From 232076b41d310050deefcba6e0f65b5505fada01 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Fri, 31 Aug 2018 12:59:39 +0200
Subject: [PATCH 001/357] Update frontend to 20180831.0

---
 homeassistant/components/frontend/__init__.py | 2 +-
 requirements_all.txt                          | 2 +-
 requirements_test_all.txt                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/frontend/__init__.py b/homeassistant/components/frontend/__init__.py
index da3d225bba0..5508aa76acf 100644
--- a/homeassistant/components/frontend/__init__.py
+++ b/homeassistant/components/frontend/__init__.py
@@ -26,7 +26,7 @@ from homeassistant.helpers.translation import async_get_translations
 from homeassistant.loader import bind_hass
 from homeassistant.util.yaml import load_yaml
 
-REQUIREMENTS = ['home-assistant-frontend==20180829.1']
+REQUIREMENTS = ['home-assistant-frontend==20180831.0']
 
 DOMAIN = 'frontend'
 DEPENDENCIES = ['api', 'websocket_api', 'http', 'system_log',
diff --git a/requirements_all.txt b/requirements_all.txt
index dad6a274676..6e9cbeffc7d 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -442,7 +442,7 @@ hole==0.3.0
 holidays==0.9.6
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180829.1
+home-assistant-frontend==20180831.0
 
 # homeassistant.components.homekit_controller
 # homekit==0.10
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index feb9b6d5efa..57d4dd9b996 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -84,7 +84,7 @@ hbmqtt==0.9.2
 holidays==0.9.6
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180829.1
+home-assistant-frontend==20180831.0
 
 # homeassistant.components.homematicip_cloud
 homematicip==0.9.8

From 8be7a0a9b966334ea30655dfd937b27f51b092c2 Mon Sep 17 00:00:00 2001
From: lamiskin <lamiskin@users.noreply.github.com>
Date: Fri, 31 Aug 2018 20:57:07 +1000
Subject: [PATCH 002/357] Correct wemo static device discovery issue. (#16292)

A recent change caused an issue if a single static wemo device is offline and could not be reached, then the whole component would not initialize (and therefore all other wemo devices are not added).
---
 homeassistant/components/wemo.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/wemo.py b/homeassistant/components/wemo.py
index 2ce2ff475a2..9664ca9419a 100644
--- a/homeassistant/components/wemo.py
+++ b/homeassistant/components/wemo.py
@@ -124,14 +124,14 @@ def setup(hass, config):
             _LOGGER.error(
                 'Unable to get description url for %s',
                 '{}:{}'.format(host, port) if port else host)
-            return False
+            continue
 
         try:
             device = pywemo.discovery.device_from_description(url, None)
         except (requests.exceptions.ConnectionError,
                 requests.exceptions.Timeout) as err:
             _LOGGER.error('Unable to access %s (%s)', url, err)
-            return False
+            continue
 
         devices.append((url, device))
 

From 16a58bd1cf0087dc793f25bd48d00b50d3b0459c Mon Sep 17 00:00:00 2001
From: Anders Melchiorsen <amelchio@nogoto.net>
Date: Fri, 31 Aug 2018 10:17:11 +0200
Subject: [PATCH 003/357] Fix LIFX effects (#16309)

---
 CODEOWNERS                             |   3 +
 homeassistant/components/light/lifx.py | 125 ++++++++++++-------------
 2 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index c756cb383d4..b86e09a6b72 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -52,6 +52,8 @@ homeassistant/components/cover/template.py @PhracturedBlue
 homeassistant/components/device_tracker/automatic.py @armills
 homeassistant/components/device_tracker/tile.py @bachya
 homeassistant/components/history_graph.py @andrey-git
+homeassistant/components/light/lifx.py @amelchio
+homeassistant/components/light/lifx_legacy.py @amelchio
 homeassistant/components/light/tplink.py @rytilahti
 homeassistant/components/light/yeelight.py @rytilahti
 homeassistant/components/lock/nello.py @pschmitt
@@ -65,6 +67,7 @@ homeassistant/components/media_player/sonos.py @amelchio
 homeassistant/components/media_player/xiaomi_tv.py @fattdev
 homeassistant/components/media_player/yamaha_musiccast.py @jalmeroth
 homeassistant/components/plant.py @ChristianKuehnel
+homeassistant/components/scene/lifx_cloud.py @amelchio
 homeassistant/components/sensor/airvisual.py @bachya
 homeassistant/components/sensor/filter.py @dgomes
 homeassistant/components/sensor/gearbest.py @HerrHofrat
diff --git a/homeassistant/components/light/lifx.py b/homeassistant/components/light/lifx.py
index cf5d6fef704..bea39354e1b 100644
--- a/homeassistant/components/light/lifx.py
+++ b/homeassistant/components/light/lifx.py
@@ -167,9 +167,9 @@ async def async_setup_platform(hass,
     return True
 
 
-def lifx_features(device):
-    """Return a feature map for this device, or a default map if unknown."""
-    return aiolifx().products.features_map.get(device.product) or \
+def lifx_features(bulb):
+    """Return a feature map for this bulb, or a default map if unknown."""
+    return aiolifx().products.features_map.get(bulb.product) or \
         aiolifx().products.features_map.get(1)
 
 
@@ -256,7 +256,7 @@ class LIFXManager:
 
     async def start_effect(self, entities, service, **kwargs):
         """Start a light effect on entities."""
-        devices = [light.device for light in entities]
+        bulbs = [light.bulb for light in entities]
 
         if service == SERVICE_EFFECT_PULSE:
             effect = aiolifx_effects().EffectPulse(
@@ -266,7 +266,7 @@ class LIFXManager:
                 mode=kwargs.get(ATTR_MODE),
                 hsbk=find_hsbk(**kwargs),
             )
-            await self.effects_conductor.start(effect, devices)
+            await self.effects_conductor.start(effect, bulbs)
         elif service == SERVICE_EFFECT_COLORLOOP:
             preprocess_turn_on_alternatives(kwargs)
 
@@ -282,12 +282,12 @@ class LIFXManager:
                 transition=kwargs.get(ATTR_TRANSITION),
                 brightness=brightness,
             )
-            await self.effects_conductor.start(effect, devices)
+            await self.effects_conductor.start(effect, bulbs)
         elif service == SERVICE_EFFECT_STOP:
-            await self.effects_conductor.stop(devices)
+            await self.effects_conductor.stop(bulbs)
 
     def service_to_entities(self, service):
-        """Return the known devices that a service call mentions."""
+        """Return the known entities that a service call mentions."""
         entity_ids = extract_entity_ids(self.hass, service)
         if entity_ids:
             entities = [entity for entity in self.entities.values()
@@ -298,50 +298,50 @@ class LIFXManager:
         return entities
 
     @callback
-    def register(self, device):
+    def register(self, bulb):
         """Handle aiolifx detected bulb."""
-        self.hass.async_add_job(self.register_new_device(device))
+        self.hass.async_add_job(self.register_new_bulb(bulb))
 
-    async def register_new_device(self, device):
+    async def register_new_bulb(self, bulb):
         """Handle newly detected bulb."""
-        if device.mac_addr in self.entities:
-            entity = self.entities[device.mac_addr]
+        if bulb.mac_addr in self.entities:
+            entity = self.entities[bulb.mac_addr]
             entity.registered = True
             _LOGGER.debug("%s register AGAIN", entity.who)
             await entity.update_hass()
         else:
-            _LOGGER.debug("%s register NEW", device.ip_addr)
+            _LOGGER.debug("%s register NEW", bulb.ip_addr)
 
             # Read initial state
             ack = AwaitAioLIFX().wait
-            color_resp = await ack(device.get_color)
+            color_resp = await ack(bulb.get_color)
             if color_resp:
-                version_resp = await ack(device.get_version)
+                version_resp = await ack(bulb.get_version)
 
             if color_resp is None or version_resp is None:
-                _LOGGER.error("Failed to initialize %s", device.ip_addr)
-                device.registered = False
+                _LOGGER.error("Failed to initialize %s", bulb.ip_addr)
+                bulb.registered = False
             else:
-                device.timeout = MESSAGE_TIMEOUT
-                device.retry_count = MESSAGE_RETRIES
-                device.unregister_timeout = UNAVAILABLE_GRACE
+                bulb.timeout = MESSAGE_TIMEOUT
+                bulb.retry_count = MESSAGE_RETRIES
+                bulb.unregister_timeout = UNAVAILABLE_GRACE
 
-                if lifx_features(device)["multizone"]:
-                    entity = LIFXStrip(device, self.effects_conductor)
-                elif lifx_features(device)["color"]:
-                    entity = LIFXColor(device, self.effects_conductor)
+                if lifx_features(bulb)["multizone"]:
+                    entity = LIFXStrip(bulb, self.effects_conductor)
+                elif lifx_features(bulb)["color"]:
+                    entity = LIFXColor(bulb, self.effects_conductor)
                 else:
-                    entity = LIFXWhite(device, self.effects_conductor)
+                    entity = LIFXWhite(bulb, self.effects_conductor)
 
                 _LOGGER.debug("%s register READY", entity.who)
-                self.entities[device.mac_addr] = entity
+                self.entities[bulb.mac_addr] = entity
                 self.async_add_entities([entity], True)
 
     @callback
-    def unregister(self, device):
+    def unregister(self, bulb):
         """Handle aiolifx disappearing bulbs."""
-        if device.mac_addr in self.entities:
-            entity = self.entities[device.mac_addr]
+        if bulb.mac_addr in self.entities:
+            entity = self.entities[bulb.mac_addr]
             _LOGGER.debug("%s unregister", entity.who)
             entity.registered = False
             self.hass.async_add_job(entity.async_update_ha_state())
@@ -352,20 +352,17 @@ class AwaitAioLIFX:
 
     def __init__(self):
         """Initialize the wrapper."""
-        self.device = None
         self.message = None
         self.event = asyncio.Event()
 
     @callback
-    def callback(self, device, message):
+    def callback(self, bulb, message):
         """Handle responses."""
-        self.device = device
         self.message = message
         self.event.set()
 
     async def wait(self, method):
         """Call an aiolifx method and wait for its response."""
-        self.device = None
         self.message = None
         self.event.clear()
         method(callb=self.callback)
@@ -387,9 +384,9 @@ def convert_16_to_8(value):
 class LIFXLight(Light):
     """Representation of a LIFX light."""
 
-    def __init__(self, device, effects_conductor):
+    def __init__(self, bulb, effects_conductor):
         """Initialize the light."""
-        self.light = device
+        self.bulb = bulb
         self.effects_conductor = effects_conductor
         self.registered = True
         self.postponed_update = None
@@ -397,34 +394,34 @@ class LIFXLight(Light):
 
     @property
     def available(self):
-        """Return the availability of the device."""
+        """Return the availability of the bulb."""
         return self.registered
 
     @property
     def unique_id(self):
         """Return a unique ID."""
-        return self.light.mac_addr
+        return self.bulb.mac_addr
 
     @property
     def name(self):
-        """Return the name of the device."""
-        return self.light.label
+        """Return the name of the bulb."""
+        return self.bulb.label
 
     @property
     def who(self):
-        """Return a string identifying the device."""
-        return "%s (%s)" % (self.light.ip_addr, self.name)
+        """Return a string identifying the bulb."""
+        return "%s (%s)" % (self.bulb.ip_addr, self.name)
 
     @property
     def min_mireds(self):
         """Return the coldest color_temp that this light supports."""
-        kelvin = lifx_features(self.light)['max_kelvin']
+        kelvin = lifx_features(self.bulb)['max_kelvin']
         return math.floor(color_util.color_temperature_kelvin_to_mired(kelvin))
 
     @property
     def max_mireds(self):
         """Return the warmest color_temp that this light supports."""
-        kelvin = lifx_features(self.light)['min_kelvin']
+        kelvin = lifx_features(self.bulb)['min_kelvin']
         return math.ceil(color_util.color_temperature_kelvin_to_mired(kelvin))
 
     @property
@@ -432,8 +429,8 @@ class LIFXLight(Light):
         """Flag supported features."""
         support = SUPPORT_BRIGHTNESS | SUPPORT_TRANSITION | SUPPORT_EFFECT
 
-        device_features = lifx_features(self.light)
-        if device_features['min_kelvin'] != device_features['max_kelvin']:
+        bulb_features = lifx_features(self.bulb)
+        if bulb_features['min_kelvin'] != bulb_features['max_kelvin']:
             support |= SUPPORT_COLOR_TEMP
 
         return support
@@ -441,25 +438,25 @@ class LIFXLight(Light):
     @property
     def brightness(self):
         """Return the brightness of this light between 0..255."""
-        return convert_16_to_8(self.light.color[2])
+        return convert_16_to_8(self.bulb.color[2])
 
     @property
     def color_temp(self):
         """Return the color temperature."""
-        _, sat, _, kelvin = self.light.color
+        _, sat, _, kelvin = self.bulb.color
         if sat:
             return None
         return color_util.color_temperature_kelvin_to_mired(kelvin)
 
     @property
     def is_on(self):
-        """Return true if device is on."""
-        return self.light.power_level != 0
+        """Return true if light is on."""
+        return self.bulb.power_level != 0
 
     @property
     def effect(self):
         """Return the name of the currently running effect."""
-        effect = self.effects_conductor.effect(self.light)
+        effect = self.effects_conductor.effect(self.bulb)
         if effect:
             return 'lifx_effect_' + effect.name
         return None
@@ -485,19 +482,19 @@ class LIFXLight(Light):
                 util.dt.utcnow() + timedelta(milliseconds=when))
 
     async def async_turn_on(self, **kwargs):
-        """Turn the device on."""
+        """Turn the light on."""
         kwargs[ATTR_POWER] = True
         self.hass.async_add_job(self.set_state(**kwargs))
 
     async def async_turn_off(self, **kwargs):
-        """Turn the device off."""
+        """Turn the light off."""
         kwargs[ATTR_POWER] = False
         self.hass.async_add_job(self.set_state(**kwargs))
 
     async def set_state(self, **kwargs):
         """Set a color on the light and turn it on/off."""
         async with self.lock:
-            bulb = self.light
+            bulb = self.bulb
 
             await self.effects_conductor.stop([bulb])
 
@@ -544,13 +541,13 @@ class LIFXLight(Light):
         await self.update_during_transition(fade)
 
     async def set_power(self, ack, pwr, duration=0):
-        """Send a power change to the device."""
-        await ack(partial(self.light.set_power, pwr, duration=duration))
+        """Send a power change to the bulb."""
+        await ack(partial(self.bulb.set_power, pwr, duration=duration))
 
     async def set_color(self, ack, hsbk, kwargs, duration=0):
-        """Send a color change to the device."""
-        hsbk = merge_hsbk(self.light.color, hsbk)
-        await ack(partial(self.light.set_color, hsbk, duration=duration))
+        """Send a color change to the bulb."""
+        hsbk = merge_hsbk(self.bulb.color, hsbk)
+        await ack(partial(self.bulb.set_color, hsbk, duration=duration))
 
     async def default_effect(self, **kwargs):
         """Start an effect with default parameters."""
@@ -563,7 +560,7 @@ class LIFXLight(Light):
     async def async_update(self):
         """Update bulb status."""
         if self.available and not self.lock.locked():
-            await AwaitAioLIFX().wait(self.light.get_color)
+            await AwaitAioLIFX().wait(self.bulb.get_color)
 
 
 class LIFXWhite(LIFXLight):
@@ -600,7 +597,7 @@ class LIFXColor(LIFXLight):
     @property
     def hs_color(self):
         """Return the hs value."""
-        hue, sat, _, _ = self.light.color
+        hue, sat, _, _ = self.bulb.color
         hue = hue / 65535 * 360
         sat = sat / 65535 * 100
         return (hue, sat) if sat else None
@@ -610,8 +607,8 @@ class LIFXStrip(LIFXColor):
     """Representation of a LIFX light strip with multiple zones."""
 
     async def set_color(self, ack, hsbk, kwargs, duration=0):
-        """Send a color change to the device."""
-        bulb = self.light
+        """Send a color change to the bulb."""
+        bulb = self.bulb
         num_zones = len(bulb.color_zones)
 
         zones = kwargs.get(ATTR_ZONES)
@@ -659,7 +656,7 @@ class LIFXStrip(LIFXColor):
         while self.available and zone < top:
             # Each get_color_zones can update 8 zones at once
             resp = await AwaitAioLIFX().wait(partial(
-                self.light.get_color_zones,
+                self.bulb.get_color_zones,
                 start_index=zone))
             if resp:
                 zone += 8

From 0e076fb9e7a0bcbf5a0c453f2696f571c2427307 Mon Sep 17 00:00:00 2001
From: Malte Franken <exxamalte@users.noreply.github.com>
Date: Fri, 31 Aug 2018 20:54:25 +1000
Subject: [PATCH 004/357] avoid error in debug log mode and rss entry without
 title (#16316)

---
 homeassistant/components/feedreader.py | 4 ++--
 tests/components/test_feedreader.py    | 6 +++---
 tests/fixtures/feedreader3.xml         | 5 +++++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/homeassistant/components/feedreader.py b/homeassistant/components/feedreader.py
index 782fd8ac8dd..7882cdc5a15 100644
--- a/homeassistant/components/feedreader.py
+++ b/homeassistant/components/feedreader.py
@@ -143,7 +143,7 @@ class FeedManager:
         else:
             self._has_published_parsed = False
             _LOGGER.debug("No published_parsed info available for entry %s",
-                          entry.title)
+                          entry)
         entry.update({'feed_url': self._url})
         self._hass.bus.fire(self._event_type, entry)
 
@@ -164,7 +164,7 @@ class FeedManager:
                 self._update_and_fire_entry(entry)
                 new_entries = True
             else:
-                _LOGGER.debug("Entry %s already processed", entry.title)
+                _LOGGER.debug("Entry %s already processed", entry)
         if not new_entries:
             self._log_no_entries()
         self._firstrun = False
diff --git a/tests/components/test_feedreader.py b/tests/components/test_feedreader.py
index dd98ebaf189..668f116362c 100644
--- a/tests/components/test_feedreader.py
+++ b/tests/components/test_feedreader.py
@@ -160,11 +160,11 @@ class TestFeedreaderComponent(unittest.TestCase):
         manager, events = self.setup_manager(feed_data, max_entries=5)
         assert len(events) == 5
 
-    def test_feed_without_publication_date(self):
-        """Test simple feed with entry without publication date."""
+    def test_feed_without_publication_date_and_title(self):
+        """Test simple feed with entry without publication date and title."""
         feed_data = load_fixture('feedreader3.xml')
         manager, events = self.setup_manager(feed_data)
-        assert len(events) == 2
+        assert len(events) == 3
 
     def test_feed_invalid_data(self):
         """Test feed with invalid data."""
diff --git a/tests/fixtures/feedreader3.xml b/tests/fixtures/feedreader3.xml
index 7b28e067cfe..d8ccd119306 100644
--- a/tests/fixtures/feedreader3.xml
+++ b/tests/fixtures/feedreader3.xml
@@ -21,6 +21,11 @@
             <link>http://www.example.com/link/2</link>
             <guid isPermaLink="false">GUID 2</guid>
         </item>
+        <item>
+            <description>Description 3</description>
+            <link>http://www.example.com/link/3</link>
+            <guid isPermaLink="false">GUID 3</guid>
+        </item>
 
     </channel>
 </rss>

From bc618af193afcbbfbd317174a6baa032cbb2e97f Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Fri, 31 Aug 2018 13:17:24 +0200
Subject: [PATCH 005/357] Bumped version to 0.77.2

---
 homeassistant/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/const.py b/homeassistant/const.py
index 59d2d553a7b..fac257fbaed 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -2,7 +2,7 @@
 """Constants used by Home Assistant components."""
 MAJOR_VERSION = 0
 MINOR_VERSION = 77
-PATCH_VERSION = '1'
+PATCH_VERSION = '2'
 __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
 __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
 REQUIRED_PYTHON_VER = (3, 5, 3)

From d705375a9ae6195fcae8a6b44bd25c2449f86ce2 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Fri, 31 Aug 2018 13:23:22 +0200
Subject: [PATCH 006/357] Update translations

---
 .../components/auth/.translations/ar.json     |  7 +++++
 .../components/auth/.translations/de.json     | 16 ++++++++++
 .../components/auth/.translations/es-419.json | 12 +++++++
 .../components/auth/.translations/fr.json     | 16 ++++++++++
 .../components/auth/.translations/it.json     | 13 ++++++++
 .../components/auth/.translations/ko.json     |  4 +--
 .../components/auth/.translations/nl.json     | 16 ++++++++++
 .../components/auth/.translations/no.json     | 16 ++++++++++
 .../components/auth/.translations/pl.json     | 16 ++++++++++
 .../components/auth/.translations/pt.json     | 16 ++++++++++
 .../components/auth/.translations/ru.json     |  2 +-
 .../components/auth/.translations/sl.json     | 16 ++++++++++
 .../components/cast/.translations/fr.json     | 13 ++++++++
 .../components/deconz/.translations/nl.json   |  2 +-
 .../components/hangouts/.translations/de.json |  1 +
 .../components/hangouts/.translations/en.json |  4 +--
 .../hangouts/.translations/es-419.json        | 18 +++++++++++
 .../components/hangouts/.translations/fr.json | 21 +++++++++++++
 .../components/hangouts/.translations/it.json | 24 ++++++++++++++
 .../components/hangouts/.translations/nl.json | 29 +++++++++++++++++
 .../components/hangouts/.translations/no.json | 18 ++++++++++-
 .../hangouts/.translations/pt-BR.json         | 11 +------
 .../components/hangouts/.translations/pt.json | 31 +++++++++++++++++++
 .../.translations/es-419.json                 |  4 ++-
 .../homematicip_cloud/.translations/fr.json   | 21 +++++++++++++
 .../homematicip_cloud/.translations/it.json   |  8 +++++
 .../homematicip_cloud/.translations/nl.json   |  8 ++---
 .../homematicip_cloud/.translations/pt.json   |  1 +
 .../components/hue/.translations/nl.json      |  2 +-
 .../components/nest/.translations/fr.json     |  7 +++++
 .../sensor/.translations/moon.pt-BR.json      |  2 --
 .../sensor/.translations/moon.pt.json         | 12 +++++++
 .../components/sonos/.translations/de.json    |  2 +-
 33 files changed, 363 insertions(+), 26 deletions(-)
 create mode 100644 homeassistant/components/auth/.translations/ar.json
 create mode 100644 homeassistant/components/auth/.translations/de.json
 create mode 100644 homeassistant/components/auth/.translations/es-419.json
 create mode 100644 homeassistant/components/auth/.translations/fr.json
 create mode 100644 homeassistant/components/auth/.translations/it.json
 create mode 100644 homeassistant/components/auth/.translations/nl.json
 create mode 100644 homeassistant/components/auth/.translations/no.json
 create mode 100644 homeassistant/components/auth/.translations/pl.json
 create mode 100644 homeassistant/components/auth/.translations/pt.json
 create mode 100644 homeassistant/components/auth/.translations/sl.json
 create mode 100644 homeassistant/components/cast/.translations/fr.json
 create mode 100644 homeassistant/components/hangouts/.translations/es-419.json
 create mode 100644 homeassistant/components/hangouts/.translations/fr.json
 create mode 100644 homeassistant/components/hangouts/.translations/nl.json
 create mode 100644 homeassistant/components/hangouts/.translations/pt.json
 create mode 100644 homeassistant/components/homematicip_cloud/.translations/fr.json
 create mode 100644 homeassistant/components/nest/.translations/fr.json
 create mode 100644 homeassistant/components/sensor/.translations/moon.pt.json

diff --git a/homeassistant/components/auth/.translations/ar.json b/homeassistant/components/auth/.translations/ar.json
new file mode 100644
index 00000000000..1ef902e6fe2
--- /dev/null
+++ b/homeassistant/components/auth/.translations/ar.json
@@ -0,0 +1,7 @@
+{
+    "mfa_setup": {
+        "totp": {
+            "title": "TOTP"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/auth/.translations/de.json b/homeassistant/components/auth/.translations/de.json
new file mode 100644
index 00000000000..67f948e8340
--- /dev/null
+++ b/homeassistant/components/auth/.translations/de.json
@@ -0,0 +1,16 @@
+{
+    "mfa_setup": {
+        "totp": {
+            "error": {
+                "invalid_code": "Ung\u00fcltiger Code, bitte versuche es erneut. Wenn Sie diesen Fehler regelm\u00e4\u00dfig erhalten, stelle sicher, dass die Uhr deines Home Assistant-Systems korrekt ist."
+            },
+            "step": {
+                "init": {
+                    "description": "Um die Zwei-Faktor-Authentifizierung mit zeitbasierten Einmalpassw\u00f6rtern zu aktivieren, scanne den QR-Code mit Ihrer Authentifizierungs-App. Wenn du keine hast, empfehlen wir entweder [Google Authenticator] (https://support.google.com/accounts/answer/1066447) oder [Authy] (https://authy.com/). \n\n {qr_code} \n \nNachdem du den Code gescannt hast, gebe den sechsstelligen Code aus der App ein, um das Setup zu \u00fcberpr\u00fcfen. Wenn es Probleme beim Scannen des QR-Codes gibt, f\u00fchre ein manuelles Setup mit dem Code ** ` {code} ` ** durch.",
+                    "title": "Richte die Zwei-Faktor-Authentifizierung mit TOTP ein"
+                }
+            },
+            "title": "TOTP"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/auth/.translations/es-419.json b/homeassistant/components/auth/.translations/es-419.json
new file mode 100644
index 00000000000..6caa9d49993
--- /dev/null
+++ b/homeassistant/components/auth/.translations/es-419.json
@@ -0,0 +1,12 @@
+{
+    "mfa_setup": {
+        "totp": {
+            "step": {
+                "init": {
+                    "title": "Configurar la autenticaci\u00f3n de dos factores mediante TOTP"
+                }
+            },
+            "title": "TOTP"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/auth/.translations/fr.json b/homeassistant/components/auth/.translations/fr.json
new file mode 100644
index 00000000000..e8a8037c39a
--- /dev/null
+++ b/homeassistant/components/auth/.translations/fr.json
@@ -0,0 +1,16 @@
+{
+    "mfa_setup": {
+        "totp": {
+            "error": {
+                "invalid_code": "Code invalide. S'il vous pla\u00eet essayez \u00e0 nouveau. Si cette erreur persiste, assurez-vous que l'horloge de votre syst\u00e8me Home Assistant est correcte."
+            },
+            "step": {
+                "init": {
+                    "description": "Pour activer l'authentification \u00e0 deux facteurs \u00e0 l'aide de mots de passe \u00e0 utilisation unique bas\u00e9s sur l'heure, num\u00e9risez le code QR avec votre application d'authentification. Si vous n'en avez pas, nous vous recommandons d'utiliser [Google Authenticator] (https://support.google.com/accounts/answer/1066447) ou [Authy] (https://authy.com/). \n\n {qr_code} \n \n Apr\u00e8s avoir num\u00e9ris\u00e9 le code, entrez le code \u00e0 six chiffres de votre application pour v\u00e9rifier la configuration. Si vous rencontrez des probl\u00e8mes lors de l\u2019analyse du code QR, effectuez une configuration manuelle avec le code ** ` {code} ` **.",
+                    "title": "Configurer une authentification \u00e0 deux facteurs \u00e0 l'aide de TOTP"
+                }
+            },
+            "title": "TOTP (Mot de passe \u00e0 utilisation unique bas\u00e9 sur le temps)"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/auth/.translations/it.json b/homeassistant/components/auth/.translations/it.json
new file mode 100644
index 00000000000..869c3b438af
--- /dev/null
+++ b/homeassistant/components/auth/.translations/it.json
@@ -0,0 +1,13 @@
+{
+    "mfa_setup": {
+        "totp": {
+            "step": {
+                "init": {
+                    "description": "Per attivare l'autenticazione a due fattori utilizzando password monouso basate sul tempo, eseguire la scansione del codice QR con l'app di autenticazione. Se non ne hai uno, ti consigliamo [Google Authenticator] (https://support.google.com/accounts/answer/1066447) o [Authy] (https://authy.com/). \n\n {qr_code} \n \n Dopo aver scansionato il codice, inserisci il codice a sei cifre dalla tua app per verificare la configurazione. Se riscontri problemi con la scansione del codice QR, esegui una configurazione manuale con codice ** ` {code} ` **.",
+                    "title": "Imposta l'autenticazione a due fattori usando TOTP"
+                }
+            },
+            "title": "TOTP"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/auth/.translations/ko.json b/homeassistant/components/auth/.translations/ko.json
index 726fa6a6cd1..4eb4783edd9 100644
--- a/homeassistant/components/auth/.translations/ko.json
+++ b/homeassistant/components/auth/.translations/ko.json
@@ -2,11 +2,11 @@
     "mfa_setup": {
         "totp": {
             "error": {
-                "invalid_code": "\uc798\ubabb\ub41c \ucf54\ub4dc \uc785\ub2c8\ub2e4. \ub2e4\uc2dc \uc2dc\ub3c4\ud574\uc8fc\uc138\uc694. \uc774 \uc624\ub958\uac00 \uc9c0\uc18d\uc801\uc73c\ub85c \ubc1c\uc0dd\ud55c\ub2e4\uba74 Home Assistant \uc758 \uc2dc\uacc4\uac00 \uc815\ud655\ud55c\uc9c0 \ud655\uc778\ud574\ubcf4\uc138\uc694."
+                "invalid_code": "\uc798\ubabb\ub41c \ucf54\ub4dc \uc785\ub2c8\ub2e4. \ub2e4\uc2dc \uc2dc\ub3c4\ud574\uc8fc\uc138\uc694. \uc774 \uc624\ub958\uac00 \uc9c0\uc18d\uc801\uc73c\ub85c \ubc1c\uc0dd\ud55c\ub2e4\uba74 Home Assistant \uc758 \uc2dc\uac04\uc124\uc815\uc774 \uc62c\ubc14\ub978\uc9c0 \ud655\uc778\ud574\ubcf4\uc138\uc694."
             },
             "step": {
                 "init": {
-                    "description": "\uc2dc\uac04 \uae30\ubc18\uc758 \uc77c\ud68c\uc6a9 \ube44\ubc00\ubc88\ud638\ub97c \uc0ac\uc6a9\ud558\ub294 2\ub2e8\uacc4 \uc778\uc99d\uc744 \ud558\ub824\uba74 \uc778\uc99d\uc6a9 \uc571\uc744 \uc774\uc6a9\ud574\uc11c QR \ucf54\ub4dc\ub97c \uc2a4\uce94\ud574 \uc8fc\uc138\uc694. \uc778\uc99d\uc6a9 \uc571\uc740 [Google Authenticator](https://support.google.com/accounts/answer/1066447) \ub098 [Authy](https://authy.com/) \ub97c \ucd94\ucc9c\ub4dc\ub9bd\ub2c8\ub2e4.\n\n{qr_code}\n\n\uc2a4\uce94 \ud6c4\uc5d0 \uc0dd\uc131\ub41c 6\uc790\ub9ac \ucf54\ub4dc\ub97c \uc785\ub825\ud574\uc11c \uc124\uc815\uc744 \ud655\uc778\ud558\uc138\uc694. QR \ucf54\ub4dc \uc2a4\uce94\uc5d0 \ubb38\uc81c\uac00 \uc788\ub2e4\uba74, **`{code}`** \ucf54\ub4dc\ub85c \uc9c1\uc811 \uc124\uc815\ud574\ubcf4\uc138\uc694.",
+                    "description": "\uc2dc\uac04 \uae30\ubc18\uc758 \uc77c\ud68c\uc6a9 \ube44\ubc00\ubc88\ud638\ub97c \uc0ac\uc6a9\ud558\ub294 2\ub2e8\uacc4 \uc778\uc99d\uc744 \ud558\ub824\uba74 \uc778\uc99d\uc6a9 \uc571\uc744 \uc774\uc6a9\ud574\uc11c QR \ucf54\ub4dc\ub97c \uc2a4\uce94\ud574 \uc8fc\uc138\uc694. \uc778\uc99d\uc6a9 \uc571\uc740 [Google Authenticator](https://support.google.com/accounts/answer/1066447) \ub610\ub294 [Authy](https://authy.com/) \ub97c \ucd94\ucc9c\ub4dc\ub9bd\ub2c8\ub2e4.\n\n{qr_code}\n\n\uc2a4\uce94 \ud6c4\uc5d0 \uc0dd\uc131\ub41c 6\uc790\ub9ac \ucf54\ub4dc\ub97c \uc785\ub825\ud574\uc11c \uc124\uc815\uc744 \ud655\uc778\ud558\uc138\uc694. QR \ucf54\ub4dc \uc2a4\uce94\uc5d0 \ubb38\uc81c\uac00 \uc788\ub2e4\uba74, **`{code}`** \ucf54\ub4dc\ub85c \uc9c1\uc811 \uc124\uc815\ud574\ubcf4\uc138\uc694.",
                     "title": "TOTP \ub97c \uc0ac\uc6a9\ud558\uc5ec 2 \ub2e8\uacc4 \uc778\uc99d \uad6c\uc131"
                 }
             },
diff --git a/homeassistant/components/auth/.translations/nl.json b/homeassistant/components/auth/.translations/nl.json
new file mode 100644
index 00000000000..40a873023dd
--- /dev/null
+++ b/homeassistant/components/auth/.translations/nl.json
@@ -0,0 +1,16 @@
+{
+    "mfa_setup": {
+        "totp": {
+            "error": {
+                "invalid_code": "Ongeldige code, probeer het opnieuw. Als u deze fout blijft krijgen, controleer dan of de klok van uw Home Assistant systeem correct is ingesteld."
+            },
+            "step": {
+                "init": {
+                    "description": "Voor het activeren van twee-factor-authenticatie via tijdgebonden eenmalige wachtwoorden: scan de QR code met uw authenticatie-app. Als u nog geen app heeft, adviseren we [Google Authenticator (https://support.google.com/accounts/answer/1066447) of [Authy](https://authy.com/).\n\n{qr_code}\n\nNa het scannen van de code voert u de zescijferige code uit uw app in om de instelling te controleren. Als u problemen heeft met het scannen van de QR-code, voert u een handmatige configuratie uit met code **`{code}`**.",
+                    "title": "Configureer twee-factor-authenticatie via TOTP"
+                }
+            },
+            "title": "TOTP"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/auth/.translations/no.json b/homeassistant/components/auth/.translations/no.json
new file mode 100644
index 00000000000..43ec497cfb1
--- /dev/null
+++ b/homeassistant/components/auth/.translations/no.json
@@ -0,0 +1,16 @@
+{
+    "mfa_setup": {
+        "totp": {
+            "error": {
+                "invalid_code": "Ugyldig kode, pr\u00f8v igjen. Hvis du f\u00e5r denne feilen konsekvent, m\u00e5 du s\u00f8rge for at klokken p\u00e5 Home Assistant systemet er riktig."
+            },
+            "step": {
+                "init": {
+                    "description": "For \u00e5 aktivere tofaktorautentisering ved hjelp av tidsbaserte engangspassord, skann QR-koden med autentiseringsappen din. Hvis du ikke har en, kan vi anbefale enten [Google Authenticator](https://support.google.com/accounts/answer/1066447) eller [Authy](https://authy.com/). \n\n {qr_code} \n \nEtter at du har skannet koden, skriver du inn den seks-sifrede koden fra appen din for \u00e5 kontrollere oppsettet. Dersom du har problemer med \u00e5 skanne QR-koden kan du taste inn f\u00f8lgende kode manuelt: **`{code}`**.",
+                    "title": "Konfigurer tofaktorautentisering ved hjelp av TOTP"
+                }
+            },
+            "title": "TOTP"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/auth/.translations/pl.json b/homeassistant/components/auth/.translations/pl.json
new file mode 100644
index 00000000000..78999c34c22
--- /dev/null
+++ b/homeassistant/components/auth/.translations/pl.json
@@ -0,0 +1,16 @@
+{
+    "mfa_setup": {
+        "totp": {
+            "error": {
+                "invalid_code": "Nieprawid\u0142owy kod, spr\u00f3buj ponownie. Je\u015bli b\u0142\u0105d b\u0119dzie si\u0119 powtarza\u0142, upewnij si\u0119, \u017ce czas zegara systemu Home Assistant jest prawid\u0142owy."
+            },
+            "step": {
+                "init": {
+                    "description": "Aby aktywowa\u0107 uwierzytelnianie dwusk\u0142adnikowe przy u\u017cyciu jednorazowych hase\u0142 opartych na czasie, zeskanuj kod QR za pomoc\u0105 aplikacji uwierzytelniaj\u0105cej. Je\u015bli jej nie masz, polecamy [Google Authenticator](https://support.google.com/accounts/answer/1066447) lub [Authy](https://authy.com/).\n\n{qr_code} \n \nPo zeskanowaniu kodu wprowad\u017a sze\u015bciocyfrowy kod z aplikacji, aby zweryfikowa\u0107 konfiguracj\u0119. Je\u015bli masz problemy z zeskanowaniem kodu QR, wykonaj r\u0119czn\u0105 konfiguracj\u0119 z kodem **`{code}`**.",
+                    "title": "Skonfiguruj uwierzytelnianie dwusk\u0142adnikowe za pomoc\u0105 hase\u0142 jednorazowych opartych na czasie"
+                }
+            },
+            "title": "Has\u0142a jednorazowe oparte na czasie"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/auth/.translations/pt.json b/homeassistant/components/auth/.translations/pt.json
new file mode 100644
index 00000000000..474dbe488be
--- /dev/null
+++ b/homeassistant/components/auth/.translations/pt.json
@@ -0,0 +1,16 @@
+{
+    "mfa_setup": {
+        "totp": {
+            "error": {
+                "invalid_code": "C\u00f3digo inv\u00e1lido, por favor, tente novamente. Se receber este erro constantemente, por favor, certifique-se de que o rel\u00f3gio do sistema que hospeda o Home Assistent \u00e9 preciso."
+            },
+            "step": {
+                "init": {
+                    "description": "Para ativar a autentica\u00e7\u00e3o com dois fatores utilizando passwords unicas temporais (OTP), ler o c\u00f3digo QR com a sua aplica\u00e7\u00e3o de autentica\u00e7\u00e3o. Se voc\u00ea n\u00e3o tiver uma, recomendamos [Google Authenticator](https://support.google.com/accounts/answer/1066447) ou [Authy](https://authy.com/).\n\n{qr_code}\n\nDepois de ler o c\u00f3digo, introduza o c\u00f3digo de seis d\u00edgitos fornecido pela sua aplica\u00e7\u00e3o para verificar a configura\u00e7\u00e3o. Se tiver problemas a ler o c\u00f3digo QR, fa\u00e7a uma configura\u00e7\u00e3o manual com o c\u00f3digo **`{c\u00f3digo}`**.",
+                    "title": "Configurar autentica\u00e7\u00e3o com dois fatores usando TOTP"
+                }
+            },
+            "title": "TOTP"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/auth/.translations/ru.json b/homeassistant/components/auth/.translations/ru.json
index b4b5b58f9fa..a716425f345 100644
--- a/homeassistant/components/auth/.translations/ru.json
+++ b/homeassistant/components/auth/.translations/ru.json
@@ -6,7 +6,7 @@
             },
             "step": {
                 "init": {
-                    "description": "\u0427\u0442\u043e\u0431\u044b \u0430\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0434\u0432\u0443\u0445\u0444\u0430\u043a\u0442\u043e\u0440\u043d\u0443\u044e \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044e \u0441 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u043c \u043e\u0434\u043d\u043e\u0440\u0430\u0437\u043e\u0432\u044b\u0445 \u043f\u0430\u0440\u043e\u043b\u0435\u0439, \u043e\u0441\u043d\u043e\u0432\u0430\u043d\u043d\u044b\u0445 \u043d\u0430 \u0432\u0440\u0435\u043c\u0435\u043d\u0438, \u043e\u0442\u0441\u043a\u0430\u043d\u0438\u0440\u0443\u0439\u0442\u0435 QR-\u043a\u043e\u0434 \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u0434\u043b\u044f \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0438 \u043f\u043e\u0434\u043b\u0438\u043d\u043d\u043e\u0441\u0442\u0438. \u0415\u0441\u043b\u0438 \u0443 \u0432\u0430\u0441 \u0435\u0433\u043e \u043d\u0435\u0442, \u043c\u044b \u0440\u0435\u043a\u043e\u043c\u0435\u043d\u0434\u0443\u0435\u043c \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u043b\u0438\u0431\u043e [Google Authenticator] (https://support.google.com/accounts/answer/1066447), \u043b\u0438\u0431\u043e [Authy] (https://authy.com/). \n\n {qr_code} \n \n \u041f\u043e\u0441\u043b\u0435 \u0441\u043a\u0430\u043d\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f QR-\u043a\u043e\u0434\u0430 \u0432\u0432\u0435\u0434\u0438\u0442\u0435 \u0448\u0435\u0441\u0442\u0438\u0437\u043d\u0430\u0447\u043d\u044b\u0439 \u043a\u043e\u0434 \u0438\u0437 \u0432\u0430\u0448\u0435\u0433\u043e \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f, \u0447\u0442\u043e\u0431\u044b \u043f\u0440\u043e\u0432\u0435\u0440\u0438\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0443. \u0415\u0441\u043b\u0438 \u0443 \u0432\u0430\u0441 \u0435\u0441\u0442\u044c \u043f\u0440\u043e\u0431\u043b\u0435\u043c\u044b \u0441\u043e \u0441\u043a\u0430\u043d\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435\u043c QR-\u043a\u043e\u0434\u0430, \u0432\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u0435 \u0440\u0443\u0447\u043d\u0443\u044e \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0443 \u0441 \u043a\u043e\u0434\u043e\u043c ** ` {code} ` **.",
+                    "description": "\u0427\u0442\u043e\u0431\u044b \u0430\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0434\u0432\u0443\u0445\u0444\u0430\u043a\u0442\u043e\u0440\u043d\u0443\u044e \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044e \u0441 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u043c \u043e\u0434\u043d\u043e\u0440\u0430\u0437\u043e\u0432\u044b\u0445 \u043f\u0430\u0440\u043e\u043b\u0435\u0439, \u043e\u0441\u043d\u043e\u0432\u0430\u043d\u043d\u044b\u0445 \u043d\u0430 \u0432\u0440\u0435\u043c\u0435\u043d\u0438, \u043e\u0442\u0441\u043a\u0430\u043d\u0438\u0440\u0443\u0439\u0442\u0435 QR-\u043a\u043e\u0434 \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u0434\u043b\u044f \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0438 \u043f\u043e\u0434\u043b\u0438\u043d\u043d\u043e\u0441\u0442\u0438. \u0415\u0441\u043b\u0438 \u0443 \u0432\u0430\u0441 \u0435\u0433\u043e \u043d\u0435\u0442, \u043c\u044b \u0440\u0435\u043a\u043e\u043c\u0435\u043d\u0434\u0443\u0435\u043c \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u043b\u0438\u0431\u043e [Google Authenticator](https://support.google.com/accounts/answer/1066447), \u043b\u0438\u0431\u043e [Authy](https://authy.com/). \n\n {qr_code} \n \n\u041f\u043e\u0441\u043b\u0435 \u0441\u043a\u0430\u043d\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f QR-\u043a\u043e\u0434\u0430 \u0432\u0432\u0435\u0434\u0438\u0442\u0435 \u0448\u0435\u0441\u0442\u0438\u0437\u043d\u0430\u0447\u043d\u044b\u0439 \u043a\u043e\u0434 \u0438\u0437 \u0432\u0430\u0448\u0435\u0433\u043e \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f, \u0447\u0442\u043e\u0431\u044b \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0443. \u0415\u0441\u043b\u0438 \u0443 \u0432\u0430\u0441 \u0435\u0441\u0442\u044c \u043f\u0440\u043e\u0431\u043b\u0435\u043c\u044b \u0441\u043e \u0441\u043a\u0430\u043d\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435\u043c QR-\u043a\u043e\u0434\u0430, \u0432\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0443 \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u043a\u043e\u0434\u0430 **`{code}`**.",
                     "title": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0434\u0432\u0443\u0445\u0444\u0430\u043a\u0442\u043e\u0440\u043d\u043e\u0439 \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u0438 \u0441 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u043c TOTP"
                 }
             },
diff --git a/homeassistant/components/auth/.translations/sl.json b/homeassistant/components/auth/.translations/sl.json
new file mode 100644
index 00000000000..45b57a772f9
--- /dev/null
+++ b/homeassistant/components/auth/.translations/sl.json
@@ -0,0 +1,16 @@
+{
+    "mfa_setup": {
+        "totp": {
+            "error": {
+                "invalid_code": "Neveljavna koda, prosimo, poskusite znova. \u010ce dobite to sporo\u010dilo ve\u010dkrat, prosimo poskrbite, da bo ura va\u0161ega Home Assistenta to\u010dna."
+            },
+            "step": {
+                "init": {
+                    "description": "\u010ce \u017eelite aktivirati preverjanje pristnosti dveh faktorjev z enkratnimi gesli, ki temeljijo na \u010dasu, skenirajte kodo QR s svojo aplikacijo za preverjanje pristnosti. \u010ce je nimate, priporo\u010damo bodisi [Google Authenticator] (https://support.google.com/accounts/answer/1066447) ali [Authy] (https://authy.com/). \n\n {qr_code} \n \n Po skeniranju kode vnesite \u0161estmestno kodo iz aplikacije, da preverite nastavitev. \u010ce imate te\u017eave pri skeniranju kode QR, naredite ro\u010dno nastavitev s kodo ** ` {code} ` **.",
+                    "title": "Nastavite dvofaktorsko avtentifikacijo s pomo\u010djo TOTP-ja"
+                }
+            },
+            "title": "TOTP"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/cast/.translations/fr.json b/homeassistant/components/cast/.translations/fr.json
new file mode 100644
index 00000000000..acacddf2187
--- /dev/null
+++ b/homeassistant/components/cast/.translations/fr.json
@@ -0,0 +1,13 @@
+{
+    "config": {
+        "abort": {
+            "no_devices_found": "Aucun appareil Google Cast trouv\u00e9 sur le r\u00e9seau.",
+            "single_instance_allowed": "Seulement une seule configuration de Google Cast est n\u00e9cessaire."
+        },
+        "step": {
+            "confirm": {
+                "description": "Voulez-vous configurer Google Cast?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/deconz/.translations/nl.json b/homeassistant/components/deconz/.translations/nl.json
index 6f3fa2ec9a4..9084d22f4a3 100644
--- a/homeassistant/components/deconz/.translations/nl.json
+++ b/homeassistant/components/deconz/.translations/nl.json
@@ -28,6 +28,6 @@
                 "title": "Extra configuratieopties voor deCONZ"
             }
         },
-        "title": "deCONZ"
+        "title": "deCONZ Zigbee gateway"
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/hangouts/.translations/de.json b/homeassistant/components/hangouts/.translations/de.json
index 4222e7f5556..a2ed8d21230 100644
--- a/homeassistant/components/hangouts/.translations/de.json
+++ b/homeassistant/components/hangouts/.translations/de.json
@@ -5,6 +5,7 @@
             "unknown": "Ein unbekannter Fehler ist aufgetreten."
         },
         "error": {
+            "invalid_2fa": "Ung\u00fcltige 2-Faktor Authentifizierung, bitte versuche es erneut.",
             "invalid_2fa_method": "Ung\u00fcltige 2FA Methode (mit Telefon verifizieren)",
             "invalid_login": "Ung\u00fcltige Daten, bitte erneut versuchen."
         },
diff --git a/homeassistant/components/hangouts/.translations/en.json b/homeassistant/components/hangouts/.translations/en.json
index 6e70a1f4310..f526bec4f34 100644
--- a/homeassistant/components/hangouts/.translations/en.json
+++ b/homeassistant/components/hangouts/.translations/en.json
@@ -5,7 +5,7 @@
             "unknown": "Unknown error occurred."
         },
         "error": {
-            "invalid_2fa": "Invalid 2 Factor Authorization, please try again.",
+            "invalid_2fa": "Invalid 2 Factor Authentication, please try again.",
             "invalid_2fa_method": "Invalid 2FA Method (Verify on Phone).",
             "invalid_login": "Invalid Login, please try again."
         },
@@ -14,7 +14,7 @@
                 "data": {
                     "2fa": "2FA Pin"
                 },
-                "title": "2-Factor-Authorization"
+                "title": "2-Factor-Authentication"
             },
             "user": {
                 "data": {
diff --git a/homeassistant/components/hangouts/.translations/es-419.json b/homeassistant/components/hangouts/.translations/es-419.json
new file mode 100644
index 00000000000..a3699db08ae
--- /dev/null
+++ b/homeassistant/components/hangouts/.translations/es-419.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Google Hangouts ya est\u00e1 configurado",
+            "unknown": "Se produjo un error desconocido."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "email": "Direcci\u00f3n de correo electr\u00f3nico",
+                    "password": "Contrase\u00f1a"
+                },
+                "title": "Inicio de sesi\u00f3n de Google Hangouts"
+            }
+        },
+        "title": "Google Hangouts"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/hangouts/.translations/fr.json b/homeassistant/components/hangouts/.translations/fr.json
new file mode 100644
index 00000000000..c92d478c454
--- /dev/null
+++ b/homeassistant/components/hangouts/.translations/fr.json
@@ -0,0 +1,21 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Google Hangouts est d\u00e9j\u00e0 configur\u00e9",
+            "unknown": "Une erreur inconnue s'est produite"
+        },
+        "error": {
+            "invalid_login": "Login invalide, veuillez r\u00e9essayer."
+        },
+        "step": {
+            "2fa": {
+                "title": "Authentification \u00e0 2 facteurs"
+            },
+            "user": {
+                "data": {
+                    "password": "Mot de passe"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/hangouts/.translations/it.json b/homeassistant/components/hangouts/.translations/it.json
index 0c609b3430a..76a9adcb40e 100644
--- a/homeassistant/components/hangouts/.translations/it.json
+++ b/homeassistant/components/hangouts/.translations/it.json
@@ -1,5 +1,29 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Google Hangouts \u00e8 gi\u00e0 configurato",
+            "unknown": "Si \u00e8 verificato un errore sconosciuto."
+        },
+        "error": {
+            "invalid_2fa": "Autenticazione a 2 fattori non valida, riprovare.",
+            "invalid_2fa_method": "Metodo 2FA non valido (verifica sul telefono).",
+            "invalid_login": "Accesso non valido, si prega di riprovare."
+        },
+        "step": {
+            "2fa": {
+                "data": {
+                    "2fa": "2FA Pin"
+                },
+                "title": "Autenticazione a due fattori"
+            },
+            "user": {
+                "data": {
+                    "email": "Indirizzo email",
+                    "password": "Password"
+                },
+                "title": "Accesso a Google Hangouts"
+            }
+        },
         "title": "Google Hangouts"
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/hangouts/.translations/nl.json b/homeassistant/components/hangouts/.translations/nl.json
new file mode 100644
index 00000000000..cf73210aa3b
--- /dev/null
+++ b/homeassistant/components/hangouts/.translations/nl.json
@@ -0,0 +1,29 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Google Hangouts is al geconfigureerd",
+            "unknown": "Onbekende fout opgetreden."
+        },
+        "error": {
+            "invalid_2fa": "Ongeldige twee-factor-authenticatie, probeer het opnieuw.",
+            "invalid_2fa_method": "Ongeldige 2FA-methode (verifi\u00ebren op telefoon).",
+            "invalid_login": "Ongeldige aanmelding, probeer het opnieuw."
+        },
+        "step": {
+            "2fa": {
+                "data": {
+                    "2fa": "2FA pin"
+                },
+                "title": "Twee-factor-authenticatie"
+            },
+            "user": {
+                "data": {
+                    "email": "E-mailadres",
+                    "password": "Wachtwoord"
+                },
+                "title": "Google Hangouts inlog"
+            }
+        },
+        "title": "Google Hangouts"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/hangouts/.translations/no.json b/homeassistant/components/hangouts/.translations/no.json
index 7ea074470c7..c2cdb93c005 100644
--- a/homeassistant/components/hangouts/.translations/no.json
+++ b/homeassistant/components/hangouts/.translations/no.json
@@ -1,11 +1,27 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Google Hangouts er allerede konfigurert",
+            "unknown": "Ukjent feil oppstod."
+        },
+        "error": {
+            "invalid_2fa": "Ugyldig tofaktorautentisering, vennligst pr\u00f8v igjen.",
+            "invalid_2fa_method": "Ugyldig 2FA-metode (Bekreft p\u00e5 telefon).",
+            "invalid_login": "Ugyldig innlogging, vennligst pr\u00f8v igjen."
+        },
         "step": {
+            "2fa": {
+                "data": {
+                    "2fa": "2FA Pin"
+                },
+                "title": "Tofaktorautentisering"
+            },
             "user": {
                 "data": {
                     "email": "E-postadresse",
                     "password": "Passord"
-                }
+                },
+                "title": "Google Hangouts p\u00e5logging"
             }
         },
         "title": "Google Hangouts"
diff --git a/homeassistant/components/hangouts/.translations/pt-BR.json b/homeassistant/components/hangouts/.translations/pt-BR.json
index 4dffe492c4d..41b097f3f8d 100644
--- a/homeassistant/components/hangouts/.translations/pt-BR.json
+++ b/homeassistant/components/hangouts/.translations/pt-BR.json
@@ -1,23 +1,14 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Hangouts do Google j\u00e1 est\u00e1 configurado.",
-            "unknown": "Ocorreu um erro desconhecido."
-        },
-        "error": {
-            "invalid_2fa_method": "M\u00e9todo 2FA inv\u00e1lido (verificar no telefone).",
-            "invalid_login": "Login inv\u00e1lido, por favor, tente novamente."
+            "already_configured": "Hangouts do Google j\u00e1 est\u00e1 configurado."
         },
         "step": {
             "2fa": {
-                "data": {
-                    "2fa": "Pin 2FA"
-                },
                 "title": ""
             },
             "user": {
                 "data": {
-                    "email": "Endere\u00e7o de e-mail",
                     "password": "Senha"
                 },
                 "title": "Login do Hangouts do Google"
diff --git a/homeassistant/components/hangouts/.translations/pt.json b/homeassistant/components/hangouts/.translations/pt.json
new file mode 100644
index 00000000000..64c960a121a
--- /dev/null
+++ b/homeassistant/components/hangouts/.translations/pt.json
@@ -0,0 +1,31 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Google Hangouts j\u00e1 est\u00e1 configurado",
+            "unknown": "Ocorreu um erro desconhecido."
+        },
+        "error": {
+            "invalid_2fa": "Autoriza\u00e7\u00e3o por 2 factores inv\u00e1lida, por favor, tente novamente.",
+            "invalid_2fa_method": "M\u00e9todo 2FA inv\u00e1lido (verificar no telefone).",
+            "invalid_login": "Login inv\u00e1lido, por favor, tente novamente."
+        },
+        "step": {
+            "2fa": {
+                "data": {
+                    "2fa": "Pin 2FA"
+                },
+                "description": "Vazio",
+                "title": ""
+            },
+            "user": {
+                "data": {
+                    "email": "Endere\u00e7o de e-mail",
+                    "password": "Palavra-passe"
+                },
+                "description": "Vazio",
+                "title": "Login Google Hangouts"
+            }
+        },
+        "title": ""
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/homematicip_cloud/.translations/es-419.json b/homeassistant/components/homematicip_cloud/.translations/es-419.json
index 9af47289380..e15d0dbae64 100644
--- a/homeassistant/components/homematicip_cloud/.translations/es-419.json
+++ b/homeassistant/components/homematicip_cloud/.translations/es-419.json
@@ -3,6 +3,7 @@
         "abort": {
             "already_configured": "Accesspoint ya est\u00e1 configurado",
             "conection_aborted": "No se pudo conectar al servidor HMIP",
+            "connection_aborted": "No se pudo conectar al servidor HMIP",
             "unknown": "Se produjo un error desconocido."
         },
         "error": {
@@ -18,6 +19,7 @@
                     "pin": "C\u00f3digo PIN (opcional)"
                 }
             }
-        }
+        },
+        "title": "HomematicIP Cloud"
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/homematicip_cloud/.translations/fr.json b/homeassistant/components/homematicip_cloud/.translations/fr.json
new file mode 100644
index 00000000000..c10cb519133
--- /dev/null
+++ b/homeassistant/components/homematicip_cloud/.translations/fr.json
@@ -0,0 +1,21 @@
+{
+    "config": {
+        "abort": {
+            "unknown": "Une erreur inconnue s'est produite"
+        },
+        "error": {
+            "invalid_pin": "Code PIN invalide, veuillez r\u00e9essayer.",
+            "press_the_button": "Veuillez appuyer sur le bouton bleu.",
+            "register_failed": "\u00c9chec d'enregistrement. Veuillez r\u00e9essayer."
+        },
+        "step": {
+            "init": {
+                "data": {
+                    "hapid": "ID du point d'acc\u00e8s (SGTIN)",
+                    "name": "Nom (facultatif, utilis\u00e9 comme pr\u00e9fixe de nom pour tous les p\u00e9riph\u00e9riques)",
+                    "pin": "Code PIN (facultatif)"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/homematicip_cloud/.translations/it.json b/homeassistant/components/homematicip_cloud/.translations/it.json
index 2566eb25570..95e600e6d03 100644
--- a/homeassistant/components/homematicip_cloud/.translations/it.json
+++ b/homeassistant/components/homematicip_cloud/.translations/it.json
@@ -1,5 +1,13 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Il punto di accesso \u00e8 gi\u00e0 configurato",
+            "connection_aborted": "Impossibile connettersi al server HMIP"
+        },
+        "error": {
+            "press_the_button": "Si prega di premere il pulsante blu.",
+            "register_failed": "Registrazione fallita, si prega di riprovare."
+        },
         "step": {
             "init": {
                 "data": {
diff --git a/homeassistant/components/homematicip_cloud/.translations/nl.json b/homeassistant/components/homematicip_cloud/.translations/nl.json
index 23305a7e584..40d1ced5007 100644
--- a/homeassistant/components/homematicip_cloud/.translations/nl.json
+++ b/homeassistant/components/homematicip_cloud/.translations/nl.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Accesspoint is reeds geconfigureerd",
+            "already_configured": "Accesspoint is al geconfigureerd",
             "conection_aborted": "Kon geen verbinding maken met de HMIP-server",
             "connection_aborted": "Kon geen verbinding maken met de HMIP-server",
             "unknown": "Er is een onbekende fout opgetreden."
@@ -19,11 +19,11 @@
                     "name": "Naam (optioneel, gebruikt als naamprefix voor alle apparaten)",
                     "pin": "Pin-Code (optioneel)"
                 },
-                "title": "Kies HomematicIP Accesspoint"
+                "title": "Kies HomematicIP accesspoint"
             },
             "link": {
-                "description": "Druk op de blauwe knop op de accesspoint en de verzendknop om HomematicIP met de Home Assistant te registreren. \n\n![Locatie van knop op brug](/static/images/config_flows/\nconfig_homematicip_cloud.png)",
-                "title": "Link Accesspoint"
+                "description": "Druk op de blauwe knop op het accesspoint en de verzendknop om HomematicIP bij Home Assistant te registreren. \n\n![Locatie van knop op bridge](/static/images/config_flows/\nconfig_homematicip_cloud.png)",
+                "title": "Link accesspoint"
             }
         },
         "title": "HomematicIP Cloud"
diff --git a/homeassistant/components/homematicip_cloud/.translations/pt.json b/homeassistant/components/homematicip_cloud/.translations/pt.json
index 2266e83ac44..87ee494a875 100644
--- a/homeassistant/components/homematicip_cloud/.translations/pt.json
+++ b/homeassistant/components/homematicip_cloud/.translations/pt.json
@@ -3,6 +3,7 @@
         "abort": {
             "already_configured": "O ponto de acesso j\u00e1 se encontra configurado",
             "conection_aborted": "N\u00e3o foi poss\u00edvel ligar ao servidor HMIP",
+            "connection_aborted": "N\u00e3o foi poss\u00edvel ligar ao servidor HMIP",
             "unknown": "Ocorreu um erro desconhecido."
         },
         "error": {
diff --git a/homeassistant/components/hue/.translations/nl.json b/homeassistant/components/hue/.translations/nl.json
index 88c611b1633..bd065bb7506 100644
--- a/homeassistant/components/hue/.translations/nl.json
+++ b/homeassistant/components/hue/.translations/nl.json
@@ -24,6 +24,6 @@
                 "title": "Link Hub"
             }
         },
-        "title": "Philips Hue Bridge"
+        "title": "Philips Hue"
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/nest/.translations/fr.json b/homeassistant/components/nest/.translations/fr.json
new file mode 100644
index 00000000000..62a4d7deec9
--- /dev/null
+++ b/homeassistant/components/nest/.translations/fr.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "already_setup": "Vous ne pouvez configurer qu'un seul compte Nest."
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/sensor/.translations/moon.pt-BR.json b/homeassistant/components/sensor/.translations/moon.pt-BR.json
index af4cefff6e5..57d3a3e95e4 100644
--- a/homeassistant/components/sensor/.translations/moon.pt-BR.json
+++ b/homeassistant/components/sensor/.translations/moon.pt-BR.json
@@ -1,8 +1,6 @@
 {
     "state": {
-        "first_quarter": "Quarto crescente",
         "full_moon": "Cheia",
-        "last_quarter": "Quarto minguante",
         "new_moon": "Nova",
         "waning_crescent": "Minguante",
         "waning_gibbous": "Minguante gibosa",
diff --git a/homeassistant/components/sensor/.translations/moon.pt.json b/homeassistant/components/sensor/.translations/moon.pt.json
new file mode 100644
index 00000000000..14961ab98f0
--- /dev/null
+++ b/homeassistant/components/sensor/.translations/moon.pt.json
@@ -0,0 +1,12 @@
+{
+    "state": {
+        "first_quarter": "Quarto crescente",
+        "full_moon": "Lua cheia",
+        "last_quarter": "Quarto minguante",
+        "new_moon": "Lua nova",
+        "waning_crescent": "Lua crescente",
+        "waning_gibbous": "Minguante convexa",
+        "waxing_crescent": "Lua minguante",
+        "waxing_gibbous": "Crescente convexa"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/sonos/.translations/de.json b/homeassistant/components/sonos/.translations/de.json
index d0587036d24..dd44fca5888 100644
--- a/homeassistant/components/sonos/.translations/de.json
+++ b/homeassistant/components/sonos/.translations/de.json
@@ -6,7 +6,7 @@
         },
         "step": {
             "confirm": {
-                "description": "M\u00f6chten Sie Sonos konfigurieren?",
+                "description": "M\u00f6chten Sie Sonos einrichten?",
                 "title": "Sonos"
             }
         },

From 2c7d6ee6b538de16e0de4c93b0667faf4d934a33 Mon Sep 17 00:00:00 2001
From: Daniel Perna <danielperna84@gmail.com>
Date: Sat, 1 Sep 2018 10:40:16 +0200
Subject: [PATCH 007/357] Fix missing humidity sensor (#16337)

---
 homeassistant/components/homematic/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/components/homematic/__init__.py b/homeassistant/components/homematic/__init__.py
index 53c8e267016..2b517652ad7 100644
--- a/homeassistant/components/homematic/__init__.py
+++ b/homeassistant/components/homematic/__init__.py
@@ -77,7 +77,7 @@ HM_DEVICE_TYPES = {
         'FillingLevel', 'ValveDrive', 'EcoLogic', 'IPThermostatWall',
         'IPSmoke', 'RFSiren', 'PresenceIP', 'IPAreaThermostat',
         'IPWeatherSensor', 'RotaryHandleSensorIP', 'IPPassageSensor',
-        'IPKeySwitchPowermeter'],
+        'IPKeySwitchPowermeter', 'IPThermostatWall230V'],
     DISCOVER_CLIMATE: [
         'Thermostat', 'ThermostatWall', 'MAXThermostat', 'ThermostatWall2',
         'MAXWallThermostat', 'IPThermostat', 'IPThermostatWall',

From 901cfef78e5961cf88055b2d01be39773df567d2 Mon Sep 17 00:00:00 2001
From: Philipp Temminghoff <phil65@kodi.tv>
Date: Sat, 1 Sep 2018 16:02:38 +0200
Subject: [PATCH 008/357] Support Sonos Beam HDMI input (#16340)

---
 homeassistant/components/media_player/sonos.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/homeassistant/components/media_player/sonos.py b/homeassistant/components/media_player/sonos.py
index 4fc6b8b0954..456252aded4 100644
--- a/homeassistant/components/media_player/sonos.py
+++ b/homeassistant/components/media_player/sonos.py
@@ -884,6 +884,8 @@ class SonosDevice(MediaPlayerDevice):
             sources += [SOURCE_LINEIN]
         elif 'PLAYBAR' in model:
             sources += [SOURCE_LINEIN, SOURCE_TV]
+        elif 'BEAM' in model:
+            sources += [SOURCE_TV]
 
         return sources
 

From a5d95dfbdcf0d9ca3da93f44e2cbb5d162ac3272 Mon Sep 17 00:00:00 2001
From: Phil Bruckner <pnbruckner@gmail.com>
Date: Sat, 1 Sep 2018 11:49:03 -0500
Subject: [PATCH 009/357] Make last_seen attribute a timezone aware datetime in
 UTC (#16348)

The last_seen attribute was a datetime in the local timezone but with
no tzinfo (i.e., a "naive" datetime.) When state changes occurred it
would be printed incorrectly in homeassistant.log because
homeassistant.util.dt.as_local assumes any datetime without tzinfo is
UTC. Also most, if not all, datetime attributes are timezone aware in
UTC. So use homeassistant.util.dt.as_utc (which assumes a naive
datetime is local) to convert last_seen to a timezone aware datetime
in UTC.
---
 homeassistant/components/device_tracker/google_maps.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/device_tracker/google_maps.py b/homeassistant/components/device_tracker/google_maps.py
index 8c21e71bd30..170d3de6800 100644
--- a/homeassistant/components/device_tracker/google_maps.py
+++ b/homeassistant/components/device_tracker/google_maps.py
@@ -15,7 +15,7 @@ from homeassistant.const import ATTR_ID, CONF_PASSWORD, CONF_USERNAME
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.event import track_time_interval
 from homeassistant.helpers.typing import ConfigType
-from homeassistant.util import slugify
+from homeassistant.util import slugify, dt as dt_util
 
 REQUIREMENTS = ['locationsharinglib==2.0.11']
 
@@ -92,7 +92,7 @@ class GoogleMapsScanner:
                 ATTR_ADDRESS: person.address,
                 ATTR_FULL_NAME: person.full_name,
                 ATTR_ID: person.id,
-                ATTR_LAST_SEEN: person.datetime,
+                ATTR_LAST_SEEN: dt_util.as_utc(person.datetime),
                 ATTR_NICKNAME: person.nickname,
             }
             self.see(

From b31890c4cbc18ec98ae92e3caefa5f88f6532367 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=B8yer=20Iversen?= <mail@dahoiv.net>
Date: Sat, 1 Sep 2018 23:30:34 +0200
Subject: [PATCH 010/357] Handle netatmo exception (#16344)

---
 homeassistant/components/sensor/netatmo.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/sensor/netatmo.py b/homeassistant/components/sensor/netatmo.py
index 5216913528a..f709e0169cf 100644
--- a/homeassistant/components/sensor/netatmo.py
+++ b/homeassistant/components/sensor/netatmo.py
@@ -317,7 +317,11 @@ class NetAtmoData:
 
         try:
             import pyatmo
-            self.station_data = pyatmo.WeatherStationData(self.auth)
+            try:
+                self.station_data = pyatmo.WeatherStationData(self.auth)
+            except TypeError:
+                _LOGGER.error("Failed to connect to NetAtmo")
+                return  # finally statement will be executed
 
             if self.station is not None:
                 self.data = self.station_data.lastData(

From 444df5b09a9a853beb20b25fae6c3e7b7349f786 Mon Sep 17 00:00:00 2001
From: Joshi <42069141+Joshi425@users.noreply.github.com>
Date: Sat, 1 Sep 2018 23:34:38 +0200
Subject: [PATCH 011/357] Add support for sound_mode for Yamaha rxv
 media_player (#16352)

---
 .../components/media_player/yamaha.py         | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/media_player/yamaha.py b/homeassistant/components/media_player/yamaha.py
index 2ffe58b02af..be6df547f1d 100644
--- a/homeassistant/components/media_player/yamaha.py
+++ b/homeassistant/components/media_player/yamaha.py
@@ -14,7 +14,7 @@ from homeassistant.components.media_player import (
     SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PLAY, SUPPORT_PLAY_MEDIA,
     SUPPORT_PREVIOUS_TRACK, SUPPORT_SELECT_SOURCE, SUPPORT_STOP,
     SUPPORT_TURN_OFF, SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET,
-    MediaPlayerDevice)
+    SUPPORT_SELECT_SOUND_MODE, MediaPlayerDevice)
 from homeassistant.const import (
     ATTR_ENTITY_ID, CONF_HOST, CONF_NAME, STATE_IDLE, STATE_OFF, STATE_ON,
     STATE_PLAYING)
@@ -43,7 +43,8 @@ ENABLE_OUTPUT_SCHEMA = MEDIA_PLAYER_SCHEMA.extend({
 SERVICE_ENABLE_OUTPUT = 'yamaha_enable_output'
 
 SUPPORT_YAMAHA = SUPPORT_VOLUME_SET | SUPPORT_VOLUME_MUTE | \
-    SUPPORT_TURN_ON | SUPPORT_TURN_OFF | SUPPORT_SELECT_SOURCE | SUPPORT_PLAY
+    SUPPORT_TURN_ON | SUPPORT_TURN_OFF | SUPPORT_SELECT_SOURCE | SUPPORT_PLAY \
+    | SUPPORT_SELECT_SOUND_MODE
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
@@ -140,6 +141,8 @@ class YamahaDevice(MediaPlayerDevice):
         self._volume = 0
         self._pwstate = STATE_OFF
         self._current_source = None
+        self._sound_mode = None
+        self._sound_mode_list = None
         self._source_list = None
         self._source_ignore = source_ignore or []
         self._source_names = source_names or {}
@@ -181,6 +184,8 @@ class YamahaDevice(MediaPlayerDevice):
         self._playback_support = self.receiver.get_playback_support()
         self._is_playback_supported = self.receiver.is_playback_supported(
             self._current_source)
+        self._sound_mode = self.receiver.surround_program
+        self._sound_mode_list = self.receiver.surround_programs()
 
     def build_source_list(self):
         """Build the source list."""
@@ -222,6 +227,16 @@ class YamahaDevice(MediaPlayerDevice):
         """Return the current input source."""
         return self._current_source
 
+    @property
+    def sound_mode(self):
+        """Return the current sound mode."""
+        return self._sound_mode
+
+    @property
+    def sound_mode_list(self):
+        """Return the current sound mode."""
+        return self._sound_mode_list
+
     @property
     def source_list(self):
         """List of available input sources."""
@@ -330,6 +345,10 @@ class YamahaDevice(MediaPlayerDevice):
         """Enable or disable an output port.."""
         self.receiver.enable_output(port, enabled)
 
+    def select_sound_mode(self, sound_mode):
+        """Set Sound Mode for Receiver.."""
+        self.receiver.surround_program = sound_mode
+
     @property
     def media_artist(self):
         """Artist of current playing media."""

From e75a1690d14ac23ae40db11a4cfb6afe085f4ab2 Mon Sep 17 00:00:00 2001
From: Maciej Bieniek <bieniu@users.noreply.github.com>
Date: Sat, 1 Sep 2018 23:37:03 +0200
Subject: [PATCH 012/357] Add unique_id to MQTT Light (#16303)

* Add unique_id

* Delete whitespaces
---
 homeassistant/components/light/mqtt.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/light/mqtt.py b/homeassistant/components/light/mqtt.py
index 225f0f510ad..64331411f7f 100644
--- a/homeassistant/components/light/mqtt.py
+++ b/homeassistant/components/light/mqtt.py
@@ -54,6 +54,7 @@ CONF_WHITE_VALUE_SCALE = 'white_value_scale'
 CONF_WHITE_VALUE_STATE_TOPIC = 'white_value_state_topic'
 CONF_WHITE_VALUE_TEMPLATE = 'white_value_template'
 CONF_ON_COMMAND_TYPE = 'on_command_type'
+CONF_UNIQUE_ID = 'unique_id'
 
 DEFAULT_BRIGHTNESS_SCALE = 255
 DEFAULT_NAME = 'MQTT Light'
@@ -79,6 +80,7 @@ PLATFORM_SCHEMA = mqtt.MQTT_RW_PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_EFFECT_STATE_TOPIC): mqtt.valid_subscribe_topic,
     vol.Optional(CONF_EFFECT_VALUE_TEMPLATE): cv.template,
     vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_UNIQUE_ID): cv.string,
     vol.Optional(CONF_OPTIMISTIC, default=DEFAULT_OPTIMISTIC): cv.boolean,
     vol.Optional(CONF_PAYLOAD_OFF, default=DEFAULT_PAYLOAD_OFF): cv.string,
     vol.Optional(CONF_PAYLOAD_ON, default=DEFAULT_PAYLOAD_ON): cv.string,
@@ -111,6 +113,7 @@ async def async_setup_platform(hass, config, async_add_entities,
 
     async_add_entities([MqttLight(
         config.get(CONF_NAME),
+        config.get(CONF_UNIQUE_ID),
         config.get(CONF_EFFECT_LIST),
         {
             key: config.get(key) for key in (
@@ -159,14 +162,15 @@ async def async_setup_platform(hass, config, async_add_entities,
 class MqttLight(MqttAvailability, Light):
     """Representation of a MQTT light."""
 
-    def __init__(self, name, effect_list, topic, templates, qos,
-                 retain, payload, optimistic, brightness_scale,
+    def __init__(self, name, unique_id, effect_list, topic, templates,
+                 qos, retain, payload, optimistic, brightness_scale,
                  white_value_scale, on_command_type, availability_topic,
                  payload_available, payload_not_available):
         """Initialize MQTT light."""
         super().__init__(availability_topic, qos, payload_available,
                          payload_not_available)
         self._name = name
+        self._unique_id = unique_id
         self._effect_list = effect_list
         self._topic = topic
         self._qos = qos
@@ -392,6 +396,11 @@ class MqttLight(MqttAvailability, Light):
         """Return the name of the device if any."""
         return self._name
 
+    @property
+    def unique_id(self):
+        """Return a unique ID."""
+        return self._unique_id
+
     @property
     def is_on(self):
         """Return true if device is on."""

From 2b0b431a2a5a6e1c0aa7862ee6e84c684b4db18b Mon Sep 17 00:00:00 2001
From: Jesse Rizzo <32472573+jesserizzo@users.noreply.github.com>
Date: Sat, 1 Sep 2018 16:45:47 -0500
Subject: [PATCH 013/357] Update to EnvoyReader 0.2, support for more hardware
 (#16212)

* Add support for older Envoy models

* Stop requiring envoy model name in config

* Update to envoy_reader0.2

* Minor formatting fixes

* run script/gen_requirements_all.py

* Minor formatting fixes

* Change some strings to constants, use getattr to call function
---
 .../components/sensor/enphase_envoy.py        | 35 +++++--------------
 requirements_all.txt                          |  2 +-
 2 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/homeassistant/components/sensor/enphase_envoy.py b/homeassistant/components/sensor/enphase_envoy.py
index 6afe887537c..7f8cff0f885 100644
--- a/homeassistant/components/sensor/enphase_envoy.py
+++ b/homeassistant/components/sensor/enphase_envoy.py
@@ -14,25 +14,27 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.const import (CONF_IP_ADDRESS, CONF_MONITORED_CONDITIONS)
 
 
-REQUIREMENTS = ['envoy_reader==0.1']
+REQUIREMENTS = ['envoy_reader==0.2']
 _LOGGER = logging.getLogger(__name__)
 
 SENSORS = {
     "production": ("Envoy Current Energy Production", 'W'),
     "daily_production": ("Envoy Today's Energy Production", "Wh"),
-    "7_days_production": ("Envoy Last Seven Days Energy Production", "Wh"),
+    "seven_days_production": ("Envoy Last Seven Days Energy Production", "Wh"),
     "lifetime_production": ("Envoy Lifetime Energy Production", "Wh"),
     "consumption": ("Envoy Current Energy Consumption", "W"),
     "daily_consumption": ("Envoy Today's Energy Consumption", "Wh"),
-    "7_days_consumption": ("Envoy Last Seven Days Energy Consumption", "Wh"),
+    "seven_days_consumption": ("Envoy Last Seven Days Energy Consumption",
+                               "Wh"),
     "lifetime_consumption": ("Envoy Lifetime Energy Consumption", "Wh")
     }
 
 
 ICON = 'mdi:flash'
+CONST_DEFAULT_HOST = "envoy"
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Required(CONF_IP_ADDRESS): cv.string,
+    vol.Optional(CONF_IP_ADDRESS, default=CONST_DEFAULT_HOST): cv.string,
     vol.Optional(CONF_MONITORED_CONDITIONS, default=list(SENSORS)):
         vol.All(cv.ensure_list, [vol.In(list(SENSORS))])})
 
@@ -81,27 +83,6 @@ class Envoy(Entity):
 
     def update(self):
         """Get the energy production data from the Enphase Envoy."""
-        import envoy_reader
+        from envoy_reader import EnvoyReader
 
-        if self._type == "production":
-            self._state = int(envoy_reader.production(self._ip_address))
-        elif self._type == "daily_production":
-            self._state = int(envoy_reader.daily_production(self._ip_address))
-        elif self._type == "7_days_production":
-            self._state = int(envoy_reader.seven_days_production(
-                self._ip_address))
-        elif self._type == "lifetime_production":
-            self._state = int(envoy_reader.lifetime_production(
-                self._ip_address))
-
-        elif self._type == "consumption":
-            self._state = int(envoy_reader.consumption(self._ip_address))
-        elif self._type == "daily_consumption":
-            self._state = int(envoy_reader.daily_consumption(
-                self._ip_address))
-        elif self._type == "7_days_consumption":
-            self._state = int(envoy_reader.seven_days_consumption(
-                self._ip_address))
-        elif self._type == "lifetime_consumption":
-            self._state = int(envoy_reader.lifetime_consumption(
-                self._ip_address))
+        self._state = getattr(EnvoyReader(self._ip_address), self._type)()
diff --git a/requirements_all.txt b/requirements_all.txt
index ff95a8fc2ad..8c2080d12fa 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -321,7 +321,7 @@ enocean==0.40
 # envirophat==0.0.6
 
 # homeassistant.components.sensor.enphase_envoy
-envoy_reader==0.1
+envoy_reader==0.2
 
 # homeassistant.components.sensor.season
 ephem==3.7.6.0

From 3797b6b012b79e384e20fecd9786a539b6941b22 Mon Sep 17 00:00:00 2001
From: Tod Schmidt <tschmidty@yahoo.com>
Date: Sat, 1 Sep 2018 18:01:11 -0400
Subject: [PATCH 014/357] Snips: Added special slot values, session_id and
 slotname_raw (#16185)

* Added special slot values, site_id, session_id, and slotname_raw

* Update snips.py
---
 homeassistant/components/snips.py |  3 +++
 tests/components/test_snips.py    | 17 +++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/homeassistant/components/snips.py b/homeassistant/components/snips.py
index 34290819106..88a93408056 100644
--- a/homeassistant/components/snips.py
+++ b/homeassistant/components/snips.py
@@ -131,7 +131,10 @@ async def async_setup(hass, config):
         slots = {}
         for slot in request.get('slots', []):
             slots[slot['slotName']] = {'value': resolve_slot_values(slot)}
+            slots['{}_raw'.format(slot['slotName'])] = {
+                'value': slot['rawValue']}
         slots['site_id'] = {'value': request.get('siteId')}
+        slots['session_id'] = {'value': request.get('sessionId')}
         slots['probability'] = {'value': request['intent']['probability']}
 
         try:
diff --git a/tests/components/test_snips.py b/tests/components/test_snips.py
index baeda2c49a8..bc044999bdd 100644
--- a/tests/components/test_snips.py
+++ b/tests/components/test_snips.py
@@ -93,6 +93,8 @@ async def test_snips_intent(hass, mqtt_mock):
     assert result
     payload = """
     {
+        "siteId": "default",
+        "sessionId": "1234567890ABCDEF",
         "input": "turn the lights green",
         "intent": {
             "intentName": "Lights",
@@ -104,7 +106,8 @@ async def test_snips_intent(hass, mqtt_mock):
                 "value": {
                     "kind": "Custom",
                     "value": "green"
-                }
+                },
+                "rawValue": "green"
             }
         ]
     }
@@ -119,9 +122,12 @@ async def test_snips_intent(hass, mqtt_mock):
     intent = intents[0]
     assert intent.platform == 'snips'
     assert intent.intent_type == 'Lights'
+    assert intent
     assert intent.slots == {'light_color': {'value': 'green'},
+                            'light_color_raw': {'value': 'green'},
                             'probability': {'value': 1},
-                            'site_id': {'value': None}}
+                            'site_id': {'value': 'default'},
+                            'session_id': {'value': '1234567890ABCDEF'}}
     assert intent.text_input == 'turn the lights green'
 
 
@@ -147,7 +153,8 @@ async def test_snips_service_intent(hass, mqtt_mock):
                 "value": {
                     "kind": "Custom",
                     "value": "kitchen"
-                }
+                },
+                "rawValue": "green"
             }
         ]
     }
@@ -217,7 +224,9 @@ async def test_snips_intent_with_duration(hass, mqtt_mock):
     assert intent.intent_type == 'SetTimer'
     assert intent.slots == {'probability': {'value': 1},
                             'site_id': {'value': None},
-                            'timer_duration': {'value': 300}}
+                            'session_id': {'value': None},
+                            'timer_duration': {'value': 300},
+                            'timer_duration_raw': {'value': 'five minutes'}}
 
 
 async def test_intent_speech_response(hass, mqtt_mock):

From 87eb6cd25a9bd100f707b9e2970cdd325cbef68d Mon Sep 17 00:00:00 2001
From: Jason Hu <awarecan@users.noreply.github.com>
Date: Sun, 2 Sep 2018 03:50:30 -0700
Subject: [PATCH 015/357] Upgrade hbmqtt to 0.9.4 (#16356)

* Upgrade to hbmqtt 0.9.4

* Lint

* Typo
---
 homeassistant/components/mqtt/server.py | 2 +-
 requirements_all.txt                    | 2 +-
 requirements_test_all.txt               | 2 +-
 tests/components/mqtt/test_server.py    | 6 ------
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/homeassistant/components/mqtt/server.py b/homeassistant/components/mqtt/server.py
index 5fc365342ae..57da85fe5f6 100644
--- a/homeassistant/components/mqtt/server.py
+++ b/homeassistant/components/mqtt/server.py
@@ -13,7 +13,7 @@ import voluptuous as vol
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP
 import homeassistant.helpers.config_validation as cv
 
-REQUIREMENTS = ['hbmqtt==0.9.2']
+REQUIREMENTS = ['hbmqtt==0.9.4']
 DEPENDENCIES = ['http']
 
 # None allows custom config to be created through generate_config
diff --git a/requirements_all.txt b/requirements_all.txt
index 8c2080d12fa..db244cc8cfb 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -430,7 +430,7 @@ hangups==0.4.5
 haversine==0.4.5
 
 # homeassistant.components.mqtt.server
-hbmqtt==0.9.2
+hbmqtt==0.9.4
 
 # homeassistant.components.climate.heatmiser
 heatmiserV3==0.9.1
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index bd921085461..446e3d056a3 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -78,7 +78,7 @@ hangups==0.4.5
 haversine==0.4.5
 
 # homeassistant.components.mqtt.server
-hbmqtt==0.9.2
+hbmqtt==0.9.4
 
 # homeassistant.components.binary_sensor.workday
 holidays==0.9.6
diff --git a/tests/components/mqtt/test_server.py b/tests/components/mqtt/test_server.py
index c761c47542f..976fdd3d15c 100644
--- a/tests/components/mqtt/test_server.py
+++ b/tests/components/mqtt/test_server.py
@@ -1,8 +1,5 @@
 """The tests for the MQTT component embedded server."""
 from unittest.mock import Mock, MagicMock, patch
-import sys
-
-import pytest
 
 from homeassistant.const import CONF_PASSWORD
 from homeassistant.setup import setup_component
@@ -11,9 +8,6 @@ import homeassistant.components.mqtt as mqtt
 from tests.common import get_test_home_assistant, mock_coro
 
 
-# Until https://github.com/beerfactory/hbmqtt/pull/139 is released
-@pytest.mark.skipif(sys.version_info[:2] >= (3, 7),
-                    reason='Package incompatible with Python 3.7')
 class TestMQTT:
     """Test the MQTT component."""
 

From 03fb2b32a6a8ef6becbab41237bf6720ae94838d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 2 Sep 2018 12:51:07 +0200
Subject: [PATCH 016/357] Upgrade Sphinx to 1.7.7 (#16359)

---
 requirements_docs.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements_docs.txt b/requirements_docs.txt
index a7436cad2fc..e26c97887b7 100644
--- a/requirements_docs.txt
+++ b/requirements_docs.txt
@@ -1,3 +1,3 @@
-Sphinx==1.7.6
+Sphinx==1.7.7
 sphinx-autodoc-typehints==1.3.0
 sphinx-autodoc-annotation==1.0.post1

From 15ad82b9bdc384beb3fa8b31c9c39ad9372ec865 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 2 Sep 2018 12:51:25 +0200
Subject: [PATCH 017/357] Upgrade qnapstats to 0.2.7 (#16360)

---
 homeassistant/components/sensor/qnap.py | 4 ++--
 requirements_all.txt                    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/sensor/qnap.py b/homeassistant/components/sensor/qnap.py
index 22f8d4c37c0..29eb8cd6749 100644
--- a/homeassistant/components/sensor/qnap.py
+++ b/homeassistant/components/sensor/qnap.py
@@ -17,7 +17,7 @@ from homeassistant.const import (
 from homeassistant.util import Throttle
 import homeassistant.helpers.config_validation as cv
 
-REQUIREMENTS = ['qnapstats==0.2.6']
+REQUIREMENTS = ['qnapstats==0.2.7']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -173,7 +173,7 @@ class QNAPStatsAPI:
 
         protocol = "https" if config.get(CONF_SSL) else "http"
         self._api = QNAPStats(
-            protocol + "://" + config.get(CONF_HOST),
+            '{}://{}'.format(protocol, config.get(CONF_HOST)),
             config.get(CONF_PORT),
             config.get(CONF_USERNAME),
             config.get(CONF_PASSWORD),
diff --git a/requirements_all.txt b/requirements_all.txt
index db244cc8cfb..49fc3b42466 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1217,7 +1217,7 @@ pyxeoma==1.4.0
 pyzabbix==0.7.4
 
 # homeassistant.components.sensor.qnap
-qnapstats==0.2.6
+qnapstats==0.2.7
 
 # homeassistant.components.rachio
 rachiopy==0.1.3

From 1d12c7b0e7d30348e9f5f5cf7e52eecffba91a6d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 2 Sep 2018 12:51:36 +0200
Subject: [PATCH 018/357] Upgrade mutagen to 1.41.1 (#16361)

---
 homeassistant/components/tts/__init__.py | 12 ++++++------
 requirements_all.txt                     |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/homeassistant/components/tts/__init__.py b/homeassistant/components/tts/__init__.py
index f060c9f353a..2ec9a2ab801 100644
--- a/homeassistant/components/tts/__init__.py
+++ b/homeassistant/components/tts/__init__.py
@@ -29,7 +29,7 @@ from homeassistant.helpers import config_per_platform
 import homeassistant.helpers.config_validation as cv
 from homeassistant.setup import async_prepare_setup_platform
 
-REQUIREMENTS = ['mutagen==1.41.0']
+REQUIREMENTS = ['mutagen==1.41.1']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -69,8 +69,8 @@ PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({
 
 SCHEMA_SERVICE_SAY = vol.Schema({
     vol.Required(ATTR_MESSAGE): cv.string,
-    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
     vol.Optional(ATTR_CACHE): cv.boolean,
+    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
     vol.Optional(ATTR_LANGUAGE): cv.string,
     vol.Optional(ATTR_OPTIONS): dict,
 })
@@ -117,7 +117,7 @@ async def async_setup(hass, config):
 
             tts.async_register_engine(p_type, provider, p_config)
         except Exception:  # pylint: disable=broad-except
-            _LOGGER.exception("Error setting up platform %s", p_type)
+            _LOGGER.exception("Error setting up platform: %s", p_type)
             return
 
         async def async_say_handle(service):
@@ -134,7 +134,7 @@ async def async_setup(hass, config):
                     options=options
                 )
             except HomeAssistantError as err:
-                _LOGGER.error("Error on init tts: %s", err)
+                _LOGGER.error("Error on init TTS: %s", err)
                 return
 
             data = {
@@ -302,8 +302,8 @@ class SpeechManager:
         return "{}/api/tts_proxy/{}".format(
             self.hass.config.api.base_url, filename)
 
-    async def async_get_tts_audio(self, engine, key, message, cache, language,
-                                  options):
+    async def async_get_tts_audio(
+            self, engine, key, message, cache, language, options):
         """Receive TTS and store for view in cache.
 
         This method is a coroutine.
diff --git a/requirements_all.txt b/requirements_all.txt
index 49fc3b42466..64a9d6bc133 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -585,7 +585,7 @@ mitemp_bt==0.0.1
 motorparts==1.0.2
 
 # homeassistant.components.tts
-mutagen==1.41.0
+mutagen==1.41.1
 
 # homeassistant.components.mychevy
 mychevy==0.4.0

From 97695a30f5f9af6ffd4a399d404290a97fb428ae Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 2 Sep 2018 12:51:56 +0200
Subject: [PATCH 019/357] Upgrade shodan to 1.10.0 (#16363)

---
 homeassistant/components/sensor/shodan.py | 2 +-
 requirements_all.txt                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/sensor/shodan.py b/homeassistant/components/sensor/shodan.py
index fd462d6811c..cfafcb67608 100644
--- a/homeassistant/components/sensor/shodan.py
+++ b/homeassistant/components/sensor/shodan.py
@@ -14,7 +14,7 @@ from homeassistant.components.sensor import PLATFORM_SCHEMA
 from homeassistant.const import ATTR_ATTRIBUTION, CONF_API_KEY, CONF_NAME
 from homeassistant.helpers.entity import Entity
 
-REQUIREMENTS = ['shodan==1.9.1']
+REQUIREMENTS = ['shodan==1.10.0']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/requirements_all.txt b/requirements_all.txt
index 64a9d6bc133..1781a70c6ca 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1290,7 +1290,7 @@ sense_energy==0.4.1
 sharp_aquos_rc==0.3.2
 
 # homeassistant.components.sensor.shodan
-shodan==1.9.1
+shodan==1.10.0
 
 # homeassistant.components.notify.simplepush
 simplepush==1.1.4

From 52e922171daa5ea9ff7f33651d6c1b650c918b61 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 2 Sep 2018 14:33:20 +0200
Subject: [PATCH 020/357] Upgrade to youtube_dl to 2018.09.01 (#16365)

---
 homeassistant/components/media_extractor.py | 2 +-
 requirements_all.txt                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/media_extractor.py b/homeassistant/components/media_extractor.py
index 8f2abb9be19..f6e982a77ef 100644
--- a/homeassistant/components/media_extractor.py
+++ b/homeassistant/components/media_extractor.py
@@ -14,7 +14,7 @@ from homeassistant.components.media_player import (
     SERVICE_PLAY_MEDIA)
 from homeassistant.helpers import config_validation as cv
 
-REQUIREMENTS = ['youtube_dl==2018.08.22']
+REQUIREMENTS = ['youtube_dl==2018.09.01']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/requirements_all.txt b/requirements_all.txt
index 1781a70c6ca..b2ac021d61e 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1512,7 +1512,7 @@ yeelight==0.4.0
 yeelightsunflower==0.0.10
 
 # homeassistant.components.media_extractor
-youtube_dl==2018.08.22
+youtube_dl==2018.09.01
 
 # homeassistant.components.light.zengge
 zengge==0.2

From 357e5eadb87a5fd8159c98ea17f1335ed5cf374a Mon Sep 17 00:00:00 2001
From: MarcSN311 <github@marcsn.de>
Date: Sun, 2 Sep 2018 15:51:15 +0200
Subject: [PATCH 021/357] Added 'nomapnt', 'outcurnt', 'loadapnt' fields
 (#16176)

* Added 'nomapnt', 'outcurnt', 'loadapnt' fields

Also added Ampere and Volt-Ampere to INFERRED_UNITS

* Fix lint issue
---
 homeassistant/components/sensor/apcupsd.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/homeassistant/components/sensor/apcupsd.py b/homeassistant/components/sensor/apcupsd.py
index 897f0626b7c..90c1f2e6795 100644
--- a/homeassistant/components/sensor/apcupsd.py
+++ b/homeassistant/components/sensor/apcupsd.py
@@ -49,6 +49,7 @@ SENSOR_TYPES = {
     'linefreq': ['Line Frequency', 'Hz', 'mdi:information-outline'],
     'linev': ['Input Voltage', 'V', 'mdi:flash'],
     'loadpct': ['Load', '%', 'mdi:gauge'],
+    'loadapnt': ['Load Apparent Power', '%', 'mdi:gauge'],
     'lotrans': ['Transfer Low', 'V', 'mdi:flash'],
     'mandate': ['Manufacture Date', '', 'mdi:calendar'],
     'masterupd': ['Master Update', '', 'mdi:information-outline'],
@@ -62,7 +63,9 @@ SENSOR_TYPES = {
     'nominv': ['Nominal Input Voltage', 'V', 'mdi:flash'],
     'nomoutv': ['Nominal Output Voltage', 'V', 'mdi:flash'],
     'nompower': ['Nominal Output Power', 'W', 'mdi:flash'],
+    'nomapnt': ['Nominal Apparent Power', 'VA', 'mdi:flash'],
     'numxfers': ['Transfer Count', '', 'mdi:counter'],
+    'outcurnt': ['Output Current', 'A', 'mdi:flash'],
     'outputv': ['Output Voltage', 'V', 'mdi:flash'],
     'reg1': ['Register 1 Fault', '', 'mdi:information-outline'],
     'reg2': ['Register 2 Fault', '', 'mdi:information-outline'],
@@ -93,6 +96,8 @@ INFERRED_UNITS = {
     ' Seconds': 'sec',
     ' Percent': '%',
     ' Volts': 'V',
+    ' Ampere': 'A',
+    ' Volt-Ampere': 'VA',
     ' Watts': 'W',
     ' Hz': 'Hz',
     ' C': TEMP_CELSIUS,

From b29c296ced611231ec8000d2cbe8425b4c130eae Mon Sep 17 00:00:00 2001
From: Lev Aronsky <aronsky@gmail.com>
Date: Sun, 2 Sep 2018 17:42:08 +0300
Subject: [PATCH 022/357] Generic Thermostat: add support for
 climate.turn_on/climate.turn_off (#16080)

* Added async_turn_on and async_turn_off implementations.

* Added turning on/off tests to generic thermostat

* style

* style

* style
---
 .../components/climate/generic_thermostat.py  |  8 ++
 .../climate/test_generic_thermostat.py        | 85 +++++++++++++++++++
 2 files changed, 93 insertions(+)

diff --git a/homeassistant/components/climate/generic_thermostat.py b/homeassistant/components/climate/generic_thermostat.py
index fec18329878..85879b8122a 100644
--- a/homeassistant/components/climate/generic_thermostat.py
+++ b/homeassistant/components/climate/generic_thermostat.py
@@ -251,6 +251,14 @@ class GenericThermostat(ClimateDevice):
         # Ensure we update the current operation after changing the mode
         self.schedule_update_ha_state()
 
+    async def async_turn_on(self):
+        """Turn thermostat on."""
+        await self.async_set_operation_mode(self.operation_list[0])
+
+    async def async_turn_off(self):
+        """Turn thermostat off."""
+        await self.async_set_operation_mode(STATE_OFF)
+
     async def async_set_temperature(self, **kwargs):
         """Set new target temperature."""
         temperature = kwargs.get(ATTR_TEMPERATURE)
diff --git a/tests/components/climate/test_generic_thermostat.py b/tests/components/climate/test_generic_thermostat.py
index ac587db13fa..c4e07705230 100644
--- a/tests/components/climate/test_generic_thermostat.py
+++ b/tests/components/climate/test_generic_thermostat.py
@@ -21,6 +21,7 @@ from homeassistant import loader
 from homeassistant.util.unit_system import METRIC_SYSTEM
 from homeassistant.util.async_ import run_coroutine_threadsafe
 from homeassistant.components import climate, input_boolean, switch
+from homeassistant.components.climate import STATE_HEAT, STATE_COOL
 import homeassistant.components as comps
 from tests.common import (assert_setup_component, get_test_home_assistant,
                           mock_restore_cache)
@@ -894,6 +895,90 @@ class TestClimateGenericThermostatKeepAlive(unittest.TestCase):
         self.hass.services.register(ha.DOMAIN, SERVICE_TURN_OFF, log_call)
 
 
+class TestClimateGenericThermostatTurnOnOff(unittest.TestCase):
+    """Test the Generic Thermostat."""
+
+    HEAT_ENTITY = 'climate.test_heat'
+    COOL_ENTITY = 'climate.test_cool'
+
+    def setUp(self):  # pylint: disable=invalid-name
+        """Set up things to be run when tests are started."""
+        self.hass = get_test_home_assistant()
+        assert setup_component(self.hass, climate.DOMAIN, {'climate': [
+            {
+                'platform': 'generic_thermostat',
+                'name': 'test_heat',
+                'heater': ENT_SWITCH,
+                'target_sensor': ENT_SENSOR
+            },
+            {
+                'platform': 'generic_thermostat',
+                'name': 'test_cool',
+                'heater': ENT_SWITCH,
+                'ac_mode': True,
+                'target_sensor': ENT_SENSOR
+            }
+        ]})
+
+    def tearDown(self):  # pylint: disable=invalid-name
+        """Stop down everything that was started."""
+        self.hass.stop()
+
+    def test_turn_on_when_off(self):
+        """Test if climate.turn_on turns on a turned off device."""
+        climate.set_operation_mode(self.hass, STATE_OFF)
+        self.hass.block_till_done()
+        self.hass.services.call('climate', SERVICE_TURN_ON)
+        self.hass.block_till_done()
+        state_heat = self.hass.states.get(self.HEAT_ENTITY)
+        state_cool = self.hass.states.get(self.COOL_ENTITY)
+        self.assertEqual(STATE_HEAT,
+                         state_heat.attributes.get('operation_mode'))
+        self.assertEqual(STATE_COOL,
+                         state_cool.attributes.get('operation_mode'))
+
+    def test_turn_on_when_on(self):
+        """Test if climate.turn_on does nothing to a turned on device."""
+        climate.set_operation_mode(self.hass, STATE_HEAT, self.HEAT_ENTITY)
+        climate.set_operation_mode(self.hass, STATE_COOL, self.COOL_ENTITY)
+        self.hass.block_till_done()
+        self.hass.services.call('climate', SERVICE_TURN_ON)
+        self.hass.block_till_done()
+        state_heat = self.hass.states.get(self.HEAT_ENTITY)
+        state_cool = self.hass.states.get(self.COOL_ENTITY)
+        self.assertEqual(STATE_HEAT,
+                         state_heat.attributes.get('operation_mode'))
+        self.assertEqual(STATE_COOL,
+                         state_cool.attributes.get('operation_mode'))
+
+    def test_turn_off_when_on(self):
+        """Test if climate.turn_off turns off a turned on device."""
+        climate.set_operation_mode(self.hass, STATE_HEAT, self.HEAT_ENTITY)
+        climate.set_operation_mode(self.hass, STATE_COOL, self.COOL_ENTITY)
+        self.hass.block_till_done()
+        self.hass.services.call('climate', SERVICE_TURN_OFF)
+        self.hass.block_till_done()
+        state_heat = self.hass.states.get(self.HEAT_ENTITY)
+        state_cool = self.hass.states.get(self.COOL_ENTITY)
+        self.assertEqual(STATE_OFF,
+                         state_heat.attributes.get('operation_mode'))
+        self.assertEqual(STATE_OFF,
+                         state_cool.attributes.get('operation_mode'))
+
+    def test_turn_off_when_off(self):
+        """Test if climate.turn_off does nothing to a turned off device."""
+        climate.set_operation_mode(self.hass, STATE_OFF)
+        self.hass.block_till_done()
+        self.hass.services.call('climate', SERVICE_TURN_OFF)
+        self.hass.block_till_done()
+        state_heat = self.hass.states.get(self.HEAT_ENTITY)
+        state_cool = self.hass.states.get(self.COOL_ENTITY)
+        self.assertEqual(STATE_OFF,
+                         state_heat.attributes.get('operation_mode'))
+        self.assertEqual(STATE_OFF,
+                         state_cool.attributes.get('operation_mode'))
+
+
 @asyncio.coroutine
 def test_custom_setup_params(hass):
     """Test the setup with custom parameters."""

From a5cff9877e343cdd5754f4e4d6fac77445ed1f68 Mon Sep 17 00:00:00 2001
From: Martin Fuchs <39280548+fucm@users.noreply.github.com>
Date: Sun, 2 Sep 2018 17:02:51 +0200
Subject: [PATCH 023/357] Add support for Tahoma Lighting Receiver on/off io
 (#15925)

* Add support for Tahoma light switch

* Clean up attributes and add available method

* Remove else statement
---
 homeassistant/components/switch/tahoma.py | 70 ++++++++++++++++++++++-
 homeassistant/components/tahoma.py        |  1 +
 2 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/switch/tahoma.py b/homeassistant/components/switch/tahoma.py
index 2904f06b432..bcac038d43b 100644
--- a/homeassistant/components/switch/tahoma.py
+++ b/homeassistant/components/switch/tahoma.py
@@ -12,11 +12,14 @@ import logging
 from homeassistant.components.switch import SwitchDevice
 from homeassistant.components.tahoma import (
     DOMAIN as TAHOMA_DOMAIN, TahomaDevice)
+from homeassistant.const import (STATE_OFF, STATE_ON)
 
 DEPENDENCIES = ['tahoma']
 
 _LOGGER = logging.getLogger(__name__)
 
+ATTR_RSSI_LEVEL = 'rssi_level'
+
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Tahoma switches."""
@@ -30,6 +33,33 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
 class TahomaSwitch(TahomaDevice, SwitchDevice):
     """Representation a Tahoma Switch."""
 
+    def __init__(self, tahoma_device, controller):
+        """Initialize the switch."""
+        super().__init__(tahoma_device, controller)
+        self._state = STATE_OFF
+        self._skip_update = False
+        self._available = False
+
+    def update(self):
+        """Update method."""
+        # Postpone the immediate state check for changes that take time.
+        if self._skip_update:
+            self._skip_update = False
+            return
+
+        self.controller.get_states([self.tahoma_device])
+
+        if self.tahoma_device.type == 'io:OnOffLightIOComponent':
+            if self.tahoma_device.active_states.get('core:OnOffState') == 'on':
+                self._state = STATE_ON
+            else:
+                self._state = STATE_OFF
+
+        self._available = bool(self.tahoma_device.active_states.get(
+            'core:StatusState') == 'available')
+
+        _LOGGER.debug("Update %s, state: %s", self._name, self._state)
+
     @property
     def device_class(self):
         """Return the class of the device."""
@@ -39,7 +69,23 @@ class TahomaSwitch(TahomaDevice, SwitchDevice):
 
     def turn_on(self, **kwargs):
         """Send the on command."""
-        self.toggle()
+        _LOGGER.debug("Turn on: %s", self._name)
+        if self.tahoma_device.type == 'rts:GarageDoor4TRTSComponent':
+            self.toggle()
+        else:
+            self.apply_action('on')
+            self._skip_update = True
+            self._state = STATE_ON
+
+    def turn_off(self, **kwargs):
+        """Send the off command."""
+        _LOGGER.debug("Turn off: %s", self._name)
+        if self.tahoma_device.type == 'rts:GarageDoor4TRTSComponent':
+            return
+
+        self.apply_action('off')
+        self._skip_update = True
+        self._state = STATE_OFF
 
     def toggle(self, **kwargs):
         """Click the switch."""
@@ -48,4 +94,24 @@ class TahomaSwitch(TahomaDevice, SwitchDevice):
     @property
     def is_on(self):
         """Get whether the switch is in on state."""
-        return False
+        if self.tahoma_device.type == 'rts:GarageDoor4TRTSComponent':
+            return False
+        return bool(self._state == STATE_ON)
+
+    @property
+    def device_state_attributes(self):
+        """Return the device state attributes."""
+        attr = {}
+        super_attr = super().device_state_attributes
+        if super_attr is not None:
+            attr.update(super_attr)
+
+        if 'core:RSSILevelState' in self.tahoma_device.active_states:
+            attr[ATTR_RSSI_LEVEL] = \
+                self.tahoma_device.active_states['core:RSSILevelState']
+        return attr
+
+    @property
+    def available(self):
+        """Return True if entity is available."""
+        return self._available
diff --git a/homeassistant/components/tahoma.py b/homeassistant/components/tahoma.py
index aaa64489168..64071ddb037 100644
--- a/homeassistant/components/tahoma.py
+++ b/homeassistant/components/tahoma.py
@@ -52,6 +52,7 @@ TAHOMA_TYPES = {
     'rts:GarageDoor4TRTSComponent': 'switch',
     'io:VerticalExteriorAwningIOComponent': 'cover',
     'io:HorizontalAwningIOComponent': 'cover',
+    'io:OnOffLightIOComponent': 'switch',
     'rtds:RTDSSmokeSensor': 'smoke',
 }
 

From 03480dc779e2837cec0f4db16b8270a31257d86d Mon Sep 17 00:00:00 2001
From: Totoo <ttotoo@gmail.com>
Date: Sun, 2 Sep 2018 18:58:31 +0200
Subject: [PATCH 024/357] Update discord.py (#16248)

* Update discord.py

* Update discord.py

Fixed ATTR_IMAGES checking, line length, and ATTR_DATA imported. Also fixed missing spaces.

* Update discord.py

Fix E302...
---
 homeassistant/components/notify/discord.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/notify/discord.py b/homeassistant/components/notify/discord.py
index dca47a46dbf..0cf4bced360 100644
--- a/homeassistant/components/notify/discord.py
+++ b/homeassistant/components/notify/discord.py
@@ -11,7 +11,7 @@ import voluptuous as vol
 
 import homeassistant.helpers.config_validation as cv
 from homeassistant.components.notify import (
-    PLATFORM_SCHEMA, BaseNotificationService, ATTR_TARGET)
+    PLATFORM_SCHEMA, BaseNotificationService, ATTR_TARGET, ATTR_DATA)
 from homeassistant.const import CONF_TOKEN
 
 _LOGGER = logging.getLogger(__name__)
@@ -22,6 +22,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Required(CONF_TOKEN): cv.string
 })
 
+ATTR_IMAGES = 'images'
+
 
 def get_service(hass, config, discovery_info=None):
     """Get the Discord notification service."""
@@ -53,9 +55,15 @@ class DiscordNotificationService(BaseNotificationService):
         def on_ready():
             """Send the messages when the bot is ready."""
             try:
+                data = kwargs.get(ATTR_DATA)
+                if data:
+                    images = data.get(ATTR_IMAGES)
                 for channelid in kwargs[ATTR_TARGET]:
                     channel = discord.Object(id=channelid)
                     yield from discord_bot.send_message(channel, message)
+                    if images:
+                        for anum, f_name in enumerate(images):
+                            yield from discord_bot.send_file(channel, f_name)
             except (discord.errors.HTTPException,
                     discord.errors.NotFound) as error:
                 _LOGGER.warning("Communication error: %s", error)

From ac3700d1c46959bb572b5d0b73936fa0491806c7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 2 Sep 2018 19:01:25 +0200
Subject: [PATCH 025/357] Upgrade python-telegram-bot to 11.0.0 (#16373)

---
 homeassistant/components/telegram_bot/__init__.py | 2 +-
 requirements_all.txt                              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/telegram_bot/__init__.py b/homeassistant/components/telegram_bot/__init__.py
index 53695102601..8e24716ab57 100644
--- a/homeassistant/components/telegram_bot/__init__.py
+++ b/homeassistant/components/telegram_bot/__init__.py
@@ -22,7 +22,7 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.exceptions import TemplateError
 from homeassistant.setup import async_prepare_setup_platform
 
-REQUIREMENTS = ['python-telegram-bot==10.1.0']
+REQUIREMENTS = ['python-telegram-bot==11.0.0']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/requirements_all.txt b/requirements_all.txt
index b2ac021d61e..cf761ef4aa6 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1139,7 +1139,7 @@ python-synology==0.2.0
 python-tado==0.2.3
 
 # homeassistant.components.telegram_bot
-python-telegram-bot==10.1.0
+python-telegram-bot==11.0.0
 
 # homeassistant.components.sensor.twitch
 python-twitch==1.3.0

From 78fcea25bbfcf36e8b646941896f9409169ac5b1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 2 Sep 2018 19:01:43 +0200
Subject: [PATCH 026/357] Upgrade attrs to 18.2.0 (#16372)

---
 homeassistant/package_constraints.txt | 2 +-
 requirements_all.txt                  | 2 +-
 setup.py                              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt
index 3e9a763181a..8d49d5d07c6 100644
--- a/homeassistant/package_constraints.txt
+++ b/homeassistant/package_constraints.txt
@@ -1,7 +1,7 @@
 aiohttp==3.4.0
 astral==1.6.1
 async_timeout==3.0.0
-attrs==18.1.0
+attrs==18.2.0
 bcrypt==3.1.4
 certifi>=2018.04.16
 jinja2>=2.10
diff --git a/requirements_all.txt b/requirements_all.txt
index cf761ef4aa6..41814e84b64 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -2,7 +2,7 @@
 aiohttp==3.4.0
 astral==1.6.1
 async_timeout==3.0.0
-attrs==18.1.0
+attrs==18.2.0
 bcrypt==3.1.4
 certifi>=2018.04.16
 jinja2>=2.10
diff --git a/setup.py b/setup.py
index b1b0af70319..71f63adfb64 100755
--- a/setup.py
+++ b/setup.py
@@ -35,7 +35,7 @@ REQUIRES = [
     'aiohttp==3.4.0',
     'astral==1.6.1',
     'async_timeout==3.0.0',
-    'attrs==18.1.0',
+    'attrs==18.2.0',
     'bcrypt==3.1.4',
     'certifi>=2018.04.16',
     'jinja2>=2.10',

From 4685a2cd97452ce5ecd679af1a3bba3602be20e9 Mon Sep 17 00:00:00 2001
From: Jason Hu <awarecan@users.noreply.github.com>
Date: Sun, 2 Sep 2018 13:17:29 -0700
Subject: [PATCH 027/357] Update server.py (#16375)

---
 homeassistant/components/mqtt/server.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/homeassistant/components/mqtt/server.py b/homeassistant/components/mqtt/server.py
index 57da85fe5f6..45529411ed5 100644
--- a/homeassistant/components/mqtt/server.py
+++ b/homeassistant/components/mqtt/server.py
@@ -85,6 +85,10 @@ def generate_config(hass, passwd, password):
             'allow-anonymous': password is None
         },
         'plugins': ['auth_anonymous'],
+        'topic-check': {
+            'enabled': True,
+            'plugins': ['topic_taboo'],
+        },
     }
 
     if password:

From 1966597d5ef4fd8536401d3531ebd219aa9f4de4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=B8yer=20Iversen?= <mail@dahoiv.net>
Date: Sun, 2 Sep 2018 23:05:48 +0200
Subject: [PATCH 028/357] add_entities for switchmate (#16368)

---
 homeassistant/components/switch/switchmate.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/switch/switchmate.py b/homeassistant/components/switch/switchmate.py
index 6ce4421ebc8..7ccd3bee4b6 100644
--- a/homeassistant/components/switch/switchmate.py
+++ b/homeassistant/components/switch/switchmate.py
@@ -31,11 +31,11 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None) -> None:
+def setup_platform(hass, config, add_entities, discovery_info=None) -> None:
     """Perform the setup for Switchmate devices."""
     name = config.get(CONF_NAME)
     mac_addr = config.get(CONF_MAC)
-    add_devices([Switchmate(mac_addr, name)], True)
+    add_entities([Switchmate(mac_addr, name)], True)
 
 
 class Switchmate(SwitchDevice):

From bf29cbd38184310960f26606d3d4ebcb69066178 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 3 Sep 2018 13:20:57 +0200
Subject: [PATCH 029/357] Update frontend to 20180903.0

---
 homeassistant/components/frontend/__init__.py | 2 +-
 requirements_all.txt                          | 2 +-
 requirements_test_all.txt                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/frontend/__init__.py b/homeassistant/components/frontend/__init__.py
index 5508aa76acf..72f61ddf1eb 100644
--- a/homeassistant/components/frontend/__init__.py
+++ b/homeassistant/components/frontend/__init__.py
@@ -26,7 +26,7 @@ from homeassistant.helpers.translation import async_get_translations
 from homeassistant.loader import bind_hass
 from homeassistant.util.yaml import load_yaml
 
-REQUIREMENTS = ['home-assistant-frontend==20180831.0']
+REQUIREMENTS = ['home-assistant-frontend==20180903.0']
 
 DOMAIN = 'frontend'
 DEPENDENCIES = ['api', 'websocket_api', 'http', 'system_log',
diff --git a/requirements_all.txt b/requirements_all.txt
index 41814e84b64..6223f9cc51c 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -448,7 +448,7 @@ hole==0.3.0
 holidays==0.9.6
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180831.0
+home-assistant-frontend==20180903.0
 
 # homeassistant.components.homekit_controller
 # homekit==0.10
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 446e3d056a3..0ee02e0d109 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -84,7 +84,7 @@ hbmqtt==0.9.4
 holidays==0.9.6
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180831.0
+home-assistant-frontend==20180903.0
 
 # homeassistant.components.homematicip_cloud
 homematicip==0.9.8

From 669b3458b9029d55ba79dbbfab79b803508467f6 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 3 Sep 2018 13:20:57 +0200
Subject: [PATCH 030/357] Update frontend to 20180903.0

---
 homeassistant/components/frontend/__init__.py | 2 +-
 requirements_all.txt                          | 2 +-
 requirements_test_all.txt                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/frontend/__init__.py b/homeassistant/components/frontend/__init__.py
index 5508aa76acf..72f61ddf1eb 100644
--- a/homeassistant/components/frontend/__init__.py
+++ b/homeassistant/components/frontend/__init__.py
@@ -26,7 +26,7 @@ from homeassistant.helpers.translation import async_get_translations
 from homeassistant.loader import bind_hass
 from homeassistant.util.yaml import load_yaml
 
-REQUIREMENTS = ['home-assistant-frontend==20180831.0']
+REQUIREMENTS = ['home-assistant-frontend==20180903.0']
 
 DOMAIN = 'frontend'
 DEPENDENCIES = ['api', 'websocket_api', 'http', 'system_log',
diff --git a/requirements_all.txt b/requirements_all.txt
index 6e9cbeffc7d..7060e5dae30 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -442,7 +442,7 @@ hole==0.3.0
 holidays==0.9.6
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180831.0
+home-assistant-frontend==20180903.0
 
 # homeassistant.components.homekit_controller
 # homekit==0.10
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 57d4dd9b996..106341aa5fb 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -84,7 +84,7 @@ hbmqtt==0.9.2
 holidays==0.9.6
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180831.0
+home-assistant-frontend==20180903.0
 
 # homeassistant.components.homematicip_cloud
 homematicip==0.9.8

From a2a447b466f658d47aea9719297466d02100c775 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 3 Sep 2018 13:21:37 +0200
Subject: [PATCH 031/357] Update translations

---
 .../components/auth/.translations/hu.json     | 16 ++++++++++
 .../components/auth/.translations/ko.json     |  2 +-
 .../components/cast/.translations/fr.json     |  6 ++--
 .../components/deconz/.translations/no.json   |  2 +-
 .../components/hangouts/.translations/fr.json |  7 +++--
 .../components/hangouts/.translations/hu.json | 29 +++++++++++++++++++
 .../hangouts/.translations/pt-BR.json         |  6 +++-
 .../homematicip_cloud/.translations/no.json   |  2 +-
 .../components/nest/.translations/fr.json     | 18 +++++++++++-
 .../sensor/.translations/moon.hu.json         | 12 ++++++++
 .../sensor/.translations/moon.no.json         |  4 +--
 .../sensor/.translations/moon.pt-BR.json      |  6 ++--
 .../components/sonos/.translations/fr.json    | 13 +++++++++
 13 files changed, 110 insertions(+), 13 deletions(-)
 create mode 100644 homeassistant/components/auth/.translations/hu.json
 create mode 100644 homeassistant/components/hangouts/.translations/hu.json
 create mode 100644 homeassistant/components/sensor/.translations/moon.hu.json
 create mode 100644 homeassistant/components/sonos/.translations/fr.json

diff --git a/homeassistant/components/auth/.translations/hu.json b/homeassistant/components/auth/.translations/hu.json
new file mode 100644
index 00000000000..4500098553e
--- /dev/null
+++ b/homeassistant/components/auth/.translations/hu.json
@@ -0,0 +1,16 @@
+{
+    "mfa_setup": {
+        "totp": {
+            "error": {
+                "invalid_code": "\u00c9rv\u00e9nytelen k\u00f3d, pr\u00f3b\u00e1ld \u00fajra. Ha ez a hiba folyamatosan el\u0151fordul, akkor gy\u0151z\u0151dj meg r\u00f3la, hogy a Home Assistant rendszered \u00f3r\u00e1ja pontosan j\u00e1r."
+            },
+            "step": {
+                "init": {
+                    "description": "Ahhoz, hogy haszn\u00e1lhasd a k\u00e9tfaktoros hiteles\u00edt\u00e9st id\u0151alap\u00fa egyszeri jelszavakkal, szkenneld be a QR k\u00f3dot a hiteles\u00edt\u00e9si applik\u00e1ci\u00f3ddal. Ha m\u00e9g nincsen, akkor a [Google Hiteles\u00edt\u0151](https://support.google.com/accounts/answer/1066447)t vagy az [Authy](https://authy.com/)-t aj\u00e1nljuk.\n\n{qr_code}\n\nA k\u00f3d beolvas\u00e1sa ut\u00e1n add meg a hat sz\u00e1mjegy\u0171 k\u00f3dot az applik\u00e1ci\u00f3b\u00f3l a telep\u00edt\u00e9s ellen\u0151rz\u00e9s\u00e9hez. Ha probl\u00e9m\u00e1ba \u00fctk\u00f6z\u00f6l a QR k\u00f3d beolvas\u00e1s\u00e1n\u00e1l, akkor ind\u00edts egy k\u00e9zi be\u00e1ll\u00edt\u00e1st a **`{code}`** k\u00f3ddal.",
+                    "title": "K\u00e9tfaktoros hiteles\u00edt\u00e9s be\u00e1ll\u00edt\u00e1sa TOTP haszn\u00e1lat\u00e1val"
+                }
+            },
+            "title": "TOTP"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/auth/.translations/ko.json b/homeassistant/components/auth/.translations/ko.json
index 4eb4783edd9..17fb5c56f57 100644
--- a/homeassistant/components/auth/.translations/ko.json
+++ b/homeassistant/components/auth/.translations/ko.json
@@ -6,7 +6,7 @@
             },
             "step": {
                 "init": {
-                    "description": "\uc2dc\uac04 \uae30\ubc18\uc758 \uc77c\ud68c\uc6a9 \ube44\ubc00\ubc88\ud638\ub97c \uc0ac\uc6a9\ud558\ub294 2\ub2e8\uacc4 \uc778\uc99d\uc744 \ud558\ub824\uba74 \uc778\uc99d\uc6a9 \uc571\uc744 \uc774\uc6a9\ud574\uc11c QR \ucf54\ub4dc\ub97c \uc2a4\uce94\ud574 \uc8fc\uc138\uc694. \uc778\uc99d\uc6a9 \uc571\uc740 [Google Authenticator](https://support.google.com/accounts/answer/1066447) \ub610\ub294 [Authy](https://authy.com/) \ub97c \ucd94\ucc9c\ub4dc\ub9bd\ub2c8\ub2e4.\n\n{qr_code}\n\n\uc2a4\uce94 \ud6c4\uc5d0 \uc0dd\uc131\ub41c 6\uc790\ub9ac \ucf54\ub4dc\ub97c \uc785\ub825\ud574\uc11c \uc124\uc815\uc744 \ud655\uc778\ud558\uc138\uc694. QR \ucf54\ub4dc \uc2a4\uce94\uc5d0 \ubb38\uc81c\uac00 \uc788\ub2e4\uba74, **`{code}`** \ucf54\ub4dc\ub85c \uc9c1\uc811 \uc124\uc815\ud574\ubcf4\uc138\uc694.",
+                    "description": "\uc2dc\uac04 \uae30\ubc18\uc758 \uc77c\ud68c\uc6a9 \ube44\ubc00\ubc88\ud638\ub97c \uc0ac\uc6a9\ud558\ub294 2\ub2e8\uacc4 \uc778\uc99d\uc744 \ud558\ub824\uba74 \uc778\uc99d\uc6a9 \uc571\uc744 \uc774\uc6a9\ud574\uc11c QR \ucf54\ub4dc\ub97c \uc2a4\uce94\ud574 \uc8fc\uc138\uc694. \uc778\uc99d\uc6a9 \uc571\uc740 [Google OTP](https://support.google.com/accounts/answer/1066447) \ub610\ub294 [Authy](https://authy.com/) \ub97c \ucd94\ucc9c\ub4dc\ub9bd\ub2c8\ub2e4.\n\n{qr_code}\n\n\uc2a4\uce94 \ud6c4\uc5d0 \uc0dd\uc131\ub41c 6\uc790\ub9ac \ucf54\ub4dc\ub97c \uc785\ub825\ud574\uc11c \uc124\uc815\uc744 \ud655\uc778\ud558\uc138\uc694. QR \ucf54\ub4dc \uc2a4\uce94\uc5d0 \ubb38\uc81c\uac00 \uc788\ub2e4\uba74, **`{code}`** \ucf54\ub4dc\ub85c \uc9c1\uc811 \uc124\uc815\ud574\ubcf4\uc138\uc694.",
                     "title": "TOTP \ub97c \uc0ac\uc6a9\ud558\uc5ec 2 \ub2e8\uacc4 \uc778\uc99d \uad6c\uc131"
                 }
             },
diff --git a/homeassistant/components/cast/.translations/fr.json b/homeassistant/components/cast/.translations/fr.json
index acacddf2187..d3b95121de6 100644
--- a/homeassistant/components/cast/.translations/fr.json
+++ b/homeassistant/components/cast/.translations/fr.json
@@ -6,8 +6,10 @@
         },
         "step": {
             "confirm": {
-                "description": "Voulez-vous configurer Google Cast?"
+                "description": "Voulez-vous configurer Google Cast?",
+                "title": "Google Cast"
             }
-        }
+        },
+        "title": "Google Cast"
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/deconz/.translations/no.json b/homeassistant/components/deconz/.translations/no.json
index 55518b7da53..27868814eab 100644
--- a/homeassistant/components/deconz/.translations/no.json
+++ b/homeassistant/components/deconz/.translations/no.json
@@ -28,6 +28,6 @@
                 "title": "Ekstra konfigurasjonsalternativer for deCONZ"
             }
         },
-        "title": "deCONZ"
+        "title": "deCONZ Zigbee gateway"
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/hangouts/.translations/fr.json b/homeassistant/components/hangouts/.translations/fr.json
index c92d478c454..53759f9b534 100644
--- a/homeassistant/components/hangouts/.translations/fr.json
+++ b/homeassistant/components/hangouts/.translations/fr.json
@@ -13,9 +13,12 @@
             },
             "user": {
                 "data": {
+                    "email": "Adresse e-mail",
                     "password": "Mot de passe"
-                }
+                },
+                "title": "Connexion \u00e0 Google Hangouts"
             }
-        }
+        },
+        "title": "Google Hangouts"
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/hangouts/.translations/hu.json b/homeassistant/components/hangouts/.translations/hu.json
new file mode 100644
index 00000000000..2631843c784
--- /dev/null
+++ b/homeassistant/components/hangouts/.translations/hu.json
@@ -0,0 +1,29 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "A Google Hangouts m\u00e1r konfigur\u00e1lva van",
+            "unknown": "Ismeretlen hiba t\u00f6rt\u00e9nt."
+        },
+        "error": {
+            "invalid_2fa": "\u00c9rv\u00e9nytelen K\u00e9tfaktoros hiteles\u00edt\u00e9s, pr\u00f3b\u00e1ld \u00fajra.",
+            "invalid_2fa_method": "\u00c9rv\u00e9nytelen 2FA M\u00f3dszer (Ellen\u0151rz\u00e9s a Telefonon).",
+            "invalid_login": "\u00c9rv\u00e9nytelen bejelentkez\u00e9s, pr\u00f3b\u00e1ld \u00fajra."
+        },
+        "step": {
+            "2fa": {
+                "data": {
+                    "2fa": "2FA Pin"
+                },
+                "title": "K\u00e9tfaktoros Hiteles\u00edt\u00e9s"
+            },
+            "user": {
+                "data": {
+                    "email": "E-Mail C\u00edm",
+                    "password": "Jelsz\u00f3"
+                },
+                "title": "Google Hangouts Bejelentkez\u00e9s"
+            }
+        },
+        "title": "Google Hangouts"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/hangouts/.translations/pt-BR.json b/homeassistant/components/hangouts/.translations/pt-BR.json
index 41b097f3f8d..516229c3871 100644
--- a/homeassistant/components/hangouts/.translations/pt-BR.json
+++ b/homeassistant/components/hangouts/.translations/pt-BR.json
@@ -1,7 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Hangouts do Google j\u00e1 est\u00e1 configurado."
+            "already_configured": "Hangouts do Google j\u00e1 est\u00e1 configurado.",
+            "unknown": "Ocorreu um erro desconhecido."
+        },
+        "error": {
+            "invalid_2fa": "Autentica\u00e7\u00e3o de 2 fatores inv\u00e1lida, por favor, tente novamente."
         },
         "step": {
             "2fa": {
diff --git a/homeassistant/components/homematicip_cloud/.translations/no.json b/homeassistant/components/homematicip_cloud/.translations/no.json
index a310a918f64..730f00ae625 100644
--- a/homeassistant/components/homematicip_cloud/.translations/no.json
+++ b/homeassistant/components/homematicip_cloud/.translations/no.json
@@ -22,7 +22,7 @@
                 "title": "Velg HomematicIP tilgangspunkt"
             },
             "link": {
-                "description": "Trykk p\u00e5 den bl\u00e5 knappen p\u00e5 tilgangspunktet og send knappen for \u00e5 registrere HomematicIP med Home Assistant. \n\n![Plassering av knapp p\u00e5 bridge](/static/images/config_flows/config_homematicip_cloud.png)",
+                "description": "Trykk p\u00e5 den bl\u00e5 knappen p\u00e5 tilgangspunktet og p\u00e5 send knappen for \u00e5 registrere HomematicIP med Home Assistant. \n\n![Plassering av knapp p\u00e5 bridge](/static/images/config_flows/config_homematicip_cloud.png)",
                 "title": "Link tilgangspunkt"
             }
         },
diff --git a/homeassistant/components/nest/.translations/fr.json b/homeassistant/components/nest/.translations/fr.json
index 62a4d7deec9..734e82dbcd0 100644
--- a/homeassistant/components/nest/.translations/fr.json
+++ b/homeassistant/components/nest/.translations/fr.json
@@ -2,6 +2,22 @@
     "config": {
         "abort": {
             "already_setup": "Vous ne pouvez configurer qu'un seul compte Nest."
-        }
+        },
+        "error": {
+            "internal_error": "Erreur interne lors de la validation du code",
+            "invalid_code": "Code invalide"
+        },
+        "step": {
+            "init": {
+                "title": "Fournisseur d'authentification"
+            },
+            "link": {
+                "data": {
+                    "code": "Code PIN"
+                },
+                "title": "Lier un compte Nest"
+            }
+        },
+        "title": "Nest"
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/sensor/.translations/moon.hu.json b/homeassistant/components/sensor/.translations/moon.hu.json
new file mode 100644
index 00000000000..0fcd02a6961
--- /dev/null
+++ b/homeassistant/components/sensor/.translations/moon.hu.json
@@ -0,0 +1,12 @@
+{
+    "state": {
+        "first_quarter": "Els\u0151 negyed",
+        "full_moon": "Telihold",
+        "last_quarter": "Utols\u00f3 negyed",
+        "new_moon": "\u00dajhold",
+        "waning_crescent": "Fogy\u00f3 Hold (sarl\u00f3)",
+        "waning_gibbous": "Fogy\u00f3 Hold",
+        "waxing_crescent": "N\u00f6v\u0151 Hold (sarl\u00f3)",
+        "waxing_gibbous": "N\u00f6v\u0151 Hold"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/sensor/.translations/moon.no.json b/homeassistant/components/sensor/.translations/moon.no.json
index 104412c90ba..19f9985accb 100644
--- a/homeassistant/components/sensor/.translations/moon.no.json
+++ b/homeassistant/components/sensor/.translations/moon.no.json
@@ -1,8 +1,8 @@
 {
     "state": {
-        "first_quarter": "F\u00f8rste kvartdel",
+        "first_quarter": "F\u00f8rste kvarter",
         "full_moon": "Fullm\u00e5ne",
-        "last_quarter": "Siste kvartdel",
+        "last_quarter": "Siste kvarter",
         "new_moon": "Nym\u00e5ne",
         "waning_crescent": "Minkende halvm\u00e5ne",
         "waning_gibbous": "Minkende trekvartm\u00e5ne",
diff --git a/homeassistant/components/sensor/.translations/moon.pt-BR.json b/homeassistant/components/sensor/.translations/moon.pt-BR.json
index 57d3a3e95e4..93b17784a4e 100644
--- a/homeassistant/components/sensor/.translations/moon.pt-BR.json
+++ b/homeassistant/components/sensor/.translations/moon.pt-BR.json
@@ -1,7 +1,9 @@
 {
     "state": {
-        "full_moon": "Cheia",
-        "new_moon": "Nova",
+        "first_quarter": "Quarto crescente",
+        "full_moon": "Lua cheia",
+        "last_quarter": "Quarto minguante",
+        "new_moon": "Lua Nova",
         "waning_crescent": "Minguante",
         "waning_gibbous": "Minguante gibosa",
         "waxing_crescent": "Crescente",
diff --git a/homeassistant/components/sonos/.translations/fr.json b/homeassistant/components/sonos/.translations/fr.json
new file mode 100644
index 00000000000..768a798e6d5
--- /dev/null
+++ b/homeassistant/components/sonos/.translations/fr.json
@@ -0,0 +1,13 @@
+{
+    "config": {
+        "abort": {
+            "no_devices_found": "Aucun p\u00e9riph\u00e9rique Sonos trouv\u00e9 sur le r\u00e9seau.",
+            "single_instance_allowed": "Seulement une seule configuration de Sonos est n\u00e9cessaire."
+        },
+        "step": {
+            "confirm": {
+                "description": "Voulez-vous configurer Sonos?"
+            }
+        }
+    }
+}
\ No newline at end of file

From b9c80a6bb36215e0a45aa2e9438a2b4f73085fbd Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 3 Sep 2018 13:21:37 +0200
Subject: [PATCH 032/357] Update translations

---
 .../components/auth/.translations/hu.json     | 16 ++++++++++
 .../components/auth/.translations/ko.json     |  2 +-
 .../components/cast/.translations/fr.json     |  6 ++--
 .../components/deconz/.translations/no.json   |  2 +-
 .../components/hangouts/.translations/fr.json |  7 +++--
 .../components/hangouts/.translations/hu.json | 29 +++++++++++++++++++
 .../hangouts/.translations/pt-BR.json         |  6 +++-
 .../homematicip_cloud/.translations/no.json   |  2 +-
 .../components/nest/.translations/fr.json     | 18 +++++++++++-
 .../sensor/.translations/moon.hu.json         | 12 ++++++++
 .../sensor/.translations/moon.no.json         |  4 +--
 .../sensor/.translations/moon.pt-BR.json      |  6 ++--
 .../components/sonos/.translations/fr.json    | 13 +++++++++
 13 files changed, 110 insertions(+), 13 deletions(-)
 create mode 100644 homeassistant/components/auth/.translations/hu.json
 create mode 100644 homeassistant/components/hangouts/.translations/hu.json
 create mode 100644 homeassistant/components/sensor/.translations/moon.hu.json
 create mode 100644 homeassistant/components/sonos/.translations/fr.json

diff --git a/homeassistant/components/auth/.translations/hu.json b/homeassistant/components/auth/.translations/hu.json
new file mode 100644
index 00000000000..4500098553e
--- /dev/null
+++ b/homeassistant/components/auth/.translations/hu.json
@@ -0,0 +1,16 @@
+{
+    "mfa_setup": {
+        "totp": {
+            "error": {
+                "invalid_code": "\u00c9rv\u00e9nytelen k\u00f3d, pr\u00f3b\u00e1ld \u00fajra. Ha ez a hiba folyamatosan el\u0151fordul, akkor gy\u0151z\u0151dj meg r\u00f3la, hogy a Home Assistant rendszered \u00f3r\u00e1ja pontosan j\u00e1r."
+            },
+            "step": {
+                "init": {
+                    "description": "Ahhoz, hogy haszn\u00e1lhasd a k\u00e9tfaktoros hiteles\u00edt\u00e9st id\u0151alap\u00fa egyszeri jelszavakkal, szkenneld be a QR k\u00f3dot a hiteles\u00edt\u00e9si applik\u00e1ci\u00f3ddal. Ha m\u00e9g nincsen, akkor a [Google Hiteles\u00edt\u0151](https://support.google.com/accounts/answer/1066447)t vagy az [Authy](https://authy.com/)-t aj\u00e1nljuk.\n\n{qr_code}\n\nA k\u00f3d beolvas\u00e1sa ut\u00e1n add meg a hat sz\u00e1mjegy\u0171 k\u00f3dot az applik\u00e1ci\u00f3b\u00f3l a telep\u00edt\u00e9s ellen\u0151rz\u00e9s\u00e9hez. Ha probl\u00e9m\u00e1ba \u00fctk\u00f6z\u00f6l a QR k\u00f3d beolvas\u00e1s\u00e1n\u00e1l, akkor ind\u00edts egy k\u00e9zi be\u00e1ll\u00edt\u00e1st a **`{code}`** k\u00f3ddal.",
+                    "title": "K\u00e9tfaktoros hiteles\u00edt\u00e9s be\u00e1ll\u00edt\u00e1sa TOTP haszn\u00e1lat\u00e1val"
+                }
+            },
+            "title": "TOTP"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/auth/.translations/ko.json b/homeassistant/components/auth/.translations/ko.json
index 4eb4783edd9..17fb5c56f57 100644
--- a/homeassistant/components/auth/.translations/ko.json
+++ b/homeassistant/components/auth/.translations/ko.json
@@ -6,7 +6,7 @@
             },
             "step": {
                 "init": {
-                    "description": "\uc2dc\uac04 \uae30\ubc18\uc758 \uc77c\ud68c\uc6a9 \ube44\ubc00\ubc88\ud638\ub97c \uc0ac\uc6a9\ud558\ub294 2\ub2e8\uacc4 \uc778\uc99d\uc744 \ud558\ub824\uba74 \uc778\uc99d\uc6a9 \uc571\uc744 \uc774\uc6a9\ud574\uc11c QR \ucf54\ub4dc\ub97c \uc2a4\uce94\ud574 \uc8fc\uc138\uc694. \uc778\uc99d\uc6a9 \uc571\uc740 [Google Authenticator](https://support.google.com/accounts/answer/1066447) \ub610\ub294 [Authy](https://authy.com/) \ub97c \ucd94\ucc9c\ub4dc\ub9bd\ub2c8\ub2e4.\n\n{qr_code}\n\n\uc2a4\uce94 \ud6c4\uc5d0 \uc0dd\uc131\ub41c 6\uc790\ub9ac \ucf54\ub4dc\ub97c \uc785\ub825\ud574\uc11c \uc124\uc815\uc744 \ud655\uc778\ud558\uc138\uc694. QR \ucf54\ub4dc \uc2a4\uce94\uc5d0 \ubb38\uc81c\uac00 \uc788\ub2e4\uba74, **`{code}`** \ucf54\ub4dc\ub85c \uc9c1\uc811 \uc124\uc815\ud574\ubcf4\uc138\uc694.",
+                    "description": "\uc2dc\uac04 \uae30\ubc18\uc758 \uc77c\ud68c\uc6a9 \ube44\ubc00\ubc88\ud638\ub97c \uc0ac\uc6a9\ud558\ub294 2\ub2e8\uacc4 \uc778\uc99d\uc744 \ud558\ub824\uba74 \uc778\uc99d\uc6a9 \uc571\uc744 \uc774\uc6a9\ud574\uc11c QR \ucf54\ub4dc\ub97c \uc2a4\uce94\ud574 \uc8fc\uc138\uc694. \uc778\uc99d\uc6a9 \uc571\uc740 [Google OTP](https://support.google.com/accounts/answer/1066447) \ub610\ub294 [Authy](https://authy.com/) \ub97c \ucd94\ucc9c\ub4dc\ub9bd\ub2c8\ub2e4.\n\n{qr_code}\n\n\uc2a4\uce94 \ud6c4\uc5d0 \uc0dd\uc131\ub41c 6\uc790\ub9ac \ucf54\ub4dc\ub97c \uc785\ub825\ud574\uc11c \uc124\uc815\uc744 \ud655\uc778\ud558\uc138\uc694. QR \ucf54\ub4dc \uc2a4\uce94\uc5d0 \ubb38\uc81c\uac00 \uc788\ub2e4\uba74, **`{code}`** \ucf54\ub4dc\ub85c \uc9c1\uc811 \uc124\uc815\ud574\ubcf4\uc138\uc694.",
                     "title": "TOTP \ub97c \uc0ac\uc6a9\ud558\uc5ec 2 \ub2e8\uacc4 \uc778\uc99d \uad6c\uc131"
                 }
             },
diff --git a/homeassistant/components/cast/.translations/fr.json b/homeassistant/components/cast/.translations/fr.json
index acacddf2187..d3b95121de6 100644
--- a/homeassistant/components/cast/.translations/fr.json
+++ b/homeassistant/components/cast/.translations/fr.json
@@ -6,8 +6,10 @@
         },
         "step": {
             "confirm": {
-                "description": "Voulez-vous configurer Google Cast?"
+                "description": "Voulez-vous configurer Google Cast?",
+                "title": "Google Cast"
             }
-        }
+        },
+        "title": "Google Cast"
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/deconz/.translations/no.json b/homeassistant/components/deconz/.translations/no.json
index 55518b7da53..27868814eab 100644
--- a/homeassistant/components/deconz/.translations/no.json
+++ b/homeassistant/components/deconz/.translations/no.json
@@ -28,6 +28,6 @@
                 "title": "Ekstra konfigurasjonsalternativer for deCONZ"
             }
         },
-        "title": "deCONZ"
+        "title": "deCONZ Zigbee gateway"
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/hangouts/.translations/fr.json b/homeassistant/components/hangouts/.translations/fr.json
index c92d478c454..53759f9b534 100644
--- a/homeassistant/components/hangouts/.translations/fr.json
+++ b/homeassistant/components/hangouts/.translations/fr.json
@@ -13,9 +13,12 @@
             },
             "user": {
                 "data": {
+                    "email": "Adresse e-mail",
                     "password": "Mot de passe"
-                }
+                },
+                "title": "Connexion \u00e0 Google Hangouts"
             }
-        }
+        },
+        "title": "Google Hangouts"
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/hangouts/.translations/hu.json b/homeassistant/components/hangouts/.translations/hu.json
new file mode 100644
index 00000000000..2631843c784
--- /dev/null
+++ b/homeassistant/components/hangouts/.translations/hu.json
@@ -0,0 +1,29 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "A Google Hangouts m\u00e1r konfigur\u00e1lva van",
+            "unknown": "Ismeretlen hiba t\u00f6rt\u00e9nt."
+        },
+        "error": {
+            "invalid_2fa": "\u00c9rv\u00e9nytelen K\u00e9tfaktoros hiteles\u00edt\u00e9s, pr\u00f3b\u00e1ld \u00fajra.",
+            "invalid_2fa_method": "\u00c9rv\u00e9nytelen 2FA M\u00f3dszer (Ellen\u0151rz\u00e9s a Telefonon).",
+            "invalid_login": "\u00c9rv\u00e9nytelen bejelentkez\u00e9s, pr\u00f3b\u00e1ld \u00fajra."
+        },
+        "step": {
+            "2fa": {
+                "data": {
+                    "2fa": "2FA Pin"
+                },
+                "title": "K\u00e9tfaktoros Hiteles\u00edt\u00e9s"
+            },
+            "user": {
+                "data": {
+                    "email": "E-Mail C\u00edm",
+                    "password": "Jelsz\u00f3"
+                },
+                "title": "Google Hangouts Bejelentkez\u00e9s"
+            }
+        },
+        "title": "Google Hangouts"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/hangouts/.translations/pt-BR.json b/homeassistant/components/hangouts/.translations/pt-BR.json
index 41b097f3f8d..516229c3871 100644
--- a/homeassistant/components/hangouts/.translations/pt-BR.json
+++ b/homeassistant/components/hangouts/.translations/pt-BR.json
@@ -1,7 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Hangouts do Google j\u00e1 est\u00e1 configurado."
+            "already_configured": "Hangouts do Google j\u00e1 est\u00e1 configurado.",
+            "unknown": "Ocorreu um erro desconhecido."
+        },
+        "error": {
+            "invalid_2fa": "Autentica\u00e7\u00e3o de 2 fatores inv\u00e1lida, por favor, tente novamente."
         },
         "step": {
             "2fa": {
diff --git a/homeassistant/components/homematicip_cloud/.translations/no.json b/homeassistant/components/homematicip_cloud/.translations/no.json
index a310a918f64..730f00ae625 100644
--- a/homeassistant/components/homematicip_cloud/.translations/no.json
+++ b/homeassistant/components/homematicip_cloud/.translations/no.json
@@ -22,7 +22,7 @@
                 "title": "Velg HomematicIP tilgangspunkt"
             },
             "link": {
-                "description": "Trykk p\u00e5 den bl\u00e5 knappen p\u00e5 tilgangspunktet og send knappen for \u00e5 registrere HomematicIP med Home Assistant. \n\n![Plassering av knapp p\u00e5 bridge](/static/images/config_flows/config_homematicip_cloud.png)",
+                "description": "Trykk p\u00e5 den bl\u00e5 knappen p\u00e5 tilgangspunktet og p\u00e5 send knappen for \u00e5 registrere HomematicIP med Home Assistant. \n\n![Plassering av knapp p\u00e5 bridge](/static/images/config_flows/config_homematicip_cloud.png)",
                 "title": "Link tilgangspunkt"
             }
         },
diff --git a/homeassistant/components/nest/.translations/fr.json b/homeassistant/components/nest/.translations/fr.json
index 62a4d7deec9..734e82dbcd0 100644
--- a/homeassistant/components/nest/.translations/fr.json
+++ b/homeassistant/components/nest/.translations/fr.json
@@ -2,6 +2,22 @@
     "config": {
         "abort": {
             "already_setup": "Vous ne pouvez configurer qu'un seul compte Nest."
-        }
+        },
+        "error": {
+            "internal_error": "Erreur interne lors de la validation du code",
+            "invalid_code": "Code invalide"
+        },
+        "step": {
+            "init": {
+                "title": "Fournisseur d'authentification"
+            },
+            "link": {
+                "data": {
+                    "code": "Code PIN"
+                },
+                "title": "Lier un compte Nest"
+            }
+        },
+        "title": "Nest"
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/sensor/.translations/moon.hu.json b/homeassistant/components/sensor/.translations/moon.hu.json
new file mode 100644
index 00000000000..0fcd02a6961
--- /dev/null
+++ b/homeassistant/components/sensor/.translations/moon.hu.json
@@ -0,0 +1,12 @@
+{
+    "state": {
+        "first_quarter": "Els\u0151 negyed",
+        "full_moon": "Telihold",
+        "last_quarter": "Utols\u00f3 negyed",
+        "new_moon": "\u00dajhold",
+        "waning_crescent": "Fogy\u00f3 Hold (sarl\u00f3)",
+        "waning_gibbous": "Fogy\u00f3 Hold",
+        "waxing_crescent": "N\u00f6v\u0151 Hold (sarl\u00f3)",
+        "waxing_gibbous": "N\u00f6v\u0151 Hold"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/sensor/.translations/moon.no.json b/homeassistant/components/sensor/.translations/moon.no.json
index 104412c90ba..19f9985accb 100644
--- a/homeassistant/components/sensor/.translations/moon.no.json
+++ b/homeassistant/components/sensor/.translations/moon.no.json
@@ -1,8 +1,8 @@
 {
     "state": {
-        "first_quarter": "F\u00f8rste kvartdel",
+        "first_quarter": "F\u00f8rste kvarter",
         "full_moon": "Fullm\u00e5ne",
-        "last_quarter": "Siste kvartdel",
+        "last_quarter": "Siste kvarter",
         "new_moon": "Nym\u00e5ne",
         "waning_crescent": "Minkende halvm\u00e5ne",
         "waning_gibbous": "Minkende trekvartm\u00e5ne",
diff --git a/homeassistant/components/sensor/.translations/moon.pt-BR.json b/homeassistant/components/sensor/.translations/moon.pt-BR.json
index 57d3a3e95e4..93b17784a4e 100644
--- a/homeassistant/components/sensor/.translations/moon.pt-BR.json
+++ b/homeassistant/components/sensor/.translations/moon.pt-BR.json
@@ -1,7 +1,9 @@
 {
     "state": {
-        "full_moon": "Cheia",
-        "new_moon": "Nova",
+        "first_quarter": "Quarto crescente",
+        "full_moon": "Lua cheia",
+        "last_quarter": "Quarto minguante",
+        "new_moon": "Lua Nova",
         "waning_crescent": "Minguante",
         "waning_gibbous": "Minguante gibosa",
         "waxing_crescent": "Crescente",
diff --git a/homeassistant/components/sonos/.translations/fr.json b/homeassistant/components/sonos/.translations/fr.json
new file mode 100644
index 00000000000..768a798e6d5
--- /dev/null
+++ b/homeassistant/components/sonos/.translations/fr.json
@@ -0,0 +1,13 @@
+{
+    "config": {
+        "abort": {
+            "no_devices_found": "Aucun p\u00e9riph\u00e9rique Sonos trouv\u00e9 sur le r\u00e9seau.",
+            "single_instance_allowed": "Seulement une seule configuration de Sonos est n\u00e9cessaire."
+        },
+        "step": {
+            "confirm": {
+                "description": "Voulez-vous configurer Sonos?"
+            }
+        }
+    }
+}
\ No newline at end of file

From 46734b8409a1f13186aa44cfae43e144d93edb3b Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 3 Sep 2018 13:22:49 +0200
Subject: [PATCH 033/357] Bumped version to 0.77.3

---
 homeassistant/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/const.py b/homeassistant/const.py
index fac257fbaed..d2066e0557d 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -2,7 +2,7 @@
 """Constants used by Home Assistant components."""
 MAJOR_VERSION = 0
 MINOR_VERSION = 77
-PATCH_VERSION = '2'
+PATCH_VERSION = '3'
 __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
 __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
 REQUIRED_PYTHON_VER = (3, 5, 3)

From 00cba29ae189e3846a39beef7f830d909f4c6cb8 Mon Sep 17 00:00:00 2001
From: Pawel <pszafer@gmail.com>
Date: Mon, 3 Sep 2018 21:40:04 +0200
Subject: [PATCH 034/357] Support for playing radio preset by Onkyo
 media_player (#16258)

* Added support to play radio preset by play media

* Switch radio station by preset for Onkyo

* added SUPPORT_PLAY_MEDIA
---
 homeassistant/components/media_player/onkyo.py | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/homeassistant/components/media_player/onkyo.py b/homeassistant/components/media_player/onkyo.py
index af9a6ef54ce..00df456804f 100644
--- a/homeassistant/components/media_player/onkyo.py
+++ b/homeassistant/components/media_player/onkyo.py
@@ -14,7 +14,7 @@ import voluptuous as vol
 from homeassistant.components.media_player import (
     SUPPORT_TURN_OFF, SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET,
     SUPPORT_VOLUME_STEP, SUPPORT_SELECT_SOURCE, SUPPORT_PLAY,
-    MediaPlayerDevice, PLATFORM_SCHEMA)
+    SUPPORT_PLAY_MEDIA, MediaPlayerDevice, PLATFORM_SCHEMA)
 from homeassistant.const import (STATE_OFF, STATE_ON, CONF_HOST, CONF_NAME)
 import homeassistant.helpers.config_validation as cv
 
@@ -30,17 +30,19 @@ SUPPORTED_MAX_VOLUME = 80
 
 SUPPORT_ONKYO = SUPPORT_VOLUME_SET | SUPPORT_VOLUME_MUTE | \
     SUPPORT_VOLUME_STEP | SUPPORT_TURN_ON | SUPPORT_TURN_OFF | \
-    SUPPORT_SELECT_SOURCE | SUPPORT_PLAY
+    SUPPORT_SELECT_SOURCE | SUPPORT_PLAY | SUPPORT_PLAY_MEDIA
 
 SUPPORT_ONKYO_WO_VOLUME = SUPPORT_TURN_ON | SUPPORT_TURN_OFF | \
-    SUPPORT_SELECT_SOURCE | SUPPORT_PLAY
+    SUPPORT_SELECT_SOURCE | SUPPORT_PLAY | SUPPORT_PLAY_MEDIA
 
 KNOWN_HOSTS = []  # type: List[str]
 DEFAULT_SOURCES = {'tv': 'TV', 'bd': 'Bluray', 'game': 'Game', 'aux1': 'Aux1',
                    'video1': 'Video 1', 'video2': 'Video 2',
                    'video3': 'Video 3', 'video4': 'Video 4',
                    'video5': 'Video 5', 'video6': 'Video 6',
-                   'video7': 'Video 7'}
+                   'video7': 'Video 7', 'fm': 'Radio'}
+
+DEFAULT_PLAYABLE_SOURCES = ("fm", "am", "tuner")
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_HOST): cv.string,
@@ -266,6 +268,13 @@ class OnkyoDevice(MediaPlayerDevice):
             source = self._reverse_mapping[source]
         self.command('input-selector {}'.format(source))
 
+    def play_media(self, media_type, media_id, **kwargs):
+        """Play radio station by preset number."""
+        source = self._reverse_mapping[self._current_source]
+        if (media_type.lower() == 'radio' and
+                source in DEFAULT_PLAYABLE_SOURCES):
+            self.command('preset {}'.format(media_id))
+
 
 class OnkyoDeviceZone(OnkyoDevice):
     """Representation of an Onkyo device's extra zone."""

From 2252f4a25797ba423bd452682c8b2d8048e26fb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=B8yer=20Iversen?= <mail@dahoiv.net>
Date: Tue, 4 Sep 2018 01:11:40 +0200
Subject: [PATCH 035/357] Bug fix for Tibber (#16397)

---
 homeassistant/components/sensor/tibber.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/sensor/tibber.py b/homeassistant/components/sensor/tibber.py
index 3670a5a59bd..ebc38fcb739 100644
--- a/homeassistant/components/sensor/tibber.py
+++ b/homeassistant/components/sensor/tibber.py
@@ -151,7 +151,7 @@ class TibberSensor(Entity):
             if now.date() == price_time.date():
                 max_price = max(max_price, price_total)
                 min_price = min(min_price, price_total)
-            self._state = state
-            self._device_state_attributes['max_price'] = max_price
-            self._device_state_attributes['min_price'] = min_price
+        self._state = state
+        self._device_state_attributes['max_price'] = max_price
+        self._device_state_attributes['min_price'] = min_price
         return state is not None

From ba63a6abc0e46c632041823b7b7900ab13b2611f Mon Sep 17 00:00:00 2001
From: Russell Cloran <rcloran+github@gmail.com>
Date: Mon, 3 Sep 2018 22:46:27 -0700
Subject: [PATCH 036/357] zha: Bump to zigpy 0.2.0/bellows 0.7.0 (#16404)

---
 homeassistant/components/zha/__init__.py | 4 ++--
 requirements_all.txt                     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/homeassistant/components/zha/__init__.py b/homeassistant/components/zha/__init__.py
index f17e7f02344..7aec4333ea8 100644
--- a/homeassistant/components/zha/__init__.py
+++ b/homeassistant/components/zha/__init__.py
@@ -16,8 +16,8 @@ from homeassistant.helpers import discovery, entity
 from homeassistant.util import slugify
 
 REQUIREMENTS = [
-    'bellows==0.6.0',
-    'zigpy==0.1.0',
+    'bellows==0.7.0',
+    'zigpy==0.2.0',
     'zigpy-xbee==0.1.1',
 ]
 
diff --git a/requirements_all.txt b/requirements_all.txt
index 6223f9cc51c..d8d73cc36a1 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -168,7 +168,7 @@ batinfo==0.4.2
 beautifulsoup4==4.6.3
 
 # homeassistant.components.zha
-bellows==0.6.0
+bellows==0.7.0
 
 # homeassistant.components.bmw_connected_drive
 bimmer_connected==0.5.1
@@ -1530,4 +1530,4 @@ ziggo-mediabox-xl==1.0.0
 zigpy-xbee==0.1.1
 
 # homeassistant.components.zha
-zigpy==0.1.0
+zigpy==0.2.0

From a4aa30fc73a625a5567b68bc6d06733694b8efcd Mon Sep 17 00:00:00 2001
From: Rene Nulsch <33263735+ReneNulschDE@users.noreply.github.com>
Date: Tue, 4 Sep 2018 08:46:04 +0200
Subject: [PATCH 037/357] Fix SystemMonitor IP address sensor (#16394)

---
 homeassistant/components/sensor/systemmonitor.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/homeassistant/components/sensor/systemmonitor.py b/homeassistant/components/sensor/systemmonitor.py
index aa448ddf56e..de8e9783f92 100644
--- a/homeassistant/components/sensor/systemmonitor.py
+++ b/homeassistant/components/sensor/systemmonitor.py
@@ -6,6 +6,7 @@ https://home-assistant.io/components/sensor.systemmonitor/
 """
 import logging
 import os
+import socket
 
 import voluptuous as vol
 
@@ -61,9 +62,9 @@ IO_COUNTER = {
     'packets_in': 3,
 }
 
-IF_ADDRS = {
-    'ipv4_address': 0,
-    'ipv6_address': 1,
+IF_ADDRS_FAMILY = {
+    'ipv4_address': socket.AF_INET,
+    'ipv6_address': socket.AF_INET6,
 }
 
 
@@ -165,7 +166,9 @@ class SystemMonitorSensor(Entity):
         elif self.type == 'ipv4_address' or self.type == 'ipv6_address':
             addresses = psutil.net_if_addrs()
             if self.argument in addresses:
-                self._state = addresses[self.argument][IF_ADDRS[self.type]][1]
+                for addr in addresses[self.argument]:
+                    if addr.family == IF_ADDRS_FAMILY[self.type]:
+                        self._state = addr.address
             else:
                 self._state = None
         elif self.type == 'last_boot':

From 7ea482cb1d6b7cb247dc105fd780416e8fd0ab51 Mon Sep 17 00:00:00 2001
From: 9R <github@9-r.net>
Date: Tue, 4 Sep 2018 08:48:03 +0200
Subject: [PATCH 038/357] add ExpressBus icon key to sensor.mvg (#16387)

---
 homeassistant/components/sensor/mvglive.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/sensor/mvglive.py b/homeassistant/components/sensor/mvglive.py
index a7a4b592664..8634e4f4570 100644
--- a/homeassistant/components/sensor/mvglive.py
+++ b/homeassistant/components/sensor/mvglive.py
@@ -31,12 +31,13 @@ CONF_PRODUCTS = 'products'
 CONF_TIMEOFFSET = 'timeoffset'
 CONF_NUMBER = 'number'
 
-DEFAULT_PRODUCT = ['U-Bahn', 'Tram', 'Bus', 'S-Bahn']
+DEFAULT_PRODUCT = ['U-Bahn', 'Tram', 'Bus', 'ExpressBus', 'S-Bahn']
 
 ICONS = {
     'U-Bahn': 'mdi:subway',
     'Tram': 'mdi:tram',
     'Bus': 'mdi:bus',
+    'ExpressBus': 'mdi:bus',
     'S-Bahn': 'mdi:train',
     'SEV': 'mdi:checkbox-blank-circle-outline',
     '-': 'mdi:clock'

From 7a6facc875ac0f3af33450d77880777ffcb3816d Mon Sep 17 00:00:00 2001
From: Robert Svensson <Kane610@users.noreply.github.com>
Date: Tue, 4 Sep 2018 09:00:14 +0200
Subject: [PATCH 039/357] Device and entity registry remove config entry on
 unload (#16247)

* Test

* Ability to remove device

* Don't remove devices, instead remove config entry from device and entity registries

* Remove print

* Remove is not the same as unload

* Add tests

* Fix hound comment
---
 homeassistant/config_entries.py          |  8 +++++++
 homeassistant/helpers/device_registry.py | 10 ++++++++-
 homeassistant/helpers/entity_registry.py | 10 ++++++++-
 tests/helpers/test_device_registry.py    | 27 ++++++++++++++++++++++++
 tests/helpers/test_entity_registry.py    |  9 ++++++++
 5 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/homeassistant/config_entries.py b/homeassistant/config_entries.py
index 8db09cdb8da..6eae9e13030 100644
--- a/homeassistant/config_entries.py
+++ b/homeassistant/config_entries.py
@@ -325,6 +325,14 @@ class ConfigEntries:
 
         unloaded = await entry.async_unload(self.hass)
 
+        device_registry = await \
+            self.hass.helpers.device_registry.async_get_registry()
+        device_registry.async_clear_config_entry(entry_id)
+
+        entity_registry = await \
+            self.hass.helpers.entity_registry.async_get_registry()
+        entity_registry.async_clear_config_entry(entry_id)
+
         return {
             'require_restart': not unloaded
         }
diff --git a/homeassistant/helpers/device_registry.py b/homeassistant/helpers/device_registry.py
index 504448b948d..e6ff45af2fe 100644
--- a/homeassistant/helpers/device_registry.py
+++ b/homeassistant/helpers/device_registry.py
@@ -45,7 +45,7 @@ class DeviceRegistry:
         self._store = hass.helpers.storage.Store(STORAGE_VERSION, STORAGE_KEY)
 
     @callback
-    def async_get_device(self, identifiers: str, connections: tuple):
+    def async_get_device(self, identifiers: set, connections: set):
         """Check if device is registered."""
         for device in self.devices.values():
             if any(iden in device.identifiers for iden in identifiers) or \
@@ -127,6 +127,14 @@ class DeviceRegistry:
 
         return data
 
+    @callback
+    def async_clear_config_entry(self, config_entry):
+        """Clear config entry from registry entries."""
+        for device in self.devices.values():
+            if config_entry in device.config_entries:
+                device.config_entries.remove(config_entry)
+                self.async_schedule_save()
+
 
 @bind_hass
 async def async_get_registry(hass) -> DeviceRegistry:
diff --git a/homeassistant/helpers/entity_registry.py b/homeassistant/helpers/entity_registry.py
index 804ee4235d0..da3645a96fe 100644
--- a/homeassistant/helpers/entity_registry.py
+++ b/homeassistant/helpers/entity_registry.py
@@ -31,7 +31,7 @@ STORAGE_VERSION = 1
 STORAGE_KEY = 'core.entity_registry'
 
 
-@attr.s(slots=True, frozen=True)
+@attr.s(slots=True)
 class RegistryEntry:
     """Entity Registry Entry."""
 
@@ -250,6 +250,14 @@ class EntityRegistry:
 
         return data
 
+    @callback
+    def async_clear_config_entry(self, config_entry):
+        """Clear config entry from registry entries."""
+        for entry in self.entities.values():
+            if config_entry == entry.config_entry_id:
+                entry.config_entry_id = None
+                self.async_schedule_save()
+
 
 @bind_hass
 async def async_get_registry(hass) -> EntityRegistry:
diff --git a/tests/helpers/test_device_registry.py b/tests/helpers/test_device_registry.py
index 84ad54f7b82..a9132529bc3 100644
--- a/tests/helpers/test_device_registry.py
+++ b/tests/helpers/test_device_registry.py
@@ -138,3 +138,30 @@ async def test_loading_from_storage(hass, hass_storage):
         manufacturer='manufacturer', model='model')
     assert entry.id == 'abcdefghijklm'
     assert isinstance(entry.config_entries, set)
+
+
+async def test_removing_config_entries(registry):
+    """Make sure we do not get duplicate entries."""
+    entry = registry.async_get_or_create(
+        config_entry='123',
+        connections={('ethernet', '12:34:56:78:90:AB:CD:EF')},
+        identifiers={('bridgeid', '0123')},
+        manufacturer='manufacturer', model='model')
+    entry2 = registry.async_get_or_create(
+        config_entry='456',
+        connections={('ethernet', '12:34:56:78:90:AB:CD:EF')},
+        identifiers={('bridgeid', '0123')},
+        manufacturer='manufacturer', model='model')
+    entry3 = registry.async_get_or_create(
+        config_entry='123',
+        connections={('ethernet', '34:56:78:90:AB:CD:EF:12')},
+        identifiers={('bridgeid', '4567')},
+        manufacturer='manufacturer', model='model')
+
+    assert len(registry.devices) == 2
+    assert entry is entry2
+    assert entry is not entry3
+    assert entry.config_entries == {'123', '456'}
+    registry.async_clear_config_entry('123')
+    assert entry.config_entries == {'456'}
+    assert entry3.config_entries == set()
diff --git a/tests/helpers/test_entity_registry.py b/tests/helpers/test_entity_registry.py
index d0c088a6f69..bb28287ddd8 100644
--- a/tests/helpers/test_entity_registry.py
+++ b/tests/helpers/test_entity_registry.py
@@ -186,6 +186,15 @@ async def test_updating_config_entry_id(registry):
     assert entry2.config_entry_id == 'mock-id-2'
 
 
+async def test_removing_config_entry_id(registry):
+    """Test that we update config entry id in registry."""
+    entry = registry.async_get_or_create(
+        'light', 'hue', '5678', config_entry_id='mock-id-1')
+    assert entry.config_entry_id == 'mock-id-1'
+    registry.async_clear_config_entry('mock-id-1')
+    assert entry.config_entry_id is None
+
+
 async def test_migration(hass):
     """Test migration from old data to new."""
     old_conf = {

From f96aee2832b8834e48c24ccd54c3d0218614a641 Mon Sep 17 00:00:00 2001
From: Aaron Bach <bachya1208@gmail.com>
Date: Tue, 4 Sep 2018 01:22:44 -0600
Subject: [PATCH 040/357] Add config flow for OpenUV (#16159)

* OpenUV config flow in place

* Test folder in place

* Owner-requested comments

* Tests

* More tests

* Owner-requested changes (part 1 of 2)

* Updated requirements

* Owner-requested changes (2 of 2)

* Removed unnecessary import

* Bumping Travis

* Updated requirements

* More requirements

* Updated tests

* Owner-requested changes

* Hound

* Updated docstring
---
 .coveragerc                                   |   8 +-
 .../components/binary_sensor/openuv.py        |  27 ++--
 .../components/openuv/.translations/en.json   |  20 +++
 .../{openuv.py => openuv/__init__.py}         | 128 +++++++++++++-----
 .../components/openuv/config_flow.py          |  73 ++++++++++
 homeassistant/components/openuv/const.py      |   3 +
 homeassistant/components/openuv/strings.json  |  20 +++
 homeassistant/components/sensor/openuv.py     |  34 +++--
 homeassistant/config_entries.py               |   1 +
 requirements_all.txt                          |   2 +-
 requirements_test_all.txt                     |   3 +
 script/gen_requirements_all.py                |   1 +
 tests/components/openuv/__init__.py           |   1 +
 tests/components/openuv/test_config_flow.py   |  93 +++++++++++++
 14 files changed, 348 insertions(+), 66 deletions(-)
 create mode 100644 homeassistant/components/openuv/.translations/en.json
 rename homeassistant/components/{openuv.py => openuv/__init__.py} (57%)
 create mode 100644 homeassistant/components/openuv/config_flow.py
 create mode 100644 homeassistant/components/openuv/const.py
 create mode 100644 homeassistant/components/openuv/strings.json
 create mode 100644 tests/components/openuv/__init__.py
 create mode 100644 tests/components/openuv/test_config_flow.py

diff --git a/.coveragerc b/.coveragerc
index 39c31e4e40b..bd531e62f72 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -123,7 +123,7 @@ omit =
     homeassistant/components/hangouts/const.py
     homeassistant/components/hangouts/hangouts_bot.py
     homeassistant/components/hangouts/hangups_utils.py
-    homeassistant/components/*/hangouts.py    
+    homeassistant/components/*/hangouts.py
 
     homeassistant/components/hdmi_cec.py
     homeassistant/components/*/hdmi_cec.py
@@ -145,12 +145,12 @@ omit =
 
     homeassistant/components/ihc/*
     homeassistant/components/*/ihc.py
-    
+
     homeassistant/components/insteon/*
     homeassistant/components/*/insteon.py
 
     homeassistant/components/insteon_local.py
-    
+
     homeassistant/components/insteon_plm.py
 
     homeassistant/components/ios.py
@@ -228,7 +228,7 @@ omit =
     homeassistant/components/opencv.py
     homeassistant/components/*/opencv.py
 
-    homeassistant/components/openuv.py
+    homeassistant/components/openuv/__init__.py
     homeassistant/components/*/openuv.py
 
     homeassistant/components/pilight.py
diff --git a/homeassistant/components/binary_sensor/openuv.py b/homeassistant/components/binary_sensor/openuv.py
index 0b299529a46..c7c27d73ee4 100644
--- a/homeassistant/components/binary_sensor/openuv.py
+++ b/homeassistant/components/binary_sensor/openuv.py
@@ -7,12 +7,11 @@ https://home-assistant.io/components/binary_sensor.openuv/
 import logging
 
 from homeassistant.components.binary_sensor import BinarySensorDevice
-from homeassistant.const import CONF_MONITORED_CONDITIONS
 from homeassistant.core import callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.components.openuv import (
-    BINARY_SENSORS, DATA_PROTECTION_WINDOW, DOMAIN, TOPIC_UPDATE,
-    TYPE_PROTECTION_WINDOW, OpenUvEntity)
+    BINARY_SENSORS, DATA_OPENUV_CLIENT, DATA_PROTECTION_WINDOW, DOMAIN,
+    TOPIC_UPDATE, TYPE_PROTECTION_WINDOW, OpenUvEntity)
 from homeassistant.util.dt import as_local, parse_datetime, utcnow
 
 DEPENDENCIES = ['openuv']
@@ -26,17 +25,20 @@ ATTR_PROTECTION_WINDOW_ENDING_UV = 'end_uv'
 
 async def async_setup_platform(
         hass, config, async_add_entities, discovery_info=None):
-    """Set up the OpenUV binary sensor platform."""
-    if discovery_info is None:
-        return
+    """Set up an OpenUV sensor based on existing config."""
+    pass
 
-    openuv = hass.data[DOMAIN]
+
+async def async_setup_entry(hass, entry, async_add_entities):
+    """Set up an OpenUV sensor based on a config entry."""
+    openuv = hass.data[DOMAIN][DATA_OPENUV_CLIENT][entry.entry_id]
 
     binary_sensors = []
-    for sensor_type in discovery_info[CONF_MONITORED_CONDITIONS]:
+    for sensor_type in openuv.binary_sensor_conditions:
         name, icon = BINARY_SENSORS[sensor_type]
         binary_sensors.append(
-            OpenUvBinarySensor(openuv, sensor_type, name, icon))
+            OpenUvBinarySensor(
+                openuv, sensor_type, name, icon, entry.entry_id))
 
     async_add_entities(binary_sensors, True)
 
@@ -44,14 +46,16 @@ async def async_setup_platform(
 class OpenUvBinarySensor(OpenUvEntity, BinarySensorDevice):
     """Define a binary sensor for OpenUV."""
 
-    def __init__(self, openuv, sensor_type, name, icon):
+    def __init__(self, openuv, sensor_type, name, icon, entry_id):
         """Initialize the sensor."""
         super().__init__(openuv)
 
+        self._entry_id = entry_id
         self._icon = icon
         self._latitude = openuv.client.latitude
         self._longitude = openuv.client.longitude
         self._name = name
+        self._dispatch_remove = None
         self._sensor_type = sensor_type
         self._state = None
 
@@ -83,8 +87,9 @@ class OpenUvBinarySensor(OpenUvEntity, BinarySensorDevice):
 
     async def async_added_to_hass(self):
         """Register callbacks."""
-        async_dispatcher_connect(
+        self._dispatch_remove = async_dispatcher_connect(
             self.hass, TOPIC_UPDATE, self._update_data)
+        self.async_on_remove(self._dispatch_remove)
 
     async def async_update(self):
         """Update the state."""
diff --git a/homeassistant/components/openuv/.translations/en.json b/homeassistant/components/openuv/.translations/en.json
new file mode 100644
index 00000000000..df0232d01fc
--- /dev/null
+++ b/homeassistant/components/openuv/.translations/en.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "error": {
+            "identifier_exists": "Coordinates already registered",
+            "invalid_api_key": "Invalid API key"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "OpenUV API Key",
+                    "elevation": "Elevation",
+                    "latitude": "Latitude",
+                    "longitude": "Longitude"
+                },
+                "title": "Fill in your information"
+            }
+        },
+        "title": "OpenUV"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/openuv.py b/homeassistant/components/openuv/__init__.py
similarity index 57%
rename from homeassistant/components/openuv.py
rename to homeassistant/components/openuv/__init__.py
index d696f0e5100..bfd90b4a574 100644
--- a/homeassistant/components/openuv.py
+++ b/homeassistant/components/openuv/__init__.py
@@ -1,5 +1,5 @@
 """
-Support for data from openuv.io.
+Support for UV data from openuv.io.
 
 For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/openuv/
@@ -9,21 +9,24 @@ from datetime import timedelta
 
 import voluptuous as vol
 
+from homeassistant.config_entries import SOURCE_IMPORT
 from homeassistant.const import (
     ATTR_ATTRIBUTION, CONF_API_KEY, CONF_BINARY_SENSORS, CONF_ELEVATION,
     CONF_LATITUDE, CONF_LONGITUDE, CONF_MONITORED_CONDITIONS,
     CONF_SCAN_INTERVAL, CONF_SENSORS)
-from homeassistant.helpers import (
-    aiohttp_client, config_validation as cv, discovery)
+from homeassistant.helpers import aiohttp_client, config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.event import async_track_time_interval
 
-REQUIREMENTS = ['pyopenuv==1.0.1']
+from .config_flow import configured_instances
+from .const import DOMAIN
+
+REQUIREMENTS = ['pyopenuv==1.0.4']
 _LOGGER = logging.getLogger(__name__)
 
-DOMAIN = 'openuv'
-
+DATA_OPENUV_CLIENT = 'data_client'
+DATA_OPENUV_LISTENER = 'data_listener'
 DATA_PROTECTION_WINDOW = 'protection_window'
 DATA_UV = 'uv'
 
@@ -82,39 +85,77 @@ SENSOR_SCHEMA = vol.Schema({
 })
 
 CONFIG_SCHEMA = vol.Schema({
-    DOMAIN: vol.Schema({
-        vol.Required(CONF_API_KEY): cv.string,
-        vol.Optional(CONF_ELEVATION): float,
-        vol.Optional(CONF_LATITUDE): cv.latitude,
-        vol.Optional(CONF_LONGITUDE): cv.longitude,
-        vol.Optional(CONF_BINARY_SENSORS, default={}): BINARY_SENSOR_SCHEMA,
-        vol.Optional(CONF_SENSORS, default={}): SENSOR_SCHEMA,
-        vol.Optional(CONF_SCAN_INTERVAL, default=DEFAULT_SCAN_INTERVAL):
-            cv.time_period,
-    })
+    DOMAIN:
+        vol.Schema({
+            vol.Required(CONF_API_KEY): cv.string,
+            vol.Optional(CONF_ELEVATION): float,
+            vol.Optional(CONF_LATITUDE): cv.latitude,
+            vol.Optional(CONF_LONGITUDE): cv.longitude,
+            vol.Optional(CONF_BINARY_SENSORS, default={}):
+                BINARY_SENSOR_SCHEMA,
+            vol.Optional(CONF_SENSORS, default={}): SENSOR_SCHEMA,
+            vol.Optional(CONF_SCAN_INTERVAL, default=DEFAULT_SCAN_INTERVAL):
+                cv.time_period,
+        })
 }, extra=vol.ALLOW_EXTRA)
 
 
 async def async_setup(hass, config):
     """Set up the OpenUV component."""
-    from pyopenuv import Client
-    from pyopenuv.errors import OpenUvError
+    hass.data[DOMAIN] = {}
+    hass.data[DOMAIN][DATA_OPENUV_CLIENT] = {}
+    hass.data[DOMAIN][DATA_OPENUV_LISTENER] = {}
+
+    if DOMAIN not in config:
+        return True
 
     conf = config[DOMAIN]
-    api_key = conf[CONF_API_KEY]
-    elevation = conf.get(CONF_ELEVATION, hass.config.elevation)
     latitude = conf.get(CONF_LATITUDE, hass.config.latitude)
     longitude = conf.get(CONF_LONGITUDE, hass.config.longitude)
+    elevation = conf.get(CONF_ELEVATION, hass.config.elevation)
+
+    identifier = '{0}, {1}'.format(latitude, longitude)
+
+    if identifier not in configured_instances(hass):
+        hass.async_add_job(
+            hass.config_entries.flow.async_init(
+                DOMAIN,
+                context={'source': SOURCE_IMPORT},
+                data={
+                    CONF_API_KEY: conf[CONF_API_KEY],
+                    CONF_LATITUDE: latitude,
+                    CONF_LONGITUDE: longitude,
+                    CONF_ELEVATION: elevation,
+                    CONF_BINARY_SENSORS: conf[CONF_BINARY_SENSORS],
+                    CONF_SENSORS: conf[CONF_SENSORS],
+                }))
+
+    hass.data[DOMAIN][CONF_SCAN_INTERVAL] = conf[CONF_SCAN_INTERVAL]
+
+    return True
+
+
+async def async_setup_entry(hass, config_entry):
+    """Set up OpenUV as config entry."""
+    from pyopenuv import Client
+    from pyopenuv.errors import OpenUvError
 
     try:
         websession = aiohttp_client.async_get_clientsession(hass)
         openuv = OpenUV(
             Client(
-                api_key, latitude, longitude, websession, altitude=elevation),
-            conf[CONF_BINARY_SENSORS][CONF_MONITORED_CONDITIONS] +
-            conf[CONF_SENSORS][CONF_MONITORED_CONDITIONS])
+                config_entry.data[CONF_API_KEY],
+                config_entry.data.get(CONF_LATITUDE, hass.config.latitude),
+                config_entry.data.get(CONF_LONGITUDE, hass.config.longitude),
+                websession,
+                altitude=config_entry.data.get(
+                    CONF_ELEVATION, hass.config.elevation)),
+            config_entry.data.get(CONF_BINARY_SENSORS, {}).get(
+                CONF_MONITORED_CONDITIONS, list(BINARY_SENSORS)),
+            config_entry.data.get(CONF_SENSORS, {}).get(
+                CONF_MONITORED_CONDITIONS, list(SENSORS)))
         await openuv.async_update()
-        hass.data[DOMAIN] = openuv
+        hass.data[DOMAIN][DATA_OPENUV_CLIENT][config_entry.entry_id] = openuv
     except OpenUvError as err:
         _LOGGER.error('An error occurred: %s', str(err))
         hass.components.persistent_notification.create(
@@ -125,13 +166,9 @@ async def async_setup(hass, config):
             notification_id=NOTIFICATION_ID)
         return False
 
-    for component, schema in [
-            ('binary_sensor', conf[CONF_BINARY_SENSORS]),
-            ('sensor', conf[CONF_SENSORS]),
-    ]:
-        hass.async_create_task(
-            discovery.async_load_platform(
-                hass, component, DOMAIN, schema, config))
+    for component in ('binary_sensor', 'sensor'):
+        hass.async_create_task(hass.config_entries.async_forward_entry_setup(
+            config_entry, component))
 
     async def refresh_sensors(event_time):
         """Refresh OpenUV data."""
@@ -139,7 +176,25 @@ async def async_setup(hass, config):
         await openuv.async_update()
         async_dispatcher_send(hass, TOPIC_UPDATE)
 
-    async_track_time_interval(hass, refresh_sensors, conf[CONF_SCAN_INTERVAL])
+    hass.data[DOMAIN][DATA_OPENUV_LISTENER][
+        config_entry.entry_id] = async_track_time_interval(
+            hass, refresh_sensors,
+            hass.data[DOMAIN][CONF_SCAN_INTERVAL])
+
+    return True
+
+
+async def async_unload_entry(hass, config_entry):
+    """Unload an OpenUV config entry."""
+    for component in ('binary_sensor', 'sensor'):
+        await hass.config_entries.async_forward_entry_unload(
+            config_entry, component)
+
+    hass.data[DOMAIN][DATA_OPENUV_CLIENT].pop(config_entry.entry_id)
+
+    remove_listener = hass.data[DOMAIN][DATA_OPENUV_LISTENER].pop(
+        config_entry.entry_id)
+    remove_listener()
 
     return True
 
@@ -147,19 +202,20 @@ async def async_setup(hass, config):
 class OpenUV:
     """Define a generic OpenUV object."""
 
-    def __init__(self, client, monitored_conditions):
+    def __init__(self, client, binary_sensor_conditions, sensor_conditions):
         """Initialize."""
-        self._monitored_conditions = monitored_conditions
+        self.binary_sensor_conditions = binary_sensor_conditions
         self.client = client
         self.data = {}
+        self.sensor_conditions = sensor_conditions
 
     async def async_update(self):
         """Update sensor/binary sensor data."""
-        if TYPE_PROTECTION_WINDOW in self._monitored_conditions:
+        if TYPE_PROTECTION_WINDOW in self.binary_sensor_conditions:
             data = await self.client.uv_protection_window()
             self.data[DATA_PROTECTION_WINDOW] = data
 
-        if any(c in self._monitored_conditions for c in SENSORS):
+        if any(c in self.sensor_conditions for c in SENSORS):
             data = await self.client.uv_index()
             self.data[DATA_UV] = data
 
diff --git a/homeassistant/components/openuv/config_flow.py b/homeassistant/components/openuv/config_flow.py
new file mode 100644
index 00000000000..55ee566268e
--- /dev/null
+++ b/homeassistant/components/openuv/config_flow.py
@@ -0,0 +1,73 @@
+"""Config flow to configure the OpenUV component."""
+
+from collections import OrderedDict
+
+import voluptuous as vol
+
+from homeassistant import config_entries, data_entry_flow
+from homeassistant.core import callback
+from homeassistant.const import (
+    CONF_API_KEY, CONF_ELEVATION, CONF_LATITUDE, CONF_LONGITUDE)
+from homeassistant.helpers import aiohttp_client, config_validation as cv
+
+from .const import DOMAIN
+
+
+@callback
+def configured_instances(hass):
+    """Return a set of configured OpenUV instances."""
+    return set(
+        '{0}, {1}'.format(
+            entry.data[CONF_LATITUDE], entry.data[CONF_LONGITUDE])
+        for entry in hass.config_entries.async_entries(DOMAIN))
+
+
+@config_entries.HANDLERS.register(DOMAIN)
+class OpenUvFlowHandler(data_entry_flow.FlowHandler):
+    """Handle an OpenUV config flow."""
+
+    VERSION = 1
+
+    def __init__(self):
+        """Initialize the config flow."""
+        pass
+
+    async def async_step_import(self, import_config):
+        """Import a config entry from configuration.yaml."""
+        return await self.async_step_user(import_config)
+
+    async def async_step_user(self, user_input=None):
+        """Handle the start of the config flow."""
+        from pyopenuv.util import validate_api_key
+
+        errors = {}
+
+        if user_input is not None:
+            identifier = '{0}, {1}'.format(
+                user_input.get(CONF_LATITUDE, self.hass.config.latitude),
+                user_input.get(CONF_LONGITUDE, self.hass.config.longitude))
+
+            if identifier in configured_instances(self.hass):
+                errors['base'] = 'identifier_exists'
+            else:
+                websession = aiohttp_client.async_get_clientsession(self.hass)
+                api_key_validation = await validate_api_key(
+                    user_input[CONF_API_KEY], websession)
+                if api_key_validation:
+                    return self.async_create_entry(
+                        title=identifier,
+                        data=user_input,
+                    )
+                errors['base'] = 'invalid_api_key'
+
+        data_schema = OrderedDict()
+        data_schema[vol.Required(CONF_API_KEY)] = str
+        data_schema[vol.Optional(CONF_LATITUDE)] = cv.latitude
+        data_schema[vol.Optional(CONF_LONGITUDE)] = cv.longitude
+        data_schema[vol.Optional(CONF_ELEVATION)] = vol.Coerce(float)
+
+        return self.async_show_form(
+            step_id='user',
+            data_schema=vol.Schema(data_schema),
+            errors=errors,
+        )
diff --git a/homeassistant/components/openuv/const.py b/homeassistant/components/openuv/const.py
new file mode 100644
index 00000000000..1aa3d2abcaa
--- /dev/null
+++ b/homeassistant/components/openuv/const.py
@@ -0,0 +1,3 @@
+"""Define constants for the OpenUV component."""
+
+DOMAIN = 'openuv'
diff --git a/homeassistant/components/openuv/strings.json b/homeassistant/components/openuv/strings.json
new file mode 100644
index 00000000000..9c5af45619e
--- /dev/null
+++ b/homeassistant/components/openuv/strings.json
@@ -0,0 +1,20 @@
+{
+  "config": {
+    "title": "OpenUV",
+    "step": {
+      "user": {
+        "title": "Fill in your information",
+        "data": {
+          "api_key": "OpenUV API Key",
+          "elevation": "Elevation",
+          "latitude": "Latitude",
+          "longitude": "Longitude"
+        }
+      }
+    },
+    "error": {
+      "identifier_exists": "Coordinates already registered",
+      "invalid_api_key": "Invalid API key"
+    }
+  }
+}
diff --git a/homeassistant/components/sensor/openuv.py b/homeassistant/components/sensor/openuv.py
index aaa04590b3f..22712aa306b 100644
--- a/homeassistant/components/sensor/openuv.py
+++ b/homeassistant/components/sensor/openuv.py
@@ -6,13 +6,12 @@ https://home-assistant.io/components/sensor.openuv/
 """
 import logging
 
-from homeassistant.const import CONF_MONITORED_CONDITIONS
 from homeassistant.core import callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.components.openuv import (
-    DATA_UV, DOMAIN, SENSORS, TOPIC_UPDATE, TYPE_CURRENT_OZONE_LEVEL,
-    TYPE_CURRENT_UV_INDEX, TYPE_CURRENT_UV_LEVEL, TYPE_MAX_UV_INDEX,
-    TYPE_SAFE_EXPOSURE_TIME_1, TYPE_SAFE_EXPOSURE_TIME_2,
+    DATA_OPENUV_CLIENT, DATA_UV, DOMAIN, SENSORS, TOPIC_UPDATE,
+    TYPE_CURRENT_OZONE_LEVEL, TYPE_CURRENT_UV_INDEX, TYPE_CURRENT_UV_LEVEL,
+    TYPE_MAX_UV_INDEX, TYPE_SAFE_EXPOSURE_TIME_1, TYPE_SAFE_EXPOSURE_TIME_2,
     TYPE_SAFE_EXPOSURE_TIME_3, TYPE_SAFE_EXPOSURE_TIME_4,
     TYPE_SAFE_EXPOSURE_TIME_5, TYPE_SAFE_EXPOSURE_TIME_6, OpenUvEntity)
 from homeassistant.util.dt import as_local, parse_datetime
@@ -40,16 +39,20 @@ UV_LEVEL_LOW = "Low"
 
 async def async_setup_platform(
         hass, config, async_add_entities, discovery_info=None):
-    """Set up the OpenUV binary sensor platform."""
-    if discovery_info is None:
-        return
+    """Set up an OpenUV sensor based on existing config."""
+    pass
 
-    openuv = hass.data[DOMAIN]
+
+async def async_setup_entry(hass, entry, async_add_entities):
+    """Set up a Nest sensor based on a config entry."""
+    openuv = hass.data[DOMAIN][DATA_OPENUV_CLIENT][entry.entry_id]
 
     sensors = []
-    for sensor_type in discovery_info[CONF_MONITORED_CONDITIONS]:
+    for sensor_type in openuv.sensor_conditions:
         name, icon, unit = SENSORS[sensor_type]
-        sensors.append(OpenUvSensor(openuv, sensor_type, name, icon, unit))
+        sensors.append(
+            OpenUvSensor(
+                openuv, sensor_type, name, icon, unit, entry.entry_id))
 
     async_add_entities(sensors, True)
 
@@ -57,10 +60,12 @@ async def async_setup_platform(
 class OpenUvSensor(OpenUvEntity):
     """Define a binary sensor for OpenUV."""
 
-    def __init__(self, openuv, sensor_type, name, icon, unit):
+    def __init__(self, openuv, sensor_type, name, icon, unit, entry_id):
         """Initialize the sensor."""
         super().__init__(openuv)
 
+        self._dispatch_remove = None
+        self._entry_id = entry_id
         self._icon = icon
         self._latitude = openuv.client.latitude
         self._longitude = openuv.client.longitude
@@ -102,7 +107,9 @@ class OpenUvSensor(OpenUvEntity):
 
     async def async_added_to_hass(self):
         """Register callbacks."""
-        async_dispatcher_connect(self.hass, TOPIC_UPDATE, self._update_data)
+        self._dispatch_remove = async_dispatcher_connect(
+            self.hass, TOPIC_UPDATE, self._update_data)
+        self.async_on_remove(self._dispatch_remove)
 
     async def async_update(self):
         """Update the state."""
@@ -125,8 +132,7 @@ class OpenUvSensor(OpenUvEntity):
         elif self._sensor_type == TYPE_MAX_UV_INDEX:
             self._state = data['uv_max']
             self._attrs.update({
-                ATTR_MAX_UV_TIME: as_local(
-                    parse_datetime(data['uv_max_time']))
+                ATTR_MAX_UV_TIME: as_local(parse_datetime(data['uv_max_time']))
             })
         elif self._sensor_type in (TYPE_SAFE_EXPOSURE_TIME_1,
                                    TYPE_SAFE_EXPOSURE_TIME_2,
diff --git a/homeassistant/config_entries.py b/homeassistant/config_entries.py
index 6eae9e13030..15932f2c3f8 100644
--- a/homeassistant/config_entries.py
+++ b/homeassistant/config_entries.py
@@ -141,6 +141,7 @@ FLOWS = [
     'homematicip_cloud',
     'hue',
     'nest',
+    'openuv',
     'sonos',
     'zone',
 ]
diff --git a/requirements_all.txt b/requirements_all.txt
index d8d73cc36a1..b155612350b 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -990,7 +990,7 @@ pynut2==2.1.2
 pynx584==0.4
 
 # homeassistant.components.openuv
-pyopenuv==1.0.1
+pyopenuv==1.0.4
 
 # homeassistant.components.iota
 pyota==2.0.5
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 0ee02e0d109..b9e44445114 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -154,6 +154,9 @@ pymonoprice==0.3
 # homeassistant.components.binary_sensor.nx584
 pynx584==0.4
 
+# homeassistant.components.openuv
+pyopenuv==1.0.4
+
 # homeassistant.auth.mfa_modules.totp
 # homeassistant.components.sensor.otp
 pyotp==2.2.6
diff --git a/script/gen_requirements_all.py b/script/gen_requirements_all.py
index 4b694ec7ec0..fc8e67b1ab6 100755
--- a/script/gen_requirements_all.py
+++ b/script/gen_requirements_all.py
@@ -78,6 +78,7 @@ TEST_REQUIREMENTS = (
     'pylitejet',
     'pymonoprice',
     'pynx584',
+    'pyopenuv',
     'pyotp',
     'pyqwikswitch',
     'PyRMVtransport',
diff --git a/tests/components/openuv/__init__.py b/tests/components/openuv/__init__.py
new file mode 100644
index 00000000000..0e3595b1e51
--- /dev/null
+++ b/tests/components/openuv/__init__.py
@@ -0,0 +1 @@
+"""Define tests for the OpenUV component."""
diff --git a/tests/components/openuv/test_config_flow.py b/tests/components/openuv/test_config_flow.py
new file mode 100644
index 00000000000..0e50bddabde
--- /dev/null
+++ b/tests/components/openuv/test_config_flow.py
@@ -0,0 +1,93 @@
+"""Define tests for the OpenUV config flow."""
+from unittest.mock import patch
+
+from homeassistant import data_entry_flow
+from homeassistant.components.openuv import DOMAIN, config_flow
+from homeassistant.const import (
+    CONF_API_KEY, CONF_ELEVATION, CONF_LATITUDE, CONF_LONGITUDE)
+
+from tests.common import MockConfigEntry, mock_coro
+
+
+async def test_duplicate_error(hass):
+    """Test that errors are shown when duplicates are added."""
+    conf = {
+        CONF_API_KEY: '12345abcde',
+        CONF_ELEVATION: 59.1234,
+        CONF_LATITUDE: 39.128712,
+        CONF_LONGITUDE: -104.9812612,
+    }
+
+    MockConfigEntry(domain=DOMAIN, data=conf).add_to_hass(hass)
+    flow = config_flow.OpenUvFlowHandler()
+    flow.hass = hass
+
+    result = await flow.async_step_user(user_input=conf)
+    assert result['errors'] == {'base': 'identifier_exists'}
+
+
+@patch('pyopenuv.util.validate_api_key', return_value=mock_coro(False))
+async def test_invalid_api_key(hass):
+    """Test that an invalid API key throws an error."""
+    conf = {
+        CONF_API_KEY: '12345abcde',
+        CONF_ELEVATION: 59.1234,
+        CONF_LATITUDE: 39.128712,
+        CONF_LONGITUDE: -104.9812612,
+    }
+
+    flow = config_flow.OpenUvFlowHandler()
+    flow.hass = hass
+
+    result = await flow.async_step_user(user_input=conf)
+    assert result['errors'] == {'base': 'invalid_api_key'}
+
+
+async def test_show_form(hass):
+    """Test that the form is served with no input."""
+    flow = config_flow.OpenUvFlowHandler()
+    flow.hass = hass
+
+    result = await flow.async_step_user(user_input=None)
+
+    assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
+    assert result['step_id'] == 'user'
+
+
+@patch('pyopenuv.util.validate_api_key', return_value=mock_coro(True))
+async def test_step_import(hass):
+    """Test that the import step works."""
+    conf = {
+        CONF_API_KEY: '12345abcde',
+    }
+
+    flow = config_flow.OpenUvFlowHandler()
+    flow.hass = hass
+
+    result = await flow.async_step_import(import_config=conf)
+
+    assert result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result['title'] == '{0}, {1}'.format(
+        hass.config.latitude, hass.config.longitude)
+    assert result['data'] == conf
+
+
+@patch('pyopenuv.util.validate_api_key', return_value=mock_coro(True))
+async def test_step_user(hass):
+    """Test that the user step works."""
+    conf = {
+        CONF_API_KEY: '12345abcde',
+        CONF_ELEVATION: 59.1234,
+        CONF_LATITUDE: 39.128712,
+        CONF_LONGITUDE: -104.9812612,
+    }
+
+    flow = config_flow.OpenUvFlowHandler()
+    flow.hass = hass
+
+    result = await flow.async_step_user(user_input=conf)
+
+    assert result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result['title'] == '{0}, {1}'.format(
+        conf[CONF_LATITUDE], conf[CONF_LONGITUDE])
+    assert result['data'] == conf

From 8fa999258915f84c0941986f578d81bec7cf5114 Mon Sep 17 00:00:00 2001
From: Robert Svensson <Kane610@users.noreply.github.com>
Date: Tue, 4 Sep 2018 09:24:42 +0200
Subject: [PATCH 041/357] Service to load new deCONZ devices without restart
 (#16308)

* New service to load new devices from deCONZ without restarting HASS

* Do not use len to check if list is empty

* Add support for scenes to be updated as well

* Rework refresh devices method

* Fix test
---
 homeassistant/components/deconz/__init__.py   | 54 +++++++++++++++++--
 homeassistant/components/deconz/services.yaml |  4 +-
 homeassistant/components/scene/deconz.py      | 19 ++++---
 requirements_all.txt                          |  2 +-
 requirements_test_all.txt                     |  2 +-
 tests/components/scene/test_deconz.py         |  1 +
 6 files changed, 70 insertions(+), 12 deletions(-)

diff --git a/homeassistant/components/deconz/__init__.py b/homeassistant/components/deconz/__init__.py
index e9f797d95f9..6ed0a6e2c11 100644
--- a/homeassistant/components/deconz/__init__.py
+++ b/homeassistant/components/deconz/__init__.py
@@ -24,7 +24,7 @@ from .const import (
     CONF_ALLOW_CLIP_SENSOR, CONFIG_FILE, DATA_DECONZ_EVENT,
     DATA_DECONZ_ID, DATA_DECONZ_UNSUB, DOMAIN, _LOGGER)
 
-REQUIREMENTS = ['pydeconz==45']
+REQUIREMENTS = ['pydeconz==47']
 
 CONFIG_SCHEMA = vol.Schema({
     DOMAIN: vol.Schema({
@@ -46,6 +46,8 @@ SERVICE_SCHEMA = vol.Schema({
     vol.Required(SERVICE_DATA): dict,
 })
 
+SERVICE_DEVICE_REFRESH = 'device_refresh'
+
 
 async def async_setup(hass, config):
     """Load configuration for deCONZ component.
@@ -84,15 +86,17 @@ async def async_setup_entry(hass, config_entry):
     @callback
     def async_add_device_callback(device_type, device):
         """Handle event of new device creation in deCONZ."""
+        if not isinstance(device, list):
+            device = [device]
         async_dispatcher_send(
-            hass, 'deconz_new_{}'.format(device_type), [device])
+            hass, 'deconz_new_{}'.format(device_type), device)
 
     session = aiohttp_client.async_get_clientsession(hass)
     deconz = DeconzSession(hass.loop, session, **config_entry.data,
                            async_add_device=async_add_device_callback)
     result = await deconz.async_load_parameters()
+
     if result is False:
-        _LOGGER.error("Failed to communicate with deCONZ")
         return False
 
     hass.data[DOMAIN] = deconz
@@ -149,16 +153,60 @@ async def async_setup_entry(hass, config_entry):
         data = call.data.get(SERVICE_DATA)
         deconz = hass.data[DOMAIN]
         if entity_id:
+
             entities = hass.data.get(DATA_DECONZ_ID)
+
             if entities:
                 field = entities.get(entity_id)
+
             if field is None:
                 _LOGGER.error('Could not find the entity %s', entity_id)
                 return
+
         await deconz.async_put_state(field, data)
+
     hass.services.async_register(
         DOMAIN, SERVICE_DECONZ, async_configure, schema=SERVICE_SCHEMA)
 
+    async def async_refresh_devices(call):
+        """Refresh available devices from deCONZ."""
+        deconz = hass.data[DOMAIN]
+
+        groups = list(deconz.groups.keys())
+        lights = list(deconz.lights.keys())
+        scenes = list(deconz.scenes.keys())
+        sensors = list(deconz.sensors.keys())
+
+        if not await deconz.async_load_parameters():
+            return
+
+        async_add_device_callback(
+            'group', [group
+                      for group_id, group in deconz.groups.items()
+                      if group_id not in groups]
+        )
+
+        async_add_device_callback(
+            'light', [light
+                      for light_id, light in deconz.lights.items()
+                      if light_id not in lights]
+        )
+
+        async_add_device_callback(
+            'scene', [scene
+                      for scene_id, scene in deconz.scenes.items()
+                      if scene_id not in scenes]
+        )
+
+        async_add_device_callback(
+            'sensor', [sensor
+                       for sensor_id, sensor in deconz.sensors.items()
+                       if sensor_id not in sensors]
+        )
+
+    hass.services.async_register(
+        DOMAIN, SERVICE_DEVICE_REFRESH, async_refresh_devices)
+
     @callback
     def deconz_shutdown(event):
         """
diff --git a/homeassistant/components/deconz/services.yaml b/homeassistant/components/deconz/services.yaml
index 78bf7041a93..fa0fb8e14a4 100644
--- a/homeassistant/components/deconz/services.yaml
+++ b/homeassistant/components/deconz/services.yaml
@@ -1,4 +1,3 @@
-
 configure:
   description: Set attribute of device in deCONZ. See https://home-assistant.io/components/deconz/#device-services for details.
   fields:
@@ -11,3 +10,6 @@ configure:
     data:
       description: Data is a json object with what data you want to alter.
       example: '{"on": true}'
+
+device_refresh:
+  description: Refresh device lists from deCONZ.
\ No newline at end of file
diff --git a/homeassistant/components/scene/deconz.py b/homeassistant/components/scene/deconz.py
index 5af8f657206..b8fca6d8630 100644
--- a/homeassistant/components/scene/deconz.py
+++ b/homeassistant/components/scene/deconz.py
@@ -5,8 +5,10 @@ For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/scene.deconz/
 """
 from homeassistant.components.deconz import (
-    DOMAIN as DATA_DECONZ, DATA_DECONZ_ID)
+    DOMAIN as DATA_DECONZ, DATA_DECONZ_ID, DATA_DECONZ_UNSUB)
 from homeassistant.components.scene import Scene
+from homeassistant.core import callback
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
 DEPENDENCIES = ['deconz']
 
@@ -19,12 +21,17 @@ async def async_setup_platform(hass, config, async_add_entities,
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up scenes for deCONZ component."""
-    scenes = hass.data[DATA_DECONZ].scenes
-    entities = []
+    @callback
+    def async_add_scene(scenes):
+        """Add scene from deCONZ."""
+        entities = []
+        for scene in scenes:
+            entities.append(DeconzScene(scene))
+        async_add_entities(entities)
+    hass.data[DATA_DECONZ_UNSUB].append(
+        async_dispatcher_connect(hass, 'deconz_new_scene', async_add_scene))
 
-    for scene in scenes.values():
-        entities.append(DeconzScene(scene))
-    async_add_entities(entities)
+    async_add_scene(hass.data[DATA_DECONZ].scenes.values())
 
 
 class DeconzScene(Scene):
diff --git a/requirements_all.txt b/requirements_all.txt
index b155612350b..5f4fd64a6a2 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -820,7 +820,7 @@ pycsspeechtts==1.0.2
 pydaikin==0.4
 
 # homeassistant.components.deconz
-pydeconz==45
+pydeconz==47
 
 # homeassistant.components.zwave
 pydispatcher==2.0.5
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index b9e44445114..236033e2f19 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -139,7 +139,7 @@ py-canary==0.5.0
 pyblackbird==0.5
 
 # homeassistant.components.deconz
-pydeconz==45
+pydeconz==47
 
 # homeassistant.components.zwave
 pydispatcher==2.0.5
diff --git a/tests/components/scene/test_deconz.py b/tests/components/scene/test_deconz.py
index 53f25808be2..8c22f718fa0 100644
--- a/tests/components/scene/test_deconz.py
+++ b/tests/components/scene/test_deconz.py
@@ -33,6 +33,7 @@ async def setup_bridge(hass, data):
                return_value=mock_coro(data)):
         await bridge.async_load_parameters()
     hass.data[deconz.DOMAIN] = bridge
+    hass.data[deconz.DATA_DECONZ_UNSUB] = []
     hass.data[deconz.DATA_DECONZ_ID] = {}
     config_entry = config_entries.ConfigEntry(
         1, deconz.DOMAIN, 'Mock Title', {'host': 'mock-host'}, 'test')

From e61ac1a4a1ec03f9852ff48e585a602d494bc80e Mon Sep 17 00:00:00 2001
From: Rohan Kapoor <rohan@rohankapoor.com>
Date: Tue, 4 Sep 2018 01:31:45 -0700
Subject: [PATCH 042/357] Delegate mqtt topic match validation to the paho mqtt
 client (#16403)

* Delegate mqtt match topics to the paho mqtt client

* Fixing linting error with importing MQTTMatcher
---
 homeassistant/components/mqtt/__init__.py | 26 +++++++----------------
 tests/components/mqtt/test_init.py        |  9 ++++++++
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/homeassistant/components/mqtt/__init__.py b/homeassistant/components/mqtt/__init__.py
index 71be9c2435e..6bb08d7e8e5 100644
--- a/homeassistant/components/mqtt/__init__.py
+++ b/homeassistant/components/mqtt/__init__.py
@@ -13,7 +13,6 @@ import os
 import socket
 import time
 import ssl
-import re
 import requests.certs
 import attr
 
@@ -727,23 +726,14 @@ def _raise_on_error(result_code: int) -> None:
 
 def _match_topic(subscription: str, topic: str) -> bool:
     """Test if topic matches subscription."""
-    reg_ex_parts = []  # type: List[str]
-    suffix = ""
-    if subscription.endswith('#'):
-        subscription = subscription[:-2]
-        suffix = "(.*)"
-    sub_parts = subscription.split('/')
-    for sub_part in sub_parts:
-        if sub_part == "+":
-            reg_ex_parts.append(r"([^\/]+)")
-        else:
-            reg_ex_parts.append(re.escape(sub_part))
-
-    reg_ex = "^" + (r'\/'.join(reg_ex_parts)) + suffix + "$"
-
-    reg = re.compile(reg_ex)
-
-    return reg.match(topic) is not None
+    from paho.mqtt.matcher import MQTTMatcher
+    matcher = MQTTMatcher()
+    matcher[subscription] = True
+    try:
+        next(matcher.iter_match(topic))
+        return True
+    except StopIteration:
+        return False
 
 
 class MqttAvailability(Entity):
diff --git a/tests/components/mqtt/test_init.py b/tests/components/mqtt/test_init.py
index ecbc7cb9b02..51bd75f66e3 100644
--- a/tests/components/mqtt/test_init.py
+++ b/tests/components/mqtt/test_init.py
@@ -277,6 +277,15 @@ class TestMQTTCallbacks(unittest.TestCase):
         self.hass.block_till_done()
         self.assertEqual(0, len(self.calls))
 
+    def test_subscribe_topic_level_wildcard_root_topic_no_subtree_match(self):
+        """Test the subscription of wildcard topics."""
+        mqtt.subscribe(self.hass, 'test-topic/#', self.record_calls)
+
+        fire_mqtt_message(self.hass, 'test-topic-123', 'test-payload')
+
+        self.hass.block_till_done()
+        self.assertEqual(0, len(self.calls))
+
     def test_subscribe_topic_subtree_wildcard_subtree_topic(self):
         """Test the subscription of wildcard topics."""
         mqtt.subscribe(self.hass, 'test-topic/#', self.record_calls)

From 85658b6dd17a200b57b7ee5728a3009ce24b359d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=B8yer=20Iversen?= <mail@dahoiv.net>
Date: Tue, 4 Sep 2018 10:50:12 +0200
Subject: [PATCH 043/357] Clean up dlink and some bug fix (#16346)

* Update dlink.py

* style

* style
---
 homeassistant/components/switch/dlink.py | 80 +++++++++++++++---------
 1 file changed, 52 insertions(+), 28 deletions(-)

diff --git a/homeassistant/components/switch/dlink.py b/homeassistant/components/switch/dlink.py
index f4eaefcae20..91ef546ea22 100644
--- a/homeassistant/components/switch/dlink.py
+++ b/homeassistant/components/switch/dlink.py
@@ -5,14 +5,17 @@ For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/switch.dlink/
 """
 import logging
+import urllib
+from datetime import timedelta
 
 import voluptuous as vol
 
-from homeassistant.components.switch import (SwitchDevice, PLATFORM_SCHEMA)
-from homeassistant.const import (
-    CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_USERNAME)
 import homeassistant.helpers.config_validation as cv
-from homeassistant.const import TEMP_CELSIUS, STATE_UNKNOWN
+from homeassistant.util import dt as dt_util
+from homeassistant.components.switch import (SwitchDevice, PLATFORM_SCHEMA)
+from homeassistant.const import (ATTR_TEMPERATURE,
+                                 CONF_HOST, CONF_NAME, CONF_PASSWORD,
+                                 CONF_USERNAME, TEMP_CELSIUS)
 
 REQUIREMENTS = ['pyW215==0.6.0']
 
@@ -23,9 +26,7 @@ DEFAULT_PASSWORD = ''
 DEFAULT_USERNAME = 'admin'
 CONF_USE_LEGACY_PROTOCOL = 'use_legacy_protocol'
 
-ATTR_CURRENT_CONSUMPTION = 'power_consumption'
 ATTR_TOTAL_CONSUMPTION = 'total_consumption'
-ATTR_TEMPERATURE = 'temperature'
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Required(CONF_HOST): cv.string,
@@ -35,6 +36,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
 })
 
+SCAN_INTERVAL = timedelta(minutes=2)
+
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up a D-Link Smart Plug."""
@@ -46,10 +49,11 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     use_legacy_protocol = config.get(CONF_USE_LEGACY_PROTOCOL)
     name = config.get(CONF_NAME)
 
-    data = SmartPlugData(SmartPlug(host,
-                                   password,
-                                   username,
-                                   use_legacy_protocol))
+    smartplug = SmartPlug(host,
+                          password,
+                          username,
+                          use_legacy_protocol)
+    data = SmartPlugData(smartplug)
 
     add_entities([SmartPlugSwitch(hass, data, name)], True)
 
@@ -74,37 +78,28 @@ class SmartPlugSwitch(SwitchDevice):
         try:
             ui_temp = self.units.temperature(int(self.data.temperature),
                                              TEMP_CELSIUS)
-            temperature = "%i %s" % \
-                          (ui_temp, self.units.temperature_unit)
+            temperature = ui_temp
         except (ValueError, TypeError):
-            temperature = STATE_UNKNOWN
+            temperature = None
 
         try:
-            current_consumption = "%.2f W" % \
-                                  float(self.data.current_consumption)
-        except ValueError:
-            current_consumption = STATE_UNKNOWN
-
-        try:
-            total_consumption = "%.1f kWh" % \
-                                float(self.data.total_consumption)
-        except ValueError:
-            total_consumption = STATE_UNKNOWN
+            total_consumption = float(self.data.total_consumption)
+        except (ValueError, TypeError):
+            total_consumption = None
 
         attrs = {
-            ATTR_CURRENT_CONSUMPTION: current_consumption,
             ATTR_TOTAL_CONSUMPTION: total_consumption,
-            ATTR_TEMPERATURE: temperature
+            ATTR_TEMPERATURE: temperature,
         }
 
         return attrs
 
     @property
-    def current_power_watt(self):
+    def current_power_w(self):
         """Return the current power usage in Watt."""
         try:
             return float(self.data.current_consumption)
-        except ValueError:
+        except (ValueError, TypeError):
             return None
 
     @property
@@ -124,6 +119,11 @@ class SmartPlugSwitch(SwitchDevice):
         """Get the latest data from the smart plug and updates the states."""
         self.data.update()
 
+    @property
+    def available(self) -> bool:
+        """Return True if entity is available."""
+        return self.data.available
+
 
 class SmartPlugData:
     """Get the latest data from smart plug."""
@@ -135,10 +135,34 @@ class SmartPlugData:
         self.temperature = None
         self.current_consumption = None
         self.total_consumption = None
+        self.available = False
+        self._n_tried = 0
+        self._last_tried = None
 
     def update(self):
         """Get the latest data from the smart plug."""
-        self.state = self.smartplug.state
+        if self._last_tried is not None:
+            last_try_s = (dt_util.now() - self._last_tried).total_seconds()/60
+            retry_seconds = min(self._n_tried*2, 10) - last_try_s
+            if self._n_tried > 0 and retry_seconds > 0:
+                _LOGGER.warning("Waiting %s s to retry", retry_seconds)
+                return
+
+        _state = 'unknown'
+        try:
+            self._last_tried = dt_util.now()
+            _state = self.smartplug.state
+        except urllib.error.HTTPError:
+            _LOGGER.error("Dlink connection problem")
+        if _state == 'unknown':
+            self._n_tried += 1
+            self.available = False
+            _LOGGER.warning("Failed to connect to dlink switch.")
+            return
+        self.state = _state
+        self.available = True
+
         self.temperature = self.smartplug.temperature
         self.current_consumption = self.smartplug.current_consumption
         self.total_consumption = self.smartplug.total_consumption
+        self._n_tried = 0

From 3bd12fcef6afb25d7cbf76191f320571f7af01f7 Mon Sep 17 00:00:00 2001
From: Toon Willems <m@toonwillems.be>
Date: Tue, 4 Sep 2018 11:15:02 +0200
Subject: [PATCH 044/357] Implement correct state for RFlink cover (#16304)

* implement correct state for rflink cover

* Fix linting error

* invert logic as local testing pointed out it should be reversed

* add period at the end to satisfy the linter
---
 homeassistant/components/cover/rflink.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/cover/rflink.py b/homeassistant/components/cover/rflink.py
index e50fa488b92..41a4c2af045 100644
--- a/homeassistant/components/cover/rflink.py
+++ b/homeassistant/components/cover/rflink.py
@@ -92,9 +92,9 @@ class RflinkCover(RflinkCommand, CoverDevice):
         self.cancel_queued_send_commands()
 
         command = event['command']
-        if command in ['on', 'allon']:
+        if command in ['on', 'allon', 'up']:
             self._state = True
-        elif command in ['off', 'alloff']:
+        elif command in ['off', 'alloff', 'down']:
             self._state = False
 
     @property
@@ -105,7 +105,12 @@ class RflinkCover(RflinkCommand, CoverDevice):
     @property
     def is_closed(self):
         """Return if the cover is closed."""
-        return None
+        return not self._state
+
+    @property
+    def assumed_state(self):
+        """Return True because covers can be stopped midway."""
+        return True
 
     def async_close_cover(self, **kwargs):
         """Turn the device close."""

From e1501c83f8d983becc557b7cb89ec746746495bb Mon Sep 17 00:00:00 2001
From: Paul Annekov <paul.annekov@gmail.com>
Date: Tue, 4 Sep 2018 22:03:30 +0300
Subject: [PATCH 045/357] Fix Mi Flora median calculation (#16085)

* fixed median was based on 1.5 minute interval, not 1 hour

* ignore median and set state from first value, when previous state was None

* update before add, removed unused 'retries' and 'ble_timeout', check if platform ready

* added missing blank line

* fixed too long line

* using modern python 3.5 features, changed comment to be less verbose

* continuation line fix

* removed DEFAULT_SCAN_INTERVAL in favor of existing SCAN_INTERVAL
---
 homeassistant/components/sensor/miflora.py | 38 ++++++++++++----------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/homeassistant/components/sensor/miflora.py b/homeassistant/components/sensor/miflora.py
index ced17512089..6f0fb3aba30 100644
--- a/homeassistant/components/sensor/miflora.py
+++ b/homeassistant/components/sensor/miflora.py
@@ -4,16 +4,19 @@ Support for Xiaomi Mi Flora BLE plant sensor.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/sensor.miflora/
 """
+import asyncio
+from datetime import timedelta
 import logging
-
 import voluptuous as vol
+import async_timeout
 
 from homeassistant.components.sensor import PLATFORM_SCHEMA
 from homeassistant.helpers.entity import Entity
 import homeassistant.helpers.config_validation as cv
+from homeassistant.exceptions import PlatformNotReady
 from homeassistant.const import (
-    CONF_FORCE_UPDATE, CONF_MONITORED_CONDITIONS, CONF_NAME, CONF_MAC
-)
+    CONF_FORCE_UPDATE, CONF_MONITORED_CONDITIONS, CONF_NAME, CONF_MAC,
+    CONF_SCAN_INTERVAL)
 
 
 REQUIREMENTS = ['miflora==0.4.0']
@@ -21,19 +24,14 @@ REQUIREMENTS = ['miflora==0.4.0']
 _LOGGER = logging.getLogger(__name__)
 
 CONF_ADAPTER = 'adapter'
-CONF_CACHE = 'cache_value'
 CONF_MEDIAN = 'median'
-CONF_RETRIES = 'retries'
-CONF_TIMEOUT = 'timeout'
 
 DEFAULT_ADAPTER = 'hci0'
-DEFAULT_UPDATE_INTERVAL = 1200
 DEFAULT_FORCE_UPDATE = False
 DEFAULT_MEDIAN = 3
 DEFAULT_NAME = 'Mi Flora'
-DEFAULT_RETRIES = 2
-DEFAULT_TIMEOUT = 10
 
+SCAN_INTERVAL = timedelta(seconds=1200)
 
 # Sensor types are defined like: Name, units
 SENSOR_TYPES = {
@@ -51,14 +49,12 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
     vol.Optional(CONF_MEDIAN, default=DEFAULT_MEDIAN): cv.positive_int,
     vol.Optional(CONF_FORCE_UPDATE, default=DEFAULT_FORCE_UPDATE): cv.boolean,
-    vol.Optional(CONF_TIMEOUT, default=DEFAULT_TIMEOUT): cv.positive_int,
-    vol.Optional(CONF_RETRIES, default=DEFAULT_RETRIES): cv.positive_int,
-    vol.Optional(CONF_CACHE, default=DEFAULT_UPDATE_INTERVAL): cv.positive_int,
     vol.Optional(CONF_ADAPTER, default=DEFAULT_ADAPTER): cv.string,
 })
 
 
-def setup_platform(hass, config, add_entities, discovery_info=None):
+async def async_setup_platform(hass, config, async_add_entities,
+                               discovery_info=None):
     """Set up the MiFlora sensor."""
     from miflora import miflora_poller
     try:
@@ -70,17 +66,22 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
         backend = GatttoolBackend
     _LOGGER.debug('Miflora is using %s backend.', backend.__name__)
 
-    cache = config.get(CONF_CACHE)
+    cache = config.get(CONF_SCAN_INTERVAL, SCAN_INTERVAL).total_seconds()
     poller = miflora_poller.MiFloraPoller(
         config.get(CONF_MAC), cache_timeout=cache,
         adapter=config.get(CONF_ADAPTER), backend=backend)
     force_update = config.get(CONF_FORCE_UPDATE)
     median = config.get(CONF_MEDIAN)
-    poller.ble_timeout = config.get(CONF_TIMEOUT)
-    poller.retries = config.get(CONF_RETRIES)
 
     devs = []
 
+    try:
+        with async_timeout.timeout(9):
+            await hass.async_add_executor_job(poller.fill_cache)
+    except asyncio.TimeoutError:
+        _LOGGER.error('Unable to connect to %s', config.get(CONF_MAC))
+        raise PlatformNotReady
+
     for parameter in config[CONF_MONITORED_CONDITIONS]:
         name = SENSOR_TYPES[parameter][0]
         unit = SENSOR_TYPES[parameter][1]
@@ -92,7 +93,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
         devs.append(MiFloraSensor(
             poller, parameter, name, unit, force_update, median))
 
-    add_entities(devs)
+    async_add_entities(devs, update_before_add=True)
 
 
 class MiFloraSensor(Entity):
@@ -171,5 +172,8 @@ class MiFloraSensor(Entity):
             median = sorted(self.data)[int((self.median_count - 1) / 2)]
             _LOGGER.debug("Median is: %s", median)
             self._state = median
+        elif self._state is None:
+            _LOGGER.debug("Set initial state")
+            self._state = self.data[0]
         else:
             _LOGGER.debug("Not yet enough data for median calculation")

From 746f4ac1585ac47be3bcc5d06d79b54da4a4e900 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Tue, 4 Sep 2018 21:16:24 +0200
Subject: [PATCH 046/357] Add context to scripts and automations (#16415)

* Add context to script helper

* Update script component

* Add context to automations

* Lint
---
 .../components/automation/__init__.py         | 91 ++++++++-----------
 homeassistant/components/automation/event.py  |  4 +-
 .../components/automation/homeassistant.py    |  8 +-
 .../components/automation/numeric_state.py    |  4 +-
 homeassistant/components/automation/state.py  |  4 +-
 .../components/automation/template.py         |  4 +-
 homeassistant/components/automation/zone.py   |  4 +-
 homeassistant/components/script.py            | 57 +++++-------
 homeassistant/helpers/script.py               | 46 ++++++----
 homeassistant/helpers/service.py              |  4 +-
 tests/components/automation/test_event.py     |  7 +-
 .../automation/test_numeric_state.py          | 10 +-
 tests/components/automation/test_state.py     |  6 +-
 tests/components/automation/test_template.py  | 12 +--
 tests/components/automation/test_zone.py      |  6 +-
 tests/components/test_script.py               | 13 ++-
 tests/helpers/test_script.py                  | 28 ++++--
 17 files changed, 164 insertions(+), 144 deletions(-)

diff --git a/homeassistant/components/automation/__init__.py b/homeassistant/components/automation/__init__.py
index c6c0af90d15..43fd4cedb88 100644
--- a/homeassistant/components/automation/__init__.py
+++ b/homeassistant/components/automation/__init__.py
@@ -158,27 +158,26 @@ def async_reload(hass):
     return hass.services.async_call(DOMAIN, SERVICE_RELOAD)
 
 
-@asyncio.coroutine
-def async_setup(hass, config):
+async def async_setup(hass, config):
     """Set up the automation."""
     component = EntityComponent(_LOGGER, DOMAIN, hass,
                                 group_name=GROUP_NAME_ALL_AUTOMATIONS)
 
-    yield from _async_process_config(hass, config, component)
+    await _async_process_config(hass, config, component)
 
-    @asyncio.coroutine
-    def trigger_service_handler(service_call):
+    async def trigger_service_handler(service_call):
         """Handle automation triggers."""
         tasks = []
         for entity in component.async_extract_from_service(service_call):
             tasks.append(entity.async_trigger(
-                service_call.data.get(ATTR_VARIABLES), True))
+                service_call.data.get(ATTR_VARIABLES),
+                skip_condition=True,
+                context=service_call.context))
 
         if tasks:
-            yield from asyncio.wait(tasks, loop=hass.loop)
+            await asyncio.wait(tasks, loop=hass.loop)
 
-    @asyncio.coroutine
-    def turn_onoff_service_handler(service_call):
+    async def turn_onoff_service_handler(service_call):
         """Handle automation turn on/off service calls."""
         tasks = []
         method = 'async_{}'.format(service_call.service)
@@ -186,10 +185,9 @@ def async_setup(hass, config):
             tasks.append(getattr(entity, method)())
 
         if tasks:
-            yield from asyncio.wait(tasks, loop=hass.loop)
+            await asyncio.wait(tasks, loop=hass.loop)
 
-    @asyncio.coroutine
-    def toggle_service_handler(service_call):
+    async def toggle_service_handler(service_call):
         """Handle automation toggle service calls."""
         tasks = []
         for entity in component.async_extract_from_service(service_call):
@@ -199,15 +197,14 @@ def async_setup(hass, config):
                 tasks.append(entity.async_turn_on())
 
         if tasks:
-            yield from asyncio.wait(tasks, loop=hass.loop)
+            await asyncio.wait(tasks, loop=hass.loop)
 
-    @asyncio.coroutine
-    def reload_service_handler(service_call):
+    async def reload_service_handler(service_call):
         """Remove all automations and load new ones from config."""
-        conf = yield from component.async_prepare_reload()
+        conf = await component.async_prepare_reload()
         if conf is None:
             return
-        yield from _async_process_config(hass, conf, component)
+        await _async_process_config(hass, conf, component)
 
     hass.services.async_register(
         DOMAIN, SERVICE_TRIGGER, trigger_service_handler,
@@ -272,15 +269,14 @@ class AutomationEntity(ToggleEntity):
         """Return True if entity is on."""
         return self._async_detach_triggers is not None
 
-    @asyncio.coroutine
-    def async_added_to_hass(self) -> None:
+    async def async_added_to_hass(self) -> None:
         """Startup with initial state or previous state."""
         if self._initial_state is not None:
             enable_automation = self._initial_state
             _LOGGER.debug("Automation %s initial state %s from config "
                           "initial_state", self.entity_id, enable_automation)
         else:
-            state = yield from async_get_last_state(self.hass, self.entity_id)
+            state = await async_get_last_state(self.hass, self.entity_id)
             if state:
                 enable_automation = state.state == STATE_ON
                 self._last_triggered = state.attributes.get('last_triggered')
@@ -298,54 +294,50 @@ class AutomationEntity(ToggleEntity):
 
         # HomeAssistant is starting up
         if self.hass.state == CoreState.not_running:
-            @asyncio.coroutine
-            def async_enable_automation(event):
+            async def async_enable_automation(event):
                 """Start automation on startup."""
-                yield from self.async_enable()
+                await self.async_enable()
 
             self.hass.bus.async_listen_once(
                 EVENT_HOMEASSISTANT_START, async_enable_automation)
 
         # HomeAssistant is running
         else:
-            yield from self.async_enable()
+            await self.async_enable()
 
-    @asyncio.coroutine
-    def async_turn_on(self, **kwargs) -> None:
+    async def async_turn_on(self, **kwargs) -> None:
         """Turn the entity on and update the state."""
         if self.is_on:
             return
 
-        yield from self.async_enable()
+        await self.async_enable()
 
-    @asyncio.coroutine
-    def async_turn_off(self, **kwargs) -> None:
+    async def async_turn_off(self, **kwargs) -> None:
         """Turn the entity off."""
         if not self.is_on:
             return
 
         self._async_detach_triggers()
         self._async_detach_triggers = None
-        yield from self.async_update_ha_state()
+        await self.async_update_ha_state()
 
-    @asyncio.coroutine
-    def async_trigger(self, variables, skip_condition=False):
+    async def async_trigger(self, variables, skip_condition=False,
+                            context=None):
         """Trigger automation.
 
         This method is a coroutine.
         """
         if skip_condition or self._cond_func(variables):
-            yield from self._async_action(self.entity_id, variables)
+            self.async_set_context(context)
+            await self._async_action(self.entity_id, variables, context)
             self._last_triggered = utcnow()
-            yield from self.async_update_ha_state()
+            await self.async_update_ha_state()
 
-    @asyncio.coroutine
-    def async_will_remove_from_hass(self):
+    async def async_will_remove_from_hass(self):
         """Remove listeners when removing automation from HASS."""
-        yield from self.async_turn_off()
+        await self.async_turn_off()
 
-    @asyncio.coroutine
-    def async_enable(self):
+    async def async_enable(self):
         """Enable this automation entity.
 
         This method is a coroutine.
@@ -353,9 +345,9 @@ class AutomationEntity(ToggleEntity):
         if self.is_on:
             return
 
-        self._async_detach_triggers = yield from self._async_attach_triggers(
+        self._async_detach_triggers = await self._async_attach_triggers(
             self.async_trigger)
-        yield from self.async_update_ha_state()
+        await self.async_update_ha_state()
 
     @property
     def device_state_attributes(self):
@@ -368,8 +360,7 @@ class AutomationEntity(ToggleEntity):
         }
 
 
-@asyncio.coroutine
-def _async_process_config(hass, config, component):
+async def _async_process_config(hass, config, component):
     """Process config and add automations.
 
     This method is a coroutine.
@@ -411,20 +402,19 @@ def _async_process_config(hass, config, component):
             entities.append(entity)
 
     if entities:
-        yield from component.async_add_entities(entities)
+        await component.async_add_entities(entities)
 
 
 def _async_get_action(hass, config, name):
     """Return an action based on a configuration."""
     script_obj = script.Script(hass, config, name)
 
-    @asyncio.coroutine
-    def action(entity_id, variables):
+    async def action(entity_id, variables, context):
         """Execute an action."""
         _LOGGER.info('Executing %s', name)
         logbook.async_log_entry(
             hass, name, 'has been triggered', DOMAIN, entity_id)
-        yield from script_obj.async_run(variables)
+        await script_obj.async_run(variables, context)
 
     return action
 
@@ -448,8 +438,7 @@ def _async_process_if(hass, config, p_config):
     return if_action
 
 
-@asyncio.coroutine
-def _async_process_trigger(hass, config, trigger_configs, name, action):
+async def _async_process_trigger(hass, config, trigger_configs, name, action):
     """Set up the triggers.
 
     This method is a coroutine.
@@ -457,13 +446,13 @@ def _async_process_trigger(hass, config, trigger_configs, name, action):
     removes = []
 
     for conf in trigger_configs:
-        platform = yield from async_prepare_setup_platform(
+        platform = await async_prepare_setup_platform(
             hass, config, DOMAIN, conf.get(CONF_PLATFORM))
 
         if platform is None:
             return None
 
-        remove = yield from platform.async_trigger(hass, conf, action)
+        remove = await platform.async_trigger(hass, conf, action)
 
         if not remove:
             _LOGGER.error("Error setting up trigger %s", name)
diff --git a/homeassistant/components/automation/event.py b/homeassistant/components/automation/event.py
index 7c035d7d1a5..e19a85edae6 100644
--- a/homeassistant/components/automation/event.py
+++ b/homeassistant/components/automation/event.py
@@ -45,11 +45,11 @@ def async_trigger(hass, config, action):
                 # If event data doesn't match requested schema, skip event
                 return
 
-        hass.async_run_job(action, {
+        hass.async_run_job(action({
             'trigger': {
                 'platform': 'event',
                 'event': event,
             },
-        })
+        }, context=event.context))
 
     return hass.bus.async_listen(event_type, handle_event)
diff --git a/homeassistant/components/automation/homeassistant.py b/homeassistant/components/automation/homeassistant.py
index 74cf195bc61..b55d99f706a 100644
--- a/homeassistant/components/automation/homeassistant.py
+++ b/homeassistant/components/automation/homeassistant.py
@@ -32,12 +32,12 @@ def async_trigger(hass, config, action):
         @callback
         def hass_shutdown(event):
             """Execute when Home Assistant is shutting down."""
-            hass.async_run_job(action, {
+            hass.async_run_job(action({
                 'trigger': {
                     'platform': 'homeassistant',
                     'event': event,
                 },
-            })
+            }, context=event.context))
 
         return hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP,
                                           hass_shutdown)
@@ -45,11 +45,11 @@ def async_trigger(hass, config, action):
     # Automation are enabled while hass is starting up, fire right away
     # Check state because a config reload shouldn't trigger it.
     if hass.state == CoreState.starting:
-        hass.async_run_job(action, {
+        hass.async_run_job(action({
             'trigger': {
                 'platform': 'homeassistant',
                 'event': event,
             },
-        })
+        }))
 
     return lambda: None
diff --git a/homeassistant/components/automation/numeric_state.py b/homeassistant/components/automation/numeric_state.py
index b59271f25e5..f0dcbf0be57 100644
--- a/homeassistant/components/automation/numeric_state.py
+++ b/homeassistant/components/automation/numeric_state.py
@@ -66,7 +66,7 @@ def async_trigger(hass, config, action):
         @callback
         def call_action():
             """Call action with right context."""
-            hass.async_run_job(action, {
+            hass.async_run_job(action({
                 'trigger': {
                     'platform': 'numeric_state',
                     'entity_id': entity,
@@ -75,7 +75,7 @@ def async_trigger(hass, config, action):
                     'from_state': from_s,
                     'to_state': to_s,
                 }
-            })
+            }, context=to_s.context))
 
         matching = check_numeric_state(entity, from_s, to_s)
 
diff --git a/homeassistant/components/automation/state.py b/homeassistant/components/automation/state.py
index 9243f960850..263d4158e25 100644
--- a/homeassistant/components/automation/state.py
+++ b/homeassistant/components/automation/state.py
@@ -43,7 +43,7 @@ def async_trigger(hass, config, action):
         @callback
         def call_action():
             """Call action with right context."""
-            hass.async_run_job(action, {
+            hass.async_run_job(action({
                 'trigger': {
                     'platform': 'state',
                     'entity_id': entity,
@@ -51,7 +51,7 @@ def async_trigger(hass, config, action):
                     'to_state': to_s,
                     'for': time_delta,
                 }
-            })
+            }, context=to_s.context))
 
         # Ignore changes to state attributes if from/to is in use
         if (not match_all and from_s is not None and to_s is not None and
diff --git a/homeassistant/components/automation/template.py b/homeassistant/components/automation/template.py
index 0fcdeaae5e0..67a44f1a347 100644
--- a/homeassistant/components/automation/template.py
+++ b/homeassistant/components/automation/template.py
@@ -32,13 +32,13 @@ def async_trigger(hass, config, action):
     @callback
     def template_listener(entity_id, from_s, to_s):
         """Listen for state changes and calls action."""
-        hass.async_run_job(action, {
+        hass.async_run_job(action({
             'trigger': {
                 'platform': 'template',
                 'entity_id': entity_id,
                 'from_state': from_s,
                 'to_state': to_s,
             },
-        })
+        }, context=to_s.context))
 
     return async_track_template(hass, value_template, template_listener)
diff --git a/homeassistant/components/automation/zone.py b/homeassistant/components/automation/zone.py
index 61d846582cb..f30dfe753cb 100644
--- a/homeassistant/components/automation/zone.py
+++ b/homeassistant/components/automation/zone.py
@@ -51,7 +51,7 @@ def async_trigger(hass, config, action):
         # pylint: disable=too-many-boolean-expressions
         if event == EVENT_ENTER and not from_match and to_match or \
            event == EVENT_LEAVE and from_match and not to_match:
-            hass.async_run_job(action, {
+            hass.async_run_job(action({
                 'trigger': {
                     'platform': 'zone',
                     'entity_id': entity,
@@ -60,7 +60,7 @@ def async_trigger(hass, config, action):
                     'zone': zone_state,
                     'event': event,
                 },
-            })
+            }, context=to_s.context))
 
     return async_track_state_change(hass, entity_id, zone_automation_listener,
                                     MATCH_ALL, MATCH_ALL)
diff --git a/homeassistant/components/script.py b/homeassistant/components/script.py
index a45f8ba8930..247ac07283e 100644
--- a/homeassistant/components/script.py
+++ b/homeassistant/components/script.py
@@ -63,11 +63,11 @@ def is_on(hass, entity_id):
 
 
 @bind_hass
-def turn_on(hass, entity_id, variables=None):
+def turn_on(hass, entity_id, variables=None, context=None):
     """Turn script on."""
     _, object_id = split_entity_id(entity_id)
 
-    hass.services.call(DOMAIN, object_id, variables)
+    hass.services.call(DOMAIN, object_id, variables, context=context)
 
 
 @bind_hass
@@ -97,45 +97,41 @@ def async_reload(hass):
     return hass.services.async_call(DOMAIN, SERVICE_RELOAD)
 
 
-@asyncio.coroutine
-def async_setup(hass, config):
+async def async_setup(hass, config):
     """Load the scripts from the configuration."""
     component = EntityComponent(
         _LOGGER, DOMAIN, hass, group_name=GROUP_NAME_ALL_SCRIPTS)
 
-    yield from _async_process_config(hass, config, component)
+    await _async_process_config(hass, config, component)
 
-    @asyncio.coroutine
-    def reload_service(service):
+    async def reload_service(service):
         """Call a service to reload scripts."""
-        conf = yield from component.async_prepare_reload()
+        conf = await component.async_prepare_reload()
         if conf is None:
             return
 
-        yield from _async_process_config(hass, conf, component)
+        await _async_process_config(hass, conf, component)
 
-    @asyncio.coroutine
-    def turn_on_service(service):
+    async def turn_on_service(service):
         """Call a service to turn script on."""
         # We could turn on script directly here, but we only want to offer
         # one way to do it. Otherwise no easy way to detect invocations.
         var = service.data.get(ATTR_VARIABLES)
         for script in component.async_extract_from_service(service):
-            yield from hass.services.async_call(DOMAIN, script.object_id, var)
+            await hass.services.async_call(DOMAIN, script.object_id, var,
+                                           context=service.context)
 
-    @asyncio.coroutine
-    def turn_off_service(service):
+    async def turn_off_service(service):
         """Cancel a script."""
         # Stopping a script is ok to be done in parallel
-        yield from asyncio.wait(
+        await asyncio.wait(
             [script.async_turn_off() for script
              in component.async_extract_from_service(service)], loop=hass.loop)
 
-    @asyncio.coroutine
-    def toggle_service(service):
+    async def toggle_service(service):
         """Toggle a script."""
         for script in component.async_extract_from_service(service):
-            yield from script.async_toggle()
+            await script.async_toggle(context=service.context)
 
     hass.services.async_register(DOMAIN, SERVICE_RELOAD, reload_service,
                                  schema=RELOAD_SERVICE_SCHEMA)
@@ -149,18 +145,17 @@ def async_setup(hass, config):
     return True
 
 
-@asyncio.coroutine
-def _async_process_config(hass, config, component):
-    """Process group configuration."""
-    @asyncio.coroutine
-    def service_handler(service):
+async def _async_process_config(hass, config, component):
+    """Process script configuration."""
+    async def service_handler(service):
         """Execute a service call to script.<script name>."""
         entity_id = ENTITY_ID_FORMAT.format(service.service)
         script = component.get_entity(entity_id)
         if script.is_on:
             _LOGGER.warning("Script %s already running.", entity_id)
             return
-        yield from script.async_turn_on(variables=service.data)
+        await script.async_turn_on(variables=service.data,
+                                   context=service.context)
 
     scripts = []
 
@@ -171,7 +166,7 @@ def _async_process_config(hass, config, component):
         hass.services.async_register(
             DOMAIN, object_id, service_handler, schema=SCRIPT_SERVICE_SCHEMA)
 
-    yield from component.async_add_entities(scripts)
+    await component.async_add_entities(scripts)
 
 
 class ScriptEntity(ToggleEntity):
@@ -209,18 +204,16 @@ class ScriptEntity(ToggleEntity):
         """Return true if script is on."""
         return self.script.is_running
 
-    @asyncio.coroutine
-    def async_turn_on(self, **kwargs):
+    async def async_turn_on(self, **kwargs):
         """Turn the script on."""
-        yield from self.script.async_run(kwargs.get(ATTR_VARIABLES))
+        await self.script.async_run(
+            kwargs.get(ATTR_VARIABLES), kwargs.get('context'))
 
-    @asyncio.coroutine
-    def async_turn_off(self, **kwargs):
+    async def async_turn_off(self, **kwargs):
         """Turn script off."""
         self.script.async_stop()
 
-    @asyncio.coroutine
-    def async_will_remove_from_hass(self):
+    async def async_will_remove_from_hass(self):
         """Stop script and remove service when it will be removed from HASS."""
         if self.script.is_running:
             self.script.async_stop()
diff --git a/homeassistant/helpers/script.py b/homeassistant/helpers/script.py
index acaeb545815..8a33b57e9d1 100644
--- a/homeassistant/helpers/script.py
+++ b/homeassistant/helpers/script.py
@@ -6,7 +6,7 @@ from typing import Optional, Sequence
 
 import voluptuous as vol
 
-from homeassistant.core import HomeAssistant, callback
+from homeassistant.core import HomeAssistant, Context, callback
 from homeassistant.const import CONF_CONDITION, CONF_TIMEOUT
 from homeassistant.exceptions import TemplateError
 from homeassistant.helpers import (
@@ -34,9 +34,10 @@ CONF_CONTINUE = 'continue_on_timeout'
 
 
 def call_from_config(hass: HomeAssistant, config: ConfigType,
-                     variables: Optional[Sequence] = None) -> None:
+                     variables: Optional[Sequence] = None,
+                     context: Optional[Context] = None) -> None:
     """Call a script based on a config entry."""
-    Script(hass, cv.SCRIPT_SCHEMA(config)).run(variables)
+    Script(hass, cv.SCRIPT_SCHEMA(config)).run(variables, context)
 
 
 class Script():
@@ -64,12 +65,13 @@ class Script():
         """Return true if script is on."""
         return self._cur != -1
 
-    def run(self, variables=None):
+    def run(self, variables=None, context=None):
         """Run script."""
         run_coroutine_threadsafe(
-            self.async_run(variables), self.hass.loop).result()
+            self.async_run(variables, context), self.hass.loop).result()
 
-    async def async_run(self, variables: Optional[Sequence] = None) -> None:
+    async def async_run(self, variables: Optional[Sequence] = None,
+                        context: Optional[Context] = None) -> None:
         """Run script.
 
         This method is a coroutine.
@@ -94,7 +96,8 @@ class Script():
                     """Handle delay."""
                     # pylint: disable=cell-var-from-loop
                     self._async_listener.remove(unsub)
-                    self.hass.async_add_job(self.async_run(variables))
+                    self.hass.async_create_task(
+                        self.async_run(variables, context))
 
                 delay = action[CONF_DELAY]
 
@@ -134,7 +137,8 @@ class Script():
                 def async_script_wait(entity_id, from_s, to_s):
                     """Handle script after template condition is true."""
                     self._async_remove_listener()
-                    self.hass.async_add_job(self.async_run(variables))
+                    self.hass.async_create_task(
+                        self.async_run(variables, context))
 
                 self._async_listener.append(async_track_template(
                     self.hass, wait_template, async_script_wait, variables))
@@ -145,7 +149,8 @@ class Script():
 
                 if CONF_TIMEOUT in action:
                     self._async_set_timeout(
-                        action, variables, action.get(CONF_CONTINUE, True))
+                        action, variables, context,
+                        action.get(CONF_CONTINUE, True))
 
                 return
 
@@ -154,10 +159,10 @@ class Script():
                     break
 
             elif CONF_EVENT in action:
-                self._async_fire_event(action, variables)
+                self._async_fire_event(action, variables, context)
 
             else:
-                await self._async_call_service(action, variables)
+                await self._async_call_service(action, variables, context)
 
         self._cur = -1
         self.last_action = None
@@ -178,7 +183,7 @@ class Script():
         if self._change_listener:
             self.hass.async_add_job(self._change_listener)
 
-    async def _async_call_service(self, action, variables):
+    async def _async_call_service(self, action, variables, context):
         """Call the service specified in the action.
 
         This method is a coroutine.
@@ -186,9 +191,14 @@ class Script():
         self.last_action = action.get(CONF_ALIAS, 'call service')
         self._log("Executing step %s" % self.last_action)
         await service.async_call_from_config(
-            self.hass, action, True, variables, validate_config=False)
+            self.hass, action,
+            blocking=True,
+            variables=variables,
+            validate_config=False,
+            context=context
+        )
 
-    def _async_fire_event(self, action, variables):
+    def _async_fire_event(self, action, variables, context):
         """Fire an event."""
         self.last_action = action.get(CONF_ALIAS, action[CONF_EVENT])
         self._log("Executing step %s" % self.last_action)
@@ -201,7 +211,7 @@ class Script():
                 _LOGGER.error('Error rendering event data template: %s', ex)
 
         self.hass.bus.async_fire(action[CONF_EVENT],
-                                 event_data)
+                                 event_data, context=context)
 
     def _async_check_condition(self, action, variables):
         """Test if condition is matching."""
@@ -216,7 +226,8 @@ class Script():
         self._log("Test condition {}: {}".format(self.last_action, check))
         return check
 
-    def _async_set_timeout(self, action, variables, continue_on_timeout=True):
+    def _async_set_timeout(self, action, variables, context,
+                           continue_on_timeout):
         """Schedule a timeout to abort or continue script."""
         timeout = action[CONF_TIMEOUT]
         unsub = None
@@ -229,7 +240,8 @@ class Script():
             # Check if we want to continue to execute
             # the script after the timeout
             if continue_on_timeout:
-                self.hass.async_add_job(self.async_run(variables))
+                self.hass.async_create_task(
+                    self.async_run(variables, context))
             else:
                 self._log("Timeout reached, abort script.")
                 self.async_stop()
diff --git a/homeassistant/helpers/service.py b/homeassistant/helpers/service.py
index fcdc3cfe856..3abf1dab59e 100644
--- a/homeassistant/helpers/service.py
+++ b/homeassistant/helpers/service.py
@@ -36,7 +36,7 @@ def call_from_config(hass, config, blocking=False, variables=None,
 
 @bind_hass
 async def async_call_from_config(hass, config, blocking=False, variables=None,
-                                 validate_config=True):
+                                 validate_config=True, context=None):
     """Call a service based on a config hash."""
     if validate_config:
         try:
@@ -77,7 +77,7 @@ async def async_call_from_config(hass, config, blocking=False, variables=None,
         service_data[ATTR_ENTITY_ID] = config[CONF_SERVICE_ENTITY_ID]
 
     await hass.services.async_call(
-        domain, service_name, service_data, blocking)
+        domain, service_name, service_data, blocking=blocking, context=context)
 
 
 @bind_hass
diff --git a/tests/components/automation/test_event.py b/tests/components/automation/test_event.py
index c52ea7b9d29..6e16c03f2dc 100644
--- a/tests/components/automation/test_event.py
+++ b/tests/components/automation/test_event.py
@@ -1,7 +1,7 @@
 """The tests for the Event automation."""
 import unittest
 
-from homeassistant.core import callback
+from homeassistant.core import Context, callback
 from homeassistant.setup import setup_component
 import homeassistant.components.automation as automation
 
@@ -31,6 +31,8 @@ class TestAutomationEvent(unittest.TestCase):
 
     def test_if_fires_on_event(self):
         """Test the firing of events."""
+        context = Context()
+
         assert setup_component(self.hass, automation.DOMAIN, {
             automation.DOMAIN: {
                 'trigger': {
@@ -43,9 +45,10 @@ class TestAutomationEvent(unittest.TestCase):
             }
         })
 
-        self.hass.bus.fire('test_event')
+        self.hass.bus.fire('test_event', context=context)
         self.hass.block_till_done()
         self.assertEqual(1, len(self.calls))
+        assert self.calls[0].context is context
 
         automation.turn_off(self.hass)
         self.hass.block_till_done()
diff --git a/tests/components/automation/test_numeric_state.py b/tests/components/automation/test_numeric_state.py
index 49565c37222..af95bc0ff02 100644
--- a/tests/components/automation/test_numeric_state.py
+++ b/tests/components/automation/test_numeric_state.py
@@ -4,7 +4,7 @@ import unittest
 from unittest.mock import patch
 
 import homeassistant.components.automation as automation
-from homeassistant.core import callback
+from homeassistant.core import Context, callback
 from homeassistant.setup import setup_component
 import homeassistant.util.dt as dt_util
 
@@ -36,6 +36,7 @@ class TestAutomationNumericState(unittest.TestCase):
 
     def test_if_fires_on_entity_change_below(self):
         """Test the firing with changed entity."""
+        context = Context()
         assert setup_component(self.hass, automation.DOMAIN, {
             automation.DOMAIN: {
                 'trigger': {
@@ -49,9 +50,10 @@ class TestAutomationNumericState(unittest.TestCase):
             }
         })
         # 9 is below 10
-        self.hass.states.set('test.entity', 9)
+        self.hass.states.set('test.entity', 9, context=context)
         self.hass.block_till_done()
         self.assertEqual(1, len(self.calls))
+        assert self.calls[0].context is context
 
         # Set above 12 so the automation will fire again
         self.hass.states.set('test.entity', 12)
@@ -116,6 +118,7 @@ class TestAutomationNumericState(unittest.TestCase):
 
     def test_if_not_fires_on_entity_change_below_to_below(self):
         """Test the firing with changed entity."""
+        context = Context()
         self.hass.states.set('test.entity', 11)
         self.hass.block_till_done()
 
@@ -133,9 +136,10 @@ class TestAutomationNumericState(unittest.TestCase):
         })
 
         # 9 is below 10 so this should fire
-        self.hass.states.set('test.entity', 9)
+        self.hass.states.set('test.entity', 9, context=context)
         self.hass.block_till_done()
         self.assertEqual(1, len(self.calls))
+        assert self.calls[0].context is context
 
         # already below so should not fire again
         self.hass.states.set('test.entity', 5)
diff --git a/tests/components/automation/test_state.py b/tests/components/automation/test_state.py
index 6b1a8914aad..274980fabc0 100644
--- a/tests/components/automation/test_state.py
+++ b/tests/components/automation/test_state.py
@@ -4,7 +4,7 @@ from datetime import timedelta
 import unittest
 from unittest.mock import patch
 
-from homeassistant.core import callback
+from homeassistant.core import Context, callback
 from homeassistant.setup import setup_component
 import homeassistant.util.dt as dt_util
 import homeassistant.components.automation as automation
@@ -38,6 +38,7 @@ class TestAutomationState(unittest.TestCase):
 
     def test_if_fires_on_entity_change(self):
         """Test for firing on entity change."""
+        context = Context()
         self.hass.states.set('test.entity', 'hello')
         self.hass.block_till_done()
 
@@ -59,9 +60,10 @@ class TestAutomationState(unittest.TestCase):
             }
         })
 
-        self.hass.states.set('test.entity', 'world')
+        self.hass.states.set('test.entity', 'world', context=context)
         self.hass.block_till_done()
         self.assertEqual(1, len(self.calls))
+        assert self.calls[0].context is context
         self.assertEqual(
             'state - test.entity - hello - world - None',
             self.calls[0].data['some'])
diff --git a/tests/components/automation/test_template.py b/tests/components/automation/test_template.py
index ef064a2c1d8..e9c763ccc73 100644
--- a/tests/components/automation/test_template.py
+++ b/tests/components/automation/test_template.py
@@ -1,7 +1,7 @@
 """The tests for the Template automation."""
 import unittest
 
-from homeassistant.core import callback
+from homeassistant.core import Context, callback
 from homeassistant.setup import setup_component
 import homeassistant.components.automation as automation
 
@@ -232,15 +232,12 @@ class TestAutomationTemplate(unittest.TestCase):
 
     def test_if_fires_on_change_with_template_advanced(self):
         """Test for firing on change with template advanced."""
+        context = Context()
         assert setup_component(self.hass, automation.DOMAIN, {
             automation.DOMAIN: {
                 'trigger': {
                     'platform': 'template',
-                    'value_template': '''{%- if is_state("test.entity", "world") -%}
-                                         true
-                                         {%- else -%}
-                                         false
-                                         {%- endif -%}''',
+                    'value_template': '{{ is_state("test.entity", "world") }}'
                 },
                 'action': {
                     'service': 'test.automation',
@@ -257,9 +254,10 @@ class TestAutomationTemplate(unittest.TestCase):
         self.hass.block_till_done()
         self.calls = []
 
-        self.hass.states.set('test.entity', 'world')
+        self.hass.states.set('test.entity', 'world', context=context)
         self.hass.block_till_done()
         self.assertEqual(1, len(self.calls))
+        assert self.calls[0].context is context
         self.assertEqual(
             'template - test.entity - hello - world',
             self.calls[0].data['some'])
diff --git a/tests/components/automation/test_zone.py b/tests/components/automation/test_zone.py
index baa3bdc1d28..d146278a997 100644
--- a/tests/components/automation/test_zone.py
+++ b/tests/components/automation/test_zone.py
@@ -1,7 +1,7 @@
 """The tests for the location automation."""
 import unittest
 
-from homeassistant.core import callback
+from homeassistant.core import Context, callback
 from homeassistant.setup import setup_component
 from homeassistant.components import automation, zone
 
@@ -40,6 +40,7 @@ class TestAutomationZone(unittest.TestCase):
 
     def test_if_fires_on_zone_enter(self):
         """Test for firing on zone enter."""
+        context = Context()
         self.hass.states.set('test.entity', 'hello', {
             'latitude': 32.881011,
             'longitude': -117.234758
@@ -70,10 +71,11 @@ class TestAutomationZone(unittest.TestCase):
         self.hass.states.set('test.entity', 'hello', {
             'latitude': 32.880586,
             'longitude': -117.237564
-        })
+        }, context=context)
         self.hass.block_till_done()
 
         self.assertEqual(1, len(self.calls))
+        assert self.calls[0].context is context
         self.assertEqual(
             'zone - test.entity - hello - hello - test',
             self.calls[0].data['some'])
diff --git a/tests/components/test_script.py b/tests/components/test_script.py
index 8ad782cf697..b9aa921cb63 100644
--- a/tests/components/test_script.py
+++ b/tests/components/test_script.py
@@ -3,7 +3,7 @@
 import unittest
 from unittest.mock import patch
 
-from homeassistant.core import callback
+from homeassistant.core import Context, callback
 from homeassistant.setup import setup_component
 from homeassistant.components import script
 
@@ -134,6 +134,7 @@ class TestScriptComponent(unittest.TestCase):
     def test_passing_variables(self):
         """Test different ways of passing in variables."""
         calls = []
+        context = Context()
 
         @callback
         def record_call(service):
@@ -157,21 +158,23 @@ class TestScriptComponent(unittest.TestCase):
 
         script.turn_on(self.hass, ENTITY_ID, {
             'greeting': 'world'
-        })
+        }, context=context)
 
         self.hass.block_till_done()
 
         assert len(calls) == 1
-        assert calls[-1].data['hello'] == 'world'
+        assert calls[0].context is context
+        assert calls[0].data['hello'] == 'world'
 
         self.hass.services.call('script', 'test', {
             'greeting': 'universe',
-        })
+        }, context=context)
 
         self.hass.block_till_done()
 
         assert len(calls) == 2
-        assert calls[-1].data['hello'] == 'universe'
+        assert calls[1].context is context
+        assert calls[1].data['hello'] == 'universe'
 
     def test_reload_service(self):
         """Verify that the turn_on service."""
diff --git a/tests/helpers/test_script.py b/tests/helpers/test_script.py
index ba5bdbcdc6e..2956d82c2ba 100644
--- a/tests/helpers/test_script.py
+++ b/tests/helpers/test_script.py
@@ -4,7 +4,7 @@ from datetime import timedelta
 from unittest import mock
 import unittest
 
-from homeassistant.core import callback
+from homeassistant.core import Context, callback
 # Otherwise can't test just this file (import order issue)
 import homeassistant.components  # noqa
 import homeassistant.util.dt as dt_util
@@ -32,6 +32,7 @@ class TestScriptHelper(unittest.TestCase):
     def test_firing_event(self):
         """Test the firing of events."""
         event = 'test_event'
+        context = Context()
         calls = []
 
         @callback
@@ -48,17 +49,19 @@ class TestScriptHelper(unittest.TestCase):
             }
         }))
 
-        script_obj.run()
+        script_obj.run(context=context)
 
         self.hass.block_till_done()
 
         assert len(calls) == 1
+        assert calls[0].context is context
         assert calls[0].data.get('hello') == 'world'
         assert not script_obj.can_cancel
 
     def test_firing_event_template(self):
         """Test the firing of events."""
         event = 'test_event'
+        context = Context()
         calls = []
 
         @callback
@@ -82,11 +85,12 @@ class TestScriptHelper(unittest.TestCase):
             }
         }))
 
-        script_obj.run({'is_world': 'yes'})
+        script_obj.run({'is_world': 'yes'}, context=context)
 
         self.hass.block_till_done()
 
         assert len(calls) == 1
+        assert calls[0].context is context
         assert calls[0].data == {
             'dict': {
                 1: 'yes',
@@ -100,6 +104,7 @@ class TestScriptHelper(unittest.TestCase):
     def test_calling_service(self):
         """Test the calling of a service."""
         calls = []
+        context = Context()
 
         @callback
         def record_call(service):
@@ -113,16 +118,18 @@ class TestScriptHelper(unittest.TestCase):
             'data': {
                 'hello': 'world'
             }
-        })
+        }, context=context)
 
         self.hass.block_till_done()
 
         assert len(calls) == 1
+        assert calls[0].context is context
         assert calls[0].data.get('hello') == 'world'
 
     def test_calling_service_template(self):
         """Test the calling of a service."""
         calls = []
+        context = Context()
 
         @callback
         def record_call(service):
@@ -147,17 +154,19 @@ class TestScriptHelper(unittest.TestCase):
                     {% endif %}
                 """
             }
-        }, {'is_world': 'yes'})
+        }, {'is_world': 'yes'}, context=context)
 
         self.hass.block_till_done()
 
         assert len(calls) == 1
+        assert calls[0].context is context
         assert calls[0].data.get('hello') == 'world'
 
     def test_delay(self):
         """Test the delay."""
         event = 'test_event'
         events = []
+        context = Context()
 
         @callback
         def record_event(event):
@@ -171,7 +180,7 @@ class TestScriptHelper(unittest.TestCase):
             {'delay': {'seconds': 5}},
             {'event': event}]))
 
-        script_obj.run()
+        script_obj.run(context=context)
         self.hass.block_till_done()
 
         assert script_obj.is_running
@@ -185,6 +194,8 @@ class TestScriptHelper(unittest.TestCase):
 
         assert not script_obj.is_running
         assert len(events) == 2
+        assert events[0].context is context
+        assert events[1].context is context
 
     def test_delay_template(self):
         """Test the delay as a template."""
@@ -282,6 +293,7 @@ class TestScriptHelper(unittest.TestCase):
         """Test the wait template."""
         event = 'test_event'
         events = []
+        context = Context()
 
         @callback
         def record_event(event):
@@ -297,7 +309,7 @@ class TestScriptHelper(unittest.TestCase):
             {'wait_template': "{{states.switch.test.state == 'off'}}"},
             {'event': event}]))
 
-        script_obj.run()
+        script_obj.run(context=context)
         self.hass.block_till_done()
 
         assert script_obj.is_running
@@ -310,6 +322,8 @@ class TestScriptHelper(unittest.TestCase):
 
         assert not script_obj.is_running
         assert len(events) == 2
+        assert events[0].context is context
+        assert events[1].context is context
 
     def test_wait_template_cancel(self):
         """Test the wait template cancel action."""

From 3afc983c056e22017b32e3cfc8fc09d0f77dcfa1 Mon Sep 17 00:00:00 2001
From: Jason Hu <awarecan@users.noreply.github.com>
Date: Tue, 4 Sep 2018 12:18:35 -0700
Subject: [PATCH 047/357] Fix openuv.config_flow unit test (#16419)

---
 tests/components/openuv/test_config_flow.py | 33 +++++++++++----------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/tests/components/openuv/test_config_flow.py b/tests/components/openuv/test_config_flow.py
index 0e50bddabde..07946fbbc09 100644
--- a/tests/components/openuv/test_config_flow.py
+++ b/tests/components/openuv/test_config_flow.py
@@ -26,7 +26,6 @@ async def test_duplicate_error(hass):
     assert result['errors'] == {'base': 'identifier_exists'}
 
 
-@patch('pyopenuv.util.validate_api_key', return_value=mock_coro(False))
 async def test_invalid_api_key(hass):
     """Test that an invalid API key throws an error."""
     conf = {
@@ -39,8 +38,10 @@ async def test_invalid_api_key(hass):
     flow = config_flow.OpenUvFlowHandler()
     flow.hass = hass
 
-    result = await flow.async_step_user(user_input=conf)
-    assert result['errors'] == {'base': 'invalid_api_key'}
+    with patch('pyopenuv.util.validate_api_key',
+               return_value=mock_coro(False)):
+        result = await flow.async_step_user(user_input=conf)
+        assert result['errors'] == {'base': 'invalid_api_key'}
 
 
 async def test_show_form(hass):
@@ -54,7 +55,6 @@ async def test_show_form(hass):
     assert result['step_id'] == 'user'
 
 
-@patch('pyopenuv.util.validate_api_key', return_value=mock_coro(True))
 async def test_step_import(hass):
     """Test that the import step works."""
     conf = {
@@ -64,15 +64,16 @@ async def test_step_import(hass):
     flow = config_flow.OpenUvFlowHandler()
     flow.hass = hass
 
-    result = await flow.async_step_import(import_config=conf)
+    with patch('pyopenuv.util.validate_api_key',
+               return_value=mock_coro(True)):
+        result = await flow.async_step_import(import_config=conf)
 
-    assert result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
-    assert result['title'] == '{0}, {1}'.format(
-        hass.config.latitude, hass.config.longitude)
-    assert result['data'] == conf
+        assert result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+        assert result['title'] == '{0}, {1}'.format(
+            hass.config.latitude, hass.config.longitude)
+        assert result['data'] == conf
 
 
-@patch('pyopenuv.util.validate_api_key', return_value=mock_coro(True))
 async def test_step_user(hass):
     """Test that the user step works."""
     conf = {
@@ -85,9 +86,11 @@ async def test_step_user(hass):
     flow = config_flow.OpenUvFlowHandler()
     flow.hass = hass
 
-    result = await flow.async_step_user(user_input=conf)
+    with patch('pyopenuv.util.validate_api_key',
+               return_value=mock_coro(True)):
+        result = await flow.async_step_user(user_input=conf)
 
-    assert result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
-    assert result['title'] == '{0}, {1}'.format(
-        conf[CONF_LATITUDE], conf[CONF_LONGITUDE])
-    assert result['data'] == conf
+        assert result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+        assert result['title'] == '{0}, {1}'.format(
+            conf[CONF_LATITUDE], conf[CONF_LONGITUDE])
+        assert result['data'] == conf

From e1084e39536d82a0bc0224a7ed3701e16eb1986b Mon Sep 17 00:00:00 2001
From: kbickar <TrumpetGod@gmail.com>
Date: Wed, 5 Sep 2018 02:01:36 -0400
Subject: [PATCH 048/357] Upgrade sense library to 0.4.2 (#16429)

* Added error handling for sense API timeouts

* Moved imports in function

* Moved imports to more appropriate function

* Change exception to custom package version

* Updated sense_energy library to 0.4.2
---
 homeassistant/components/sensor/sense.py | 2 +-
 requirements_all.txt                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/sensor/sense.py b/homeassistant/components/sensor/sense.py
index 3da022dc3b5..dd9d66f58f1 100644
--- a/homeassistant/components/sensor/sense.py
+++ b/homeassistant/components/sensor/sense.py
@@ -16,7 +16,7 @@ from homeassistant.helpers.entity import Entity
 from homeassistant.util import Throttle
 import homeassistant.helpers.config_validation as cv
 
-REQUIREMENTS = ['sense_energy==0.4.1']
+REQUIREMENTS = ['sense_energy==0.4.2']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/requirements_all.txt b/requirements_all.txt
index 5f4fd64a6a2..98f1ee570d6 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1284,7 +1284,7 @@ sendgrid==5.6.0
 sense-hat==2.2.0
 
 # homeassistant.components.sensor.sense
-sense_energy==0.4.1
+sense_energy==0.4.2
 
 # homeassistant.components.media_player.aquostv
 sharp_aquos_rc==0.3.2

From 5bd9be625212e1eba63c870647807bd135d93da8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=B8yer=20Iversen?= <mail@dahoiv.net>
Date: Thu, 6 Sep 2018 10:02:37 +0200
Subject: [PATCH 049/357] switchbot (#16396)

* switchbot

* style

* use switchbot lib

* unnecessary import

* switchbot, rename variable update requirements_all

* add line
---
 .coveragerc                                  |  1 +
 homeassistant/components/switch/switchbot.py | 73 ++++++++++++++++++++
 requirements_all.txt                         |  3 +
 3 files changed, 77 insertions(+)
 create mode 100644 homeassistant/components/switch/switchbot.py

diff --git a/.coveragerc b/.coveragerc
index bd531e62f72..c1a0d0d967c 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -793,6 +793,7 @@ omit =
     homeassistant/components/switch/rest.py
     homeassistant/components/switch/rpi_rf.py
     homeassistant/components/switch/snmp.py
+    homeassistant/components/switch/switchbot.py
     homeassistant/components/switch/switchmate.py
     homeassistant/components/switch/telnet.py
     homeassistant/components/switch/tplink.py
diff --git a/homeassistant/components/switch/switchbot.py b/homeassistant/components/switch/switchbot.py
new file mode 100644
index 00000000000..53f987c8b46
--- /dev/null
+++ b/homeassistant/components/switch/switchbot.py
@@ -0,0 +1,73 @@
+"""
+Support for Switchbot.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/switch.switchbot
+"""
+import logging
+
+import voluptuous as vol
+
+import homeassistant.helpers.config_validation as cv
+from homeassistant.components.switch import SwitchDevice, PLATFORM_SCHEMA
+from homeassistant.const import CONF_NAME, CONF_MAC
+
+REQUIREMENTS = ['PySwitchbot==0.3']
+
+_LOGGER = logging.getLogger(__name__)
+
+DEFAULT_NAME = 'Switchbot'
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_MAC): cv.string,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+})
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Perform the setup for Switchbot devices."""
+    name = config.get(CONF_NAME)
+    mac_addr = config[CONF_MAC]
+    add_entities([SwitchBot(mac_addr, name)])
+
+
+class SwitchBot(SwitchDevice):
+    """Representation of a Switchbot."""
+
+    def __init__(self, mac, name) -> None:
+        """Initialize the Switchbot."""
+        import switchbot
+        self._state = False
+        self._name = name
+        self._mac = mac
+        self._device = switchbot.Switchbot(mac=mac)
+
+    def turn_on(self, **kwargs) -> None:
+        """Turn device on."""
+        if self._device.turn_on():
+            self._state = True
+
+    def turn_off(self, **kwargs) -> None:
+        """Turn device off."""
+        if self._device.turn_off():
+            self._state = False
+
+    @property
+    def assumed_state(self) -> bool:
+        """Return true if unable to access real state of entity."""
+        return True
+
+    @property
+    def is_on(self) -> bool:
+        """Return true if device is on."""
+        return self._state
+
+    @property
+    def unique_id(self) -> str:
+        """Return a unique, HASS-friendly identifier for this entity."""
+        return self._mac.replace(':', '')
+
+    @property
+    def name(self) -> str:
+        """Return the name of the switch."""
+        return self._name
diff --git a/requirements_all.txt b/requirements_all.txt
index 98f1ee570d6..8a84410b223 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -53,6 +53,9 @@ PyQRCode==1.2.1
 # homeassistant.components.sensor.rmvtransport
 PyRMVtransport==0.0.7
 
+# homeassistant.components.switch.switchbot
+PySwitchbot==0.3
+
 # homeassistant.components.xiaomi_aqara
 PyXiaomiGateway==0.9.5
 

From cf4b72e00ecfb848219ad77a624f30672b69412e Mon Sep 17 00:00:00 2001
From: PhracturedBlue <rc2012@pblue.org>
Date: Thu, 6 Sep 2018 01:51:16 -0700
Subject: [PATCH 050/357] Fix camera proxy to not require api_password to
 function (#16450)

---
 homeassistant/components/camera/__init__.py | 106 ++++++++++++--------
 homeassistant/components/camera/proxy.py    |  88 +++++-----------
 2 files changed, 90 insertions(+), 104 deletions(-)

diff --git a/homeassistant/components/camera/__init__.py b/homeassistant/components/camera/__init__.py
index 76860702165..a8a486013d4 100644
--- a/homeassistant/components/camera/__init__.py
+++ b/homeassistant/components/camera/__init__.py
@@ -142,6 +142,68 @@ def async_snapshot(hass, filename, entity_id=None):
 @bind_hass
 async def async_get_image(hass, entity_id, timeout=10):
     """Fetch an image from a camera entity."""
+    camera = _get_camera_from_entity_id(hass, entity_id)
+
+    with suppress(asyncio.CancelledError, asyncio.TimeoutError):
+        with async_timeout.timeout(timeout, loop=hass.loop):
+            image = await camera.async_camera_image()
+
+            if image:
+                return Image(camera.content_type, image)
+
+    raise HomeAssistantError('Unable to get image')
+
+
+@bind_hass
+async def async_get_mjpeg_stream(hass, request, entity_id):
+    """Fetch an mjpeg stream from a camera entity."""
+    camera = _get_camera_from_entity_id(hass, entity_id)
+
+    return await camera.handle_async_mjpeg_stream(request)
+
+
+async def async_get_still_stream(request, image_cb, content_type, interval):
+    """Generate an HTTP MJPEG stream from camera images.
+
+    This method must be run in the event loop.
+    """
+    response = web.StreamResponse()
+    response.content_type = ('multipart/x-mixed-replace; '
+                             'boundary=--frameboundary')
+    await response.prepare(request)
+
+    async def write_to_mjpeg_stream(img_bytes):
+        """Write image to stream."""
+        await response.write(bytes(
+            '--frameboundary\r\n'
+            'Content-Type: {}\r\n'
+            'Content-Length: {}\r\n\r\n'.format(
+                content_type, len(img_bytes)),
+            'utf-8') + img_bytes + b'\r\n')
+
+    last_image = None
+
+    while True:
+        img_bytes = await image_cb()
+        if not img_bytes:
+            break
+
+        if img_bytes != last_image:
+            await write_to_mjpeg_stream(img_bytes)
+
+            # Chrome seems to always ignore first picture,
+            # print it twice.
+            if last_image is None:
+                await write_to_mjpeg_stream(img_bytes)
+            last_image = img_bytes
+
+        await asyncio.sleep(interval)
+
+    return response
+
+
+def _get_camera_from_entity_id(hass, entity_id):
+    """Get camera component from entity_id."""
     component = hass.data.get(DOMAIN)
 
     if component is None:
@@ -155,14 +217,7 @@ async def async_get_image(hass, entity_id, timeout=10):
     if not camera.is_on:
         raise HomeAssistantError('Camera is off')
 
-    with suppress(asyncio.CancelledError, asyncio.TimeoutError):
-        with async_timeout.timeout(timeout, loop=hass.loop):
-            image = await camera.async_camera_image()
-
-            if image:
-                return Image(camera.content_type, image)
-
-    raise HomeAssistantError('Unable to get image')
+    return camera
 
 
 async def async_setup(hass, config):
@@ -290,39 +345,8 @@ class Camera(Entity):
 
         This method must be run in the event loop.
         """
-        response = web.StreamResponse()
-        response.content_type = ('multipart/x-mixed-replace; '
-                                 'boundary=--frameboundary')
-        await response.prepare(request)
-
-        async def write_to_mjpeg_stream(img_bytes):
-            """Write image to stream."""
-            await response.write(bytes(
-                '--frameboundary\r\n'
-                'Content-Type: {}\r\n'
-                'Content-Length: {}\r\n\r\n'.format(
-                    self.content_type, len(img_bytes)),
-                'utf-8') + img_bytes + b'\r\n')
-
-        last_image = None
-
-        while True:
-            img_bytes = await self.async_camera_image()
-            if not img_bytes:
-                break
-
-            if img_bytes and img_bytes != last_image:
-                await write_to_mjpeg_stream(img_bytes)
-
-                # Chrome seems to always ignore first picture,
-                # print it twice.
-                if last_image is None:
-                    await write_to_mjpeg_stream(img_bytes)
-                last_image = img_bytes
-
-            await asyncio.sleep(interval)
-
-        return response
+        return await async_get_still_stream(request, self.async_camera_image,
+                                            self.content_type, interval)
 
     async def handle_async_mjpeg_stream(self, request):
         """Serve an HTTP MJPEG stream from the camera.
diff --git a/homeassistant/components/camera/proxy.py b/homeassistant/components/camera/proxy.py
index 6c245ffdf43..83d87311646 100644
--- a/homeassistant/components/camera/proxy.py
+++ b/homeassistant/components/camera/proxy.py
@@ -7,17 +7,15 @@ https://www.home-assistant.io/components/camera.proxy/
 import asyncio
 import logging
 
-import aiohttp
-import async_timeout
 import voluptuous as vol
 
 from homeassistant.components.camera import PLATFORM_SCHEMA, Camera
 from homeassistant.const import CONF_ENTITY_ID, CONF_NAME, HTTP_HEADER_HA_AUTH
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.aiohttp_client import (
-    async_aiohttp_proxy_web, async_get_clientsession)
 from homeassistant.util.async_ import run_coroutine_threadsafe
 import homeassistant.util.dt as dt_util
+from . import async_get_still_stream
 
 REQUIREMENTS = ['pillow==5.2.0']
 
@@ -158,22 +156,14 @@ class ProxyCamera(Camera):
             return self._last_image
 
         self._last_image_time = now
-        url = "{}/api/camera_proxy/{}".format(
-            self.hass.config.api.base_url, self._proxied_camera)
-        try:
-            websession = async_get_clientsession(self.hass)
-            with async_timeout.timeout(10, loop=self.hass.loop):
-                response = await websession.get(url, headers=self._headers)
-            image = await response.read()
-        except asyncio.TimeoutError:
-            _LOGGER.error("Timeout getting camera image")
-            return self._last_image
-        except aiohttp.ClientError as err:
-            _LOGGER.error("Error getting new camera image: %s", err)
+        image = await self.hass.components.camera.async_get_image(
+            self._proxied_camera)
+        if not image:
+            _LOGGER.error("Error getting original camera image")
             return self._last_image
 
         image = await self.hass.async_add_job(
-            _resize_image, image, self._image_opts)
+            _resize_image, image.content, self._image_opts)
 
         if self._cache_images:
             self._last_image = image
@@ -181,56 +171,28 @@ class ProxyCamera(Camera):
 
     async def handle_async_mjpeg_stream(self, request):
         """Generate an HTTP MJPEG stream from camera images."""
-        websession = async_get_clientsession(self.hass)
-        url = "{}/api/camera_proxy_stream/{}".format(
-            self.hass.config.api.base_url, self._proxied_camera)
-        stream_coro = websession.get(url, headers=self._headers)
-
         if not self._stream_opts:
-            return await async_aiohttp_proxy_web(
-                self.hass, request, stream_coro)
+            return await self.hass.components.camera.async_get_mjpeg_stream(
+                request, self._proxied_camera)
 
-        response = aiohttp.web.StreamResponse()
-        response.content_type = (
-            'multipart/x-mixed-replace; boundary=--frameboundary')
-        await response.prepare(request)
-
-        async def write(img_bytes):
-            """Write image to stream."""
-            await response.write(bytes(
-                '--frameboundary\r\n'
-                'Content-Type: {}\r\n'
-                'Content-Length: {}\r\n\r\n'.format(
-                    self.content_type, len(img_bytes)),
-                'utf-8') + img_bytes + b'\r\n')
-
-        with async_timeout.timeout(10, loop=self.hass.loop):
-            req = await stream_coro
-
-        try:
-            # This would be nicer as an async generator
-            # But that would only be supported for python >=3.6
-            data = b''
-            stream = req.content
-            while True:
-                chunk = await stream.read(102400)
-                if not chunk:
-                    break
-                data += chunk
-                jpg_start = data.find(b'\xff\xd8')
-                jpg_end = data.find(b'\xff\xd9')
-                if jpg_start != -1 and jpg_end != -1:
-                    image = data[jpg_start:jpg_end + 2]
-                    image = await self.hass.async_add_job(
-                        _resize_image, image, self._stream_opts)
-                    await write(image)
-                    data = data[jpg_end + 2:]
-        finally:
-            req.close()
-
-        return response
+        return await async_get_still_stream(
+            request, self._async_stream_image,
+            self.content_type, self.frame_interval)
 
     @property
     def name(self):
         """Return the name of this camera."""
         return self._name
+
+    async def _async_stream_image(self):
+        """Return a still image response from the camera."""
+        try:
+            image = await self.hass.components.camera.async_get_image(
+                self._proxied_camera)
+            if not image:
+                return None
+        except HomeAssistantError:
+            raise asyncio.CancelledError
+
+        return await self.hass.async_add_job(
+            _resize_image, image.content, self._stream_opts)

From 2640db1522237a7018cbf79155d52fa33cbff2fb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 6 Sep 2018 12:31:08 +0200
Subject: [PATCH 051/357] Upgrade shodan to 1.10.1 (#16460)

---
 homeassistant/components/sensor/shodan.py | 2 +-
 requirements_all.txt                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/sensor/shodan.py b/homeassistant/components/sensor/shodan.py
index cfafcb67608..6f228df3a93 100644
--- a/homeassistant/components/sensor/shodan.py
+++ b/homeassistant/components/sensor/shodan.py
@@ -14,7 +14,7 @@ from homeassistant.components.sensor import PLATFORM_SCHEMA
 from homeassistant.const import ATTR_ATTRIBUTION, CONF_API_KEY, CONF_NAME
 from homeassistant.helpers.entity import Entity
 
-REQUIREMENTS = ['shodan==1.10.0']
+REQUIREMENTS = ['shodan==1.10.1']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/requirements_all.txt b/requirements_all.txt
index 8a84410b223..9633b30d55b 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1293,7 +1293,7 @@ sense_energy==0.4.2
 sharp_aquos_rc==0.3.2
 
 # homeassistant.components.sensor.shodan
-shodan==1.10.0
+shodan==1.10.1
 
 # homeassistant.components.notify.simplepush
 simplepush==1.1.4

From db1bda2975842097b31f9382888f58c69a5ef76b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 6 Sep 2018 12:31:30 +0200
Subject: [PATCH 052/357] Upgrade Sphinx to 1.7.8 (#16459)

---
 requirements_docs.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements_docs.txt b/requirements_docs.txt
index e26c97887b7..1a809c2fb85 100644
--- a/requirements_docs.txt
+++ b/requirements_docs.txt
@@ -1,3 +1,3 @@
-Sphinx==1.7.7
+Sphinx==1.7.8
 sphinx-autodoc-typehints==1.3.0
 sphinx-autodoc-annotation==1.0.post1

From 3acb3a86cf113e2af0021cde1f0a76be7aee1483 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=B8yer=20Iversen?= <mail@dahoiv.net>
Date: Thu, 6 Sep 2018 12:50:55 +0200
Subject: [PATCH 053/357] update rfxtrx lib (#16463)

---
 homeassistant/components/rfxtrx.py | 2 +-
 requirements_all.txt               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/rfxtrx.py b/homeassistant/components/rfxtrx.py
index 60dbb209039..b5bc97b7ffa 100644
--- a/homeassistant/components/rfxtrx.py
+++ b/homeassistant/components/rfxtrx.py
@@ -17,7 +17,7 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 from homeassistant.util import slugify
 
-REQUIREMENTS = ['pyRFXtrx==0.22.1']
+REQUIREMENTS = ['pyRFXtrx==0.23']
 
 DOMAIN = 'rfxtrx'
 
diff --git a/requirements_all.txt b/requirements_all.txt
index 9633b30d55b..a16fd558d26 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -746,7 +746,7 @@ pyCEC==0.4.13
 pyHS100==0.3.2
 
 # homeassistant.components.rfxtrx
-pyRFXtrx==0.22.1
+pyRFXtrx==0.23
 
 # homeassistant.components.sensor.tibber
 pyTibber==0.4.1

From ce06229c42065d1c409e1f4ee9d7db66d106bb75 Mon Sep 17 00:00:00 2001
From: Ioan Loosley <legit.ioangogo@gmail.com>
Date: Thu, 6 Sep 2018 13:08:39 +0100
Subject: [PATCH 054/357] Added Twitch v5 support to the twitch platform
 (#16428)

* code not working

* did it all all at once

* removing debug stuff

* fixing lint issues

* fixing lint issues

* I am blind

* I felt small(80 by somthing) was to small, especily with lovelace

* fixing silly mistake

* this shouldnt be here

* made some changes

* corrrected client_id

* corrrected client_id

* less returns needed

* Fixing Small bugs and making stuff snake case

* Tweaking
---
 homeassistant/components/sensor/twitch.py | 58 ++++++++++++++---------
 requirements_all.txt                      |  2 +-
 2 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/homeassistant/components/sensor/twitch.py b/homeassistant/components/sensor/twitch.py
index 3763aa30fb4..57e98bc273d 100644
--- a/homeassistant/components/sensor/twitch.py
+++ b/homeassistant/components/sensor/twitch.py
@@ -12,7 +12,7 @@ from homeassistant.components.sensor import PLATFORM_SCHEMA
 from homeassistant.helpers.entity import Entity
 import homeassistant.helpers.config_validation as cv
 
-REQUIREMENTS = ['python-twitch==1.3.0']
+REQUIREMENTS = ['python-twitch-client==0.5.1']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -20,12 +20,14 @@ ATTR_GAME = 'game'
 ATTR_TITLE = 'title'
 
 CONF_CHANNELS = 'channels'
+CONF_CLIENT_ID = 'client_id'
 ICON = 'mdi:twitch'
 
 STATE_OFFLINE = 'offline'
 STATE_STREAMING = 'streaming'
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_CLIENT_ID): cv.string,
     vol.Required(CONF_CHANNELS, default=[]):
         vol.All(cv.ensure_list, [cv.string]),
 })
@@ -33,21 +35,34 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Twitch platform."""
-    channels = config.get(CONF_CHANNELS, [])
+    from twitch import TwitchClient
+    from requests.exceptions import HTTPError
 
-    add_entities([TwitchSensor(channel) for channel in channels], True)
+    channels = config.get(CONF_CHANNELS, [])
+    client = TwitchClient(client_id=config.get(CONF_CLIENT_ID))
+
+    try:
+        client.ingests.get_server_list()
+    except HTTPError:
+        _LOGGER.error("Client ID is not valid")
+        return False
+
+    users = client.users.translate_usernames_to_ids(channels)
+
+    add_entities([TwitchSensor(user, client) for user in users], True)
 
 
 class TwitchSensor(Entity):
     """Representation of an Twitch channel."""
 
-    def __init__(self, channel):
+    def __init__(self, user, client):
         """Initialize the sensor."""
-        self._channel = channel
+        self._client = client
+        self._user = user
+        self._channel = self._user.name
+        self._id = self._user.id
         self._state = STATE_OFFLINE
-        self._preview = None
-        self._game = None
-        self._title = None
+        self._preview = self._game = self._title = None
 
     @property
     def should_poll(self):
@@ -69,20 +84,6 @@ class TwitchSensor(Entity):
         """Return preview of current game."""
         return self._preview
 
-    # pylint: disable=no-member
-    def update(self):
-        """Update device state."""
-        from twitch.api import v3 as twitch
-        stream = twitch.streams.by_channel(self._channel).get('stream')
-        if stream:
-            self._game = stream.get('channel').get('game')
-            self._title = stream.get('channel').get('status')
-            self._preview = stream.get('preview').get('small')
-            self._state = STATE_STREAMING
-        else:
-            self._preview = None
-            self._state = STATE_OFFLINE
-
     @property
     def device_state_attributes(self):
         """Return the state attributes."""
@@ -96,3 +97,16 @@ class TwitchSensor(Entity):
     def icon(self):
         """Icon to use in the frontend, if any."""
         return ICON
+
+    # pylint: disable=no-member
+    def update(self):
+        """Update device state."""
+        stream = self._client.streams.get_stream_by_user(self._id)
+        if stream:
+            self._game = stream.get('channel').get('game')
+            self._title = stream.get('channel').get('status')
+            self._preview = stream.get('preview').get('medium')
+            self._state = STATE_STREAMING
+        else:
+            self._preview = self._client.users.get_by_id(self._id).get('logo')
+            self._state = STATE_OFFLINE
diff --git a/requirements_all.txt b/requirements_all.txt
index a16fd558d26..bc81da03660 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1145,7 +1145,7 @@ python-tado==0.2.3
 python-telegram-bot==11.0.0
 
 # homeassistant.components.sensor.twitch
-python-twitch==1.3.0
+python-twitch-client==0.5.1
 
 # homeassistant.components.velbus
 python-velbus==2.0.19

From cff9b1bf7eb5bf82ccb3f6eaead6611bde2b912b Mon Sep 17 00:00:00 2001
From: Tsvi Mostovicz <ttmost@gmail.com>
Date: Fri, 7 Sep 2018 10:55:53 +0300
Subject: [PATCH 055/357] Fix waze_travel_time component startup (#16465)

* Fix waze_travel_time component startup

* Remove @Throttle decorator as per pvizelli's request

* Make the linting gods happy again
---
 homeassistant/components/sensor/waze_travel_time.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/sensor/waze_travel_time.py b/homeassistant/components/sensor/waze_travel_time.py
index 8d046b0de0d..e4cc8381ede 100644
--- a/homeassistant/components/sensor/waze_travel_time.py
+++ b/homeassistant/components/sensor/waze_travel_time.py
@@ -16,7 +16,6 @@ from homeassistant.const import (
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers import location
 from homeassistant.helpers.entity import Entity
-from homeassistant.util import Throttle
 
 REQUIREMENTS = ['WazeRouteCalculator==0.6']
 
@@ -71,7 +70,8 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     add_entities([sensor])
 
     # Wait until start event is sent to load this component.
-    hass.bus.listen_once(EVENT_HOMEASSISTANT_START, sensor.update)
+    hass.bus.listen_once(
+        EVENT_HOMEASSISTANT_START, lambda _: sensor.update())
 
 
 def _get_location_from_attributes(state):
@@ -182,7 +182,6 @@ class WazeTravelTime(Entity):
 
         return friendly_name
 
-    @Throttle(SCAN_INTERVAL)
     def update(self):
         """Fetch new state data for the sensor."""
         import WazeRouteCalculator

From fbaa489533dad06cdd37da388bc21b3b7f469bb9 Mon Sep 17 00:00:00 2001
From: Greg Laabs <OverloadUT@gmail.com>
Date: Fri, 7 Sep 2018 01:11:51 -0700
Subject: [PATCH 056/357] Update license to official GitHub template (#16470)

* Delete LICENSE.md

* Create LICENSE.md
---
 LICENSE.md | 331 +++++++++++++++++++++++++++--------------------------
 1 file changed, 169 insertions(+), 162 deletions(-)

diff --git a/LICENSE.md b/LICENSE.md
index b62a9b5ff78..261eeb9e9f8 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,194 +1,201 @@
-Apache License
-==============
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-_Version 2.0, January 2004_
-_&lt;<http://www.apache.org/licenses/>&gt;_
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-### Terms and Conditions for use, reproduction, and distribution
+   1. Definitions.
 
-#### 1. Definitions
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
 
-“License” shall mean the terms and conditions for use, reproduction, and
-distribution as defined by Sections 1 through 9 of this document.
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
 
-“Licensor” shall mean the copyright owner or entity authorized by the copyright
-owner that is granting the License.
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
 
-“Legal Entity” shall mean the union of the acting entity and all other entities
-that control, are controlled by, or are under common control with that entity.
-For the purposes of this definition, “control” means **(i)** the power, direct or
-indirect, to cause the direction or management of such entity, whether by
-contract or otherwise, or **(ii)** ownership of fifty percent (50%) or more of the
-outstanding shares, or **(iii)** beneficial ownership of such entity.
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
 
-“You” (or “Your”) shall mean an individual or Legal Entity exercising
-permissions granted by this License.
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
 
-“Source” form shall mean the preferred form for making modifications, including
-but not limited to software source code, documentation source, and configuration
-files.
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
 
-“Object” form shall mean any form resulting from mechanical transformation or
-translation of a Source form, including but not limited to compiled object code,
-generated documentation, and conversions to other media types.
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
 
-“Work” shall mean the work of authorship, whether in Source or Object form, made
-available under the License, as indicated by a copyright notice that is included
-in or attached to the work (an example is provided in the Appendix below).
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
 
-“Derivative Works” shall mean any work, whether in Source or Object form, that
-is based on (or derived from) the Work and for which the editorial revisions,
-annotations, elaborations, or other modifications represent, as a whole, an
-original work of authorship. For the purposes of this License, Derivative Works
-shall not include works that remain separable from, or merely link (or bind by
-name) to the interfaces of, the Work and Derivative Works thereof.
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
 
-“Contribution” shall mean any work of authorship, including the original version
-of the Work and any modifications or additions to that Work or Derivative Works
-thereof, that is intentionally submitted to Licensor for inclusion in the Work
-by the copyright owner or by an individual or Legal Entity authorized to submit
-on behalf of the copyright owner. For the purposes of this definition,
-“submitted” means any form of electronic, verbal, or written communication sent
-to the Licensor or its representatives, including but not limited to
-communication on electronic mailing lists, source code control systems, and
-issue tracking systems that are managed by, or on behalf of, the Licensor for
-the purpose of discussing and improving the Work, but excluding communication
-that is conspicuously marked or otherwise designated in writing by the copyright
-owner as “Not a Contribution.”
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
 
-“Contributor” shall mean Licensor and any individual or Legal Entity on behalf
-of whom a Contribution has been received by Licensor and subsequently
-incorporated within the Work.
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
 
-#### 2. Grant of Copyright License
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
 
-Subject to the terms and conditions of this License, each Contributor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable copyright license to reproduce, prepare Derivative Works of,
-publicly display, publicly perform, sublicense, and distribute the Work and such
-Derivative Works in Source or Object form.
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
 
-#### 3. Grant of Patent License
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
 
-Subject to the terms and conditions of this License, each Contributor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable (except as stated in this section) patent license to make, have
-made, use, offer to sell, sell, import, and otherwise transfer the Work, where
-such license applies only to those patent claims licensable by such Contributor
-that are necessarily infringed by their Contribution(s) alone or by combination
-of their Contribution(s) with the Work to which such Contribution(s) was
-submitted. If You institute patent litigation against any entity (including a
-cross-claim or counterclaim in a lawsuit) alleging that the Work or a
-Contribution incorporated within the Work constitutes direct or contributory
-patent infringement, then any patent licenses granted to You under this License
-for that Work shall terminate as of the date such litigation is filed.
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
 
-#### 4. Redistribution
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
 
-You may reproduce and distribute copies of the Work or Derivative Works thereof
-in any medium, with or without modifications, and in Source or Object form,
-provided that You meet the following conditions:
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
 
-* **(a)** You must give any other recipients of the Work or Derivative Works a copy of
-this License; and
-* **(b)** You must cause any modified files to carry prominent notices stating that You
-changed the files; and
-* **(c)** You must retain, in the Source form of any Derivative Works that You distribute,
-all copyright, patent, trademark, and attribution notices from the Source form
-of the Work, excluding those notices that do not pertain to any part of the
-Derivative Works; and
-* **(d)** If the Work includes a “NOTICE” text file as part of its distribution, then any
-Derivative Works that You distribute must include a readable copy of the
-attribution notices contained within such NOTICE file, excluding those notices
-that do not pertain to any part of the Derivative Works, in at least one of the
-following places: within a NOTICE text file distributed as part of the
-Derivative Works; within the Source form or documentation, if provided along
-with the Derivative Works; or, within a display generated by the Derivative
-Works, if and wherever such third-party notices normally appear. The contents of
-the NOTICE file are for informational purposes only and do not modify the
-License. You may add Your own attribution notices within Derivative Works that
-You distribute, alongside or as an addendum to the NOTICE text from the Work,
-provided that such additional attribution notices cannot be construed as
-modifying the License.
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
 
-You may add Your own copyright statement to Your modifications and may provide
-additional or different license terms and conditions for use, reproduction, or
-distribution of Your modifications, or for any such Derivative Works as a whole,
-provided Your use, reproduction, and distribution of the Work otherwise complies
-with the conditions stated in this License.
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
 
-#### 5. Submission of Contributions
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
 
-Unless You explicitly state otherwise, any Contribution intentionally submitted
-for inclusion in the Work by You to the Licensor shall be under the terms and
-conditions of this License, without any additional terms or conditions.
-Notwithstanding the above, nothing herein shall supersede or modify the terms of
-any separate license agreement you may have executed with Licensor regarding
-such Contributions.
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
 
-#### 6. Trademarks
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
 
-This License does not grant permission to use the trade names, trademarks,
-service marks, or product names of the Licensor, except as required for
-reasonable and customary use in describing the origin of the Work and
-reproducing the content of the NOTICE file.
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
 
-#### 7. Disclaimer of Warranty
+   END OF TERMS AND CONDITIONS
 
-Unless required by applicable law or agreed to in writing, Licensor provides the
-Work (and each Contributor provides its Contributions) on an “AS IS” BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
-including, without limitation, any warranties or conditions of TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
-solely responsible for determining the appropriateness of using or
-redistributing the Work and assume any risks associated with Your exercise of
-permissions under this License.
+   APPENDIX: How to apply the Apache License to your work.
 
-#### 8. Limitation of Liability
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
 
-In no event and under no legal theory, whether in tort (including negligence),
-contract, or otherwise, unless required by applicable law (such as deliberate
-and grossly negligent acts) or agreed to in writing, shall any Contributor be
-liable to You for damages, including any direct, indirect, special, incidental,
-or consequential damages of any character arising as a result of this License or
-out of the use or inability to use the Work (including but not limited to
-damages for loss of goodwill, work stoppage, computer failure or malfunction, or
-any and all other commercial damages or losses), even if such Contributor has
-been advised of the possibility of such damages.
+   Copyright [yyyy] [name of copyright owner]
 
-#### 9. Accepting Warranty or Additional Liability
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
 
-While redistributing the Work or Derivative Works thereof, You may choose to
-offer, and charge a fee for, acceptance of support, warranty, indemnity, or
-other liability obligations and/or rights consistent with this License. However,
-in accepting such obligations, You may act only on Your own behalf and on Your
-sole responsibility, not on behalf of any other Contributor, and only if You
-agree to indemnify, defend, and hold each Contributor harmless for any liability
-incurred by, or claims asserted against, such Contributor by reason of your
-accepting any such warranty or additional liability.
+       http://www.apache.org/licenses/LICENSE-2.0
 
-_END OF TERMS AND CONDITIONS_
-
-### APPENDIX: How to apply the Apache License to your work
-
-To apply the Apache License to your work, attach the following boilerplate
-notice, with the fields enclosed by brackets `[]` replaced with your own
-identifying information. (Don't include the brackets!) The text should be
-enclosed in the appropriate comment syntax for the file format. We also
-recommend that a file or class name and description of purpose be included on
-the same “printed page” as the copyright notice for easier identification within
-third-party archives.
-
-    Copyright [yyyy] [name of copyright owner]
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

From 1f73840aab53e89d06c8a4c02acb28df2f2c9130 Mon Sep 17 00:00:00 2001
From: Dom <domwillcode@gmail.com>
Date: Fri, 7 Sep 2018 11:22:10 +0100
Subject: [PATCH 057/357] Add Yale Smart Alarm component (#16377)

* Add Smart Alarm Component

* Lint fixes

* Update coverage

* Update coverage with the correct file name

* PR Fixes. Update client version (to include timeouts). Cleaned up clien tcreation and improved authentication failure error. Added state map to replace nasty if blocks.

* PR Fixes. Update client version (to include timeouts). Cleaned up clien tcreation and improved authentication failure error. Added state map to replace nasty if blocks.

* Remove test file added in error.

* PR Fixes
---
 .coveragerc                                   |  1 +
 .../alarm_control_panel/yale_smart_alarm.py   | 98 +++++++++++++++++++
 requirements_all.txt                          |  3 +
 3 files changed, 102 insertions(+)
 create mode 100755 homeassistant/components/alarm_control_panel/yale_smart_alarm.py

diff --git a/.coveragerc b/.coveragerc
index c1a0d0d967c..85ed4e1fcf4 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -377,6 +377,7 @@ omit =
     homeassistant/components/alarm_control_panel/nx584.py
     homeassistant/components/alarm_control_panel/simplisafe.py
     homeassistant/components/alarm_control_panel/totalconnect.py
+    homeassistant/components/alarm_control_panel/yale_smart_alarm.py
     homeassistant/components/apiai.py
     homeassistant/components/binary_sensor/arest.py
     homeassistant/components/binary_sensor/concord232.py
diff --git a/homeassistant/components/alarm_control_panel/yale_smart_alarm.py b/homeassistant/components/alarm_control_panel/yale_smart_alarm.py
new file mode 100755
index 00000000000..e512d15fcdd
--- /dev/null
+++ b/homeassistant/components/alarm_control_panel/yale_smart_alarm.py
@@ -0,0 +1,98 @@
+"""
+Yale Smart Alarm client for interacting with the Yale Smart Alarm System API.
+
+For more details about this platform, please refer to the documentation at
+https://www.home-assistant.io/components/alarm_control_panel.yale_smart_alarm
+"""
+import logging
+
+import voluptuous as vol
+
+from homeassistant.components.alarm_control_panel import (
+    AlarmControlPanel, PLATFORM_SCHEMA)
+from homeassistant.const import (
+    CONF_PASSWORD, CONF_USERNAME, CONF_NAME,
+    STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED)
+import homeassistant.helpers.config_validation as cv
+
+REQUIREMENTS = ['yalesmartalarmclient==0.1.4']
+
+CONF_AREA_ID = 'area_id'
+
+DEFAULT_NAME = 'Yale Smart Alarm'
+
+DEFAULT_AREA_ID = '1'
+
+_LOGGER = logging.getLogger(__name__)
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_USERNAME): cv.string,
+    vol.Required(CONF_PASSWORD): cv.string,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_AREA_ID, default=DEFAULT_AREA_ID): cv.string,
+})
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Set up the alarm platform."""
+    name = config[CONF_NAME]
+    username = config[CONF_USERNAME]
+    password = config[CONF_PASSWORD]
+    area_id = config[CONF_AREA_ID]
+
+    from yalesmartalarmclient.client import (
+        YaleSmartAlarmClient, AuthenticationError)
+    try:
+        client = YaleSmartAlarmClient(username, password, area_id)
+    except AuthenticationError:
+        _LOGGER.error("Authentication failed. Check credentials")
+        return
+
+    add_entities([YaleAlarmDevice(name, client)], True)
+
+
+class YaleAlarmDevice(AlarmControlPanel):
+    """Represent a Yale Smart Alarm."""
+
+    def __init__(self, name, client):
+        """Initialize the Yale Alarm Device."""
+        self._name = name
+        self._client = client
+        self._state = None
+
+        from yalesmartalarmclient.client import (YALE_STATE_DISARM,
+                                                 YALE_STATE_ARM_PARTIAL,
+                                                 YALE_STATE_ARM_FULL)
+        self._state_map = {
+            YALE_STATE_DISARM: STATE_ALARM_DISARMED,
+            YALE_STATE_ARM_PARTIAL: STATE_ALARM_ARMED_HOME,
+            YALE_STATE_ARM_FULL: STATE_ALARM_ARMED_AWAY
+        }
+
+    @property
+    def name(self):
+        """Return the name of the device."""
+        return self._name
+
+    @property
+    def state(self):
+        """Return the state of the device."""
+        return self._state
+
+    def update(self):
+        """Return the state of the device."""
+        armed_status = self._client.get_armed_status()
+
+        self._state = self._state_map.get(armed_status)
+
+    def alarm_disarm(self, code=None):
+        """Send disarm command."""
+        self._client.disarm()
+
+    def alarm_arm_home(self, code=None):
+        """Send arm home command."""
+        self._client.arm_partial()
+
+    def alarm_arm_away(self, code=None):
+        """Send arm away command."""
+        self._client.arm_full()
diff --git a/requirements_all.txt b/requirements_all.txt
index bc81da03660..d280fa14f15 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1508,6 +1508,9 @@ yahoo-finance==1.4.0
 # homeassistant.components.weather.yweather
 yahooweather==0.10
 
+# homeassistant.components.alarm_control_panel.yale_smart_alarm
+yalesmartalarmclient==0.1.4
+
 # homeassistant.components.light.yeelight
 yeelight==0.4.0
 

From 80c77b86965107006237167a641661406919dd0a Mon Sep 17 00:00:00 2001
From: cpw <cpw+github@weeksfamily.ca>
Date: Fri, 7 Sep 2018 07:21:32 -0400
Subject: [PATCH 058/357] Update radiotherm (#15031)

the two device_state_attributes don't return the current actual state (fan on/off, heat/cool), but rather the mode of the fan or thermostat (generally auto). As such this change makes the actual current state visible to the system, so you can do stuff when the fan turns on, for example. I suspect this is just a bug, but maybe it was intended NOT to be able to see the actual fan state?
---
 homeassistant/components/climate/radiotherm.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/climate/radiotherm.py b/homeassistant/components/climate/radiotherm.py
index 429b544aefc..14cd2a0f02e 100644
--- a/homeassistant/components/climate/radiotherm.py
+++ b/homeassistant/components/climate/radiotherm.py
@@ -174,8 +174,8 @@ class RadioThermostat(ClimateDevice):
     def device_state_attributes(self):
         """Return the device specific state attributes."""
         return {
-            ATTR_FAN: self._fmode,
-            ATTR_MODE: self._tmode,
+            ATTR_FAN: self._fstate,
+            ATTR_MODE: self._tstate,
         }
 
     @property

From d0f9d125a72ad89fb4ed0e3bd83d9aa68ff87562 Mon Sep 17 00:00:00 2001
From: Andreas Oberritter <obi@saftware.de>
Date: Fri, 7 Sep 2018 13:28:42 +0200
Subject: [PATCH 059/357] Support SNMPv3 and asyncio in snmp switch (#14754)

* snmp switch: Add asyncio support and reuse SnmpEngine object

* snmp switch: Support protocol v3
---
 homeassistant/components/switch/snmp.py | 128 +++++++++++++++++-------
 1 file changed, 92 insertions(+), 36 deletions(-)

diff --git a/homeassistant/components/switch/snmp.py b/homeassistant/components/switch/snmp.py
index f208c24286d..795686c9b15 100644
--- a/homeassistant/components/switch/snmp.py
+++ b/homeassistant/components/switch/snmp.py
@@ -10,7 +10,8 @@ import voluptuous as vol
 
 from homeassistant.components.switch import (SwitchDevice, PLATFORM_SCHEMA)
 from homeassistant.const import (
-    CONF_HOST, CONF_NAME, CONF_PORT, CONF_PAYLOAD_ON, CONF_PAYLOAD_OFF)
+    CONF_HOST, CONF_NAME, CONF_PORT, CONF_PAYLOAD_ON, CONF_PAYLOAD_OFF,
+    CONF_USERNAME)
 import homeassistant.helpers.config_validation as cv
 
 REQUIREMENTS = ['pysnmp==4.4.5']
@@ -23,18 +24,44 @@ CONF_COMMAND_PAYLOAD_ON = 'command_payload_on'
 CONF_COMMAND_PAYLOAD_OFF = 'command_payload_off'
 CONF_COMMUNITY = 'community'
 CONF_VERSION = 'version'
+CONF_AUTH_KEY = 'auth_key'
+CONF_AUTH_PROTOCOL = 'auth_protocol'
+CONF_PRIV_KEY = 'priv_key'
+CONF_PRIV_PROTOCOL = 'priv_protocol'
 
 DEFAULT_NAME = 'SNMP Switch'
 DEFAULT_HOST = 'localhost'
 DEFAULT_PORT = '161'
 DEFAULT_COMMUNITY = 'private'
 DEFAULT_VERSION = '1'
+DEFAULT_AUTH_PROTOCOL = 'none'
+DEFAULT_PRIV_PROTOCOL = 'none'
 DEFAULT_PAYLOAD_ON = 1
 DEFAULT_PAYLOAD_OFF = 0
 
 SNMP_VERSIONS = {
     '1': 0,
-    '2c': 1
+    '2c': 1,
+    '3': None
+}
+
+MAP_AUTH_PROTOCOLS = {
+    'none': 'usmNoAuthProtocol',
+    'hmac-md5': 'usmHMACMD5AuthProtocol',
+    'hmac-sha': 'usmHMACSHAAuthProtocol',
+    'hmac128-sha224': 'usmHMAC128SHA224AuthProtocol',
+    'hmac192-sha256': 'usmHMAC192SHA256AuthProtocol',
+    'hmac256-sha384': 'usmHMAC256SHA384AuthProtocol',
+    'hmac384-sha512': 'usmHMAC384SHA512AuthProtocol',
+}
+
+MAP_PRIV_PROTOCOLS = {
+    'none': 'usmNoPrivProtocol',
+    'des': 'usmDESPrivProtocol',
+    '3des-ede': 'usm3DESEDEPrivProtocol',
+    'aes-cfb-128': 'usmAesCfb128Protocol',
+    'aes-cfb-192': 'usmAesCfb192Protocol',
+    'aes-cfb-256': 'usmAesCfb256Protocol',
 }
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
@@ -49,9 +76,17 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_PAYLOAD_ON, default=DEFAULT_PAYLOAD_ON): cv.string,
     vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
     vol.Optional(CONF_VERSION, default=DEFAULT_VERSION): vol.In(SNMP_VERSIONS),
+    vol.Optional(CONF_USERNAME): cv.string,
+    vol.Optional(CONF_AUTH_KEY): cv.string,
+    vol.Optional(CONF_AUTH_PROTOCOL, default=DEFAULT_AUTH_PROTOCOL):
+        vol.In(MAP_AUTH_PROTOCOLS),
+    vol.Optional(CONF_PRIV_KEY): cv.string,
+    vol.Optional(CONF_PRIV_PROTOCOL, default=DEFAULT_PRIV_PROTOCOL):
+        vol.In(MAP_PRIV_PROTOCOLS),
 })
 
 
+
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the SNMP switch."""
     name = config.get(CONF_NAME)
@@ -63,68 +98,96 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     command_payload_on = config.get(CONF_COMMAND_PAYLOAD_ON)
     command_payload_off = config.get(CONF_COMMAND_PAYLOAD_OFF)
     version = config.get(CONF_VERSION)
+    username = config.get(CONF_USERNAME)
+    authkey = config.get(CONF_AUTH_KEY)
+    authproto = config.get(CONF_AUTH_PROTOCOL)
+    privkey = config.get(CONF_PRIV_KEY)
+    privproto = config.get(CONF_PRIV_PROTOCOL)
     payload_on = config.get(CONF_PAYLOAD_ON)
     payload_off = config.get(CONF_PAYLOAD_OFF)
 
     add_entities(
         [SnmpSwitch(name, host, port, community, baseoid, command_oid, version,
+                    username, authkey, authproto, privkey, privproto,
                     payload_on, payload_off,
                     command_payload_on, command_payload_off)], True)
 
 
 class SnmpSwitch(SwitchDevice):
-    """Represents a SNMP switch."""
+    """Representation of a SNMP switch."""
 
     def __init__(self, name, host, port, community,
-                 baseoid, commandoid, version, payload_on, payload_off,
+                 baseoid, commandoid, version,
+                 username, authkey, authproto, privkey, privproto,
+                 payload_on, payload_off,
                  command_payload_on, command_payload_off):
         """Initialize the switch."""
+        from pysnmp.hlapi.asyncio import (
+            CommunityData, ContextData, SnmpEngine,
+            UdpTransportTarget, UsmUserData)
+
         self._name = name
-        self._host = host
-        self._port = port
-        self._community = community
         self._baseoid = baseoid
 
-        """Set the command OID to the base OID if command OID is unset"""
+        # Set the command OID to the base OID if command OID is unset
         self._commandoid = commandoid or baseoid
         self._command_payload_on = command_payload_on or payload_on
         self._command_payload_off = command_payload_off or payload_off
 
-        self._version = SNMP_VERSIONS[version]
         self._state = None
         self._payload_on = payload_on
         self._payload_off = payload_off
 
-    def turn_on(self, **kwargs):
+        if version == '3':
+            import pysnmp.hlapi.asyncio as hlapi
+
+            if not authkey:
+                authproto = 'none'
+            if not privkey:
+                privproto = 'none'
+
+            self._request_args = [
+                SnmpEngine(),
+                UsmUserData(
+                    username,
+                    authKey=authkey or None,
+                    privKey=privkey or None,
+                    authProtocol=getattr(hlapi, MAP_AUTH_PROTOCOLS[authproto]),
+                    privProtocol=getattr(hlapi, MAP_PRIV_PROTOCOLS[privproto]),
+                ),
+                UdpTransportTarget((host, port)),
+                ContextData()
+            ]
+        else:
+            self._request_args = [
+                SnmpEngine(),
+                CommunityData(community, mpModel=SNMP_VERSIONS[version]),
+                UdpTransportTarget((host, port)),
+                ContextData()
+            ]
+
+    async def async_turn_on(self, **kwargs):
         """Turn on the switch."""
         from pyasn1.type.univ import (Integer)
 
-        self._set(Integer(self._command_payload_on))
+        await self._set(Integer(self._command_payload_on))
 
-    def turn_off(self, **kwargs):
+    async def async_turn_off(self, **kwargs):
         """Turn off the switch."""
         from pyasn1.type.univ import (Integer)
 
-        self._set(Integer(self._command_payload_off))
+        await self._set(Integer(self._command_payload_off))
 
-    def update(self):
+    async def async_update(self):
         """Update the state."""
-        from pysnmp.hlapi import (
-            getCmd, CommunityData, SnmpEngine, UdpTransportTarget, ContextData,
-            ObjectType, ObjectIdentity)
-
+        from pysnmp.hlapi.asyncio import (getCmd, ObjectType, ObjectIdentity)
         from pyasn1.type.univ import (Integer)
 
-        request = getCmd(
-            SnmpEngine(),
-            CommunityData(self._community, mpModel=self._version),
-            UdpTransportTarget((self._host, self._port)),
-            ContextData(),
+        errindication, errstatus, errindex, restable = await getCmd(
+            *self._request_args,
             ObjectType(ObjectIdentity(self._baseoid))
         )
 
-        errindication, errstatus, errindex, restable = next(request)
-
         if errindication:
             _LOGGER.error("SNMP error: %s", errindication)
         elif errstatus:
@@ -149,17 +212,10 @@ class SnmpSwitch(SwitchDevice):
         """Return true if switch is on; False if off. None if unknown."""
         return self._state
 
-    def _set(self, value):
-        from pysnmp.hlapi import (
-            setCmd, CommunityData, SnmpEngine, UdpTransportTarget, ContextData,
-            ObjectType, ObjectIdentity)
+    async def _set(self, value):
+        from pysnmp.hlapi.asyncio import (setCmd, ObjectType, ObjectIdentity)
 
-        request = setCmd(
-            SnmpEngine(),
-            CommunityData(self._community, mpModel=self._version),
-            UdpTransportTarget((self._host, self._port)),
-            ContextData(),
+        await setCmd(
+            *self._request_args,
             ObjectType(ObjectIdentity(self._commandoid), value)
         )
-
-        next(request)

From a5715c48a4ce8c508573e1f26af8a36f2ceb0efb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 7 Sep 2018 14:41:31 +0200
Subject: [PATCH 060/357] Fix GitHub change to resolve conflicts (#16477)

---
 homeassistant/components/switch/snmp.py | 31 +++++++++++--------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/homeassistant/components/switch/snmp.py b/homeassistant/components/switch/snmp.py
index 795686c9b15..62636b67003 100644
--- a/homeassistant/components/switch/snmp.py
+++ b/homeassistant/components/switch/snmp.py
@@ -86,8 +86,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-
-def setup_platform(hass, config, add_entities, discovery_info=None):
+async def async_setup_platform(
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the SNMP switch."""
     name = config.get(CONF_NAME)
     host = config.get(CONF_HOST)
@@ -106,21 +106,20 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     payload_on = config.get(CONF_PAYLOAD_ON)
     payload_off = config.get(CONF_PAYLOAD_OFF)
 
-    add_entities(
-        [SnmpSwitch(name, host, port, community, baseoid, command_oid, version,
-                    username, authkey, authproto, privkey, privproto,
-                    payload_on, payload_off,
-                    command_payload_on, command_payload_off)], True)
+    async_add_entities(
+        [SnmpSwitch(
+            name, host, port, community, baseoid, command_oid, version,
+            username, authkey, authproto, privkey, privproto, payload_on,
+            payload_off, command_payload_on, command_payload_off)], True)
 
 
 class SnmpSwitch(SwitchDevice):
     """Representation of a SNMP switch."""
 
-    def __init__(self, name, host, port, community,
-                 baseoid, commandoid, version,
-                 username, authkey, authproto, privkey, privproto,
-                 payload_on, payload_off,
-                 command_payload_on, command_payload_off):
+    def __init__(self, name, host, port, community, baseoid, commandoid,
+                 version, username, authkey, authproto, privkey, privproto,
+                 payload_on, payload_off, command_payload_on,
+                 command_payload_off):
         """Initialize the switch."""
         from pysnmp.hlapi.asyncio import (
             CommunityData, ContextData, SnmpEngine,
@@ -156,14 +155,14 @@ class SnmpSwitch(SwitchDevice):
                     privProtocol=getattr(hlapi, MAP_PRIV_PROTOCOLS[privproto]),
                 ),
                 UdpTransportTarget((host, port)),
-                ContextData()
+                ContextData(),
             ]
         else:
             self._request_args = [
                 SnmpEngine(),
                 CommunityData(community, mpModel=SNMP_VERSIONS[version]),
                 UdpTransportTarget((host, port)),
-                ContextData()
+                ContextData(),
             ]
 
     async def async_turn_on(self, **kwargs):
@@ -184,9 +183,7 @@ class SnmpSwitch(SwitchDevice):
         from pyasn1.type.univ import (Integer)
 
         errindication, errstatus, errindex, restable = await getCmd(
-            *self._request_args,
-            ObjectType(ObjectIdentity(self._baseoid))
-        )
+            *self._request_args, ObjectType(ObjectIdentity(self._baseoid)))
 
         if errindication:
             _LOGGER.error("SNMP error: %s", errindication)

From 7ad094b0a726abc5ab944ce38ff600d1fb85ca65 Mon Sep 17 00:00:00 2001
From: mvn23 <schopdiedwaas@gmail.com>
Date: Fri, 7 Sep 2018 18:16:19 +0200
Subject: [PATCH 061/357] Add OpenTherm Gateway climate platform (#16299)

* Initial OpenTherm Gateway support.

* Fix coveragerc and requirements_all*.txt
Overall cleanup and polishing

* Make hound/flake/travis happy

* Basic improvements to comply with Home Assistant's style guidelines
Changed wording from "component" to more appropriate terms where necessary
Fixed small mistakes that snuck in during testing and/or due to my own ignorance ;)

* Fixed overwriting state property

* Fixed a bug with ROOM_SETPOINT_OVRD
Updated dependency pyotgw to latest version

* Remove unit_of_measurement from OpenThermGateway class

* Cleanup after previous commits

* Moved initialisation and configuration from async_setup_platform to async_added_to_hass

* Make travis happy

* Disable polling for this platform
Improve update flow

* Small improvements/optimisations
---
 .coveragerc                                   |   1 +
 .../components/climate/opentherm_gw.py        | 189 ++++++++++++++++++
 requirements_all.txt                          |   3 +
 3 files changed, 193 insertions(+)
 create mode 100644 homeassistant/components/climate/opentherm_gw.py

diff --git a/.coveragerc b/.coveragerc
index 85ed4e1fcf4..ca36f4a8dbb 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -415,6 +415,7 @@ omit =
     homeassistant/components/climate/honeywell.py
     homeassistant/components/climate/knx.py
     homeassistant/components/climate/oem.py
+    homeassistant/components/climate/opentherm_gw.py
     homeassistant/components/climate/proliphix.py
     homeassistant/components/climate/radiotherm.py
     homeassistant/components/climate/sensibo.py
diff --git a/homeassistant/components/climate/opentherm_gw.py b/homeassistant/components/climate/opentherm_gw.py
new file mode 100644
index 00000000000..c1f7afa61b0
--- /dev/null
+++ b/homeassistant/components/climate/opentherm_gw.py
@@ -0,0 +1,189 @@
+"""
+Support for OpenTherm Gateway devices.
+
+For more details about this component, please refer to the documentation at
+http://home-assistant.io/components/climate.opentherm_gw/
+"""
+import logging
+
+import voluptuous as vol
+
+from homeassistant.components.climate import (ClimateDevice, PLATFORM_SCHEMA,
+                                              STATE_IDLE, STATE_HEAT,
+                                              STATE_COOL,
+                                              SUPPORT_TARGET_TEMPERATURE)
+from homeassistant.const import (ATTR_TEMPERATURE, CONF_DEVICE, CONF_NAME,
+                                 PRECISION_HALVES, PRECISION_TENTHS,
+                                 TEMP_CELSIUS, PRECISION_WHOLE)
+import homeassistant.helpers.config_validation as cv
+
+REQUIREMENTS = ['pyotgw==0.1b0']
+
+CONF_FLOOR_TEMP = "floor_temperature"
+CONF_PRECISION = 'precision'
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_DEVICE): cv.string,
+    vol.Optional(CONF_NAME, default="OpenTherm Gateway"): cv.string,
+    vol.Optional(CONF_PRECISION): vol.In([PRECISION_TENTHS, PRECISION_HALVES,
+                                          PRECISION_WHOLE]),
+    vol.Optional(CONF_FLOOR_TEMP, default=False): cv.boolean,
+})
+
+SUPPORT_FLAGS = (SUPPORT_TARGET_TEMPERATURE)
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_setup_platform(hass, config, async_add_entities,
+                               discovery_info=None):
+    """Set up the opentherm_gw device."""
+    gateway = OpenThermGateway(config)
+    async_add_entities([gateway])
+
+
+class OpenThermGateway(ClimateDevice):
+    """Representation of a climate device."""
+
+    def __init__(self, config):
+        """Initialize the sensor."""
+        import pyotgw
+        self.pyotgw = pyotgw
+        self.gateway = self.pyotgw.pyotgw()
+        self._device = config[CONF_DEVICE]
+        self.friendly_name = config.get(CONF_NAME)
+        self.floor_temp = config.get(CONF_FLOOR_TEMP)
+        self.temp_precision = config.get(CONF_PRECISION)
+        self._current_operation = STATE_IDLE
+        self._current_temperature = 0.0
+        self._target_temperature = 0.0
+        self._away_mode_a = None
+        self._away_mode_b = None
+        self._away_state_a = False
+        self._away_state_b = False
+
+    async def async_added_to_hass(self):
+        """Connect to the OpenTherm Gateway device."""
+        await self.gateway.connect(self.hass.loop, self._device)
+        self.gateway.subscribe(self.receive_report)
+        _LOGGER.debug("Connected to %s on %s", self.friendly_name,
+                      self._device)
+
+    async def receive_report(self, status):
+        """Receive and handle a new report from the Gateway."""
+        _LOGGER.debug("Received report: %s", status)
+        ch_active = status.get(self.pyotgw.DATA_SLAVE_CH_ACTIVE)
+        cooling_active = status.get(self.pyotgw.DATA_SLAVE_COOLING_ACTIVE)
+        if ch_active:
+            self._current_operation = STATE_HEAT
+        elif cooling_active:
+            self._current_operation = STATE_COOL
+        else:
+            self._current_operation = STATE_IDLE
+        self._current_temperature = status.get(self.pyotgw.DATA_ROOM_TEMP)
+
+        temp = status.get(self.pyotgw.DATA_ROOM_SETPOINT_OVRD)
+        if temp is None:
+            temp = status.get(self.pyotgw.DATA_ROOM_SETPOINT)
+        self._target_temperature = temp
+
+        # GPIO mode 5: 0 == Away
+        # GPIO mode 6: 1 == Away
+        gpio_a_state = status.get(self.pyotgw.OTGW_GPIO_A)
+        if gpio_a_state == 5:
+            self._away_mode_a = 0
+        elif gpio_a_state == 6:
+            self._away_mode_a = 1
+        else:
+            self._away_mode_a = None
+        gpio_b_state = status.get(self.pyotgw.OTGW_GPIO_B)
+        if gpio_b_state == 5:
+            self._away_mode_b = 0
+        elif gpio_b_state == 6:
+            self._away_mode_b = 1
+        else:
+            self._away_mode_b = None
+        if self._away_mode_a is not None:
+            self._away_state_a = (status.get(self.pyotgw.OTGW_GPIO_A_STATE) ==
+                                  self._away_mode_a)
+        if self._away_mode_b is not None:
+            self._away_state_b = (status.get(self.pyotgw.OTGW_GPIO_B_STATE) ==
+                                  self._away_mode_b)
+        self.async_schedule_update_ha_state()
+
+    @property
+    def name(self):
+        """Return the friendly name."""
+        return self.friendly_name
+
+    @property
+    def precision(self):
+        """Return the precision of the system."""
+        if self.temp_precision is not None:
+            return self.temp_precision
+        if self.hass.config.units.temperature_unit == TEMP_CELSIUS:
+            return PRECISION_HALVES
+        return PRECISION_WHOLE
+
+    @property
+    def should_poll(self):
+        """Disable polling for this entity."""
+        return False
+
+    @property
+    def temperature_unit(self):
+        """Return the unit of measurement used by the platform."""
+        return TEMP_CELSIUS
+
+    @property
+    def current_operation(self):
+        """Return current operation ie. heat, cool, idle."""
+        return self._current_operation
+
+    @property
+    def current_temperature(self):
+        """Return the current temperature."""
+        if self.floor_temp is True:
+            if self.temp_precision == PRECISION_HALVES:
+                return int(2 * self._current_temperature) / 2
+            if self.temp_precision == PRECISION_TENTHS:
+                return int(10 * self._current_temperature) / 10
+            return int(self._current_temperature)
+        return self._current_temperature
+
+    @property
+    def target_temperature(self):
+        """Return the temperature we try to reach."""
+        return self._target_temperature
+
+    @property
+    def target_temperature_step(self):
+        """Return the supported step of target temperature."""
+        return self.temp_precision
+
+    @property
+    def is_away_mode_on(self):
+        """Return true if away mode is on."""
+        return self._away_state_a or self._away_state_b
+
+    async def async_set_temperature(self, **kwargs):
+        """Set new target temperature."""
+        if ATTR_TEMPERATURE in kwargs:
+            temp = float(kwargs[ATTR_TEMPERATURE])
+            self._target_temperature = await self.gateway.set_target_temp(
+                temp)
+            self.async_schedule_update_ha_state()
+
+    @property
+    def supported_features(self):
+        """Return the list of supported features."""
+        return SUPPORT_FLAGS
+
+    @property
+    def min_temp(self):
+        """Return the minimum temperature."""
+        return 1
+
+    @property
+    def max_temp(self):
+        """Return the maximum temperature."""
+        return 30
diff --git a/requirements_all.txt b/requirements_all.txt
index d280fa14f15..b4a70fd0be2 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -998,6 +998,9 @@ pyopenuv==1.0.4
 # homeassistant.components.iota
 pyota==2.0.5
 
+# homeassistant.components.climate.opentherm_gw
+pyotgw==0.1b0
+
 # homeassistant.auth.mfa_modules.totp
 # homeassistant.components.sensor.otp
 pyotp==2.2.6

From 50266e9b91ef9cba3bd3114f65557bf95a1deebb Mon Sep 17 00:00:00 2001
From: Andreas Oberritter <obi@saftware.de>
Date: Fri, 7 Sep 2018 20:51:18 +0200
Subject: [PATCH 062/357] Support SNMPv3 and asyncio in snmp sensor (#14753)

* snmp sensor: Add asyncio support and reuse SnmpEngine object

* snmp sensor: Support protocol v3

* Fix lint issue
---
 homeassistant/components/sensor/snmp.py | 122 +++++++++++++++++-------
 1 file changed, 85 insertions(+), 37 deletions(-)

diff --git a/homeassistant/components/sensor/snmp.py b/homeassistant/components/sensor/snmp.py
index f7d160ecf2f..d66a24524fb 100644
--- a/homeassistant/components/sensor/snmp.py
+++ b/homeassistant/components/sensor/snmp.py
@@ -14,7 +14,7 @@ from homeassistant.components.sensor import PLATFORM_SCHEMA
 from homeassistant.helpers.entity import Entity
 from homeassistant.const import (
     CONF_HOST, CONF_NAME, CONF_PORT, CONF_UNIT_OF_MEASUREMENT, STATE_UNKNOWN,
-    CONF_VALUE_TEMPLATE)
+    CONF_USERNAME, CONF_VALUE_TEMPLATE)
 
 REQUIREMENTS = ['pysnmp==4.4.5']
 
@@ -23,6 +23,10 @@ _LOGGER = logging.getLogger(__name__)
 CONF_BASEOID = 'baseoid'
 CONF_COMMUNITY = 'community'
 CONF_VERSION = 'version'
+CONF_AUTH_KEY = 'auth_key'
+CONF_AUTH_PROTOCOL = 'auth_protocol'
+CONF_PRIV_KEY = 'priv_key'
+CONF_PRIV_PROTOCOL = 'priv_protocol'
 CONF_ACCEPT_ERRORS = 'accept_errors'
 CONF_DEFAULT_VALUE = 'default_value'
 
@@ -31,10 +35,32 @@ DEFAULT_HOST = 'localhost'
 DEFAULT_NAME = 'SNMP'
 DEFAULT_PORT = '161'
 DEFAULT_VERSION = '1'
+DEFAULT_AUTH_PROTOCOL = 'none'
+DEFAULT_PRIV_PROTOCOL = 'none'
 
 SNMP_VERSIONS = {
     '1': 0,
-    '2c': 1
+    '2c': 1,
+    '3': None
+}
+
+MAP_AUTH_PROTOCOLS = {
+    'none': 'usmNoAuthProtocol',
+    'hmac-md5': 'usmHMACMD5AuthProtocol',
+    'hmac-sha': 'usmHMACSHAAuthProtocol',
+    'hmac128-sha224': 'usmHMAC128SHA224AuthProtocol',
+    'hmac192-sha256': 'usmHMAC192SHA256AuthProtocol',
+    'hmac256-sha384': 'usmHMAC256SHA384AuthProtocol',
+    'hmac384-sha512': 'usmHMAC384SHA512AuthProtocol',
+}
+
+MAP_PRIV_PROTOCOLS = {
+    'none': 'usmNoPrivProtocol',
+    'des': 'usmDESPrivProtocol',
+    '3des-ede': 'usm3DESEDEPrivProtocol',
+    'aes-cfb-128': 'usmAesCfb128Protocol',
+    'aes-cfb-192': 'usmAesCfb192Protocol',
+    'aes-cfb-256': 'usmAesCfb256Protocol',
 }
 
 SCAN_INTERVAL = timedelta(seconds=10)
@@ -50,14 +76,22 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_UNIT_OF_MEASUREMENT): cv.string,
     vol.Optional(CONF_VALUE_TEMPLATE): cv.template,
     vol.Optional(CONF_VERSION, default=DEFAULT_VERSION): vol.In(SNMP_VERSIONS),
+    vol.Optional(CONF_USERNAME): cv.string,
+    vol.Optional(CONF_AUTH_KEY): cv.string,
+    vol.Optional(CONF_AUTH_PROTOCOL, default=DEFAULT_AUTH_PROTOCOL):
+        vol.In(MAP_AUTH_PROTOCOLS),
+    vol.Optional(CONF_PRIV_KEY): cv.string,
+    vol.Optional(CONF_PRIV_PROTOCOL, default=DEFAULT_PRIV_PROTOCOL):
+        vol.In(MAP_PRIV_PROTOCOLS),
 })
 
 
-def setup_platform(hass, config, add_entities, discovery_info=None):
+async def async_setup_platform(
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the SNMP sensor."""
-    from pysnmp.hlapi import (
+    from pysnmp.hlapi.asyncio import (
         getCmd, CommunityData, SnmpEngine, UdpTransportTarget, ContextData,
-        ObjectType, ObjectIdentity)
+        ObjectType, ObjectIdentity, UsmUserData)
 
     name = config.get(CONF_NAME)
     host = config.get(CONF_HOST)
@@ -66,6 +100,11 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     baseoid = config.get(CONF_BASEOID)
     unit = config.get(CONF_UNIT_OF_MEASUREMENT)
     version = config.get(CONF_VERSION)
+    username = config.get(CONF_USERNAME)
+    authkey = config.get(CONF_AUTH_KEY)
+    authproto = config.get(CONF_AUTH_PROTOCOL)
+    privkey = config.get(CONF_PRIV_KEY)
+    privproto = config.get(CONF_PRIV_PROTOCOL)
     accept_errors = config.get(CONF_ACCEPT_ERRORS)
     default_value = config.get(CONF_DEFAULT_VALUE)
     value_template = config.get(CONF_VALUE_TEMPLATE)
@@ -73,27 +112,46 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     if value_template is not None:
         value_template.hass = hass
 
-    errindication, _, _, _ = next(
-        getCmd(SnmpEngine(),
-               CommunityData(community, mpModel=SNMP_VERSIONS[version]),
-               UdpTransportTarget((host, port)),
-               ContextData(),
-               ObjectType(ObjectIdentity(baseoid))))
+    if version == '3':
+        import pysnmp.hlapi.asyncio as hlapi
+
+        if not authkey:
+            authproto = 'none'
+        if not privkey:
+            privproto = 'none'
+
+        request_args = [
+            SnmpEngine(),
+            UsmUserData(
+                username, authKey=authkey or None, privKey=privkey or None,
+                authProtocol=getattr(hlapi, MAP_AUTH_PROTOCOLS[authproto]),
+                privProtocol=getattr(hlapi, MAP_PRIV_PROTOCOLS[privproto]),),
+            UdpTransportTarget((host, port)),
+            ContextData(),
+        ]
+    else:
+        request_args = [
+            SnmpEngine(),
+            CommunityData(community, mpModel=SNMP_VERSIONS[version]),
+            UdpTransportTarget((host, port)),
+            ContextData(),
+        ]
+
+    errindication, _, _, _ = await getCmd(
+        *request_args, ObjectType(ObjectIdentity(baseoid)))
 
     if errindication and not accept_errors:
         _LOGGER.error("Please check the details in the configuration file")
-        return False
-    data = SnmpData(
-        host, port, community, baseoid, version, accept_errors,
-        default_value)
-    add_entities([SnmpSensor(data, name, unit, value_template)], True)
+        return
+
+    data = SnmpData(request_args, baseoid, accept_errors, default_value)
+    async_add_entities([SnmpSensor(data, name, unit, value_template)], True)
 
 
 class SnmpSensor(Entity):
     """Representation of a SNMP sensor."""
 
-    def __init__(self, data, name, unit_of_measurement,
-                 value_template):
+    def __init__(self, data, name, unit_of_measurement, value_template):
         """Initialize the sensor."""
         self.data = data
         self._name = name
@@ -116,9 +174,9 @@ class SnmpSensor(Entity):
         """Return the unit the value is expressed in."""
         return self._unit_of_measurement
 
-    def update(self):
+    async def async_update(self):
         """Get the latest data and updates the states."""
-        self.data.update()
+        await self.data.async_update()
         value = self.data.value
 
         if value is None:
@@ -133,30 +191,20 @@ class SnmpSensor(Entity):
 class SnmpData:
     """Get the latest data and update the states."""
 
-    def __init__(self, host, port, community, baseoid, version, accept_errors,
-                 default_value):
+    def __init__(self, request_args, baseoid, accept_errors, default_value):
         """Initialize the data object."""
-        self._host = host
-        self._port = port
-        self._community = community
+        self._request_args = request_args
         self._baseoid = baseoid
-        self._version = SNMP_VERSIONS[version]
         self._accept_errors = accept_errors
         self._default_value = default_value
         self.value = None
 
-    def update(self):
+    async def async_update(self):
         """Get the latest data from the remote SNMP capable host."""
-        from pysnmp.hlapi import (
-            getCmd, CommunityData, SnmpEngine, UdpTransportTarget, ContextData,
-            ObjectType, ObjectIdentity)
-        errindication, errstatus, errindex, restable = next(
-            getCmd(SnmpEngine(),
-                   CommunityData(self._community, mpModel=self._version),
-                   UdpTransportTarget((self._host, self._port)),
-                   ContextData(),
-                   ObjectType(ObjectIdentity(self._baseoid)))
-            )
+        from pysnmp.hlapi.asyncio import (getCmd, ObjectType, ObjectIdentity)
+
+        errindication, errstatus, errindex, restable = await getCmd(
+            *self._request_args, ObjectType(ObjectIdentity(self._baseoid)))
 
         if errindication and not self._accept_errors:
             _LOGGER.error("SNMP error: %s", errindication)

From 8a2bc99f6337b61923dea095636a3e2857ccb6c5 Mon Sep 17 00:00:00 2001
From: Florian Werner <florian.werner@dev.xod.de>
Date: Sat, 8 Sep 2018 01:10:08 +0200
Subject: [PATCH 063/357] Add rate of change to statistics sensor (#15632)

* always export max_age/min_age

* downgrade errors of missing data
on start with empty recorder database these errors are logged multiple times:
ERROR (MainThread) [homeassistant.components.sensor.statistics] mean requires at least one data point
ERROR (MainThread) [homeassistant.components.sensor.statistics] variance requires at least two data points

downgrade them to debug as they are not meaningful to end users

* add change_rate attribute
this calculates the average change rate of all data points

* simplify count, reorder attribute calculation

* reorder initialization

* reorder attribute names

* don't use min/max for min_age/max_age

* add test case

* style

* style

* sort constants

* init variables with None

* add precision config setting

* round to precision

* test round
---
 homeassistant/components/sensor/statistics.py | 122 +++++++++++-------
 tests/components/sensor/test_statistics.py    |  42 +++++-
 2 files changed, 112 insertions(+), 52 deletions(-)

diff --git a/homeassistant/components/sensor/statistics.py b/homeassistant/components/sensor/statistics.py
index b1cfd447f0e..e7692001ffa 100644
--- a/homeassistant/components/sensor/statistics.py
+++ b/homeassistant/components/sensor/statistics.py
@@ -25,23 +25,26 @@ _LOGGER = logging.getLogger(__name__)
 
 ATTR_AVERAGE_CHANGE = 'average_change'
 ATTR_CHANGE = 'change'
+ATTR_CHANGE_RATE = 'change_rate'
 ATTR_COUNT = 'count'
+ATTR_MAX_AGE = 'max_age'
 ATTR_MAX_VALUE = 'max_value'
-ATTR_MIN_VALUE = 'min_value'
 ATTR_MEAN = 'mean'
 ATTR_MEDIAN = 'median'
-ATTR_VARIANCE = 'variance'
-ATTR_STANDARD_DEVIATION = 'standard_deviation'
-ATTR_SAMPLING_SIZE = 'sampling_size'
-ATTR_TOTAL = 'total'
-ATTR_MAX_AGE = 'max_age'
 ATTR_MIN_AGE = 'min_age'
+ATTR_MIN_VALUE = 'min_value'
+ATTR_SAMPLING_SIZE = 'sampling_size'
+ATTR_STANDARD_DEVIATION = 'standard_deviation'
+ATTR_TOTAL = 'total'
+ATTR_VARIANCE = 'variance'
 
 CONF_SAMPLING_SIZE = 'sampling_size'
 CONF_MAX_AGE = 'max_age'
+CONF_PRECISION = 'precision'
 
 DEFAULT_NAME = 'Stats'
 DEFAULT_SIZE = 20
+DEFAULT_PRECISION = 2
 ICON = 'mdi:calculator'
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
@@ -49,7 +52,9 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
     vol.Optional(CONF_SAMPLING_SIZE, default=DEFAULT_SIZE):
         vol.All(vol.Coerce(int), vol.Range(min=1)),
-    vol.Optional(CONF_MAX_AGE): cv.time_period
+    vol.Optional(CONF_MAX_AGE): cv.time_period,
+    vol.Optional(CONF_PRECISION, default=DEFAULT_PRECISION):
+        vol.Coerce(int)
 })
 
 
@@ -61,17 +66,19 @@ def async_setup_platform(hass, config, async_add_entities,
     name = config.get(CONF_NAME)
     sampling_size = config.get(CONF_SAMPLING_SIZE)
     max_age = config.get(CONF_MAX_AGE, None)
+    precision = config.get(CONF_PRECISION)
+
+    async_add_entities([StatisticsSensor(hass, entity_id, name, sampling_size,
+                                         max_age, precision)], True)
 
-    async_add_entities(
-        [StatisticsSensor(hass, entity_id, name, sampling_size, max_age)],
-        True)
     return True
 
 
 class StatisticsSensor(Entity):
     """Representation of a Statistics sensor."""
 
-    def __init__(self, hass, entity_id, name, sampling_size, max_age):
+    def __init__(self, hass, entity_id, name, sampling_size, max_age,
+                 precision):
         """Initialize the Statistics sensor."""
         self._hass = hass
         self._entity_id = entity_id
@@ -83,15 +90,16 @@ class StatisticsSensor(Entity):
             self._name = '{} {}'.format(name, ATTR_COUNT)
         self._sampling_size = sampling_size
         self._max_age = max_age
+        self._precision = precision
         self._unit_of_measurement = None
         self.states = deque(maxlen=self._sampling_size)
-        if self._max_age is not None:
-            self.ages = deque(maxlen=self._sampling_size)
+        self.ages = deque(maxlen=self._sampling_size)
 
-        self.median = self.mean = self.variance = self.stdev = 0
-        self.min = self.max = self.total = self.count = 0
-        self.average_change = self.change = 0
-        self.max_age = self.min_age = 0
+        self.count = 0
+        self.mean = self.median = self.stdev = self.variance = None
+        self.total = self.min = self.max = None
+        self.min_age = self.max_age = None
+        self.change = self.average_change = self.change_rate = None
 
         if 'recorder' in self._hass.config.components:
             # only use the database if it's configured
@@ -113,11 +121,9 @@ class StatisticsSensor(Entity):
     def _add_state_to_queue(self, new_state):
         try:
             self.states.append(float(new_state.state))
-            if self._max_age is not None:
-                self.ages.append(new_state.last_updated)
-            self.count = self.count + 1
+            self.ages.append(new_state.last_updated)
         except ValueError:
-            self.count = self.count + 1
+            pass
 
     @property
     def name(self):
@@ -143,26 +149,22 @@ class StatisticsSensor(Entity):
     def device_state_attributes(self):
         """Return the state attributes of the sensor."""
         if not self.is_binary:
-            state = {
-                ATTR_MEAN: self.mean,
-                ATTR_COUNT: self.count,
-                ATTR_MAX_VALUE: self.max,
-                ATTR_MEDIAN: self.median,
-                ATTR_MIN_VALUE: self.min,
+            return {
                 ATTR_SAMPLING_SIZE: self._sampling_size,
+                ATTR_COUNT: self.count,
+                ATTR_MEAN: self.mean,
+                ATTR_MEDIAN: self.median,
                 ATTR_STANDARD_DEVIATION: self.stdev,
-                ATTR_TOTAL: self.total,
                 ATTR_VARIANCE: self.variance,
+                ATTR_TOTAL: self.total,
+                ATTR_MIN_VALUE: self.min,
+                ATTR_MAX_VALUE: self.max,
+                ATTR_MIN_AGE: self.min_age,
+                ATTR_MAX_AGE: self.max_age,
                 ATTR_CHANGE: self.change,
                 ATTR_AVERAGE_CHANGE: self.average_change,
+                ATTR_CHANGE_RATE: self.change_rate,
             }
-            # Only return min/max age if we have an age span
-            if self._max_age:
-                state.update({
-                    ATTR_MAX_AGE: self.max_age,
-                    ATTR_MIN_AGE: self.min_age,
-                })
-            return state
 
     @property
     def icon(self):
@@ -183,36 +185,56 @@ class StatisticsSensor(Entity):
         if self._max_age is not None:
             self._purge_old()
 
+        self.count = len(self.states)
+
         if not self.is_binary:
             try:  # require only one data point
-                self.mean = round(statistics.mean(self.states), 2)
-                self.median = round(statistics.median(self.states), 2)
+                self.mean = round(statistics.mean(self.states),
+                                  self._precision)
+                self.median = round(statistics.median(self.states),
+                                    self._precision)
             except statistics.StatisticsError as err:
-                _LOGGER.error(err)
+                _LOGGER.debug(err)
                 self.mean = self.median = STATE_UNKNOWN
 
             try:  # require at least two data points
-                self.stdev = round(statistics.stdev(self.states), 2)
-                self.variance = round(statistics.variance(self.states), 2)
+                self.stdev = round(statistics.stdev(self.states),
+                                   self._precision)
+                self.variance = round(statistics.variance(self.states),
+                                      self._precision)
             except statistics.StatisticsError as err:
-                _LOGGER.error(err)
+                _LOGGER.debug(err)
                 self.stdev = self.variance = STATE_UNKNOWN
 
             if self.states:
-                self.count = len(self.states)
-                self.total = round(sum(self.states), 2)
-                self.min = min(self.states)
-                self.max = max(self.states)
+                self.total = round(sum(self.states), self._precision)
+                self.min = round(min(self.states), self._precision)
+                self.max = round(max(self.states), self._precision)
+
+                self.min_age = self.ages[0]
+                self.max_age = self.ages[-1]
+
                 self.change = self.states[-1] - self.states[0]
                 self.average_change = self.change
+                self.change_rate = 0
+
                 if len(self.states) > 1:
                     self.average_change /= len(self.states) - 1
-                if self._max_age is not None:
-                    self.max_age = max(self.ages)
-                    self.min_age = min(self.ages)
+
+                    time_diff = (self.max_age - self.min_age).total_seconds()
+                    if time_diff > 0:
+                        self.change_rate = self.average_change / time_diff
+
+                self.change = round(self.change, self._precision)
+                self.average_change = round(self.average_change,
+                                            self._precision)
+                self.change_rate = round(self.change_rate, self._precision)
+
             else:
-                self.min = self.max = self.total = STATE_UNKNOWN
-                self.average_change = self.change = STATE_UNKNOWN
+                self.total = self.min = self.max = STATE_UNKNOWN
+                self.min_age = self.max_age = dt_util.utcnow()
+                self.change = self.average_change = STATE_UNKNOWN
+                self.change_rate = STATE_UNKNOWN
 
     @asyncio.coroutine
     def _initialize_from_database(self):
diff --git a/tests/components/sensor/test_statistics.py b/tests/components/sensor/test_statistics.py
index 466b89cc0d1..e7cfec4d825 100644
--- a/tests/components/sensor/test_statistics.py
+++ b/tests/components/sensor/test_statistics.py
@@ -28,8 +28,10 @@ class TestStatisticsSensor(unittest.TestCase):
         self.median = round(statistics.median(self.values), 2)
         self.deviation = round(statistics.stdev(self.values), 2)
         self.variance = round(statistics.variance(self.values), 2)
-        self.change = self.values[-1] - self.values[0]
-        self.average_change = self.change / (len(self.values) - 1)
+        self.change = round(self.values[-1] - self.values[0], 2)
+        self.average_change = round(self.change / (len(self.values) - 1), 2)
+        self.change_rate = round(self.average_change / (60 * (self.count - 1)),
+                                 2)
 
     def teardown_method(self, method):
         """Stop everything that was started."""
@@ -171,6 +173,42 @@ class TestStatisticsSensor(unittest.TestCase):
         self.assertEqual(6, state.attributes.get('min_value'))
         self.assertEqual(14, state.attributes.get('max_value'))
 
+    def test_change_rate(self):
+        """Test min_age/max_age and change_rate."""
+        mock_data = {
+            'return_time': datetime(2017, 8, 2, 12, 23, 42,
+                                    tzinfo=dt_util.UTC),
+        }
+
+        def mock_now():
+            return mock_data['return_time']
+
+        with patch('homeassistant.components.sensor.statistics.dt_util.utcnow',
+                   new=mock_now):
+            assert setup_component(self.hass, 'sensor', {
+                'sensor': {
+                    'platform': 'statistics',
+                    'name': 'test',
+                    'entity_id': 'sensor.test_monitored'
+                }
+            })
+
+            for value in self.values:
+                self.hass.states.set('sensor.test_monitored', value,
+                                     {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS})
+                self.hass.block_till_done()
+                # insert the next value one minute later
+                mock_data['return_time'] += timedelta(minutes=1)
+
+            state = self.hass.states.get('sensor.test_mean')
+
+        self.assertEqual(datetime(2017, 8, 2, 12, 23, 42, tzinfo=dt_util.UTC),
+                         state.attributes.get('min_age'))
+        self.assertEqual(datetime(2017, 8, 2, 12, 23 + self.count - 1, 42,
+                                  tzinfo=dt_util.UTC),
+                         state.attributes.get('max_age'))
+        self.assertEqual(self.change_rate, state.attributes.get('change_rate'))
+
     def test_initialize_from_database(self):
         """Test initializing the statistics from the database."""
         # enable the recorder

From 93143384a8ece876b95332a7aebaaa237408b33e Mon Sep 17 00:00:00 2001
From: Varga Tamas <tamas@alapzaj.com>
Date: Sat, 8 Sep 2018 18:13:24 +0200
Subject: [PATCH 064/357] Restore status attribute for xiaomi_vacuum (#16366)

* Added new states and exposed state/state code received from xiaomi vacuum

* Restore status attribute for xiaomi_vacuum
---
 homeassistant/components/vacuum/xiaomi_miio.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/vacuum/xiaomi_miio.py b/homeassistant/components/vacuum/xiaomi_miio.py
index 41842459c8a..290c3417149 100644
--- a/homeassistant/components/vacuum/xiaomi_miio.py
+++ b/homeassistant/components/vacuum/xiaomi_miio.py
@@ -60,6 +60,7 @@ ATTR_ERROR = 'error'
 ATTR_RC_DURATION = 'duration'
 ATTR_RC_ROTATION = 'rotation'
 ATTR_RC_VELOCITY = 'velocity'
+ATTR_STATUS = 'status'
 
 SERVICE_SCHEMA_REMOTE_CONTROL = VACUUM_SERVICE_SCHEMA.extend({
     vol.Optional(ATTR_RC_VELOCITY):
@@ -240,7 +241,8 @@ class MiroboVacuum(StateVacuumDevice):
                     / 3600),
                 ATTR_SENSOR_DIRTY_LEFT: int(
                     self.consumable_state.sensor_dirty_left.total_seconds()
-                    / 3600)
+                    / 3600),
+                ATTR_STATUS: str(self.vacuum_state.state)
                 })
 
             if self.vacuum_state.got_error:

From 9944c60311046df03f2d0706ba2c3477e733d49b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 8 Sep 2018 18:33:41 +0200
Subject: [PATCH 065/357] Check if API key is valid and users available
 (#16494)

---
 homeassistant/components/sensor/lastfm.py | 25 ++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/homeassistant/components/sensor/lastfm.py b/homeassistant/components/sensor/lastfm.py
index 338adc7d501..d92fe8b53bf 100644
--- a/homeassistant/components/sensor/lastfm.py
+++ b/homeassistant/components/sensor/lastfm.py
@@ -4,6 +4,7 @@ Sensor for Last.fm account status.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/sensor.lastfm/
 """
+import logging
 import re
 
 import voluptuous as vol
@@ -15,6 +16,8 @@ from homeassistant.helpers.entity import Entity
 
 REQUIREMENTS = ['pylast==2.4.0']
 
+_LOGGER = logging.getLogger(__name__)
+
 ATTR_LAST_PLAYED = 'last_played'
 ATTR_PLAY_COUNT = 'play_count'
 ATTR_TOP_PLAYED = 'top_played'
@@ -30,13 +33,25 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up the Last.fm platform."""
+    """Set up the Last.fm sensor platform."""
     import pylast as lastfm
-    network = lastfm.LastFMNetwork(api_key=config.get(CONF_API_KEY))
+    from pylast import WSError
 
-    add_entities(
-        [LastfmSensor(
-            username, network) for username in config.get(CONF_USERS)], True)
+    api_key = config[CONF_API_KEY]
+    users = config.get(CONF_USERS)
+
+    lastfm_api = lastfm.LastFMNetwork(api_key=api_key)
+
+    entities = []
+    for username in users:
+        try:
+            lastfm_api.get_user(username).get_image()
+            entities.append(LastfmSensor(username, lastfm_api))
+        except WSError as error:
+            _LOGGER.error(error)
+            return
+
+    add_entities(entities, True)
 
 
 class LastfmSensor(Entity):

From e7b8d2e6df4b24db86fd94bc0f221da2ab935d44 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Sat, 8 Sep 2018 22:10:42 +0200
Subject: [PATCH 066/357] Update name legacy api password (#16455)

---
 .../auth/providers/legacy_api_password.py      | 18 ++++++++----------
 .../auth/providers/test_legacy_api_password.py |  4 +---
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/homeassistant/auth/providers/legacy_api_password.py b/homeassistant/auth/providers/legacy_api_password.py
index f631f8e73cf..111b9e7d39f 100644
--- a/homeassistant/auth/providers/legacy_api_password.py
+++ b/homeassistant/auth/providers/legacy_api_password.py
@@ -24,7 +24,7 @@ USER_SCHEMA = vol.Schema({
 CONFIG_SCHEMA = AUTH_PROVIDER_SCHEMA.extend({
 }, extra=vol.PREVENT_EXTRA)
 
-LEGACY_USER = 'homeassistant'
+LEGACY_USER_NAME = 'Legacy API password user'
 
 
 class InvalidAuthError(HomeAssistantError):
@@ -52,23 +52,21 @@ class LegacyApiPasswordAuthProvider(AuthProvider):
 
     async def async_get_or_create_credentials(
             self, flow_result: Dict[str, str]) -> Credentials:
-        """Return LEGACY_USER always."""
-        for credential in await self.async_credentials():
-            if credential.data['username'] == LEGACY_USER:
-                return credential
+        """Return credentials for this login."""
+        credentials = await self.async_credentials()
+        if credentials:
+            return credentials[0]
 
-        return self.async_create_credentials({
-            'username': LEGACY_USER
-        })
+        return self.async_create_credentials({})
 
     async def async_user_meta_for_credentials(
             self, credentials: Credentials) -> UserMeta:
         """
-        Set name as LEGACY_USER always.
+        Return info for the user.
 
         Will be used to populate info when creating a new user.
         """
-        return UserMeta(name=LEGACY_USER, is_active=True)
+        return UserMeta(name=LEGACY_USER_NAME, is_active=True)
 
 
 class LegacyLoginFlow(LoginFlow):
diff --git a/tests/auth/providers/test_legacy_api_password.py b/tests/auth/providers/test_legacy_api_password.py
index 60916798d5b..96da624161a 100644
--- a/tests/auth/providers/test_legacy_api_password.py
+++ b/tests/auth/providers/test_legacy_api_password.py
@@ -33,11 +33,10 @@ def manager(hass, store, provider):
 async def test_create_new_credential(manager, provider):
     """Test that we create a new credential."""
     credentials = await provider.async_get_or_create_credentials({})
-    assert credentials.data["username"] is legacy_api_password.LEGACY_USER
     assert credentials.is_new is True
 
     user = await manager.async_get_or_create_user(credentials)
-    assert user.name == legacy_api_password.LEGACY_USER
+    assert user.name == legacy_api_password.LEGACY_USER_NAME
     assert user.is_active
 
 
@@ -46,7 +45,6 @@ async def test_only_one_credentials(manager, provider):
     credentials = await provider.async_get_or_create_credentials({})
     await manager.async_get_or_create_user(credentials)
     credentials2 = await provider.async_get_or_create_credentials({})
-    assert credentials2.data["username"] == legacy_api_password.LEGACY_USER
     assert credentials2.id == credentials.id
     assert credentials2.is_new is False
 

From e3e3ed42ec603b75f3906c52083960bed48a4419 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 9 Sep 2018 00:22:41 +0300
Subject: [PATCH 067/357] Fix Netgear LTESensor docstring (#16501)

---
 homeassistant/components/sensor/netgear_lte.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/components/sensor/netgear_lte.py b/homeassistant/components/sensor/netgear_lte.py
index 2ecf545aa4e..b13a8e39132 100644
--- a/homeassistant/components/sensor/netgear_lte.py
+++ b/homeassistant/components/sensor/netgear_lte.py
@@ -43,7 +43,7 @@ async def async_setup_platform(
 
 @attr.s
 class LTESensor(Entity):
-    """Data usage sensor entity."""
+    """Base LTE sensor entity."""
 
     modem_data = attr.ib()
     sensor_type = attr.ib()

From 7d590a6b93a1abbf3f83f735d866644cbbfa3a9f Mon Sep 17 00:00:00 2001
From: Anders Melchiorsen <amelchio@nogoto.net>
Date: Sun, 9 Sep 2018 00:34:22 +0200
Subject: [PATCH 068/357] Update pyHS100 to 0.3.3 (#16502)

---
 homeassistant/components/light/tplink.py  | 2 +-
 homeassistant/components/switch/tplink.py | 2 +-
 requirements_all.txt                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/light/tplink.py b/homeassistant/components/light/tplink.py
index a1e46c07d7d..0cc02e82b65 100644
--- a/homeassistant/components/light/tplink.py
+++ b/homeassistant/components/light/tplink.py
@@ -19,7 +19,7 @@ from homeassistant.util.color import \
 from homeassistant.util.color import (
     color_temperature_kelvin_to_mired as kelvin_to_mired)
 
-REQUIREMENTS = ['pyHS100==0.3.2']
+REQUIREMENTS = ['pyHS100==0.3.3']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/switch/tplink.py b/homeassistant/components/switch/tplink.py
index a68ad2bf37d..01d5c2cc72c 100644
--- a/homeassistant/components/switch/tplink.py
+++ b/homeassistant/components/switch/tplink.py
@@ -14,7 +14,7 @@ from homeassistant.components.switch import (
 from homeassistant.const import (CONF_HOST, CONF_NAME, ATTR_VOLTAGE)
 import homeassistant.helpers.config_validation as cv
 
-REQUIREMENTS = ['pyHS100==0.3.2']
+REQUIREMENTS = ['pyHS100==0.3.3']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/requirements_all.txt b/requirements_all.txt
index b4a70fd0be2..f9d08287930 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -743,7 +743,7 @@ pyCEC==0.4.13
 
 # homeassistant.components.light.tplink
 # homeassistant.components.switch.tplink
-pyHS100==0.3.2
+pyHS100==0.3.3
 
 # homeassistant.components.rfxtrx
 pyRFXtrx==0.23

From 4291bdc6b2a3862c99e271bfadf76b6dd49cce06 Mon Sep 17 00:00:00 2001
From: Jason Hu <awarecan@users.noreply.github.com>
Date: Sun, 9 Sep 2018 00:49:51 -0700
Subject: [PATCH 069/357] Move voluptuous-serialize to core requirement
 (#16507)

---
 homeassistant/components/config/config_entries.py | 3 ---
 homeassistant/package_constraints.txt             | 1 +
 requirements_all.txt                              | 4 +---
 requirements_test_all.txt                         | 3 ---
 script/gen_requirements_all.py                    | 2 --
 setup.py                                          | 1 +
 6 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/homeassistant/components/config/config_entries.py b/homeassistant/components/config/config_entries.py
index 04d2c713cdc..e0c0e7daaf4 100644
--- a/homeassistant/components/config/config_entries.py
+++ b/homeassistant/components/config/config_entries.py
@@ -7,9 +7,6 @@ from homeassistant.helpers.data_entry_flow import (
     FlowManagerIndexView, FlowManagerResourceView)
 
 
-REQUIREMENTS = ['voluptuous-serialize==2.0.0']
-
-
 @asyncio.coroutine
 def async_setup(hass):
     """Enable the Home Assistant views."""
diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt
index 8d49d5d07c6..168da1f2ead 100644
--- a/homeassistant/package_constraints.txt
+++ b/homeassistant/package_constraints.txt
@@ -12,6 +12,7 @@ pytz>=2018.04
 pyyaml>=3.13,<4
 requests==2.19.1
 voluptuous==0.11.5
+voluptuous-serialize==2.0.0
 
 pycryptodome>=3.6.6
 
diff --git a/requirements_all.txt b/requirements_all.txt
index f9d08287930..3e46814126a 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -13,6 +13,7 @@ pytz>=2018.04
 pyyaml>=3.13,<4
 requests==2.19.1
 voluptuous==0.11.5
+voluptuous-serialize==2.0.0
 
 # homeassistant.components.nuimo_controller
 --only-binary=all nuimo==0.1.0
@@ -1444,9 +1445,6 @@ venstarcolortouch==0.6
 # homeassistant.components.sensor.volkszaehler
 volkszaehler==0.1.2
 
-# homeassistant.components.config.config_entries
-voluptuous-serialize==2.0.0
-
 # homeassistant.components.volvooncall
 volvooncall==0.4.0
 
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 236033e2f19..060aef04a9b 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -215,9 +215,6 @@ statsd==3.2.1
 # homeassistant.components.camera.uvc
 uvcclient==0.10.1
 
-# homeassistant.components.config.config_entries
-voluptuous-serialize==2.0.0
-
 # homeassistant.components.vultr
 vultr==0.1.2
 
diff --git a/script/gen_requirements_all.py b/script/gen_requirements_all.py
index fc8e67b1ab6..a307ec9ee15 100755
--- a/script/gen_requirements_all.py
+++ b/script/gen_requirements_all.py
@@ -74,7 +74,6 @@ TEST_REQUIREMENTS = (
     'pyblackbird',
     'pydeconz',
     'pydispatcher',
-    'PyJWT',
     'pylitejet',
     'pymonoprice',
     'pynx584',
@@ -98,7 +97,6 @@ TEST_REQUIREMENTS = (
     'sqlalchemy',
     'statsd',
     'uvcclient',
-    'voluptuous-serialize',
     'warrant',
     'yahoo-finance',
     'pythonwhois',
diff --git a/setup.py b/setup.py
index 71f63adfb64..2978f37ad72 100755
--- a/setup.py
+++ b/setup.py
@@ -47,6 +47,7 @@ REQUIRES = [
     'pyyaml>=3.13,<4',
     'requests==2.19.1',
     'voluptuous==0.11.5',
+    'voluptuous-serialize==2.0.0',
 ]
 
 MIN_PY_VERSION = '.'.join(map(str, hass_const.REQUIRED_PYTHON_VER))

From d6d4ff6888d08fde99b2440212f79f659b2ba438 Mon Sep 17 00:00:00 2001
From: tadly <git@tadly.de>
Date: Sun, 9 Sep 2018 09:55:57 +0200
Subject: [PATCH 070/357] adds listener for OnAVStart and OnAVChange (#16495)

With Kodi 18, OnPlay is called before an item actually started playing.
For this OnAVStart and OnAVChange have been introduced.
---
 homeassistant/components/media_player/kodi.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/homeassistant/components/media_player/kodi.py b/homeassistant/components/media_player/kodi.py
index b36512e7c65..5ea82f6b054 100644
--- a/homeassistant/components/media_player/kodi.py
+++ b/homeassistant/components/media_player/kodi.py
@@ -310,6 +310,8 @@ class KodiDevice(MediaPlayerDevice):
             # Register notification listeners
             self._ws_server.Player.OnPause = self.async_on_speed_event
             self._ws_server.Player.OnPlay = self.async_on_speed_event
+            self._ws_server.Player.OnAVStart = self.async_on_speed_event
+            self._ws_server.Player.OnAVChange = self.async_on_speed_event
             self._ws_server.Player.OnResume = self.async_on_speed_event
             self._ws_server.Player.OnSpeedChanged = self.async_on_speed_event
             self._ws_server.Player.OnStop = self.async_on_stop

From 0d7ee9b93ba1b2336eeee7122a3cfc66ca218e22 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 9 Sep 2018 14:26:06 +0200
Subject: [PATCH 071/357] Order imports (#16515)

---
 homeassistant/components/mailbox/__init__.py  | 22 +++---
 .../components/mailbox/asterisk_mbox.py       | 11 +--
 homeassistant/components/mailbox/demo.py      | 22 +++---
 .../components/media_player/__init__.py       | 21 +++---
 .../components/media_player/anthemav.py       | 10 +--
 .../components/media_player/apple_tv.py       | 19 +++--
 .../components/media_player/aquostv.py        | 15 ++--
 .../components/media_player/blackbird.py      |  7 +-
 .../components/media_player/bluesound.py      |  4 +-
 .../components/media_player/braviatv.py       | 10 +--
 homeassistant/components/media_player/cast.py | 29 ++++----
 .../components/media_player/channels.py       | 33 ++++-----
 .../components/media_player/clementine.py     | 19 +++--
 homeassistant/components/media_player/cmus.py | 11 ++-
 homeassistant/components/media_player/demo.py | 15 ++--
 .../components/media_player/denon.py          |  8 +--
 .../components/media_player/denonavr.py       | 32 +++++----
 .../components/media_player/directv.py        | 23 +++---
 .../components/media_player/dlna_dmr.py       | 71 +++++++------------
 .../components/media_player/dunehd.py         | 10 +--
 homeassistant/components/media_player/emby.py | 20 +++---
 .../components/media_player/epson.py          | 51 +++++++------
 .../components/media_player/firetv.py         | 10 +--
 .../media_player/frontier_silicon.py          | 28 ++++----
 .../components/media_player/gpmdp.py          | 18 ++---
 .../components/media_player/gstreamer.py      | 13 ++--
 .../components/media_player/hdmi_cec.py       | 12 ++--
 .../components/media_player/horizon.py        | 15 ++--
 .../components/media_player/itunes.py         | 16 ++---
 homeassistant/components/media_player/kodi.py | 24 ++++---
 .../components/media_player/lg_netcast.py     | 23 +++---
 .../components/media_player/liveboxplaytv.py  | 16 ++---
 .../components/media_player/mediaroom.py      | 68 ++++++++----------
 .../components/media_player/mpchc.py          | 10 +--
 homeassistant/components/media_player/nad.py  | 10 ++-
 .../components/media_player/onkyo.py          |  6 +-
 .../components/media_player/openhome.py       |  8 +--
 .../media_player/panasonic_viera.py           | 17 ++---
 .../components/media_player/pandora.py        | 25 ++++---
 .../components/media_player/philips_js.py     | 12 ++--
 .../components/media_player/pioneer.py        |  8 +--
 .../components/media_player/pjlink.py         | 11 ++-
 homeassistant/components/media_player/plex.py | 43 +++++------
 homeassistant/components/media_player/roku.py | 12 ++--
 .../components/media_player/russound_rio.py   | 46 +++++-------
 .../components/media_player/russound_rnet.py  |  6 +-
 .../components/media_player/samsungtv.py      | 21 +++---
 .../components/media_player/sisyphus.py       | 38 +++-------
 .../components/media_player/songpal.py        | 48 ++++++-------
 .../components/media_player/sonos.py          |  2 +-
 .../components/media_player/soundtouch.py     | 26 +++----
 .../components/media_player/spotify.py        | 63 ++++++++--------
 .../components/media_player/squeezebox.py     | 22 +++---
 .../components/media_player/ue_smart_radio.py | 40 ++++++-----
 .../components/media_player/universal.py      | 34 +++++----
 .../components/media_player/vizio.py          |  2 +-
 homeassistant/components/media_player/vlc.py  | 13 ++--
 .../components/media_player/volumio.py        | 17 ++---
 .../components/media_player/webostv.py        |  4 +-
 .../components/media_player/xiaomi_tv.py      | 14 ++--
 .../components/media_player/yamaha.py         |  6 +-
 .../media_player/yamaha_musiccast.py          | 46 ++++++------
 .../media_player/ziggo_mediabox_xl.py         | 10 ++-
 63 files changed, 629 insertions(+), 697 deletions(-)

diff --git a/homeassistant/components/mailbox/__init__.py b/homeassistant/components/mailbox/__init__.py
index 6a648e4dc47..0c5dabb6eeb 100644
--- a/homeassistant/components/mailbox/__init__.py
+++ b/homeassistant/components/mailbox/__init__.py
@@ -4,31 +4,33 @@ Provides functionality for mailboxes.
 For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/mailbox/
 """
-
 import asyncio
-import logging
 from contextlib import suppress
 from datetime import timedelta
-
-import async_timeout
+import logging
 
 from aiohttp import web
 from aiohttp.web_exceptions import HTTPNotFound
+import async_timeout
 
-from homeassistant.core import callback
-from homeassistant.helpers import config_per_platform, discovery
-from homeassistant.helpers.entity_component import EntityComponent
-from homeassistant.helpers.entity import Entity
 from homeassistant.components.http import HomeAssistantView
+from homeassistant.core import callback
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import config_per_platform, discovery
+from homeassistant.helpers.entity import Entity
+from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.setup import async_prepare_setup_platform
 
+_LOGGER = logging.getLogger(__name__)
+
+CONTENT_TYPE_MPEG = 'audio/mpeg'
+
 DEPENDENCIES = ['http']
 DOMAIN = 'mailbox'
+
 EVENT = 'mailbox_updated'
-CONTENT_TYPE_MPEG = 'audio/mpeg'
+
 SCAN_INTERVAL = timedelta(seconds=30)
-_LOGGER = logging.getLogger(__name__)
 
 
 @asyncio.coroutine
diff --git a/homeassistant/components/mailbox/asterisk_mbox.py b/homeassistant/components/mailbox/asterisk_mbox.py
index 47d59234d7d..29b34f3e512 100644
--- a/homeassistant/components/mailbox/asterisk_mbox.py
+++ b/homeassistant/components/mailbox/asterisk_mbox.py
@@ -7,17 +7,18 @@ https://home-assistant.io/components/mailbox.asteriskvm/
 import asyncio
 import logging
 
-from homeassistant.core import callback
 from homeassistant.components.asterisk_mbox import DOMAIN
-from homeassistant.components.mailbox import (Mailbox, CONTENT_TYPE_MPEG,
-                                              StreamError)
+from homeassistant.components.mailbox import (
+    CONTENT_TYPE_MPEG, Mailbox, StreamError)
+from homeassistant.core import callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
-DEPENDENCIES = ['asterisk_mbox']
 _LOGGER = logging.getLogger(__name__)
 
-SIGNAL_MESSAGE_UPDATE = 'asterisk_mbox.message_updated'
+DEPENDENCIES = ['asterisk_mbox']
+
 SIGNAL_MESSAGE_REQUEST = 'asterisk_mbox.message_request'
+SIGNAL_MESSAGE_UPDATE = 'asterisk_mbox.message_updated'
 
 
 @asyncio.coroutine
diff --git a/homeassistant/components/mailbox/demo.py b/homeassistant/components/mailbox/demo.py
index 8096a4fabb7..e0d2618ac4e 100644
--- a/homeassistant/components/mailbox/demo.py
+++ b/homeassistant/components/mailbox/demo.py
@@ -5,16 +5,16 @@ For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/mailbox.asteriskvm/
 """
 import asyncio
+from hashlib import sha1
 import logging
 import os
-from hashlib import sha1
 
+from homeassistant.components.mailbox import (
+    CONTENT_TYPE_MPEG, Mailbox, StreamError)
 from homeassistant.util import dt
 
-from homeassistant.components.mailbox import (Mailbox, CONTENT_TYPE_MPEG,
-                                              StreamError)
-
 _LOGGER = logging.getLogger(__name__)
+
 DOMAIN = "DemoMailbox"
 
 
@@ -38,11 +38,15 @@ class DemoMailbox(Mailbox):
             msgtxt = "Message {}. {}".format(
                 idx + 1, txt * (1 + idx * (idx % 2)))
             msgsha = sha1(msgtxt.encode('utf-8')).hexdigest()
-            msg = {"info": {"origtime": msgtime,
-                            "callerid": "John Doe <212-555-1212>",
-                            "duration": "10"},
-                   "text": msgtxt,
-                   "sha":  msgsha}
+            msg = {
+                'info': {
+                    'origtime': msgtime,
+                    'callerid': 'John Doe <212-555-1212>',
+                    'duration': '10',
+                },
+                'text': msgtxt,
+                'sha':  msgsha,
+            }
             self._messages[msgsha] = msg
 
     @property
diff --git a/homeassistant/components/media_player/__init__.py b/homeassistant/components/media_player/__init__.py
index 7c49b095c66..831009ed8bf 100644
--- a/homeassistant/components/media_player/__init__.py
+++ b/homeassistant/components/media_player/__init__.py
@@ -15,33 +15,32 @@ from random import SystemRandom
 from urllib.parse import urlparse
 
 from aiohttp import web
-from aiohttp.hdrs import CONTENT_TYPE, CACHE_CONTROL
+from aiohttp.hdrs import CACHE_CONTROL, CONTENT_TYPE
 import async_timeout
 import voluptuous as vol
 
-from homeassistant.core import callback
+from homeassistant.components import websocket_api
 from homeassistant.components.http import KEY_AUTHENTICATED, HomeAssistantView
 from homeassistant.const import (
-    STATE_OFF, STATE_IDLE, STATE_PLAYING, STATE_UNKNOWN, ATTR_ENTITY_ID,
-    SERVICE_TOGGLE, SERVICE_TURN_ON, SERVICE_TURN_OFF, SERVICE_VOLUME_UP,
-    SERVICE_MEDIA_PLAY, SERVICE_MEDIA_SEEK, SERVICE_MEDIA_STOP,
-    SERVICE_VOLUME_SET, SERVICE_MEDIA_PAUSE, SERVICE_SHUFFLE_SET,
-    SERVICE_VOLUME_DOWN, SERVICE_VOLUME_MUTE, SERVICE_MEDIA_NEXT_TRACK,
-    SERVICE_MEDIA_PLAY_PAUSE, SERVICE_MEDIA_PREVIOUS_TRACK)
+    ATTR_ENTITY_ID, SERVICE_MEDIA_NEXT_TRACK, SERVICE_MEDIA_PAUSE,
+    SERVICE_MEDIA_PLAY, SERVICE_MEDIA_PLAY_PAUSE, SERVICE_MEDIA_PREVIOUS_TRACK,
+    SERVICE_MEDIA_SEEK, SERVICE_MEDIA_STOP, SERVICE_SHUFFLE_SET,
+    SERVICE_TOGGLE, SERVICE_TURN_OFF, SERVICE_TURN_ON, SERVICE_VOLUME_DOWN,
+    SERVICE_VOLUME_MUTE, SERVICE_VOLUME_SET, SERVICE_VOLUME_UP, STATE_IDLE,
+    STATE_OFF, STATE_PLAYING, STATE_UNKNOWN)
+from homeassistant.core import callback
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.config_validation import PLATFORM_SCHEMA  # noqa
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.loader import bind_hass
-from homeassistant.components import websocket_api
 
 _LOGGER = logging.getLogger(__name__)
 _RND = SystemRandom()
 
 DOMAIN = 'media_player'
 DEPENDENCIES = ['http']
-SCAN_INTERVAL = timedelta(seconds=10)
 
 ENTITY_ID_FORMAT = DOMAIN + '.{}'
 
@@ -97,6 +96,8 @@ MEDIA_TYPE_CHANNEL = 'channel'
 MEDIA_TYPE_PLAYLIST = 'playlist'
 MEDIA_TYPE_URL = 'url'
 
+SCAN_INTERVAL = timedelta(seconds=10)
+
 SUPPORT_PAUSE = 1
 SUPPORT_SEEK = 2
 SUPPORT_VOLUME_SET = 4
diff --git a/homeassistant/components/media_player/anthemav.py b/homeassistant/components/media_player/anthemav.py
index 359ee0a9254..33b6e28a890 100644
--- a/homeassistant/components/media_player/anthemav.py
+++ b/homeassistant/components/media_player/anthemav.py
@@ -4,17 +4,17 @@ Support for Anthem Network Receivers and Processors.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/media_player.anthemav/
 """
-import logging
 import asyncio
+import logging
 
 import voluptuous as vol
 
 from homeassistant.components.media_player import (
-    PLATFORM_SCHEMA, SUPPORT_TURN_OFF, SUPPORT_TURN_ON, SUPPORT_SELECT_SOURCE,
+    PLATFORM_SCHEMA, SUPPORT_SELECT_SOURCE, SUPPORT_TURN_OFF, SUPPORT_TURN_ON,
     SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET, MediaPlayerDevice)
 from homeassistant.const import (
-    CONF_NAME, CONF_HOST, CONF_PORT, STATE_OFF, STATE_ON, STATE_UNKNOWN,
-    EVENT_HOMEASSISTANT_STOP)
+    CONF_HOST, CONF_NAME, CONF_PORT, EVENT_HOMEASSISTANT_STOP, STATE_OFF,
+    STATE_ON, STATE_UNKNOWN)
 import homeassistant.helpers.config_validation as cv
 
 REQUIREMENTS = ['anthemav==1.1.8']
@@ -32,7 +32,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Required(CONF_HOST): cv.string,
     vol.Optional(CONF_NAME): cv.string,
     vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
-    })
+})
 
 
 @asyncio.coroutine
diff --git a/homeassistant/components/media_player/apple_tv.py b/homeassistant/components/media_player/apple_tv.py
index 360ccd0f522..399e59ae9f5 100644
--- a/homeassistant/components/media_player/apple_tv.py
+++ b/homeassistant/components/media_player/apple_tv.py
@@ -7,20 +7,19 @@ https://home-assistant.io/components/media_player.apple_tv/
 import asyncio
 import logging
 
-from homeassistant.core import callback
 from homeassistant.components.apple_tv import (
     ATTR_ATV, ATTR_POWER, DATA_APPLE_TV, DATA_ENTITIES)
 from homeassistant.components.media_player import (
-    SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PREVIOUS_TRACK, SUPPORT_SEEK,
-    SUPPORT_STOP, SUPPORT_PLAY, SUPPORT_PLAY_MEDIA, SUPPORT_TURN_ON,
-    SUPPORT_TURN_OFF, MediaPlayerDevice, MEDIA_TYPE_MUSIC,
-    MEDIA_TYPE_VIDEO, MEDIA_TYPE_TVSHOW)
+    MEDIA_TYPE_MUSIC, MEDIA_TYPE_TVSHOW, MEDIA_TYPE_VIDEO, SUPPORT_NEXT_TRACK,
+    SUPPORT_PAUSE, SUPPORT_PLAY, SUPPORT_PLAY_MEDIA, SUPPORT_PREVIOUS_TRACK,
+    SUPPORT_SEEK, SUPPORT_STOP, SUPPORT_TURN_OFF, SUPPORT_TURN_ON,
+    MediaPlayerDevice)
 from homeassistant.const import (
-    STATE_IDLE, STATE_PAUSED, STATE_PLAYING, STATE_STANDBY, CONF_HOST,
-    STATE_OFF, CONF_NAME, EVENT_HOMEASSISTANT_STOP)
+    CONF_HOST, CONF_NAME, EVENT_HOMEASSISTANT_STOP, STATE_IDLE, STATE_OFF,
+    STATE_PAUSED, STATE_PLAYING, STATE_STANDBY)
+from homeassistant.core import callback
 import homeassistant.util.dt as dt_util
 
-
 DEPENDENCIES = ['apple_tv']
 
 _LOGGER = logging.getLogger(__name__)
@@ -31,8 +30,8 @@ SUPPORT_APPLE_TV = SUPPORT_TURN_ON | SUPPORT_TURN_OFF | SUPPORT_PLAY_MEDIA | \
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_entities,
-                         discovery_info=None):
+def async_setup_platform(
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the Apple TV platform."""
     if not discovery_info:
         return
diff --git a/homeassistant/components/media_player/aquostv.py b/homeassistant/components/media_player/aquostv.py
index 6e8cc727121..ac399307126 100644
--- a/homeassistant/components/media_player/aquostv.py
+++ b/homeassistant/components/media_player/aquostv.py
@@ -9,16 +9,13 @@ import logging
 import voluptuous as vol
 
 from homeassistant.components.media_player import (
-    SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PREVIOUS_TRACK,
-    SUPPORT_TURN_ON, SUPPORT_TURN_OFF, SUPPORT_SELECT_SOURCE,
-    SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_STEP, SUPPORT_PLAY,
-    SUPPORT_VOLUME_SET, MediaPlayerDevice, PLATFORM_SCHEMA)
-
+    PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PLAY,
+    SUPPORT_PREVIOUS_TRACK, SUPPORT_SELECT_SOURCE, SUPPORT_TURN_OFF,
+    SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET,
+    SUPPORT_VOLUME_STEP, MediaPlayerDevice)
 from homeassistant.const import (
-    CONF_HOST, CONF_NAME, STATE_OFF, STATE_ON, STATE_UNKNOWN,
-    CONF_PORT, CONF_USERNAME, CONF_PASSWORD, CONF_TIMEOUT)
-
-
+    CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_PORT, CONF_TIMEOUT,
+    CONF_USERNAME, STATE_OFF, STATE_ON, STATE_UNKNOWN)
 import homeassistant.helpers.config_validation as cv
 
 REQUIREMENTS = ['sharp_aquos_rc==0.3.2']
diff --git a/homeassistant/components/media_player/blackbird.py b/homeassistant/components/media_player/blackbird.py
index 7869093138c..2c78bb24bbd 100644
--- a/homeassistant/components/media_player/blackbird.py
+++ b/homeassistant/components/media_player/blackbird.py
@@ -13,15 +13,15 @@ from homeassistant.components.media_player import (
     DOMAIN, MEDIA_PLAYER_SCHEMA, PLATFORM_SCHEMA, SUPPORT_SELECT_SOURCE,
     SUPPORT_TURN_OFF, SUPPORT_TURN_ON, MediaPlayerDevice)
 from homeassistant.const import (
-    ATTR_ENTITY_ID, CONF_NAME, CONF_HOST, CONF_PORT, STATE_OFF, STATE_ON)
+    ATTR_ENTITY_ID, CONF_HOST, CONF_NAME, CONF_PORT, CONF_TYPE, STATE_OFF,
+    STATE_ON)
 import homeassistant.helpers.config_validation as cv
 
 REQUIREMENTS = ['pyblackbird==0.5']
 
 _LOGGER = logging.getLogger(__name__)
 
-SUPPORT_BLACKBIRD = SUPPORT_TURN_ON | SUPPORT_TURN_OFF | \
-                    SUPPORT_SELECT_SOURCE
+SUPPORT_BLACKBIRD = SUPPORT_TURN_ON | SUPPORT_TURN_OFF | SUPPORT_SELECT_SOURCE
 
 ZONE_SCHEMA = vol.Schema({
     vol.Required(CONF_NAME): cv.string,
@@ -33,7 +33,6 @@ SOURCE_SCHEMA = vol.Schema({
 
 CONF_ZONES = 'zones'
 CONF_SOURCES = 'sources'
-CONF_TYPE = 'type'
 
 DATA_BLACKBIRD = 'blackbird'
 
diff --git a/homeassistant/components/media_player/bluesound.py b/homeassistant/components/media_player/bluesound.py
index 1fe939b34ef..ab012402636 100644
--- a/homeassistant/components/media_player/bluesound.py
+++ b/homeassistant/components/media_player/bluesound.py
@@ -24,8 +24,8 @@ from homeassistant.components.media_player import (
     MediaPlayerDevice)
 from homeassistant.const import (
     ATTR_ENTITY_ID, CONF_HOST, CONF_HOSTS, CONF_NAME, CONF_PORT,
-    EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP, STATE_IDLE,
-    STATE_OFF, STATE_PAUSED, STATE_PLAYING)
+    EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP, STATE_IDLE, STATE_OFF,
+    STATE_PAUSED, STATE_PLAYING)
 from homeassistant.core import callback
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 import homeassistant.helpers.config_validation as cv
diff --git a/homeassistant/components/media_player/braviatv.py b/homeassistant/components/media_player/braviatv.py
index 9f4496582ad..04dc013108f 100644
--- a/homeassistant/components/media_player/braviatv.py
+++ b/homeassistant/components/media_player/braviatv.py
@@ -10,11 +10,11 @@ import re
 import voluptuous as vol
 
 from homeassistant.components.media_player import (
-    SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PREVIOUS_TRACK, SUPPORT_TURN_ON,
-    SUPPORT_TURN_OFF, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_STEP, SUPPORT_PLAY,
-    SUPPORT_VOLUME_SET, SUPPORT_SELECT_SOURCE, MediaPlayerDevice,
-    PLATFORM_SCHEMA)
-from homeassistant.const import (CONF_HOST, CONF_NAME, STATE_OFF, STATE_ON)
+    PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PLAY,
+    SUPPORT_PREVIOUS_TRACK, SUPPORT_SELECT_SOURCE, SUPPORT_TURN_OFF,
+    SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET,
+    SUPPORT_VOLUME_STEP, MediaPlayerDevice)
+from homeassistant.const import CONF_HOST, CONF_NAME, STATE_OFF, STATE_ON
 import homeassistant.helpers.config_validation as cv
 from homeassistant.util.json import load_json, save_json
 
diff --git a/homeassistant/components/media_player/cast.py b/homeassistant/components/media_player/cast.py
index 2954e427ed5..83b84f5c3bb 100644
--- a/homeassistant/components/media_player/cast.py
+++ b/homeassistant/components/media_player/cast.py
@@ -7,26 +7,27 @@ https://home-assistant.io/components/media_player.cast/
 import asyncio
 import logging
 import threading
+
 from typing import Optional, Tuple
 
-import voluptuous as vol
 import attr
+import voluptuous as vol
 
-from homeassistant.exceptions import PlatformNotReady
-from homeassistant.helpers.typing import HomeAssistantType, ConfigType
-from homeassistant.core import callback
-from homeassistant.helpers.dispatcher import (dispatcher_send,
-                                              async_dispatcher_connect)
 from homeassistant.components.cast import DOMAIN as CAST_DOMAIN
 from homeassistant.components.media_player import (
-    MEDIA_TYPE_MUSIC, MEDIA_TYPE_TVSHOW, MEDIA_TYPE_MOVIE, SUPPORT_NEXT_TRACK,
-    SUPPORT_PAUSE, SUPPORT_PLAY_MEDIA, SUPPORT_PREVIOUS_TRACK,
-    SUPPORT_TURN_OFF, SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET,
-    SUPPORT_STOP, SUPPORT_PLAY, MediaPlayerDevice, PLATFORM_SCHEMA)
+    MEDIA_TYPE_MOVIE, MEDIA_TYPE_MUSIC, MEDIA_TYPE_TVSHOW, PLATFORM_SCHEMA,
+    SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PLAY, SUPPORT_PLAY_MEDIA,
+    SUPPORT_PREVIOUS_TRACK, SUPPORT_STOP, SUPPORT_TURN_OFF, SUPPORT_TURN_ON,
+    SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET, MediaPlayerDevice)
 from homeassistant.const import (
-    CONF_HOST, STATE_IDLE, STATE_OFF, STATE_PAUSED, STATE_PLAYING,
-    EVENT_HOMEASSISTANT_STOP)
+    CONF_HOST, EVENT_HOMEASSISTANT_STOP, STATE_IDLE, STATE_OFF, STATE_PAUSED,
+    STATE_PLAYING)
+from homeassistant.core import callback
+from homeassistant.exceptions import PlatformNotReady
 import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.dispatcher import (
+    async_dispatcher_connect, dispatcher_send)
+from homeassistant.helpers.typing import ConfigType, HomeAssistantType
 import homeassistant.util.dt as dt_util
 
 DEPENDENCIES = ('cast',)
@@ -57,8 +58,8 @@ SIGNAL_CAST_DISCOVERED = 'cast_discovered'
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_HOST): cv.string,
-    vol.Optional(CONF_IGNORE_CEC, default=[]): vol.All(cv.ensure_list,
-                                                       [cv.string])
+    vol.Optional(CONF_IGNORE_CEC, default=[]):
+        vol.All(cv.ensure_list, [cv.string]),
 })
 
 
diff --git a/homeassistant/components/media_player/channels.py b/homeassistant/components/media_player/channels.py
index fcfa16b33ac..43259c40f65 100644
--- a/homeassistant/components/media_player/channels.py
+++ b/homeassistant/components/media_player/channels.py
@@ -9,18 +9,18 @@ import logging
 import voluptuous as vol
 
 from homeassistant.components.media_player import (
-    MEDIA_TYPE_CHANNEL, MEDIA_TYPE_TVSHOW, MEDIA_TYPE_EPISODE,
-    MEDIA_TYPE_MOVIE, SUPPORT_PLAY, SUPPORT_PAUSE, SUPPORT_STOP,
-    SUPPORT_VOLUME_MUTE, SUPPORT_NEXT_TRACK, SUPPORT_PREVIOUS_TRACK,
-    SUPPORT_PLAY_MEDIA, SUPPORT_SELECT_SOURCE, DOMAIN, PLATFORM_SCHEMA,
+    DOMAIN, MEDIA_TYPE_CHANNEL, MEDIA_TYPE_EPISODE, MEDIA_TYPE_MOVIE,
+    MEDIA_TYPE_TVSHOW, PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE,
+    SUPPORT_PLAY, SUPPORT_PLAY_MEDIA, SUPPORT_PREVIOUS_TRACK,
+    SUPPORT_SELECT_SOURCE, SUPPORT_STOP, SUPPORT_VOLUME_MUTE,
     MediaPlayerDevice)
-
 from homeassistant.const import (
-    CONF_HOST, CONF_PORT, CONF_NAME, STATE_IDLE, STATE_PAUSED, STATE_PLAYING,
-    ATTR_ENTITY_ID)
-
+    ATTR_ENTITY_ID, CONF_HOST, CONF_NAME, CONF_PORT, STATE_IDLE, STATE_PAUSED,
+    STATE_PLAYING)
 import homeassistant.helpers.config_validation as cv
 
+REQUIREMENTS = ['pychannels==1.0.0']
+
 _LOGGER = logging.getLogger(__name__)
 
 DATA_CHANNELS = 'channels'
@@ -52,16 +52,11 @@ CHANNELS_SEEK_BY_SCHEMA = CHANNELS_SCHEMA.extend({
     vol.Required(ATTR_SECONDS): vol.Coerce(int),
 })
 
-REQUIREMENTS = ['pychannels==1.0.0']
-
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Channels platform."""
     device = ChannelsPlayer(
-        config.get('name'),
-        config.get(CONF_HOST),
-        config.get(CONF_PORT)
-        )
+        config.get(CONF_NAME), config.get(CONF_HOST), config.get(CONF_PORT))
 
     if DATA_CHANNELS not in hass.data:
         hass.data[DATA_CHANNELS] = []
@@ -77,8 +72,8 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
                        device.entity_id == entity_id), None)
 
         if device is None:
-            _LOGGER.warning("Unable to find Channels with entity_id: %s",
-                            entity_id)
+            _LOGGER.warning(
+                "Unable to find Channels with entity_id: %s", entity_id)
             return
 
         if service.service == SERVICE_SEEK_FORWARD:
@@ -90,12 +85,10 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
             device.seek_by(seconds)
 
     hass.services.register(
-        DOMAIN, SERVICE_SEEK_FORWARD, service_handler,
-        schema=CHANNELS_SCHEMA)
+        DOMAIN, SERVICE_SEEK_FORWARD, service_handler, schema=CHANNELS_SCHEMA)
 
     hass.services.register(
-        DOMAIN, SERVICE_SEEK_BACKWARD, service_handler,
-        schema=CHANNELS_SCHEMA)
+        DOMAIN, SERVICE_SEEK_BACKWARD, service_handler, schema=CHANNELS_SCHEMA)
 
     hass.services.register(
         DOMAIN, SERVICE_SEEK_BY, service_handler,
diff --git a/homeassistant/components/media_player/clementine.py b/homeassistant/components/media_player/clementine.py
index fab2bef73f0..e38c44b8d27 100644
--- a/homeassistant/components/media_player/clementine.py
+++ b/homeassistant/components/media_player/clementine.py
@@ -4,7 +4,6 @@ Support for Clementine Music Player as media player.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/media_player.clementine/
 """
-
 import asyncio
 from datetime import timedelta
 import logging
@@ -12,24 +11,24 @@ import time
 
 import voluptuous as vol
 
-import homeassistant.helpers.config_validation as cv
 from homeassistant.components.media_player import (
-    SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PREVIOUS_TRACK, PLATFORM_SCHEMA,
-    SUPPORT_VOLUME_STEP, SUPPORT_SELECT_SOURCE, SUPPORT_PLAY, MEDIA_TYPE_MUSIC,
-    SUPPORT_VOLUME_SET, MediaPlayerDevice)
+    MEDIA_TYPE_MUSIC, PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE,
+    SUPPORT_PLAY, SUPPORT_PREVIOUS_TRACK, SUPPORT_SELECT_SOURCE,
+    SUPPORT_VOLUME_SET, SUPPORT_VOLUME_STEP, MediaPlayerDevice)
 from homeassistant.const import (
-    CONF_HOST, CONF_NAME, CONF_PORT, CONF_ACCESS_TOKEN,
-    STATE_OFF, STATE_PLAYING, STATE_PAUSED, STATE_UNKNOWN)
+    CONF_ACCESS_TOKEN, CONF_HOST, CONF_NAME, CONF_PORT, STATE_OFF,
+    STATE_PAUSED, STATE_PLAYING)
+import homeassistant.helpers.config_validation as cv
 
 REQUIREMENTS = ['python-clementine-remote==1.0.1']
 
-SCAN_INTERVAL = timedelta(seconds=5)
-
 _LOGGER = logging.getLogger(__name__)
 
 DEFAULT_NAME = 'Clementine Remote'
 DEFAULT_PORT = 5500
 
+SCAN_INTERVAL = timedelta(seconds=5)
+
 SUPPORT_CLEMENTINE = SUPPORT_PAUSE | SUPPORT_VOLUME_STEP | \
                      SUPPORT_PREVIOUS_TRACK | SUPPORT_VOLUME_SET | \
                      SUPPORT_NEXT_TRACK | \
@@ -69,7 +68,7 @@ class ClementineDevice(MediaPlayerDevice):
         self._track_name = ''
         self._track_artist = ''
         self._track_album_name = ''
-        self._state = STATE_UNKNOWN
+        self._state = None
 
     def update(self):
         """Retrieve the latest data from the Clementine Player."""
diff --git a/homeassistant/components/media_player/cmus.py b/homeassistant/components/media_player/cmus.py
index 6f579fd9791..2711ac1ff11 100644
--- a/homeassistant/components/media_player/cmus.py
+++ b/homeassistant/components/media_player/cmus.py
@@ -8,15 +8,14 @@ import logging
 
 import voluptuous as vol
 
-
 from homeassistant.components.media_player import (
-    MEDIA_TYPE_MUSIC, MEDIA_TYPE_PLAYLIST, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE,
-    SUPPORT_PREVIOUS_TRACK, SUPPORT_TURN_OFF, SUPPORT_TURN_ON, SUPPORT_PLAY,
-    SUPPORT_VOLUME_SET, SUPPORT_PLAY_MEDIA, SUPPORT_SEEK, PLATFORM_SCHEMA,
+    MEDIA_TYPE_MUSIC, MEDIA_TYPE_PLAYLIST, PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK,
+    SUPPORT_PAUSE, SUPPORT_PLAY, SUPPORT_PLAY_MEDIA, SUPPORT_PREVIOUS_TRACK,
+    SUPPORT_SEEK, SUPPORT_TURN_OFF, SUPPORT_TURN_ON, SUPPORT_VOLUME_SET,
     MediaPlayerDevice)
 from homeassistant.const import (
-    STATE_OFF, STATE_PAUSED, STATE_PLAYING, CONF_HOST, CONF_NAME, CONF_PORT,
-    CONF_PASSWORD)
+    CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_PORT, STATE_OFF, STATE_PAUSED,
+    STATE_PLAYING)
 import homeassistant.helpers.config_validation as cv
 
 REQUIREMENTS = ['pycmus==0.1.1']
diff --git a/homeassistant/components/media_player/demo.py b/homeassistant/components/media_player/demo.py
index 06f2a3f1155..c2a736f531e 100644
--- a/homeassistant/components/media_player/demo.py
+++ b/homeassistant/components/media_player/demo.py
@@ -5,11 +5,12 @@ For more details about this platform, please refer to the documentation
 https://home-assistant.io/components/demo/
 """
 from homeassistant.components.media_player import (
-    MEDIA_TYPE_MUSIC, MEDIA_TYPE_TVSHOW, MEDIA_TYPE_MOVIE, SUPPORT_NEXT_TRACK,
-    SUPPORT_PAUSE, SUPPORT_PLAY_MEDIA, SUPPORT_PREVIOUS_TRACK,
-    SUPPORT_TURN_OFF, SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET,
-    SUPPORT_SELECT_SOURCE, SUPPORT_SELECT_SOUND_MODE, SUPPORT_CLEAR_PLAYLIST,
-    SUPPORT_PLAY, SUPPORT_SHUFFLE_SET, MediaPlayerDevice)
+    MEDIA_TYPE_MOVIE, MEDIA_TYPE_MUSIC, MEDIA_TYPE_TVSHOW,
+    SUPPORT_CLEAR_PLAYLIST, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PLAY,
+    SUPPORT_PLAY_MEDIA, SUPPORT_PREVIOUS_TRACK, SUPPORT_SELECT_SOUND_MODE,
+    SUPPORT_SELECT_SOURCE, SUPPORT_SHUFFLE_SET, SUPPORT_TURN_OFF,
+    SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET,
+    MediaPlayerDevice)
 from homeassistant.const import STATE_OFF, STATE_PAUSED, STATE_PLAYING
 import homeassistant.util.dt as dt_util
 
@@ -20,8 +21,8 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
         DemoYoutubePlayer(
             'Living Room', 'eyU3bRy2x44',
             '♥♥ The Best Fireplace Video (3 hours)', 300),
-        DemoYoutubePlayer('Bedroom', 'kxopViU98Xo', 'Epic sax guy 10 hours',
-                          360000),
+        DemoYoutubePlayer(
+            'Bedroom', 'kxopViU98Xo', 'Epic sax guy 10 hours', 360000),
         DemoMusicPlayer(), DemoTVShowPlayer(),
     ])
 
diff --git a/homeassistant/components/media_player/denon.py b/homeassistant/components/media_player/denon.py
index 320211e700f..c0f296c2fb8 100644
--- a/homeassistant/components/media_player/denon.py
+++ b/homeassistant/components/media_player/denon.py
@@ -10,10 +10,10 @@ import telnetlib
 import voluptuous as vol
 
 from homeassistant.components.media_player import (
-    PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK, SUPPORT_SELECT_SOURCE,
-    SUPPORT_PAUSE, SUPPORT_PREVIOUS_TRACK, SUPPORT_TURN_OFF,
-    SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET,
-    SUPPORT_STOP, SUPPORT_PLAY, MediaPlayerDevice)
+    PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PLAY,
+    SUPPORT_PREVIOUS_TRACK, SUPPORT_SELECT_SOURCE, SUPPORT_STOP,
+    SUPPORT_TURN_OFF, SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET,
+    MediaPlayerDevice)
 from homeassistant.const import (
     CONF_HOST, CONF_NAME, STATE_OFF, STATE_ON, STATE_UNKNOWN)
 import homeassistant.helpers.config_validation as cv
diff --git a/homeassistant/components/media_player/denonavr.py b/homeassistant/components/media_player/denonavr.py
index 14839590bee..296548dd3c2 100644
--- a/homeassistant/components/media_player/denonavr.py
+++ b/homeassistant/components/media_player/denonavr.py
@@ -5,35 +5,37 @@ For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/media_player.denon/
 """
 
-import logging
 from collections import namedtuple
+import logging
+
 import voluptuous as vol
 
 from homeassistant.components.media_player import (
-    SUPPORT_PAUSE, SUPPORT_NEXT_TRACK, SUPPORT_PREVIOUS_TRACK,
-    SUPPORT_TURN_OFF, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_STEP,
-    SUPPORT_SELECT_SOURCE, SUPPORT_SELECT_SOUND_MODE,
-    SUPPORT_PLAY_MEDIA, MEDIA_TYPE_CHANNEL, MediaPlayerDevice,
-    PLATFORM_SCHEMA, SUPPORT_TURN_ON, MEDIA_TYPE_MUSIC,
-    SUPPORT_VOLUME_SET, SUPPORT_PLAY)
+    MEDIA_TYPE_CHANNEL, MEDIA_TYPE_MUSIC, PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK,
+    SUPPORT_PAUSE, SUPPORT_PLAY, SUPPORT_PLAY_MEDIA, SUPPORT_PREVIOUS_TRACK,
+    SUPPORT_SELECT_SOUND_MODE, SUPPORT_SELECT_SOURCE, SUPPORT_TURN_OFF,
+    SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET,
+    SUPPORT_VOLUME_STEP, MediaPlayerDevice)
 from homeassistant.const import (
-    CONF_HOST, STATE_OFF, STATE_PLAYING, STATE_PAUSED,
-    CONF_NAME, STATE_ON, CONF_ZONE, CONF_TIMEOUT)
+    CONF_HOST, CONF_NAME, CONF_TIMEOUT, CONF_ZONE, STATE_OFF, STATE_ON,
+    STATE_PAUSED, STATE_PLAYING)
 import homeassistant.helpers.config_validation as cv
 
 REQUIREMENTS = ['denonavr==0.7.5']
 
 _LOGGER = logging.getLogger(__name__)
 
+ATTR_SOUND_MODE_RAW = 'sound_mode_raw'
+
+CONF_INVALID_ZONES_ERR = 'Invalid Zone (expected Zone2 or Zone3)'
+CONF_SHOW_ALL_SOURCES = 'show_all_sources'
+CONF_VALID_ZONES = ['Zone2', 'Zone3']
+CONF_ZONES = 'zones'
+
 DEFAULT_SHOW_SOURCES = False
 DEFAULT_TIMEOUT = 2
-CONF_SHOW_ALL_SOURCES = 'show_all_sources'
-CONF_ZONES = 'zones'
-CONF_VALID_ZONES = ['Zone2', 'Zone3']
-CONF_INVALID_ZONES_ERR = 'Invalid Zone (expected Zone2 or Zone3)'
-KEY_DENON_CACHE = 'denonavr_hosts'
 
-ATTR_SOUND_MODE_RAW = 'sound_mode_raw'
+KEY_DENON_CACHE = 'denonavr_hosts'
 
 SUPPORT_DENON = SUPPORT_VOLUME_STEP | SUPPORT_VOLUME_MUTE | \
     SUPPORT_TURN_ON | SUPPORT_TURN_OFF | \
diff --git a/homeassistant/components/media_player/directv.py b/homeassistant/components/media_player/directv.py
index e03474cdb38..42293ba25fe 100644
--- a/homeassistant/components/media_player/directv.py
+++ b/homeassistant/components/media_player/directv.py
@@ -4,29 +4,28 @@ Support for the DirecTV receivers.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/media_player.directv/
 """
-import voluptuous as vol
 import requests
+import voluptuous as vol
 
 from homeassistant.components.media_player import (
-    MEDIA_TYPE_TVSHOW, MEDIA_TYPE_MOVIE, SUPPORT_PAUSE, SUPPORT_PLAY_MEDIA,
-    SUPPORT_TURN_OFF, SUPPORT_TURN_ON, SUPPORT_STOP, PLATFORM_SCHEMA,
-    SUPPORT_NEXT_TRACK, SUPPORT_PREVIOUS_TRACK, SUPPORT_PLAY,
-    MediaPlayerDevice)
+    MEDIA_TYPE_MOVIE, MEDIA_TYPE_TVSHOW, PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK,
+    SUPPORT_PAUSE, SUPPORT_PLAY, SUPPORT_PLAY_MEDIA, SUPPORT_PREVIOUS_TRACK,
+    SUPPORT_STOP, SUPPORT_TURN_OFF, SUPPORT_TURN_ON, MediaPlayerDevice)
 from homeassistant.const import (
-    CONF_DEVICE, CONF_HOST, CONF_NAME, STATE_OFF, STATE_PLAYING, CONF_PORT)
+    CONF_DEVICE, CONF_HOST, CONF_NAME, CONF_PORT, STATE_OFF, STATE_PLAYING)
 import homeassistant.helpers.config_validation as cv
 
 REQUIREMENTS = ['directpy==0.5']
 
 DEFAULT_DEVICE = '0'
-DEFAULT_NAME = 'DirecTV Receiver'
+DEFAULT_NAME = "DirecTV Receiver"
 DEFAULT_PORT = 8080
 
 SUPPORT_DTV = SUPPORT_PAUSE | SUPPORT_TURN_ON | SUPPORT_TURN_OFF | \
     SUPPORT_PLAY_MEDIA | SUPPORT_STOP | SUPPORT_NEXT_TRACK | \
     SUPPORT_PREVIOUS_TRACK | SUPPORT_PLAY
 
-DATA_DIRECTV = "data_directv"
+DATA_DIRECTV = 'data_directv'
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Required(CONF_HOST): cv.string,
@@ -51,9 +50,9 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
 
     elif discovery_info:
         host = discovery_info.get('host')
-        name = 'DirecTV_' + discovery_info.get('serial', '')
+        name = 'DirecTV_{}'.format(discovery_info.get('serial', ''))
 
-        # attempt to discover additional RVU units
+        # Attempt to discover additional RVU units
         try:
             resp = requests.get(
                 'http://%s:%d/info/getLocations' % (host, DEFAULT_PORT)).json()
@@ -65,7 +64,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
                                       DEFAULT_PORT, loc["clientAddr"]])
 
         except requests.exceptions.RequestException:
-            # bail out and just go forward with uPnP data
+            # Bail out and just go forward with uPnP data
             if DEFAULT_DEVICE not in known_devices:
                 hosts.append([name, host, DEFAULT_PORT, DEFAULT_DEVICE])
 
@@ -78,8 +77,6 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     add_entities(dtvs)
     hass.data[DATA_DIRECTV] = known_devices
 
-    return True
-
 
 class DirecTvDevice(MediaPlayerDevice):
     """Representation of a DirecTV receiver on the network."""
diff --git a/homeassistant/components/media_player/dlna_dmr.py b/homeassistant/components/media_player/dlna_dmr.py
index 6c970ec197e..8aab4bfa43a 100644
--- a/homeassistant/components/media_player/dlna_dmr.py
+++ b/homeassistant/components/media_player/dlna_dmr.py
@@ -1,43 +1,36 @@
-# -*- coding: utf-8 -*-
 """
 Support for DLNA DMR (Device Media Renderer).
 
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/media_player.dlna_dmr/
 """
-
 import asyncio
+from datetime import datetime
 import functools
 import logging
-from datetime import datetime
 
 import aiohttp
 import voluptuous as vol
 
-import homeassistant.helpers.config_validation as cv
 from homeassistant.components.media_player import (
-    SUPPORT_PLAY, SUPPORT_PAUSE, SUPPORT_STOP,
-    SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET,
-    SUPPORT_PLAY_MEDIA,
-    SUPPORT_PREVIOUS_TRACK, SUPPORT_NEXT_TRACK,
-    MediaPlayerDevice,
-    PLATFORM_SCHEMA)
+    PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PLAY,
+    SUPPORT_PLAY_MEDIA, SUPPORT_PREVIOUS_TRACK, SUPPORT_STOP,
+    SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET, MediaPlayerDevice)
 from homeassistant.const import (
-    EVENT_HOMEASSISTANT_STOP,
-    CONF_URL, CONF_NAME,
-    STATE_OFF, STATE_ON, STATE_IDLE, STATE_PLAYING, STATE_PAUSED)
+    CONF_NAME, CONF_URL, EVENT_HOMEASSISTANT_STOP, STATE_IDLE, STATE_OFF,
+    STATE_ON, STATE_PAUSED, STATE_PLAYING)
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
+import homeassistant.helpers.config_validation as cv
 from homeassistant.util import get_local_ip
 
+REQUIREMENTS = ['async-upnp-client==0.12.4']
+
+_LOGGER = logging.getLogger(__name__)
 
 DLNA_DMR_DATA = 'dlna_dmr'
 
-REQUIREMENTS = [
-    'async-upnp-client==0.12.4',
-]
-
 DEFAULT_NAME = 'DLNA Digital Media Renderer'
 DEFAULT_LISTEN_PORT = 8301
 
@@ -68,8 +61,6 @@ HOME_ASSISTANT_UPNP_MIME_TYPE_MAPPING = {
     'playlist': 'playlist/*',
 }
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def catch_request_errors():
     """Catch asyncio.TimeoutError, aiohttp.ClientError errors."""
@@ -96,13 +87,11 @@ async def async_start_event_handler(hass, server_host, server_port, requester):
 
     # start event handler
     from async_upnp_client.aiohttp import AiohttpNotifyServer
-    server = AiohttpNotifyServer(requester,
-                                 server_port,
-                                 server_host,
-                                 hass.loop)
+    server = AiohttpNotifyServer(
+        requester, server_port, server_host, hass.loop)
     await server.start_server()
-    _LOGGER.info('UPNP/DLNA event handler listening on: %s',
-                 server.callback_url)
+    _LOGGER.info(
+        'UPNP/DLNA event handler listening on: %s', server.callback_url)
     hass_data['notify_server'] = server
     hass_data['event_handler'] = server.event_handler
 
@@ -116,10 +105,8 @@ async def async_start_event_handler(hass, server_host, server_port, requester):
     return hass_data['event_handler']
 
 
-async def async_setup_platform(hass: HomeAssistant,
-                               config,
-                               async_add_entities,
-                               discovery_info=None):
+async def async_setup_platform(
+        hass: HomeAssistant, config, async_add_entities, discovery_info=None):
     """Set up DLNA DMR platform."""
     if config.get(CONF_URL) is not None:
         url = config[CONF_URL]
@@ -145,10 +132,8 @@ async def async_setup_platform(hass: HomeAssistant,
         if server_host is None:
             server_host = get_local_ip()
         server_port = config.get(CONF_LISTEN_PORT, DEFAULT_LISTEN_PORT)
-        event_handler = await async_start_event_handler(hass,
-                                                        server_host,
-                                                        server_port,
-                                                        requester)
+        event_handler = await async_start_event_handler(
+            hass, server_host, server_port, requester)
 
     # create upnp device
     from async_upnp_client import UpnpFactory
@@ -183,10 +168,10 @@ class DlnaDmrDevice(MediaPlayerDevice):
         """Handle addition."""
         self._device.on_event = self._on_event
 
-        # register unsubscribe on stop
+        # Register unsubscribe on stop
         bus = self.hass.bus
-        bus.async_listen_once(EVENT_HOMEASSISTANT_STOP,
-                              self._async_on_hass_stop)
+        bus.async_listen_once(
+            EVENT_HOMEASSISTANT_STOP, self._async_on_hass_stop)
 
     @property
     def available(self):
@@ -306,23 +291,21 @@ class DlnaDmrDevice(MediaPlayerDevice):
         mime_type = HOME_ASSISTANT_UPNP_MIME_TYPE_MAPPING[media_type]
         upnp_class = HOME_ASSISTANT_UPNP_CLASS_MAPPING[media_type]
 
-        # stop current playing media
+        # Stop current playing media
         if self._device.can_stop:
             await self.async_media_stop()
 
-        # queue media
-        await self._device.async_set_transport_uri(media_id,
-                                                   title,
-                                                   mime_type,
-                                                   upnp_class)
+        # +ueue media
+        await self._device.async_set_transport_uri(
+            media_id, title, mime_type, upnp_class)
         await self._device.async_wait_for_can_play()
 
-        # if already playing, no need to call Play
+        # If already playing, no need to call Play
         from async_upnp_client import dlna
         if self._device.state == dlna.STATE_PLAYING:
             return
 
-        # play it
+        # Play it
         await self.async_media_play()
 
     @catch_request_errors()
diff --git a/homeassistant/components/media_player/dunehd.py b/homeassistant/components/media_player/dunehd.py
index f582ceefe5f..00c8ff3f4df 100644
--- a/homeassistant/components/media_player/dunehd.py
+++ b/homeassistant/components/media_player/dunehd.py
@@ -6,13 +6,13 @@ https://home-assistant.io/components/media_player.dunehd/
 """
 import voluptuous as vol
 
-import homeassistant.helpers.config_validation as cv
 from homeassistant.components.media_player import (
-    SUPPORT_PAUSE, SUPPORT_TURN_OFF, SUPPORT_TURN_ON, SUPPORT_NEXT_TRACK,
-    SUPPORT_PREVIOUS_TRACK, SUPPORT_SELECT_SOURCE, PLATFORM_SCHEMA,
-    SUPPORT_PLAY, MediaPlayerDevice)
+    PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PLAY,
+    SUPPORT_PREVIOUS_TRACK, SUPPORT_SELECT_SOURCE, SUPPORT_TURN_OFF,
+    SUPPORT_TURN_ON, MediaPlayerDevice)
 from homeassistant.const import (
-    CONF_HOST, CONF_NAME, STATE_OFF, STATE_PAUSED, STATE_ON, STATE_PLAYING)
+    CONF_HOST, CONF_NAME, STATE_OFF, STATE_ON, STATE_PAUSED, STATE_PLAYING)
+import homeassistant.helpers.config_validation as cv
 
 REQUIREMENTS = ['pdunehd==1.3']
 
diff --git a/homeassistant/components/media_player/emby.py b/homeassistant/components/media_player/emby.py
index 809db228d02..2bf3a1b803f 100644
--- a/homeassistant/components/media_player/emby.py
+++ b/homeassistant/components/media_player/emby.py
@@ -10,13 +10,13 @@ import logging
 import voluptuous as vol
 
 from homeassistant.components.media_player import (
-    MEDIA_TYPE_TVSHOW, MEDIA_TYPE_MOVIE, MEDIA_TYPE_MUSIC, SUPPORT_NEXT_TRACK,
-    SUPPORT_PAUSE, SUPPORT_SEEK, SUPPORT_STOP, SUPPORT_PREVIOUS_TRACK,
-    MediaPlayerDevice, SUPPORT_PLAY, PLATFORM_SCHEMA)
+    MEDIA_TYPE_MOVIE, MEDIA_TYPE_MUSIC, MEDIA_TYPE_TVSHOW, PLATFORM_SCHEMA,
+    SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PLAY, SUPPORT_PREVIOUS_TRACK,
+    SUPPORT_SEEK, SUPPORT_STOP, MediaPlayerDevice)
 from homeassistant.const import (
-    STATE_IDLE, STATE_OFF, STATE_PAUSED, STATE_PLAYING,
-    CONF_HOST, CONF_PORT, CONF_SSL, CONF_API_KEY, DEVICE_DEFAULT_NAME,
-    EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP)
+    CONF_API_KEY, CONF_HOST, CONF_PORT, CONF_SSL, DEVICE_DEFAULT_NAME,
+    EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP, STATE_IDLE, STATE_OFF,
+    STATE_PAUSED, STATE_PLAYING)
 from homeassistant.core import callback
 import homeassistant.helpers.config_validation as cv
 import homeassistant.util.dt as dt_util
@@ -42,11 +42,11 @@ SUPPORT_EMBY = SUPPORT_PAUSE | SUPPORT_PREVIOUS_TRACK | SUPPORT_NEXT_TRACK | \
     SUPPORT_STOP | SUPPORT_SEEK | SUPPORT_PLAY
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
-    vol.Optional(CONF_SSL, default=DEFAULT_SSL): cv.boolean,
     vol.Required(CONF_API_KEY): cv.string,
-    vol.Optional(CONF_PORT): cv.port,
     vol.Optional(CONF_AUTO_HIDE, default=DEFAULT_AUTO_HIDE): cv.boolean,
+    vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
+    vol.Optional(CONF_PORT): cv.port,
+    vol.Optional(CONF_SSL, default=DEFAULT_SSL): cv.boolean,
 })
 
 
@@ -95,7 +95,7 @@ def async_setup_platform(hass, config, async_add_entities,
 
         if new_devices:
             _LOGGER.debug("Adding new devices: %s", new_devices)
-            async_add_entities(new_devices, update_before_add=True)
+            async_add_entities(new_devices, True)
 
     @callback
     def device_removal_callback(data):
diff --git a/homeassistant/components/media_player/epson.py b/homeassistant/components/media_player/epson.py
index 23bbf685004..46beb4487fd 100644
--- a/homeassistant/components/media_player/epson.py
+++ b/homeassistant/components/media_player/epson.py
@@ -5,6 +5,7 @@ For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/media_player.epson/
 """
 import logging
+
 import voluptuous as vol
 
 from homeassistant.components.media_player import (
@@ -20,37 +21,45 @@ import homeassistant.helpers.config_validation as cv
 
 REQUIREMENTS = ['epson-projector==0.1.3']
 
+_LOGGER = logging.getLogger(__name__)
+
+ATTR_CMODE = 'cmode'
+
 DATA_EPSON = 'epson'
 DEFAULT_NAME = 'EPSON Projector'
 
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Required(CONF_HOST): cv.string,
-    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-    vol.Optional(CONF_PORT, default=80): cv.port,
-    vol.Optional(CONF_SSL, default=False): cv.boolean
-})
-
 SERVICE_SELECT_CMODE = 'epson_select_cmode'
-ATTR_CMODE = 'cmode'
 SUPPORT_CMODE = 33001
 
 SUPPORT_EPSON = SUPPORT_TURN_ON | SUPPORT_TURN_OFF | SUPPORT_SELECT_SOURCE |\
             SUPPORT_CMODE | SUPPORT_VOLUME_MUTE | SUPPORT_VOLUME_STEP | \
             SUPPORT_NEXT_TRACK | SUPPORT_PREVIOUS_TRACK
-_LOGGER = logging.getLogger(__name__)
 
 
-async def async_setup_platform(hass, config, async_add_entities,
-                               discovery_info=None):
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_HOST): cv.string,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_PORT, default=80): cv.port,
+    vol.Optional(CONF_SSL, default=False): cv.boolean,
+})
+
+
+async def async_setup_platform(
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the Epson media player platform."""
+    from epson_projector.const import (CMODE_LIST_SET)
+
     if DATA_EPSON not in hass.data:
         hass.data[DATA_EPSON] = []
+
     name = config.get(CONF_NAME)
     host = config.get(CONF_HOST)
+    port = config.get(CONF_PORT)
+    ssl = config.get(CONF_SSL)
+
+    epson = EpsonProjector(async_get_clientsession(
+        hass, verify_ssl=False), name, host, port, ssl)
 
-    epson = EpsonProjector(async_get_clientsession(hass, verify_ssl=False),
-                           name, host,
-                           config.get(CONF_PORT), config.get(CONF_SSL))
     hass.data[DATA_EPSON].append(epson)
     async_add_entities([epson], update_before_add=True)
 
@@ -67,7 +76,7 @@ async def async_setup_platform(hass, config, async_add_entities,
                 cmode = service.data.get(ATTR_CMODE)
                 await device.select_cmode(cmode)
             await device.update()
-    from epson_projector.const import (CMODE_LIST_SET)
+
     epson_schema = MEDIA_PLAYER_SCHEMA.extend({
         vol.Required(ATTR_CMODE): vol.All(cv.string, vol.Any(*CMODE_LIST_SET))
     })
@@ -81,13 +90,12 @@ class EpsonProjector(MediaPlayerDevice):
 
     def __init__(self, websession, name, host, port, encryption):
         """Initialize entity to control Epson projector."""
-        self._name = name
         import epson_projector as epson
         from epson_projector.const import DEFAULT_SOURCES
+
+        self._name = name
         self._projector = epson.Projector(
-            host,
-            websession=websession,
-            port=port)
+            host, websession=websession, port=port)
         self._cmode = None
         self._source_list = list(DEFAULT_SOURCES.values())
         self._source = None
@@ -97,9 +105,8 @@ class EpsonProjector(MediaPlayerDevice):
     async def update(self):
         """Update state of device."""
         from epson_projector.const import (
-            EPSON_CODES, POWER,
-            CMODE, CMODE_LIST, SOURCE, VOLUME,
-            BUSY, SOURCE_LIST)
+            EPSON_CODES, POWER, CMODE, CMODE_LIST, SOURCE, VOLUME, BUSY,
+            SOURCE_LIST)
         is_turned_on = await self._projector.get_property(POWER)
         _LOGGER.debug("Project turn on/off status: %s", is_turned_on)
         if is_turned_on and is_turned_on == EPSON_CODES[POWER]:
diff --git a/homeassistant/components/media_player/firetv.py b/homeassistant/components/media_player/firetv.py
index 0594b603a0c..3914d2381b2 100644
--- a/homeassistant/components/media_player/firetv.py
+++ b/homeassistant/components/media_player/firetv.py
@@ -10,13 +10,13 @@ import requests
 import voluptuous as vol
 
 from homeassistant.components.media_player import (
-    SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PREVIOUS_TRACK, PLATFORM_SCHEMA,
-    SUPPORT_SELECT_SOURCE, SUPPORT_TURN_OFF, SUPPORT_TURN_ON,
-    SUPPORT_VOLUME_SET, SUPPORT_PLAY, MediaPlayerDevice)
+    PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PLAY,
+    SUPPORT_PREVIOUS_TRACK, SUPPORT_SELECT_SOURCE, SUPPORT_TURN_OFF,
+    SUPPORT_TURN_ON, SUPPORT_VOLUME_SET, MediaPlayerDevice)
 from homeassistant.const import (
+    CONF_DEVICE, CONF_DEVICES, CONF_HOST, CONF_NAME, CONF_PORT, CONF_SSL,
     STATE_IDLE, STATE_OFF, STATE_PAUSED, STATE_PLAYING, STATE_STANDBY,
-    STATE_UNKNOWN, CONF_HOST, CONF_PORT, CONF_SSL, CONF_NAME, CONF_DEVICE,
-    CONF_DEVICES)
+    STATE_UNKNOWN)
 import homeassistant.helpers.config_validation as cv
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/media_player/frontier_silicon.py b/homeassistant/components/media_player/frontier_silicon.py
index 6dc4e73b1c0..aebdb676859 100644
--- a/homeassistant/components/media_player/frontier_silicon.py
+++ b/homeassistant/components/media_player/frontier_silicon.py
@@ -10,14 +10,14 @@ import logging
 import voluptuous as vol
 
 from homeassistant.components.media_player import (
-    SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PREVIOUS_TRACK, SUPPORT_SEEK,
-    SUPPORT_PLAY_MEDIA, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET,
-    SUPPORT_VOLUME_STEP, SUPPORT_STOP, SUPPORT_TURN_OFF, SUPPORT_TURN_ON,
-    SUPPORT_PLAY, SUPPORT_SELECT_SOURCE, MediaPlayerDevice, PLATFORM_SCHEMA,
-    MEDIA_TYPE_MUSIC)
+    MEDIA_TYPE_MUSIC, PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE,
+    SUPPORT_PLAY, SUPPORT_PLAY_MEDIA, SUPPORT_PREVIOUS_TRACK, SUPPORT_SEEK,
+    SUPPORT_SELECT_SOURCE, SUPPORT_STOP, SUPPORT_TURN_OFF, SUPPORT_TURN_ON,
+    SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET, SUPPORT_VOLUME_STEP,
+    MediaPlayerDevice)
 from homeassistant.const import (
-    STATE_OFF, STATE_PLAYING, STATE_PAUSED, STATE_UNKNOWN,
-    CONF_HOST, CONF_PORT, CONF_PASSWORD)
+    CONF_HOST, CONF_PASSWORD, CONF_PORT, STATE_OFF, STATE_PAUSED,
+    STATE_PLAYING, STATE_UNKNOWN)
 import homeassistant.helpers.config_validation as cv
 
 REQUIREMENTS = ['afsapi==0.0.4']
@@ -42,16 +42,15 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_entities,
-                         discovery_info=None):
+def async_setup_platform(
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the Frontier Silicon platform."""
     import requests
 
     if discovery_info is not None:
         async_add_entities(
-            [AFSAPIDevice(discovery_info['ssdp_description'],
-                          DEFAULT_PASSWORD)],
-            update_before_add=True)
+            [AFSAPIDevice(
+                discovery_info['ssdp_description'], DEFAULT_PASSWORD)], True)
         return True
 
     host = config.get(CONF_HOST)
@@ -60,8 +59,7 @@ def async_setup_platform(hass, config, async_add_entities,
 
     try:
         async_add_entities(
-            [AFSAPIDevice(DEVICE_URL.format(host, port), password)],
-            update_before_add=True)
+            [AFSAPIDevice(DEVICE_URL.format(host, port), password)], True)
         _LOGGER.debug("FSAPI device %s:%s -> %s", host, port, password)
         return True
     except requests.exceptions.RequestException:
@@ -78,7 +76,7 @@ class AFSAPIDevice(MediaPlayerDevice):
         """Initialize the Frontier Silicon API device."""
         self._device_url = device_url
         self._password = password
-        self._state = STATE_UNKNOWN
+        self._state = None
 
         self._name = None
         self._title = None
diff --git a/homeassistant/components/media_player/gpmdp.py b/homeassistant/components/media_player/gpmdp.py
index 200191ad77a..b16eb8d417a 100644
--- a/homeassistant/components/media_player/gpmdp.py
+++ b/homeassistant/components/media_player/gpmdp.py
@@ -4,19 +4,19 @@ Support for Google Play Music Desktop Player.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/media_player.gpmdp/
 """
-import logging
 import json
+import logging
 import socket
 import time
 
 import voluptuous as vol
 
 from homeassistant.components.media_player import (
-    MEDIA_TYPE_MUSIC, SUPPORT_NEXT_TRACK, SUPPORT_PREVIOUS_TRACK,
-    SUPPORT_PAUSE, SUPPORT_VOLUME_SET, SUPPORT_SEEK, SUPPORT_PLAY,
-    MediaPlayerDevice, PLATFORM_SCHEMA)
+    MEDIA_TYPE_MUSIC, PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE,
+    SUPPORT_PLAY, SUPPORT_PREVIOUS_TRACK, SUPPORT_SEEK, SUPPORT_VOLUME_SET,
+    MediaPlayerDevice)
 from homeassistant.const import (
-    STATE_PLAYING, STATE_PAUSED, STATE_OFF, CONF_HOST, CONF_PORT, CONF_NAME)
+    CONF_HOST, CONF_NAME, CONF_PORT, STATE_OFF, STATE_PAUSED, STATE_PLAYING)
 import homeassistant.helpers.config_validation as cv
 from homeassistant.util.json import load_json, save_json
 
@@ -55,9 +55,11 @@ def request_configuration(hass, config, url, add_entities_callback):
         return
     from websocket import create_connection
     websocket = create_connection((url), timeout=1)
-    websocket.send(json.dumps({'namespace': 'connect',
-                               'method': 'connect',
-                               'arguments': ['Home Assistant']}))
+    websocket.send(json.dumps({
+        'namespace': 'connect',
+        'method': 'connect',
+        'arguments': ['Home Assistant']
+    }))
 
     def gpmdp_configuration_callback(callback_data):
         """Handle configuration changes."""
diff --git a/homeassistant/components/media_player/gstreamer.py b/homeassistant/components/media_player/gstreamer.py
index e2477f0a4cd..e520fcb1033 100644
--- a/homeassistant/components/media_player/gstreamer.py
+++ b/homeassistant/components/media_player/gstreamer.py
@@ -9,21 +9,18 @@ import logging
 import voluptuous as vol
 
 from homeassistant.components.media_player import (
-    MEDIA_TYPE_MUSIC, SUPPORT_VOLUME_SET, SUPPORT_PAUSE,
-    SUPPORT_PLAY_MEDIA, SUPPORT_PLAY, SUPPORT_NEXT_TRACK,
-    PLATFORM_SCHEMA, MediaPlayerDevice)
-from homeassistant.const import (
-    STATE_IDLE, CONF_NAME, EVENT_HOMEASSISTANT_STOP)
+    MEDIA_TYPE_MUSIC, PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE,
+    SUPPORT_PLAY, SUPPORT_PLAY_MEDIA, SUPPORT_VOLUME_SET, MediaPlayerDevice)
+from homeassistant.const import CONF_NAME, EVENT_HOMEASSISTANT_STOP, STATE_IDLE
 import homeassistant.helpers.config_validation as cv
 
+REQUIREMENTS = ['gstreamer-player==1.1.0']
 
 _LOGGER = logging.getLogger(__name__)
 
-
-REQUIREMENTS = ['gstreamer-player==1.1.0']
-DOMAIN = 'gstreamer'
 CONF_PIPELINE = 'pipeline'
 
+DOMAIN = 'gstreamer'
 
 SUPPORT_GSTREAMER = SUPPORT_VOLUME_SET | SUPPORT_PLAY | SUPPORT_PAUSE |\
      SUPPORT_PLAY_MEDIA | SUPPORT_NEXT_TRACK
diff --git a/homeassistant/components/media_player/hdmi_cec.py b/homeassistant/components/media_player/hdmi_cec.py
index 9198e4dec88..cb4afadd058 100644
--- a/homeassistant/components/media_player/hdmi_cec.py
+++ b/homeassistant/components/media_player/hdmi_cec.py
@@ -7,12 +7,12 @@ https://home-assistant.io/components/hdmi_cec/
 import logging
 
 from homeassistant.components.hdmi_cec import ATTR_NEW, CecDevice
-from homeassistant.components.media_player import MediaPlayerDevice, DOMAIN, \
-    SUPPORT_TURN_ON, SUPPORT_TURN_OFF, SUPPORT_PLAY_MEDIA, SUPPORT_PAUSE, \
-    SUPPORT_PREVIOUS_TRACK, SUPPORT_NEXT_TRACK, SUPPORT_STOP, \
-    SUPPORT_VOLUME_STEP, SUPPORT_VOLUME_MUTE
-from homeassistant.const import STATE_ON, STATE_OFF, STATE_PLAYING, \
-    STATE_IDLE, STATE_PAUSED
+from homeassistant.components.media_player import (
+    DOMAIN, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PLAY_MEDIA,
+    SUPPORT_PREVIOUS_TRACK, SUPPORT_STOP, SUPPORT_TURN_OFF, SUPPORT_TURN_ON,
+    SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_STEP, MediaPlayerDevice)
+from homeassistant.const import (
+    STATE_IDLE, STATE_OFF, STATE_ON, STATE_PAUSED, STATE_PLAYING)
 from homeassistant.core import HomeAssistant
 
 DEPENDENCIES = ['hdmi_cec']
diff --git a/homeassistant/components/media_player/horizon.py b/homeassistant/components/media_player/horizon.py
index 4fa97cb5537..04471c69b9c 100644
--- a/homeassistant/components/media_player/horizon.py
+++ b/homeassistant/components/media_player/horizon.py
@@ -4,27 +4,26 @@ Support for the Unitymedia Horizon HD Recorder.
 For more details about this platform, please refer to the documentation
 https://home-assistant.io/components/media_player.horizon/
 """
-
 from datetime import timedelta
 import logging
 
 import voluptuous as vol
 
+from homeassistant import util
 from homeassistant.components.media_player import (
-    MediaPlayerDevice, PLATFORM_SCHEMA, MEDIA_TYPE_CHANNEL,
-    SUPPORT_NEXT_TRACK, SUPPORT_TURN_ON, SUPPORT_TURN_OFF, SUPPORT_PAUSE,
-    SUPPORT_PLAY, SUPPORT_PLAY_MEDIA, SUPPORT_PREVIOUS_TRACK)
-from homeassistant.const import (CONF_HOST, CONF_NAME, CONF_PORT, STATE_OFF,
-                                 STATE_PAUSED, STATE_PLAYING)
+    MEDIA_TYPE_CHANNEL, PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE,
+    SUPPORT_PLAY, SUPPORT_PLAY_MEDIA, SUPPORT_PREVIOUS_TRACK, SUPPORT_TURN_OFF,
+    SUPPORT_TURN_ON, MediaPlayerDevice)
+from homeassistant.const import (
+    CONF_HOST, CONF_NAME, CONF_PORT, STATE_OFF, STATE_PAUSED, STATE_PLAYING)
 from homeassistant.exceptions import PlatformNotReady
 import homeassistant.helpers.config_validation as cv
-from homeassistant import util
 
 REQUIREMENTS = ['einder==0.3.1']
 
 _LOGGER = logging.getLogger(__name__)
 
-DEFAULT_NAME = "Horizon"
+DEFAULT_NAME = 'Horizon'
 DEFAULT_PORT = 5900
 
 MIN_TIME_BETWEEN_FORCED_SCANS = timedelta(seconds=1)
diff --git a/homeassistant/components/media_player/itunes.py b/homeassistant/components/media_player/itunes.py
index 31df74dbeaf..e2ae179676b 100644
--- a/homeassistant/components/media_player/itunes.py
+++ b/homeassistant/components/media_player/itunes.py
@@ -10,21 +10,21 @@ import requests
 import voluptuous as vol
 
 from homeassistant.components.media_player import (
-    MEDIA_TYPE_MUSIC, MEDIA_TYPE_PLAYLIST, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE,
-    SUPPORT_PLAY_MEDIA, SUPPORT_PREVIOUS_TRACK, SUPPORT_SEEK, SUPPORT_TURN_OFF,
-    SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET, PLATFORM_SCHEMA,
-    SUPPORT_PLAY, MediaPlayerDevice)
+    MEDIA_TYPE_MUSIC, MEDIA_TYPE_PLAYLIST, PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK,
+    SUPPORT_PAUSE, SUPPORT_PLAY, SUPPORT_PLAY_MEDIA, SUPPORT_PREVIOUS_TRACK,
+    SUPPORT_SEEK, SUPPORT_TURN_OFF, SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE,
+    SUPPORT_VOLUME_SET, MediaPlayerDevice)
 from homeassistant.const import (
-    STATE_IDLE, STATE_OFF, STATE_ON, STATE_PAUSED, STATE_PLAYING, CONF_NAME,
-    CONF_HOST, CONF_PORT, CONF_SSL)
+    CONF_HOST, CONF_NAME, CONF_PORT, CONF_SSL, STATE_IDLE, STATE_OFF, STATE_ON,
+    STATE_PAUSED, STATE_PLAYING)
 import homeassistant.helpers.config_validation as cv
 
 _LOGGER = logging.getLogger(__name__)
 
 DEFAULT_NAME = 'iTunes'
 DEFAULT_PORT = 8181
-DEFAULT_TIMEOUT = 10
 DEFAULT_SSL = False
+DEFAULT_TIMEOUT = 10
 DOMAIN = 'itunes'
 
 SUPPORT_ITUNES = SUPPORT_PAUSE | SUPPORT_VOLUME_SET | SUPPORT_VOLUME_MUTE | \
@@ -52,7 +52,7 @@ class Itunes:
 
     @property
     def _base_url(self):
-        """Return the base url for endpoints."""
+        """Return the base URL for endpoints."""
         if self.use_ssl:
             uri_scheme = 'https://'
         else:
diff --git a/homeassistant/components/media_player/kodi.py b/homeassistant/components/media_player/kodi.py
index 5ea82f6b054..c98dc5c56fe 100644
--- a/homeassistant/components/media_player/kodi.py
+++ b/homeassistant/components/media_player/kodi.py
@@ -8,27 +8,29 @@ import asyncio
 from collections import OrderedDict
 from functools import wraps
 import logging
+import re
 import socket
 import urllib
-import re
 
 import aiohttp
 import voluptuous as vol
 
 from homeassistant.components.media_player import (
-    SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PREVIOUS_TRACK, SUPPORT_SEEK,
-    SUPPORT_PLAY_MEDIA, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET, SUPPORT_STOP,
-    SUPPORT_TURN_OFF, SUPPORT_PLAY, SUPPORT_VOLUME_STEP, SUPPORT_SHUFFLE_SET,
-    MediaPlayerDevice, PLATFORM_SCHEMA, MEDIA_TYPE_MUSIC, MEDIA_TYPE_TVSHOW,
-    MEDIA_TYPE_MOVIE, MEDIA_TYPE_VIDEO, MEDIA_TYPE_CHANNEL,
-    MEDIA_TYPE_PLAYLIST, MEDIA_PLAYER_SCHEMA, DOMAIN, SUPPORT_TURN_ON)
+    DOMAIN, MEDIA_PLAYER_SCHEMA, MEDIA_TYPE_CHANNEL, MEDIA_TYPE_MOVIE,
+    MEDIA_TYPE_MUSIC, MEDIA_TYPE_PLAYLIST, MEDIA_TYPE_TVSHOW, MEDIA_TYPE_VIDEO,
+    PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PLAY,
+    SUPPORT_PLAY_MEDIA, SUPPORT_PREVIOUS_TRACK, SUPPORT_SEEK,
+    SUPPORT_SHUFFLE_SET, SUPPORT_STOP, SUPPORT_TURN_OFF, SUPPORT_TURN_ON,
+    SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET, SUPPORT_VOLUME_STEP,
+    MediaPlayerDevice)
 from homeassistant.const import (
-    STATE_IDLE, STATE_OFF, STATE_PAUSED, STATE_PLAYING, CONF_HOST, CONF_NAME,
-    CONF_PORT, CONF_PROXY_SSL, CONF_USERNAME, CONF_PASSWORD,
-    CONF_TIMEOUT, EVENT_HOMEASSISTANT_STOP)
+    CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_PORT, CONF_PROXY_SSL,
+    CONF_TIMEOUT, CONF_USERNAME, EVENT_HOMEASSISTANT_STOP, STATE_IDLE,
+    STATE_OFF, STATE_PAUSED, STATE_PLAYING)
 from homeassistant.core import callback
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers import script
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers import script, config_validation as cv
 from homeassistant.helpers.template import Template
 from homeassistant.util.yaml import dump
 
diff --git a/homeassistant/components/media_player/lg_netcast.py b/homeassistant/components/media_player/lg_netcast.py
index cbc15af91b6..92f48411401 100644
--- a/homeassistant/components/media_player/lg_netcast.py
+++ b/homeassistant/components/media_player/lg_netcast.py
@@ -10,15 +10,16 @@ import logging
 from requests import RequestException
 import voluptuous as vol
 
-import homeassistant.helpers.config_validation as cv
-from homeassistant.components.media_player import (
-    SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PREVIOUS_TRACK, PLATFORM_SCHEMA,
-    SUPPORT_TURN_OFF, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_STEP,
-    SUPPORT_SELECT_SOURCE, SUPPORT_PLAY, MEDIA_TYPE_CHANNEL, MediaPlayerDevice)
-from homeassistant.const import (
-    CONF_HOST, CONF_NAME, CONF_ACCESS_TOKEN,
-    STATE_OFF, STATE_PLAYING, STATE_PAUSED, STATE_UNKNOWN)
 from homeassistant import util
+from homeassistant.components.media_player import (
+    MEDIA_TYPE_CHANNEL, PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE,
+    SUPPORT_PLAY, SUPPORT_PREVIOUS_TRACK, SUPPORT_SELECT_SOURCE,
+    SUPPORT_TURN_OFF, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_STEP,
+    MediaPlayerDevice)
+from homeassistant.const import (
+    CONF_ACCESS_TOKEN, CONF_HOST, CONF_NAME, STATE_OFF, STATE_PAUSED,
+    STATE_PLAYING, STATE_UNKNOWN)
+import homeassistant.helpers.config_validation as cv
 
 REQUIREMENTS = ['pylgnetcast-homeassistant==0.2.0.dev0']
 
@@ -35,16 +36,16 @@ SUPPORT_LGTV = SUPPORT_PAUSE | SUPPORT_VOLUME_STEP | \
                SUPPORT_SELECT_SOURCE | SUPPORT_PLAY
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
     vol.Required(CONF_HOST): cv.string,
-    vol.Optional(CONF_ACCESS_TOKEN):
-        vol.All(cv.string, vol.Length(max=6)),
+    vol.Optional(CONF_ACCESS_TOKEN): vol.All(cv.string, vol.Length(max=6)),
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
 })
 
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the LG TV platform."""
     from pylgnetcast import LgNetCastClient
+
     host = config.get(CONF_HOST)
     access_token = config.get(CONF_ACCESS_TOKEN)
     name = config.get(CONF_NAME)
diff --git a/homeassistant/components/media_player/liveboxplaytv.py b/homeassistant/components/media_player/liveboxplaytv.py
index d5b1bcd78fe..9a08ceeac93 100644
--- a/homeassistant/components/media_player/liveboxplaytv.py
+++ b/homeassistant/components/media_player/liveboxplaytv.py
@@ -5,20 +5,20 @@ For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/media_player.liveboxplaytv/
 """
 import asyncio
-import logging
 from datetime import timedelta
+import logging
 
 import requests
 import voluptuous as vol
 
 from homeassistant.components.media_player import (
-    SUPPORT_TURN_ON, SUPPORT_TURN_OFF, SUPPORT_PLAY,
-    SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PREVIOUS_TRACK,
-    SUPPORT_VOLUME_STEP, SUPPORT_VOLUME_MUTE, SUPPORT_SELECT_SOURCE,
-    MEDIA_TYPE_CHANNEL, MediaPlayerDevice, PLATFORM_SCHEMA)
+    MEDIA_TYPE_CHANNEL, PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE,
+    SUPPORT_PLAY, SUPPORT_PREVIOUS_TRACK, SUPPORT_SELECT_SOURCE,
+    SUPPORT_TURN_OFF, SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE,
+    SUPPORT_VOLUME_STEP, MediaPlayerDevice)
 from homeassistant.const import (
-    CONF_HOST, CONF_PORT, STATE_ON, STATE_OFF, STATE_PLAYING,
-    STATE_PAUSED, CONF_NAME)
+    CONF_HOST, CONF_NAME, CONF_PORT, STATE_OFF, STATE_ON, STATE_PAUSED,
+    STATE_PLAYING)
 import homeassistant.helpers.config_validation as cv
 import homeassistant.util.dt as dt_util
 
@@ -40,7 +40,7 @@ MIN_TIME_BETWEEN_FORCED_SCANS = timedelta(seconds=1)
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Required(CONF_HOST): cv.string,
     vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
-    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
 })
 
 
diff --git a/homeassistant/components/media_player/mediaroom.py b/homeassistant/components/media_player/mediaroom.py
index f0b5365cf83..345b58cbbe4 100644
--- a/homeassistant/components/media_player/mediaroom.py
+++ b/homeassistant/components/media_player/mediaroom.py
@@ -8,45 +8,41 @@ import logging
 
 import voluptuous as vol
 
-from homeassistant.core import callback
 from homeassistant.components.media_player import (
-    MEDIA_TYPE_CHANNEL, SUPPORT_PAUSE, SUPPORT_PLAY_MEDIA, SUPPORT_TURN_OFF,
-    SUPPORT_TURN_ON, SUPPORT_STOP, PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK,
-    SUPPORT_PREVIOUS_TRACK, SUPPORT_PLAY, SUPPORT_VOLUME_STEP,
-    SUPPORT_VOLUME_MUTE, MediaPlayerDevice,
-)
-from homeassistant.helpers.dispatcher import (
-    dispatcher_send, async_dispatcher_connect
-)
+    MEDIA_TYPE_CHANNEL, PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE,
+    SUPPORT_PLAY, SUPPORT_PLAY_MEDIA, SUPPORT_PREVIOUS_TRACK, SUPPORT_STOP,
+    SUPPORT_TURN_OFF, SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE,
+    SUPPORT_VOLUME_STEP, MediaPlayerDevice)
 from homeassistant.const import (
-    CONF_HOST, CONF_NAME, CONF_OPTIMISTIC, STATE_OFF,
-    CONF_TIMEOUT, STATE_PAUSED, STATE_PLAYING, STATE_STANDBY,
-    STATE_UNAVAILABLE, EVENT_HOMEASSISTANT_STOP
-)
+    CONF_HOST, CONF_NAME, CONF_OPTIMISTIC, CONF_TIMEOUT,
+    EVENT_HOMEASSISTANT_STOP, STATE_OFF, STATE_PAUSED, STATE_PLAYING,
+    STATE_STANDBY, STATE_UNAVAILABLE)
+from homeassistant.core import callback
 import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.dispatcher import (
+    async_dispatcher_connect, dispatcher_send)
 
 REQUIREMENTS = ['pymediaroom==0.6.4']
 
 _LOGGER = logging.getLogger(__name__)
 
-DEFAULT_NAME = 'Mediaroom STB'
+DATA_MEDIAROOM = 'mediaroom_known_stb'
+DEFAULT_NAME = "Mediaroom STB"
 DEFAULT_TIMEOUT = 9
-DATA_MEDIAROOM = "mediaroom_known_stb"
-DISCOVERY_MEDIAROOM = "mediaroom_discovery_installed"
+DISCOVERY_MEDIAROOM = 'mediaroom_discovery_installed'
+
 SIGNAL_STB_NOTIFY = 'mediaroom_stb_discovered'
 SUPPORT_MEDIAROOM = SUPPORT_PAUSE | SUPPORT_TURN_ON | SUPPORT_TURN_OFF \
     | SUPPORT_VOLUME_STEP | SUPPORT_VOLUME_MUTE | SUPPORT_PLAY_MEDIA \
     | SUPPORT_STOP | SUPPORT_NEXT_TRACK | SUPPORT_PREVIOUS_TRACK \
     | SUPPORT_PLAY
 
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
-    {
-        vol.Optional(CONF_HOST): cv.string,
-        vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-        vol.Optional(CONF_OPTIMISTIC, default=False): cv.boolean,
-        vol.Optional(CONF_TIMEOUT, default=DEFAULT_TIMEOUT): cv.positive_int,
-    }
-)
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_HOST): cv.string,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_OPTIMISTIC, default=False): cv.boolean,
+    vol.Optional(CONF_TIMEOUT, default=DEFAULT_TIMEOUT): cv.positive_int,
+})
 
 
 async def async_setup_platform(hass, config, async_add_entities,
@@ -57,10 +53,9 @@ async def async_setup_platform(hass, config, async_add_entities,
         known_hosts = hass.data[DATA_MEDIAROOM] = []
     host = config.get(CONF_HOST, None)
     if host:
-        async_add_entities([MediaroomDevice(host=host,
-                                            device_id=None,
-                                            optimistic=config[CONF_OPTIMISTIC],
-                                            timeout=config[CONF_TIMEOUT])])
+        async_add_entities([MediaroomDevice(
+            host=host, device_id=None, optimistic=config[CONF_OPTIMISTIC],
+            timeout=config[CONF_TIMEOUT])])
         hass.data[DATA_MEDIAROOM].append(host)
 
     _LOGGER.debug("Trying to discover Mediaroom STB")
@@ -75,8 +70,7 @@ async def async_setup_platform(hass, config, async_add_entities,
         hass.data[DATA_MEDIAROOM].append(notify.ip_address)
         new_stb = MediaroomDevice(
             host=notify.ip_address, device_id=notify.device_uuid,
-            optimistic=False
-        )
+            optimistic=False)
         async_add_entities([new_stb])
 
     if not config[CONF_OPTIMISTIC]:
@@ -90,11 +84,11 @@ async def async_setup_platform(hass, config, async_add_entities,
             @callback
             def stop_discovery(event):
                 """Stop discovery of new mediaroom STB's."""
-                _LOGGER.debug("Stopping internal pymediaroom discovery.")
+                _LOGGER.debug("Stopping internal pymediaroom discovery")
                 hass.data[DISCOVERY_MEDIAROOM].close()
 
-            hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP,
-                                       stop_discovery)
+            hass.bus.async_listen_once(
+                EVENT_HOMEASSISTANT_STOP, stop_discovery)
 
             _LOGGER.debug("Auto discovery installed")
 
@@ -118,8 +112,8 @@ class MediaroomDevice(MediaPlayerDevice):
 
         self._state = state_map[mediaroom_state]
 
-    def __init__(self, host, device_id, optimistic=False,
-                 timeout=DEFAULT_TIMEOUT):
+    def __init__(
+            self, host, device_id, optimistic=False, timeout=DEFAULT_TIMEOUT):
         """Initialize the device."""
         from pymediaroom import Remote
 
@@ -160,8 +154,8 @@ class MediaroomDevice(MediaPlayerDevice):
             self._available = True
             self.async_schedule_update_ha_state()
 
-        async_dispatcher_connect(self.hass, SIGNAL_STB_NOTIFY,
-                                 async_notify_received)
+        async_dispatcher_connect(
+            self.hass, SIGNAL_STB_NOTIFY, async_notify_received)
 
     async def async_play_media(self, media_type, media_id, **kwargs):
         """Play media."""
diff --git a/homeassistant/components/media_player/mpchc.py b/homeassistant/components/media_player/mpchc.py
index 840429ef3d4..e6bc1f2699d 100644
--- a/homeassistant/components/media_player/mpchc.py
+++ b/homeassistant/components/media_player/mpchc.py
@@ -11,12 +11,12 @@ import requests
 import voluptuous as vol
 
 from homeassistant.components.media_player import (
-    SUPPORT_VOLUME_MUTE, SUPPORT_PAUSE, SUPPORT_STOP, SUPPORT_NEXT_TRACK,
-    SUPPORT_PREVIOUS_TRACK, SUPPORT_VOLUME_STEP, SUPPORT_PLAY,
-    MediaPlayerDevice, PLATFORM_SCHEMA)
+    PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PLAY,
+    SUPPORT_PREVIOUS_TRACK, SUPPORT_STOP, SUPPORT_VOLUME_MUTE,
+    SUPPORT_VOLUME_STEP, MediaPlayerDevice)
 from homeassistant.const import (
-    STATE_OFF, STATE_IDLE, STATE_PAUSED, STATE_PLAYING, CONF_NAME, CONF_HOST,
-    CONF_PORT)
+    CONF_HOST, CONF_NAME, CONF_PORT, STATE_IDLE, STATE_OFF, STATE_PAUSED,
+    STATE_PLAYING)
 import homeassistant.helpers.config_validation as cv
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/media_player/nad.py b/homeassistant/components/media_player/nad.py
index d30c5815d3f..5fff8831617 100644
--- a/homeassistant/components/media_player/nad.py
+++ b/homeassistant/components/media_player/nad.py
@@ -9,12 +9,10 @@ import logging
 import voluptuous as vol
 
 from homeassistant.components.media_player import (
-    SUPPORT_VOLUME_SET,
-    SUPPORT_VOLUME_MUTE, SUPPORT_TURN_ON, SUPPORT_TURN_OFF,
-    SUPPORT_VOLUME_STEP, SUPPORT_SELECT_SOURCE, MediaPlayerDevice,
-    PLATFORM_SCHEMA)
-from homeassistant.const import (
-    CONF_NAME, STATE_OFF, STATE_ON)
+    PLATFORM_SCHEMA, SUPPORT_SELECT_SOURCE, SUPPORT_TURN_OFF, SUPPORT_TURN_ON,
+    SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET, SUPPORT_VOLUME_STEP,
+    MediaPlayerDevice)
+from homeassistant.const import CONF_NAME, STATE_OFF, STATE_ON
 import homeassistant.helpers.config_validation as cv
 
 REQUIREMENTS = ['nad_receiver==0.0.9']
diff --git a/homeassistant/components/media_player/onkyo.py b/homeassistant/components/media_player/onkyo.py
index 00df456804f..0ba098d85f5 100644
--- a/homeassistant/components/media_player/onkyo.py
+++ b/homeassistant/components/media_player/onkyo.py
@@ -12,10 +12,10 @@ from typing import List  # noqa: F401
 import voluptuous as vol
 
 from homeassistant.components.media_player import (
+    PLATFORM_SCHEMA, SUPPORT_PLAY, SUPPORT_PLAY_MEDIA, SUPPORT_SELECT_SOURCE,
     SUPPORT_TURN_OFF, SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET,
-    SUPPORT_VOLUME_STEP, SUPPORT_SELECT_SOURCE, SUPPORT_PLAY,
-    SUPPORT_PLAY_MEDIA, MediaPlayerDevice, PLATFORM_SCHEMA)
-from homeassistant.const import (STATE_OFF, STATE_ON, CONF_HOST, CONF_NAME)
+    SUPPORT_VOLUME_STEP, MediaPlayerDevice)
+from homeassistant.const import CONF_HOST, CONF_NAME, STATE_OFF, STATE_ON
 import homeassistant.helpers.config_validation as cv
 
 REQUIREMENTS = ['onkyo-eiscp==1.2.4']
diff --git a/homeassistant/components/media_player/openhome.py b/homeassistant/components/media_player/openhome.py
index 1ffe0ef82df..ab23f8a7f9a 100644
--- a/homeassistant/components/media_player/openhome.py
+++ b/homeassistant/components/media_player/openhome.py
@@ -7,12 +7,12 @@ https://home-assistant.io/components/media_player.openhome/
 import logging
 
 from homeassistant.components.media_player import (
-    SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PREVIOUS_TRACK, SUPPORT_TURN_ON,
-    SUPPORT_TURN_OFF, SUPPORT_VOLUME_SET, SUPPORT_VOLUME_MUTE,
-    SUPPORT_VOLUME_STEP, SUPPORT_STOP, SUPPORT_PLAY, SUPPORT_SELECT_SOURCE,
+    SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PLAY, SUPPORT_PREVIOUS_TRACK,
+    SUPPORT_SELECT_SOURCE, SUPPORT_STOP, SUPPORT_TURN_OFF, SUPPORT_TURN_ON,
+    SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET, SUPPORT_VOLUME_STEP,
     MediaPlayerDevice)
 from homeassistant.const import (
-    STATE_IDLE, STATE_PAUSED, STATE_PLAYING, STATE_OFF)
+    STATE_IDLE, STATE_OFF, STATE_PAUSED, STATE_PLAYING)
 
 REQUIREMENTS = ['openhomedevice==0.4.2']
 
diff --git a/homeassistant/components/media_player/panasonic_viera.py b/homeassistant/components/media_player/panasonic_viera.py
index 937a72c80ff..efe04c7005b 100644
--- a/homeassistant/components/media_player/panasonic_viera.py
+++ b/homeassistant/components/media_player/panasonic_viera.py
@@ -9,22 +9,19 @@ import logging
 import voluptuous as vol
 
 from homeassistant.components.media_player import (
-    SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PREVIOUS_TRACK,
-    SUPPORT_TURN_ON, SUPPORT_TURN_OFF, SUPPORT_PLAY,
-    SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET, MEDIA_TYPE_URL,
-    SUPPORT_PLAY_MEDIA, SUPPORT_STOP,
-    SUPPORT_VOLUME_STEP, MediaPlayerDevice, PLATFORM_SCHEMA)
+    MEDIA_TYPE_URL, PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE,
+    SUPPORT_PLAY, SUPPORT_PLAY_MEDIA, SUPPORT_PREVIOUS_TRACK, SUPPORT_STOP,
+    SUPPORT_TURN_OFF, SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET,
+    SUPPORT_VOLUME_STEP, MediaPlayerDevice)
 from homeassistant.const import (
-    CONF_HOST, CONF_NAME, STATE_OFF, STATE_ON, STATE_UNKNOWN, CONF_PORT)
+    CONF_HOST, CONF_MAC, CONF_NAME, CONF_PORT, STATE_OFF, STATE_ON,
+    STATE_UNKNOWN)
 import homeassistant.helpers.config_validation as cv
 
-REQUIREMENTS = ['panasonic_viera==0.3.1',
-                'wakeonlan==1.0.0']
+REQUIREMENTS = ['panasonic_viera==0.3.1', 'wakeonlan==1.0.0']
 
 _LOGGER = logging.getLogger(__name__)
 
-CONF_MAC = 'mac'
-
 DEFAULT_NAME = 'Panasonic Viera TV'
 DEFAULT_PORT = 55000
 
diff --git a/homeassistant/components/media_player/pandora.py b/homeassistant/components/media_player/pandora.py
index 5295bfc40eb..231ea5302ae 100644
--- a/homeassistant/components/media_player/pandora.py
+++ b/homeassistant/components/media_player/pandora.py
@@ -4,23 +4,22 @@ Component for controlling Pandora stations through the pianobar client.
 For more details about this platform, please refer to the documentation
 https://home-assistant.io/components/media_player.pandora/
 """
-import logging
-import re
-import os
-import signal
 from datetime import timedelta
+import logging
+import os
+import re
 import shutil
+import signal
 
-from homeassistant.const import EVENT_HOMEASSISTANT_STOP
-from homeassistant.components.media_player import (
-    SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, MEDIA_TYPE_MUSIC,
-    SUPPORT_TURN_OFF, SUPPORT_TURN_ON, SUPPORT_PLAY,
-    SUPPORT_SELECT_SOURCE, SERVICE_MEDIA_NEXT_TRACK, SERVICE_MEDIA_PLAY_PAUSE,
-    SERVICE_MEDIA_PLAY, SERVICE_VOLUME_UP, SERVICE_VOLUME_DOWN,
-    MediaPlayerDevice)
-from homeassistant.const import (STATE_OFF, STATE_PAUSED, STATE_PLAYING,
-                                 STATE_IDLE)
 from homeassistant import util
+from homeassistant.components.media_player import (
+    MEDIA_TYPE_MUSIC, SERVICE_MEDIA_NEXT_TRACK, SERVICE_MEDIA_PLAY,
+    SERVICE_MEDIA_PLAY_PAUSE, SERVICE_VOLUME_DOWN, SERVICE_VOLUME_UP,
+    SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PLAY, SUPPORT_SELECT_SOURCE,
+    SUPPORT_TURN_OFF, SUPPORT_TURN_ON, MediaPlayerDevice)
+from homeassistant.const import (
+    EVENT_HOMEASSISTANT_STOP, STATE_IDLE, STATE_OFF, STATE_PAUSED,
+    STATE_PLAYING)
 
 REQUIREMENTS = ['pexpect==4.6.0']
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/media_player/philips_js.py b/homeassistant/components/media_player/philips_js.py
index 9c7418d4c80..7d434ab480e 100644
--- a/homeassistant/components/media_player/philips_js.py
+++ b/homeassistant/components/media_player/philips_js.py
@@ -4,19 +4,19 @@ Media Player component to integrate TVs exposing the Joint Space API.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/media_player.philips_js/
 """
-import logging
 from datetime import timedelta
+import logging
 
 import voluptuous as vol
 
-import homeassistant.helpers.config_validation as cv
 from homeassistant.components.media_player import (
-    PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK, SUPPORT_PREVIOUS_TRACK,
+    PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK, SUPPORT_PLAY, SUPPORT_PREVIOUS_TRACK,
     SUPPORT_SELECT_SOURCE, SUPPORT_TURN_OFF, SUPPORT_TURN_ON,
     SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET, SUPPORT_VOLUME_STEP,
-    SUPPORT_PLAY, MediaPlayerDevice)
+    MediaPlayerDevice)
 from homeassistant.const import (
-    CONF_HOST, CONF_NAME, CONF_API_VERSION, STATE_OFF, STATE_ON, STATE_UNKNOWN)
+    CONF_API_VERSION, CONF_HOST, CONF_NAME, STATE_OFF, STATE_ON, STATE_UNKNOWN)
+import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.script import Script
 from homeassistant.util import Throttle
 
@@ -37,7 +37,7 @@ CONF_ON_ACTION = 'turn_on_action'
 
 DEFAULT_DEVICE = 'default'
 DEFAULT_HOST = '127.0.0.1'
-DEFAULT_NAME = 'Philips TV'
+DEFAULT_NAME = "Philips TV"
 DEFAULT_API_VERSION = '1'
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
diff --git a/homeassistant/components/media_player/pioneer.py b/homeassistant/components/media_player/pioneer.py
index 71ccf9a460d..29e4068f1d4 100644
--- a/homeassistant/components/media_player/pioneer.py
+++ b/homeassistant/components/media_player/pioneer.py
@@ -10,12 +10,12 @@ import telnetlib
 import voluptuous as vol
 
 from homeassistant.components.media_player import (
-    SUPPORT_PAUSE, SUPPORT_SELECT_SOURCE, MediaPlayerDevice, PLATFORM_SCHEMA,
+    PLATFORM_SCHEMA, SUPPORT_PAUSE, SUPPORT_PLAY, SUPPORT_SELECT_SOURCE,
     SUPPORT_TURN_OFF, SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET,
-    SUPPORT_PLAY)
+    MediaPlayerDevice)
 from homeassistant.const import (
-    CONF_HOST, STATE_OFF, STATE_ON, STATE_UNKNOWN, CONF_NAME, CONF_PORT,
-    CONF_TIMEOUT)
+    CONF_HOST, CONF_NAME, CONF_PORT, CONF_TIMEOUT, STATE_OFF, STATE_ON,
+    STATE_UNKNOWN)
 import homeassistant.helpers.config_validation as cv
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/media_player/pjlink.py b/homeassistant/components/media_player/pjlink.py
index 42884cdce09..168cde4a792 100644
--- a/homeassistant/components/media_player/pjlink.py
+++ b/homeassistant/components/media_player/pjlink.py
@@ -9,11 +9,10 @@ import logging
 import voluptuous as vol
 
 from homeassistant.components.media_player import (
-    SUPPORT_TURN_OFF, SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE,
-    SUPPORT_SELECT_SOURCE, PLATFORM_SCHEMA, MediaPlayerDevice)
+    PLATFORM_SCHEMA, SUPPORT_SELECT_SOURCE, SUPPORT_TURN_OFF, SUPPORT_TURN_ON,
+    SUPPORT_VOLUME_MUTE, MediaPlayerDevice)
 from homeassistant.const import (
-    STATE_OFF, STATE_ON, CONF_HOST,
-    CONF_NAME, CONF_PASSWORD, CONF_PORT)
+    CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_PORT, STATE_OFF, STATE_ON)
 import homeassistant.helpers.config_validation as cv
 
 REQUIREMENTS = ['pypjlink2==1.2.0']
@@ -87,8 +86,8 @@ class PjLinkDevice(MediaPlayerDevice):
     def projector(self):
         """Create PJLink Projector instance."""
         from pypjlink import Projector
-        projector = Projector.from_address(self._host, self._port,
-                                           self._encoding)
+        projector = Projector.from_address(
+            self._host, self._port, self._encoding)
         projector.authenticate(self._password)
         return projector
 
diff --git a/homeassistant/components/media_player/plex.py b/homeassistant/components/media_player/plex.py
index 46dacd98aad..0b4069ed664 100644
--- a/homeassistant/components/media_player/plex.py
+++ b/homeassistant/components/media_player/plex.py
@@ -4,17 +4,16 @@ Support to interface with the Plex API.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/media_player.plex/
 """
+from datetime import timedelta
 import json
 import logging
 
-from datetime import timedelta
-
 import requests
 import voluptuous as vol
 
 from homeassistant import util
 from homeassistant.components.media_player import (
-    MEDIA_TYPE_MUSIC, MEDIA_TYPE_TVSHOW, MEDIA_TYPE_MOVIE, PLATFORM_SCHEMA,
+    MEDIA_TYPE_MOVIE, MEDIA_TYPE_MUSIC, MEDIA_TYPE_TVSHOW, PLATFORM_SCHEMA,
     SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PLAY, SUPPORT_PREVIOUS_TRACK,
     SUPPORT_STOP, SUPPORT_TURN_OFF, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET,
     MediaPlayerDevice)
@@ -22,9 +21,8 @@ from homeassistant.const import (
     DEVICE_DEFAULT_NAME, STATE_IDLE, STATE_OFF, STATE_PAUSED, STATE_PLAYING)
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.event import track_utc_time_change
-from homeassistant.util.json import load_json, save_json
 from homeassistant.util import dt as dt_util
-
+from homeassistant.util.json import load_json, save_json
 
 REQUIREMENTS = ['plexapi==3.0.6']
 
@@ -35,6 +33,7 @@ MIN_TIME_BETWEEN_SCANS = timedelta(seconds=10)
 MIN_TIME_BETWEEN_FORCED_SCANS = timedelta(seconds=1)
 
 PLEX_CONFIG_FILE = 'plex.conf'
+PLEX_DATA = 'plex'
 
 CONF_INCLUDE_NON_CLIENTS = 'include_non_clients'
 CONF_USE_EPISODE_ART = 'use_episode_art'
@@ -44,20 +43,14 @@ CONF_REMOVE_UNAVAILABLE_CLIENTS = 'remove_unavailable_clients'
 CONF_CLIENT_REMOVE_INTERVAL = 'client_remove_interval'
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Optional(CONF_INCLUDE_NON_CLIENTS, default=False):
-    cv.boolean,
-    vol.Optional(CONF_USE_EPISODE_ART, default=False):
-    cv.boolean,
-    vol.Optional(CONF_USE_CUSTOM_ENTITY_IDS, default=False):
-    cv.boolean,
-    vol.Optional(CONF_REMOVE_UNAVAILABLE_CLIENTS, default=True):
-    cv.boolean,
+    vol.Optional(CONF_INCLUDE_NON_CLIENTS, default=False): cv.boolean,
+    vol.Optional(CONF_USE_EPISODE_ART, default=False): cv.boolean,
+    vol.Optional(CONF_USE_CUSTOM_ENTITY_IDS, default=False): cv.boolean,
+    vol.Optional(CONF_REMOVE_UNAVAILABLE_CLIENTS, default=True): cv.boolean,
     vol.Optional(CONF_CLIENT_REMOVE_INTERVAL, default=timedelta(seconds=600)):
         vol.All(cv.time_period, cv.positive_timedelta),
 })
 
-PLEX_DATA = "plex"
-
 
 def setup_platform(hass, config, add_entities_callback, discovery_info=None):
     """Set up the Plex platform."""
@@ -157,8 +150,8 @@ def setup_plexserver(
             _LOGGER.exception("Error listing plex devices")
             return
         except requests.exceptions.RequestException as ex:
-            _LOGGER.error("Could not connect to plex server at http://%s (%s)",
-                          host, ex)
+            _LOGGER.error(
+                "Could not connect to plex server at http://%s (%s)", host, ex)
             return
 
         new_plex_clients = []
@@ -171,9 +164,9 @@ def setup_plexserver(
             available_client_ids.append(device.machineIdentifier)
 
             if device.machineIdentifier not in plex_clients:
-                new_client = PlexClient(config, device, None,
-                                        plex_sessions, update_devices,
-                                        update_sessions)
+                new_client = PlexClient(
+                    config, device, None, plex_sessions, update_devices,
+                    update_sessions)
                 plex_clients[device.machineIdentifier] = new_client
                 new_plex_clients.append(new_client)
             else:
@@ -184,9 +177,9 @@ def setup_plexserver(
             for machine_identifier, session in plex_sessions.items():
                 if (machine_identifier not in plex_clients
                         and machine_identifier is not None):
-                    new_client = PlexClient(config, None, session,
-                                            plex_sessions, update_devices,
-                                            update_sessions)
+                    new_client = PlexClient(
+                        config, None, session, plex_sessions, update_devices,
+                        update_sessions)
                     plex_clients[machine_identifier] = new_client
                     new_plex_clients.append(new_client)
                 else:
@@ -225,8 +218,8 @@ def setup_plexserver(
             _LOGGER.exception("Error listing plex sessions")
             return
         except requests.exceptions.RequestException as ex:
-            _LOGGER.error("Could not connect to plex server at http://%s (%s)",
-                          host, ex)
+            _LOGGER.error(
+                "Could not connect to plex server at http://%s (%s)", host, ex)
             return
 
         plex_sessions.clear()
diff --git a/homeassistant/components/media_player/roku.py b/homeassistant/components/media_player/roku.py
index fca7b29d2ec..fccca235193 100644
--- a/homeassistant/components/media_player/roku.py
+++ b/homeassistant/components/media_player/roku.py
@@ -9,11 +9,11 @@ import logging
 import voluptuous as vol
 
 from homeassistant.components.media_player import (
-    MEDIA_TYPE_MOVIE, SUPPORT_NEXT_TRACK, SUPPORT_PLAY_MEDIA,
-    SUPPORT_PREVIOUS_TRACK, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET,
-    SUPPORT_SELECT_SOURCE, SUPPORT_PLAY, MediaPlayerDevice, PLATFORM_SCHEMA)
+    MEDIA_TYPE_MOVIE, PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK, SUPPORT_PLAY,
+    SUPPORT_PLAY_MEDIA, SUPPORT_PREVIOUS_TRACK, SUPPORT_SELECT_SOURCE,
+    SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET, MediaPlayerDevice)
 from homeassistant.const import (
-    CONF_HOST, STATE_IDLE, STATE_PLAYING, STATE_UNKNOWN, STATE_HOME)
+    CONF_HOST, STATE_HOME, STATE_IDLE, STATE_PLAYING, STATE_UNKNOWN)
 import homeassistant.helpers.config_validation as cv
 
 REQUIREMENTS = ['python-roku==3.1.5']
@@ -40,13 +40,13 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     hosts = []
 
     if discovery_info:
-        host = discovery_info.get("host")
+        host = discovery_info.get('host')
 
         if host in KNOWN_HOSTS:
             return
 
         _LOGGER.debug("Discovered Roku: %s", host)
-        hosts.append(discovery_info.get("host"))
+        hosts.append(discovery_info.get('host'))
 
     elif CONF_HOST in config:
         hosts.append(config.get(CONF_HOST))
diff --git a/homeassistant/components/media_player/russound_rio.py b/homeassistant/components/media_player/russound_rio.py
index cf946945cf2..74f6bfb35ab 100644
--- a/homeassistant/components/media_player/russound_rio.py
+++ b/homeassistant/components/media_player/russound_rio.py
@@ -4,20 +4,19 @@ Support for Russound multizone controllers using RIO Protocol.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/media_player.russound_rio/
 """
-
 import asyncio
 import logging
 
 import voluptuous as vol
 
-from homeassistant.core import callback
 from homeassistant.components.media_player import (
-    SUPPORT_TURN_ON, SUPPORT_TURN_OFF, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET,
-    SUPPORT_SELECT_SOURCE, MediaPlayerDevice, PLATFORM_SCHEMA,
-    MEDIA_TYPE_MUSIC)
+    MEDIA_TYPE_MUSIC, PLATFORM_SCHEMA, SUPPORT_SELECT_SOURCE, SUPPORT_TURN_OFF,
+    SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET,
+    MediaPlayerDevice)
 from homeassistant.const import (
-    CONF_HOST, CONF_PORT, STATE_OFF, STATE_ON,
-    CONF_NAME, EVENT_HOMEASSISTANT_STOP)
+    CONF_HOST, CONF_NAME, CONF_PORT, EVENT_HOMEASSISTANT_STOP, STATE_OFF,
+    STATE_ON)
+from homeassistant.core import callback
 import homeassistant.helpers.config_validation as cv
 
 REQUIREMENTS = ['russound_rio==0.1.4']
@@ -31,26 +30,24 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Required(CONF_HOST): cv.string,
     vol.Required(CONF_NAME): cv.string,
     vol.Optional(CONF_PORT, default=9621): cv.port,
-    })
+})
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_entities,
-                         discovery_info=None):
+def async_setup_platform(
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the Russound RIO platform."""
+    from russound_rio import Russound
+
     host = config.get(CONF_HOST)
     port = config.get(CONF_PORT)
 
-    from russound_rio import Russound
-
     russ = Russound(hass.loop, host, port)
 
     yield from russ.connect()
 
-    # Discover sources
+    # Discover sources and zones
     sources = yield from russ.enumerate_sources()
-
-    # Discover zones
     valid_zones = yield from russ.enumerate_zones()
 
     devices = []
@@ -81,9 +78,8 @@ class RussoundZoneDevice(MediaPlayerDevice):
         self._sources = sources
 
     def _zone_var(self, name, default=None):
-        return self._russ.get_cached_zone_variable(self._zone_id,
-                                                   name,
-                                                   default)
+        return self._russ.get_cached_zone_variable(
+            self._zone_id, name, default)
 
     def _source_var(self, name, default=None):
         current = int(self._zone_var('currentsource', 0))
@@ -188,21 +184,17 @@ class RussoundZoneDevice(MediaPlayerDevice):
 
     def async_turn_off(self):
         """Turn off the zone."""
-        return self._russ.send_zone_event(self._zone_id,
-                                          "ZoneOff")
+        return self._russ.send_zone_event(self._zone_id, 'ZoneOff')
 
     def async_turn_on(self):
         """Turn on the zone."""
-        return self._russ.send_zone_event(self._zone_id,
-                                          "ZoneOn")
+        return self._russ.send_zone_event(self._zone_id, 'ZoneOn')
 
     def async_set_volume_level(self, volume):
         """Set the volume level."""
         rvol = int(volume * 50.0)
-        return self._russ.send_zone_event(self._zone_id,
-                                          "KeyPress",
-                                          "Volume",
-                                          rvol)
+        return self._russ.send_zone_event(
+            self._zone_id, 'KeyPress', 'Volume', rvol)
 
     def async_select_source(self, source):
         """Select the source input for this zone."""
@@ -210,4 +202,4 @@ class RussoundZoneDevice(MediaPlayerDevice):
             if name.lower() != source.lower():
                 continue
             return self._russ.send_zone_event(
-                self._zone_id, "SelectSource", source_id)
+                self._zone_id, 'SelectSource', source_id)
diff --git a/homeassistant/components/media_player/russound_rnet.py b/homeassistant/components/media_player/russound_rnet.py
index 8aef15e02af..7f4d04eb634 100644
--- a/homeassistant/components/media_player/russound_rnet.py
+++ b/homeassistant/components/media_player/russound_rnet.py
@@ -9,10 +9,10 @@ import logging
 import voluptuous as vol
 
 from homeassistant.components.media_player import (
-    SUPPORT_TURN_ON, SUPPORT_TURN_OFF, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET,
-    SUPPORT_SELECT_SOURCE, MediaPlayerDevice, PLATFORM_SCHEMA)
+    PLATFORM_SCHEMA, SUPPORT_SELECT_SOURCE, SUPPORT_TURN_OFF, SUPPORT_TURN_ON,
+    SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET, MediaPlayerDevice)
 from homeassistant.const import (
-    CONF_HOST, CONF_PORT, STATE_OFF, STATE_ON, CONF_NAME)
+    CONF_HOST, CONF_NAME, CONF_PORT, STATE_OFF, STATE_ON)
 import homeassistant.helpers.config_validation as cv
 
 REQUIREMENTS = ['russound==0.1.9']
diff --git a/homeassistant/components/media_player/samsungtv.py b/homeassistant/components/media_player/samsungtv.py
index 72c3ab2c621..cc966c0d263 100644
--- a/homeassistant/components/media_player/samsungtv.py
+++ b/homeassistant/components/media_player/samsungtv.py
@@ -5,23 +5,22 @@ For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/media_player.samsungtv/
 """
 import asyncio
+from datetime import timedelta
 import logging
 import socket
-from datetime import timedelta
-
+import subprocess
 import sys
 
-import subprocess
 import voluptuous as vol
 
 from homeassistant.components.media_player import (
-    SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PREVIOUS_TRACK,
-    SUPPORT_TURN_OFF, SUPPORT_TURN_ON, SUPPORT_PLAY,
-    SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_STEP, SUPPORT_PLAY_MEDIA,
-    MediaPlayerDevice, PLATFORM_SCHEMA, MEDIA_TYPE_CHANNEL)
+    MEDIA_TYPE_CHANNEL, PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE,
+    SUPPORT_PLAY, SUPPORT_PLAY_MEDIA, SUPPORT_PREVIOUS_TRACK, SUPPORT_TURN_OFF,
+    SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_STEP,
+    MediaPlayerDevice)
 from homeassistant.const import (
-    CONF_HOST, CONF_NAME, STATE_OFF, STATE_ON, STATE_UNKNOWN, CONF_PORT,
-    CONF_MAC)
+    CONF_HOST, CONF_MAC, CONF_NAME, CONF_PORT, CONF_TIMEOUT, STATE_OFF,
+    STATE_ON, STATE_UNKNOWN)
 import homeassistant.helpers.config_validation as cv
 from homeassistant.util import dt as dt_util
 
@@ -29,13 +28,11 @@ REQUIREMENTS = ['samsungctl[websocket]==0.7.1', 'wakeonlan==1.0.0']
 
 _LOGGER = logging.getLogger(__name__)
 
-CONF_TIMEOUT = 'timeout'
-
 DEFAULT_NAME = 'Samsung TV Remote'
 DEFAULT_PORT = 55000
 DEFAULT_TIMEOUT = 0
-KEY_PRESS_TIMEOUT = 1.2
 
+KEY_PRESS_TIMEOUT = 1.2
 KNOWN_DEVICES_KEY = 'samsungtv_known_devices'
 
 SUPPORT_SAMSUNGTV = SUPPORT_PAUSE | SUPPORT_VOLUME_STEP | \
diff --git a/homeassistant/components/media_player/sisyphus.py b/homeassistant/components/media_player/sisyphus.py
index 36f28769b12..ef6b02514f0 100644
--- a/homeassistant/components/media_player/sisyphus.py
+++ b/homeassistant/components/media_player/sisyphus.py
@@ -7,25 +7,18 @@ https://home-assistant.io/components/media_player.sisyphus/
 import logging
 
 from homeassistant.components.media_player import (
-    SUPPORT_NEXT_TRACK,
-    SUPPORT_PAUSE,
-    SUPPORT_PLAY,
-    SUPPORT_PREVIOUS_TRACK,
-    SUPPORT_SHUFFLE_SET,
-    SUPPORT_TURN_OFF,
-    SUPPORT_TURN_ON,
-    SUPPORT_VOLUME_MUTE,
-    SUPPORT_VOLUME_SET,
-    MediaPlayerDevice)
+    SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PLAY, SUPPORT_PREVIOUS_TRACK,
+    SUPPORT_SHUFFLE_SET, SUPPORT_TURN_OFF, SUPPORT_TURN_ON,
+    SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET, MediaPlayerDevice)
 from homeassistant.components.sisyphus import DATA_SISYPHUS
-from homeassistant.const import CONF_HOST, CONF_NAME, STATE_PLAYING, \
-    STATE_PAUSED, STATE_IDLE, STATE_OFF
+from homeassistant.const import (
+    CONF_HOST, CONF_NAME, STATE_IDLE, STATE_OFF, STATE_PAUSED, STATE_PLAYING)
 
 _LOGGER = logging.getLogger(__name__)
 
 DEPENDENCIES = ['sisyphus']
 
-MEDIA_TYPE_TRACK = "sisyphus_track"
+MEDIA_TYPE_TRACK = 'sisyphus_track'
 
 SUPPORTED_FEATURES = SUPPORT_VOLUME_MUTE \
     | SUPPORT_VOLUME_SET \
@@ -44,21 +37,14 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     name = discovery_info[CONF_NAME]
     host = discovery_info[CONF_HOST]
     add_entities(
-        [SisyphusPlayer(name, host, hass.data[DATA_SISYPHUS][name])],
-        update_before_add=True)
+        [SisyphusPlayer(name, host, hass.data[DATA_SISYPHUS][name])], True)
 
 
 class SisyphusPlayer(MediaPlayerDevice):
-    """Represents a single Sisyphus table as a media player device."""
+    """Representation of a Sisyphus table as a media player device."""
 
     def __init__(self, name, host, table):
-        """
-        Constructor.
-
-        :param name: name of the table
-        :param host: hostname or ip address
-        :param table: sisyphus-control Table object
-        """
+        """Initialize the Sisyphus media device."""
         self._name = name
         self._host = host
         self._table = table
@@ -99,11 +85,7 @@ class SisyphusPlayer(MediaPlayerDevice):
         return self._table.is_shuffle
 
     async def async_set_shuffle(self, shuffle):
-        """
-        Change the shuffle mode of the current playlist.
-
-        :param shuffle: True to shuffle, False not to
-        """
+        """Change the shuffle mode of the current playlist."""
         await self._table.set_shuffle(shuffle)
 
     @property
diff --git a/homeassistant/components/media_player/songpal.py b/homeassistant/components/media_player/songpal.py
index e45819428e8..83b10997c31 100644
--- a/homeassistant/components/media_player/songpal.py
+++ b/homeassistant/components/media_player/songpal.py
@@ -9,32 +9,30 @@ import logging
 import voluptuous as vol
 
 from homeassistant.components.media_player import (
-    PLATFORM_SCHEMA, SUPPORT_SELECT_SOURCE, SUPPORT_TURN_OFF,
-    SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_STEP, SUPPORT_VOLUME_SET,
-    SUPPORT_TURN_ON, MediaPlayerDevice, DOMAIN)
-from homeassistant.const import (
-    CONF_NAME, STATE_ON, STATE_OFF, ATTR_ENTITY_ID)
+    DOMAIN, PLATFORM_SCHEMA, SUPPORT_SELECT_SOURCE, SUPPORT_TURN_OFF,
+    SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET,
+    SUPPORT_VOLUME_STEP, MediaPlayerDevice)
+from homeassistant.const import ATTR_ENTITY_ID, CONF_NAME, STATE_OFF, STATE_ON
 from homeassistant.exceptions import PlatformNotReady
 import homeassistant.helpers.config_validation as cv
 
 REQUIREMENTS = ['python-songpal==0.0.8']
 
+_LOGGER = logging.getLogger(__name__)
+
+CONF_ENDPOINT = 'endpoint'
+
+PARAM_NAME = 'name'
+PARAM_VALUE = 'value'
+
+PLATFORM = 'songpal'
+
+SET_SOUND_SETTING = 'songpal_set_sound_setting'
+
 SUPPORT_SONGPAL = SUPPORT_VOLUME_SET | SUPPORT_VOLUME_STEP | \
                   SUPPORT_VOLUME_MUTE | SUPPORT_SELECT_SOURCE | \
                   SUPPORT_TURN_ON | SUPPORT_TURN_OFF
 
-_LOGGER = logging.getLogger(__name__)
-
-
-PLATFORM = "songpal"
-
-SET_SOUND_SETTING = "songpal_set_sound_setting"
-
-PARAM_NAME = "name"
-PARAM_VALUE = "value"
-
-CONF_ENDPOINT = "endpoint"
-
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_NAME): cv.string,
     vol.Required(CONF_ENDPOINT): cv.string,
@@ -43,13 +41,15 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 SET_SOUND_SCHEMA = vol.Schema({
     vol.Optional(ATTR_ENTITY_ID): cv.entity_id,
     vol.Required(PARAM_NAME): cv.string,
-    vol.Required(PARAM_VALUE): cv.string})
+    vol.Required(PARAM_VALUE): cv.string,
+})
 
 
-async def async_setup_platform(hass, config,
-                               async_add_entities, discovery_info=None):
+async def async_setup_platform(
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the Songpal platform."""
     from songpal import SongpalException
+
     if PLATFORM not in hass.data:
         hass.data[PLATFORM] = {}
 
@@ -85,8 +85,8 @@ async def async_setup_platform(hass, config,
                 _LOGGER.debug("Calling %s (entity: %s) with params %s",
                               service, entity_id, params)
 
-                await device.async_set_sound_setting(params[PARAM_NAME],
-                                                     params[PARAM_VALUE])
+                await device.async_set_sound_setting(
+                    params[PARAM_NAME], params[PARAM_VALUE])
 
     hass.services.async_register(
         DOMAIN, SET_SOUND_SETTING, async_service_handler,
@@ -151,8 +151,8 @@ class SongpalDevice(MediaPlayerDevice):
                 return
 
             if len(volumes) > 1:
-                _LOGGER.debug("Got %s volume controls, using the first one",
-                              volumes)
+                _LOGGER.debug(
+                    "Got %s volume controls, using the first one", volumes)
 
             volume = volumes[0]
             _LOGGER.debug("Current volume: %s", volume)
diff --git a/homeassistant/components/media_player/sonos.py b/homeassistant/components/media_player/sonos.py
index 456252aded4..72ac0a046a3 100644
--- a/homeassistant/components/media_player/sonos.py
+++ b/homeassistant/components/media_player/sonos.py
@@ -9,8 +9,8 @@ import datetime
 import functools as ft
 import logging
 import socket
-import urllib
 import threading
+import urllib
 
 import voluptuous as vol
 
diff --git a/homeassistant/components/media_player/soundtouch.py b/homeassistant/components/media_player/soundtouch.py
index 4e26af9dcc2..a16658501cb 100644
--- a/homeassistant/components/media_player/soundtouch.py
+++ b/homeassistant/components/media_player/soundtouch.py
@@ -5,19 +5,19 @@ For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/media_player.soundtouch/
 """
 import logging
-
 import re
+
 import voluptuous as vol
 
-import homeassistant.helpers.config_validation as cv
 from homeassistant.components.media_player import (
-    SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PREVIOUS_TRACK,
-    SUPPORT_TURN_OFF, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_STEP,
-    SUPPORT_VOLUME_SET, SUPPORT_TURN_ON, SUPPORT_PLAY, MediaPlayerDevice,
-    DOMAIN, PLATFORM_SCHEMA)
-from homeassistant.const import (CONF_HOST, CONF_NAME, STATE_OFF, CONF_PORT,
-                                 STATE_PAUSED, STATE_PLAYING,
-                                 STATE_UNAVAILABLE)
+    DOMAIN, PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PLAY,
+    SUPPORT_PREVIOUS_TRACK, SUPPORT_TURN_OFF, SUPPORT_TURN_ON,
+    SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET, SUPPORT_VOLUME_STEP,
+    MediaPlayerDevice)
+from homeassistant.const import (
+    CONF_HOST, CONF_NAME, CONF_PORT, STATE_OFF, STATE_PAUSED, STATE_PLAYING,
+    STATE_UNAVAILABLE)
+import homeassistant.helpers.config_validation as cv
 
 REQUIREMENTS = ['libsoundtouch==0.7.2']
 
@@ -43,17 +43,17 @@ SOUNDTOUCH_PLAY_EVERYWHERE = vol.Schema({
 
 SOUNDTOUCH_CREATE_ZONE_SCHEMA = vol.Schema({
     vol.Required('master'): cv.entity_id,
-    vol.Required('slaves'): cv.entity_ids
+    vol.Required('slaves'): cv.entity_ids,
 })
 
 SOUNDTOUCH_ADD_ZONE_SCHEMA = vol.Schema({
     vol.Required('master'): cv.entity_id,
-    vol.Required('slaves'): cv.entity_ids
+    vol.Required('slaves'): cv.entity_ids,
 })
 
 SOUNDTOUCH_REMOVE_ZONE_SCHEMA = vol.Schema({
     vol.Required('master'): cv.entity_id,
-    vol.Required('slaves'): cv.entity_ids
+    vol.Required('slaves'): cv.entity_ids,
 })
 
 DEFAULT_NAME = 'Bose Soundtouch'
@@ -67,7 +67,7 @@ SUPPORT_SOUNDTOUCH = SUPPORT_PAUSE | SUPPORT_VOLUME_STEP | \
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Required(CONF_HOST): cv.string,
     vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-    vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port
+    vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
 })
 
 
diff --git a/homeassistant/components/media_player/spotify.py b/homeassistant/components/media_player/spotify.py
index 9fc200c67fd..8a4ffeeb157 100644
--- a/homeassistant/components/media_player/spotify.py
+++ b/homeassistant/components/media_player/spotify.py
@@ -4,48 +4,54 @@ Support for interacting with Spotify Connect.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/media_player.spotify/
 """
-import logging
 from datetime import timedelta
+import logging
 
 import voluptuous as vol
 
-from homeassistant.core import callback
 from homeassistant.components.http import HomeAssistantView
 from homeassistant.components.media_player import (
-    MEDIA_TYPE_MUSIC, MEDIA_TYPE_PLAYLIST, SUPPORT_VOLUME_SET,
-    SUPPORT_PLAY, SUPPORT_PAUSE, SUPPORT_PLAY_MEDIA, SUPPORT_NEXT_TRACK,
-    SUPPORT_PREVIOUS_TRACK, SUPPORT_SELECT_SOURCE, SUPPORT_SHUFFLE_SET,
-    PLATFORM_SCHEMA, MediaPlayerDevice)
+    MEDIA_TYPE_MUSIC, MEDIA_TYPE_PLAYLIST, PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK,
+    SUPPORT_PAUSE, SUPPORT_PLAY, SUPPORT_PLAY_MEDIA, SUPPORT_PREVIOUS_TRACK,
+    SUPPORT_SELECT_SOURCE, SUPPORT_SHUFFLE_SET, SUPPORT_VOLUME_SET,
+    MediaPlayerDevice)
 from homeassistant.const import (
-    CONF_NAME, STATE_PLAYING, STATE_PAUSED, STATE_IDLE, STATE_UNKNOWN)
+    CONF_NAME, STATE_IDLE, STATE_PAUSED, STATE_PLAYING, STATE_UNKNOWN)
+from homeassistant.core import callback
 import homeassistant.helpers.config_validation as cv
 
 REQUIREMENTS = ['spotipy-homeassistant==2.4.4.dev1']
 
-DEPENDENCIES = ['http']
-
 _LOGGER = logging.getLogger(__name__)
 
+AUTH_CALLBACK_NAME = 'api:spotify'
+AUTH_CALLBACK_PATH = '/api/spotify'
+
+CONF_ALIASES = 'aliases'
+CONF_CACHE_PATH = 'cache_path'
+CONF_CLIENT_ID = 'client_id'
+CONF_CLIENT_SECRET = 'client_secret'
+
+CONFIGURATOR_DESCRIPTION = 'To link your Spotify account, ' \
+                           'click the link, login, and authorize:'
+CONFIGURATOR_LINK_NAME = 'Link Spotify account'
+CONFIGURATOR_SUBMIT_CAPTION = 'I authorized successfully'
+
+DEFAULT_CACHE_PATH = '.spotify-token-cache'
+DEFAULT_NAME = 'Spotify'
+DEPENDENCIES = ['http']
+DOMAIN = 'spotify'
+
+ICON = 'mdi:spotify'
+
+SCAN_INTERVAL = timedelta(seconds=30)
+
+SCOPE = 'user-read-playback-state user-modify-playback-state user-read-private'
+
 SUPPORT_SPOTIFY = SUPPORT_VOLUME_SET | SUPPORT_PAUSE | SUPPORT_PLAY |\
     SUPPORT_NEXT_TRACK | SUPPORT_PREVIOUS_TRACK | SUPPORT_SELECT_SOURCE |\
     SUPPORT_PLAY_MEDIA | SUPPORT_SHUFFLE_SET
 
-SCOPE = 'user-read-playback-state user-modify-playback-state user-read-private'
-DEFAULT_CACHE_PATH = '.spotify-token-cache'
-AUTH_CALLBACK_PATH = '/api/spotify'
-AUTH_CALLBACK_NAME = 'api:spotify'
-ICON = 'mdi:spotify'
-DEFAULT_NAME = 'Spotify'
-DOMAIN = 'spotify'
-CONF_ALIASES = 'aliases'
-CONF_CLIENT_ID = 'client_id'
-CONF_CLIENT_SECRET = 'client_secret'
-CONF_CACHE_PATH = 'cache_path'
-CONFIGURATOR_LINK_NAME = 'Link Spotify account'
-CONFIGURATOR_SUBMIT_CAPTION = 'I authorized successfully'
-CONFIGURATOR_DESCRIPTION = 'To link your Spotify account, ' \
-                           'click the link, login, and authorize:'
-
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Required(CONF_CLIENT_ID): cv.string,
     vol.Required(CONF_CLIENT_SECRET): cv.string,
@@ -54,8 +60,6 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_ALIASES, default={}): {cv.string: cv.string}
 })
 
-SCAN_INTERVAL = timedelta(seconds=30)
-
 
 def request_configuration(hass, config, add_entities, oauth):
     """Request Spotify authorization."""
@@ -71,6 +75,7 @@ def request_configuration(hass, config, add_entities, oauth):
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Spotify platform."""
     import spotipy.oauth2
+
     callback_url = '{}{}'.format(hass.config.api.base_url, AUTH_CALLBACK_PATH)
     cache = config.get(CONF_CACHE_PATH, hass.config.path(DEFAULT_CACHE_PATH))
     oauth = spotipy.oauth2.SpotifyOAuth(
@@ -88,8 +93,8 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
         configurator = hass.components.configurator
         configurator.request_done(hass.data.get(DOMAIN))
         del hass.data[DOMAIN]
-    player = SpotifyMediaPlayer(oauth, config.get(CONF_NAME, DEFAULT_NAME),
-                                config[CONF_ALIASES])
+    player = SpotifyMediaPlayer(
+        oauth, config.get(CONF_NAME, DEFAULT_NAME), config[CONF_ALIASES])
     add_entities([player], True)
 
 
diff --git a/homeassistant/components/media_player/squeezebox.py b/homeassistant/components/media_player/squeezebox.py
index a2732b5f849..2d6a849aecb 100644
--- a/homeassistant/components/media_player/squeezebox.py
+++ b/homeassistant/components/media_player/squeezebox.py
@@ -4,26 +4,26 @@ Support for interfacing to the Logitech SqueezeBox API.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/media_player.squeezebox/
 """
-import logging
 import asyncio
-import urllib.parse
 import json
+import logging
+import urllib.parse
+
 import aiohttp
 import async_timeout
-
 import voluptuous as vol
 
 from homeassistant.components.media_player import (
-    ATTR_MEDIA_ENQUEUE, SUPPORT_PLAY_MEDIA,
-    MEDIA_TYPE_MUSIC, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, PLATFORM_SCHEMA,
-    SUPPORT_PREVIOUS_TRACK, SUPPORT_SEEK, SUPPORT_TURN_OFF, SUPPORT_TURN_ON,
-    SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET, SUPPORT_PLAY, MediaPlayerDevice,
-    MEDIA_PLAYER_SCHEMA, DOMAIN, SUPPORT_SHUFFLE_SET, SUPPORT_CLEAR_PLAYLIST)
+    ATTR_MEDIA_ENQUEUE, DOMAIN, MEDIA_PLAYER_SCHEMA, MEDIA_TYPE_MUSIC,
+    PLATFORM_SCHEMA, SUPPORT_CLEAR_PLAYLIST, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE,
+    SUPPORT_PLAY, SUPPORT_PLAY_MEDIA, SUPPORT_PREVIOUS_TRACK, SUPPORT_SEEK,
+    SUPPORT_SHUFFLE_SET, SUPPORT_TURN_OFF, SUPPORT_TURN_ON,
+    SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET, MediaPlayerDevice)
 from homeassistant.const import (
-    CONF_HOST, CONF_PASSWORD, CONF_USERNAME, STATE_IDLE, STATE_OFF,
-    STATE_PAUSED, STATE_PLAYING, STATE_UNKNOWN, CONF_PORT, ATTR_COMMAND)
-import homeassistant.helpers.config_validation as cv
+    ATTR_COMMAND, CONF_HOST, CONF_PASSWORD, CONF_PORT, CONF_USERNAME,
+    STATE_IDLE, STATE_OFF, STATE_PAUSED, STATE_PLAYING, STATE_UNKNOWN)
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
+import homeassistant.helpers.config_validation as cv
 from homeassistant.util.dt import utcnow
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/media_player/ue_smart_radio.py b/homeassistant/components/media_player/ue_smart_radio.py
index ae7617ead24..066972aaa25 100644
--- a/homeassistant/components/media_player/ue_smart_radio.py
+++ b/homeassistant/components/media_player/ue_smart_radio.py
@@ -6,31 +6,34 @@ https://home-assistant.io/components/media_player.ue_smart_radio/
 """
 
 import logging
-import voluptuous as vol
+
 import requests
+import voluptuous as vol
 
 from homeassistant.components.media_player import (
-    MediaPlayerDevice, MEDIA_TYPE_MUSIC, PLATFORM_SCHEMA,
-    SUPPORT_PLAY, SUPPORT_PAUSE, SUPPORT_STOP, SUPPORT_PREVIOUS_TRACK,
-    SUPPORT_NEXT_TRACK, SUPPORT_TURN_ON, SUPPORT_TURN_OFF, SUPPORT_VOLUME_SET,
-    SUPPORT_VOLUME_MUTE)
+    MEDIA_TYPE_MUSIC, PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE,
+    SUPPORT_PLAY, SUPPORT_PREVIOUS_TRACK, SUPPORT_STOP, SUPPORT_TURN_OFF,
+    SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET,
+    MediaPlayerDevice)
 from homeassistant.const import (
-    CONF_USERNAME, CONF_PASSWORD, STATE_OFF, STATE_IDLE, STATE_PLAYING,
-    STATE_PAUSED)
+    CONF_PASSWORD, CONF_USERNAME, STATE_IDLE, STATE_OFF, STATE_PAUSED,
+    STATE_PLAYING)
 import homeassistant.helpers.config_validation as cv
 
 _LOGGER = logging.getLogger(__name__)
 
-ICON = "mdi:radio"
-URL = "http://decibel.logitechmusic.com/jsonrpc.js"
+ICON = 'mdi:radio'
+URL = 'http://decibel.logitechmusic.com/jsonrpc.js'
 
 SUPPORT_UE_SMART_RADIO = SUPPORT_PLAY | SUPPORT_PAUSE | SUPPORT_STOP | \
     SUPPORT_PREVIOUS_TRACK | SUPPORT_NEXT_TRACK | SUPPORT_TURN_ON | \
     SUPPORT_TURN_OFF | SUPPORT_VOLUME_SET | SUPPORT_VOLUME_MUTE
 
-PLAYBACK_DICT = {"play": STATE_PLAYING,
-                 "pause": STATE_PAUSED,
-                 "stop": STATE_IDLE}
+PLAYBACK_DICT = {
+    'play': STATE_PLAYING,
+    'pause': STATE_PAUSED,
+    'stop': STATE_IDLE,
+}
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Required(CONF_USERNAME): cv.string,
@@ -41,10 +44,9 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 def send_request(payload, session):
     """Send request to radio."""
     try:
-        request = requests.post(URL,
-                                cookies={"sdi_squeezenetwork_session":
-                                         session},
-                                json=payload, timeout=5)
+        request = requests.post(
+            URL, cookies={"sdi_squeezenetwork_session": session},
+            json=payload, timeout=5)
     except requests.exceptions.Timeout:
         _LOGGER.error("Timed out when sending request")
     except requests.exceptions.ConnectionError:
@@ -58,9 +60,9 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     email = config.get(CONF_USERNAME)
     password = config.get(CONF_PASSWORD)
 
-    session_request = requests.post("https://www.uesmartradio.com/user/login",
-                                    data={"email": email, "password":
-                                          password})
+    session_request = requests.post(
+        "https://www.uesmartradio.com/user/login",
+        data={"email": email, "password": password}, timeout=5)
     session = session_request.cookies["sdi_squeezenetwork_session"]
 
     player_request = send_request({"params": ["", ["serverstatus"]]}, session)
diff --git a/homeassistant/components/media_player/universal.py b/homeassistant/components/media_player/universal.py
index 1572e2df89b..47eaf599929 100644
--- a/homeassistant/components/media_player/universal.py
+++ b/homeassistant/components/media_player/universal.py
@@ -4,12 +4,11 @@ Combination of multiple media players into one for a universal controller.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/media_player.universal/
 """
-import logging
 from copy import copy
+import logging
 
 import voluptuous as vol
 
-from homeassistant.core import callback
 from homeassistant.components.media_player import (
     ATTR_APP_ID, ATTR_APP_NAME, ATTR_INPUT_SOURCE, ATTR_INPUT_SOURCE_LIST,
     ATTR_MEDIA_ALBUM_ARTIST, ATTR_MEDIA_ALBUM_NAME, ATTR_MEDIA_ARTIST,
@@ -18,36 +17,35 @@ from homeassistant.components.media_player import (
     ATTR_MEDIA_POSITION, ATTR_MEDIA_POSITION_UPDATED_AT, ATTR_MEDIA_SEASON,
     ATTR_MEDIA_SEEK_POSITION, ATTR_MEDIA_SERIES_TITLE, ATTR_MEDIA_SHUFFLE,
     ATTR_MEDIA_TITLE, ATTR_MEDIA_TRACK, ATTR_MEDIA_VOLUME_LEVEL,
-    ATTR_MEDIA_VOLUME_MUTED, DOMAIN, MediaPlayerDevice, PLATFORM_SCHEMA,
-    SERVICE_CLEAR_PLAYLIST, SERVICE_PLAY_MEDIA, SERVICE_SELECT_SOURCE,
-    SUPPORT_CLEAR_PLAYLIST, SUPPORT_SELECT_SOURCE, SUPPORT_SHUFFLE_SET,
-    SUPPORT_TURN_OFF, SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET,
-    SUPPORT_VOLUME_STEP)
+    ATTR_MEDIA_VOLUME_MUTED, DOMAIN, PLATFORM_SCHEMA, SERVICE_CLEAR_PLAYLIST,
+    SERVICE_PLAY_MEDIA, SERVICE_SELECT_SOURCE, SUPPORT_CLEAR_PLAYLIST,
+    SUPPORT_SELECT_SOURCE, SUPPORT_SHUFFLE_SET, SUPPORT_TURN_OFF,
+    SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET,
+    SUPPORT_VOLUME_STEP, MediaPlayerDevice)
 from homeassistant.const import (
     ATTR_ENTITY_ID, ATTR_ENTITY_PICTURE, ATTR_SUPPORTED_FEATURES, CONF_NAME,
-    CONF_STATE_TEMPLATE, SERVICE_MEDIA_NEXT_TRACK, SERVICE_MEDIA_PAUSE,
-    SERVICE_MEDIA_PLAY, SERVICE_MEDIA_PLAY_PAUSE, SERVICE_MEDIA_PREVIOUS_TRACK,
-    SERVICE_MEDIA_SEEK, SERVICE_TURN_OFF, SERVICE_TURN_ON, SERVICE_VOLUME_DOWN,
-    SERVICE_VOLUME_MUTE, SERVICE_VOLUME_SET, SERVICE_VOLUME_UP,
-    SERVICE_SHUFFLE_SET, STATE_IDLE, STATE_OFF, STATE_ON, STATE_UNAVAILABLE,
-    SERVICE_MEDIA_STOP)
+    CONF_STATE, CONF_STATE_TEMPLATE, SERVICE_MEDIA_NEXT_TRACK,
+    SERVICE_MEDIA_PAUSE, SERVICE_MEDIA_PLAY, SERVICE_MEDIA_PLAY_PAUSE,
+    SERVICE_MEDIA_PREVIOUS_TRACK, SERVICE_MEDIA_SEEK, SERVICE_MEDIA_STOP,
+    SERVICE_SHUFFLE_SET, SERVICE_TURN_OFF, SERVICE_TURN_ON,
+    SERVICE_VOLUME_DOWN, SERVICE_VOLUME_MUTE, SERVICE_VOLUME_SET,
+    SERVICE_VOLUME_UP, STATE_IDLE, STATE_OFF, STATE_ON, STATE_UNAVAILABLE)
+from homeassistant.core import callback
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.service import async_call_from_config
 
+_LOGGER = logging.getLogger(__name__)
+
 ATTR_ACTIVE_CHILD = 'active_child'
+ATTR_DATA = 'data'
 
 CONF_ATTRS = 'attributes'
 CONF_CHILDREN = 'children'
 CONF_COMMANDS = 'commands'
-CONF_PLATFORM = 'platform'
 CONF_SERVICE = 'service'
 CONF_SERVICE_DATA = 'service_data'
-ATTR_DATA = 'data'
-CONF_STATE = 'state'
 
 OFF_STATES = [STATE_IDLE, STATE_OFF, STATE_UNAVAILABLE]
-REQUIREMENTS = []
-_LOGGER = logging.getLogger(__name__)
 
 ATTRS_SCHEMA = vol.Schema({cv.slug: cv.string})
 CMD_SCHEMA = vol.Schema({cv.slug: cv.SERVICE_SCHEMA})
diff --git a/homeassistant/components/media_player/vizio.py b/homeassistant/components/media_player/vizio.py
index 673be3074de..9564a8d3df0 100644
--- a/homeassistant/components/media_player/vizio.py
+++ b/homeassistant/components/media_player/vizio.py
@@ -9,6 +9,7 @@ import logging
 
 import voluptuous as vol
 
+from homeassistant import util
 from homeassistant.components.media_player import (
     PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK, SUPPORT_PREVIOUS_TRACK,
     SUPPORT_SELECT_SOURCE, SUPPORT_TURN_OFF, SUPPORT_TURN_ON,
@@ -18,7 +19,6 @@ from homeassistant.const import (
     CONF_ACCESS_TOKEN, CONF_HOST, CONF_NAME, STATE_OFF, STATE_ON,
     STATE_UNKNOWN)
 from homeassistant.helpers import config_validation as cv
-from homeassistant import util
 
 REQUIREMENTS = ['pyvizio==0.0.3']
 
diff --git a/homeassistant/components/media_player/vlc.py b/homeassistant/components/media_player/vlc.py
index 075a533e372..5cc4196d4e1 100644
--- a/homeassistant/components/media_player/vlc.py
+++ b/homeassistant/components/media_player/vlc.py
@@ -9,12 +9,11 @@ import logging
 import voluptuous as vol
 
 from homeassistant.components.media_player import (
-    SUPPORT_PAUSE, SUPPORT_PLAY_MEDIA, SUPPORT_STOP, SUPPORT_VOLUME_MUTE,
-    SUPPORT_VOLUME_SET, SUPPORT_PLAY, MediaPlayerDevice, PLATFORM_SCHEMA,
-    MEDIA_TYPE_MUSIC)
-
-from homeassistant.const import (CONF_NAME, STATE_IDLE, STATE_PAUSED,
-                                 STATE_PLAYING)
+    MEDIA_TYPE_MUSIC, PLATFORM_SCHEMA, SUPPORT_PAUSE, SUPPORT_PLAY,
+    SUPPORT_PLAY_MEDIA, SUPPORT_STOP, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET,
+    MediaPlayerDevice)
+from homeassistant.const import (
+    CONF_NAME, STATE_IDLE, STATE_PAUSED, STATE_PLAYING)
 import homeassistant.helpers.config_validation as cv
 import homeassistant.util.dt as dt_util
 
@@ -29,8 +28,8 @@ SUPPORT_VLC = SUPPORT_PAUSE | SUPPORT_VOLUME_SET | SUPPORT_VOLUME_MUTE | \
     SUPPORT_PLAY_MEDIA | SUPPORT_PLAY | SUPPORT_STOP
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Optional(CONF_NAME): cv.string,
     vol.Optional(CONF_ARGUMENTS, default=''): cv.string,
+    vol.Optional(CONF_NAME): cv.string,
 })
 
 
diff --git a/homeassistant/components/media_player/volumio.py b/homeassistant/components/media_player/volumio.py
index 00f5d25362f..743f19cb259 100644
--- a/homeassistant/components/media_player/volumio.py
+++ b/homeassistant/components/media_player/volumio.py
@@ -6,23 +6,24 @@ https://home-assistant.io/components/media_player.volumio/
 
 Volumio rest API: https://volumio.github.io/docs/API/REST_API.html
 """
+import asyncio
 from datetime import timedelta
 import logging
 import socket
-import asyncio
-import aiohttp
 
+import aiohttp
 import voluptuous as vol
 
 from homeassistant.components.media_player import (
-    SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PREVIOUS_TRACK, SUPPORT_SEEK,
-    SUPPORT_PLAY_MEDIA, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET, SUPPORT_STOP,
-    SUPPORT_PLAY, MediaPlayerDevice, PLATFORM_SCHEMA, MEDIA_TYPE_MUSIC,
-    SUPPORT_VOLUME_STEP, SUPPORT_SELECT_SOURCE, SUPPORT_CLEAR_PLAYLIST)
+    MEDIA_TYPE_MUSIC, PLATFORM_SCHEMA, SUPPORT_CLEAR_PLAYLIST,
+    SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PLAY, SUPPORT_PLAY_MEDIA,
+    SUPPORT_PREVIOUS_TRACK, SUPPORT_SEEK, SUPPORT_SELECT_SOURCE, SUPPORT_STOP,
+    SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET, SUPPORT_VOLUME_STEP,
+    MediaPlayerDevice)
 from homeassistant.const import (
-    STATE_PLAYING, STATE_PAUSED, STATE_IDLE, CONF_HOST, CONF_PORT, CONF_NAME)
-import homeassistant.helpers.config_validation as cv
+    CONF_HOST, CONF_NAME, CONF_PORT, STATE_IDLE, STATE_PAUSED, STATE_PLAYING)
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
+import homeassistant.helpers.config_validation as cv
 from homeassistant.util import Throttle
 
 _CONFIGURING = {}
diff --git a/homeassistant/components/media_player/webostv.py b/homeassistant/components/media_player/webostv.py
index fd6b1c6d96e..b3cd07b9d35 100644
--- a/homeassistant/components/media_player/webostv.py
+++ b/homeassistant/components/media_player/webostv.py
@@ -14,6 +14,7 @@ from typing import Dict  # noqa: F401
 
 import voluptuous as vol
 
+from homeassistant import util
 from homeassistant.components.media_player import (
     MEDIA_TYPE_CHANNEL, PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE,
     SUPPORT_PLAY, SUPPORT_PLAY_MEDIA, SUPPORT_PREVIOUS_TRACK,
@@ -24,7 +25,6 @@ from homeassistant.const import (
     STATE_OFF, STATE_PAUSED, STATE_PLAYING, STATE_UNKNOWN)
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.script import Script
-from homeassistant import util
 
 REQUIREMENTS = ['pylgtv==0.1.7', 'websockets==3.2']
 
@@ -34,7 +34,7 @@ _LOGGER = logging.getLogger(__name__)
 CONF_SOURCES = 'sources'
 CONF_ON_ACTION = 'turn_on_action'
 
-DEFAULT_NAME = 'LG webOS Smart TV'
+DEFAULT_NAME = "LG webOS Smart TV"
 LIVETV_APP_ID = 'com.webos.app.livetv'
 
 WEBOSTV_CONFIG_FILE = 'webostv.conf'
diff --git a/homeassistant/components/media_player/xiaomi_tv.py b/homeassistant/components/media_player/xiaomi_tv.py
index ad66ae855bd..93c4bb72b17 100644
--- a/homeassistant/components/media_player/xiaomi_tv.py
+++ b/homeassistant/components/media_player/xiaomi_tv.py
@@ -4,14 +4,15 @@ Add support for the Xiaomi TVs.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/xiaomi_tv/
 """
-
 import logging
+
 import voluptuous as vol
-import homeassistant.helpers.config_validation as cv
-from homeassistant.const import (CONF_HOST, CONF_NAME, STATE_OFF, STATE_ON)
+
 from homeassistant.components.media_player import (
-    SUPPORT_TURN_ON, SUPPORT_TURN_OFF, MediaPlayerDevice, PLATFORM_SCHEMA,
-    SUPPORT_VOLUME_STEP)
+    PLATFORM_SCHEMA, SUPPORT_TURN_OFF, SUPPORT_TURN_ON, SUPPORT_VOLUME_STEP,
+    MediaPlayerDevice)
+from homeassistant.const import CONF_HOST, CONF_NAME, STATE_OFF, STATE_ON
+import homeassistant.helpers.config_validation as cv
 
 REQUIREMENTS = ['pymitv==1.4.0']
 
@@ -41,8 +42,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
         # Check if there's a valid TV at the IP address.
         if not Discover().check_ip(host):
             _LOGGER.error(
-                "Could not find Xiaomi TV with specified IP: %s", host
-            )
+                "Could not find Xiaomi TV with specified IP: %s", host)
         else:
             # Register TV with Home Assistant.
             add_entities([XiaomiTV(host, name)])
diff --git a/homeassistant/components/media_player/yamaha.py b/homeassistant/components/media_player/yamaha.py
index be6df547f1d..be61560d52b 100644
--- a/homeassistant/components/media_player/yamaha.py
+++ b/homeassistant/components/media_player/yamaha.py
@@ -12,9 +12,9 @@ import voluptuous as vol
 from homeassistant.components.media_player import (
     DOMAIN, MEDIA_PLAYER_SCHEMA, MEDIA_TYPE_MUSIC, PLATFORM_SCHEMA,
     SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PLAY, SUPPORT_PLAY_MEDIA,
-    SUPPORT_PREVIOUS_TRACK, SUPPORT_SELECT_SOURCE, SUPPORT_STOP,
-    SUPPORT_TURN_OFF, SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET,
-    SUPPORT_SELECT_SOUND_MODE, MediaPlayerDevice)
+    SUPPORT_PREVIOUS_TRACK, SUPPORT_SELECT_SOUND_MODE, SUPPORT_SELECT_SOURCE,
+    SUPPORT_STOP, SUPPORT_TURN_OFF, SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE,
+    SUPPORT_VOLUME_SET, MediaPlayerDevice)
 from homeassistant.const import (
     ATTR_ENTITY_ID, CONF_HOST, CONF_NAME, STATE_IDLE, STATE_OFF, STATE_ON,
     STATE_PLAYING)
diff --git a/homeassistant/components/media_player/yamaha_musiccast.py b/homeassistant/components/media_player/yamaha_musiccast.py
index 135bf4d0aef..bf21a3f5028 100644
--- a/homeassistant/components/media_player/yamaha_musiccast.py
+++ b/homeassistant/components/media_player/yamaha_musiccast.py
@@ -1,28 +1,26 @@
-"""Example for configuration.yaml.
-
-media_player:
-  - platform: yamaha_musiccast
-    host: 192.168.xxx.xx
-    port: 5005
-
 """
+Support for Yamaha MusicCast Receivers.
 
+For more details about this platform, please refer to the documentation at
+https://www.home-assistant.io/components/media_player.yamaha_musiccast/
+"""
 import logging
+
 import voluptuous as vol
+
+from homeassistant.components.media_player import (
+    MEDIA_TYPE_MUSIC, PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE,
+    SUPPORT_PLAY, SUPPORT_PREVIOUS_TRACK, SUPPORT_SELECT_SOURCE, SUPPORT_STOP,
+    SUPPORT_TURN_OFF, SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET,
+    MediaPlayerDevice)
+from homeassistant.const import (
+    CONF_HOST, CONF_PORT, STATE_IDLE, STATE_ON, STATE_PAUSED, STATE_PLAYING,
+    STATE_UNKNOWN)
 import homeassistant.helpers.config_validation as cv
 import homeassistant.util.dt as dt_util
 
-from homeassistant.const import (
-    CONF_HOST, CONF_PORT,
-    STATE_UNKNOWN, STATE_ON, STATE_PLAYING, STATE_PAUSED, STATE_IDLE
-)
-from homeassistant.components.media_player import (
-    MediaPlayerDevice, MEDIA_TYPE_MUSIC, PLATFORM_SCHEMA,
-    SUPPORT_PAUSE, SUPPORT_PREVIOUS_TRACK, SUPPORT_NEXT_TRACK,
-    SUPPORT_TURN_ON, SUPPORT_TURN_OFF, SUPPORT_PLAY,
-    SUPPORT_VOLUME_SET, SUPPORT_VOLUME_MUTE,
-    SUPPORT_SELECT_SOURCE, SUPPORT_STOP
-)
+REQUIREMENTS = ['pymusiccast==0.1.6']
+
 _LOGGER = logging.getLogger(__name__)
 
 SUPPORTED_FEATURES = (
@@ -36,8 +34,6 @@ SUPPORTED_FEATURES = (
 KNOWN_HOSTS_KEY = 'data_yamaha_musiccast'
 INTERVAL_SECONDS = 'interval_seconds'
 
-REQUIREMENTS = ['pymusiccast==0.1.6']
-
 DEFAULT_PORT = 5005
 DEFAULT_INTERVAL = 480
 
@@ -71,11 +67,11 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
         return
 
     if [item for item in known_hosts if item[0] == ipaddr]:
-        _LOGGER.warning("Host %s:%d already registered.", host, port)
+        _LOGGER.warning("Host %s:%d already registered", host, port)
         return
 
     if [item for item in known_hosts if item[1] == port]:
-        _LOGGER.warning("Port %s:%d already registered.", host, port)
+        _LOGGER.warning("Port %s:%d already registered", host, port)
         return
 
     reg_host = (ipaddr, port)
@@ -91,11 +87,9 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     if receiver:
         for zone in receiver.zones:
             _LOGGER.debug(
-                "receiver: %s / Port: %d / Zone: %s",
-                receiver, port, zone)
+                "Receiver: %s / Port: %d / Zone: %s", receiver, port, zone)
             add_entities(
-                [YamahaDevice(receiver, receiver.zones[zone])],
-                True)
+                [YamahaDevice(receiver, receiver.zones[zone])], True)
     else:
         known_hosts.remove(reg_host)
 
diff --git a/homeassistant/components/media_player/ziggo_mediabox_xl.py b/homeassistant/components/media_player/ziggo_mediabox_xl.py
index 376b9e7c426..555042bee5c 100644
--- a/homeassistant/components/media_player/ziggo_mediabox_xl.py
+++ b/homeassistant/components/media_player/ziggo_mediabox_xl.py
@@ -10,10 +10,9 @@ import socket
 import voluptuous as vol
 
 from homeassistant.components.media_player import (
-    PLATFORM_SCHEMA, MediaPlayerDevice,
-    SUPPORT_TURN_ON, SUPPORT_TURN_OFF,
-    SUPPORT_NEXT_TRACK, SUPPORT_PREVIOUS_TRACK, SUPPORT_SELECT_SOURCE,
-    SUPPORT_PLAY, SUPPORT_PAUSE)
+    PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PLAY,
+    SUPPORT_PREVIOUS_TRACK, SUPPORT_SELECT_SOURCE, SUPPORT_TURN_OFF,
+    SUPPORT_TURN_ON, MediaPlayerDevice)
 from homeassistant.const import (
     CONF_HOST, CONF_NAME, STATE_OFF, STATE_ON, STATE_PAUSED, STATE_PLAYING)
 import homeassistant.helpers.config_validation as cv
@@ -169,6 +168,5 @@ class ZiggoMediaboxXLDevice(MediaPlayerDevice):
         if digits is None:
             return
 
-        self.send_keys(['NUM_{}'.format(digit)
-                        for digit in str(digits)])
+        self.send_keys(['NUM_{}'.format(digit) for digit in str(digits)])
         self._state = STATE_PLAYING

From 253e787a1bdd92a13d52ea831d4276a402143012 Mon Sep 17 00:00:00 2001
From: Jason Hu <awarecan@users.noreply.github.com>
Date: Mon, 10 Sep 2018 01:39:51 -0700
Subject: [PATCH 072/357] Upgrade aiohttp to 3.4.4 (#16486)

---
 homeassistant/package_constraints.txt | 2 +-
 requirements_all.txt                  | 2 +-
 setup.py                              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt
index 168da1f2ead..9217e3b3961 100644
--- a/homeassistant/package_constraints.txt
+++ b/homeassistant/package_constraints.txt
@@ -1,4 +1,4 @@
-aiohttp==3.4.0
+aiohttp==3.4.4
 astral==1.6.1
 async_timeout==3.0.0
 attrs==18.2.0
diff --git a/requirements_all.txt b/requirements_all.txt
index 3e46814126a..d2e53706f4e 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1,5 +1,5 @@
 # Home Assistant core
-aiohttp==3.4.0
+aiohttp==3.4.4
 astral==1.6.1
 async_timeout==3.0.0
 attrs==18.2.0
diff --git a/setup.py b/setup.py
index 2978f37ad72..727badb1d94 100755
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@ PROJECT_URLS = {
 PACKAGES = find_packages(exclude=['tests', 'tests.*'])
 
 REQUIRES = [
-    'aiohttp==3.4.0',
+    'aiohttp==3.4.4',
     'astral==1.6.1',
     'async_timeout==3.0.0',
     'attrs==18.2.0',

From a1578e3c6edcae74c1e9abc0ffd6ff8c65fc092b Mon Sep 17 00:00:00 2001
From: Louis-Dominique Dubeau <ldd@lddubeau.com>
Date: Mon, 10 Sep 2018 05:50:25 -0400
Subject: [PATCH 073/357] Add a base_url configuration setting to tts. (#16478)

* Add a base_url configuration setting to tts.

* Remove the empty string as default value for base_urls

As requested in

https://github.com/home-assistant/home-assistant/pull/16478#pullrequestreview-153526144
---
 homeassistant/components/tts/__init__.py | 13 +++--
 tests/components/tts/test_init.py        | 68 +++++++++++++++---------
 2 files changed, 53 insertions(+), 28 deletions(-)

diff --git a/homeassistant/components/tts/__init__.py b/homeassistant/components/tts/__init__.py
index 2ec9a2ab801..e5eef0e6135 100644
--- a/homeassistant/components/tts/__init__.py
+++ b/homeassistant/components/tts/__init__.py
@@ -43,6 +43,7 @@ CONF_CACHE = 'cache'
 CONF_CACHE_DIR = 'cache_dir'
 CONF_LANG = 'language'
 CONF_TIME_MEMORY = 'time_memory'
+CONF_BASE_URL = 'base_url'
 
 DEFAULT_CACHE = True
 DEFAULT_CACHE_DIR = 'tts'
@@ -65,6 +66,7 @@ PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_CACHE_DIR, default=DEFAULT_CACHE_DIR): cv.string,
     vol.Optional(CONF_TIME_MEMORY, default=DEFAULT_TIME_MEMORY):
         vol.All(vol.Coerce(int), vol.Range(min=60, max=57600)),
+    vol.Optional(CONF_BASE_URL): cv.string,
 })
 
 SCHEMA_SERVICE_SAY = vol.Schema({
@@ -87,8 +89,9 @@ async def async_setup(hass, config):
         use_cache = conf.get(CONF_CACHE, DEFAULT_CACHE)
         cache_dir = conf.get(CONF_CACHE_DIR, DEFAULT_CACHE_DIR)
         time_memory = conf.get(CONF_TIME_MEMORY, DEFAULT_TIME_MEMORY)
+        base_url = conf.get(CONF_BASE_URL) or hass.config.api.base_url
 
-        await tts.async_init_cache(use_cache, cache_dir, time_memory)
+        await tts.async_init_cache(use_cache, cache_dir, time_memory, base_url)
     except (HomeAssistantError, KeyError) as err:
         _LOGGER.error("Error on cache init %s", err)
         return False
@@ -180,13 +183,16 @@ class SpeechManager:
         self.use_cache = DEFAULT_CACHE
         self.cache_dir = DEFAULT_CACHE_DIR
         self.time_memory = DEFAULT_TIME_MEMORY
+        self.base_url = None
         self.file_cache = {}
         self.mem_cache = {}
 
-    async def async_init_cache(self, use_cache, cache_dir, time_memory):
+    async def async_init_cache(self, use_cache, cache_dir, time_memory,
+                               base_url):
         """Init config folder and load file cache."""
         self.use_cache = use_cache
         self.time_memory = time_memory
+        self.base_url = base_url
 
         def init_tts_cache_dir(cache_dir):
             """Init cache folder."""
@@ -299,8 +305,7 @@ class SpeechManager:
             filename = await self.async_get_tts_audio(
                 engine, key, message, use_cache, language, options)
 
-        return "{}/api/tts_proxy/{}".format(
-            self.hass.config.api.base_url, filename)
+        return "{}/api/tts_proxy/{}".format(self.base_url, filename)
 
     async def async_get_tts_audio(
             self, engine, key, message, cache, language, options):
diff --git a/tests/components/tts/test_init.py b/tests/components/tts/test_init.py
index 719fe2716e7..70cbbc15c91 100644
--- a/tests/components/tts/test_init.py
+++ b/tests/components/tts/test_init.py
@@ -97,10 +97,9 @@ class TestTTS:
 
         assert len(calls) == 1
         assert calls[0].data[ATTR_MEDIA_CONTENT_TYPE] == MEDIA_TYPE_MUSIC
-        assert calls[0].data[ATTR_MEDIA_CONTENT_ID].find(
-            "/api/tts_proxy/265944c108cbb00b2a621be5930513e03a0bb2cd"
-            "_en_-_demo.mp3") \
-            != -1
+        assert calls[0].data[ATTR_MEDIA_CONTENT_ID] == \
+            "{}/api/tts_proxy/265944c108cbb00b2a621be5930513e03a0bb2cd" \
+            "_en_-_demo.mp3".format(self.hass.config.api.base_url)
         assert os.path.isfile(os.path.join(
             self.default_tts_cache,
             "265944c108cbb00b2a621be5930513e03a0bb2cd_en_-_demo.mp3"))
@@ -126,10 +125,9 @@ class TestTTS:
 
         assert len(calls) == 1
         assert calls[0].data[ATTR_MEDIA_CONTENT_TYPE] == MEDIA_TYPE_MUSIC
-        assert calls[0].data[ATTR_MEDIA_CONTENT_ID].find(
-            "/api/tts_proxy/265944c108cbb00b2a621be5930513e03a0bb2cd"
-            "_de_-_demo.mp3") \
-            != -1
+        assert calls[0].data[ATTR_MEDIA_CONTENT_ID] == \
+            "{}/api/tts_proxy/265944c108cbb00b2a621be5930513e03a0bb2cd" \
+            "_de_-_demo.mp3".format(self.hass.config.api.base_url)
         assert os.path.isfile(os.path.join(
             self.default_tts_cache,
             "265944c108cbb00b2a621be5930513e03a0bb2cd_de_-_demo.mp3"))
@@ -167,10 +165,9 @@ class TestTTS:
 
         assert len(calls) == 1
         assert calls[0].data[ATTR_MEDIA_CONTENT_TYPE] == MEDIA_TYPE_MUSIC
-        assert calls[0].data[ATTR_MEDIA_CONTENT_ID].find(
-            "/api/tts_proxy/265944c108cbb00b2a621be5930513e03a0bb2cd"
-            "_de_-_demo.mp3") \
-            != -1
+        assert calls[0].data[ATTR_MEDIA_CONTENT_ID] == \
+            "{}/api/tts_proxy/265944c108cbb00b2a621be5930513e03a0bb2cd" \
+            "_de_-_demo.mp3".format(self.hass.config.api.base_url)
         assert os.path.isfile(os.path.join(
             self.default_tts_cache,
             "265944c108cbb00b2a621be5930513e03a0bb2cd_de_-_demo.mp3"))
@@ -225,10 +222,9 @@ class TestTTS:
 
         assert len(calls) == 1
         assert calls[0].data[ATTR_MEDIA_CONTENT_TYPE] == MEDIA_TYPE_MUSIC
-        assert calls[0].data[ATTR_MEDIA_CONTENT_ID].find(
-            "/api/tts_proxy/265944c108cbb00b2a621be5930513e03a0bb2cd"
-            "_de_{0}_demo.mp3".format(opt_hash)) \
-            != -1
+        assert calls[0].data[ATTR_MEDIA_CONTENT_ID] == \
+            "{}/api/tts_proxy/265944c108cbb00b2a621be5930513e03a0bb2cd" \
+            "_de_{}_demo.mp3".format(self.hass.config.api.base_url, opt_hash)
         assert os.path.isfile(os.path.join(
             self.default_tts_cache,
             "265944c108cbb00b2a621be5930513e03a0bb2cd_de_{0}_demo.mp3".format(
@@ -259,10 +255,9 @@ class TestTTS:
 
         assert len(calls) == 1
         assert calls[0].data[ATTR_MEDIA_CONTENT_TYPE] == MEDIA_TYPE_MUSIC
-        assert calls[0].data[ATTR_MEDIA_CONTENT_ID].find(
-            "/api/tts_proxy/265944c108cbb00b2a621be5930513e03a0bb2cd"
-            "_de_{0}_demo.mp3".format(opt_hash)) \
-            != -1
+        assert calls[0].data[ATTR_MEDIA_CONTENT_ID] == \
+            "{}/api/tts_proxy/265944c108cbb00b2a621be5930513e03a0bb2cd" \
+            "_de_{}_demo.mp3".format(self.hass.config.api.base_url, opt_hash)
         assert os.path.isfile(os.path.join(
             self.default_tts_cache,
             "265944c108cbb00b2a621be5930513e03a0bb2cd_de_{0}_demo.mp3".format(
@@ -298,6 +293,32 @@ class TestTTS:
             "265944c108cbb00b2a621be5930513e03a0bb2cd_de_{0}_demo.mp3".format(
                 opt_hash)))
 
+    def test_setup_component_and_test_service_with_base_url_set(self):
+        """Set up the demo platform with ``base_url`` set and call service."""
+        calls = mock_service(self.hass, DOMAIN_MP, SERVICE_PLAY_MEDIA)
+
+        config = {
+            tts.DOMAIN: {
+                'platform': 'demo',
+                'base_url': 'http://fnord',
+            }
+        }
+
+        with assert_setup_component(1, tts.DOMAIN):
+            setup_component(self.hass, tts.DOMAIN, config)
+
+        self.hass.services.call(tts.DOMAIN, 'demo_say', {
+            tts.ATTR_MESSAGE: "I person is on front of your door.",
+        })
+        self.hass.block_till_done()
+
+        assert len(calls) == 1
+        assert calls[0].data[ATTR_MEDIA_CONTENT_TYPE] == MEDIA_TYPE_MUSIC
+        assert calls[0].data[ATTR_MEDIA_CONTENT_ID] == \
+            "http://fnord" \
+            "/api/tts_proxy/265944c108cbb00b2a621be5930513e03a0bb2cd" \
+            "_en_-_demo.mp3"
+
     def test_setup_component_and_test_service_clear_cache(self):
         """Set up the demo platform and call service clear cache."""
         calls = mock_service(self.hass, DOMAIN_MP, SERVICE_PLAY_MEDIA)
@@ -507,10 +528,9 @@ class TestTTS:
         self.hass.block_till_done()
 
         assert len(calls) == 1
-        assert calls[0].data[ATTR_MEDIA_CONTENT_ID].find(
-            "/api/tts_proxy/265944c108cbb00b2a621be5930513e03a0bb2cd"
-            "_en_-_demo.mp3") \
-            != -1
+        assert calls[0].data[ATTR_MEDIA_CONTENT_ID] == \
+            "{}/api/tts_proxy/265944c108cbb00b2a621be5930513e03a0bb2cd" \
+            "_en_-_demo.mp3".format(self.hass.config.api.base_url)
 
     @patch('homeassistant.components.tts.demo.DemoProvider.get_tts_audio',
            return_value=(None, None))

From 8ed4d732aca3b3b68f3e40e2606421d9f734a137 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 10 Sep 2018 13:35:24 +0200
Subject: [PATCH 074/357] Upgrade youtube_dl to 2018.09.10 (#16534)

---
 homeassistant/components/media_extractor.py | 2 +-
 requirements_all.txt                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/media_extractor.py b/homeassistant/components/media_extractor.py
index f6e982a77ef..0d7d76c4447 100644
--- a/homeassistant/components/media_extractor.py
+++ b/homeassistant/components/media_extractor.py
@@ -14,7 +14,7 @@ from homeassistant.components.media_player import (
     SERVICE_PLAY_MEDIA)
 from homeassistant.helpers import config_validation as cv
 
-REQUIREMENTS = ['youtube_dl==2018.09.01']
+REQUIREMENTS = ['youtube_dl==2018.09.10']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/requirements_all.txt b/requirements_all.txt
index d2e53706f4e..bf3e98a226c 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1519,7 +1519,7 @@ yeelight==0.4.0
 yeelightsunflower==0.0.10
 
 # homeassistant.components.media_extractor
-youtube_dl==2018.09.01
+youtube_dl==2018.09.10
 
 # homeassistant.components.light.zengge
 zengge==0.2

From c20f147949e8dc0f7574552e52e02b74e5d40739 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 10 Sep 2018 13:35:47 +0200
Subject: [PATCH 075/357] Upgrade keyring to 15.0.0 (#16536)

---
 homeassistant/scripts/keyring.py | 2 +-
 requirements_all.txt             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/scripts/keyring.py b/homeassistant/scripts/keyring.py
index 54e7eb01ae1..e48fa809d19 100644
--- a/homeassistant/scripts/keyring.py
+++ b/homeassistant/scripts/keyring.py
@@ -5,7 +5,7 @@ import os
 
 from homeassistant.util.yaml import _SECRET_NAMESPACE
 
-REQUIREMENTS = ['keyring==13.2.1', 'keyrings.alt==3.1']
+REQUIREMENTS = ['keyring==15.0.0', 'keyrings.alt==3.1']
 
 
 def run(args):
diff --git a/requirements_all.txt b/requirements_all.txt
index bf3e98a226c..c021ea1a985 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -502,7 +502,7 @@ jsonrpc-async==0.6
 jsonrpc-websocket==0.6
 
 # homeassistant.scripts.keyring
-keyring==13.2.1
+keyring==15.0.0
 
 # homeassistant.scripts.keyring
 keyrings.alt==3.1

From fb15dbf3ba0f6df2ee5dc827abbaaec12fc40e90 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 10 Sep 2018 13:44:11 +0200
Subject: [PATCH 076/357] Bump frontend to 20180910.0

---
 homeassistant/components/frontend/__init__.py | 2 +-
 requirements_all.txt                          | 2 +-
 requirements_test_all.txt                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/frontend/__init__.py b/homeassistant/components/frontend/__init__.py
index 72f61ddf1eb..add323c4c28 100644
--- a/homeassistant/components/frontend/__init__.py
+++ b/homeassistant/components/frontend/__init__.py
@@ -26,7 +26,7 @@ from homeassistant.helpers.translation import async_get_translations
 from homeassistant.loader import bind_hass
 from homeassistant.util.yaml import load_yaml
 
-REQUIREMENTS = ['home-assistant-frontend==20180903.0']
+REQUIREMENTS = ['home-assistant-frontend==20180910.0']
 
 DOMAIN = 'frontend'
 DEPENDENCIES = ['api', 'websocket_api', 'http', 'system_log',
diff --git a/requirements_all.txt b/requirements_all.txt
index c021ea1a985..358f5ac2244 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -452,7 +452,7 @@ hole==0.3.0
 holidays==0.9.6
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180903.0
+home-assistant-frontend==20180910.0
 
 # homeassistant.components.homekit_controller
 # homekit==0.10
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 060aef04a9b..9f875118b2e 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -84,7 +84,7 @@ hbmqtt==0.9.4
 holidays==0.9.6
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180903.0
+home-assistant-frontend==20180910.0
 
 # homeassistant.components.homematicip_cloud
 homematicip==0.9.8

From 1d6609e3863c519f92fb1b10039e9c6dadac4767 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 10 Sep 2018 13:44:27 +0200
Subject: [PATCH 077/357] Update translations

---
 .../components/auth/.translations/sv.json     | 12 +++++++++++
 .../components/deconz/.translations/fr.json   |  3 ++-
 .../components/hangouts/.translations/sv.json | 21 +++++++++++++++++++
 .../homematicip_cloud/.translations/da.json   |  7 +++++++
 .../homematicip_cloud/.translations/fr.json   |  3 +++
 .../homematicip_cloud/.translations/it.json   |  1 +
 .../components/nest/.translations/da.json     |  6 ++++--
 .../components/nest/.translations/fr.json     |  8 ++++++-
 .../components/openuv/.translations/ca.json   | 20 ++++++++++++++++++
 .../components/openuv/.translations/da.json   | 15 +++++++++++++
 .../openuv/.translations/es-419.json          | 17 +++++++++++++++
 .../components/openuv/.translations/fr.json   | 20 ++++++++++++++++++
 .../components/openuv/.translations/hu.json   | 20 ++++++++++++++++++
 .../components/openuv/.translations/it.json   | 15 +++++++++++++
 .../components/openuv/.translations/pl.json   | 18 ++++++++++++++++
 .../components/openuv/.translations/ru.json   | 20 ++++++++++++++++++
 .../components/openuv/.translations/sl.json   | 20 ++++++++++++++++++
 .../components/openuv/.translations/sv.json   | 18 ++++++++++++++++
 .../openuv/.translations/zh-Hans.json         | 20 ++++++++++++++++++
 .../openuv/.translations/zh-Hant.json         | 20 ++++++++++++++++++
 .../sensor/.translations/moon.da.json         |  5 +++++
 .../sensor/.translations/moon.it.json         |  5 ++++-
 .../components/sonos/.translations/fr.json    |  6 ++++--
 23 files changed, 293 insertions(+), 7 deletions(-)
 create mode 100644 homeassistant/components/auth/.translations/sv.json
 create mode 100644 homeassistant/components/hangouts/.translations/sv.json
 create mode 100644 homeassistant/components/openuv/.translations/ca.json
 create mode 100644 homeassistant/components/openuv/.translations/da.json
 create mode 100644 homeassistant/components/openuv/.translations/es-419.json
 create mode 100644 homeassistant/components/openuv/.translations/fr.json
 create mode 100644 homeassistant/components/openuv/.translations/hu.json
 create mode 100644 homeassistant/components/openuv/.translations/it.json
 create mode 100644 homeassistant/components/openuv/.translations/pl.json
 create mode 100644 homeassistant/components/openuv/.translations/ru.json
 create mode 100644 homeassistant/components/openuv/.translations/sl.json
 create mode 100644 homeassistant/components/openuv/.translations/sv.json
 create mode 100644 homeassistant/components/openuv/.translations/zh-Hans.json
 create mode 100644 homeassistant/components/openuv/.translations/zh-Hant.json
 create mode 100644 homeassistant/components/sensor/.translations/moon.da.json

diff --git a/homeassistant/components/auth/.translations/sv.json b/homeassistant/components/auth/.translations/sv.json
new file mode 100644
index 00000000000..e148766e2a1
--- /dev/null
+++ b/homeassistant/components/auth/.translations/sv.json
@@ -0,0 +1,12 @@
+{
+    "mfa_setup": {
+        "totp": {
+            "step": {
+                "init": {
+                    "title": "St\u00e4ll in tv\u00e5faktorsautentisering med TOTP"
+                }
+            },
+            "title": "TOTP"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/deconz/.translations/fr.json b/homeassistant/components/deconz/.translations/fr.json
index 02f174cd59f..56399a3c6fd 100644
--- a/homeassistant/components/deconz/.translations/fr.json
+++ b/homeassistant/components/deconz/.translations/fr.json
@@ -22,7 +22,8 @@
             },
             "options": {
                 "data": {
-                    "allow_clip_sensor": "Autoriser l'importation de capteurs virtuels"
+                    "allow_clip_sensor": "Autoriser l'importation de capteurs virtuels",
+                    "allow_deconz_groups": "Autoriser l'importation des groupes deCONZ"
                 },
                 "title": "Options de configuration suppl\u00e9mentaires pour deCONZ"
             }
diff --git a/homeassistant/components/hangouts/.translations/sv.json b/homeassistant/components/hangouts/.translations/sv.json
new file mode 100644
index 00000000000..d926097dfc2
--- /dev/null
+++ b/homeassistant/components/hangouts/.translations/sv.json
@@ -0,0 +1,21 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Google Hangouts \u00e4r redan inst\u00e4llt",
+            "unknown": "Ett ok\u00e4nt fel intr\u00e4ffade"
+        },
+        "step": {
+            "2fa": {
+                "title": "Tv\u00e5faktorsautentisering"
+            },
+            "user": {
+                "data": {
+                    "email": "E-postadress",
+                    "password": "L\u00f6senord"
+                },
+                "title": "Google Hangouts-inloggning"
+            }
+        },
+        "title": "Google Hangouts"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/homematicip_cloud/.translations/da.json b/homeassistant/components/homematicip_cloud/.translations/da.json
index b617130945a..7473b4a7b86 100644
--- a/homeassistant/components/homematicip_cloud/.translations/da.json
+++ b/homeassistant/components/homematicip_cloud/.translations/da.json
@@ -2,6 +2,13 @@
     "config": {
         "error": {
             "invalid_pin": "Ugyldig PIN, pr\u00f8v igen."
+        },
+        "step": {
+            "init": {
+                "data": {
+                    "pin": "Pin kode (valgfri)"
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/homematicip_cloud/.translations/fr.json b/homeassistant/components/homematicip_cloud/.translations/fr.json
index c10cb519133..8405946daa2 100644
--- a/homeassistant/components/homematicip_cloud/.translations/fr.json
+++ b/homeassistant/components/homematicip_cloud/.translations/fr.json
@@ -1,6 +1,9 @@
 {
     "config": {
         "abort": {
+            "already_configured": "Le point d'acc\u00e8s est d\u00e9j\u00e0 configur\u00e9",
+            "conection_aborted": "Impossible de se connecter au serveur HMIP",
+            "connection_aborted": "Impossible de se connecter au serveur HMIP",
             "unknown": "Une erreur inconnue s'est produite"
         },
         "error": {
diff --git a/homeassistant/components/homematicip_cloud/.translations/it.json b/homeassistant/components/homematicip_cloud/.translations/it.json
index 95e600e6d03..9ef1abd500c 100644
--- a/homeassistant/components/homematicip_cloud/.translations/it.json
+++ b/homeassistant/components/homematicip_cloud/.translations/it.json
@@ -5,6 +5,7 @@
             "connection_aborted": "Impossibile connettersi al server HMIP"
         },
         "error": {
+            "invalid_pin": "PIN non valido, riprova.",
             "press_the_button": "Si prega di premere il pulsante blu.",
             "register_failed": "Registrazione fallita, si prega di riprovare."
         },
diff --git a/homeassistant/components/nest/.translations/da.json b/homeassistant/components/nest/.translations/da.json
index 4410f83d2ca..5edf3a00af4 100644
--- a/homeassistant/components/nest/.translations/da.json
+++ b/homeassistant/components/nest/.translations/da.json
@@ -16,8 +16,10 @@
             "link": {
                 "data": {
                     "code": "PIN-kode"
-                }
+                },
+                "title": "Link Nest-konto"
             }
-        }
+        },
+        "title": "Nest"
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/nest/.translations/fr.json b/homeassistant/components/nest/.translations/fr.json
index 734e82dbcd0..fd2cb435eb2 100644
--- a/homeassistant/components/nest/.translations/fr.json
+++ b/homeassistant/components/nest/.translations/fr.json
@@ -1,7 +1,9 @@
 {
     "config": {
         "abort": {
-            "already_setup": "Vous ne pouvez configurer qu'un seul compte Nest."
+            "already_setup": "Vous ne pouvez configurer qu'un seul compte Nest.",
+            "authorize_url_timeout": "D\u00e9lai de g\u00e9n\u00e9ration de l'URL d'authentification d\u00e9pass\u00e9.",
+            "no_flows": "Vous devez configurer Nest avant de pouvoir vous authentifier avec celui-ci. [Veuillez lire les instructions] (https://www.home-assistant.io/components/nest/)."
         },
         "error": {
             "internal_error": "Erreur interne lors de la validation du code",
@@ -9,12 +11,16 @@
         },
         "step": {
             "init": {
+                "data": {
+                    "flow_impl": "Fournisseur"
+                },
                 "title": "Fournisseur d'authentification"
             },
             "link": {
                 "data": {
                     "code": "Code PIN"
                 },
+                "description": "Pour associer votre compte Nest, [autorisez votre compte] ( {url} ). \n\n Apr\u00e8s autorisation, copiez-collez le code PIN fourni ci-dessous.",
                 "title": "Lier un compte Nest"
             }
         },
diff --git a/homeassistant/components/openuv/.translations/ca.json b/homeassistant/components/openuv/.translations/ca.json
new file mode 100644
index 00000000000..4a6cf526921
--- /dev/null
+++ b/homeassistant/components/openuv/.translations/ca.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "error": {
+            "identifier_exists": "Les coordenades ja estan registrades",
+            "invalid_api_key": "Contrasenya API no v\u00e0lida"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "Contrasenya API d'OpenUV",
+                    "elevation": "Elevaci\u00f3",
+                    "latitude": "Latitud",
+                    "longitude": "Longitud"
+                },
+                "title": "Introdu\u00efu la vostra informaci\u00f3"
+            }
+        },
+        "title": "OpenUV"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/openuv/.translations/da.json b/homeassistant/components/openuv/.translations/da.json
new file mode 100644
index 00000000000..5cda5c6e663
--- /dev/null
+++ b/homeassistant/components/openuv/.translations/da.json
@@ -0,0 +1,15 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "OpenUV API N\u00f8gle",
+                    "latitude": "Breddegrad",
+                    "longitude": "L\u00e6ngdegrad"
+                },
+                "title": "Udfyld dine oplysninger"
+            }
+        },
+        "title": "OpenUV"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/openuv/.translations/es-419.json b/homeassistant/components/openuv/.translations/es-419.json
new file mode 100644
index 00000000000..6b391c20a0a
--- /dev/null
+++ b/homeassistant/components/openuv/.translations/es-419.json
@@ -0,0 +1,17 @@
+{
+    "config": {
+        "error": {
+            "identifier_exists": "Coordenadas ya registradas",
+            "invalid_api_key": "Clave de API inv\u00e1lida"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "elevation": "Elevaci\u00f3n",
+                    "latitude": "Latitud",
+                    "longitude": "Longitud"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/openuv/.translations/fr.json b/homeassistant/components/openuv/.translations/fr.json
new file mode 100644
index 00000000000..2f83fa30085
--- /dev/null
+++ b/homeassistant/components/openuv/.translations/fr.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "error": {
+            "identifier_exists": "Coordonn\u00e9es d\u00e9j\u00e0 enregistr\u00e9es",
+            "invalid_api_key": "Cl\u00e9 d'API invalide"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "Cl\u00e9 d'API OpenUV",
+                    "elevation": "Altitude",
+                    "latitude": "Latitude",
+                    "longitude": "Longitude"
+                },
+                "title": "Veuillez saisir vos informations"
+            }
+        },
+        "title": "OpenUV"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/openuv/.translations/hu.json b/homeassistant/components/openuv/.translations/hu.json
new file mode 100644
index 00000000000..fd30f83c5f8
--- /dev/null
+++ b/homeassistant/components/openuv/.translations/hu.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "error": {
+            "identifier_exists": "A koordin\u00e1t\u00e1k m\u00e1r regisztr\u00e1lva vannak",
+            "invalid_api_key": "\u00c9rv\u00e9nytelen API kulcs"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "OpenUV API kulcs",
+                    "elevation": "Magass\u00e1g",
+                    "latitude": "Sz\u00e9less\u00e9g",
+                    "longitude": "Hossz\u00fas\u00e1g"
+                },
+                "title": "T\u00f6ltsd ki az adataid"
+            }
+        },
+        "title": "OpenUV"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/openuv/.translations/it.json b/homeassistant/components/openuv/.translations/it.json
new file mode 100644
index 00000000000..a18d36693d5
--- /dev/null
+++ b/homeassistant/components/openuv/.translations/it.json
@@ -0,0 +1,15 @@
+{
+    "config": {
+        "error": {
+            "invalid_api_key": "Chiave API non valida"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "latitude": "Latitudine",
+                    "longitude": "Logitudine"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/openuv/.translations/pl.json b/homeassistant/components/openuv/.translations/pl.json
new file mode 100644
index 00000000000..fdb94b293b8
--- /dev/null
+++ b/homeassistant/components/openuv/.translations/pl.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "error": {
+            "identifier_exists": "Wsp\u00f3\u0142rz\u0119dne s\u0105 ju\u017c zarejestrowane",
+            "invalid_api_key": "Nieprawid\u0142owy klucz API"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "Klucz API OpenUV",
+                    "latitude": "Szeroko\u015b\u0107 geograficzna",
+                    "longitude": "D\u0142ugo\u015b\u0107 geograficzna"
+                }
+            }
+        },
+        "title": "OpenUV"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/openuv/.translations/ru.json b/homeassistant/components/openuv/.translations/ru.json
new file mode 100644
index 00000000000..bd7fc3f8191
--- /dev/null
+++ b/homeassistant/components/openuv/.translations/ru.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "error": {
+            "identifier_exists": "\u041a\u043e\u043e\u0440\u0434\u0438\u043d\u0430\u0442\u044b \u0443\u0436\u0435 \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u044b",
+            "invalid_api_key": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u043a\u043b\u044e\u0447 API"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "\u041a\u043b\u044e\u0447 API OpenUV",
+                    "elevation": "\u0412\u044b\u0441\u043e\u0442\u0430",
+                    "latitude": "\u0428\u0438\u0440\u043e\u0442\u0430",
+                    "longitude": "\u0414\u043e\u043b\u0433\u043e\u0442\u0430"
+                },
+                "title": "\u0417\u0430\u043f\u043e\u043b\u043d\u0438\u0442\u0435 \u0441\u0432\u043e\u044e \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e"
+            }
+        },
+        "title": "OpenUV"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/openuv/.translations/sl.json b/homeassistant/components/openuv/.translations/sl.json
new file mode 100644
index 00000000000..6d8c537d6aa
--- /dev/null
+++ b/homeassistant/components/openuv/.translations/sl.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "error": {
+            "identifier_exists": "Koordinate \u017ee registrirane",
+            "invalid_api_key": "Neveljaven API klju\u010d"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "OpenUV API Klju\u010d",
+                    "elevation": "Nadmorska vi\u0161ina",
+                    "latitude": "Zemljepisna \u0161irina",
+                    "longitude": "Zemljepisna dol\u017eina"
+                },
+                "title": "Izpolnite svoje podatke"
+            }
+        },
+        "title": "OpenUV"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/openuv/.translations/sv.json b/homeassistant/components/openuv/.translations/sv.json
new file mode 100644
index 00000000000..0df9a0434ab
--- /dev/null
+++ b/homeassistant/components/openuv/.translations/sv.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "error": {
+            "invalid_api_key": "Ogiltigt API-l\u00f6senord"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "OpenUV API-nyckel",
+                    "elevation": "H\u00f6jd",
+                    "latitude": "Latitud",
+                    "longitude": "Longitud"
+                },
+                "title": "Fyll i dina uppgifter"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/openuv/.translations/zh-Hans.json b/homeassistant/components/openuv/.translations/zh-Hans.json
new file mode 100644
index 00000000000..d8f46d6afe4
--- /dev/null
+++ b/homeassistant/components/openuv/.translations/zh-Hans.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "error": {
+            "identifier_exists": "\u5750\u6807\u5df2\u7ecf\u6ce8\u518c",
+            "invalid_api_key": "\u65e0\u6548\u7684 API \u5bc6\u94a5"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "OpenUV API \u5bc6\u94a5",
+                    "elevation": "\u6d77\u62d4",
+                    "latitude": "\u7eac\u5ea6",
+                    "longitude": "\u7ecf\u5ea6"
+                },
+                "title": "\u586b\u5199\u60a8\u7684\u4fe1\u606f"
+            }
+        },
+        "title": "OpenUV"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/openuv/.translations/zh-Hant.json b/homeassistant/components/openuv/.translations/zh-Hant.json
new file mode 100644
index 00000000000..2310af22fa2
--- /dev/null
+++ b/homeassistant/components/openuv/.translations/zh-Hant.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "error": {
+            "identifier_exists": "\u8a72\u5ea7\u6a19\u5df2\u8a3b\u518a",
+            "invalid_api_key": "API \u5bc6\u78bc\u7121\u6548"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "OpenUV API \u5bc6\u9470",
+                    "elevation": "\u6d77\u62d4",
+                    "latitude": "\u7def\u5ea6",
+                    "longitude": "\u7d93\u5ea6"
+                },
+                "title": "\u586b\u5beb\u8cc7\u8a0a"
+            }
+        },
+        "title": "OpenUV"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/sensor/.translations/moon.da.json b/homeassistant/components/sensor/.translations/moon.da.json
new file mode 100644
index 00000000000..330df6d0cf7
--- /dev/null
+++ b/homeassistant/components/sensor/.translations/moon.da.json
@@ -0,0 +1,5 @@
+{
+    "state": {
+        "full_moon": "Fuldm\u00e5ne"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/sensor/.translations/moon.it.json b/homeassistant/components/sensor/.translations/moon.it.json
index fce5152b3f9..014437e3fe4 100644
--- a/homeassistant/components/sensor/.translations/moon.it.json
+++ b/homeassistant/components/sensor/.translations/moon.it.json
@@ -3,6 +3,9 @@
         "first_quarter": "Primo quarto",
         "full_moon": "Luna piena",
         "last_quarter": "Ultimo quarto",
-        "new_moon": "Nuova luna"
+        "new_moon": "Nuova luna",
+        "waning_gibbous": "Gibbosa calante",
+        "waxing_crescent": "Luna crescente",
+        "waxing_gibbous": "Gibbosa crescente"
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/sonos/.translations/fr.json b/homeassistant/components/sonos/.translations/fr.json
index 768a798e6d5..809591dee7c 100644
--- a/homeassistant/components/sonos/.translations/fr.json
+++ b/homeassistant/components/sonos/.translations/fr.json
@@ -6,8 +6,10 @@
         },
         "step": {
             "confirm": {
-                "description": "Voulez-vous configurer Sonos?"
+                "description": "Voulez-vous configurer Sonos?",
+                "title": "Sonos"
             }
-        }
+        },
+        "title": "Sonos"
     }
 }
\ No newline at end of file

From 3f97944f6b5125a08fbd7e43b3acda33762c0833 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 10 Sep 2018 13:44:56 +0200
Subject: [PATCH 078/357] Bumped version to 0.78.0b0

---
 homeassistant/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/const.py b/homeassistant/const.py
index 3bb468c1b1e..ba7011b388a 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -2,7 +2,7 @@
 """Constants used by Home Assistant components."""
 MAJOR_VERSION = 0
 MINOR_VERSION = 78
-PATCH_VERSION = '0.dev0'
+PATCH_VERSION = '0b0'
 __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
 __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
 REQUIRED_PYTHON_VER = (3, 5, 3)

From 99f7b7f42dcb3965c80e4729728b7366f2f8dffd Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 10 Sep 2018 13:46:07 +0200
Subject: [PATCH 079/357] Version bump to 0.79.0dev0

---
 homeassistant/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/const.py b/homeassistant/const.py
index 3bb468c1b1e..d27b5e3a1b7 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 """Constants used by Home Assistant components."""
 MAJOR_VERSION = 0
-MINOR_VERSION = 78
+MINOR_VERSION = 79
 PATCH_VERSION = '0.dev0'
 __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
 __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)

From 7a5e828f6b45a7d22197e1261f5920a1b7de9e33 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <frenck@frenck.nl>
Date: Mon, 10 Sep 2018 14:28:21 +0200
Subject: [PATCH 080/357] Updates documentation repo URL in PR template
 (#16537)

---
 .github/PULL_REQUEST_TEMPLATE.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index c2f65f9a8be..1e37cf86fc3 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -3,7 +3,7 @@
 
 **Related issue (if applicable):** fixes #<home-assistant issue number goes here>
 
-**Pull request in [home-assistant.github.io](https://github.com/home-assistant/home-assistant.github.io) with documentation (if applicable):** home-assistant/home-assistant.github.io#<home-assistant.github.io PR number goes here>
+**Pull request in [home-assistant.io](https://github.com/home-assistant/home-assistant.io) with documentation (if applicable):** home-assistant/home-assistant.io#<home-assistant.io PR number goes here>
 
 ## Example entry for `configuration.yaml` (if applicable):
 ```yaml
@@ -15,7 +15,7 @@
   - [ ] Local tests pass with `tox`. **Your PR cannot be merged unless tests pass**
 
 If user exposed functionality or configuration variables are added/changed:
-  - [ ] Documentation added/updated in [home-assistant.github.io](https://github.com/home-assistant/home-assistant.github.io)
+  - [ ] Documentation added/updated in [home-assistant.io](https://github.com/home-assistant/home-assistant.io)
 
 If the code communicates with devices, web services, or third-party tools:
   - [ ] New dependencies have been added to the `REQUIREMENTS` variable ([example][ex-requir]).

From d2d715faa8dd551c3fd4dd999d62314344a04685 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 10 Sep 2018 16:07:31 +0200
Subject: [PATCH 081/357] Upgrade wakeonlan to 1.1.6 (#16512)

---
 .../media_player/panasonic_viera.py           |  2 +-
 .../components/media_player/samsungtv.py      |  2 +-
 .../components/switch/wake_on_lan.py          | 28 ++++++++-----------
 homeassistant/components/wake_on_lan.py       |  5 ++--
 requirements_all.txt                          |  2 +-
 requirements_test_all.txt                     |  2 +-
 6 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/homeassistant/components/media_player/panasonic_viera.py b/homeassistant/components/media_player/panasonic_viera.py
index efe04c7005b..d3e56c4dfb1 100644
--- a/homeassistant/components/media_player/panasonic_viera.py
+++ b/homeassistant/components/media_player/panasonic_viera.py
@@ -18,7 +18,7 @@ from homeassistant.const import (
     STATE_UNKNOWN)
 import homeassistant.helpers.config_validation as cv
 
-REQUIREMENTS = ['panasonic_viera==0.3.1', 'wakeonlan==1.0.0']
+REQUIREMENTS = ['panasonic_viera==0.3.1', 'wakeonlan==1.1.6']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/media_player/samsungtv.py b/homeassistant/components/media_player/samsungtv.py
index cc966c0d263..c0a5d617f19 100644
--- a/homeassistant/components/media_player/samsungtv.py
+++ b/homeassistant/components/media_player/samsungtv.py
@@ -24,7 +24,7 @@ from homeassistant.const import (
 import homeassistant.helpers.config_validation as cv
 from homeassistant.util import dt as dt_util
 
-REQUIREMENTS = ['samsungctl[websocket]==0.7.1', 'wakeonlan==1.0.0']
+REQUIREMENTS = ['samsungctl[websocket]==0.7.1', 'wakeonlan==1.1.6']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/switch/wake_on_lan.py b/homeassistant/components/switch/wake_on_lan.py
index 06f86865064..16bd700e1d5 100644
--- a/homeassistant/components/switch/wake_on_lan.py
+++ b/homeassistant/components/switch/wake_on_lan.py
@@ -10,26 +10,26 @@ import subprocess as sp
 
 import voluptuous as vol
 
-from homeassistant.components.switch import (SwitchDevice, PLATFORM_SCHEMA)
+from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchDevice
+from homeassistant.const import CONF_HOST, CONF_NAME
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.script import Script
-from homeassistant.const import (CONF_HOST, CONF_NAME)
 
-REQUIREMENTS = ['wakeonlan==1.0.0']
+REQUIREMENTS = ['wakeonlan==1.1.6']
 
 _LOGGER = logging.getLogger(__name__)
 
+CONF_BROADCAST_ADDRESS = 'broadcast_address'
 CONF_MAC_ADDRESS = 'mac_address'
 CONF_OFF_ACTION = 'turn_off'
-CONF_BROADCAST_ADDRESS = 'broadcast_address'
 
 DEFAULT_NAME = 'Wake on LAN'
 DEFAULT_PING_TIMEOUT = 1
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Required(CONF_MAC_ADDRESS): cv.string,
-    vol.Optional(CONF_HOST): cv.string,
     vol.Optional(CONF_BROADCAST_ADDRESS): cv.string,
+    vol.Optional(CONF_HOST): cv.string,
     vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
     vol.Optional(CONF_OFF_ACTION): cv.SCRIPT_SCHEMA,
 })
@@ -37,21 +37,22 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up a wake on lan switch."""
-    name = config.get(CONF_NAME)
+    broadcast_address = config.get(CONF_BROADCAST_ADDRESS)
     host = config.get(CONF_HOST)
     mac_address = config.get(CONF_MAC_ADDRESS)
-    broadcast_address = config.get(CONF_BROADCAST_ADDRESS)
+    name = config.get(CONF_NAME)
     off_action = config.get(CONF_OFF_ACTION)
 
-    add_entities([WOLSwitch(hass, name, host, mac_address,
-                            off_action, broadcast_address)], True)
+    add_entities([WOLSwitch(
+        hass, name, host, mac_address, off_action, broadcast_address)], True)
 
 
 class WOLSwitch(SwitchDevice):
     """Representation of a wake on lan switch."""
 
-    def __init__(self, hass, name, host, mac_address,
-                 off_action, broadcast_address):
+    def __init__(
+            self, hass, name, host, mac_address, off_action,
+            broadcast_address):
         """Initialize the WOL switch."""
         import wakeonlan
         self._hass = hass
@@ -63,11 +64,6 @@ class WOLSwitch(SwitchDevice):
         self._state = False
         self._wol = wakeonlan
 
-    @property
-    def should_poll(self):
-        """Return the polling state."""
-        return True
-
     @property
     def is_on(self):
         """Return true if switch is on."""
diff --git a/homeassistant/components/wake_on_lan.py b/homeassistant/components/wake_on_lan.py
index 4e729c7ccc7..5bcb0d4dd79 100644
--- a/homeassistant/components/wake_on_lan.py
+++ b/homeassistant/components/wake_on_lan.py
@@ -13,11 +13,12 @@ import voluptuous as vol
 from homeassistant.const import CONF_MAC
 import homeassistant.helpers.config_validation as cv
 
-REQUIREMENTS = ['wakeonlan==1.0.0']
+REQUIREMENTS = ['wakeonlan==1.1.6']
 
-DOMAIN = "wake_on_lan"
 _LOGGER = logging.getLogger(__name__)
 
+DOMAIN = 'wake_on_lan'
+
 CONF_BROADCAST_ADDRESS = 'broadcast_address'
 
 SERVICE_SEND_MAGIC_PACKET = 'send_magic_packet'
diff --git a/requirements_all.txt b/requirements_all.txt
index 358f5ac2244..af51d0870cd 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1461,7 +1461,7 @@ vultr==0.1.2
 # homeassistant.components.media_player.panasonic_viera
 # homeassistant.components.media_player.samsungtv
 # homeassistant.components.switch.wake_on_lan
-wakeonlan==1.0.0
+wakeonlan==1.1.6
 
 # homeassistant.components.sensor.waqi
 waqiasync==1.0.0
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 9f875118b2e..736ba9115e4 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -222,7 +222,7 @@ vultr==0.1.2
 # homeassistant.components.media_player.panasonic_viera
 # homeassistant.components.media_player.samsungtv
 # homeassistant.components.switch.wake_on_lan
-wakeonlan==1.0.0
+wakeonlan==1.1.6
 
 # homeassistant.components.cloud
 warrant==0.6.1

From e96635b5c1171f68c6b55fd32ba7aa81064a3a3d Mon Sep 17 00:00:00 2001
From: vikramgorla <vikram.gorla@gmail.com>
Date: Mon, 10 Sep 2018 16:13:05 +0200
Subject: [PATCH 082/357] bugfix - incorrect camera type and missing sensors
 when multiple netatmo cameras (#16490)

fixed get_camera_type as it was originally not consuming any input, was looping with all cameras and the first camera type was retutned, modified to call cameraType using provided camera name.
---
 homeassistant/components/netatmo.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/homeassistant/components/netatmo.py b/homeassistant/components/netatmo.py
index c25b57fbd62..59b0a64f6e9 100644
--- a/homeassistant/components/netatmo.py
+++ b/homeassistant/components/netatmo.py
@@ -101,10 +101,10 @@ class CameraData:
         return self.module_names
 
     def get_camera_type(self, camera=None, home=None, cid=None):
-        """Return all module available on the API as a list."""
-        for camera_name in self.camera_names:
-            self.camera_type = self.camera_data.cameraType(camera_name)
-            return self.camera_type
+        """Return camera type for a camera, cid has preference over camera."""
+        self.camera_type = self.camera_data.cameraType(camera=camera,
+                                                       home=home, cid=cid)
+        return self.camera_type
 
     @Throttle(MIN_TIME_BETWEEN_UPDATES)
     def update(self):

From f858938adad94439c9d333be5fc70d31b2ec4c94 Mon Sep 17 00:00:00 2001
From: mrosseel <mrosseel@users.noreply.github.com>
Date: Mon, 10 Sep 2018 16:19:17 +0200
Subject: [PATCH 083/357] Make the Qnap sensor more resilient if server is not
 reachable (#16445)

* add CONF_ALLOW_UNREACHABLE option, retry connection if allowed

* fix linting errors

* Removing the config option, just using PlatformNotReady
---
 homeassistant/components/sensor/qnap.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/homeassistant/components/sensor/qnap.py b/homeassistant/components/sensor/qnap.py
index 29eb8cd6749..a6a9c6e30d0 100644
--- a/homeassistant/components/sensor/qnap.py
+++ b/homeassistant/components/sensor/qnap.py
@@ -15,6 +15,7 @@ from homeassistant.const import (
     CONF_HOST, CONF_USERNAME, CONF_PASSWORD, CONF_PORT, CONF_SSL, ATTR_NAME,
     CONF_VERIFY_SSL, CONF_TIMEOUT, CONF_MONITORED_CONDITIONS, TEMP_CELSIUS)
 from homeassistant.util import Throttle
+from homeassistant.exceptions import PlatformNotReady
 import homeassistant.helpers.config_validation as cv
 
 REQUIREMENTS = ['qnapstats==0.2.7']
@@ -107,14 +108,9 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     api = QNAPStatsAPI(config)
     api.update()
 
+    # QNAP is not available
     if not api.data:
-        hass.components.persistent_notification.create(
-            'Error: Failed to set up QNAP sensor.<br />'
-            'Check the logs for additional information. '
-            'You will need to restart hass after fixing.',
-            title=NOTIFICATION_TITLE,
-            notification_id=NOTIFICATION_ID)
-        return False
+        raise PlatformNotReady
 
     sensors = []
 

From dcd7b9a52941abaee6cb4eeb4633a77dbfbc80c2 Mon Sep 17 00:00:00 2001
From: Tom Harris <tharris@harrisnj.net>
Date: Mon, 10 Sep 2018 10:54:17 -0400
Subject: [PATCH 084/357] Fix insteon Hub v1 support (#16472)

* Fix support for Hub version 1 (i.e. pre-2014 Hub model 2242)

* Bump insteonplm to 0.14.1

* Code review changes

* Clean up and better document set_default_port

* Simplify set_default_port based on code review

* Remove Callable type import

* Simplify port setup
---
 homeassistant/components/insteon/__init__.py | 40 +++++++++++++-------
 requirements_all.txt                         |  2 +-
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/homeassistant/components/insteon/__init__.py b/homeassistant/components/insteon/__init__.py
index d79640b77ab..749d167e6de 100644
--- a/homeassistant/components/insteon/__init__.py
+++ b/homeassistant/components/insteon/__init__.py
@@ -7,6 +7,8 @@ https://home-assistant.io/components/insteon/
 import asyncio
 import collections
 import logging
+from typing import Dict
+
 import voluptuous as vol
 
 from homeassistant.core import callback
@@ -18,7 +20,7 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers import discovery
 from homeassistant.helpers.entity import Entity
 
-REQUIREMENTS = ['insteonplm==0.13.1']
+REQUIREMENTS = ['insteonplm==0.14.2']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -27,9 +29,9 @@ DOMAIN = 'insteon'
 CONF_IP_PORT = 'ip_port'
 CONF_HUB_USERNAME = 'username'
 CONF_HUB_PASSWORD = 'password'
+CONF_HUB_VERSION = 'hub_version'
 CONF_OVERRIDE = 'device_override'
-CONF_PLM_HUB_MSG = ('Must configure either a PLM port or a Hub host, username '
-                    'and password')
+CONF_PLM_HUB_MSG = 'Must configure either a PLM port or a Hub host'
 CONF_ADDRESS = 'address'
 CONF_CAT = 'cat'
 CONF_SUBCAT = 'subcat'
@@ -66,6 +68,22 @@ EVENT_BUTTON_ON = 'insteon.button_on'
 EVENT_BUTTON_OFF = 'insteon.button_off'
 EVENT_CONF_BUTTON = 'button'
 
+
+def set_default_port(schema: Dict) -> Dict:
+    """Set the default port based on the Hub version."""
+    # If the ip_port is found do nothing
+    # If it is not found the set the default
+    ip_port = schema.get(CONF_IP_PORT)
+    if not ip_port:
+        hub_version = schema.get(CONF_HUB_VERSION)
+        # Found hub_version but not ip_port
+        if hub_version == 1:
+            schema[CONF_IP_PORT] = 9761
+        else:
+            schema[CONF_IP_PORT] = 25105
+    return schema
+
+
 CONF_DEVICE_OVERRIDE_SCHEMA = vol.All(
     cv.deprecated(CONF_PLATFORM), vol.Schema({
         vol.Required(CONF_ADDRESS): cv.string,
@@ -88,12 +106,13 @@ CONFIG_SCHEMA = vol.Schema({
     DOMAIN: vol.All(
         vol.Schema(
             {vol.Exclusive(CONF_PORT, 'plm_or_hub',
-                           msg=CONF_PLM_HUB_MSG): cv.isdevice,
+                           msg=CONF_PLM_HUB_MSG): cv.string,
              vol.Exclusive(CONF_HOST, 'plm_or_hub',
                            msg=CONF_PLM_HUB_MSG): cv.string,
-             vol.Optional(CONF_IP_PORT, default=25105): int,
+             vol.Optional(CONF_IP_PORT): cv.port,
              vol.Optional(CONF_HUB_USERNAME): cv.string,
              vol.Optional(CONF_HUB_PASSWORD): cv.string,
+             vol.Optional(CONF_HUB_VERSION, default=2): vol.In([1, 2]),
              vol.Optional(CONF_OVERRIDE): vol.All(
                  cv.ensure_list_csv, [CONF_DEVICE_OVERRIDE_SCHEMA]),
              vol.Optional(CONF_X10_ALL_UNITS_OFF): vol.In(HOUSECODES),
@@ -103,14 +122,7 @@ CONFIG_SCHEMA = vol.Schema({
                                              [CONF_X10_SCHEMA])
              }, extra=vol.ALLOW_EXTRA, required=True),
         cv.has_at_least_one_key(CONF_PORT, CONF_HOST),
-        vol.Schema(
-            {vol.Inclusive(CONF_HOST, 'hub',
-                           msg=CONF_PLM_HUB_MSG): cv.string,
-             vol.Inclusive(CONF_HUB_USERNAME, 'hub',
-                           msg=CONF_PLM_HUB_MSG): cv.string,
-             vol.Inclusive(CONF_HUB_PASSWORD, 'hub',
-                           msg=CONF_PLM_HUB_MSG): cv.string,
-             }, extra=vol.ALLOW_EXTRA, required=True))
+        set_default_port)
     }, extra=vol.ALLOW_EXTRA)
 
 
@@ -151,6 +163,7 @@ def async_setup(hass, config):
     ip_port = conf.get(CONF_IP_PORT)
     username = conf.get(CONF_HUB_USERNAME)
     password = conf.get(CONF_HUB_PASSWORD)
+    hub_version = conf.get(CONF_HUB_VERSION)
     overrides = conf.get(CONF_OVERRIDE, [])
     x10_devices = conf.get(CONF_X10, [])
     x10_all_units_off_housecode = conf.get(CONF_X10_ALL_UNITS_OFF)
@@ -284,6 +297,7 @@ def async_setup(hass, config):
             port=ip_port,
             username=username,
             password=password,
+            hub_version=hub_version,
             loop=hass.loop,
             workdir=hass.config.config_dir)
     else:
diff --git a/requirements_all.txt b/requirements_all.txt
index af51d0870cd..b21c398961c 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -486,7 +486,7 @@ ihcsdk==2.2.0
 influxdb==5.0.0
 
 # homeassistant.components.insteon
-insteonplm==0.13.1
+insteonplm==0.14.2
 
 # homeassistant.components.sensor.iperf3
 iperf3==0.1.10

From cfe5db4350431af827c95974971bb57f1eeb04f4 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Mon, 10 Sep 2018 23:51:40 +0200
Subject: [PATCH 085/357] Fail fetch auth providers if onboarding required
 (#16454)

---
 homeassistant/components/auth/login_flow.py | 15 ++++++++++++---
 tests/components/auth/test_login_flow.py    | 15 +++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/auth/login_flow.py b/homeassistant/components/auth/login_flow.py
index a518bdde415..73a739c2960 100644
--- a/homeassistant/components/auth/login_flow.py
+++ b/homeassistant/components/auth/login_flow.py
@@ -66,7 +66,7 @@ associate with an credential if "type" set to "link_user" in
     "version": 1
 }
 """
-import aiohttp.web
+from aiohttp import web
 import voluptuous as vol
 
 from homeassistant import data_entry_flow
@@ -95,11 +95,20 @@ class AuthProvidersView(HomeAssistantView):
 
     async def get(self, request):
         """Get available auth providers."""
+        hass = request.app['hass']
+
+        if not hass.components.onboarding.async_is_onboarded():
+            return self.json_message(
+                message='Onboarding not finished',
+                status_code=400,
+                message_code='onboarding_required'
+            )
+
         return self.json([{
             'name': provider.name,
             'id': provider.id,
             'type': provider.type,
-        } for provider in request.app['hass'].auth.auth_providers])
+        } for provider in hass.auth.auth_providers])
 
 
 def _prepare_result_json(result):
@@ -139,7 +148,7 @@ class LoginFlowIndexView(HomeAssistantView):
 
     async def get(self, request):
         """Do not allow index of flows in progress."""
-        return aiohttp.web.Response(status=405)
+        return web.Response(status=405)
 
     @RequestDataValidator(vol.Schema({
         vol.Required('client_id'): str,
diff --git a/tests/components/auth/test_login_flow.py b/tests/components/auth/test_login_flow.py
index 8b6108067c5..d759bac74b7 100644
--- a/tests/components/auth/test_login_flow.py
+++ b/tests/components/auth/test_login_flow.py
@@ -1,4 +1,6 @@
 """Tests for the login flow."""
+from unittest.mock import patch
+
 from . import async_setup_auth
 
 from tests.common import CLIENT_ID, CLIENT_REDIRECT_URI
@@ -16,6 +18,19 @@ async def test_fetch_auth_providers(hass, aiohttp_client):
     }]
 
 
+async def test_fetch_auth_providers_onboarding(hass, aiohttp_client):
+    """Test fetching auth providers."""
+    client = await async_setup_auth(hass, aiohttp_client)
+    with patch('homeassistant.components.onboarding.async_is_onboarded',
+               return_value=False):
+        resp = await client.get('/auth/providers')
+    assert resp.status == 400
+    assert await resp.json() == {
+        'message': 'Onboarding not finished',
+        'code': 'onboarding_required',
+    }
+
+
 async def test_cannot_get_flows_in_progress(hass, aiohttp_client):
     """Test we cannot get flows in progress."""
     client = await async_setup_auth(hass, aiohttp_client, [])

From a059cc860a4c99e3edf3972af809b39fba191073 Mon Sep 17 00:00:00 2001
From: cgtobi <cgtobi@users.noreply.github.com>
Date: Tue, 11 Sep 2018 05:55:02 +0200
Subject: [PATCH 086/357] Update PyRMVtransport version (#16547)

* Update PyRMVtransport version

* Update requirements.
---
 homeassistant/components/sensor/rmvtransport.py | 2 +-
 requirements_all.txt                            | 2 +-
 requirements_test_all.txt                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/sensor/rmvtransport.py b/homeassistant/components/sensor/rmvtransport.py
index 3d7fd2aa3b7..0916765e12d 100644
--- a/homeassistant/components/sensor/rmvtransport.py
+++ b/homeassistant/components/sensor/rmvtransport.py
@@ -13,7 +13,7 @@ from homeassistant.helpers.entity import Entity
 from homeassistant.components.sensor import PLATFORM_SCHEMA
 from homeassistant.const import (CONF_NAME, ATTR_ATTRIBUTION)
 
-REQUIREMENTS = ['PyRMVtransport==0.0.7']
+REQUIREMENTS = ['PyRMVtransport==0.1']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/requirements_all.txt b/requirements_all.txt
index b21c398961c..50cc56f3443 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -52,7 +52,7 @@ PyMata==2.14
 PyQRCode==1.2.1
 
 # homeassistant.components.sensor.rmvtransport
-PyRMVtransport==0.0.7
+PyRMVtransport==0.1
 
 # homeassistant.components.switch.switchbot
 PySwitchbot==0.3
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 736ba9115e4..42f2c11242e 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -22,7 +22,7 @@ requests_mock==1.5.2
 HAP-python==2.2.2
 
 # homeassistant.components.sensor.rmvtransport
-PyRMVtransport==0.0.7
+PyRMVtransport==0.1
 
 # homeassistant.components.sonos
 SoCo==0.16

From ee696643cd7c63bf0cc88f5111c64b6e2d836640 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 11 Sep 2018 12:21:48 +0300
Subject: [PATCH 087/357] Isort preparations (#16555)

* Don't treat typing as an "in-between" module for import order

That was a < 3.5 era thing.

* Tighten scope of some pylint unused-import disables

To avoid isort moving a top level one around, undesirably broadening its
scope.
---
 homeassistant/__main__.py                             | 1 -
 homeassistant/bootstrap.py                            | 1 -
 homeassistant/components/apple_tv.py                  | 1 -
 homeassistant/components/geo_location/demo.py         | 1 -
 homeassistant/components/google_assistant/__init__.py | 2 +-
 homeassistant/components/google_assistant/auth.py     | 2 +-
 homeassistant/components/media_player/cast.py         | 1 -
 homeassistant/components/media_player/webostv.py      | 4 +---
 homeassistant/components/rachio.py                    | 2 +-
 homeassistant/components/recorder/__init__.py         | 1 -
 homeassistant/config.py                               | 3 +--
 homeassistant/core.py                                 | 3 +--
 homeassistant/data_entry_flow.py                      | 2 +-
 homeassistant/helpers/__init__.py                     | 1 -
 homeassistant/helpers/config_validation.py            | 1 -
 homeassistant/helpers/entity.py                       | 1 -
 homeassistant/helpers/json.py                         | 1 -
 homeassistant/loader.py                               | 4 +---
 homeassistant/scripts/__init__.py                     | 1 -
 homeassistant/scripts/check_config.py                 | 2 +-
 homeassistant/scripts/influxdb_import.py              | 1 -
 homeassistant/scripts/influxdb_migrator.py            | 1 -
 homeassistant/util/__init__.py                        | 1 -
 homeassistant/util/dt.py                              | 4 +---
 homeassistant/util/package.py                         | 1 -
 setup.cfg                                             | 2 --
 26 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/homeassistant/__main__.py b/homeassistant/__main__.py
index 65b1cd2ae1a..80bc1dccff4 100644
--- a/homeassistant/__main__.py
+++ b/homeassistant/__main__.py
@@ -7,7 +7,6 @@ import platform
 import subprocess
 import sys
 import threading
-
 from typing import List, Dict, Any  # noqa pylint: disable=unused-import
 
 
diff --git a/homeassistant/bootstrap.py b/homeassistant/bootstrap.py
index 2051359c0ba..2125ab46a8c 100644
--- a/homeassistant/bootstrap.py
+++ b/homeassistant/bootstrap.py
@@ -5,7 +5,6 @@ import os
 import sys
 from time import time
 from collections import OrderedDict
-
 from typing import Any, Optional, Dict
 
 import voluptuous as vol
diff --git a/homeassistant/components/apple_tv.py b/homeassistant/components/apple_tv.py
index 97fb2363024..21ff0e3286d 100644
--- a/homeassistant/components/apple_tv.py
+++ b/homeassistant/components/apple_tv.py
@@ -6,7 +6,6 @@ https://home-assistant.io/components/apple_tv/
 """
 import asyncio
 import logging
-
 from typing import Sequence, TypeVar, Union
 
 import voluptuous as vol
diff --git a/homeassistant/components/geo_location/demo.py b/homeassistant/components/geo_location/demo.py
index 8e8d8211086..ddec369e696 100644
--- a/homeassistant/components/geo_location/demo.py
+++ b/homeassistant/components/geo_location/demo.py
@@ -8,7 +8,6 @@ import logging
 import random
 from datetime import timedelta
 from math import pi, cos, sin, radians
-
 from typing import Optional
 
 from homeassistant.components.geo_location import GeoLocationEvent
diff --git a/homeassistant/components/google_assistant/__init__.py b/homeassistant/components/google_assistant/__init__.py
index 567a6d84233..22569af1f86 100644
--- a/homeassistant/components/google_assistant/__init__.py
+++ b/homeassistant/components/google_assistant/__init__.py
@@ -6,6 +6,7 @@ https://home-assistant.io/components/google_assistant/
 """
 import asyncio
 import logging
+from typing import Dict, Any
 
 import aiohttp
 import async_timeout
@@ -14,7 +15,6 @@ import voluptuous as vol
 
 # Typing imports
 from homeassistant.core import HomeAssistant
-from typing import Dict, Any
 
 from homeassistant.const import CONF_NAME
 from homeassistant.helpers import config_validation as cv
diff --git a/homeassistant/components/google_assistant/auth.py b/homeassistant/components/google_assistant/auth.py
index e80b2282066..5b98e25014d 100644
--- a/homeassistant/components/google_assistant/auth.py
+++ b/homeassistant/components/google_assistant/auth.py
@@ -1,11 +1,11 @@
 """Google Assistant OAuth View."""
 
 import logging
+from typing import Dict, Any
 
 # Typing imports
 # if False:
 from aiohttp.web import Request, Response
-from typing import Dict, Any
 
 from homeassistant.core import HomeAssistant
 from homeassistant.components.http import HomeAssistantView
diff --git a/homeassistant/components/media_player/cast.py b/homeassistant/components/media_player/cast.py
index 83b84f5c3bb..83c3595ebd9 100644
--- a/homeassistant/components/media_player/cast.py
+++ b/homeassistant/components/media_player/cast.py
@@ -7,7 +7,6 @@ https://home-assistant.io/components/media_player.cast/
 import asyncio
 import logging
 import threading
-
 from typing import Optional, Tuple
 
 import attr
diff --git a/homeassistant/components/media_player/webostv.py b/homeassistant/components/media_player/webostv.py
index b3cd07b9d35..b5240bdb9f5 100644
--- a/homeassistant/components/media_player/webostv.py
+++ b/homeassistant/components/media_player/webostv.py
@@ -8,9 +8,7 @@ import asyncio
 from datetime import timedelta
 import logging
 from urllib.parse import urlparse
-
-# pylint: disable=unused-import
-from typing import Dict  # noqa: F401
+from typing import Dict  # noqa: F401 pylint: disable=unused-import
 
 import voluptuous as vol
 
diff --git a/homeassistant/components/rachio.py b/homeassistant/components/rachio.py
index 0e67e15d5c0..cd80b7bec9b 100644
--- a/homeassistant/components/rachio.py
+++ b/homeassistant/components/rachio.py
@@ -6,10 +6,10 @@ https://home-assistant.io/components/rachio/
 """
 import asyncio
 import logging
+from typing import Optional
 
 from aiohttp import web
 import voluptuous as vol
-from typing import Optional
 from homeassistant.auth.util import generate_secret
 from homeassistant.components.http import HomeAssistantView
 from homeassistant.const import CONF_API_KEY, EVENT_HOMEASSISTANT_STOP, URL_API
diff --git a/homeassistant/components/recorder/__init__.py b/homeassistant/components/recorder/__init__.py
index 47d6e181c8f..a3cd2eebd8c 100644
--- a/homeassistant/components/recorder/__init__.py
+++ b/homeassistant/components/recorder/__init__.py
@@ -15,7 +15,6 @@ import logging
 import queue
 import threading
 import time
-
 from typing import Any, Dict, Optional  # noqa: F401
 
 import voluptuous as vol
diff --git a/homeassistant/config.py b/homeassistant/config.py
index d742e62660b..5474b283494 100644
--- a/homeassistant/config.py
+++ b/homeassistant/config.py
@@ -6,8 +6,7 @@ import logging
 import os
 import re
 import shutil
-# pylint: disable=unused-import
-from typing import (  # noqa: F401
+from typing import (  # noqa: F401 pylint: disable=unused-import
     Any, Tuple, Optional, Dict, List, Union, Callable, Sequence, Set)
 from types import ModuleType
 import voluptuous as vol
diff --git a/homeassistant/core.py b/homeassistant/core.py
index 2b7a2479471..fdbbe49ea05 100644
--- a/homeassistant/core.py
+++ b/homeassistant/core.py
@@ -18,8 +18,7 @@ from time import monotonic
 import uuid
 
 from types import MappingProxyType
-# pylint: disable=unused-import
-from typing import (  # NOQA
+from typing import (  # noqa: F401 pylint: disable=unused-import
     Optional, Any, Callable, List, TypeVar, Dict, Coroutine, Set,
     TYPE_CHECKING, Awaitable, Iterator)
 
diff --git a/homeassistant/data_entry_flow.py b/homeassistant/data_entry_flow.py
index a54c07fc1b8..ecf9850a67c 100644
--- a/homeassistant/data_entry_flow.py
+++ b/homeassistant/data_entry_flow.py
@@ -1,8 +1,8 @@
 """Classes to help gather user submissions."""
 import logging
+from typing import Dict, Any, Callable, Hashable, List, Optional  # noqa pylint: disable=unused-import
 import uuid
 import voluptuous as vol
-from typing import Dict, Any, Callable, Hashable, List, Optional  # noqa pylint: disable=unused-import
 from .core import callback, HomeAssistant
 from .exceptions import HomeAssistantError
 
diff --git a/homeassistant/helpers/__init__.py b/homeassistant/helpers/__init__.py
index ed489ed858b..abc3b7a2324 100644
--- a/homeassistant/helpers/__init__.py
+++ b/homeassistant/helpers/__init__.py
@@ -1,6 +1,5 @@
 """Helper methods for components within Home Assistant."""
 import re
-
 from typing import Any, Iterable, Tuple, Sequence, Dict
 
 from homeassistant.const import CONF_PLATFORM
diff --git a/homeassistant/helpers/config_validation.py b/homeassistant/helpers/config_validation.py
index 90098a677a1..3363b199b0b 100644
--- a/homeassistant/helpers/config_validation.py
+++ b/homeassistant/helpers/config_validation.py
@@ -7,7 +7,6 @@ from urllib.parse import urlparse
 from socket import _GLOBAL_DEFAULT_TIMEOUT
 import logging
 import inspect
-
 from typing import Any, Union, TypeVar, Callable, Sequence, Dict
 
 import voluptuous as vol
diff --git a/homeassistant/helpers/entity.py b/homeassistant/helpers/entity.py
index 695da5bce9c..e48af6a3365 100644
--- a/homeassistant/helpers/entity.py
+++ b/homeassistant/helpers/entity.py
@@ -4,7 +4,6 @@ from datetime import timedelta
 import logging
 import functools as ft
 from timeit import default_timer as timer
-
 from typing import Optional, List, Iterable
 
 from homeassistant.const import (
diff --git a/homeassistant/helpers/json.py b/homeassistant/helpers/json.py
index c28ee8c5c2c..bdb82687a32 100644
--- a/homeassistant/helpers/json.py
+++ b/homeassistant/helpers/json.py
@@ -2,7 +2,6 @@
 from datetime import datetime
 import json
 import logging
-
 from typing import Any
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/loader.py b/homeassistant/loader.py
index 3ac49e354b5..6fb003926e1 100644
--- a/homeassistant/loader.py
+++ b/homeassistant/loader.py
@@ -15,9 +15,7 @@ import importlib
 import logging
 import sys
 from types import ModuleType
-
-# pylint: disable=unused-import
-from typing import Optional, Set, TYPE_CHECKING, Callable, Any, TypeVar  # NOQA
+from typing import Optional, Set, TYPE_CHECKING, Callable, Any, TypeVar  # noqa pylint: disable=unused-import
 
 from homeassistant.const import PLATFORM_FORMAT
 from homeassistant.util import OrderedSet
diff --git a/homeassistant/scripts/__init__.py b/homeassistant/scripts/__init__.py
index 7aba3b2561c..02cc0bff362 100644
--- a/homeassistant/scripts/__init__.py
+++ b/homeassistant/scripts/__init__.py
@@ -5,7 +5,6 @@ import importlib
 import logging
 import os
 import sys
-
 from typing import List
 
 from homeassistant.bootstrap import async_mount_local_lib_path
diff --git a/homeassistant/scripts/check_config.py b/homeassistant/scripts/check_config.py
index e0c933df5bb..94add794651 100644
--- a/homeassistant/scripts/check_config.py
+++ b/homeassistant/scripts/check_config.py
@@ -6,10 +6,10 @@ import os
 from collections import OrderedDict, namedtuple
 from glob import glob
 from platform import system
+from typing import Dict, List, Sequence
 from unittest.mock import patch
 
 import attr
-from typing import Dict, List, Sequence
 import voluptuous as vol
 
 from homeassistant import bootstrap, core, loader
diff --git a/homeassistant/scripts/influxdb_import.py b/homeassistant/scripts/influxdb_import.py
index 031df1d3a72..a6dd90920c3 100644
--- a/homeassistant/scripts/influxdb_import.py
+++ b/homeassistant/scripts/influxdb_import.py
@@ -3,7 +3,6 @@ import argparse
 import json
 import os
 import sys
-
 from typing import List
 
 import homeassistant.config as config_util
diff --git a/homeassistant/scripts/influxdb_migrator.py b/homeassistant/scripts/influxdb_migrator.py
index a4c0df74b09..04d54cd3fa8 100644
--- a/homeassistant/scripts/influxdb_migrator.py
+++ b/homeassistant/scripts/influxdb_migrator.py
@@ -2,7 +2,6 @@
 
 import argparse
 import sys
-
 from typing import List
 
 
diff --git a/homeassistant/util/__init__.py b/homeassistant/util/__init__.py
index 1e74c500fc1..17849154ff7 100644
--- a/homeassistant/util/__init__.py
+++ b/homeassistant/util/__init__.py
@@ -11,7 +11,6 @@ import string
 from functools import wraps
 from types import MappingProxyType
 from unicodedata import normalize
-
 from typing import (Any, Optional, TypeVar, Callable, KeysView, Union,  # noqa
                     Iterable, List, Dict, Iterator, Coroutine, MutableSet)
 
diff --git a/homeassistant/util/dt.py b/homeassistant/util/dt.py
index 729195fb3fd..5d4b10454a7 100644
--- a/homeassistant/util/dt.py
+++ b/homeassistant/util/dt.py
@@ -1,9 +1,7 @@
 """Helper methods to handle the time in Home Assistant."""
 import datetime as dt
 import re
-
-# pylint: disable=unused-import
-from typing import Any, Dict, Union, Optional, Tuple  # NOQA
+from typing import Any, Dict, Union, Optional, Tuple  # noqa pylint: disable=unused-import
 
 import pytz
 import pytz.exceptions as pytzexceptions
diff --git a/homeassistant/util/package.py b/homeassistant/util/package.py
index 422809f7594..925755eb741 100644
--- a/homeassistant/util/package.py
+++ b/homeassistant/util/package.py
@@ -4,7 +4,6 @@ import logging
 import os
 from subprocess import PIPE, Popen
 import sys
-
 from typing import Optional
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/setup.cfg b/setup.cfg
index 7813cc5c047..a8bd819c792 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -32,6 +32,4 @@ indent = "    "
 not_skip = __init__.py
 # will group `import x` and `from x import` of the same module.
 force_sort_within_sections = true
-# typing is stdlib on py35 but 3rd party on py34, let it hang in between
-known_inbetweens = typing
 sections = FUTURE,STDLIB,INBETWEENS,THIRDPARTY,FIRSTPARTY,LOCALFOLDER

From 6b08e6e769680b4d325c12ed7c7100be4d458407 Mon Sep 17 00:00:00 2001
From: Zellux Wang <zellux@gmail.com>
Date: Tue, 11 Sep 2018 03:25:38 -0600
Subject: [PATCH 088/357] Fix arlo intilization when no base station available
 (#16529)

* Fix arlo intilization when no base station

* Fix pylint for empty camera check

* Fix typo

* Minor change to trigger CI again
---
 homeassistant/components/arlo.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/arlo.py b/homeassistant/components/arlo.py
index c6a414b9d91..015e1e0d1fc 100644
--- a/homeassistant/components/arlo.py
+++ b/homeassistant/components/arlo.py
@@ -61,10 +61,12 @@ def setup(hass, config):
         arlo_base_station = next((
             station for station in arlo.base_stations), None)
 
-        if arlo_base_station is None:
+        if arlo_base_station is not None:
+            arlo_base_station.refresh_rate = scan_interval.total_seconds()
+        elif not arlo.cameras:
+            _LOGGER.error("No Arlo camera or base station available.")
             return False
 
-        arlo_base_station.refresh_rate = scan_interval.total_seconds()
         hass.data[DATA_ARLO] = arlo
 
     except (ConnectTimeout, HTTPError) as ex:

From 20f6cb7cc77fa420b1b6ba290769a34fb6002915 Mon Sep 17 00:00:00 2001
From: Diogo Gomes <diogogomes@gmail.com>
Date: Tue, 11 Sep 2018 10:30:20 +0100
Subject: [PATCH 089/357] Replace api_password in Camera.Push (#16339)

* Use access_token and user provided token instead of api_password

* address comments by @awarecan

* new tests

* add extra checks and test

* lint

* add comment
---
 homeassistant/components/camera/push.py | 32 ++++++++++--
 tests/components/camera/test_push.py    | 67 ++++++++++++++++++++++---
 2 files changed, 87 insertions(+), 12 deletions(-)

diff --git a/homeassistant/components/camera/push.py b/homeassistant/components/camera/push.py
index 305e29d62d3..c9deca1309d 100644
--- a/homeassistant/components/camera/push.py
+++ b/homeassistant/components/camera/push.py
@@ -13,8 +13,10 @@ import voluptuous as vol
 from homeassistant.components.camera import Camera, PLATFORM_SCHEMA,\
     STATE_IDLE, STATE_RECORDING
 from homeassistant.core import callback
-from homeassistant.components.http.view import HomeAssistantView
-from homeassistant.const import CONF_NAME, CONF_TIMEOUT, HTTP_BAD_REQUEST
+from homeassistant.components.http.view import KEY_AUTHENTICATED,\
+    HomeAssistantView
+from homeassistant.const import CONF_NAME, CONF_TIMEOUT,\
+    HTTP_NOT_FOUND, HTTP_UNAUTHORIZED, HTTP_BAD_REQUEST
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.event import async_track_point_in_utc_time
 import homeassistant.util.dt as dt_util
@@ -25,11 +27,13 @@ DEPENDENCIES = ['http']
 
 CONF_BUFFER_SIZE = 'buffer'
 CONF_IMAGE_FIELD = 'field'
+CONF_TOKEN = 'token'
 
 DEFAULT_NAME = "Push Camera"
 
 ATTR_FILENAME = 'filename'
 ATTR_LAST_TRIP = 'last_trip'
+ATTR_TOKEN = 'token'
 
 PUSH_CAMERA_DATA = 'push_camera'
 
@@ -39,6 +43,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_TIMEOUT, default=timedelta(seconds=5)): vol.All(
         cv.time_period, cv.positive_timedelta),
     vol.Optional(CONF_IMAGE_FIELD, default='image'): cv.string,
+    vol.Optional(CONF_TOKEN): vol.All(cv.string, vol.Length(min=8)),
 })
 
 
@@ -50,7 +55,8 @@ async def async_setup_platform(hass, config, async_add_entities,
 
     cameras = [PushCamera(config[CONF_NAME],
                           config[CONF_BUFFER_SIZE],
-                          config[CONF_TIMEOUT])]
+                          config[CONF_TIMEOUT],
+                          config.get(CONF_TOKEN))]
 
     hass.http.register_view(CameraPushReceiver(hass,
                                                config[CONF_IMAGE_FIELD]))
@@ -63,6 +69,7 @@ class CameraPushReceiver(HomeAssistantView):
 
     url = "/api/camera_push/{entity_id}"
     name = 'api:camera_push:camera_entity'
+    requires_auth = False
 
     def __init__(self, hass, image_field):
         """Initialize CameraPushReceiver with camera entity."""
@@ -75,8 +82,21 @@ class CameraPushReceiver(HomeAssistantView):
 
         if _camera is None:
             _LOGGER.error("Unknown %s", entity_id)
+            status = HTTP_NOT_FOUND if request[KEY_AUTHENTICATED]\
+                else HTTP_UNAUTHORIZED
             return self.json_message('Unknown {}'.format(entity_id),
-                                     HTTP_BAD_REQUEST)
+                                     status)
+
+        # Supports HA authentication and token based
+        # when token has been configured
+        authenticated = (request[KEY_AUTHENTICATED] or
+                         (_camera.token is not None and
+                          request.query.get('token') == _camera.token))
+
+        if not authenticated:
+            return self.json_message(
+                'Invalid authorization credentials for {}'.format(entity_id),
+                HTTP_UNAUTHORIZED)
 
         try:
             data = await request.post()
@@ -95,7 +115,7 @@ class CameraPushReceiver(HomeAssistantView):
 class PushCamera(Camera):
     """The representation of a Push camera."""
 
-    def __init__(self, name, buffer_size, timeout):
+    def __init__(self, name, buffer_size, timeout, token):
         """Initialize push camera component."""
         super().__init__()
         self._name = name
@@ -106,6 +126,7 @@ class PushCamera(Camera):
         self._timeout = timeout
         self.queue = deque([], buffer_size)
         self._current_image = None
+        self.token = token
 
     async def async_added_to_hass(self):
         """Call when entity is added to hass."""
@@ -168,5 +189,6 @@ class PushCamera(Camera):
             name: value for name, value in (
                 (ATTR_LAST_TRIP, self._last_trip),
                 (ATTR_FILENAME, self._filename),
+                (ATTR_TOKEN, self.token),
             ) if value is not None
         }
diff --git a/tests/components/camera/test_push.py b/tests/components/camera/test_push.py
index f9a3c62aa4a..6d9688c10e6 100644
--- a/tests/components/camera/test_push.py
+++ b/tests/components/camera/test_push.py
@@ -6,7 +6,7 @@ from datetime import timedelta
 from homeassistant import core as ha
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
-from tests.components.auth import async_setup_auth
+from homeassistant.components.http.auth import setup_auth
 
 
 async def test_bad_posting(aioclient_mock, hass, aiohttp_client):
@@ -15,19 +15,69 @@ async def test_bad_posting(aioclient_mock, hass, aiohttp_client):
         'camera': {
             'platform': 'push',
             'name': 'config_test',
+            'token': '12345678'
         }})
-
-    client = await async_setup_auth(hass, aiohttp_client)
+    client = await aiohttp_client(hass.http.app)
 
     # missing file
     resp = await client.post('/api/camera_push/camera.config_test')
     assert resp.status == 400
 
-    files = {'image': io.BytesIO(b'fake')}
-
     # wrong entity
+    files = {'image': io.BytesIO(b'fake')}
     resp = await client.post('/api/camera_push/camera.wrong', data=files)
-    assert resp.status == 400
+    assert resp.status == 404
+
+
+async def test_cases_with_no_auth(aioclient_mock, hass, aiohttp_client):
+    """Test cases where aiohttp_client is not auth."""
+    await async_setup_component(hass, 'camera', {
+        'camera': {
+            'platform': 'push',
+            'name': 'config_test',
+            'token': '12345678'
+        }})
+
+    setup_auth(hass.http.app, [], True, api_password=None)
+    client = await aiohttp_client(hass.http.app)
+
+    # wrong token
+    files = {'image': io.BytesIO(b'fake')}
+    resp = await client.post('/api/camera_push/camera.config_test?token=1234',
+                             data=files)
+    assert resp.status == 401
+
+    # right token
+    files = {'image': io.BytesIO(b'fake')}
+    resp = await client.post(
+        '/api/camera_push/camera.config_test?token=12345678',
+        data=files)
+    assert resp.status == 200
+
+
+async def test_no_auth_no_token(aioclient_mock, hass, aiohttp_client):
+    """Test cases where aiohttp_client is not auth."""
+    await async_setup_component(hass, 'camera', {
+        'camera': {
+            'platform': 'push',
+            'name': 'config_test',
+        }})
+
+    setup_auth(hass.http.app, [], True, api_password=None)
+    client = await aiohttp_client(hass.http.app)
+
+    # no token
+    files = {'image': io.BytesIO(b'fake')}
+    resp = await client.post('/api/camera_push/camera.config_test',
+                             data=files)
+    assert resp.status == 401
+
+    # fake token
+    files = {'image': io.BytesIO(b'fake')}
+    resp = await client.post(
+        '/api/camera_push/camera.config_test?token=12345678',
+        data=files)
+    assert resp.status == 401
 
 
 async def test_posting_url(hass, aiohttp_client):
@@ -36,6 +86,7 @@ async def test_posting_url(hass, aiohttp_client):
         'camera': {
             'platform': 'push',
             'name': 'config_test',
+            'token': '12345678'
         }})
 
     client = await aiohttp_client(hass.http.app)
@@ -46,7 +97,9 @@ async def test_posting_url(hass, aiohttp_client):
     assert camera_state.state == 'idle'
 
     # post image
-    resp = await client.post('/api/camera_push/camera.config_test', data=files)
+    resp = await client.post(
+        '/api/camera_push/camera.config_test?token=12345678',
+        data=files)
     assert resp.status == 200
 
     # state recording

From 50fb59477adb83e41ea338b9a002aca8212f15a7 Mon Sep 17 00:00:00 2001
From: Jerad Meisner <jerad.meisner@gmail.com>
Date: Tue, 11 Sep 2018 02:39:30 -0700
Subject: [PATCH 090/357] Store notifications in component. Add ws endpoint for
 fetching. (#16503)

* Store notifications in component. Add ws endpoint for fetching.

* Comments
---
 homeassistant/components/http/ban.py          |  12 +-
 .../persistent_notification/__init__.py       |  77 ++++++++++-
 .../persistent_notification/test_init.py      | 125 +++++++++++++++++-
 3 files changed, 203 insertions(+), 11 deletions(-)

diff --git a/homeassistant/components/http/ban.py b/homeassistant/components/http/ban.py
index 015c386e836..2a25de96edc 100644
--- a/homeassistant/components/http/ban.py
+++ b/homeassistant/components/http/ban.py
@@ -10,7 +10,6 @@ from aiohttp.web_exceptions import HTTPForbidden, HTTPUnauthorized
 import voluptuous as vol
 
 from homeassistant.core import callback
-from homeassistant.components import persistent_notification
 from homeassistant.config import load_yaml_config_file
 from homeassistant.exceptions import HomeAssistantError
 import homeassistant.helpers.config_validation as cv
@@ -92,9 +91,10 @@ async def process_wrong_login(request):
     msg = ('Login attempt or request with invalid authentication '
            'from {}'.format(remote_addr))
     _LOGGER.warning(msg)
-    persistent_notification.async_create(
-        request.app['hass'], msg, 'Login attempt failed',
-        NOTIFICATION_ID_LOGIN)
+
+    hass = request.app['hass']
+    hass.components.persistent_notification.async_create(
+        msg, 'Login attempt failed', NOTIFICATION_ID_LOGIN)
 
     # Check if ban middleware is loaded
     if (KEY_BANNED_IPS not in request.app or
@@ -108,15 +108,13 @@ async def process_wrong_login(request):
         new_ban = IpBan(remote_addr)
         request.app[KEY_BANNED_IPS].append(new_ban)
 
-        hass = request.app['hass']
         await hass.async_add_job(
             update_ip_bans_config, hass.config.path(IP_BANS_FILE), new_ban)
 
         _LOGGER.warning(
             "Banned IP %s for too many login attempts", remote_addr)
 
-        persistent_notification.async_create(
-            hass,
+        hass.components.persistent_notification.async_create(
             'Too many login attempts from {}'.format(remote_addr),
             'Banning IP address', NOTIFICATION_ID_BAN)
 
diff --git a/homeassistant/components/persistent_notification/__init__.py b/homeassistant/components/persistent_notification/__init__.py
index 2850a5f96cd..6b8fd68bc26 100644
--- a/homeassistant/components/persistent_notification/__init__.py
+++ b/homeassistant/components/persistent_notification/__init__.py
@@ -6,10 +6,12 @@ https://home-assistant.io/components/persistent_notification/
 """
 import asyncio
 import logging
+from collections import OrderedDict
 from typing import Awaitable
 
 import voluptuous as vol
 
+from homeassistant.components import websocket_api
 from homeassistant.core import callback, HomeAssistant
 from homeassistant.exceptions import TemplateError
 from homeassistant.loader import bind_hass
@@ -20,13 +22,17 @@ from homeassistant.util import slugify
 ATTR_MESSAGE = 'message'
 ATTR_NOTIFICATION_ID = 'notification_id'
 ATTR_TITLE = 'title'
+ATTR_STATUS = 'status'
 
 DOMAIN = 'persistent_notification'
 
 ENTITY_ID_FORMAT = DOMAIN + '.{}'
 
+EVENT_PERSISTENT_NOTIFICATIONS_UPDATED = 'persistent_notifications_updated'
+
 SERVICE_CREATE = 'create'
 SERVICE_DISMISS = 'dismiss'
+SERVICE_MARK_READ = 'mark_read'
 
 SCHEMA_SERVICE_CREATE = vol.Schema({
     vol.Required(ATTR_MESSAGE): cv.template,
@@ -38,11 +44,21 @@ SCHEMA_SERVICE_DISMISS = vol.Schema({
     vol.Required(ATTR_NOTIFICATION_ID): cv.string,
 })
 
+SCHEMA_SERVICE_MARK_READ = vol.Schema({
+    vol.Required(ATTR_NOTIFICATION_ID): cv.string,
+})
 
 DEFAULT_OBJECT_ID = 'notification'
 _LOGGER = logging.getLogger(__name__)
 
 STATE = 'notifying'
+STATUS_UNREAD = 'unread'
+STATUS_READ = 'read'
+
+WS_TYPE_GET_NOTIFICATIONS = 'persistent_notification/get'
+SCHEMA_WS_GET = websocket_api.BASE_COMMAND_MESSAGE_SCHEMA.extend({
+    vol.Required('type'): WS_TYPE_GET_NOTIFICATIONS,
+})
 
 
 @bind_hass
@@ -76,7 +92,7 @@ def async_create(hass: HomeAssistant, message: str, title: str = None,
 
 @callback
 @bind_hass
-def async_dismiss(hass, notification_id):
+def async_dismiss(hass: HomeAssistant, notification_id: str) -> None:
     """Remove a notification."""
     data = {ATTR_NOTIFICATION_ID: notification_id}
 
@@ -86,6 +102,9 @@ def async_dismiss(hass, notification_id):
 @asyncio.coroutine
 def async_setup(hass: HomeAssistant, config: dict) -> Awaitable[bool]:
     """Set up the persistent notification component."""
+    persistent_notifications = OrderedDict()
+    hass.data[DOMAIN] = {'notifications': persistent_notifications}
+
     @callback
     def create_service(call):
         """Handle a create notification service call."""
@@ -98,6 +117,8 @@ def async_setup(hass: HomeAssistant, config: dict) -> Awaitable[bool]:
         else:
             entity_id = async_generate_entity_id(
                 ENTITY_ID_FORMAT, DEFAULT_OBJECT_ID, hass=hass)
+            notification_id = entity_id.split('.')[1]
+
         attr = {}
         if title is not None:
             try:
@@ -120,18 +141,72 @@ def async_setup(hass: HomeAssistant, config: dict) -> Awaitable[bool]:
 
         hass.states.async_set(entity_id, STATE, attr)
 
+        # Store notification and fire event
+        # This will eventually replace state machine storage
+        persistent_notifications[entity_id] = {
+            ATTR_MESSAGE: message,
+            ATTR_NOTIFICATION_ID: notification_id,
+            ATTR_STATUS: STATUS_UNREAD,
+            ATTR_TITLE: title,
+        }
+
+        hass.bus.async_fire(EVENT_PERSISTENT_NOTIFICATIONS_UPDATED)
+
     @callback
     def dismiss_service(call):
         """Handle the dismiss notification service call."""
         notification_id = call.data.get(ATTR_NOTIFICATION_ID)
         entity_id = ENTITY_ID_FORMAT.format(slugify(notification_id))
 
+        if entity_id not in persistent_notifications:
+            return
+
         hass.states.async_remove(entity_id)
 
+        del persistent_notifications[entity_id]
+        hass.bus.async_fire(EVENT_PERSISTENT_NOTIFICATIONS_UPDATED)
+
+    @callback
+    def mark_read_service(call):
+        """Handle the mark_read notification service call."""
+        notification_id = call.data.get(ATTR_NOTIFICATION_ID)
+        entity_id = ENTITY_ID_FORMAT.format(slugify(notification_id))
+
+        if entity_id not in persistent_notifications:
+            _LOGGER.error('Marking persistent_notification read failed: '
+                          'Notification ID %s not found.', notification_id)
+            return
+
+        persistent_notifications[entity_id][ATTR_STATUS] = STATUS_READ
+        hass.bus.async_fire(EVENT_PERSISTENT_NOTIFICATIONS_UPDATED)
+
     hass.services.async_register(DOMAIN, SERVICE_CREATE, create_service,
                                  SCHEMA_SERVICE_CREATE)
 
     hass.services.async_register(DOMAIN, SERVICE_DISMISS, dismiss_service,
                                  SCHEMA_SERVICE_DISMISS)
 
+    hass.services.async_register(DOMAIN, SERVICE_MARK_READ, mark_read_service,
+                                 SCHEMA_SERVICE_MARK_READ)
+
+    hass.components.websocket_api.async_register_command(
+        WS_TYPE_GET_NOTIFICATIONS, websocket_get_notifications,
+        SCHEMA_WS_GET
+    )
+
     return True
+
+
+@callback
+def websocket_get_notifications(
+        hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg):
+    """Return a list of persistent_notifications."""
+    connection.to_write.put_nowait(
+        websocket_api.result_message(msg['id'], [
+            {
+                key: data[key] for key in (ATTR_NOTIFICATION_ID, ATTR_MESSAGE,
+                                           ATTR_STATUS, ATTR_TITLE)
+            }
+            for data in hass.data[DOMAIN]['notifications'].values()
+        ])
+    )
diff --git a/tests/components/persistent_notification/test_init.py b/tests/components/persistent_notification/test_init.py
index a609247b839..6acc796a108 100644
--- a/tests/components/persistent_notification/test_init.py
+++ b/tests/components/persistent_notification/test_init.py
@@ -1,5 +1,6 @@
 """The tests for the persistent notification component."""
-from homeassistant.setup import setup_component
+from homeassistant.components import websocket_api
+from homeassistant.setup import setup_component, async_setup_component
 import homeassistant.components.persistent_notification as pn
 
 from tests.common import get_test_home_assistant
@@ -19,7 +20,9 @@ class TestPersistentNotification:
 
     def test_create(self):
         """Test creating notification without title or notification id."""
+        notifications = self.hass.data[pn.DOMAIN]['notifications']
         assert len(self.hass.states.entity_ids(pn.DOMAIN)) == 0
+        assert len(notifications) == 0
 
         pn.create(self.hass, 'Hello World {{ 1 + 1 }}',
                   title='{{ 1 + 1 }} beers')
@@ -27,54 +30,170 @@ class TestPersistentNotification:
 
         entity_ids = self.hass.states.entity_ids(pn.DOMAIN)
         assert len(entity_ids) == 1
+        assert len(notifications) == 1
 
         state = self.hass.states.get(entity_ids[0])
         assert state.state == pn.STATE
         assert state.attributes.get('message') == 'Hello World 2'
         assert state.attributes.get('title') == '2 beers'
 
+        notification = notifications.get(entity_ids[0])
+        assert notification['status'] == pn.STATUS_UNREAD
+        assert notification['message'] == 'Hello World 2'
+        assert notification['title'] == '2 beers'
+        notifications.clear()
+
     def test_create_notification_id(self):
         """Ensure overwrites existing notification with same id."""
+        notifications = self.hass.data[pn.DOMAIN]['notifications']
         assert len(self.hass.states.entity_ids(pn.DOMAIN)) == 0
+        assert len(notifications) == 0
 
         pn.create(self.hass, 'test', notification_id='Beer 2')
         self.hass.block_till_done()
 
         assert len(self.hass.states.entity_ids()) == 1
-        state = self.hass.states.get('persistent_notification.beer_2')
+        assert len(notifications) == 1
+
+        entity_id = 'persistent_notification.beer_2'
+        state = self.hass.states.get(entity_id)
         assert state.attributes.get('message') == 'test'
 
+        notification = notifications.get(entity_id)
+        assert notification['message'] == 'test'
+        assert notification['title'] is None
+
         pn.create(self.hass, 'test 2', notification_id='Beer 2')
         self.hass.block_till_done()
 
         # We should have overwritten old one
         assert len(self.hass.states.entity_ids()) == 1
-        state = self.hass.states.get('persistent_notification.beer_2')
+        state = self.hass.states.get(entity_id)
         assert state.attributes.get('message') == 'test 2'
 
+        notification = notifications.get(entity_id)
+        assert notification['message'] == 'test 2'
+        notifications.clear()
+
     def test_create_template_error(self):
         """Ensure we output templates if contain error."""
+        notifications = self.hass.data[pn.DOMAIN]['notifications']
         assert len(self.hass.states.entity_ids(pn.DOMAIN)) == 0
+        assert len(notifications) == 0
 
         pn.create(self.hass, '{{ message + 1 }}', '{{ title + 1 }}')
         self.hass.block_till_done()
 
         entity_ids = self.hass.states.entity_ids(pn.DOMAIN)
         assert len(entity_ids) == 1
+        assert len(notifications) == 1
 
         state = self.hass.states.get(entity_ids[0])
         assert state.attributes.get('message') == '{{ message + 1 }}'
         assert state.attributes.get('title') == '{{ title + 1 }}'
 
+        notification = notifications.get(entity_ids[0])
+        assert notification['message'] == '{{ message + 1 }}'
+        assert notification['title'] == '{{ title + 1 }}'
+        notifications.clear()
+
     def test_dismiss_notification(self):
         """Ensure removal of specific notification."""
+        notifications = self.hass.data[pn.DOMAIN]['notifications']
         assert len(self.hass.states.entity_ids(pn.DOMAIN)) == 0
+        assert len(notifications) == 0
 
         pn.create(self.hass, 'test', notification_id='Beer 2')
         self.hass.block_till_done()
 
         assert len(self.hass.states.entity_ids(pn.DOMAIN)) == 1
+        assert len(notifications) == 1
         pn.dismiss(self.hass, notification_id='Beer 2')
         self.hass.block_till_done()
 
         assert len(self.hass.states.entity_ids(pn.DOMAIN)) == 0
+        assert len(notifications) == 0
+        notifications.clear()
+
+    def test_mark_read(self):
+        """Ensure notification is marked as Read."""
+        notifications = self.hass.data[pn.DOMAIN]['notifications']
+        assert len(notifications) == 0
+
+        pn.create(self.hass, 'test', notification_id='Beer 2')
+        self.hass.block_till_done()
+
+        entity_id = 'persistent_notification.beer_2'
+        assert len(notifications) == 1
+        notification = notifications.get(entity_id)
+        assert notification['status'] == pn.STATUS_UNREAD
+
+        self.hass.services.call(pn.DOMAIN, pn.SERVICE_MARK_READ, {
+            'notification_id': 'Beer 2'
+        })
+        self.hass.block_till_done()
+
+        assert len(notifications) == 1
+        notification = notifications.get(entity_id)
+        assert notification['status'] == pn.STATUS_READ
+        notifications.clear()
+
+
+async def test_ws_get_notifications(hass, hass_ws_client):
+    """Test websocket endpoint for retrieving persistent notifications."""
+    await async_setup_component(hass, pn.DOMAIN, {})
+
+    client = await hass_ws_client(hass)
+
+    await client.send_json({
+        'id': 5,
+        'type': 'persistent_notification/get'
+    })
+    msg = await client.receive_json()
+    assert msg['id'] == 5
+    assert msg['type'] == websocket_api.TYPE_RESULT
+    assert msg['success']
+    notifications = msg['result']
+    assert len(notifications) == 0
+
+    # Create
+    hass.components.persistent_notification.async_create(
+        'test', notification_id='Beer 2')
+    await client.send_json({
+        'id': 6,
+        'type': 'persistent_notification/get'
+    })
+    msg = await client.receive_json()
+    assert msg['id'] == 6
+    assert msg['type'] == websocket_api.TYPE_RESULT
+    assert msg['success']
+    notifications = msg['result']
+    assert len(notifications) == 1
+    notification = notifications[0]
+    assert notification['notification_id'] == 'Beer 2'
+    assert notification['message'] == 'test'
+    assert notification['title'] is None
+    assert notification['status'] == pn.STATUS_UNREAD
+
+    # Mark Read
+    await hass.services.async_call(pn.DOMAIN, pn.SERVICE_MARK_READ, {
+        'notification_id': 'Beer 2'
+    })
+    await client.send_json({
+        'id': 7,
+        'type': 'persistent_notification/get'
+    })
+    msg = await client.receive_json()
+    notifications = msg['result']
+    assert len(notifications) == 1
+    assert notifications[0]['status'] == pn.STATUS_READ
+
+    # Dismiss
+    hass.components.persistent_notification.async_dismiss('Beer 2')
+    await client.send_json({
+        'id': 8,
+        'type': 'persistent_notification/get'
+    })
+    msg = await client.receive_json()
+    notifications = msg['result']
+    assert len(notifications) == 0

From 95839470129a8071b8d55ca099569c3b05aac0a8 Mon Sep 17 00:00:00 2001
From: Jason Hu <awarecan@users.noreply.github.com>
Date: Tue, 11 Sep 2018 03:05:15 -0700
Subject: [PATCH 091/357] Long-lived access token (#16453)

* Allow create refresh_token with specific access_token_expiration

* Add token_type, client_name and client_icon

* Add unit test

* Add websocket API to create long-lived access token

* Allow URL use as client_id for long-lived access token

* Remove mutate_refresh_token method

* Use client name as id for long_lived_access_token type refresh token

* Minor change

* Do not allow duplicate client name

* Update docstring

* Remove unnecessary `list`
---
 homeassistant/auth/__init__.py            |  45 ++++++-
 homeassistant/auth/auth_store.py          |  34 +++++-
 homeassistant/auth/models.py              |  16 ++-
 homeassistant/components/auth/__init__.py | 104 +++++++++++++++-
 tests/auth/test_init.py                   | 141 +++++++++++++++++++++-
 tests/components/auth/test_init.py        |  59 ++++++++-
 tests/components/conftest.py              |   2 +
 7 files changed, 385 insertions(+), 16 deletions(-)

diff --git a/homeassistant/auth/__init__.py b/homeassistant/auth/__init__.py
index 4ef8440de62..b0cebb5fd6c 100644
--- a/homeassistant/auth/__init__.py
+++ b/homeassistant/auth/__init__.py
@@ -2,11 +2,13 @@
 import asyncio
 import logging
 from collections import OrderedDict
+from datetime import timedelta
 from typing import Any, Dict, List, Optional, Tuple, cast
 
 import jwt
 
 from homeassistant import data_entry_flow
+from homeassistant.auth.const import ACCESS_TOKEN_EXPIRATION
 from homeassistant.core import callback, HomeAssistant
 from homeassistant.util import dt as dt_util
 
@@ -242,8 +244,12 @@ class AuthManager:
                 modules[module_id] = module.name
         return modules
 
-    async def async_create_refresh_token(self, user: models.User,
-                                         client_id: Optional[str] = None) \
+    async def async_create_refresh_token(
+            self, user: models.User, client_id: Optional[str] = None,
+            client_name: Optional[str] = None,
+            client_icon: Optional[str] = None,
+            token_type: Optional[str] = None,
+            access_token_expiration: timedelta = ACCESS_TOKEN_EXPIRATION) \
             -> models.RefreshToken:
         """Create a new refresh token for a user."""
         if not user.is_active:
@@ -254,10 +260,36 @@ class AuthManager:
                 'System generated users cannot have refresh tokens connected '
                 'to a client.')
 
-        if not user.system_generated and client_id is None:
+        if token_type is None:
+            if user.system_generated:
+                token_type = models.TOKEN_TYPE_SYSTEM
+            else:
+                token_type = models.TOKEN_TYPE_NORMAL
+
+        if user.system_generated != (token_type == models.TOKEN_TYPE_SYSTEM):
+            raise ValueError(
+                'System generated users can only have system type '
+                'refresh tokens')
+
+        if token_type == models.TOKEN_TYPE_NORMAL and client_id is None:
             raise ValueError('Client is required to generate a refresh token.')
 
-        return await self._store.async_create_refresh_token(user, client_id)
+        if (token_type == models.TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN and
+                client_name is None):
+            raise ValueError('Client_name is required for long-lived access '
+                             'token')
+
+        if token_type == models.TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN:
+            for token in user.refresh_tokens.values():
+                if (token.client_name == client_name and token.token_type ==
+                        models.TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN):
+                    # Each client_name can only have one
+                    # long_lived_access_token type of refresh token
+                    raise ValueError('{} already exists'.format(client_name))
+
+        return await self._store.async_create_refresh_token(
+            user, client_id, client_name, client_icon,
+            token_type, access_token_expiration)
 
     async def async_get_refresh_token(
             self, token_id: str) -> Optional[models.RefreshToken]:
@@ -280,10 +312,11 @@ class AuthManager:
                                   refresh_token: models.RefreshToken) -> str:
         """Create a new access token."""
         # pylint: disable=no-self-use
+        now = dt_util.utcnow()
         return jwt.encode({
             'iss': refresh_token.id,
-            'iat': dt_util.utcnow(),
-            'exp': dt_util.utcnow() + refresh_token.access_token_expiration,
+            'iat': now,
+            'exp': now + refresh_token.access_token_expiration,
         }, refresh_token.jwt_key, algorithm='HS256').decode()
 
     async def async_validate_access_token(
diff --git a/homeassistant/auth/auth_store.py b/homeassistant/auth/auth_store.py
index 0f12d69211c..d78a1f4225e 100644
--- a/homeassistant/auth/auth_store.py
+++ b/homeassistant/auth/auth_store.py
@@ -5,6 +5,7 @@ from logging import getLogger
 from typing import Any, Dict, List, Optional  # noqa: F401
 import hmac
 
+from homeassistant.auth.const import ACCESS_TOKEN_EXPIRATION
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.util import dt as dt_util
 
@@ -128,11 +129,27 @@ class AuthStore:
         self._async_schedule_save()
 
     async def async_create_refresh_token(
-            self, user: models.User, client_id: Optional[str] = None) \
+            self, user: models.User, client_id: Optional[str] = None,
+            client_name: Optional[str] = None,
+            client_icon: Optional[str] = None,
+            token_type: str = models.TOKEN_TYPE_NORMAL,
+            access_token_expiration: timedelta = ACCESS_TOKEN_EXPIRATION) \
             -> models.RefreshToken:
         """Create a new token for a user."""
-        refresh_token = models.RefreshToken(user=user, client_id=client_id)
+        kwargs = {
+            'user': user,
+            'client_id': client_id,
+            'token_type': token_type,
+            'access_token_expiration': access_token_expiration
+        }  # type: Dict[str, Any]
+        if client_name:
+            kwargs['client_name'] = client_name
+        if client_icon:
+            kwargs['client_icon'] = client_icon
+
+        refresh_token = models.RefreshToken(**kwargs)
         user.refresh_tokens[refresh_token.id] = refresh_token
+
         self._async_schedule_save()
         return refresh_token
 
@@ -216,10 +233,20 @@ class AuthStore:
                     'Ignoring refresh token %(id)s with invalid created_at '
                     '%(created_at)s for user_id %(user_id)s', rt_dict)
                 continue
+            token_type = rt_dict.get('token_type')
+            if token_type is None:
+                if rt_dict['clinet_id'] is None:
+                    token_type = models.TOKEN_TYPE_SYSTEM
+                else:
+                    token_type = models.TOKEN_TYPE_NORMAL
             token = models.RefreshToken(
                 id=rt_dict['id'],
                 user=users[rt_dict['user_id']],
                 client_id=rt_dict['client_id'],
+                # use dict.get to keep backward compatibility
+                client_name=rt_dict.get('client_name'),
+                client_icon=rt_dict.get('client_icon'),
+                token_type=token_type,
                 created_at=created_at,
                 access_token_expiration=timedelta(
                     seconds=rt_dict['access_token_expiration']),
@@ -271,6 +298,9 @@ class AuthStore:
                 'id': refresh_token.id,
                 'user_id': user.id,
                 'client_id': refresh_token.client_id,
+                'client_name': refresh_token.client_name,
+                'client_icon': refresh_token.client_icon,
+                'token_type': refresh_token.token_type,
                 'created_at': refresh_token.created_at.isoformat(),
                 'access_token_expiration':
                     refresh_token.access_token_expiration.total_seconds(),
diff --git a/homeassistant/auth/models.py b/homeassistant/auth/models.py
index a6500510e0d..c5273d7fa1d 100644
--- a/homeassistant/auth/models.py
+++ b/homeassistant/auth/models.py
@@ -7,9 +7,12 @@ import attr
 
 from homeassistant.util import dt as dt_util
 
-from .const import ACCESS_TOKEN_EXPIRATION
 from .util import generate_secret
 
+TOKEN_TYPE_NORMAL = 'normal'
+TOKEN_TYPE_SYSTEM = 'system'
+TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN = 'long_lived_access_token'
+
 
 @attr.s(slots=True)
 class User:
@@ -37,11 +40,16 @@ class RefreshToken:
     """RefreshToken for a user to grant new access tokens."""
 
     user = attr.ib(type=User)
-    client_id = attr.ib(type=str)  # type: Optional[str]
+    client_id = attr.ib(type=Optional[str])
+    access_token_expiration = attr.ib(type=timedelta)
+    client_name = attr.ib(type=Optional[str], default=None)
+    client_icon = attr.ib(type=Optional[str], default=None)
+    token_type = attr.ib(type=str, default=TOKEN_TYPE_NORMAL,
+                         validator=attr.validators.in_((
+                             TOKEN_TYPE_NORMAL, TOKEN_TYPE_SYSTEM,
+                             TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN)))
     id = attr.ib(type=str, default=attr.Factory(lambda: uuid.uuid4().hex))
     created_at = attr.ib(type=datetime, default=attr.Factory(dt_util.utcnow))
-    access_token_expiration = attr.ib(type=timedelta,
-                                      default=ACCESS_TOKEN_EXPIRATION)
     token = attr.ib(type=str,
                     default=attr.Factory(lambda: generate_secret(64)))
     jwt_key = attr.ib(type=str,
diff --git a/homeassistant/components/auth/__init__.py b/homeassistant/components/auth/__init__.py
index a87e646761c..5839b7ec403 100644
--- a/homeassistant/components/auth/__init__.py
+++ b/homeassistant/components/auth/__init__.py
@@ -12,6 +12,7 @@ be in JSON as it's more readable.
 Exchange the authorization code retrieved from the login flow for tokens.
 
 {
+    "client_id": "https://hassbian.local:8123/",
     "grant_type": "authorization_code",
     "code": "411ee2f916e648d691e937ae9344681e"
 }
@@ -32,6 +33,7 @@ token.
 Request a new access token using a refresh token.
 
 {
+    "client_id": "https://hassbian.local:8123/",
     "grant_type": "refresh_token",
     "refresh_token": "IJKLMNOPQRST"
 }
@@ -55,6 +57,67 @@ ever been granted by that refresh token. Response code will ALWAYS be 200.
     "action": "revoke"
 }
 
+# Websocket API
+
+## Get current user
+
+Send websocket command `auth/current_user` will return current user of the
+active websocket connection.
+
+{
+    "id": 10,
+    "type": "auth/current_user",
+}
+
+The result payload likes
+
+{
+    "id": 10,
+    "type": "result",
+    "success": true,
+    "result": {
+        "id": "USER_ID",
+        "name": "John Doe",
+        "is_owner': true,
+        "credentials": [
+            {
+                "auth_provider_type": "homeassistant",
+                "auth_provider_id": null
+            }
+        ],
+        "mfa_modules": [
+            {
+                "id": "totp",
+                "name": "TOTP",
+                "enabled": true,
+            }
+        ]
+    }
+}
+
+## Create a long-lived access token
+
+Send websocket command `auth/long_lived_access_token` will create
+a long-lived access token for current user. Access token will not be saved in
+Home Assistant. User need to record the token in secure place.
+
+{
+    "id": 11,
+    "type": "auth/long_lived_access_token",
+    "client_name": "GPS Logger",
+    "client_icon": null,
+    "lifespan": 365
+}
+
+Result will be a long-lived access token:
+
+{
+    "id": 11,
+    "type": "result",
+    "success": true,
+    "result": "ABCDEFGH"
+}
+
 """
 import logging
 import uuid
@@ -63,7 +126,8 @@ from datetime import timedelta
 from aiohttp import web
 import voluptuous as vol
 
-from homeassistant.auth.models import User, Credentials
+from homeassistant.auth.models import User, Credentials, \
+    TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN
 from homeassistant.components import websocket_api
 from homeassistant.components.http.ban import log_invalid_auth
 from homeassistant.components.http.data_validator import RequestDataValidator
@@ -83,6 +147,15 @@ SCHEMA_WS_CURRENT_USER = websocket_api.BASE_COMMAND_MESSAGE_SCHEMA.extend({
     vol.Required('type'): WS_TYPE_CURRENT_USER,
 })
 
+WS_TYPE_LONG_LIVED_ACCESS_TOKEN = 'auth/long_lived_access_token'
+SCHEMA_WS_LONG_LIVED_ACCESS_TOKEN = \
+    websocket_api.BASE_COMMAND_MESSAGE_SCHEMA.extend({
+        vol.Required('type'): WS_TYPE_LONG_LIVED_ACCESS_TOKEN,
+        vol.Required('lifespan'): int,  # days
+        vol.Required('client_name'): str,
+        vol.Optional('client_icon'): str,
+    })
+
 RESULT_TYPE_CREDENTIALS = 'credentials'
 RESULT_TYPE_USER = 'user'
 
@@ -100,6 +173,11 @@ async def async_setup(hass, config):
         WS_TYPE_CURRENT_USER, websocket_current_user,
         SCHEMA_WS_CURRENT_USER
     )
+    hass.components.websocket_api.async_register_command(
+        WS_TYPE_LONG_LIVED_ACCESS_TOKEN,
+        websocket_create_long_lived_access_token,
+        SCHEMA_WS_LONG_LIVED_ACCESS_TOKEN
+    )
 
     await login_flow.async_setup(hass, store_result)
     await mfa_setup_flow.async_setup(hass)
@@ -343,3 +421,27 @@ def websocket_current_user(
             }))
 
     hass.async_create_task(async_get_current_user(connection.user))
+
+
+@websocket_api.ws_require_user()
+@callback
+def websocket_create_long_lived_access_token(
+        hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg):
+    """Create or a long-lived access token."""
+    async def async_create_long_lived_access_token(user):
+        """Create or a long-lived access token."""
+        refresh_token = await hass.auth.async_create_refresh_token(
+            user,
+            client_name=msg['client_name'],
+            client_icon=msg.get('client_icon'),
+            token_type=TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN,
+            access_token_expiration=timedelta(days=msg['lifespan']))
+
+        access_token = hass.auth.async_create_access_token(
+            refresh_token)
+
+        connection.send_message_outside(
+            websocket_api.result_message(msg['id'], access_token))
+
+    hass.async_create_task(
+        async_create_long_lived_access_token(connection.user))
diff --git a/tests/auth/test_init.py b/tests/auth/test_init.py
index 63b2b4408dd..765199b256c 100644
--- a/tests/auth/test_init.py
+++ b/tests/auth/test_init.py
@@ -2,6 +2,7 @@
 from datetime import timedelta
 from unittest.mock import Mock, patch
 
+import jwt
 import pytest
 import voluptuous as vol
 
@@ -323,7 +324,7 @@ async def test_generating_system_user(hass):
 
 
 async def test_refresh_token_requires_client_for_user(hass):
-    """Test that we can add a system user."""
+    """Test create refresh token for a user with client_id."""
     manager = await auth.auth_manager_from_config(hass, [], [])
     user = MockUser().add_to_auth_manager(manager)
     assert user.system_generated is False
@@ -334,10 +335,14 @@ async def test_refresh_token_requires_client_for_user(hass):
     token = await manager.async_create_refresh_token(user, CLIENT_ID)
     assert token is not None
     assert token.client_id == CLIENT_ID
+    assert token.token_type == auth_models.TOKEN_TYPE_NORMAL
+    # default access token expiration
+    assert token.access_token_expiration == \
+        auth_const.ACCESS_TOKEN_EXPIRATION
 
 
 async def test_refresh_token_not_requires_client_for_system_user(hass):
-    """Test that we can add a system user."""
+    """Test create refresh token for a system user w/o client_id."""
     manager = await auth.auth_manager_from_config(hass, [], [])
     user = await manager.async_create_system_user('Hass.io')
     assert user.system_generated is True
@@ -348,6 +353,56 @@ async def test_refresh_token_not_requires_client_for_system_user(hass):
     token = await manager.async_create_refresh_token(user)
     assert token is not None
     assert token.client_id is None
+    assert token.token_type == auth_models.TOKEN_TYPE_SYSTEM
+
+
+async def test_refresh_token_with_specific_access_token_expiration(hass):
+    """Test create a refresh token with specific access token expiration."""
+    manager = await auth.auth_manager_from_config(hass, [], [])
+    user = MockUser().add_to_auth_manager(manager)
+
+    token = await manager.async_create_refresh_token(
+        user, CLIENT_ID,
+        access_token_expiration=timedelta(days=100))
+    assert token is not None
+    assert token.client_id == CLIENT_ID
+    assert token.access_token_expiration == timedelta(days=100)
+
+
+async def test_refresh_token_type(hass):
+    """Test create a refresh token with token type."""
+    manager = await auth.auth_manager_from_config(hass, [], [])
+    user = MockUser().add_to_auth_manager(manager)
+
+    with pytest.raises(ValueError):
+        await manager.async_create_refresh_token(
+            user, CLIENT_ID, token_type=auth_models.TOKEN_TYPE_SYSTEM)
+
+    token = await manager.async_create_refresh_token(
+        user, CLIENT_ID,
+        token_type=auth_models.TOKEN_TYPE_NORMAL)
+    assert token is not None
+    assert token.client_id == CLIENT_ID
+    assert token.token_type == auth_models.TOKEN_TYPE_NORMAL
+
+
+async def test_refresh_token_type_long_lived_access_token(hass):
+    """Test create a refresh token has long-lived access token type."""
+    manager = await auth.auth_manager_from_config(hass, [], [])
+    user = MockUser().add_to_auth_manager(manager)
+
+    with pytest.raises(ValueError):
+        await manager.async_create_refresh_token(
+            user, token_type=auth_models.TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN)
+
+    token = await manager.async_create_refresh_token(
+        user, client_name='GPS LOGGER', client_icon='mdi:home',
+        token_type=auth_models.TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN)
+    assert token is not None
+    assert token.client_id is None
+    assert token.client_name == 'GPS LOGGER'
+    assert token.client_icon == 'mdi:home'
+    assert token.token_type == auth_models.TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN
 
 
 async def test_cannot_deactive_owner(mock_hass):
@@ -378,6 +433,88 @@ async def test_remove_refresh_token(mock_hass):
     )
 
 
+async def test_create_access_token(mock_hass):
+    """Test normal refresh_token's jwt_key keep same after used."""
+    manager = await auth.auth_manager_from_config(mock_hass, [], [])
+    user = MockUser().add_to_auth_manager(manager)
+    refresh_token = await manager.async_create_refresh_token(user, CLIENT_ID)
+    assert refresh_token.token_type == auth_models.TOKEN_TYPE_NORMAL
+    jwt_key = refresh_token.jwt_key
+    access_token = manager.async_create_access_token(refresh_token)
+    assert access_token is not None
+    assert refresh_token.jwt_key == jwt_key
+    jwt_payload = jwt.decode(access_token, jwt_key, algorithm=['HS256'])
+    assert jwt_payload['iss'] == refresh_token.id
+    assert jwt_payload['exp'] - jwt_payload['iat'] == \
+        timedelta(minutes=30).total_seconds()
+
+
+async def test_create_long_lived_access_token(mock_hass):
+    """Test refresh_token's jwt_key changed for long-lived access token."""
+    manager = await auth.auth_manager_from_config(mock_hass, [], [])
+    user = MockUser().add_to_auth_manager(manager)
+    refresh_token = await manager.async_create_refresh_token(
+        user, client_name='GPS Logger',
+        token_type=auth_models.TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN,
+        access_token_expiration=timedelta(days=300))
+    assert refresh_token.token_type == \
+        auth_models.TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN
+    access_token = manager.async_create_access_token(refresh_token)
+    jwt_payload = jwt.decode(
+        access_token, refresh_token.jwt_key, algorithm=['HS256'])
+    assert jwt_payload['iss'] == refresh_token.id
+    assert jwt_payload['exp'] - jwt_payload['iat'] == \
+        timedelta(days=300).total_seconds()
+
+
+async def test_one_long_lived_access_token_per_refresh_token(mock_hass):
+    """Test one refresh_token can only have one long-lived access token."""
+    manager = await auth.auth_manager_from_config(mock_hass, [], [])
+    user = MockUser().add_to_auth_manager(manager)
+    refresh_token = await manager.async_create_refresh_token(
+        user, client_name='GPS Logger',
+        token_type=auth_models.TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN,
+        access_token_expiration=timedelta(days=3000))
+    assert refresh_token.token_type == \
+        auth_models.TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN
+    access_token = manager.async_create_access_token(refresh_token)
+    jwt_key = refresh_token.jwt_key
+
+    rt = await manager.async_validate_access_token(access_token)
+    assert rt.id == refresh_token.id
+
+    with pytest.raises(ValueError):
+        await manager.async_create_refresh_token(
+            user, client_name='GPS Logger',
+            token_type=auth_models.TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN,
+            access_token_expiration=timedelta(days=3000))
+
+    await manager.async_remove_refresh_token(refresh_token)
+    assert refresh_token.id not in user.refresh_tokens
+    rt = await manager.async_validate_access_token(access_token)
+    assert rt is None, 'Previous issued access token has been invoked'
+
+    refresh_token_2 = await manager.async_create_refresh_token(
+        user, client_name='GPS Logger',
+        token_type=auth_models.TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN,
+        access_token_expiration=timedelta(days=3000))
+    assert refresh_token_2.id != refresh_token.id
+    assert refresh_token_2.token_type == \
+        auth_models.TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN
+    access_token_2 = manager.async_create_access_token(refresh_token_2)
+    jwt_key_2 = refresh_token_2.jwt_key
+
+    assert access_token != access_token_2
+    assert jwt_key != jwt_key_2
+
+    rt = await manager.async_validate_access_token(access_token_2)
+    jwt_payload = jwt.decode(
+        access_token_2, rt.jwt_key, algorithm=['HS256'])
+    assert jwt_payload['iss'] == refresh_token_2.id
+    assert jwt_payload['exp'] - jwt_payload['iat'] == \
+        timedelta(days=3000).total_seconds()
+
+
 async def test_login_with_auth_module(mock_hass):
     """Test login as existing user with auth module."""
     manager = await auth.auth_manager_from_config(mock_hass, [{
diff --git a/tests/components/auth/test_init.py b/tests/components/auth/test_init.py
index 7b9dda6acb3..e0fe00bd9d8 100644
--- a/tests/components/auth/test_init.py
+++ b/tests/components/auth/test_init.py
@@ -2,6 +2,8 @@
 from datetime import timedelta
 from unittest.mock import patch
 
+from homeassistant import const
+from homeassistant.auth import auth_manager_from_config
 from homeassistant.auth.models import Credentials
 from homeassistant.components.auth import RESULT_TYPE_USER
 from homeassistant.setup import async_setup_component
@@ -10,7 +12,8 @@ from homeassistant.components import auth
 
 from . import async_setup_auth
 
-from tests.common import CLIENT_ID, CLIENT_REDIRECT_URI, MockUser
+from tests.common import CLIENT_ID, CLIENT_REDIRECT_URI, MockUser, \
+    ensure_auth_manager_loaded
 
 
 async def test_login_new_user_and_trying_refresh_token(hass, aiohttp_client):
@@ -267,3 +270,57 @@ async def test_revoking_refresh_token(hass, aiohttp_client):
     })
 
     assert resp.status == 400
+
+
+async def test_ws_long_lived_access_token(hass, hass_ws_client):
+    """Test generate long-lived access token."""
+    hass.auth = await auth_manager_from_config(
+        hass, provider_configs=[{
+            'type': 'insecure_example',
+            'users': [{
+                'username': 'test-user',
+                'password': 'test-pass',
+                'name': 'Test Name',
+            }]
+        }], module_configs=[])
+    ensure_auth_manager_loaded(hass.auth)
+    assert await async_setup_component(hass, 'auth', {'http': {}})
+    assert await async_setup_component(hass, 'api', {'http': {}})
+
+    user = MockUser(id='mock-user').add_to_hass(hass)
+    cred = await hass.auth.auth_providers[0].async_get_or_create_credentials(
+        {'username': 'test-user'})
+    await hass.auth.async_link_user(user, cred)
+
+    ws_client = await hass_ws_client(hass, hass.auth.async_create_access_token(
+        await hass.auth.async_create_refresh_token(user, CLIENT_ID)))
+
+    # verify create long-lived access token
+    await ws_client.send_json({
+        'id': 5,
+        'type': auth.WS_TYPE_LONG_LIVED_ACCESS_TOKEN,
+        'client_name': 'GPS Logger',
+        'lifespan': 365,
+    })
+
+    result = await ws_client.receive_json()
+    assert result['success'], result
+
+    long_lived_access_token = result['result']
+    assert long_lived_access_token is not None
+
+    refresh_token = await hass.auth.async_validate_access_token(
+        long_lived_access_token)
+    assert refresh_token.client_id is None
+    assert refresh_token.client_name == 'GPS Logger'
+    assert refresh_token.client_icon is None
+
+    # verify long-lived access token can be used as bearer token
+    api_client = ws_client.client
+    resp = await api_client.get(const.URL_API)
+    assert resp.status == 401
+
+    resp = await api_client.get(const.URL_API, headers={
+        'Authorization': 'Bearer {}'.format(long_lived_access_token)
+    })
+    assert resp.status == 200
diff --git a/tests/components/conftest.py b/tests/components/conftest.py
index bb9b643296e..7cec790c847 100644
--- a/tests/components/conftest.py
+++ b/tests/components/conftest.py
@@ -34,6 +34,8 @@ def hass_ws_client(aiohttp_client):
         auth_ok = await websocket.receive_json()
         assert auth_ok['type'] == wapi.TYPE_AUTH_OK
 
+        # wrap in client
+        websocket.client = client
         return websocket
 
     return create_client

From 4e3faf61089df91eb46df751a8540654a48ad996 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Tue, 11 Sep 2018 12:55:05 +0200
Subject: [PATCH 092/357] Fix typo (#16556)

---
 homeassistant/auth/auth_store.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/auth/auth_store.py b/homeassistant/auth/auth_store.py
index d78a1f4225e..8e8d03253e5 100644
--- a/homeassistant/auth/auth_store.py
+++ b/homeassistant/auth/auth_store.py
@@ -235,7 +235,7 @@ class AuthStore:
                 continue
             token_type = rt_dict.get('token_type')
             if token_type is None:
-                if rt_dict['clinet_id'] is None:
+                if rt_dict['client_id'] is None:
                     token_type = models.TOKEN_TYPE_SYSTEM
                 else:
                     token_type = models.TOKEN_TYPE_NORMAL

From 0db13a99aa1dc945bdcc2132a08b7b3bd2e1232f Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Tue, 11 Sep 2018 18:08:03 +0200
Subject: [PATCH 093/357] Add websocket commands for refresh tokens (#16559)

* Add websocket commands for refresh tokens

* Comment
---
 homeassistant/components/auth/__init__.py | 60 +++++++++++++++++
 tests/components/auth/test_init.py        | 82 ++++++++++++++---------
 tests/components/conftest.py              | 42 ++++++++----
 3 files changed, 140 insertions(+), 44 deletions(-)

diff --git a/homeassistant/components/auth/__init__.py b/homeassistant/components/auth/__init__.py
index 5839b7ec403..5fac423f27a 100644
--- a/homeassistant/components/auth/__init__.py
+++ b/homeassistant/components/auth/__init__.py
@@ -156,6 +156,19 @@ SCHEMA_WS_LONG_LIVED_ACCESS_TOKEN = \
         vol.Optional('client_icon'): str,
     })
 
+WS_TYPE_REFRESH_TOKENS = 'auth/refresh_tokens'
+SCHEMA_WS_REFRESH_TOKENS = \
+    websocket_api.BASE_COMMAND_MESSAGE_SCHEMA.extend({
+        vol.Required('type'): WS_TYPE_REFRESH_TOKENS,
+    })
+
+WS_TYPE_DELETE_REFRESH_TOKEN = 'auth/delete_refresh_token'
+SCHEMA_WS_DELETE_REFRESH_TOKEN = \
+    websocket_api.BASE_COMMAND_MESSAGE_SCHEMA.extend({
+        vol.Required('type'): WS_TYPE_DELETE_REFRESH_TOKEN,
+        vol.Required('refresh_token_id'): str,
+    })
+
 RESULT_TYPE_CREDENTIALS = 'credentials'
 RESULT_TYPE_USER = 'user'
 
@@ -178,6 +191,16 @@ async def async_setup(hass, config):
         websocket_create_long_lived_access_token,
         SCHEMA_WS_LONG_LIVED_ACCESS_TOKEN
     )
+    hass.components.websocket_api.async_register_command(
+        WS_TYPE_REFRESH_TOKENS,
+        websocket_refresh_tokens,
+        SCHEMA_WS_REFRESH_TOKENS
+    )
+    hass.components.websocket_api.async_register_command(
+        WS_TYPE_DELETE_REFRESH_TOKEN,
+        websocket_delete_refresh_token,
+        SCHEMA_WS_DELETE_REFRESH_TOKEN
+    )
 
     await login_flow.async_setup(hass, store_result)
     await mfa_setup_flow.async_setup(hass)
@@ -445,3 +468,40 @@ def websocket_create_long_lived_access_token(
 
     hass.async_create_task(
         async_create_long_lived_access_token(connection.user))
+
+
+@websocket_api.ws_require_user()
+@callback
+def websocket_refresh_tokens(
+        hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg):
+    """Return metadata of users refresh tokens."""
+    connection.to_write.put_nowait(websocket_api.result_message(msg['id'], [{
+        'id': refresh.id,
+        'client_id': refresh.client_id,
+        'client_name': refresh.client_name,
+        'client_icon': refresh.client_icon,
+        'type': refresh.token_type,
+        'created_at': refresh.created_at,
+    } for refresh in connection.user.refresh_tokens.values()]))
+
+
+@websocket_api.ws_require_user()
+@callback
+def websocket_delete_refresh_token(
+        hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg):
+    """Handle a delete refresh token request."""
+    async def async_delete_refresh_token(user, refresh_token_id):
+        """Delete a refresh token."""
+        refresh_token = connection.user.refresh_tokens.get(refresh_token_id)
+
+        if refresh_token is None:
+            return websocket_api.error_message(
+                msg['id'], 'invalid_token_id', 'Received invalid token')
+
+        await hass.auth.async_remove_refresh_token(refresh_token)
+
+        connection.send_message_outside(
+            websocket_api.result_message(msg['id'], {}))
+
+    hass.async_create_task(
+        async_delete_refresh_token(connection.user, msg['refresh_token_id']))
diff --git a/tests/components/auth/test_init.py b/tests/components/auth/test_init.py
index e0fe00bd9d8..a8e95c73a36 100644
--- a/tests/components/auth/test_init.py
+++ b/tests/components/auth/test_init.py
@@ -2,18 +2,15 @@
 from datetime import timedelta
 from unittest.mock import patch
 
-from homeassistant import const
-from homeassistant.auth import auth_manager_from_config
 from homeassistant.auth.models import Credentials
 from homeassistant.components.auth import RESULT_TYPE_USER
 from homeassistant.setup import async_setup_component
 from homeassistant.util.dt import utcnow
 from homeassistant.components import auth
 
-from . import async_setup_auth
+from tests.common import CLIENT_ID, CLIENT_REDIRECT_URI, MockUser
 
-from tests.common import CLIENT_ID, CLIENT_REDIRECT_URI, MockUser, \
-    ensure_auth_manager_loaded
+from . import async_setup_auth
 
 
 async def test_login_new_user_and_trying_refresh_token(hass, aiohttp_client):
@@ -272,28 +269,12 @@ async def test_revoking_refresh_token(hass, aiohttp_client):
     assert resp.status == 400
 
 
-async def test_ws_long_lived_access_token(hass, hass_ws_client):
+async def test_ws_long_lived_access_token(hass, hass_ws_client,
+                                          hass_access_token):
     """Test generate long-lived access token."""
-    hass.auth = await auth_manager_from_config(
-        hass, provider_configs=[{
-            'type': 'insecure_example',
-            'users': [{
-                'username': 'test-user',
-                'password': 'test-pass',
-                'name': 'Test Name',
-            }]
-        }], module_configs=[])
-    ensure_auth_manager_loaded(hass.auth)
     assert await async_setup_component(hass, 'auth', {'http': {}})
-    assert await async_setup_component(hass, 'api', {'http': {}})
 
-    user = MockUser(id='mock-user').add_to_hass(hass)
-    cred = await hass.auth.auth_providers[0].async_get_or_create_credentials(
-        {'username': 'test-user'})
-    await hass.auth.async_link_user(user, cred)
-
-    ws_client = await hass_ws_client(hass, hass.auth.async_create_access_token(
-        await hass.auth.async_create_refresh_token(user, CLIENT_ID)))
+    ws_client = await hass_ws_client(hass, hass_access_token)
 
     # verify create long-lived access token
     await ws_client.send_json({
@@ -315,12 +296,51 @@ async def test_ws_long_lived_access_token(hass, hass_ws_client):
     assert refresh_token.client_name == 'GPS Logger'
     assert refresh_token.client_icon is None
 
-    # verify long-lived access token can be used as bearer token
-    api_client = ws_client.client
-    resp = await api_client.get(const.URL_API)
-    assert resp.status == 401
 
-    resp = await api_client.get(const.URL_API, headers={
-        'Authorization': 'Bearer {}'.format(long_lived_access_token)
+async def test_ws_refresh_tokens(hass, hass_ws_client, hass_access_token):
+    """Test fetching refresh token metadata."""
+    assert await async_setup_component(hass, 'auth', {'http': {}})
+
+    ws_client = await hass_ws_client(hass, hass_access_token)
+
+    await ws_client.send_json({
+        'id': 5,
+        'type': auth.WS_TYPE_REFRESH_TOKENS,
     })
-    assert resp.status == 200
+
+    result = await ws_client.receive_json()
+    assert result['success'], result
+    assert len(result['result']) == 1
+    token = result['result'][0]
+    refresh_token = await hass.auth.async_validate_access_token(
+        hass_access_token)
+    assert token['id'] == refresh_token.id
+    assert token['type'] == refresh_token.token_type
+    assert token['client_id'] == refresh_token.client_id
+    assert token['client_name'] == refresh_token.client_name
+    assert token['client_icon'] == refresh_token.client_icon
+    assert token['created_at'] == refresh_token.created_at.isoformat()
+
+
+async def test_ws_delete_refresh_token(hass, hass_ws_client,
+                                       hass_access_token):
+    """Test deleting a refresh token."""
+    assert await async_setup_component(hass, 'auth', {'http': {}})
+
+    refresh_token = await hass.auth.async_validate_access_token(
+        hass_access_token)
+
+    ws_client = await hass_ws_client(hass, hass_access_token)
+
+    # verify create long-lived access token
+    await ws_client.send_json({
+        'id': 5,
+        'type': auth.WS_TYPE_DELETE_REFRESH_TOKEN,
+        'refresh_token_id': refresh_token.id
+    })
+
+    result = await ws_client.receive_json()
+    assert result['success'], result
+    refresh_token = await hass.auth.async_validate_access_token(
+        hass_access_token)
+    assert refresh_token is None
diff --git a/tests/components/conftest.py b/tests/components/conftest.py
index 7cec790c847..232405a632c 100644
--- a/tests/components/conftest.py
+++ b/tests/components/conftest.py
@@ -1,4 +1,6 @@
 """Fixtures for component testing."""
+from unittest.mock import patch
+
 import pytest
 
 from homeassistant.setup import async_setup_component
@@ -16,23 +18,37 @@ def hass_ws_client(aiohttp_client):
         assert await async_setup_component(hass, 'websocket_api')
 
         client = await aiohttp_client(hass.http.app)
-        websocket = await client.ws_connect(wapi.URL)
-        auth_resp = await websocket.receive_json()
 
-        if auth_resp['type'] == wapi.TYPE_AUTH_OK:
-            assert access_token is None, \
-                'Access token given but no auth required'
-            return websocket
+        patching = None
 
-        assert access_token is not None, 'Access token required for fixture'
+        if access_token is not None:
+            patching = patch('homeassistant.auth.AuthManager.active',
+                             return_value=True)
+            patching.start()
 
-        await websocket.send_json({
-            'type': websocket_api.TYPE_AUTH,
-            'access_token': access_token
-        })
+        try:
+            websocket = await client.ws_connect(wapi.URL)
+            auth_resp = await websocket.receive_json()
 
-        auth_ok = await websocket.receive_json()
-        assert auth_ok['type'] == wapi.TYPE_AUTH_OK
+            if auth_resp['type'] == wapi.TYPE_AUTH_OK:
+                assert access_token is None, \
+                    'Access token given but no auth required'
+                return websocket
+
+            assert access_token is not None, \
+                'Access token required for fixture'
+
+            await websocket.send_json({
+                'type': websocket_api.TYPE_AUTH,
+                'access_token': access_token
+            })
+
+            auth_ok = await websocket.receive_json()
+            assert auth_ok['type'] == wapi.TYPE_AUTH_OK
+
+        finally:
+            if patching is not None:
+                patching.stop()
 
         # wrap in client
         websocket.client = client

From 3f06b4eb9bf2e9e487f6afd680ba6a0023c96390 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Tue, 11 Sep 2018 21:36:54 +0200
Subject: [PATCH 094/357] Update translations

---
 .../components/auth/.translations/sv.json     |  4 ++++
 .../components/hangouts/.translations/sv.json |  8 ++++++++
 .../homematicip_cloud/.translations/sv.json   |  1 +
 .../components/openuv/.translations/ar.json   |  5 +++++
 .../components/openuv/.translations/de.json   | 19 ++++++++++++++++++
 .../components/openuv/.translations/fa.json   |  5 +++++
 .../components/openuv/.translations/ko.json   | 20 +++++++++++++++++++
 .../components/openuv/.translations/nl.json   | 19 ++++++++++++++++++
 .../components/openuv/.translations/no.json   | 20 +++++++++++++++++++
 .../components/openuv/.translations/pl.json   |  4 +++-
 .../components/openuv/.translations/sv.json   |  4 +++-
 11 files changed, 107 insertions(+), 2 deletions(-)
 create mode 100644 homeassistant/components/openuv/.translations/ar.json
 create mode 100644 homeassistant/components/openuv/.translations/de.json
 create mode 100644 homeassistant/components/openuv/.translations/fa.json
 create mode 100644 homeassistant/components/openuv/.translations/ko.json
 create mode 100644 homeassistant/components/openuv/.translations/nl.json
 create mode 100644 homeassistant/components/openuv/.translations/no.json

diff --git a/homeassistant/components/auth/.translations/sv.json b/homeassistant/components/auth/.translations/sv.json
index e148766e2a1..cf8227c09a3 100644
--- a/homeassistant/components/auth/.translations/sv.json
+++ b/homeassistant/components/auth/.translations/sv.json
@@ -1,8 +1,12 @@
 {
     "mfa_setup": {
         "totp": {
+            "error": {
+                "invalid_code": "Ogiltig kod, f\u00f6rs\u00f6k igen. Om du flera g\u00e5nger i rad f\u00e5r detta fel, se till att klockan i din Home Assistant \u00e4r korrekt inst\u00e4lld."
+            },
             "step": {
                 "init": {
+                    "description": "F\u00f6r att aktivera tv\u00e5faktorsautentisering som anv\u00e4nder tidsbaserade eng\u00e5ngsl\u00f6senord, skanna QR-koden med din autentiseringsapp. Om du inte har en, rekommenderar vi antingen [Google Authenticator] (https://support.google.com/accounts/answer/1066447) eller [Authy] (https://authy.com/). \n\n{qr_code} \n\nN\u00e4r du har skannat koden anger du den sexsiffriga koden fr\u00e5n din app f\u00f6r att verifiera inst\u00e4llningen. Om du har problem med att skanna QR-koden, g\u00f6r en manuell inst\u00e4llning med kod ** ` {code} ` **.",
                     "title": "St\u00e4ll in tv\u00e5faktorsautentisering med TOTP"
                 }
             },
diff --git a/homeassistant/components/hangouts/.translations/sv.json b/homeassistant/components/hangouts/.translations/sv.json
index d926097dfc2..90bf4e97712 100644
--- a/homeassistant/components/hangouts/.translations/sv.json
+++ b/homeassistant/components/hangouts/.translations/sv.json
@@ -4,8 +4,16 @@
             "already_configured": "Google Hangouts \u00e4r redan inst\u00e4llt",
             "unknown": "Ett ok\u00e4nt fel intr\u00e4ffade"
         },
+        "error": {
+            "invalid_2fa": "Ogiltig 2FA autentisering, f\u00f6rs\u00f6k igen.",
+            "invalid_2fa_method": "Ogiltig 2FA-metod (Verifiera med telefon).",
+            "invalid_login": "Ogiltig inloggning, f\u00f6rs\u00f6k igen."
+        },
         "step": {
             "2fa": {
+                "data": {
+                    "2fa": "2FA Pinkod"
+                },
                 "title": "Tv\u00e5faktorsautentisering"
             },
             "user": {
diff --git a/homeassistant/components/homematicip_cloud/.translations/sv.json b/homeassistant/components/homematicip_cloud/.translations/sv.json
index 945dca8a277..4e8aac999de 100644
--- a/homeassistant/components/homematicip_cloud/.translations/sv.json
+++ b/homeassistant/components/homematicip_cloud/.translations/sv.json
@@ -3,6 +3,7 @@
         "abort": {
             "already_configured": "Accesspunkten \u00e4r redan konfigurerad",
             "conection_aborted": "Kunde inte ansluta till HMIP server",
+            "connection_aborted": "Det gick inte att ansluta till HMIP-servern",
             "unknown": "Ett ok\u00e4nt fel har intr\u00e4ffat"
         },
         "error": {
diff --git a/homeassistant/components/openuv/.translations/ar.json b/homeassistant/components/openuv/.translations/ar.json
new file mode 100644
index 00000000000..288fae919dc
--- /dev/null
+++ b/homeassistant/components/openuv/.translations/ar.json
@@ -0,0 +1,5 @@
+{
+    "config": {
+        "title": "OpenUV"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/openuv/.translations/de.json b/homeassistant/components/openuv/.translations/de.json
new file mode 100644
index 00000000000..1f81ac30f53
--- /dev/null
+++ b/homeassistant/components/openuv/.translations/de.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "error": {
+            "identifier_exists": "Koordinaten existieren bereits",
+            "invalid_api_key": "Ung\u00fcltiger API-Schl\u00fcssel"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "OpenUV API-Schl\u00fcssel",
+                    "elevation": "H\u00f6he",
+                    "latitude": "Breitengrad",
+                    "longitude": "L\u00e4ngengrad"
+                }
+            }
+        },
+        "title": "OpenUV"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/openuv/.translations/fa.json b/homeassistant/components/openuv/.translations/fa.json
new file mode 100644
index 00000000000..288fae919dc
--- /dev/null
+++ b/homeassistant/components/openuv/.translations/fa.json
@@ -0,0 +1,5 @@
+{
+    "config": {
+        "title": "OpenUV"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/openuv/.translations/ko.json b/homeassistant/components/openuv/.translations/ko.json
new file mode 100644
index 00000000000..bb054f0b3a6
--- /dev/null
+++ b/homeassistant/components/openuv/.translations/ko.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "error": {
+            "identifier_exists": "\uc88c\ud45c\uac12\uc774 \uc774\ubbf8 \ub4f1\ub85d\ub418\uc5c8\uc2b5\ub2c8\ub2e4",
+            "invalid_api_key": "\uc798\ubabb\ub41c API \ud0a4"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "OpenUV API \ud0a4",
+                    "elevation": "\uace0\ub3c4",
+                    "latitude": "\uc704\ub3c4",
+                    "longitude": "\uacbd\ub3c4"
+                },
+                "title": "\uc0ac\uc6a9\uc790 \uc815\ubcf4\ub97c \uc785\ub825\ud574 \uc8fc\uc138\uc694"
+            }
+        },
+        "title": "OpenUV"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/openuv/.translations/nl.json b/homeassistant/components/openuv/.translations/nl.json
new file mode 100644
index 00000000000..2c5086b3365
--- /dev/null
+++ b/homeassistant/components/openuv/.translations/nl.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "error": {
+            "invalid_api_key": "Ongeldige API-sleutel"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "OpenUV API-Sleutel",
+                    "elevation": "Hoogte",
+                    "latitude": "Breedtegraad",
+                    "longitude": "Lengtegraad"
+                },
+                "title": "Vul uw gegevens in"
+            }
+        },
+        "title": "OpenUV"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/openuv/.translations/no.json b/homeassistant/components/openuv/.translations/no.json
new file mode 100644
index 00000000000..2ffd5e7fb41
--- /dev/null
+++ b/homeassistant/components/openuv/.translations/no.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "error": {
+            "identifier_exists": "Koordinatene er allerede registrert",
+            "invalid_api_key": "Ugyldig API-n\u00f8kkel"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "OpenUV API-n\u00f8kkel",
+                    "elevation": "Elevasjon",
+                    "latitude": "Breddegrad",
+                    "longitude": "Lengdegrad"
+                },
+                "title": "Fyll ut informasjonen din"
+            }
+        },
+        "title": "OpenUV"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/openuv/.translations/pl.json b/homeassistant/components/openuv/.translations/pl.json
index fdb94b293b8..f6c52ffd04e 100644
--- a/homeassistant/components/openuv/.translations/pl.json
+++ b/homeassistant/components/openuv/.translations/pl.json
@@ -8,9 +8,11 @@
             "user": {
                 "data": {
                     "api_key": "Klucz API OpenUV",
+                    "elevation": "Wysoko\u015b\u0107",
                     "latitude": "Szeroko\u015b\u0107 geograficzna",
                     "longitude": "D\u0142ugo\u015b\u0107 geograficzna"
-                }
+                },
+                "title": "Wpisz swoje informacje"
             }
         },
         "title": "OpenUV"
diff --git a/homeassistant/components/openuv/.translations/sv.json b/homeassistant/components/openuv/.translations/sv.json
index 0df9a0434ab..d9de0f7c0a6 100644
--- a/homeassistant/components/openuv/.translations/sv.json
+++ b/homeassistant/components/openuv/.translations/sv.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "error": {
+            "identifier_exists": "Koordinater \u00e4r redan registrerade",
             "invalid_api_key": "Ogiltigt API-l\u00f6senord"
         },
         "step": {
@@ -13,6 +14,7 @@
                 },
                 "title": "Fyll i dina uppgifter"
             }
-        }
+        },
+        "title": "OpenUV"
     }
 }
\ No newline at end of file

From 00d8907c5ec811c2de6a3a72af643a490b17e3ca Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Tue, 11 Sep 2018 21:36:54 +0200
Subject: [PATCH 095/357] Update translations

---
 .../components/auth/.translations/sv.json     |  4 ++++
 .../components/hangouts/.translations/sv.json |  8 ++++++++
 .../homematicip_cloud/.translations/sv.json   |  1 +
 .../components/openuv/.translations/ar.json   |  5 +++++
 .../components/openuv/.translations/de.json   | 19 ++++++++++++++++++
 .../components/openuv/.translations/fa.json   |  5 +++++
 .../components/openuv/.translations/ko.json   | 20 +++++++++++++++++++
 .../components/openuv/.translations/nl.json   | 19 ++++++++++++++++++
 .../components/openuv/.translations/no.json   | 20 +++++++++++++++++++
 .../components/openuv/.translations/pl.json   |  4 +++-
 .../components/openuv/.translations/sv.json   |  4 +++-
 11 files changed, 107 insertions(+), 2 deletions(-)
 create mode 100644 homeassistant/components/openuv/.translations/ar.json
 create mode 100644 homeassistant/components/openuv/.translations/de.json
 create mode 100644 homeassistant/components/openuv/.translations/fa.json
 create mode 100644 homeassistant/components/openuv/.translations/ko.json
 create mode 100644 homeassistant/components/openuv/.translations/nl.json
 create mode 100644 homeassistant/components/openuv/.translations/no.json

diff --git a/homeassistant/components/auth/.translations/sv.json b/homeassistant/components/auth/.translations/sv.json
index e148766e2a1..cf8227c09a3 100644
--- a/homeassistant/components/auth/.translations/sv.json
+++ b/homeassistant/components/auth/.translations/sv.json
@@ -1,8 +1,12 @@
 {
     "mfa_setup": {
         "totp": {
+            "error": {
+                "invalid_code": "Ogiltig kod, f\u00f6rs\u00f6k igen. Om du flera g\u00e5nger i rad f\u00e5r detta fel, se till att klockan i din Home Assistant \u00e4r korrekt inst\u00e4lld."
+            },
             "step": {
                 "init": {
+                    "description": "F\u00f6r att aktivera tv\u00e5faktorsautentisering som anv\u00e4nder tidsbaserade eng\u00e5ngsl\u00f6senord, skanna QR-koden med din autentiseringsapp. Om du inte har en, rekommenderar vi antingen [Google Authenticator] (https://support.google.com/accounts/answer/1066447) eller [Authy] (https://authy.com/). \n\n{qr_code} \n\nN\u00e4r du har skannat koden anger du den sexsiffriga koden fr\u00e5n din app f\u00f6r att verifiera inst\u00e4llningen. Om du har problem med att skanna QR-koden, g\u00f6r en manuell inst\u00e4llning med kod ** ` {code} ` **.",
                     "title": "St\u00e4ll in tv\u00e5faktorsautentisering med TOTP"
                 }
             },
diff --git a/homeassistant/components/hangouts/.translations/sv.json b/homeassistant/components/hangouts/.translations/sv.json
index d926097dfc2..90bf4e97712 100644
--- a/homeassistant/components/hangouts/.translations/sv.json
+++ b/homeassistant/components/hangouts/.translations/sv.json
@@ -4,8 +4,16 @@
             "already_configured": "Google Hangouts \u00e4r redan inst\u00e4llt",
             "unknown": "Ett ok\u00e4nt fel intr\u00e4ffade"
         },
+        "error": {
+            "invalid_2fa": "Ogiltig 2FA autentisering, f\u00f6rs\u00f6k igen.",
+            "invalid_2fa_method": "Ogiltig 2FA-metod (Verifiera med telefon).",
+            "invalid_login": "Ogiltig inloggning, f\u00f6rs\u00f6k igen."
+        },
         "step": {
             "2fa": {
+                "data": {
+                    "2fa": "2FA Pinkod"
+                },
                 "title": "Tv\u00e5faktorsautentisering"
             },
             "user": {
diff --git a/homeassistant/components/homematicip_cloud/.translations/sv.json b/homeassistant/components/homematicip_cloud/.translations/sv.json
index 945dca8a277..4e8aac999de 100644
--- a/homeassistant/components/homematicip_cloud/.translations/sv.json
+++ b/homeassistant/components/homematicip_cloud/.translations/sv.json
@@ -3,6 +3,7 @@
         "abort": {
             "already_configured": "Accesspunkten \u00e4r redan konfigurerad",
             "conection_aborted": "Kunde inte ansluta till HMIP server",
+            "connection_aborted": "Det gick inte att ansluta till HMIP-servern",
             "unknown": "Ett ok\u00e4nt fel har intr\u00e4ffat"
         },
         "error": {
diff --git a/homeassistant/components/openuv/.translations/ar.json b/homeassistant/components/openuv/.translations/ar.json
new file mode 100644
index 00000000000..288fae919dc
--- /dev/null
+++ b/homeassistant/components/openuv/.translations/ar.json
@@ -0,0 +1,5 @@
+{
+    "config": {
+        "title": "OpenUV"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/openuv/.translations/de.json b/homeassistant/components/openuv/.translations/de.json
new file mode 100644
index 00000000000..1f81ac30f53
--- /dev/null
+++ b/homeassistant/components/openuv/.translations/de.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "error": {
+            "identifier_exists": "Koordinaten existieren bereits",
+            "invalid_api_key": "Ung\u00fcltiger API-Schl\u00fcssel"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "OpenUV API-Schl\u00fcssel",
+                    "elevation": "H\u00f6he",
+                    "latitude": "Breitengrad",
+                    "longitude": "L\u00e4ngengrad"
+                }
+            }
+        },
+        "title": "OpenUV"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/openuv/.translations/fa.json b/homeassistant/components/openuv/.translations/fa.json
new file mode 100644
index 00000000000..288fae919dc
--- /dev/null
+++ b/homeassistant/components/openuv/.translations/fa.json
@@ -0,0 +1,5 @@
+{
+    "config": {
+        "title": "OpenUV"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/openuv/.translations/ko.json b/homeassistant/components/openuv/.translations/ko.json
new file mode 100644
index 00000000000..bb054f0b3a6
--- /dev/null
+++ b/homeassistant/components/openuv/.translations/ko.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "error": {
+            "identifier_exists": "\uc88c\ud45c\uac12\uc774 \uc774\ubbf8 \ub4f1\ub85d\ub418\uc5c8\uc2b5\ub2c8\ub2e4",
+            "invalid_api_key": "\uc798\ubabb\ub41c API \ud0a4"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "OpenUV API \ud0a4",
+                    "elevation": "\uace0\ub3c4",
+                    "latitude": "\uc704\ub3c4",
+                    "longitude": "\uacbd\ub3c4"
+                },
+                "title": "\uc0ac\uc6a9\uc790 \uc815\ubcf4\ub97c \uc785\ub825\ud574 \uc8fc\uc138\uc694"
+            }
+        },
+        "title": "OpenUV"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/openuv/.translations/nl.json b/homeassistant/components/openuv/.translations/nl.json
new file mode 100644
index 00000000000..2c5086b3365
--- /dev/null
+++ b/homeassistant/components/openuv/.translations/nl.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "error": {
+            "invalid_api_key": "Ongeldige API-sleutel"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "OpenUV API-Sleutel",
+                    "elevation": "Hoogte",
+                    "latitude": "Breedtegraad",
+                    "longitude": "Lengtegraad"
+                },
+                "title": "Vul uw gegevens in"
+            }
+        },
+        "title": "OpenUV"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/openuv/.translations/no.json b/homeassistant/components/openuv/.translations/no.json
new file mode 100644
index 00000000000..2ffd5e7fb41
--- /dev/null
+++ b/homeassistant/components/openuv/.translations/no.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "error": {
+            "identifier_exists": "Koordinatene er allerede registrert",
+            "invalid_api_key": "Ugyldig API-n\u00f8kkel"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "OpenUV API-n\u00f8kkel",
+                    "elevation": "Elevasjon",
+                    "latitude": "Breddegrad",
+                    "longitude": "Lengdegrad"
+                },
+                "title": "Fyll ut informasjonen din"
+            }
+        },
+        "title": "OpenUV"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/openuv/.translations/pl.json b/homeassistant/components/openuv/.translations/pl.json
index fdb94b293b8..f6c52ffd04e 100644
--- a/homeassistant/components/openuv/.translations/pl.json
+++ b/homeassistant/components/openuv/.translations/pl.json
@@ -8,9 +8,11 @@
             "user": {
                 "data": {
                     "api_key": "Klucz API OpenUV",
+                    "elevation": "Wysoko\u015b\u0107",
                     "latitude": "Szeroko\u015b\u0107 geograficzna",
                     "longitude": "D\u0142ugo\u015b\u0107 geograficzna"
-                }
+                },
+                "title": "Wpisz swoje informacje"
             }
         },
         "title": "OpenUV"
diff --git a/homeassistant/components/openuv/.translations/sv.json b/homeassistant/components/openuv/.translations/sv.json
index 0df9a0434ab..d9de0f7c0a6 100644
--- a/homeassistant/components/openuv/.translations/sv.json
+++ b/homeassistant/components/openuv/.translations/sv.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "error": {
+            "identifier_exists": "Koordinater \u00e4r redan registrerade",
             "invalid_api_key": "Ogiltigt API-l\u00f6senord"
         },
         "step": {
@@ -13,6 +14,7 @@
                 },
                 "title": "Fyll i dina uppgifter"
             }
-        }
+        },
+        "title": "OpenUV"
     }
 }
\ No newline at end of file

From 629c4a0bf57a753c651092f605c348f3d24d414a Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Tue, 11 Sep 2018 21:37:38 +0200
Subject: [PATCH 096/357] Update frontend to 20180911.0

---
 homeassistant/components/frontend/__init__.py | 2 +-
 requirements_all.txt                          | 2 +-
 requirements_test_all.txt                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/frontend/__init__.py b/homeassistant/components/frontend/__init__.py
index add323c4c28..5fea70ce846 100644
--- a/homeassistant/components/frontend/__init__.py
+++ b/homeassistant/components/frontend/__init__.py
@@ -26,7 +26,7 @@ from homeassistant.helpers.translation import async_get_translations
 from homeassistant.loader import bind_hass
 from homeassistant.util.yaml import load_yaml
 
-REQUIREMENTS = ['home-assistant-frontend==20180910.0']
+REQUIREMENTS = ['home-assistant-frontend==20180911.0']
 
 DOMAIN = 'frontend'
 DEPENDENCIES = ['api', 'websocket_api', 'http', 'system_log',
diff --git a/requirements_all.txt b/requirements_all.txt
index 50cc56f3443..14e9f753246 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -452,7 +452,7 @@ hole==0.3.0
 holidays==0.9.6
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180910.0
+home-assistant-frontend==20180911.0
 
 # homeassistant.components.homekit_controller
 # homekit==0.10
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 42f2c11242e..9df1060e4ac 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -84,7 +84,7 @@ hbmqtt==0.9.4
 holidays==0.9.6
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180910.0
+home-assistant-frontend==20180911.0
 
 # homeassistant.components.homematicip_cloud
 homematicip==0.9.8

From b9b8bc678c51615677294078b2ac8061a902ad45 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Tue, 11 Sep 2018 21:37:38 +0200
Subject: [PATCH 097/357] Update frontend to 20180911.0

---
 homeassistant/components/frontend/__init__.py | 2 +-
 requirements_all.txt                          | 2 +-
 requirements_test_all.txt                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/frontend/__init__.py b/homeassistant/components/frontend/__init__.py
index add323c4c28..5fea70ce846 100644
--- a/homeassistant/components/frontend/__init__.py
+++ b/homeassistant/components/frontend/__init__.py
@@ -26,7 +26,7 @@ from homeassistant.helpers.translation import async_get_translations
 from homeassistant.loader import bind_hass
 from homeassistant.util.yaml import load_yaml
 
-REQUIREMENTS = ['home-assistant-frontend==20180910.0']
+REQUIREMENTS = ['home-assistant-frontend==20180911.0']
 
 DOMAIN = 'frontend'
 DEPENDENCIES = ['api', 'websocket_api', 'http', 'system_log',
diff --git a/requirements_all.txt b/requirements_all.txt
index 358f5ac2244..ab83a023381 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -452,7 +452,7 @@ hole==0.3.0
 holidays==0.9.6
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180910.0
+home-assistant-frontend==20180911.0
 
 # homeassistant.components.homekit_controller
 # homekit==0.10
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 9f875118b2e..7708aeb6650 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -84,7 +84,7 @@ hbmqtt==0.9.4
 holidays==0.9.6
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180910.0
+home-assistant-frontend==20180911.0
 
 # homeassistant.components.homematicip_cloud
 homematicip==0.9.8

From 06af76404ff28a3bf8531e952c33793e32bf621c Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Tue, 11 Sep 2018 21:40:35 +0200
Subject: [PATCH 098/357] Fix invalid state (#16558)

* Fix invalid state

* Make slightly more efficient in unsubscribing

* Use uuid4"
---
 homeassistant/const.py |  3 +++
 homeassistant/core.py  | 20 +++++++++++++++-----
 tests/test_core.py     | 29 +++++++++++++++++++++++++++--
 3 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/homeassistant/const.py b/homeassistant/const.py
index d27b5e3a1b7..b9b71734241 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -225,6 +225,9 @@ ATTR_ID = 'id'
 # Name
 ATTR_NAME = 'name'
 
+# Data for a SERVICE_EXECUTED event
+ATTR_SERVICE_CALL_ID = 'service_call_id'
+
 # Contains one string or a list of strings, each being an entity id
 ATTR_ENTITY_ID = 'entity_id'
 
diff --git a/homeassistant/core.py b/homeassistant/core.py
index fdbbe49ea05..39ee20cb1a8 100644
--- a/homeassistant/core.py
+++ b/homeassistant/core.py
@@ -29,7 +29,7 @@ from voluptuous.humanize import humanize_error
 
 from homeassistant.const import (
     ATTR_DOMAIN, ATTR_FRIENDLY_NAME, ATTR_NOW, ATTR_SERVICE,
-    ATTR_SERVICE_DATA, EVENT_CALL_SERVICE,
+    ATTR_SERVICE_CALL_ID, ATTR_SERVICE_DATA, EVENT_CALL_SERVICE,
     EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP,
     EVENT_SERVICE_EXECUTED, EVENT_SERVICE_REGISTERED, EVENT_STATE_CHANGED,
     EVENT_TIME_CHANGED, MATCH_ALL, EVENT_HOMEASSISTANT_CLOSE,
@@ -1042,10 +1042,12 @@ class ServiceRegistry:
         This method is a coroutine.
         """
         context = context or Context()
+        call_id = uuid.uuid4().hex
         event_data = {
             ATTR_DOMAIN: domain.lower(),
             ATTR_SERVICE: service.lower(),
             ATTR_SERVICE_DATA: service_data,
+            ATTR_SERVICE_CALL_ID: call_id,
         }
 
         if not blocking:
@@ -1058,8 +1060,9 @@ class ServiceRegistry:
         @callback
         def service_executed(event: Event) -> None:
             """Handle an executed service."""
-            if event.context == context:
+            if event.data[ATTR_SERVICE_CALL_ID] == call_id:
                 fut.set_result(True)
+                unsub()
 
         unsub = self._hass.bus.async_listen(
             EVENT_SERVICE_EXECUTED, service_executed)
@@ -1069,7 +1072,8 @@ class ServiceRegistry:
 
         done, _ = await asyncio.wait([fut], timeout=SERVICE_CALL_LIMIT)
         success = bool(done)
-        unsub()
+        if not success:
+            unsub()
         return success
 
     async def _event_to_service_call(self, event: Event) -> None:
@@ -1077,6 +1081,7 @@ class ServiceRegistry:
         service_data = event.data.get(ATTR_SERVICE_DATA) or {}
         domain = event.data.get(ATTR_DOMAIN).lower()  # type: ignore
         service = event.data.get(ATTR_SERVICE).lower()  # type: ignore
+        call_id = event.data.get(ATTR_SERVICE_CALL_ID)
 
         if not self.has_service(domain, service):
             if event.origin == EventOrigin.local:
@@ -1088,12 +1093,17 @@ class ServiceRegistry:
 
         def fire_service_executed() -> None:
             """Fire service executed event."""
+            if not call_id:
+                return
+
+            data = {ATTR_SERVICE_CALL_ID: call_id}
+
             if (service_handler.is_coroutinefunction or
                     service_handler.is_callback):
-                self._hass.bus.async_fire(EVENT_SERVICE_EXECUTED, {},
+                self._hass.bus.async_fire(EVENT_SERVICE_EXECUTED, data,
                                           EventOrigin.local, event.context)
             else:
-                self._hass.bus.fire(EVENT_SERVICE_EXECUTED, {},
+                self._hass.bus.fire(EVENT_SERVICE_EXECUTED, data,
                                     EventOrigin.local, event.context)
 
         try:
diff --git a/tests/test_core.py b/tests/test_core.py
index ce066135709..7e6d57136e4 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -20,9 +20,10 @@ from homeassistant.util.unit_system import (METRIC_SYSTEM)
 from homeassistant.const import (
     __version__, EVENT_STATE_CHANGED, ATTR_FRIENDLY_NAME, CONF_UNIT_SYSTEM,
     ATTR_NOW, EVENT_TIME_CHANGED, EVENT_HOMEASSISTANT_STOP,
-    EVENT_HOMEASSISTANT_CLOSE, EVENT_SERVICE_REGISTERED, EVENT_SERVICE_REMOVED)
+    EVENT_HOMEASSISTANT_CLOSE, EVENT_SERVICE_REGISTERED, EVENT_SERVICE_REMOVED,
+    EVENT_SERVICE_EXECUTED)
 
-from tests.common import get_test_home_assistant
+from tests.common import get_test_home_assistant, async_mock_service
 
 PST = pytz.timezone('America/Los_Angeles')
 
@@ -969,3 +970,27 @@ def test_track_task_functions(loop):
         assert hass._track_task
     finally:
         yield from hass.async_stop()
+
+
+async def test_service_executed_with_subservices(hass):
+    """Test we block correctly till all services done."""
+    calls = async_mock_service(hass, 'test', 'inner')
+
+    async def handle_outer(call):
+        """Handle outer service call."""
+        calls.append(call)
+        call1 = hass.services.async_call('test', 'inner', blocking=True,
+                                         context=call.context)
+        call2 = hass.services.async_call('test', 'inner', blocking=True,
+                                         context=call.context)
+        await asyncio.wait([call1, call2])
+        calls.append(call)
+
+    hass.services.async_register('test', 'outer', handle_outer)
+
+    await hass.services.async_call('test', 'outer', blocking=True)
+
+    assert len(calls) == 4
+    assert [call.service for call in calls] == [
+        'outer', 'inner', 'inner', 'outer']
+    assert len(hass.bus.async_listeners().get(EVENT_SERVICE_EXECUTED, [])) == 0

From 968809c99130baedf34c91569f5b208459b252c2 Mon Sep 17 00:00:00 2001
From: Diogo Gomes <diogogomes@gmail.com>
Date: Tue, 11 Sep 2018 10:30:20 +0100
Subject: [PATCH 099/357] Replace api_password in Camera.Push (#16339)

* Use access_token and user provided token instead of api_password

* address comments by @awarecan

* new tests

* add extra checks and test

* lint

* add comment
---
 homeassistant/components/camera/push.py | 32 ++++++++++--
 tests/components/camera/test_push.py    | 67 ++++++++++++++++++++++---
 2 files changed, 87 insertions(+), 12 deletions(-)

diff --git a/homeassistant/components/camera/push.py b/homeassistant/components/camera/push.py
index 305e29d62d3..c9deca1309d 100644
--- a/homeassistant/components/camera/push.py
+++ b/homeassistant/components/camera/push.py
@@ -13,8 +13,10 @@ import voluptuous as vol
 from homeassistant.components.camera import Camera, PLATFORM_SCHEMA,\
     STATE_IDLE, STATE_RECORDING
 from homeassistant.core import callback
-from homeassistant.components.http.view import HomeAssistantView
-from homeassistant.const import CONF_NAME, CONF_TIMEOUT, HTTP_BAD_REQUEST
+from homeassistant.components.http.view import KEY_AUTHENTICATED,\
+    HomeAssistantView
+from homeassistant.const import CONF_NAME, CONF_TIMEOUT,\
+    HTTP_NOT_FOUND, HTTP_UNAUTHORIZED, HTTP_BAD_REQUEST
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.event import async_track_point_in_utc_time
 import homeassistant.util.dt as dt_util
@@ -25,11 +27,13 @@ DEPENDENCIES = ['http']
 
 CONF_BUFFER_SIZE = 'buffer'
 CONF_IMAGE_FIELD = 'field'
+CONF_TOKEN = 'token'
 
 DEFAULT_NAME = "Push Camera"
 
 ATTR_FILENAME = 'filename'
 ATTR_LAST_TRIP = 'last_trip'
+ATTR_TOKEN = 'token'
 
 PUSH_CAMERA_DATA = 'push_camera'
 
@@ -39,6 +43,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_TIMEOUT, default=timedelta(seconds=5)): vol.All(
         cv.time_period, cv.positive_timedelta),
     vol.Optional(CONF_IMAGE_FIELD, default='image'): cv.string,
+    vol.Optional(CONF_TOKEN): vol.All(cv.string, vol.Length(min=8)),
 })
 
 
@@ -50,7 +55,8 @@ async def async_setup_platform(hass, config, async_add_entities,
 
     cameras = [PushCamera(config[CONF_NAME],
                           config[CONF_BUFFER_SIZE],
-                          config[CONF_TIMEOUT])]
+                          config[CONF_TIMEOUT],
+                          config.get(CONF_TOKEN))]
 
     hass.http.register_view(CameraPushReceiver(hass,
                                                config[CONF_IMAGE_FIELD]))
@@ -63,6 +69,7 @@ class CameraPushReceiver(HomeAssistantView):
 
     url = "/api/camera_push/{entity_id}"
     name = 'api:camera_push:camera_entity'
+    requires_auth = False
 
     def __init__(self, hass, image_field):
         """Initialize CameraPushReceiver with camera entity."""
@@ -75,8 +82,21 @@ class CameraPushReceiver(HomeAssistantView):
 
         if _camera is None:
             _LOGGER.error("Unknown %s", entity_id)
+            status = HTTP_NOT_FOUND if request[KEY_AUTHENTICATED]\
+                else HTTP_UNAUTHORIZED
             return self.json_message('Unknown {}'.format(entity_id),
-                                     HTTP_BAD_REQUEST)
+                                     status)
+
+        # Supports HA authentication and token based
+        # when token has been configured
+        authenticated = (request[KEY_AUTHENTICATED] or
+                         (_camera.token is not None and
+                          request.query.get('token') == _camera.token))
+
+        if not authenticated:
+            return self.json_message(
+                'Invalid authorization credentials for {}'.format(entity_id),
+                HTTP_UNAUTHORIZED)
 
         try:
             data = await request.post()
@@ -95,7 +115,7 @@ class CameraPushReceiver(HomeAssistantView):
 class PushCamera(Camera):
     """The representation of a Push camera."""
 
-    def __init__(self, name, buffer_size, timeout):
+    def __init__(self, name, buffer_size, timeout, token):
         """Initialize push camera component."""
         super().__init__()
         self._name = name
@@ -106,6 +126,7 @@ class PushCamera(Camera):
         self._timeout = timeout
         self.queue = deque([], buffer_size)
         self._current_image = None
+        self.token = token
 
     async def async_added_to_hass(self):
         """Call when entity is added to hass."""
@@ -168,5 +189,6 @@ class PushCamera(Camera):
             name: value for name, value in (
                 (ATTR_LAST_TRIP, self._last_trip),
                 (ATTR_FILENAME, self._filename),
+                (ATTR_TOKEN, self.token),
             ) if value is not None
         }
diff --git a/tests/components/camera/test_push.py b/tests/components/camera/test_push.py
index f9a3c62aa4a..6d9688c10e6 100644
--- a/tests/components/camera/test_push.py
+++ b/tests/components/camera/test_push.py
@@ -6,7 +6,7 @@ from datetime import timedelta
 from homeassistant import core as ha
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
-from tests.components.auth import async_setup_auth
+from homeassistant.components.http.auth import setup_auth
 
 
 async def test_bad_posting(aioclient_mock, hass, aiohttp_client):
@@ -15,19 +15,69 @@ async def test_bad_posting(aioclient_mock, hass, aiohttp_client):
         'camera': {
             'platform': 'push',
             'name': 'config_test',
+            'token': '12345678'
         }})
-
-    client = await async_setup_auth(hass, aiohttp_client)
+    client = await aiohttp_client(hass.http.app)
 
     # missing file
     resp = await client.post('/api/camera_push/camera.config_test')
     assert resp.status == 400
 
-    files = {'image': io.BytesIO(b'fake')}
-
     # wrong entity
+    files = {'image': io.BytesIO(b'fake')}
     resp = await client.post('/api/camera_push/camera.wrong', data=files)
-    assert resp.status == 400
+    assert resp.status == 404
+
+
+async def test_cases_with_no_auth(aioclient_mock, hass, aiohttp_client):
+    """Test cases where aiohttp_client is not auth."""
+    await async_setup_component(hass, 'camera', {
+        'camera': {
+            'platform': 'push',
+            'name': 'config_test',
+            'token': '12345678'
+        }})
+
+    setup_auth(hass.http.app, [], True, api_password=None)
+    client = await aiohttp_client(hass.http.app)
+
+    # wrong token
+    files = {'image': io.BytesIO(b'fake')}
+    resp = await client.post('/api/camera_push/camera.config_test?token=1234',
+                             data=files)
+    assert resp.status == 401
+
+    # right token
+    files = {'image': io.BytesIO(b'fake')}
+    resp = await client.post(
+        '/api/camera_push/camera.config_test?token=12345678',
+        data=files)
+    assert resp.status == 200
+
+
+async def test_no_auth_no_token(aioclient_mock, hass, aiohttp_client):
+    """Test cases where aiohttp_client is not auth."""
+    await async_setup_component(hass, 'camera', {
+        'camera': {
+            'platform': 'push',
+            'name': 'config_test',
+        }})
+
+    setup_auth(hass.http.app, [], True, api_password=None)
+    client = await aiohttp_client(hass.http.app)
+
+    # no token
+    files = {'image': io.BytesIO(b'fake')}
+    resp = await client.post('/api/camera_push/camera.config_test',
+                             data=files)
+    assert resp.status == 401
+
+    # fake token
+    files = {'image': io.BytesIO(b'fake')}
+    resp = await client.post(
+        '/api/camera_push/camera.config_test?token=12345678',
+        data=files)
+    assert resp.status == 401
 
 
 async def test_posting_url(hass, aiohttp_client):
@@ -36,6 +86,7 @@ async def test_posting_url(hass, aiohttp_client):
         'camera': {
             'platform': 'push',
             'name': 'config_test',
+            'token': '12345678'
         }})
 
     client = await aiohttp_client(hass.http.app)
@@ -46,7 +97,9 @@ async def test_posting_url(hass, aiohttp_client):
     assert camera_state.state == 'idle'
 
     # post image
-    resp = await client.post('/api/camera_push/camera.config_test', data=files)
+    resp = await client.post(
+        '/api/camera_push/camera.config_test?token=12345678',
+        data=files)
     assert resp.status == 200
 
     # state recording

From 44d210698ed5ad5c23b28c5ee6b966b7dd7fdbc7 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Mon, 10 Sep 2018 23:51:40 +0200
Subject: [PATCH 100/357] Fail fetch auth providers if onboarding required
 (#16454)

---
 homeassistant/components/auth/login_flow.py | 15 ++++++++++++---
 tests/components/auth/test_login_flow.py    | 15 +++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/auth/login_flow.py b/homeassistant/components/auth/login_flow.py
index a518bdde415..73a739c2960 100644
--- a/homeassistant/components/auth/login_flow.py
+++ b/homeassistant/components/auth/login_flow.py
@@ -66,7 +66,7 @@ associate with an credential if "type" set to "link_user" in
     "version": 1
 }
 """
-import aiohttp.web
+from aiohttp import web
 import voluptuous as vol
 
 from homeassistant import data_entry_flow
@@ -95,11 +95,20 @@ class AuthProvidersView(HomeAssistantView):
 
     async def get(self, request):
         """Get available auth providers."""
+        hass = request.app['hass']
+
+        if not hass.components.onboarding.async_is_onboarded():
+            return self.json_message(
+                message='Onboarding not finished',
+                status_code=400,
+                message_code='onboarding_required'
+            )
+
         return self.json([{
             'name': provider.name,
             'id': provider.id,
             'type': provider.type,
-        } for provider in request.app['hass'].auth.auth_providers])
+        } for provider in hass.auth.auth_providers])
 
 
 def _prepare_result_json(result):
@@ -139,7 +148,7 @@ class LoginFlowIndexView(HomeAssistantView):
 
     async def get(self, request):
         """Do not allow index of flows in progress."""
-        return aiohttp.web.Response(status=405)
+        return web.Response(status=405)
 
     @RequestDataValidator(vol.Schema({
         vol.Required('client_id'): str,
diff --git a/tests/components/auth/test_login_flow.py b/tests/components/auth/test_login_flow.py
index 8b6108067c5..d759bac74b7 100644
--- a/tests/components/auth/test_login_flow.py
+++ b/tests/components/auth/test_login_flow.py
@@ -1,4 +1,6 @@
 """Tests for the login flow."""
+from unittest.mock import patch
+
 from . import async_setup_auth
 
 from tests.common import CLIENT_ID, CLIENT_REDIRECT_URI
@@ -16,6 +18,19 @@ async def test_fetch_auth_providers(hass, aiohttp_client):
     }]
 
 
+async def test_fetch_auth_providers_onboarding(hass, aiohttp_client):
+    """Test fetching auth providers."""
+    client = await async_setup_auth(hass, aiohttp_client)
+    with patch('homeassistant.components.onboarding.async_is_onboarded',
+               return_value=False):
+        resp = await client.get('/auth/providers')
+    assert resp.status == 400
+    assert await resp.json() == {
+        'message': 'Onboarding not finished',
+        'code': 'onboarding_required',
+    }
+
+
 async def test_cannot_get_flows_in_progress(hass, aiohttp_client):
     """Test we cannot get flows in progress."""
     client = await async_setup_auth(hass, aiohttp_client, [])

From 1ea8c1ece3cca8ea5d191d6e2ba04605f3bb68a1 Mon Sep 17 00:00:00 2001
From: Tom Harris <tharris@harrisnj.net>
Date: Mon, 10 Sep 2018 10:54:17 -0400
Subject: [PATCH 101/357] Fix insteon Hub v1 support (#16472)

* Fix support for Hub version 1 (i.e. pre-2014 Hub model 2242)

* Bump insteonplm to 0.14.1

* Code review changes

* Clean up and better document set_default_port

* Simplify set_default_port based on code review

* Remove Callable type import

* Simplify port setup
---
 homeassistant/components/insteon/__init__.py | 40 +++++++++++++-------
 requirements_all.txt                         |  2 +-
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/homeassistant/components/insteon/__init__.py b/homeassistant/components/insteon/__init__.py
index d79640b77ab..749d167e6de 100644
--- a/homeassistant/components/insteon/__init__.py
+++ b/homeassistant/components/insteon/__init__.py
@@ -7,6 +7,8 @@ https://home-assistant.io/components/insteon/
 import asyncio
 import collections
 import logging
+from typing import Dict
+
 import voluptuous as vol
 
 from homeassistant.core import callback
@@ -18,7 +20,7 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers import discovery
 from homeassistant.helpers.entity import Entity
 
-REQUIREMENTS = ['insteonplm==0.13.1']
+REQUIREMENTS = ['insteonplm==0.14.2']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -27,9 +29,9 @@ DOMAIN = 'insteon'
 CONF_IP_PORT = 'ip_port'
 CONF_HUB_USERNAME = 'username'
 CONF_HUB_PASSWORD = 'password'
+CONF_HUB_VERSION = 'hub_version'
 CONF_OVERRIDE = 'device_override'
-CONF_PLM_HUB_MSG = ('Must configure either a PLM port or a Hub host, username '
-                    'and password')
+CONF_PLM_HUB_MSG = 'Must configure either a PLM port or a Hub host'
 CONF_ADDRESS = 'address'
 CONF_CAT = 'cat'
 CONF_SUBCAT = 'subcat'
@@ -66,6 +68,22 @@ EVENT_BUTTON_ON = 'insteon.button_on'
 EVENT_BUTTON_OFF = 'insteon.button_off'
 EVENT_CONF_BUTTON = 'button'
 
+
+def set_default_port(schema: Dict) -> Dict:
+    """Set the default port based on the Hub version."""
+    # If the ip_port is found do nothing
+    # If it is not found the set the default
+    ip_port = schema.get(CONF_IP_PORT)
+    if not ip_port:
+        hub_version = schema.get(CONF_HUB_VERSION)
+        # Found hub_version but not ip_port
+        if hub_version == 1:
+            schema[CONF_IP_PORT] = 9761
+        else:
+            schema[CONF_IP_PORT] = 25105
+    return schema
+
+
 CONF_DEVICE_OVERRIDE_SCHEMA = vol.All(
     cv.deprecated(CONF_PLATFORM), vol.Schema({
         vol.Required(CONF_ADDRESS): cv.string,
@@ -88,12 +106,13 @@ CONFIG_SCHEMA = vol.Schema({
     DOMAIN: vol.All(
         vol.Schema(
             {vol.Exclusive(CONF_PORT, 'plm_or_hub',
-                           msg=CONF_PLM_HUB_MSG): cv.isdevice,
+                           msg=CONF_PLM_HUB_MSG): cv.string,
              vol.Exclusive(CONF_HOST, 'plm_or_hub',
                            msg=CONF_PLM_HUB_MSG): cv.string,
-             vol.Optional(CONF_IP_PORT, default=25105): int,
+             vol.Optional(CONF_IP_PORT): cv.port,
              vol.Optional(CONF_HUB_USERNAME): cv.string,
              vol.Optional(CONF_HUB_PASSWORD): cv.string,
+             vol.Optional(CONF_HUB_VERSION, default=2): vol.In([1, 2]),
              vol.Optional(CONF_OVERRIDE): vol.All(
                  cv.ensure_list_csv, [CONF_DEVICE_OVERRIDE_SCHEMA]),
              vol.Optional(CONF_X10_ALL_UNITS_OFF): vol.In(HOUSECODES),
@@ -103,14 +122,7 @@ CONFIG_SCHEMA = vol.Schema({
                                              [CONF_X10_SCHEMA])
              }, extra=vol.ALLOW_EXTRA, required=True),
         cv.has_at_least_one_key(CONF_PORT, CONF_HOST),
-        vol.Schema(
-            {vol.Inclusive(CONF_HOST, 'hub',
-                           msg=CONF_PLM_HUB_MSG): cv.string,
-             vol.Inclusive(CONF_HUB_USERNAME, 'hub',
-                           msg=CONF_PLM_HUB_MSG): cv.string,
-             vol.Inclusive(CONF_HUB_PASSWORD, 'hub',
-                           msg=CONF_PLM_HUB_MSG): cv.string,
-             }, extra=vol.ALLOW_EXTRA, required=True))
+        set_default_port)
     }, extra=vol.ALLOW_EXTRA)
 
 
@@ -151,6 +163,7 @@ def async_setup(hass, config):
     ip_port = conf.get(CONF_IP_PORT)
     username = conf.get(CONF_HUB_USERNAME)
     password = conf.get(CONF_HUB_PASSWORD)
+    hub_version = conf.get(CONF_HUB_VERSION)
     overrides = conf.get(CONF_OVERRIDE, [])
     x10_devices = conf.get(CONF_X10, [])
     x10_all_units_off_housecode = conf.get(CONF_X10_ALL_UNITS_OFF)
@@ -284,6 +297,7 @@ def async_setup(hass, config):
             port=ip_port,
             username=username,
             password=password,
+            hub_version=hub_version,
             loop=hass.loop,
             workdir=hass.config.config_dir)
     else:
diff --git a/requirements_all.txt b/requirements_all.txt
index ab83a023381..f11be0e1a89 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -486,7 +486,7 @@ ihcsdk==2.2.0
 influxdb==5.0.0
 
 # homeassistant.components.insteon
-insteonplm==0.13.1
+insteonplm==0.14.2
 
 # homeassistant.components.sensor.iperf3
 iperf3==0.1.10

From 60b45d4ba5f3e1f683fe2404f4d1028bb42c6642 Mon Sep 17 00:00:00 2001
From: vikramgorla <vikram.gorla@gmail.com>
Date: Mon, 10 Sep 2018 16:13:05 +0200
Subject: [PATCH 102/357] bugfix - incorrect camera type and missing sensors
 when multiple netatmo cameras (#16490)

fixed get_camera_type as it was originally not consuming any input, was looping with all cameras and the first camera type was retutned, modified to call cameraType using provided camera name.
---
 homeassistant/components/netatmo.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/homeassistant/components/netatmo.py b/homeassistant/components/netatmo.py
index c25b57fbd62..59b0a64f6e9 100644
--- a/homeassistant/components/netatmo.py
+++ b/homeassistant/components/netatmo.py
@@ -101,10 +101,10 @@ class CameraData:
         return self.module_names
 
     def get_camera_type(self, camera=None, home=None, cid=None):
-        """Return all module available on the API as a list."""
-        for camera_name in self.camera_names:
-            self.camera_type = self.camera_data.cameraType(camera_name)
-            return self.camera_type
+        """Return camera type for a camera, cid has preference over camera."""
+        self.camera_type = self.camera_data.cameraType(camera=camera,
+                                                       home=home, cid=cid)
+        return self.camera_type
 
     @Throttle(MIN_TIME_BETWEEN_UPDATES)
     def update(self):

From a4cec0b871abdba21d6fc061fb10c4eda7674b60 Mon Sep 17 00:00:00 2001
From: Zellux Wang <zellux@gmail.com>
Date: Tue, 11 Sep 2018 03:25:38 -0600
Subject: [PATCH 103/357] Fix arlo intilization when no base station available
 (#16529)

* Fix arlo intilization when no base station

* Fix pylint for empty camera check

* Fix typo

* Minor change to trigger CI again
---
 homeassistant/components/arlo.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/arlo.py b/homeassistant/components/arlo.py
index c6a414b9d91..015e1e0d1fc 100644
--- a/homeassistant/components/arlo.py
+++ b/homeassistant/components/arlo.py
@@ -61,10 +61,12 @@ def setup(hass, config):
         arlo_base_station = next((
             station for station in arlo.base_stations), None)
 
-        if arlo_base_station is None:
+        if arlo_base_station is not None:
+            arlo_base_station.refresh_rate = scan_interval.total_seconds()
+        elif not arlo.cameras:
+            _LOGGER.error("No Arlo camera or base station available.")
             return False
 
-        arlo_base_station.refresh_rate = scan_interval.total_seconds()
         hass.data[DATA_ARLO] = arlo
 
     except (ConnectTimeout, HTTPError) as ex:

From 20e562b81610531bcc0ae82d4f7712063685c7c1 Mon Sep 17 00:00:00 2001
From: Jason Hu <awarecan@users.noreply.github.com>
Date: Tue, 11 Sep 2018 03:05:15 -0700
Subject: [PATCH 104/357] Long-lived access token (#16453)

* Allow create refresh_token with specific access_token_expiration

* Add token_type, client_name and client_icon

* Add unit test

* Add websocket API to create long-lived access token

* Allow URL use as client_id for long-lived access token

* Remove mutate_refresh_token method

* Use client name as id for long_lived_access_token type refresh token

* Minor change

* Do not allow duplicate client name

* Update docstring

* Remove unnecessary `list`
---
 homeassistant/auth/__init__.py            |  45 ++++++-
 homeassistant/auth/auth_store.py          |  34 +++++-
 homeassistant/auth/models.py              |  16 ++-
 homeassistant/components/auth/__init__.py | 104 +++++++++++++++-
 tests/auth/test_init.py                   | 141 +++++++++++++++++++++-
 tests/components/auth/test_init.py        |  59 ++++++++-
 tests/components/conftest.py              |   2 +
 7 files changed, 385 insertions(+), 16 deletions(-)

diff --git a/homeassistant/auth/__init__.py b/homeassistant/auth/__init__.py
index 4ef8440de62..b0cebb5fd6c 100644
--- a/homeassistant/auth/__init__.py
+++ b/homeassistant/auth/__init__.py
@@ -2,11 +2,13 @@
 import asyncio
 import logging
 from collections import OrderedDict
+from datetime import timedelta
 from typing import Any, Dict, List, Optional, Tuple, cast
 
 import jwt
 
 from homeassistant import data_entry_flow
+from homeassistant.auth.const import ACCESS_TOKEN_EXPIRATION
 from homeassistant.core import callback, HomeAssistant
 from homeassistant.util import dt as dt_util
 
@@ -242,8 +244,12 @@ class AuthManager:
                 modules[module_id] = module.name
         return modules
 
-    async def async_create_refresh_token(self, user: models.User,
-                                         client_id: Optional[str] = None) \
+    async def async_create_refresh_token(
+            self, user: models.User, client_id: Optional[str] = None,
+            client_name: Optional[str] = None,
+            client_icon: Optional[str] = None,
+            token_type: Optional[str] = None,
+            access_token_expiration: timedelta = ACCESS_TOKEN_EXPIRATION) \
             -> models.RefreshToken:
         """Create a new refresh token for a user."""
         if not user.is_active:
@@ -254,10 +260,36 @@ class AuthManager:
                 'System generated users cannot have refresh tokens connected '
                 'to a client.')
 
-        if not user.system_generated and client_id is None:
+        if token_type is None:
+            if user.system_generated:
+                token_type = models.TOKEN_TYPE_SYSTEM
+            else:
+                token_type = models.TOKEN_TYPE_NORMAL
+
+        if user.system_generated != (token_type == models.TOKEN_TYPE_SYSTEM):
+            raise ValueError(
+                'System generated users can only have system type '
+                'refresh tokens')
+
+        if token_type == models.TOKEN_TYPE_NORMAL and client_id is None:
             raise ValueError('Client is required to generate a refresh token.')
 
-        return await self._store.async_create_refresh_token(user, client_id)
+        if (token_type == models.TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN and
+                client_name is None):
+            raise ValueError('Client_name is required for long-lived access '
+                             'token')
+
+        if token_type == models.TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN:
+            for token in user.refresh_tokens.values():
+                if (token.client_name == client_name and token.token_type ==
+                        models.TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN):
+                    # Each client_name can only have one
+                    # long_lived_access_token type of refresh token
+                    raise ValueError('{} already exists'.format(client_name))
+
+        return await self._store.async_create_refresh_token(
+            user, client_id, client_name, client_icon,
+            token_type, access_token_expiration)
 
     async def async_get_refresh_token(
             self, token_id: str) -> Optional[models.RefreshToken]:
@@ -280,10 +312,11 @@ class AuthManager:
                                   refresh_token: models.RefreshToken) -> str:
         """Create a new access token."""
         # pylint: disable=no-self-use
+        now = dt_util.utcnow()
         return jwt.encode({
             'iss': refresh_token.id,
-            'iat': dt_util.utcnow(),
-            'exp': dt_util.utcnow() + refresh_token.access_token_expiration,
+            'iat': now,
+            'exp': now + refresh_token.access_token_expiration,
         }, refresh_token.jwt_key, algorithm='HS256').decode()
 
     async def async_validate_access_token(
diff --git a/homeassistant/auth/auth_store.py b/homeassistant/auth/auth_store.py
index 0f12d69211c..d78a1f4225e 100644
--- a/homeassistant/auth/auth_store.py
+++ b/homeassistant/auth/auth_store.py
@@ -5,6 +5,7 @@ from logging import getLogger
 from typing import Any, Dict, List, Optional  # noqa: F401
 import hmac
 
+from homeassistant.auth.const import ACCESS_TOKEN_EXPIRATION
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.util import dt as dt_util
 
@@ -128,11 +129,27 @@ class AuthStore:
         self._async_schedule_save()
 
     async def async_create_refresh_token(
-            self, user: models.User, client_id: Optional[str] = None) \
+            self, user: models.User, client_id: Optional[str] = None,
+            client_name: Optional[str] = None,
+            client_icon: Optional[str] = None,
+            token_type: str = models.TOKEN_TYPE_NORMAL,
+            access_token_expiration: timedelta = ACCESS_TOKEN_EXPIRATION) \
             -> models.RefreshToken:
         """Create a new token for a user."""
-        refresh_token = models.RefreshToken(user=user, client_id=client_id)
+        kwargs = {
+            'user': user,
+            'client_id': client_id,
+            'token_type': token_type,
+            'access_token_expiration': access_token_expiration
+        }  # type: Dict[str, Any]
+        if client_name:
+            kwargs['client_name'] = client_name
+        if client_icon:
+            kwargs['client_icon'] = client_icon
+
+        refresh_token = models.RefreshToken(**kwargs)
         user.refresh_tokens[refresh_token.id] = refresh_token
+
         self._async_schedule_save()
         return refresh_token
 
@@ -216,10 +233,20 @@ class AuthStore:
                     'Ignoring refresh token %(id)s with invalid created_at '
                     '%(created_at)s for user_id %(user_id)s', rt_dict)
                 continue
+            token_type = rt_dict.get('token_type')
+            if token_type is None:
+                if rt_dict['clinet_id'] is None:
+                    token_type = models.TOKEN_TYPE_SYSTEM
+                else:
+                    token_type = models.TOKEN_TYPE_NORMAL
             token = models.RefreshToken(
                 id=rt_dict['id'],
                 user=users[rt_dict['user_id']],
                 client_id=rt_dict['client_id'],
+                # use dict.get to keep backward compatibility
+                client_name=rt_dict.get('client_name'),
+                client_icon=rt_dict.get('client_icon'),
+                token_type=token_type,
                 created_at=created_at,
                 access_token_expiration=timedelta(
                     seconds=rt_dict['access_token_expiration']),
@@ -271,6 +298,9 @@ class AuthStore:
                 'id': refresh_token.id,
                 'user_id': user.id,
                 'client_id': refresh_token.client_id,
+                'client_name': refresh_token.client_name,
+                'client_icon': refresh_token.client_icon,
+                'token_type': refresh_token.token_type,
                 'created_at': refresh_token.created_at.isoformat(),
                 'access_token_expiration':
                     refresh_token.access_token_expiration.total_seconds(),
diff --git a/homeassistant/auth/models.py b/homeassistant/auth/models.py
index a6500510e0d..c5273d7fa1d 100644
--- a/homeassistant/auth/models.py
+++ b/homeassistant/auth/models.py
@@ -7,9 +7,12 @@ import attr
 
 from homeassistant.util import dt as dt_util
 
-from .const import ACCESS_TOKEN_EXPIRATION
 from .util import generate_secret
 
+TOKEN_TYPE_NORMAL = 'normal'
+TOKEN_TYPE_SYSTEM = 'system'
+TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN = 'long_lived_access_token'
+
 
 @attr.s(slots=True)
 class User:
@@ -37,11 +40,16 @@ class RefreshToken:
     """RefreshToken for a user to grant new access tokens."""
 
     user = attr.ib(type=User)
-    client_id = attr.ib(type=str)  # type: Optional[str]
+    client_id = attr.ib(type=Optional[str])
+    access_token_expiration = attr.ib(type=timedelta)
+    client_name = attr.ib(type=Optional[str], default=None)
+    client_icon = attr.ib(type=Optional[str], default=None)
+    token_type = attr.ib(type=str, default=TOKEN_TYPE_NORMAL,
+                         validator=attr.validators.in_((
+                             TOKEN_TYPE_NORMAL, TOKEN_TYPE_SYSTEM,
+                             TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN)))
     id = attr.ib(type=str, default=attr.Factory(lambda: uuid.uuid4().hex))
     created_at = attr.ib(type=datetime, default=attr.Factory(dt_util.utcnow))
-    access_token_expiration = attr.ib(type=timedelta,
-                                      default=ACCESS_TOKEN_EXPIRATION)
     token = attr.ib(type=str,
                     default=attr.Factory(lambda: generate_secret(64)))
     jwt_key = attr.ib(type=str,
diff --git a/homeassistant/components/auth/__init__.py b/homeassistant/components/auth/__init__.py
index a87e646761c..5839b7ec403 100644
--- a/homeassistant/components/auth/__init__.py
+++ b/homeassistant/components/auth/__init__.py
@@ -12,6 +12,7 @@ be in JSON as it's more readable.
 Exchange the authorization code retrieved from the login flow for tokens.
 
 {
+    "client_id": "https://hassbian.local:8123/",
     "grant_type": "authorization_code",
     "code": "411ee2f916e648d691e937ae9344681e"
 }
@@ -32,6 +33,7 @@ token.
 Request a new access token using a refresh token.
 
 {
+    "client_id": "https://hassbian.local:8123/",
     "grant_type": "refresh_token",
     "refresh_token": "IJKLMNOPQRST"
 }
@@ -55,6 +57,67 @@ ever been granted by that refresh token. Response code will ALWAYS be 200.
     "action": "revoke"
 }
 
+# Websocket API
+
+## Get current user
+
+Send websocket command `auth/current_user` will return current user of the
+active websocket connection.
+
+{
+    "id": 10,
+    "type": "auth/current_user",
+}
+
+The result payload likes
+
+{
+    "id": 10,
+    "type": "result",
+    "success": true,
+    "result": {
+        "id": "USER_ID",
+        "name": "John Doe",
+        "is_owner': true,
+        "credentials": [
+            {
+                "auth_provider_type": "homeassistant",
+                "auth_provider_id": null
+            }
+        ],
+        "mfa_modules": [
+            {
+                "id": "totp",
+                "name": "TOTP",
+                "enabled": true,
+            }
+        ]
+    }
+}
+
+## Create a long-lived access token
+
+Send websocket command `auth/long_lived_access_token` will create
+a long-lived access token for current user. Access token will not be saved in
+Home Assistant. User need to record the token in secure place.
+
+{
+    "id": 11,
+    "type": "auth/long_lived_access_token",
+    "client_name": "GPS Logger",
+    "client_icon": null,
+    "lifespan": 365
+}
+
+Result will be a long-lived access token:
+
+{
+    "id": 11,
+    "type": "result",
+    "success": true,
+    "result": "ABCDEFGH"
+}
+
 """
 import logging
 import uuid
@@ -63,7 +126,8 @@ from datetime import timedelta
 from aiohttp import web
 import voluptuous as vol
 
-from homeassistant.auth.models import User, Credentials
+from homeassistant.auth.models import User, Credentials, \
+    TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN
 from homeassistant.components import websocket_api
 from homeassistant.components.http.ban import log_invalid_auth
 from homeassistant.components.http.data_validator import RequestDataValidator
@@ -83,6 +147,15 @@ SCHEMA_WS_CURRENT_USER = websocket_api.BASE_COMMAND_MESSAGE_SCHEMA.extend({
     vol.Required('type'): WS_TYPE_CURRENT_USER,
 })
 
+WS_TYPE_LONG_LIVED_ACCESS_TOKEN = 'auth/long_lived_access_token'
+SCHEMA_WS_LONG_LIVED_ACCESS_TOKEN = \
+    websocket_api.BASE_COMMAND_MESSAGE_SCHEMA.extend({
+        vol.Required('type'): WS_TYPE_LONG_LIVED_ACCESS_TOKEN,
+        vol.Required('lifespan'): int,  # days
+        vol.Required('client_name'): str,
+        vol.Optional('client_icon'): str,
+    })
+
 RESULT_TYPE_CREDENTIALS = 'credentials'
 RESULT_TYPE_USER = 'user'
 
@@ -100,6 +173,11 @@ async def async_setup(hass, config):
         WS_TYPE_CURRENT_USER, websocket_current_user,
         SCHEMA_WS_CURRENT_USER
     )
+    hass.components.websocket_api.async_register_command(
+        WS_TYPE_LONG_LIVED_ACCESS_TOKEN,
+        websocket_create_long_lived_access_token,
+        SCHEMA_WS_LONG_LIVED_ACCESS_TOKEN
+    )
 
     await login_flow.async_setup(hass, store_result)
     await mfa_setup_flow.async_setup(hass)
@@ -343,3 +421,27 @@ def websocket_current_user(
             }))
 
     hass.async_create_task(async_get_current_user(connection.user))
+
+
+@websocket_api.ws_require_user()
+@callback
+def websocket_create_long_lived_access_token(
+        hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg):
+    """Create or a long-lived access token."""
+    async def async_create_long_lived_access_token(user):
+        """Create or a long-lived access token."""
+        refresh_token = await hass.auth.async_create_refresh_token(
+            user,
+            client_name=msg['client_name'],
+            client_icon=msg.get('client_icon'),
+            token_type=TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN,
+            access_token_expiration=timedelta(days=msg['lifespan']))
+
+        access_token = hass.auth.async_create_access_token(
+            refresh_token)
+
+        connection.send_message_outside(
+            websocket_api.result_message(msg['id'], access_token))
+
+    hass.async_create_task(
+        async_create_long_lived_access_token(connection.user))
diff --git a/tests/auth/test_init.py b/tests/auth/test_init.py
index 63b2b4408dd..765199b256c 100644
--- a/tests/auth/test_init.py
+++ b/tests/auth/test_init.py
@@ -2,6 +2,7 @@
 from datetime import timedelta
 from unittest.mock import Mock, patch
 
+import jwt
 import pytest
 import voluptuous as vol
 
@@ -323,7 +324,7 @@ async def test_generating_system_user(hass):
 
 
 async def test_refresh_token_requires_client_for_user(hass):
-    """Test that we can add a system user."""
+    """Test create refresh token for a user with client_id."""
     manager = await auth.auth_manager_from_config(hass, [], [])
     user = MockUser().add_to_auth_manager(manager)
     assert user.system_generated is False
@@ -334,10 +335,14 @@ async def test_refresh_token_requires_client_for_user(hass):
     token = await manager.async_create_refresh_token(user, CLIENT_ID)
     assert token is not None
     assert token.client_id == CLIENT_ID
+    assert token.token_type == auth_models.TOKEN_TYPE_NORMAL
+    # default access token expiration
+    assert token.access_token_expiration == \
+        auth_const.ACCESS_TOKEN_EXPIRATION
 
 
 async def test_refresh_token_not_requires_client_for_system_user(hass):
-    """Test that we can add a system user."""
+    """Test create refresh token for a system user w/o client_id."""
     manager = await auth.auth_manager_from_config(hass, [], [])
     user = await manager.async_create_system_user('Hass.io')
     assert user.system_generated is True
@@ -348,6 +353,56 @@ async def test_refresh_token_not_requires_client_for_system_user(hass):
     token = await manager.async_create_refresh_token(user)
     assert token is not None
     assert token.client_id is None
+    assert token.token_type == auth_models.TOKEN_TYPE_SYSTEM
+
+
+async def test_refresh_token_with_specific_access_token_expiration(hass):
+    """Test create a refresh token with specific access token expiration."""
+    manager = await auth.auth_manager_from_config(hass, [], [])
+    user = MockUser().add_to_auth_manager(manager)
+
+    token = await manager.async_create_refresh_token(
+        user, CLIENT_ID,
+        access_token_expiration=timedelta(days=100))
+    assert token is not None
+    assert token.client_id == CLIENT_ID
+    assert token.access_token_expiration == timedelta(days=100)
+
+
+async def test_refresh_token_type(hass):
+    """Test create a refresh token with token type."""
+    manager = await auth.auth_manager_from_config(hass, [], [])
+    user = MockUser().add_to_auth_manager(manager)
+
+    with pytest.raises(ValueError):
+        await manager.async_create_refresh_token(
+            user, CLIENT_ID, token_type=auth_models.TOKEN_TYPE_SYSTEM)
+
+    token = await manager.async_create_refresh_token(
+        user, CLIENT_ID,
+        token_type=auth_models.TOKEN_TYPE_NORMAL)
+    assert token is not None
+    assert token.client_id == CLIENT_ID
+    assert token.token_type == auth_models.TOKEN_TYPE_NORMAL
+
+
+async def test_refresh_token_type_long_lived_access_token(hass):
+    """Test create a refresh token has long-lived access token type."""
+    manager = await auth.auth_manager_from_config(hass, [], [])
+    user = MockUser().add_to_auth_manager(manager)
+
+    with pytest.raises(ValueError):
+        await manager.async_create_refresh_token(
+            user, token_type=auth_models.TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN)
+
+    token = await manager.async_create_refresh_token(
+        user, client_name='GPS LOGGER', client_icon='mdi:home',
+        token_type=auth_models.TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN)
+    assert token is not None
+    assert token.client_id is None
+    assert token.client_name == 'GPS LOGGER'
+    assert token.client_icon == 'mdi:home'
+    assert token.token_type == auth_models.TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN
 
 
 async def test_cannot_deactive_owner(mock_hass):
@@ -378,6 +433,88 @@ async def test_remove_refresh_token(mock_hass):
     )
 
 
+async def test_create_access_token(mock_hass):
+    """Test normal refresh_token's jwt_key keep same after used."""
+    manager = await auth.auth_manager_from_config(mock_hass, [], [])
+    user = MockUser().add_to_auth_manager(manager)
+    refresh_token = await manager.async_create_refresh_token(user, CLIENT_ID)
+    assert refresh_token.token_type == auth_models.TOKEN_TYPE_NORMAL
+    jwt_key = refresh_token.jwt_key
+    access_token = manager.async_create_access_token(refresh_token)
+    assert access_token is not None
+    assert refresh_token.jwt_key == jwt_key
+    jwt_payload = jwt.decode(access_token, jwt_key, algorithm=['HS256'])
+    assert jwt_payload['iss'] == refresh_token.id
+    assert jwt_payload['exp'] - jwt_payload['iat'] == \
+        timedelta(minutes=30).total_seconds()
+
+
+async def test_create_long_lived_access_token(mock_hass):
+    """Test refresh_token's jwt_key changed for long-lived access token."""
+    manager = await auth.auth_manager_from_config(mock_hass, [], [])
+    user = MockUser().add_to_auth_manager(manager)
+    refresh_token = await manager.async_create_refresh_token(
+        user, client_name='GPS Logger',
+        token_type=auth_models.TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN,
+        access_token_expiration=timedelta(days=300))
+    assert refresh_token.token_type == \
+        auth_models.TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN
+    access_token = manager.async_create_access_token(refresh_token)
+    jwt_payload = jwt.decode(
+        access_token, refresh_token.jwt_key, algorithm=['HS256'])
+    assert jwt_payload['iss'] == refresh_token.id
+    assert jwt_payload['exp'] - jwt_payload['iat'] == \
+        timedelta(days=300).total_seconds()
+
+
+async def test_one_long_lived_access_token_per_refresh_token(mock_hass):
+    """Test one refresh_token can only have one long-lived access token."""
+    manager = await auth.auth_manager_from_config(mock_hass, [], [])
+    user = MockUser().add_to_auth_manager(manager)
+    refresh_token = await manager.async_create_refresh_token(
+        user, client_name='GPS Logger',
+        token_type=auth_models.TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN,
+        access_token_expiration=timedelta(days=3000))
+    assert refresh_token.token_type == \
+        auth_models.TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN
+    access_token = manager.async_create_access_token(refresh_token)
+    jwt_key = refresh_token.jwt_key
+
+    rt = await manager.async_validate_access_token(access_token)
+    assert rt.id == refresh_token.id
+
+    with pytest.raises(ValueError):
+        await manager.async_create_refresh_token(
+            user, client_name='GPS Logger',
+            token_type=auth_models.TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN,
+            access_token_expiration=timedelta(days=3000))
+
+    await manager.async_remove_refresh_token(refresh_token)
+    assert refresh_token.id not in user.refresh_tokens
+    rt = await manager.async_validate_access_token(access_token)
+    assert rt is None, 'Previous issued access token has been invoked'
+
+    refresh_token_2 = await manager.async_create_refresh_token(
+        user, client_name='GPS Logger',
+        token_type=auth_models.TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN,
+        access_token_expiration=timedelta(days=3000))
+    assert refresh_token_2.id != refresh_token.id
+    assert refresh_token_2.token_type == \
+        auth_models.TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN
+    access_token_2 = manager.async_create_access_token(refresh_token_2)
+    jwt_key_2 = refresh_token_2.jwt_key
+
+    assert access_token != access_token_2
+    assert jwt_key != jwt_key_2
+
+    rt = await manager.async_validate_access_token(access_token_2)
+    jwt_payload = jwt.decode(
+        access_token_2, rt.jwt_key, algorithm=['HS256'])
+    assert jwt_payload['iss'] == refresh_token_2.id
+    assert jwt_payload['exp'] - jwt_payload['iat'] == \
+        timedelta(days=3000).total_seconds()
+
+
 async def test_login_with_auth_module(mock_hass):
     """Test login as existing user with auth module."""
     manager = await auth.auth_manager_from_config(mock_hass, [{
diff --git a/tests/components/auth/test_init.py b/tests/components/auth/test_init.py
index 7b9dda6acb3..e0fe00bd9d8 100644
--- a/tests/components/auth/test_init.py
+++ b/tests/components/auth/test_init.py
@@ -2,6 +2,8 @@
 from datetime import timedelta
 from unittest.mock import patch
 
+from homeassistant import const
+from homeassistant.auth import auth_manager_from_config
 from homeassistant.auth.models import Credentials
 from homeassistant.components.auth import RESULT_TYPE_USER
 from homeassistant.setup import async_setup_component
@@ -10,7 +12,8 @@ from homeassistant.components import auth
 
 from . import async_setup_auth
 
-from tests.common import CLIENT_ID, CLIENT_REDIRECT_URI, MockUser
+from tests.common import CLIENT_ID, CLIENT_REDIRECT_URI, MockUser, \
+    ensure_auth_manager_loaded
 
 
 async def test_login_new_user_and_trying_refresh_token(hass, aiohttp_client):
@@ -267,3 +270,57 @@ async def test_revoking_refresh_token(hass, aiohttp_client):
     })
 
     assert resp.status == 400
+
+
+async def test_ws_long_lived_access_token(hass, hass_ws_client):
+    """Test generate long-lived access token."""
+    hass.auth = await auth_manager_from_config(
+        hass, provider_configs=[{
+            'type': 'insecure_example',
+            'users': [{
+                'username': 'test-user',
+                'password': 'test-pass',
+                'name': 'Test Name',
+            }]
+        }], module_configs=[])
+    ensure_auth_manager_loaded(hass.auth)
+    assert await async_setup_component(hass, 'auth', {'http': {}})
+    assert await async_setup_component(hass, 'api', {'http': {}})
+
+    user = MockUser(id='mock-user').add_to_hass(hass)
+    cred = await hass.auth.auth_providers[0].async_get_or_create_credentials(
+        {'username': 'test-user'})
+    await hass.auth.async_link_user(user, cred)
+
+    ws_client = await hass_ws_client(hass, hass.auth.async_create_access_token(
+        await hass.auth.async_create_refresh_token(user, CLIENT_ID)))
+
+    # verify create long-lived access token
+    await ws_client.send_json({
+        'id': 5,
+        'type': auth.WS_TYPE_LONG_LIVED_ACCESS_TOKEN,
+        'client_name': 'GPS Logger',
+        'lifespan': 365,
+    })
+
+    result = await ws_client.receive_json()
+    assert result['success'], result
+
+    long_lived_access_token = result['result']
+    assert long_lived_access_token is not None
+
+    refresh_token = await hass.auth.async_validate_access_token(
+        long_lived_access_token)
+    assert refresh_token.client_id is None
+    assert refresh_token.client_name == 'GPS Logger'
+    assert refresh_token.client_icon is None
+
+    # verify long-lived access token can be used as bearer token
+    api_client = ws_client.client
+    resp = await api_client.get(const.URL_API)
+    assert resp.status == 401
+
+    resp = await api_client.get(const.URL_API, headers={
+        'Authorization': 'Bearer {}'.format(long_lived_access_token)
+    })
+    assert resp.status == 200
diff --git a/tests/components/conftest.py b/tests/components/conftest.py
index bb9b643296e..7cec790c847 100644
--- a/tests/components/conftest.py
+++ b/tests/components/conftest.py
@@ -34,6 +34,8 @@ def hass_ws_client(aiohttp_client):
         auth_ok = await websocket.receive_json()
         assert auth_ok['type'] == wapi.TYPE_AUTH_OK
 
+        # wrap in client
+        websocket.client = client
         return websocket
 
     return create_client

From 37c8aac76f54a49dcd05db5d11e90a6e4a725f6e Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Tue, 11 Sep 2018 12:55:05 +0200
Subject: [PATCH 105/357] Fix typo (#16556)

---
 homeassistant/auth/auth_store.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/auth/auth_store.py b/homeassistant/auth/auth_store.py
index d78a1f4225e..8e8d03253e5 100644
--- a/homeassistant/auth/auth_store.py
+++ b/homeassistant/auth/auth_store.py
@@ -235,7 +235,7 @@ class AuthStore:
                 continue
             token_type = rt_dict.get('token_type')
             if token_type is None:
-                if rt_dict['clinet_id'] is None:
+                if rt_dict['client_id'] is None:
                     token_type = models.TOKEN_TYPE_SYSTEM
                 else:
                     token_type = models.TOKEN_TYPE_NORMAL

From 20f06f4eb9fe6ab97e79851784851abd8552f335 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Tue, 11 Sep 2018 21:40:35 +0200
Subject: [PATCH 106/357] Fix invalid state (#16558)

* Fix invalid state

* Make slightly more efficient in unsubscribing

* Use uuid4"
---
 homeassistant/const.py |  3 +++
 homeassistant/core.py  | 20 +++++++++++++++-----
 tests/test_core.py     | 29 +++++++++++++++++++++++++++--
 3 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/homeassistant/const.py b/homeassistant/const.py
index ba7011b388a..e8349f2f0b8 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -225,6 +225,9 @@ ATTR_ID = 'id'
 # Name
 ATTR_NAME = 'name'
 
+# Data for a SERVICE_EXECUTED event
+ATTR_SERVICE_CALL_ID = 'service_call_id'
+
 # Contains one string or a list of strings, each being an entity id
 ATTR_ENTITY_ID = 'entity_id'
 
diff --git a/homeassistant/core.py b/homeassistant/core.py
index 2b7a2479471..b4c824fe44b 100644
--- a/homeassistant/core.py
+++ b/homeassistant/core.py
@@ -30,7 +30,7 @@ from voluptuous.humanize import humanize_error
 
 from homeassistant.const import (
     ATTR_DOMAIN, ATTR_FRIENDLY_NAME, ATTR_NOW, ATTR_SERVICE,
-    ATTR_SERVICE_DATA, EVENT_CALL_SERVICE,
+    ATTR_SERVICE_CALL_ID, ATTR_SERVICE_DATA, EVENT_CALL_SERVICE,
     EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP,
     EVENT_SERVICE_EXECUTED, EVENT_SERVICE_REGISTERED, EVENT_STATE_CHANGED,
     EVENT_TIME_CHANGED, MATCH_ALL, EVENT_HOMEASSISTANT_CLOSE,
@@ -1043,10 +1043,12 @@ class ServiceRegistry:
         This method is a coroutine.
         """
         context = context or Context()
+        call_id = uuid.uuid4().hex
         event_data = {
             ATTR_DOMAIN: domain.lower(),
             ATTR_SERVICE: service.lower(),
             ATTR_SERVICE_DATA: service_data,
+            ATTR_SERVICE_CALL_ID: call_id,
         }
 
         if not blocking:
@@ -1059,8 +1061,9 @@ class ServiceRegistry:
         @callback
         def service_executed(event: Event) -> None:
             """Handle an executed service."""
-            if event.context == context:
+            if event.data[ATTR_SERVICE_CALL_ID] == call_id:
                 fut.set_result(True)
+                unsub()
 
         unsub = self._hass.bus.async_listen(
             EVENT_SERVICE_EXECUTED, service_executed)
@@ -1070,7 +1073,8 @@ class ServiceRegistry:
 
         done, _ = await asyncio.wait([fut], timeout=SERVICE_CALL_LIMIT)
         success = bool(done)
-        unsub()
+        if not success:
+            unsub()
         return success
 
     async def _event_to_service_call(self, event: Event) -> None:
@@ -1078,6 +1082,7 @@ class ServiceRegistry:
         service_data = event.data.get(ATTR_SERVICE_DATA) or {}
         domain = event.data.get(ATTR_DOMAIN).lower()  # type: ignore
         service = event.data.get(ATTR_SERVICE).lower()  # type: ignore
+        call_id = event.data.get(ATTR_SERVICE_CALL_ID)
 
         if not self.has_service(domain, service):
             if event.origin == EventOrigin.local:
@@ -1089,12 +1094,17 @@ class ServiceRegistry:
 
         def fire_service_executed() -> None:
             """Fire service executed event."""
+            if not call_id:
+                return
+
+            data = {ATTR_SERVICE_CALL_ID: call_id}
+
             if (service_handler.is_coroutinefunction or
                     service_handler.is_callback):
-                self._hass.bus.async_fire(EVENT_SERVICE_EXECUTED, {},
+                self._hass.bus.async_fire(EVENT_SERVICE_EXECUTED, data,
                                           EventOrigin.local, event.context)
             else:
-                self._hass.bus.fire(EVENT_SERVICE_EXECUTED, {},
+                self._hass.bus.fire(EVENT_SERVICE_EXECUTED, data,
                                     EventOrigin.local, event.context)
 
         try:
diff --git a/tests/test_core.py b/tests/test_core.py
index ce066135709..7e6d57136e4 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -20,9 +20,10 @@ from homeassistant.util.unit_system import (METRIC_SYSTEM)
 from homeassistant.const import (
     __version__, EVENT_STATE_CHANGED, ATTR_FRIENDLY_NAME, CONF_UNIT_SYSTEM,
     ATTR_NOW, EVENT_TIME_CHANGED, EVENT_HOMEASSISTANT_STOP,
-    EVENT_HOMEASSISTANT_CLOSE, EVENT_SERVICE_REGISTERED, EVENT_SERVICE_REMOVED)
+    EVENT_HOMEASSISTANT_CLOSE, EVENT_SERVICE_REGISTERED, EVENT_SERVICE_REMOVED,
+    EVENT_SERVICE_EXECUTED)
 
-from tests.common import get_test_home_assistant
+from tests.common import get_test_home_assistant, async_mock_service
 
 PST = pytz.timezone('America/Los_Angeles')
 
@@ -969,3 +970,27 @@ def test_track_task_functions(loop):
         assert hass._track_task
     finally:
         yield from hass.async_stop()
+
+
+async def test_service_executed_with_subservices(hass):
+    """Test we block correctly till all services done."""
+    calls = async_mock_service(hass, 'test', 'inner')
+
+    async def handle_outer(call):
+        """Handle outer service call."""
+        calls.append(call)
+        call1 = hass.services.async_call('test', 'inner', blocking=True,
+                                         context=call.context)
+        call2 = hass.services.async_call('test', 'inner', blocking=True,
+                                         context=call.context)
+        await asyncio.wait([call1, call2])
+        calls.append(call)
+
+    hass.services.async_register('test', 'outer', handle_outer)
+
+    await hass.services.async_call('test', 'outer', blocking=True)
+
+    assert len(calls) == 4
+    assert [call.service for call in calls] == [
+        'outer', 'inner', 'inner', 'outer']
+    assert len(hass.bus.async_listeners().get(EVENT_SERVICE_EXECUTED, [])) == 0

From e50fc69c1e367ad22aa684c184eb605107d614b7 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Tue, 11 Sep 2018 18:08:03 +0200
Subject: [PATCH 107/357] Add websocket commands for refresh tokens (#16559)

* Add websocket commands for refresh tokens

* Comment
---
 homeassistant/components/auth/__init__.py | 60 +++++++++++++++++
 tests/components/auth/test_init.py        | 82 ++++++++++++++---------
 tests/components/conftest.py              | 42 ++++++++----
 3 files changed, 140 insertions(+), 44 deletions(-)

diff --git a/homeassistant/components/auth/__init__.py b/homeassistant/components/auth/__init__.py
index 5839b7ec403..5fac423f27a 100644
--- a/homeassistant/components/auth/__init__.py
+++ b/homeassistant/components/auth/__init__.py
@@ -156,6 +156,19 @@ SCHEMA_WS_LONG_LIVED_ACCESS_TOKEN = \
         vol.Optional('client_icon'): str,
     })
 
+WS_TYPE_REFRESH_TOKENS = 'auth/refresh_tokens'
+SCHEMA_WS_REFRESH_TOKENS = \
+    websocket_api.BASE_COMMAND_MESSAGE_SCHEMA.extend({
+        vol.Required('type'): WS_TYPE_REFRESH_TOKENS,
+    })
+
+WS_TYPE_DELETE_REFRESH_TOKEN = 'auth/delete_refresh_token'
+SCHEMA_WS_DELETE_REFRESH_TOKEN = \
+    websocket_api.BASE_COMMAND_MESSAGE_SCHEMA.extend({
+        vol.Required('type'): WS_TYPE_DELETE_REFRESH_TOKEN,
+        vol.Required('refresh_token_id'): str,
+    })
+
 RESULT_TYPE_CREDENTIALS = 'credentials'
 RESULT_TYPE_USER = 'user'
 
@@ -178,6 +191,16 @@ async def async_setup(hass, config):
         websocket_create_long_lived_access_token,
         SCHEMA_WS_LONG_LIVED_ACCESS_TOKEN
     )
+    hass.components.websocket_api.async_register_command(
+        WS_TYPE_REFRESH_TOKENS,
+        websocket_refresh_tokens,
+        SCHEMA_WS_REFRESH_TOKENS
+    )
+    hass.components.websocket_api.async_register_command(
+        WS_TYPE_DELETE_REFRESH_TOKEN,
+        websocket_delete_refresh_token,
+        SCHEMA_WS_DELETE_REFRESH_TOKEN
+    )
 
     await login_flow.async_setup(hass, store_result)
     await mfa_setup_flow.async_setup(hass)
@@ -445,3 +468,40 @@ def websocket_create_long_lived_access_token(
 
     hass.async_create_task(
         async_create_long_lived_access_token(connection.user))
+
+
+@websocket_api.ws_require_user()
+@callback
+def websocket_refresh_tokens(
+        hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg):
+    """Return metadata of users refresh tokens."""
+    connection.to_write.put_nowait(websocket_api.result_message(msg['id'], [{
+        'id': refresh.id,
+        'client_id': refresh.client_id,
+        'client_name': refresh.client_name,
+        'client_icon': refresh.client_icon,
+        'type': refresh.token_type,
+        'created_at': refresh.created_at,
+    } for refresh in connection.user.refresh_tokens.values()]))
+
+
+@websocket_api.ws_require_user()
+@callback
+def websocket_delete_refresh_token(
+        hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg):
+    """Handle a delete refresh token request."""
+    async def async_delete_refresh_token(user, refresh_token_id):
+        """Delete a refresh token."""
+        refresh_token = connection.user.refresh_tokens.get(refresh_token_id)
+
+        if refresh_token is None:
+            return websocket_api.error_message(
+                msg['id'], 'invalid_token_id', 'Received invalid token')
+
+        await hass.auth.async_remove_refresh_token(refresh_token)
+
+        connection.send_message_outside(
+            websocket_api.result_message(msg['id'], {}))
+
+    hass.async_create_task(
+        async_delete_refresh_token(connection.user, msg['refresh_token_id']))
diff --git a/tests/components/auth/test_init.py b/tests/components/auth/test_init.py
index e0fe00bd9d8..a8e95c73a36 100644
--- a/tests/components/auth/test_init.py
+++ b/tests/components/auth/test_init.py
@@ -2,18 +2,15 @@
 from datetime import timedelta
 from unittest.mock import patch
 
-from homeassistant import const
-from homeassistant.auth import auth_manager_from_config
 from homeassistant.auth.models import Credentials
 from homeassistant.components.auth import RESULT_TYPE_USER
 from homeassistant.setup import async_setup_component
 from homeassistant.util.dt import utcnow
 from homeassistant.components import auth
 
-from . import async_setup_auth
+from tests.common import CLIENT_ID, CLIENT_REDIRECT_URI, MockUser
 
-from tests.common import CLIENT_ID, CLIENT_REDIRECT_URI, MockUser, \
-    ensure_auth_manager_loaded
+from . import async_setup_auth
 
 
 async def test_login_new_user_and_trying_refresh_token(hass, aiohttp_client):
@@ -272,28 +269,12 @@ async def test_revoking_refresh_token(hass, aiohttp_client):
     assert resp.status == 400
 
 
-async def test_ws_long_lived_access_token(hass, hass_ws_client):
+async def test_ws_long_lived_access_token(hass, hass_ws_client,
+                                          hass_access_token):
     """Test generate long-lived access token."""
-    hass.auth = await auth_manager_from_config(
-        hass, provider_configs=[{
-            'type': 'insecure_example',
-            'users': [{
-                'username': 'test-user',
-                'password': 'test-pass',
-                'name': 'Test Name',
-            }]
-        }], module_configs=[])
-    ensure_auth_manager_loaded(hass.auth)
     assert await async_setup_component(hass, 'auth', {'http': {}})
-    assert await async_setup_component(hass, 'api', {'http': {}})
 
-    user = MockUser(id='mock-user').add_to_hass(hass)
-    cred = await hass.auth.auth_providers[0].async_get_or_create_credentials(
-        {'username': 'test-user'})
-    await hass.auth.async_link_user(user, cred)
-
-    ws_client = await hass_ws_client(hass, hass.auth.async_create_access_token(
-        await hass.auth.async_create_refresh_token(user, CLIENT_ID)))
+    ws_client = await hass_ws_client(hass, hass_access_token)
 
     # verify create long-lived access token
     await ws_client.send_json({
@@ -315,12 +296,51 @@ async def test_ws_long_lived_access_token(hass, hass_ws_client):
     assert refresh_token.client_name == 'GPS Logger'
     assert refresh_token.client_icon is None
 
-    # verify long-lived access token can be used as bearer token
-    api_client = ws_client.client
-    resp = await api_client.get(const.URL_API)
-    assert resp.status == 401
 
-    resp = await api_client.get(const.URL_API, headers={
-        'Authorization': 'Bearer {}'.format(long_lived_access_token)
+async def test_ws_refresh_tokens(hass, hass_ws_client, hass_access_token):
+    """Test fetching refresh token metadata."""
+    assert await async_setup_component(hass, 'auth', {'http': {}})
+
+    ws_client = await hass_ws_client(hass, hass_access_token)
+
+    await ws_client.send_json({
+        'id': 5,
+        'type': auth.WS_TYPE_REFRESH_TOKENS,
     })
-    assert resp.status == 200
+
+    result = await ws_client.receive_json()
+    assert result['success'], result
+    assert len(result['result']) == 1
+    token = result['result'][0]
+    refresh_token = await hass.auth.async_validate_access_token(
+        hass_access_token)
+    assert token['id'] == refresh_token.id
+    assert token['type'] == refresh_token.token_type
+    assert token['client_id'] == refresh_token.client_id
+    assert token['client_name'] == refresh_token.client_name
+    assert token['client_icon'] == refresh_token.client_icon
+    assert token['created_at'] == refresh_token.created_at.isoformat()
+
+
+async def test_ws_delete_refresh_token(hass, hass_ws_client,
+                                       hass_access_token):
+    """Test deleting a refresh token."""
+    assert await async_setup_component(hass, 'auth', {'http': {}})
+
+    refresh_token = await hass.auth.async_validate_access_token(
+        hass_access_token)
+
+    ws_client = await hass_ws_client(hass, hass_access_token)
+
+    # verify create long-lived access token
+    await ws_client.send_json({
+        'id': 5,
+        'type': auth.WS_TYPE_DELETE_REFRESH_TOKEN,
+        'refresh_token_id': refresh_token.id
+    })
+
+    result = await ws_client.receive_json()
+    assert result['success'], result
+    refresh_token = await hass.auth.async_validate_access_token(
+        hass_access_token)
+    assert refresh_token is None
diff --git a/tests/components/conftest.py b/tests/components/conftest.py
index 7cec790c847..232405a632c 100644
--- a/tests/components/conftest.py
+++ b/tests/components/conftest.py
@@ -1,4 +1,6 @@
 """Fixtures for component testing."""
+from unittest.mock import patch
+
 import pytest
 
 from homeassistant.setup import async_setup_component
@@ -16,23 +18,37 @@ def hass_ws_client(aiohttp_client):
         assert await async_setup_component(hass, 'websocket_api')
 
         client = await aiohttp_client(hass.http.app)
-        websocket = await client.ws_connect(wapi.URL)
-        auth_resp = await websocket.receive_json()
 
-        if auth_resp['type'] == wapi.TYPE_AUTH_OK:
-            assert access_token is None, \
-                'Access token given but no auth required'
-            return websocket
+        patching = None
 
-        assert access_token is not None, 'Access token required for fixture'
+        if access_token is not None:
+            patching = patch('homeassistant.auth.AuthManager.active',
+                             return_value=True)
+            patching.start()
 
-        await websocket.send_json({
-            'type': websocket_api.TYPE_AUTH,
-            'access_token': access_token
-        })
+        try:
+            websocket = await client.ws_connect(wapi.URL)
+            auth_resp = await websocket.receive_json()
 
-        auth_ok = await websocket.receive_json()
-        assert auth_ok['type'] == wapi.TYPE_AUTH_OK
+            if auth_resp['type'] == wapi.TYPE_AUTH_OK:
+                assert access_token is None, \
+                    'Access token given but no auth required'
+                return websocket
+
+            assert access_token is not None, \
+                'Access token required for fixture'
+
+            await websocket.send_json({
+                'type': websocket_api.TYPE_AUTH,
+                'access_token': access_token
+            })
+
+            auth_ok = await websocket.receive_json()
+            assert auth_ok['type'] == wapi.TYPE_AUTH_OK
+
+        finally:
+            if patching is not None:
+                patching.stop()
 
         # wrap in client
         websocket.client = client

From 6d33fb2dc8825e05514cac66600e6edaa93b8ef2 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Tue, 11 Sep 2018 21:45:42 +0200
Subject: [PATCH 108/357] Bumped version to 0.78.0b1

---
 homeassistant/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/const.py b/homeassistant/const.py
index e8349f2f0b8..03434439702 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -2,7 +2,7 @@
 """Constants used by Home Assistant components."""
 MAJOR_VERSION = 0
 MINOR_VERSION = 78
-PATCH_VERSION = '0b0'
+PATCH_VERSION = '0b1'
 __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
 __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
 REQUIRED_PYTHON_VER = (3, 5, 3)

From 188f5de5ae8343f3a091347a89ec6504444d75f0 Mon Sep 17 00:00:00 2001
From: Aaron Bach <bachya1208@gmail.com>
Date: Tue, 11 Sep 2018 17:13:16 -0600
Subject: [PATCH 109/357] Fixes an OpenUV bug with the scan interval (#16570)

---
 homeassistant/components/openuv/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/components/openuv/__init__.py b/homeassistant/components/openuv/__init__.py
index bfd90b4a574..35ab16b4d1f 100644
--- a/homeassistant/components/openuv/__init__.py
+++ b/homeassistant/components/openuv/__init__.py
@@ -179,7 +179,7 @@ async def async_setup_entry(hass, config_entry):
     hass.data[DOMAIN][DATA_OPENUV_LISTENER][
         config_entry.entry_id] = async_track_time_interval(
             hass, refresh_sensors,
-            hass.data[DOMAIN][CONF_SCAN_INTERVAL])
+            hass.data[DOMAIN].get(CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL))
 
     return True
 

From 6bd120ff1d5ba54336a3f19fa39bbdb1aaa9b468 Mon Sep 17 00:00:00 2001
From: William Scanlon <william.joseph.scanlon@gmail.com>
Date: Tue, 11 Sep 2018 21:45:51 -0400
Subject: [PATCH 110/357] Bump pyeconet (#16571)

* Updated pyeconet to the newest version to deal with econet API change
---
 homeassistant/components/climate/econet.py | 2 +-
 requirements_all.txt                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/climate/econet.py b/homeassistant/components/climate/econet.py
index 9350b8f853d..8be640c37e1 100644
--- a/homeassistant/components/climate/econet.py
+++ b/homeassistant/components/climate/econet.py
@@ -18,7 +18,7 @@ from homeassistant.const import (
     TEMP_FAHRENHEIT)
 import homeassistant.helpers.config_validation as cv
 
-REQUIREMENTS = ['pyeconet==0.0.5']
+REQUIREMENTS = ['pyeconet==0.0.6']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/requirements_all.txt b/requirements_all.txt
index 14e9f753246..63861d2ab3d 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -839,7 +839,7 @@ pydukeenergy==0.0.6
 pyebox==1.1.4
 
 # homeassistant.components.climate.econet
-pyeconet==0.0.5
+pyeconet==0.0.6
 
 # homeassistant.components.switch.edimax
 pyedimax==0.1

From e2465da7c2bab8eceae8bfc63c4348736a36824d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=B8yer=20Iversen?= <mail@dahoiv.net>
Date: Wed, 12 Sep 2018 04:52:01 +0200
Subject: [PATCH 111/357] yr: use async syntax (#16563)

---
 homeassistant/components/sensor/yr.py | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/homeassistant/components/sensor/yr.py b/homeassistant/components/sensor/yr.py
index 16ae98f9141..f081be1a2f1 100644
--- a/homeassistant/components/sensor/yr.py
+++ b/homeassistant/components/sensor/yr.py
@@ -66,9 +66,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-@asyncio.coroutine
-def async_setup_platform(hass, config, async_add_entities,
-                         discovery_info=None):
+async def async_setup_platform(hass, config, async_add_entities,
+                               discovery_info=None):
     """Set up the Yr.no sensor."""
     elevation = config.get(CONF_ELEVATION, hass.config.elevation or 0)
     forecast = config.get(CONF_FORECAST)
@@ -93,7 +92,7 @@ def async_setup_platform(hass, config, async_add_entities,
 
     weather = YrData(hass, coordinates, forecast, dev)
     async_track_utc_time_change(hass, weather.updating_devices, minute=31)
-    yield from weather.fetching_data()
+    await weather.fetching_data()
 
 
 class YrSensor(Entity):
@@ -156,8 +155,7 @@ class YrData:
         self.data = {}
         self.hass = hass
 
-    @asyncio.coroutine
-    def fetching_data(self, *_):
+    async def fetching_data(self, *_):
         """Get the latest data from yr.no."""
         import xmltodict
 
@@ -169,12 +167,12 @@ class YrData:
         try:
             websession = async_get_clientsession(self.hass)
             with async_timeout.timeout(10, loop=self.hass.loop):
-                resp = yield from websession.get(
+                resp = await websession.get(
                     self._url, params=self._urlparams)
             if resp.status != 200:
                 try_again('{} returned {}'.format(resp.url, resp.status))
                 return
-            text = yield from resp.text()
+            text = await resp.text()
 
         except (asyncio.TimeoutError, aiohttp.ClientError) as err:
             try_again(err)
@@ -186,11 +184,10 @@ class YrData:
             try_again(err)
             return
 
-        yield from self.updating_devices()
+        await self.updating_devices()
         async_call_later(self.hass, 60*60, self.fetching_data)
 
-    @asyncio.coroutine
-    def updating_devices(self, *_):
+    async def updating_devices(self, *_):
         """Find the current data from self.data."""
         if not self.data:
             return
@@ -256,4 +253,4 @@ class YrData:
                     tasks.append(dev.async_update_ha_state())
 
         if tasks:
-            yield from asyncio.wait(tasks, loop=self.hass.loop)
+            await asyncio.wait(tasks, loop=self.hass.loop)

From 34d369ba26a2eff819bcd6f0215eca18397a5a82 Mon Sep 17 00:00:00 2001
From: Jason Hu <awarecan@users.noreply.github.com>
Date: Wed, 12 Sep 2018 00:49:44 -0700
Subject: [PATCH 112/357] Return if refresh token is current used one in WS API
 (#16575)

---
 homeassistant/components/auth/__init__.py | 2 ++
 homeassistant/components/websocket_api.py | 1 +
 tests/components/auth/test_init.py        | 1 +
 3 files changed, 4 insertions(+)

diff --git a/homeassistant/components/auth/__init__.py b/homeassistant/components/auth/__init__.py
index 5fac423f27a..01cfe4724bf 100644
--- a/homeassistant/components/auth/__init__.py
+++ b/homeassistant/components/auth/__init__.py
@@ -475,6 +475,7 @@ def websocket_create_long_lived_access_token(
 def websocket_refresh_tokens(
         hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg):
     """Return metadata of users refresh tokens."""
+    current_id = connection.request.get('refresh_token_id')
     connection.to_write.put_nowait(websocket_api.result_message(msg['id'], [{
         'id': refresh.id,
         'client_id': refresh.client_id,
@@ -482,6 +483,7 @@ def websocket_refresh_tokens(
         'client_icon': refresh.client_icon,
         'type': refresh.token_type,
         'created_at': refresh.created_at,
+        'is_current': refresh.id == current_id,
     } for refresh in connection.user.refresh_tokens.values()]))
 
 
diff --git a/homeassistant/components/websocket_api.py b/homeassistant/components/websocket_api.py
index 0c9ab366534..e9db666c032 100644
--- a/homeassistant/components/websocket_api.py
+++ b/homeassistant/components/websocket_api.py
@@ -360,6 +360,7 @@ class ActiveConnection:
                     authenticated = refresh_token is not None
                     if authenticated:
                         request['hass_user'] = refresh_token.user
+                        request['refresh_token_id'] = refresh_token.id
 
                 elif ((not self.hass.auth.active or
                        self.hass.auth.support_legacy) and
diff --git a/tests/components/auth/test_init.py b/tests/components/auth/test_init.py
index a8e95c73a36..ad2aa01737b 100644
--- a/tests/components/auth/test_init.py
+++ b/tests/components/auth/test_init.py
@@ -320,6 +320,7 @@ async def test_ws_refresh_tokens(hass, hass_ws_client, hass_access_token):
     assert token['client_name'] == refresh_token.client_name
     assert token['client_icon'] == refresh_token.client_icon
     assert token['created_at'] == refresh_token.created_at.isoformat()
+    assert token['is_current'] is True
 
 
 async def test_ws_delete_refresh_token(hass, hass_ws_client,

From 601f2df5a7a2ace5c4f4f217aa7bdd4551e340c0 Mon Sep 17 00:00:00 2001
From: Daniel Perna <danielperna84@gmail.com>
Date: Wed, 12 Sep 2018 11:22:21 +0200
Subject: [PATCH 113/357] Notifications for Android TV: Add fontsize and
 sending images (#16565)

* Add fontsize and image functionality

* woof
---
 .../components/notify/nfandroidtv.py          | 91 ++++++++++++++++++-
 1 file changed, 87 insertions(+), 4 deletions(-)

diff --git a/homeassistant/components/notify/nfandroidtv.py b/homeassistant/components/notify/nfandroidtv.py
index 044a037cc29..faf5e90e016 100644
--- a/homeassistant/components/notify/nfandroidtv.py
+++ b/homeassistant/components/notify/nfandroidtv.py
@@ -9,6 +9,8 @@ import io
 import base64
 
 import requests
+from requests.auth import HTTPBasicAuth
+from requests.auth import HTTPDigestAuth
 import voluptuous as vol
 
 from homeassistant.components.notify import (
@@ -21,12 +23,14 @@ _LOGGER = logging.getLogger(__name__)
 
 CONF_IP = 'host'
 CONF_DURATION = 'duration'
+CONF_FONTSIZE = 'fontsize'
 CONF_POSITION = 'position'
 CONF_TRANSPARENCY = 'transparency'
 CONF_COLOR = 'color'
 CONF_INTERRUPT = 'interrupt'
 
 DEFAULT_DURATION = 5
+DEFAULT_FONTSIZE = 'medium'
 DEFAULT_POSITION = 'bottom-right'
 DEFAULT_TRANSPARENCY = 'default'
 DEFAULT_COLOR = 'grey'
@@ -37,11 +41,29 @@ DEFAULT_ICON = (
     'cMXEAAAAASUVORK5CYII=')
 
 ATTR_DURATION = 'duration'
+ATTR_FONTSIZE = 'fontsize'
 ATTR_POSITION = 'position'
 ATTR_TRANSPARENCY = 'transparency'
 ATTR_COLOR = 'color'
 ATTR_BKGCOLOR = 'bkgcolor'
 ATTR_INTERRUPT = 'interrupt'
+ATTR_IMAGE = 'filename2'
+ATTR_FILE = 'file'
+# Attributes contained in file
+ATTR_FILE_URL = 'url'
+ATTR_FILE_PATH = 'path'
+ATTR_FILE_USERNAME = 'username'
+ATTR_FILE_PASSWORD = 'password'
+ATTR_FILE_AUTH = 'auth'
+# Any other value or absence of 'auth' lead to basic authentication being used
+ATTR_FILE_AUTH_DIGEST = 'digest'
+
+FONTSIZES = {
+    'small': 1,
+    'medium': 0,
+    'large': 2,
+    'max': 3
+}
 
 POSITIONS = {
     'bottom-right': 0,
@@ -75,6 +97,8 @@ COLORS = {
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Required(CONF_IP): cv.string,
     vol.Optional(CONF_DURATION, default=DEFAULT_DURATION): vol.Coerce(int),
+    vol.Optional(CONF_FONTSIZE, default=DEFAULT_FONTSIZE):
+        vol.In(FONTSIZES.keys()),
     vol.Optional(CONF_POSITION, default=DEFAULT_POSITION):
         vol.In(POSITIONS.keys()),
     vol.Optional(CONF_TRANSPARENCY, default=DEFAULT_TRANSPARENCY):
@@ -90,6 +114,7 @@ def get_service(hass, config, discovery_info=None):
     """Get the Notifications for Android TV notification service."""
     remoteip = config.get(CONF_IP)
     duration = config.get(CONF_DURATION)
+    fontsize = config.get(CONF_FONTSIZE)
     position = config.get(CONF_POSITION)
     transparency = config.get(CONF_TRANSPARENCY)
     color = config.get(CONF_COLOR)
@@ -97,23 +122,26 @@ def get_service(hass, config, discovery_info=None):
     timeout = config.get(CONF_TIMEOUT)
 
     return NFAndroidTVNotificationService(
-        remoteip, duration, position, transparency, color, interrupt, timeout)
+        remoteip, duration, fontsize, position,
+        transparency, color, interrupt, timeout, hass.config.is_allowed_path)
 
 
 class NFAndroidTVNotificationService(BaseNotificationService):
     """Notification service for Notifications for Android TV."""
 
-    def __init__(self, remoteip, duration, position, transparency, color,
-                 interrupt, timeout):
+    def __init__(self, remoteip, duration, fontsize, position, transparency,
+                 color, interrupt, timeout, is_allowed_path):
         """Initialize the service."""
         self._target = 'http://{}:7676'.format(remoteip)
         self._default_duration = duration
+        self._default_fontsize = fontsize
         self._default_position = position
         self._default_transparency = transparency
         self._default_color = color
         self._default_interrupt = interrupt
         self._timeout = timeout
         self._icon_file = io.BytesIO(base64.b64decode(DEFAULT_ICON))
+        self.is_allowed_path = is_allowed_path
 
     def send_message(self, message="", **kwargs):
         """Send a message to a Android TV device."""
@@ -123,7 +151,8 @@ class NFAndroidTVNotificationService(BaseNotificationService):
                                  'application/octet-stream',
                                  {'Expires': '0'}), type='0',
                        title=kwargs.get(ATTR_TITLE, ATTR_TITLE_DEFAULT),
-                       msg=message, duration="%i" % self._default_duration,
+                       msg=message, duration='%i' % self._default_duration,
+                       fontsize='%i' % FONTSIZES.get(self._default_fontsize),
                        position='%i' % POSITIONS.get(self._default_position),
                        bkgcolor='%s' % COLORS.get(self._default_color),
                        transparency='%i' % TRANSPARENCIES.get(
@@ -140,6 +169,13 @@ class NFAndroidTVNotificationService(BaseNotificationService):
                 except ValueError:
                     _LOGGER.warning("Invalid duration-value: %s",
                                     str(duration))
+            if ATTR_FONTSIZE in data:
+                fontsize = data.get(ATTR_FONTSIZE)
+                if fontsize in FONTSIZES:
+                    payload[ATTR_FONTSIZE] = '%i' % FONTSIZES.get(fontsize)
+                else:
+                    _LOGGER.warning("Invalid fontsize-value: %s",
+                                    str(fontsize))
             if ATTR_POSITION in data:
                 position = data.get(ATTR_POSITION)
                 if position in POSITIONS:
@@ -168,6 +204,19 @@ class NFAndroidTVNotificationService(BaseNotificationService):
                 except vol.Invalid:
                     _LOGGER.warning("Invalid interrupt-value: %s",
                                     str(interrupt))
+            filedata = data.get(ATTR_FILE) if data else None
+            if filedata is not None:
+                # Load from file or URL
+                file_as_bytes = self.load_file(
+                    url=filedata.get(ATTR_FILE_URL),
+                    local_path=filedata.get(ATTR_FILE_PATH),
+                    username=filedata.get(ATTR_FILE_USERNAME),
+                    password=filedata.get(ATTR_FILE_PASSWORD),
+                    auth=filedata.get(ATTR_FILE_AUTH))
+                if file_as_bytes:
+                    payload[ATTR_IMAGE] = (
+                        'image', file_as_bytes,
+                        'application/octet-stream', {'Expires': '0'})
 
         try:
             _LOGGER.debug("Payload: %s", str(payload))
@@ -178,3 +227,37 @@ class NFAndroidTVNotificationService(BaseNotificationService):
         except requests.exceptions.ConnectionError as err:
             _LOGGER.error("Error communicating with %s: %s",
                           self._target, str(err))
+
+    def load_file(self, url=None, local_path=None, username=None,
+                  password=None, auth=None):
+        """Load image/document/etc from a local path or URL."""
+        try:
+            if url is not None:
+                # Check whether authentication parameters are provided
+                if username is not None and password is not None:
+                    # Use digest or basic authentication
+                    if ATTR_FILE_AUTH_DIGEST == auth:
+                        auth_ = HTTPDigestAuth(username, password)
+                    else:
+                        auth_ = HTTPBasicAuth(username, password)
+                    # Load file from URL with authentication
+                    req = requests.get(
+                        url, auth=auth_, timeout=DEFAULT_TIMEOUT)
+                else:
+                    # Load file from URL without authentication
+                    req = requests.get(url, timeout=DEFAULT_TIMEOUT)
+                return req.content
+
+            elif local_path is not None:
+                # Check whether path is whitelisted in configuration.yaml
+                if self.is_allowed_path(local_path):
+                    return open(local_path, "rb")
+                _LOGGER.warning("'%s' is not secure to load data from!",
+                                local_path)
+            else:
+                _LOGGER.warning("Neither URL nor local path found in params!")
+
+        except OSError as error:
+            _LOGGER.error("Can't load from url or local path: %s", error)
+
+        return None

From beed82ab12f9863c98eb31357d231fadf0045e3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Wed, 12 Sep 2018 12:33:26 +0300
Subject: [PATCH 114/357] Upgrade pytest to 3.8.0 and pytest-timeout to 1.3.2
 (#16489)

---
 requirements_test.txt     | 4 ++--
 requirements_test_all.txt | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/requirements_test.txt b/requirements_test.txt
index e50ef699848..4144c6866df 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -12,6 +12,6 @@ pylint==2.1.1
 pytest-aiohttp==0.3.0
 pytest-cov==2.5.1
 pytest-sugar==0.9.1
-pytest-timeout==1.3.1
-pytest==3.7.2
+pytest-timeout==1.3.2
+pytest==3.8.0
 requests_mock==1.5.2
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 9df1060e4ac..dbf8f27bd84 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -13,8 +13,8 @@ pylint==2.1.1
 pytest-aiohttp==0.3.0
 pytest-cov==2.5.1
 pytest-sugar==0.9.1
-pytest-timeout==1.3.1
-pytest==3.7.2
+pytest-timeout==1.3.2
+pytest==3.8.0
 requests_mock==1.5.2
 
 

From 117ea9e553afc2a94c2ba9c269e54ee7161d4575 Mon Sep 17 00:00:00 2001
From: Alexei Chetroi <lexoid@gmail.com>
Date: Wed, 12 Sep 2018 05:39:23 -0400
Subject: [PATCH 115/357] Refactor zha/async_device_initialized(). (#16485)

Leverage endpoint.model and endpoint.manufacturer properties
---
 homeassistant/components/zha/__init__.py | 46 +++---------------------
 1 file changed, 5 insertions(+), 41 deletions(-)

diff --git a/homeassistant/components/zha/__init__.py b/homeassistant/components/zha/__init__.py
index 7aec4333ea8..48c2ad20be0 100644
--- a/homeassistant/components/zha/__init__.py
+++ b/homeassistant/components/zha/__init__.py
@@ -179,8 +179,6 @@ class ApplicationListener:
             if endpoint_id == 0:  # ZDO
                 continue
 
-            discovered_info = await _discover_endpoint_info(endpoint)
-
             component = None
             profile_clusters = ([], [])
             device_key = "{}-{}".format(device.ieee, endpoint_id)
@@ -212,10 +210,11 @@ class ApplicationListener:
                     'endpoint': endpoint,
                     'in_clusters': {c.cluster_id: c for c in in_clusters},
                     'out_clusters': {c.cluster_id: c for c in out_clusters},
+                    'manufacturer': endpoint.manufacturer,
+                    'model': endpoint.model,
                     'new_join': join,
                     'unique_id': device_key,
                 }
-                discovery_info.update(discovered_info)
                 self._hass.data[DISCOVERY_KEY][device_key] = discovery_info
 
                 await discovery.async_load_platform(
@@ -234,7 +233,6 @@ class ApplicationListener:
                     device_key,
                     zha_const.SINGLE_INPUT_CLUSTER_DEVICE_CLASS,
                     'in_clusters',
-                    discovered_info,
                     join,
                 )
 
@@ -246,7 +244,6 @@ class ApplicationListener:
                     device_key,
                     zha_const.SINGLE_OUTPUT_CLUSTER_DEVICE_CLASS,
                     'out_clusters',
-                    discovered_info,
                     join,
                 )
 
@@ -257,7 +254,7 @@ class ApplicationListener:
     async def _attempt_single_cluster_device(self, endpoint, cluster,
                                              profile_clusters, device_key,
                                              device_classes, discovery_attr,
-                                             entity_info, is_new_join):
+                                             is_new_join):
         """Try to set up an entity from a "bare" cluster."""
         if cluster.cluster_id in profile_clusters:
             return
@@ -277,12 +274,13 @@ class ApplicationListener:
             'endpoint': endpoint,
             'in_clusters': {},
             'out_clusters': {},
+            'manufacturer': endpoint.manufacturer,
+            'model': endpoint.model,
             'new_join': is_new_join,
             'unique_id': cluster_key,
             'entity_suffix': '_{}'.format(cluster.cluster_id),
         }
         discovery_info[discovery_attr] = {cluster.cluster_id: cluster}
-        discovery_info.update(entity_info)
         self._hass.data[DISCOVERY_KEY][cluster_key] = discovery_info
 
         await discovery.async_load_platform(
@@ -369,40 +367,6 @@ class Entity(entity.Entity):
         pass
 
 
-async def _discover_endpoint_info(endpoint):
-    """Find some basic information about an endpoint."""
-    extra_info = {
-        'manufacturer': None,
-        'model': None,
-    }
-    if 0 not in endpoint.in_clusters:
-        return extra_info
-
-    async def read(attributes):
-        """Read attributes and update extra_info convenience function."""
-        result, _ = await endpoint.in_clusters[0].read_attributes(
-            attributes,
-            allow_cache=True,
-        )
-        extra_info.update(result)
-
-    await read(['manufacturer', 'model'])
-    if extra_info['manufacturer'] is None or extra_info['model'] is None:
-        # Some devices fail at returning multiple results. Attempt separately.
-        await read(['manufacturer'])
-        await read(['model'])
-
-    for key, value in extra_info.items():
-        if isinstance(value, bytes):
-            try:
-                extra_info[key] = value.decode('ascii').strip()
-            except UnicodeDecodeError:
-                # Unsure what the best behaviour here is. Unset the key?
-                pass
-
-    return extra_info
-
-
 def get_discovery_info(hass, discovery_info):
     """Get the full discovery info for a device.
 

From 501f2b0a9321beed7a5c02a13e2634f8eac0ed0e Mon Sep 17 00:00:00 2001
From: Alexei Chetroi <lexoid@gmail.com>
Date: Wed, 12 Sep 2018 06:43:06 -0400
Subject: [PATCH 116/357] Update fan.zha platform. (#16551)

* Update fan.zha platform.

switch from asyncio to async def()
catch DeliveryError exceptions
keep previous state, if reading 'fan_mode' attribute fails

* fan.zha: Use None for unknown state.

if we fail to read 'fan_mode' attribute, use None for state
---
 homeassistant/components/fan/zha.py | 34 ++++++++++++++---------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/homeassistant/components/fan/zha.py b/homeassistant/components/fan/zha.py
index 2612c065393..d86e0c3c99b 100644
--- a/homeassistant/components/fan/zha.py
+++ b/homeassistant/components/fan/zha.py
@@ -4,7 +4,6 @@ Fans on Zigbee Home Automation networks.
 For more details on this platform, please refer to the documentation
 at https://home-assistant.io/components/fan.zha/
 """
-import asyncio
 import logging
 from homeassistant.components import zha
 from homeassistant.components.fan import (
@@ -38,9 +37,8 @@ VALUE_TO_SPEED = {i: speed for i, speed in enumerate(SPEED_LIST)}
 SPEED_TO_VALUE = {speed: i for i, speed in enumerate(SPEED_LIST)}
 
 
-@asyncio.coroutine
-def async_setup_platform(hass, config, async_add_entities,
-                         discovery_info=None):
+async def async_setup_platform(hass, config, async_add_entities,
+                               discovery_info=None):
     """Set up the Zigbee Home Automation fans."""
     discovery_info = zha.get_discovery_info(hass, discovery_info)
     if discovery_info is None:
@@ -76,32 +74,34 @@ class ZhaFan(zha.Entity, FanEntity):
             return False
         return self._state != SPEED_OFF
 
-    @asyncio.coroutine
-    def async_turn_on(self, speed: str = None, **kwargs) -> None:
+    async def async_turn_on(self, speed: str = None, **kwargs) -> None:
         """Turn the entity on."""
         if speed is None:
             speed = SPEED_MEDIUM
 
-        yield from self.async_set_speed(speed)
+        await self.async_set_speed(speed)
 
-    @asyncio.coroutine
-    def async_turn_off(self, **kwargs) -> None:
+    async def async_turn_off(self, **kwargs) -> None:
         """Turn the entity off."""
-        yield from self.async_set_speed(SPEED_OFF)
+        await self.async_set_speed(SPEED_OFF)
 
-    @asyncio.coroutine
-    def async_set_speed(self, speed: str) -> None:
+    async def async_set_speed(self, speed: str) -> None:
         """Set the speed of the fan."""
-        yield from self._endpoint.fan.write_attributes({
-            'fan_mode': SPEED_TO_VALUE[speed]})
+        from zigpy.exceptions import DeliveryError
+        try:
+            await self._endpoint.fan.write_attributes(
+                {'fan_mode': SPEED_TO_VALUE[speed]}
+            )
+        except DeliveryError as ex:
+            _LOGGER.error("%s: Could not set speed: %s", self.entity_id, ex)
+            return
 
         self._state = speed
         self.async_schedule_update_ha_state()
 
-    @asyncio.coroutine
-    def async_update(self):
+    async def async_update(self):
         """Retrieve latest state."""
-        result = yield from zha.safe_read(self._endpoint.fan, ['fan_mode'])
+        result = await zha.safe_read(self._endpoint.fan, ['fan_mode'])
         new_value = result.get('fan_mode', None)
         self._state = VALUE_TO_SPEED.get(new_value, None)
 

From 77026a224284c617a027a134141b5af2362f71e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zo=C3=A9=20B=C5=91le?= <github@astech.hu>
Date: Wed, 12 Sep 2018 12:44:14 +0200
Subject: [PATCH 117/357] Increasing python-websockets' version number (#16578)

* increasing python-websockets' version number so now it works with python 3.7

* required version for websockets increased to work with Python 3.7

* script/gen_requirements_all.py is done
---
 homeassistant/components/media_player/webostv.py | 2 +-
 homeassistant/components/spc.py                  | 2 +-
 requirements_all.txt                             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/media_player/webostv.py b/homeassistant/components/media_player/webostv.py
index b5240bdb9f5..0a5b9fe509b 100644
--- a/homeassistant/components/media_player/webostv.py
+++ b/homeassistant/components/media_player/webostv.py
@@ -24,7 +24,7 @@ from homeassistant.const import (
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.script import Script
 
-REQUIREMENTS = ['pylgtv==0.1.7', 'websockets==3.2']
+REQUIREMENTS = ['pylgtv==0.1.7', 'websockets==6.0']
 
 _CONFIGURING = {}  # type: Dict[str, str]
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/spc.py b/homeassistant/components/spc.py
index bf7db87f06b..5b357efcabd 100644
--- a/homeassistant/components/spc.py
+++ b/homeassistant/components/spc.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
 from homeassistant.helpers import discovery
 import homeassistant.helpers.config_validation as cv
 
-REQUIREMENTS = ['websockets==3.2']
+REQUIREMENTS = ['websockets==6.0']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/requirements_all.txt b/requirements_all.txt
index 63861d2ab3d..c9bdccfb4a6 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1480,7 +1480,7 @@ websocket-client==0.37.0
 
 # homeassistant.components.spc
 # homeassistant.components.media_player.webostv
-websockets==3.2
+websockets==6.0
 
 # homeassistant.components.wirelesstag
 wirelesstagpy==0.3.0

From 453cbb7c606c413a343d1be31774e664ff05388a Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Wed, 12 Sep 2018 13:23:50 +0200
Subject: [PATCH 118/357] Update frontend to 20180912.0

---
 homeassistant/components/frontend/__init__.py | 2 +-
 requirements_all.txt                          | 2 +-
 requirements_test_all.txt                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/frontend/__init__.py b/homeassistant/components/frontend/__init__.py
index 5fea70ce846..a7a6187c939 100644
--- a/homeassistant/components/frontend/__init__.py
+++ b/homeassistant/components/frontend/__init__.py
@@ -26,7 +26,7 @@ from homeassistant.helpers.translation import async_get_translations
 from homeassistant.loader import bind_hass
 from homeassistant.util.yaml import load_yaml
 
-REQUIREMENTS = ['home-assistant-frontend==20180911.0']
+REQUIREMENTS = ['home-assistant-frontend==20180912.0']
 
 DOMAIN = 'frontend'
 DEPENDENCIES = ['api', 'websocket_api', 'http', 'system_log',
diff --git a/requirements_all.txt b/requirements_all.txt
index c9bdccfb4a6..dfea5da4145 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -452,7 +452,7 @@ hole==0.3.0
 holidays==0.9.6
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180911.0
+home-assistant-frontend==20180912.0
 
 # homeassistant.components.homekit_controller
 # homekit==0.10
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index dbf8f27bd84..e8bdd85a3e5 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -84,7 +84,7 @@ hbmqtt==0.9.4
 holidays==0.9.6
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180911.0
+home-assistant-frontend==20180912.0
 
 # homeassistant.components.homematicip_cloud
 homematicip==0.9.8

From 68c21530ca74baa27adfa1f6943384f123ce3c09 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Wed, 12 Sep 2018 13:23:50 +0200
Subject: [PATCH 119/357] Update frontend to 20180912.0

---
 homeassistant/components/frontend/__init__.py | 2 +-
 requirements_all.txt                          | 2 +-
 requirements_test_all.txt                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/frontend/__init__.py b/homeassistant/components/frontend/__init__.py
index 5fea70ce846..a7a6187c939 100644
--- a/homeassistant/components/frontend/__init__.py
+++ b/homeassistant/components/frontend/__init__.py
@@ -26,7 +26,7 @@ from homeassistant.helpers.translation import async_get_translations
 from homeassistant.loader import bind_hass
 from homeassistant.util.yaml import load_yaml
 
-REQUIREMENTS = ['home-assistant-frontend==20180911.0']
+REQUIREMENTS = ['home-assistant-frontend==20180912.0']
 
 DOMAIN = 'frontend'
 DEPENDENCIES = ['api', 'websocket_api', 'http', 'system_log',
diff --git a/requirements_all.txt b/requirements_all.txt
index f11be0e1a89..5d9518b3c13 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -452,7 +452,7 @@ hole==0.3.0
 holidays==0.9.6
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180911.0
+home-assistant-frontend==20180912.0
 
 # homeassistant.components.homekit_controller
 # homekit==0.10
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 7708aeb6650..c333b3d6ca5 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -84,7 +84,7 @@ hbmqtt==0.9.4
 holidays==0.9.6
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180911.0
+home-assistant-frontend==20180912.0
 
 # homeassistant.components.homematicip_cloud
 homematicip==0.9.8

From ff78a5b04b0831a5075b49508effc922392ca2c5 Mon Sep 17 00:00:00 2001
From: Jason Hu <awarecan@users.noreply.github.com>
Date: Wed, 12 Sep 2018 04:24:16 -0700
Subject: [PATCH 120/357] Track refresh token last usage information (#16408)

* Extend refresh_token to support last_used_at and last_used_by

* Address code review comment

* Remove unused code

* Add it to websocket response

* Fix typing
---
 homeassistant/auth/__init__.py            |  5 ++++-
 homeassistant/auth/auth_store.py          | 26 ++++++++++++++++++++++-
 homeassistant/auth/models.py              |  5 ++++-
 homeassistant/components/auth/__init__.py | 19 +++++++++++------
 tests/auth/test_init.py                   | 18 +++++++++++++++-
 tests/components/auth/test_init.py        |  2 ++
 6 files changed, 65 insertions(+), 10 deletions(-)

diff --git a/homeassistant/auth/__init__.py b/homeassistant/auth/__init__.py
index b0cebb5fd6c..c6f978640f6 100644
--- a/homeassistant/auth/__init__.py
+++ b/homeassistant/auth/__init__.py
@@ -309,8 +309,11 @@ class AuthManager:
 
     @callback
     def async_create_access_token(self,
-                                  refresh_token: models.RefreshToken) -> str:
+                                  refresh_token: models.RefreshToken,
+                                  remote_ip: Optional[str] = None) -> str:
         """Create a new access token."""
+        self._store.async_log_refresh_token_usage(refresh_token, remote_ip)
+
         # pylint: disable=no-self-use
         now = dt_util.utcnow()
         return jwt.encode({
diff --git a/homeassistant/auth/auth_store.py b/homeassistant/auth/auth_store.py
index 8e8d03253e5..fb4700c806f 100644
--- a/homeassistant/auth/auth_store.py
+++ b/homeassistant/auth/auth_store.py
@@ -195,6 +195,15 @@ class AuthStore:
 
         return found
 
+    @callback
+    def async_log_refresh_token_usage(
+            self, refresh_token: models.RefreshToken,
+            remote_ip: Optional[str] = None) -> None:
+        """Update refresh token last used information."""
+        refresh_token.last_used_at = dt_util.utcnow()
+        refresh_token.last_used_ip = remote_ip
+        self._async_schedule_save()
+
     async def _async_load(self) -> None:
         """Load the users."""
         data = await self._store.async_load()
@@ -233,12 +242,21 @@ class AuthStore:
                     'Ignoring refresh token %(id)s with invalid created_at '
                     '%(created_at)s for user_id %(user_id)s', rt_dict)
                 continue
+
             token_type = rt_dict.get('token_type')
             if token_type is None:
                 if rt_dict['client_id'] is None:
                     token_type = models.TOKEN_TYPE_SYSTEM
                 else:
                     token_type = models.TOKEN_TYPE_NORMAL
+
+            # old refresh_token don't have last_used_at (pre-0.78)
+            last_used_at_str = rt_dict.get('last_used_at')
+            if last_used_at_str:
+                last_used_at = dt_util.parse_datetime(last_used_at_str)
+            else:
+                last_used_at = None
+
             token = models.RefreshToken(
                 id=rt_dict['id'],
                 user=users[rt_dict['user_id']],
@@ -251,7 +269,9 @@ class AuthStore:
                 access_token_expiration=timedelta(
                     seconds=rt_dict['access_token_expiration']),
                 token=rt_dict['token'],
-                jwt_key=rt_dict['jwt_key']
+                jwt_key=rt_dict['jwt_key'],
+                last_used_at=last_used_at,
+                last_used_ip=rt_dict.get('last_used_ip'),
             )
             users[rt_dict['user_id']].refresh_tokens[token.id] = token
 
@@ -306,6 +326,10 @@ class AuthStore:
                     refresh_token.access_token_expiration.total_seconds(),
                 'token': refresh_token.token,
                 'jwt_key': refresh_token.jwt_key,
+                'last_used_at':
+                    refresh_token.last_used_at.isoformat()
+                    if refresh_token.last_used_at else None,
+                'last_used_ip': refresh_token.last_used_ip,
             }
             for user in self._users.values()
             for refresh_token in user.refresh_tokens.values()
diff --git a/homeassistant/auth/models.py b/homeassistant/auth/models.py
index c5273d7fa1d..b0f4024c3ab 100644
--- a/homeassistant/auth/models.py
+++ b/homeassistant/auth/models.py
@@ -55,13 +55,16 @@ class RefreshToken:
     jwt_key = attr.ib(type=str,
                       default=attr.Factory(lambda: generate_secret(64)))
 
+    last_used_at = attr.ib(type=Optional[datetime], default=None)
+    last_used_ip = attr.ib(type=Optional[str], default=None)
+
 
 @attr.s(slots=True)
 class Credentials:
     """Credentials for a user on an auth provider."""
 
     auth_provider_type = attr.ib(type=str)
-    auth_provider_id = attr.ib(type=str)  # type: Optional[str]
+    auth_provider_id = attr.ib(type=Optional[str])
 
     # Allow the auth provider to store data to represent their auth.
     data = attr.ib(type=dict)
diff --git a/homeassistant/components/auth/__init__.py b/homeassistant/components/auth/__init__.py
index 01cfe4724bf..bee72d8e4fc 100644
--- a/homeassistant/components/auth/__init__.py
+++ b/homeassistant/components/auth/__init__.py
@@ -129,6 +129,7 @@ import voluptuous as vol
 from homeassistant.auth.models import User, Credentials, \
     TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN
 from homeassistant.components import websocket_api
+from homeassistant.components.http import KEY_REAL_IP
 from homeassistant.components.http.ban import log_invalid_auth
 from homeassistant.components.http.data_validator import RequestDataValidator
 from homeassistant.components.http.view import HomeAssistantView
@@ -236,10 +237,12 @@ class TokenView(HomeAssistantView):
             return await self._async_handle_revoke_token(hass, data)
 
         if grant_type == 'authorization_code':
-            return await self._async_handle_auth_code(hass, data)
+            return await self._async_handle_auth_code(
+                hass, data, str(request[KEY_REAL_IP]))
 
         if grant_type == 'refresh_token':
-            return await self._async_handle_refresh_token(hass, data)
+            return await self._async_handle_refresh_token(
+                hass, data, str(request[KEY_REAL_IP]))
 
         return self.json({
             'error': 'unsupported_grant_type',
@@ -264,7 +267,7 @@ class TokenView(HomeAssistantView):
         await hass.auth.async_remove_refresh_token(refresh_token)
         return web.Response(status=200)
 
-    async def _async_handle_auth_code(self, hass, data):
+    async def _async_handle_auth_code(self, hass, data, remote_addr):
         """Handle authorization code request."""
         client_id = data.get('client_id')
         if client_id is None or not indieauth.verify_client_id(client_id):
@@ -300,7 +303,8 @@ class TokenView(HomeAssistantView):
 
         refresh_token = await hass.auth.async_create_refresh_token(user,
                                                                    client_id)
-        access_token = hass.auth.async_create_access_token(refresh_token)
+        access_token = hass.auth.async_create_access_token(
+            refresh_token, remote_addr)
 
         return self.json({
             'access_token': access_token,
@@ -310,7 +314,7 @@ class TokenView(HomeAssistantView):
                 int(refresh_token.access_token_expiration.total_seconds()),
         })
 
-    async def _async_handle_refresh_token(self, hass, data):
+    async def _async_handle_refresh_token(self, hass, data, remote_addr):
         """Handle authorization code request."""
         client_id = data.get('client_id')
         if client_id is not None and not indieauth.verify_client_id(client_id):
@@ -338,7 +342,8 @@ class TokenView(HomeAssistantView):
                 'error': 'invalid_request',
             }, status_code=400)
 
-        access_token = hass.auth.async_create_access_token(refresh_token)
+        access_token = hass.auth.async_create_access_token(
+            refresh_token, remote_addr)
 
         return self.json({
             'access_token': access_token,
@@ -484,6 +489,8 @@ def websocket_refresh_tokens(
         'type': refresh.token_type,
         'created_at': refresh.created_at,
         'is_current': refresh.id == current_id,
+        'last_used_at': refresh.last_used_at,
+        'last_used_ip': refresh.last_used_ip,
     } for refresh in connection.user.refresh_tokens.values()]))
 
 
diff --git a/tests/auth/test_init.py b/tests/auth/test_init.py
index 765199b256c..8325bd2551a 100644
--- a/tests/auth/test_init.py
+++ b/tests/auth/test_init.py
@@ -278,7 +278,11 @@ async def test_saving_loading(hass, hass_storage):
     })
     user = step['result']
     await manager.async_activate_user(user)
-    await manager.async_create_refresh_token(user, CLIENT_ID)
+    # the first refresh token will be used to create access token
+    refresh_token = await manager.async_create_refresh_token(user, CLIENT_ID)
+    manager.async_create_access_token(refresh_token, '192.168.0.1')
+    # the second refresh token will not be used
+    await manager.async_create_refresh_token(user, 'dummy-client')
 
     await flush_store(manager._store._store)
 
@@ -286,6 +290,18 @@ async def test_saving_loading(hass, hass_storage):
     users = await store2.async_get_users()
     assert len(users) == 1
     assert users[0] == user
+    assert len(users[0].refresh_tokens) == 2
+    for r_token in users[0].refresh_tokens.values():
+        if r_token.client_id == CLIENT_ID:
+            # verify the first refresh token
+            assert r_token.last_used_at is not None
+            assert r_token.last_used_ip == '192.168.0.1'
+        elif r_token.client_id == 'dummy-client':
+            # verify the second refresh token
+            assert r_token.last_used_at is None
+            assert r_token.last_used_ip is None
+        else:
+            assert False, 'Unknown client_id: %s' % r_token.client_id
 
 
 async def test_cannot_retrieve_expired_access_token(hass):
diff --git a/tests/components/auth/test_init.py b/tests/components/auth/test_init.py
index ad2aa01737b..a3974553661 100644
--- a/tests/components/auth/test_init.py
+++ b/tests/components/auth/test_init.py
@@ -321,6 +321,8 @@ async def test_ws_refresh_tokens(hass, hass_ws_client, hass_access_token):
     assert token['client_icon'] == refresh_token.client_icon
     assert token['created_at'] == refresh_token.created_at.isoformat()
     assert token['is_current'] is True
+    assert token['last_used_at'] == refresh_token.last_used_at.isoformat()
+    assert token['last_used_ip'] == refresh_token.last_used_ip
 
 
 async def test_ws_delete_refresh_token(hass, hass_ws_client,

From 4efe86327d7c0948b3cb68128d163bcfb448c295 Mon Sep 17 00:00:00 2001
From: Marcel Hoppe <hobbypunk90@users.noreply.github.com>
Date: Wed, 12 Sep 2018 13:27:21 +0200
Subject: [PATCH 121/357] Hangouts help "page" and little bugfix (#16464)

* add 'default_conversations' parameter

* remove the empty message segment at the end of every message

* add 'HangoutsHelp' intent

* add hangouts/intents.py
---
 .coveragerc                                   |  1 +
 homeassistant/components/hangouts/__init__.py | 26 ++++++++--
 homeassistant/components/hangouts/const.py    |  3 ++
 .../components/hangouts/hangouts_bot.py       | 51 ++++++++++++++-----
 homeassistant/components/hangouts/intents.py  | 33 ++++++++++++
 5 files changed, 95 insertions(+), 19 deletions(-)
 create mode 100644 homeassistant/components/hangouts/intents.py

diff --git a/.coveragerc b/.coveragerc
index ca36f4a8dbb..bd08f5c38df 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -123,6 +123,7 @@ omit =
     homeassistant/components/hangouts/const.py
     homeassistant/components/hangouts/hangouts_bot.py
     homeassistant/components/hangouts/hangups_utils.py
+    homeassistant/components/hangouts/intents.py
     homeassistant/components/*/hangouts.py
 
     homeassistant/components/hdmi_cec.py
diff --git a/homeassistant/components/hangouts/__init__.py b/homeassistant/components/hangouts/__init__.py
index ebadff57be3..8480ae09549 100644
--- a/homeassistant/components/hangouts/__init__.py
+++ b/homeassistant/components/hangouts/__init__.py
@@ -9,7 +9,9 @@ import logging
 import voluptuous as vol
 
 from homeassistant import config_entries
+from homeassistant.components.hangouts.intents import HelpIntent
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP
+from homeassistant.helpers import intent
 from homeassistant.helpers import dispatcher
 import homeassistant.helpers.config_validation as cv
 
@@ -18,12 +20,13 @@ from .const import (
     EVENT_HANGOUTS_CONNECTED, EVENT_HANGOUTS_CONVERSATIONS_CHANGED,
     MESSAGE_SCHEMA, SERVICE_SEND_MESSAGE,
     SERVICE_UPDATE, CONF_SENTENCES, CONF_MATCHERS,
-    CONF_ERROR_SUPPRESSED_CONVERSATIONS, INTENT_SCHEMA, TARGETS_SCHEMA)
+    CONF_ERROR_SUPPRESSED_CONVERSATIONS, INTENT_SCHEMA, TARGETS_SCHEMA,
+    CONF_DEFAULT_CONVERSATIONS, EVENT_HANGOUTS_CONVERSATIONS_RESOLVED,
+    INTENT_HELP)
 
 # We need an import from .config_flow, without it .config_flow is never loaded.
 from .config_flow import HangoutsFlowHandler  # noqa: F401
 
-
 REQUIREMENTS = ['hangups==0.4.5']
 
 _LOGGER = logging.getLogger(__name__)
@@ -33,6 +36,8 @@ CONFIG_SCHEMA = vol.Schema({
         vol.Optional(CONF_INTENTS, default={}): vol.Schema({
             cv.string: INTENT_SCHEMA
         }),
+        vol.Optional(CONF_DEFAULT_CONVERSATIONS, default=[]):
+            [TARGETS_SCHEMA],
         vol.Optional(CONF_ERROR_SUPPRESSED_CONVERSATIONS, default=[]):
             [TARGETS_SCHEMA]
     })
@@ -47,16 +52,23 @@ async def async_setup(hass, config):
     if config is None:
         hass.data[DOMAIN] = {
             CONF_INTENTS: {},
+            CONF_DEFAULT_CONVERSATIONS: [],
             CONF_ERROR_SUPPRESSED_CONVERSATIONS: [],
         }
         return True
 
     hass.data[DOMAIN] = {
         CONF_INTENTS: config[CONF_INTENTS],
+        CONF_DEFAULT_CONVERSATIONS: config[CONF_DEFAULT_CONVERSATIONS],
         CONF_ERROR_SUPPRESSED_CONVERSATIONS:
             config[CONF_ERROR_SUPPRESSED_CONVERSATIONS],
     }
 
+    if (hass.data[DOMAIN][CONF_INTENTS] and
+            INTENT_HELP not in hass.data[DOMAIN][CONF_INTENTS]):
+        hass.data[DOMAIN][CONF_INTENTS][INTENT_HELP] = {
+            CONF_SENTENCES: ['HELP']}
+
     for data in hass.data[DOMAIN][CONF_INTENTS].values():
         matchers = []
         for sentence in data[CONF_SENTENCES]:
@@ -82,6 +94,7 @@ async def async_setup_entry(hass, config):
             hass,
             config.data.get(CONF_REFRESH_TOKEN),
             hass.data[DOMAIN][CONF_INTENTS],
+            hass.data[DOMAIN][CONF_DEFAULT_CONVERSATIONS],
             hass.data[DOMAIN][CONF_ERROR_SUPPRESSED_CONVERSATIONS])
         hass.data[DOMAIN][CONF_BOT] = bot
     except GoogleAuthError as exception:
@@ -96,11 +109,12 @@ async def async_setup_entry(hass, config):
     dispatcher.async_dispatcher_connect(
         hass,
         EVENT_HANGOUTS_CONVERSATIONS_CHANGED,
-        bot.async_update_conversation_commands)
+        bot.async_resolve_conversations)
+
     dispatcher.async_dispatcher_connect(
         hass,
-        EVENT_HANGOUTS_CONVERSATIONS_CHANGED,
-        bot.async_handle_update_error_suppressed_conversations)
+        EVENT_HANGOUTS_CONVERSATIONS_RESOLVED,
+        bot.async_update_conversation_commands)
 
     hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP,
                                bot.async_handle_hass_stop)
@@ -116,6 +130,8 @@ async def async_setup_entry(hass, config):
                                  async_handle_update_users_and_conversations,
                                  schema=vol.Schema({}))
 
+    intent.async_register(hass, HelpIntent(hass))
+
     return True
 
 
diff --git a/homeassistant/components/hangouts/const.py b/homeassistant/components/hangouts/const.py
index 3b96edf93a2..caae0de169b 100644
--- a/homeassistant/components/hangouts/const.py
+++ b/homeassistant/components/hangouts/const.py
@@ -24,10 +24,13 @@ CONF_INTENT_TYPE = 'intent_type'
 CONF_SENTENCES = 'sentences'
 CONF_MATCHERS = 'matchers'
 
+INTENT_HELP = 'HangoutsHelp'
+
 EVENT_HANGOUTS_CONNECTED = 'hangouts_connected'
 EVENT_HANGOUTS_DISCONNECTED = 'hangouts_disconnected'
 EVENT_HANGOUTS_USERS_CHANGED = 'hangouts_users_changed'
 EVENT_HANGOUTS_CONVERSATIONS_CHANGED = 'hangouts_conversations_changed'
+EVENT_HANGOUTS_CONVERSATIONS_RESOLVED = 'hangouts_conversations_resolved'
 EVENT_HANGOUTS_MESSAGE_RECEIVED = 'hangouts_message_received'
 
 CONF_CONVERSATION_ID = 'id'
diff --git a/homeassistant/components/hangouts/hangouts_bot.py b/homeassistant/components/hangouts/hangouts_bot.py
index 15f4156d374..7edc8898c8c 100644
--- a/homeassistant/components/hangouts/hangouts_bot.py
+++ b/homeassistant/components/hangouts/hangouts_bot.py
@@ -8,7 +8,7 @@ from .const import (
     EVENT_HANGOUTS_CONNECTED, EVENT_HANGOUTS_CONVERSATIONS_CHANGED,
     EVENT_HANGOUTS_DISCONNECTED, EVENT_HANGOUTS_MESSAGE_RECEIVED,
     CONF_MATCHERS, CONF_CONVERSATION_ID,
-    CONF_CONVERSATION_NAME)
+    CONF_CONVERSATION_NAME, EVENT_HANGOUTS_CONVERSATIONS_RESOLVED, INTENT_HELP)
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -16,7 +16,8 @@ _LOGGER = logging.getLogger(__name__)
 class HangoutsBot:
     """The Hangouts Bot."""
 
-    def __init__(self, hass, refresh_token, intents, error_suppressed_convs):
+    def __init__(self, hass, refresh_token, intents,
+                 default_convs, error_suppressed_convs):
         """Set up the client."""
         self.hass = hass
         self._connected = False
@@ -29,6 +30,8 @@ class HangoutsBot:
         self._client = None
         self._user_list = None
         self._conversation_list = None
+        self._default_convs = default_convs
+        self._default_conv_ids = None
         self._error_suppressed_convs = error_suppressed_convs
         self._error_suppressed_conv_ids = None
 
@@ -51,7 +54,7 @@ class HangoutsBot:
                 return conv
         return None
 
-    def async_update_conversation_commands(self, _):
+    def async_update_conversation_commands(self):
         """Refresh the commands for every conversation."""
         self._conversation_intents = {}
 
@@ -63,6 +66,8 @@ class HangoutsBot:
                     if conv_id is not None:
                         conversations.append(conv_id)
                 data['_' + CONF_CONVERSATIONS] = conversations
+            elif self._default_conv_ids:
+                data['_' + CONF_CONVERSATIONS] = self._default_conv_ids
             else:
                 data['_' + CONF_CONVERSATIONS] = \
                     [conv.id_ for conv in self._conversation_list.get_all()]
@@ -81,13 +86,22 @@ class HangoutsBot:
         self._conversation_list.on_event.add_observer(
             self._async_handle_conversation_event)
 
-    def async_handle_update_error_suppressed_conversations(self, _):
-        """Resolve the list of error suppressed conversations."""
+    def async_resolve_conversations(self, _):
+        """Resolve the list of default and error suppressed conversations."""
+        self._default_conv_ids = []
         self._error_suppressed_conv_ids = []
+
+        for conversation in self._default_convs:
+            conv_id = self._resolve_conversation_id(conversation)
+            if conv_id is not None:
+                self._default_conv_ids.append(conv_id)
+
         for conversation in self._error_suppressed_convs:
             conv_id = self._resolve_conversation_id(conversation)
             if conv_id is not None:
                 self._error_suppressed_conv_ids.append(conv_id)
+        dispatcher.async_dispatcher_send(self.hass,
+                                         EVENT_HANGOUTS_CONVERSATIONS_RESOLVED)
 
     async def _async_handle_conversation_event(self, event):
         from hangups import ChatMessageEvent
@@ -112,7 +126,8 @@ class HangoutsBot:
         if intents is not None:
             is_error = False
             try:
-                intent_result = await self._async_process(intents, message)
+                intent_result = await self._async_process(intents, message,
+                                                          conv_id)
             except (intent.UnknownIntent, intent.IntentHandleError) as err:
                 is_error = True
                 intent_result = intent.IntentResponse()
@@ -133,7 +148,7 @@ class HangoutsBot:
                     [{'text': message, 'parse_str': True}],
                     [{CONF_CONVERSATION_ID: conv_id}])
 
-    async def _async_process(self, intents, text):
+    async def _async_process(self, intents, text, conv_id):
         """Detect a matching intent."""
         for intent_type, data in intents.items():
             for matcher in data.get(CONF_MATCHERS, []):
@@ -141,12 +156,15 @@ class HangoutsBot:
 
                 if not match:
                     continue
+                if intent_type == INTENT_HELP:
+                    return await self.hass.helpers.intent.async_handle(
+                        DOMAIN, intent_type,
+                        {'conv_id': {'value': conv_id}}, text)
 
-                response = await self.hass.helpers.intent.async_handle(
+                return await self.hass.helpers.intent.async_handle(
                     DOMAIN, intent_type,
-                    {key: {'value': value} for key, value
-                     in match.groupdict().items()}, text)
-                return response
+                    {key: {'value': value}
+                     for key, value in match.groupdict().items()}, text)
 
     async def async_connect(self):
         """Login to the Google Hangouts."""
@@ -204,15 +222,16 @@ class HangoutsBot:
         from hangups import ChatMessageSegment, hangouts_pb2
         messages = []
         for segment in message:
+            if messages:
+                messages.append(ChatMessageSegment('',
+                                                   segment_type=hangouts_pb2.
+                                                   SEGMENT_TYPE_LINE_BREAK))
             if 'parse_str' in segment and segment['parse_str']:
                 messages.extend(ChatMessageSegment.from_str(segment['text']))
             else:
                 if 'parse_str' in segment:
                     del segment['parse_str']
                 messages.append(ChatMessageSegment(**segment))
-            messages.append(ChatMessageSegment('',
-                                               segment_type=hangouts_pb2.
-                                               SEGMENT_TYPE_LINE_BREAK))
 
         if not messages:
             return False
@@ -247,3 +266,7 @@ class HangoutsBot:
     async def async_handle_update_users_and_conversations(self, _=None):
         """Handle the update_users_and_conversations service."""
         await self._async_list_conversations()
+
+    def get_intents(self, conv_id):
+        """Return the intents for a specific conversation."""
+        return self._conversation_intents.get(conv_id)
diff --git a/homeassistant/components/hangouts/intents.py b/homeassistant/components/hangouts/intents.py
new file mode 100644
index 00000000000..be52f059139
--- /dev/null
+++ b/homeassistant/components/hangouts/intents.py
@@ -0,0 +1,33 @@
+"""Intents for the hangouts component."""
+from homeassistant.helpers import intent
+import homeassistant.helpers.config_validation as cv
+
+from .const import INTENT_HELP, DOMAIN, CONF_BOT
+
+
+class HelpIntent(intent.IntentHandler):
+    """Handle Help intents."""
+
+    intent_type = INTENT_HELP
+    slot_schema = {
+        'conv_id': cv.string
+    }
+
+    def __init__(self, hass):
+        """Set up the intent."""
+        self.hass = hass
+
+    async def async_handle(self, intent_obj):
+        """Handle the intent."""
+        slots = self.async_validate_slots(intent_obj.slots)
+        conv_id = slots['conv_id']['value']
+
+        intents = self.hass.data[DOMAIN][CONF_BOT].get_intents(conv_id)
+        response = intent_obj.create_response()
+        help_text = "I understand the following sentences:"
+        for intent_data in intents.values():
+            for sentence in intent_data['sentences']:
+                help_text += "\n'{}'".format(sentence)
+        response.async_set_speech(help_text)
+
+        return response

From 1983361373028b0bcb6a33224f7ab0ace9d15eab Mon Sep 17 00:00:00 2001
From: Jason Hu <awarecan@users.noreply.github.com>
Date: Wed, 12 Sep 2018 00:49:44 -0700
Subject: [PATCH 122/357] Return if refresh token is current used one in WS API
 (#16575)

---
 homeassistant/components/auth/__init__.py | 2 ++
 homeassistant/components/websocket_api.py | 1 +
 tests/components/auth/test_init.py        | 1 +
 3 files changed, 4 insertions(+)

diff --git a/homeassistant/components/auth/__init__.py b/homeassistant/components/auth/__init__.py
index 5fac423f27a..01cfe4724bf 100644
--- a/homeassistant/components/auth/__init__.py
+++ b/homeassistant/components/auth/__init__.py
@@ -475,6 +475,7 @@ def websocket_create_long_lived_access_token(
 def websocket_refresh_tokens(
         hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg):
     """Return metadata of users refresh tokens."""
+    current_id = connection.request.get('refresh_token_id')
     connection.to_write.put_nowait(websocket_api.result_message(msg['id'], [{
         'id': refresh.id,
         'client_id': refresh.client_id,
@@ -482,6 +483,7 @@ def websocket_refresh_tokens(
         'client_icon': refresh.client_icon,
         'type': refresh.token_type,
         'created_at': refresh.created_at,
+        'is_current': refresh.id == current_id,
     } for refresh in connection.user.refresh_tokens.values()]))
 
 
diff --git a/homeassistant/components/websocket_api.py b/homeassistant/components/websocket_api.py
index 0c9ab366534..e9db666c032 100644
--- a/homeassistant/components/websocket_api.py
+++ b/homeassistant/components/websocket_api.py
@@ -360,6 +360,7 @@ class ActiveConnection:
                     authenticated = refresh_token is not None
                     if authenticated:
                         request['hass_user'] = refresh_token.user
+                        request['refresh_token_id'] = refresh_token.id
 
                 elif ((not self.hass.auth.active or
                        self.hass.auth.support_legacy) and
diff --git a/tests/components/auth/test_init.py b/tests/components/auth/test_init.py
index a8e95c73a36..ad2aa01737b 100644
--- a/tests/components/auth/test_init.py
+++ b/tests/components/auth/test_init.py
@@ -320,6 +320,7 @@ async def test_ws_refresh_tokens(hass, hass_ws_client, hass_access_token):
     assert token['client_name'] == refresh_token.client_name
     assert token['client_icon'] == refresh_token.client_icon
     assert token['created_at'] == refresh_token.created_at.isoformat()
+    assert token['is_current'] is True
 
 
 async def test_ws_delete_refresh_token(hass, hass_ws_client,

From 4c1b816bb8c12a04428347c7b211f22eb54bbdc1 Mon Sep 17 00:00:00 2001
From: Jason Hu <awarecan@users.noreply.github.com>
Date: Wed, 12 Sep 2018 04:24:16 -0700
Subject: [PATCH 123/357] Track refresh token last usage information (#16408)

* Extend refresh_token to support last_used_at and last_used_by

* Address code review comment

* Remove unused code

* Add it to websocket response

* Fix typing
---
 homeassistant/auth/__init__.py            |  5 ++++-
 homeassistant/auth/auth_store.py          | 26 ++++++++++++++++++++++-
 homeassistant/auth/models.py              |  5 ++++-
 homeassistant/components/auth/__init__.py | 19 +++++++++++------
 tests/auth/test_init.py                   | 18 +++++++++++++++-
 tests/components/auth/test_init.py        |  2 ++
 6 files changed, 65 insertions(+), 10 deletions(-)

diff --git a/homeassistant/auth/__init__.py b/homeassistant/auth/__init__.py
index b0cebb5fd6c..c6f978640f6 100644
--- a/homeassistant/auth/__init__.py
+++ b/homeassistant/auth/__init__.py
@@ -309,8 +309,11 @@ class AuthManager:
 
     @callback
     def async_create_access_token(self,
-                                  refresh_token: models.RefreshToken) -> str:
+                                  refresh_token: models.RefreshToken,
+                                  remote_ip: Optional[str] = None) -> str:
         """Create a new access token."""
+        self._store.async_log_refresh_token_usage(refresh_token, remote_ip)
+
         # pylint: disable=no-self-use
         now = dt_util.utcnow()
         return jwt.encode({
diff --git a/homeassistant/auth/auth_store.py b/homeassistant/auth/auth_store.py
index 8e8d03253e5..fb4700c806f 100644
--- a/homeassistant/auth/auth_store.py
+++ b/homeassistant/auth/auth_store.py
@@ -195,6 +195,15 @@ class AuthStore:
 
         return found
 
+    @callback
+    def async_log_refresh_token_usage(
+            self, refresh_token: models.RefreshToken,
+            remote_ip: Optional[str] = None) -> None:
+        """Update refresh token last used information."""
+        refresh_token.last_used_at = dt_util.utcnow()
+        refresh_token.last_used_ip = remote_ip
+        self._async_schedule_save()
+
     async def _async_load(self) -> None:
         """Load the users."""
         data = await self._store.async_load()
@@ -233,12 +242,21 @@ class AuthStore:
                     'Ignoring refresh token %(id)s with invalid created_at '
                     '%(created_at)s for user_id %(user_id)s', rt_dict)
                 continue
+
             token_type = rt_dict.get('token_type')
             if token_type is None:
                 if rt_dict['client_id'] is None:
                     token_type = models.TOKEN_TYPE_SYSTEM
                 else:
                     token_type = models.TOKEN_TYPE_NORMAL
+
+            # old refresh_token don't have last_used_at (pre-0.78)
+            last_used_at_str = rt_dict.get('last_used_at')
+            if last_used_at_str:
+                last_used_at = dt_util.parse_datetime(last_used_at_str)
+            else:
+                last_used_at = None
+
             token = models.RefreshToken(
                 id=rt_dict['id'],
                 user=users[rt_dict['user_id']],
@@ -251,7 +269,9 @@ class AuthStore:
                 access_token_expiration=timedelta(
                     seconds=rt_dict['access_token_expiration']),
                 token=rt_dict['token'],
-                jwt_key=rt_dict['jwt_key']
+                jwt_key=rt_dict['jwt_key'],
+                last_used_at=last_used_at,
+                last_used_ip=rt_dict.get('last_used_ip'),
             )
             users[rt_dict['user_id']].refresh_tokens[token.id] = token
 
@@ -306,6 +326,10 @@ class AuthStore:
                     refresh_token.access_token_expiration.total_seconds(),
                 'token': refresh_token.token,
                 'jwt_key': refresh_token.jwt_key,
+                'last_used_at':
+                    refresh_token.last_used_at.isoformat()
+                    if refresh_token.last_used_at else None,
+                'last_used_ip': refresh_token.last_used_ip,
             }
             for user in self._users.values()
             for refresh_token in user.refresh_tokens.values()
diff --git a/homeassistant/auth/models.py b/homeassistant/auth/models.py
index c5273d7fa1d..b0f4024c3ab 100644
--- a/homeassistant/auth/models.py
+++ b/homeassistant/auth/models.py
@@ -55,13 +55,16 @@ class RefreshToken:
     jwt_key = attr.ib(type=str,
                       default=attr.Factory(lambda: generate_secret(64)))
 
+    last_used_at = attr.ib(type=Optional[datetime], default=None)
+    last_used_ip = attr.ib(type=Optional[str], default=None)
+
 
 @attr.s(slots=True)
 class Credentials:
     """Credentials for a user on an auth provider."""
 
     auth_provider_type = attr.ib(type=str)
-    auth_provider_id = attr.ib(type=str)  # type: Optional[str]
+    auth_provider_id = attr.ib(type=Optional[str])
 
     # Allow the auth provider to store data to represent their auth.
     data = attr.ib(type=dict)
diff --git a/homeassistant/components/auth/__init__.py b/homeassistant/components/auth/__init__.py
index 01cfe4724bf..bee72d8e4fc 100644
--- a/homeassistant/components/auth/__init__.py
+++ b/homeassistant/components/auth/__init__.py
@@ -129,6 +129,7 @@ import voluptuous as vol
 from homeassistant.auth.models import User, Credentials, \
     TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN
 from homeassistant.components import websocket_api
+from homeassistant.components.http import KEY_REAL_IP
 from homeassistant.components.http.ban import log_invalid_auth
 from homeassistant.components.http.data_validator import RequestDataValidator
 from homeassistant.components.http.view import HomeAssistantView
@@ -236,10 +237,12 @@ class TokenView(HomeAssistantView):
             return await self._async_handle_revoke_token(hass, data)
 
         if grant_type == 'authorization_code':
-            return await self._async_handle_auth_code(hass, data)
+            return await self._async_handle_auth_code(
+                hass, data, str(request[KEY_REAL_IP]))
 
         if grant_type == 'refresh_token':
-            return await self._async_handle_refresh_token(hass, data)
+            return await self._async_handle_refresh_token(
+                hass, data, str(request[KEY_REAL_IP]))
 
         return self.json({
             'error': 'unsupported_grant_type',
@@ -264,7 +267,7 @@ class TokenView(HomeAssistantView):
         await hass.auth.async_remove_refresh_token(refresh_token)
         return web.Response(status=200)
 
-    async def _async_handle_auth_code(self, hass, data):
+    async def _async_handle_auth_code(self, hass, data, remote_addr):
         """Handle authorization code request."""
         client_id = data.get('client_id')
         if client_id is None or not indieauth.verify_client_id(client_id):
@@ -300,7 +303,8 @@ class TokenView(HomeAssistantView):
 
         refresh_token = await hass.auth.async_create_refresh_token(user,
                                                                    client_id)
-        access_token = hass.auth.async_create_access_token(refresh_token)
+        access_token = hass.auth.async_create_access_token(
+            refresh_token, remote_addr)
 
         return self.json({
             'access_token': access_token,
@@ -310,7 +314,7 @@ class TokenView(HomeAssistantView):
                 int(refresh_token.access_token_expiration.total_seconds()),
         })
 
-    async def _async_handle_refresh_token(self, hass, data):
+    async def _async_handle_refresh_token(self, hass, data, remote_addr):
         """Handle authorization code request."""
         client_id = data.get('client_id')
         if client_id is not None and not indieauth.verify_client_id(client_id):
@@ -338,7 +342,8 @@ class TokenView(HomeAssistantView):
                 'error': 'invalid_request',
             }, status_code=400)
 
-        access_token = hass.auth.async_create_access_token(refresh_token)
+        access_token = hass.auth.async_create_access_token(
+            refresh_token, remote_addr)
 
         return self.json({
             'access_token': access_token,
@@ -484,6 +489,8 @@ def websocket_refresh_tokens(
         'type': refresh.token_type,
         'created_at': refresh.created_at,
         'is_current': refresh.id == current_id,
+        'last_used_at': refresh.last_used_at,
+        'last_used_ip': refresh.last_used_ip,
     } for refresh in connection.user.refresh_tokens.values()]))
 
 
diff --git a/tests/auth/test_init.py b/tests/auth/test_init.py
index 765199b256c..8325bd2551a 100644
--- a/tests/auth/test_init.py
+++ b/tests/auth/test_init.py
@@ -278,7 +278,11 @@ async def test_saving_loading(hass, hass_storage):
     })
     user = step['result']
     await manager.async_activate_user(user)
-    await manager.async_create_refresh_token(user, CLIENT_ID)
+    # the first refresh token will be used to create access token
+    refresh_token = await manager.async_create_refresh_token(user, CLIENT_ID)
+    manager.async_create_access_token(refresh_token, '192.168.0.1')
+    # the second refresh token will not be used
+    await manager.async_create_refresh_token(user, 'dummy-client')
 
     await flush_store(manager._store._store)
 
@@ -286,6 +290,18 @@ async def test_saving_loading(hass, hass_storage):
     users = await store2.async_get_users()
     assert len(users) == 1
     assert users[0] == user
+    assert len(users[0].refresh_tokens) == 2
+    for r_token in users[0].refresh_tokens.values():
+        if r_token.client_id == CLIENT_ID:
+            # verify the first refresh token
+            assert r_token.last_used_at is not None
+            assert r_token.last_used_ip == '192.168.0.1'
+        elif r_token.client_id == 'dummy-client':
+            # verify the second refresh token
+            assert r_token.last_used_at is None
+            assert r_token.last_used_ip is None
+        else:
+            assert False, 'Unknown client_id: %s' % r_token.client_id
 
 
 async def test_cannot_retrieve_expired_access_token(hass):
diff --git a/tests/components/auth/test_init.py b/tests/components/auth/test_init.py
index ad2aa01737b..a3974553661 100644
--- a/tests/components/auth/test_init.py
+++ b/tests/components/auth/test_init.py
@@ -321,6 +321,8 @@ async def test_ws_refresh_tokens(hass, hass_ws_client, hass_access_token):
     assert token['client_icon'] == refresh_token.client_icon
     assert token['created_at'] == refresh_token.created_at.isoformat()
     assert token['is_current'] is True
+    assert token['last_used_at'] == refresh_token.last_used_at.isoformat()
+    assert token['last_used_ip'] == refresh_token.last_used_ip
 
 
 async def test_ws_delete_refresh_token(hass, hass_ws_client,

From 08100a485a7c3bd46d44f5dd1a5bc07e45980210 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zo=C3=A9=20B=C5=91le?= <github@astech.hu>
Date: Wed, 12 Sep 2018 12:44:14 +0200
Subject: [PATCH 124/357] Increasing python-websockets' version number (#16578)

* increasing python-websockets' version number so now it works with python 3.7

* required version for websockets increased to work with Python 3.7

* script/gen_requirements_all.py is done
---
 homeassistant/components/media_player/webostv.py | 2 +-
 homeassistant/components/spc.py                  | 2 +-
 requirements_all.txt                             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/media_player/webostv.py b/homeassistant/components/media_player/webostv.py
index b3cd07b9d35..d78619a8279 100644
--- a/homeassistant/components/media_player/webostv.py
+++ b/homeassistant/components/media_player/webostv.py
@@ -26,7 +26,7 @@ from homeassistant.const import (
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.script import Script
 
-REQUIREMENTS = ['pylgtv==0.1.7', 'websockets==3.2']
+REQUIREMENTS = ['pylgtv==0.1.7', 'websockets==6.0']
 
 _CONFIGURING = {}  # type: Dict[str, str]
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/spc.py b/homeassistant/components/spc.py
index bf7db87f06b..5b357efcabd 100644
--- a/homeassistant/components/spc.py
+++ b/homeassistant/components/spc.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
 from homeassistant.helpers import discovery
 import homeassistant.helpers.config_validation as cv
 
-REQUIREMENTS = ['websockets==3.2']
+REQUIREMENTS = ['websockets==6.0']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/requirements_all.txt b/requirements_all.txt
index 5d9518b3c13..7dba008becb 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1480,7 +1480,7 @@ websocket-client==0.37.0
 
 # homeassistant.components.spc
 # homeassistant.components.media_player.webostv
-websockets==3.2
+websockets==6.0
 
 # homeassistant.components.wirelesstag
 wirelesstagpy==0.3.0

From a88cda44d977aa43abe73ac0a62f27508aeb6d81 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Wed, 12 Sep 2018 13:30:14 +0200
Subject: [PATCH 125/357] Bumped version to 0.78.0b2

---
 homeassistant/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/const.py b/homeassistant/const.py
index 03434439702..6bdb431d1ff 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -2,7 +2,7 @@
 """Constants used by Home Assistant components."""
 MAJOR_VERSION = 0
 MINOR_VERSION = 78
-PATCH_VERSION = '0b1'
+PATCH_VERSION = '0b2'
 __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
 __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
 REQUIRED_PYTHON_VER = (3, 5, 3)

From 308b7fb3854b05f716ee7e71cb757ed273b5bd9b Mon Sep 17 00:00:00 2001
From: Jason Hu <awarecan@users.noreply.github.com>
Date: Wed, 12 Sep 2018 04:42:54 -0700
Subject: [PATCH 126/357] Add retry limit for chromecast connection (#16471)

---
 homeassistant/components/media_player/cast.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/media_player/cast.py b/homeassistant/components/media_player/cast.py
index 83c3595ebd9..beec1e5609c 100644
--- a/homeassistant/components/media_player/cast.py
+++ b/homeassistant/components/media_player/cast.py
@@ -61,6 +61,10 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
         vol.All(cv.ensure_list, [cv.string]),
 })
 
+CONNECTION_RETRY = 3
+CONNECTION_RETRY_WAIT = 2
+CONNECTION_TIMEOUT = 10
+
 
 @attr.s(slots=True, frozen=True)
 class ChromecastInfo:
@@ -368,15 +372,13 @@ class CastDevice(MediaPlayerDevice):
                 return
             await self._async_disconnect()
 
-        # Failed connection will unfortunately never raise an exception, it
-        # will instead just try connecting indefinitely.
         # pylint: disable=protected-access
         _LOGGER.debug("Connecting to cast device %s", cast_info)
         chromecast = await self.hass.async_add_job(
             pychromecast._get_chromecast_from_host, (
                 cast_info.host, cast_info.port, cast_info.uuid,
                 cast_info.model_name, cast_info.friendly_name
-            ))
+            ), CONNECTION_RETRY, CONNECTION_RETRY_WAIT, CONNECTION_TIMEOUT)
         self._chromecast = chromecast
         self._status_listener = CastStatusListener(self, chromecast)
         # Initialise connection status as connected because we can only

From 2682d26f79c383fd623d82adb2a26afa041d7605 Mon Sep 17 00:00:00 2001
From: Nate Clark <nate@nateclark.com>
Date: Wed, 12 Sep 2018 07:54:38 -0400
Subject: [PATCH 127/357] Konnected component feature updates (#16479)

* add  config option to invert state of binary_sensor

* Add API endpoint to get state of a Konnected switch
---
 homeassistant/components/konnected.py | 60 +++++++++++++++++++++++----
 1 file changed, 53 insertions(+), 7 deletions(-)

diff --git a/homeassistant/components/konnected.py b/homeassistant/components/konnected.py
index 3df28586313..388fa41f36f 100644
--- a/homeassistant/components/konnected.py
+++ b/homeassistant/components/konnected.py
@@ -19,7 +19,7 @@ from homeassistant.const import (
     HTTP_BAD_REQUEST, HTTP_NOT_FOUND, HTTP_UNAUTHORIZED,
     CONF_DEVICES, CONF_BINARY_SENSORS, CONF_SWITCHES, CONF_HOST, CONF_PORT,
     CONF_ID, CONF_NAME, CONF_TYPE, CONF_PIN, CONF_ZONE, CONF_ACCESS_TOKEN,
-    ATTR_ENTITY_ID, ATTR_STATE)
+    ATTR_ENTITY_ID, ATTR_STATE, STATE_ON)
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers import discovery
 from homeassistant.helpers import config_validation as cv
@@ -35,6 +35,7 @@ CONF_API_HOST = 'api_host'
 CONF_MOMENTARY = 'momentary'
 CONF_PAUSE = 'pause'
 CONF_REPEAT = 'repeat'
+CONF_INVERSE = 'inverse'
 
 STATE_LOW = 'low'
 STATE_HIGH = 'high'
@@ -48,6 +49,7 @@ _BINARY_SENSOR_SCHEMA = vol.All(
         vol.Exclusive(CONF_ZONE, 's_pin'): vol.Any(*ZONE_TO_PIN),
         vol.Required(CONF_TYPE): DEVICE_CLASSES_SCHEMA,
         vol.Optional(CONF_NAME): cv.string,
+        vol.Optional(CONF_INVERSE): cv.boolean,
     }), cv.has_at_least_one_key(CONF_PIN, CONF_ZONE)
 )
 
@@ -156,6 +158,7 @@ class ConfiguredDevice:
                 CONF_TYPE: entity[CONF_TYPE],
                 CONF_NAME: entity.get(CONF_NAME, 'Konnected {} Zone {}'.format(
                     self.device_id[6:], PIN_TO_ZONE[pin])),
+                CONF_INVERSE: entity.get(CONF_INVERSE),
                 ATTR_STATE: None
             }
             _LOGGER.debug('Set up sensor %s (initial state: %s)',
@@ -259,15 +262,19 @@ class DiscoveredDevice:
 
     def update_initial_states(self):
         """Update the initial state of each sensor from status poll."""
-        for sensor in self.status.get('sensors'):
-            entity_id = self.stored_configuration[CONF_BINARY_SENSORS]. \
-                get(sensor.get(CONF_PIN), {}). \
-                get(ATTR_ENTITY_ID)
+        for sensor_data in self.status.get('sensors'):
+            sensor_config = self.stored_configuration[CONF_BINARY_SENSORS]. \
+                get(sensor_data.get(CONF_PIN), {})
+            entity_id = sensor_config.get(ATTR_ENTITY_ID)
+
+            state = bool(sensor_data.get(ATTR_STATE))
+            if sensor_config.get(CONF_INVERSE):
+                state = not state
 
             async_dispatcher_send(
                 self.hass,
                 SIGNAL_SENSOR_UPDATE.format(entity_id),
-                bool(sensor.get(ATTR_STATE)))
+                state)
 
     def sync_device_config(self):
         """Sync the new pin configuration to the Konnected device."""
@@ -321,6 +328,43 @@ class KonnectedView(HomeAssistantView):
         """Initialize the view."""
         self.auth_token = auth_token
 
+    @staticmethod
+    def binary_value(state, activation):
+        """Return binary value for GPIO based on state and activation."""
+        if activation == STATE_HIGH:
+            return 1 if state == STATE_ON else 0
+        return 0 if state == STATE_ON else 1
+
+    async def get(self, request: Request, device_id) -> Response:
+        """Return the current binary state of a switch."""
+        hass = request.app['hass']
+        pin_num = int(request.query.get('pin'))
+        data = hass.data[DOMAIN]
+
+        device = data[CONF_DEVICES][device_id]
+        if not device:
+            return self.json_message(
+                'Device ' + device_id + ' not configured',
+                status_code=HTTP_NOT_FOUND)
+
+        try:
+            pin = next(filter(
+                lambda switch: switch[CONF_PIN] == pin_num,
+                device[CONF_SWITCHES]))
+        except StopIteration:
+            pin = None
+
+        if not pin:
+            return self.json_message(
+                'Switch on pin ' + pin_num + ' not configured',
+                status_code=HTTP_NOT_FOUND)
+
+        return self.json(
+            {'pin': pin_num,
+             'state': self.binary_value(
+                 hass.states.get(pin[ATTR_ENTITY_ID]).state,
+                 pin[CONF_ACTIVATION])})
+
     async def put(self, request: Request, device_id,
                   pin_num=None, state=None) -> Response:
         """Receive a sensor update via PUT request and async set state."""
@@ -341,7 +385,6 @@ class KonnectedView(HomeAssistantView):
             return self.json_message(
                 "unauthorized", status_code=HTTP_UNAUTHORIZED)
         pin_num = int(pin_num)
-        state = bool(int(state))
         device = data[CONF_DEVICES].get(device_id)
         if device is None:
             return self.json_message('unregistered device',
@@ -356,6 +399,9 @@ class KonnectedView(HomeAssistantView):
         if entity_id is None:
             return self.json_message('uninitialized sensor/actuator',
                                      status_code=HTTP_NOT_FOUND)
+        state = bool(int(state))
+        if pin_data.get(CONF_INVERSE):
+            state = not state
 
         async_dispatcher_send(
             hass, SIGNAL_SENSOR_UPDATE.format(entity_id), state)

From 3824582e681b8eb25d0cbcc74eb3b26da1d03962 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Wed, 12 Sep 2018 20:17:52 +0200
Subject: [PATCH 128/357] Add config entry to iOS (#16580)

* Add config entry to iOS

* Add translation
---
 .../components/ios/.translations/en.json      | 14 ++++
 .../components/{ios.py => ios/__init__.py}    | 73 ++++++++++++-------
 homeassistant/components/ios/strings.json     | 14 ++++
 homeassistant/components/notify/ios.py        | 16 ++--
 homeassistant/components/sensor/ios.py        | 13 ++--
 homeassistant/config_entries.py               |  1 +
 tests/components/ios/__init__.py              |  1 +
 tests/components/ios/test_init.py             | 61 ++++++++++++++++
 8 files changed, 153 insertions(+), 40 deletions(-)
 create mode 100644 homeassistant/components/ios/.translations/en.json
 rename homeassistant/components/{ios.py => ios/__init__.py} (81%)
 create mode 100644 homeassistant/components/ios/strings.json
 create mode 100644 tests/components/ios/__init__.py
 create mode 100644 tests/components/ios/test_init.py

diff --git a/homeassistant/components/ios/.translations/en.json b/homeassistant/components/ios/.translations/en.json
new file mode 100644
index 00000000000..ae2e4e03f74
--- /dev/null
+++ b/homeassistant/components/ios/.translations/en.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Only a single configuration of Home Assistant iOS is necessary."
+        },
+        "step": {
+            "confirm": {
+                "description": "Do you want to set up the Home Assistant iOS component?",
+                "title": "Home Assistant iOS"
+            }
+        },
+        "title": "Home Assistant iOS"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ios.py b/homeassistant/components/ios/__init__.py
similarity index 81%
rename from homeassistant/components/ios.py
rename to homeassistant/components/ios/__init__.py
index 7f7377469fd..3766e00879d 100644
--- a/homeassistant/components/ios.py
+++ b/homeassistant/components/ios/__init__.py
@@ -11,13 +11,14 @@ import datetime
 import voluptuous as vol
 # from voluptuous.humanize import humanize_error
 
+from homeassistant import config_entries
 from homeassistant.components.http import HomeAssistantView
 from homeassistant.const import (HTTP_INTERNAL_SERVER_ERROR,
                                  HTTP_BAD_REQUEST)
 from homeassistant.core import callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers import discovery
+from homeassistant.helpers import (
+    config_validation as cv, discovery, config_entry_flow)
 from homeassistant.util.json import load_json, save_json
 
 
@@ -164,62 +165,70 @@ IDENTIFY_SCHEMA = vol.Schema({
 
 CONFIGURATION_FILE = '.ios.conf'
 
-CONFIG_FILE = {ATTR_DEVICES: {}}
 
-CONFIG_FILE_PATH = ""
-
-
-def devices_with_push():
+def devices_with_push(hass):
     """Return a dictionary of push enabled targets."""
     targets = {}
-    for device_name, device in CONFIG_FILE[ATTR_DEVICES].items():
+    for device_name, device in hass.data[DOMAIN][ATTR_DEVICES].items():
         if device.get(ATTR_PUSH_ID) is not None:
             targets[device_name] = device.get(ATTR_PUSH_ID)
     return targets
 
 
-def enabled_push_ids():
+def enabled_push_ids(hass):
     """Return a list of push enabled target push IDs."""
     push_ids = list()
-    for device in CONFIG_FILE[ATTR_DEVICES].values():
+    for device in hass.data[DOMAIN][ATTR_DEVICES].values():
         if device.get(ATTR_PUSH_ID) is not None:
             push_ids.append(device.get(ATTR_PUSH_ID))
     return push_ids
 
 
-def devices():
+def devices(hass):
     """Return a dictionary of all identified devices."""
-    return CONFIG_FILE[ATTR_DEVICES]
+    return hass.data[DOMAIN][ATTR_DEVICES]
 
 
-def device_name_for_push_id(push_id):
+def device_name_for_push_id(hass, push_id):
     """Return the device name for the push ID."""
-    for device_name, device in CONFIG_FILE[ATTR_DEVICES].items():
+    for device_name, device in hass.data[DOMAIN][ATTR_DEVICES].items():
         if device.get(ATTR_PUSH_ID) is push_id:
             return device_name
     return None
 
 
-def setup(hass, config):
+async def async_setup(hass, config):
     """Set up the iOS component."""
-    global CONFIG_FILE
-    global CONFIG_FILE_PATH
+    conf = config.get(DOMAIN)
 
-    CONFIG_FILE_PATH = hass.config.path(CONFIGURATION_FILE)
+    ios_config = await hass.async_add_executor_job(
+        load_json, hass.config.path(CONFIGURATION_FILE))
 
-    CONFIG_FILE = load_json(CONFIG_FILE_PATH)
+    if ios_config == {}:
+        ios_config[ATTR_DEVICES] = {}
 
-    if CONFIG_FILE == {}:
-        CONFIG_FILE[ATTR_DEVICES] = {}
+    ios_config[CONF_PUSH] = (conf or {}).get(CONF_PUSH, {})
 
+    hass.data[DOMAIN] = ios_config
+
+    # No entry support for notify component yet
     discovery.load_platform(hass, 'notify', DOMAIN, {}, config)
 
-    discovery.load_platform(hass, 'sensor', DOMAIN, {}, config)
+    if conf is not None:
+        hass.async_create_task(hass.config_entries.flow.async_init(
+            DOMAIN, context={'source': config_entries.SOURCE_IMPORT}))
 
-    hass.http.register_view(iOSIdentifyDeviceView)
+    return True
 
-    app_config = config.get(DOMAIN, {})
-    hass.http.register_view(iOSPushConfigView(app_config.get(CONF_PUSH, {})))
+
+async def async_setup_entry(hass, entry):
+    """Set up an iOS entry."""
+    hass.async_create_task(
+        hass.config_entries.async_forward_entry_setup(entry, 'sensor'))
+
+    hass.http.register_view(
+        iOSIdentifyDeviceView(hass.config.path(CONFIGURATION_FILE)))
+    hass.http.register_view(iOSPushConfigView(hass.data[DOMAIN][CONF_PUSH]))
 
     return True
 
@@ -247,6 +256,10 @@ class iOSIdentifyDeviceView(HomeAssistantView):
     url = '/api/ios/identify'
     name = 'api:ios:identify'
 
+    def __init__(self, config_path):
+        """Initiliaze the view."""
+        self._config_path = config_path
+
     @asyncio.coroutine
     def post(self, request):
         """Handle the POST request for device identification."""
@@ -255,6 +268,8 @@ class iOSIdentifyDeviceView(HomeAssistantView):
         except ValueError:
             return self.json_message("Invalid JSON", HTTP_BAD_REQUEST)
 
+        hass = request.app['hass']
+
         # Commented for now while iOS app is getting frequent updates
         # try:
         #     data = IDENTIFY_SCHEMA(req_data)
@@ -266,12 +281,16 @@ class iOSIdentifyDeviceView(HomeAssistantView):
 
         name = data.get(ATTR_DEVICE_ID)
 
-        CONFIG_FILE[ATTR_DEVICES][name] = data
+        hass.data[DOMAIN][ATTR_DEVICES][name] = data
 
         try:
-            save_json(CONFIG_FILE_PATH, CONFIG_FILE)
+            save_json(self._config_path, hass.data[DOMAIN])
         except HomeAssistantError:
             return self.json_message("Error saving device.",
                                      HTTP_INTERNAL_SERVER_ERROR)
 
         return self.json({"status": "registered"})
+
+
+config_entry_flow.register_discovery_flow(
+    DOMAIN, 'Home Assistant iOS', lambda *_: True)
diff --git a/homeassistant/components/ios/strings.json b/homeassistant/components/ios/strings.json
new file mode 100644
index 00000000000..cbb63cf8229
--- /dev/null
+++ b/homeassistant/components/ios/strings.json
@@ -0,0 +1,14 @@
+{
+  "config": {
+    "title": "Home Assistant iOS",
+    "step": {
+      "confirm": {
+        "title": "Home Assistant iOS",
+        "description": "Do you want to set up the Home Assistant iOS component?"
+      }
+    },
+    "abort": {
+      "single_instance_allowed": "Only a single configuration of Home Assistant iOS is necessary."
+    }
+  }
+}
diff --git a/homeassistant/components/notify/ios.py b/homeassistant/components/notify/ios.py
index 8609e1dabee..e6a37d707ad 100644
--- a/homeassistant/components/notify/ios.py
+++ b/homeassistant/components/notify/ios.py
@@ -24,7 +24,7 @@ DEPENDENCIES = ["ios"]
 
 
 # pylint: disable=invalid-name
-def log_rate_limits(target, resp, level=20):
+def log_rate_limits(hass, target, resp, level=20):
     """Output rate limit log line at given level."""
     rate_limits = resp["rateLimits"]
     resetsAt = dt_util.parse_datetime(rate_limits["resetsAt"])
@@ -33,7 +33,7 @@ def log_rate_limits(target, resp, level=20):
                       "%d sent, %d allowed, %d errors, "
                       "resets in %s")
     _LOGGER.log(level, rate_limit_msg,
-                ios.device_name_for_push_id(target),
+                ios.device_name_for_push_id(hass, target),
                 rate_limits["successful"],
                 rate_limits["maximum"], rate_limits["errors"],
                 str(resetsAtTime).split(".")[0])
@@ -45,7 +45,7 @@ def get_service(hass, config, discovery_info=None):
         # Need this to enable requirements checking in the app.
         hass.config.components.add("notify.ios")
 
-    if not ios.devices_with_push():
+    if not ios.devices_with_push(hass):
         _LOGGER.error("The notify.ios platform was loaded but no "
                       "devices exist! Please check the documentation at "
                       "https://home-assistant.io/ecosystem/ios/notifications"
@@ -64,7 +64,7 @@ class iOSNotificationService(BaseNotificationService):
     @property
     def targets(self):
         """Return a dictionary of registered targets."""
-        return ios.devices_with_push()
+        return ios.devices_with_push(self.hass)
 
     def send_message(self, message="", **kwargs):
         """Send a message to the Lambda APNS gateway."""
@@ -78,13 +78,13 @@ class iOSNotificationService(BaseNotificationService):
         targets = kwargs.get(ATTR_TARGET)
 
         if not targets:
-            targets = ios.enabled_push_ids()
+            targets = ios.enabled_push_ids(self.hass)
 
         if kwargs.get(ATTR_DATA) is not None:
             data[ATTR_DATA] = kwargs.get(ATTR_DATA)
 
         for target in targets:
-            if target not in ios.enabled_push_ids():
+            if target not in ios.enabled_push_ids(self.hass):
                 _LOGGER.error("The target (%s) does not exist in .ios.conf.",
                               targets)
                 return
@@ -102,8 +102,8 @@ class iOSNotificationService(BaseNotificationService):
                 message = req.json().get("message", fallback_message)
                 if req.status_code == 429:
                     _LOGGER.warning(message)
-                    log_rate_limits(target, req.json(), 30)
+                    log_rate_limits(self.hass, target, req.json(), 30)
                 else:
                     _LOGGER.error(message)
             else:
-                log_rate_limits(target, req.json())
+                log_rate_limits(self.hass, target, req.json())
diff --git a/homeassistant/components/sensor/ios.py b/homeassistant/components/sensor/ios.py
index f775381c4ec..a50d1161676 100644
--- a/homeassistant/components/sensor/ios.py
+++ b/homeassistant/components/sensor/ios.py
@@ -21,14 +21,17 @@ DEFAULT_ICON_STATE = 'mdi:power-plug'
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the iOS sensor."""
-    if discovery_info is None:
-        return
+    # Leave here for if someone accidentally adds platform: ios to config
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up iOS from a config entry."""
     dev = list()
-    for device_name, device in ios.devices().items():
+    for device_name, device in ios.devices(hass).items():
         for sensor_type in ('level', 'state'):
             dev.append(IOSSensor(sensor_type, device_name, device))
 
-    add_entities(dev, True)
+    async_add_entities(dev, True)
 
 
 class IOSSensor(Entity):
@@ -102,5 +105,5 @@ class IOSSensor(Entity):
 
     def update(self):
         """Get the latest state of the sensor."""
-        self._device = ios.devices().get(self._device_name)
+        self._device = ios.devices(self.hass).get(self._device_name)
         self._state = self._device[ios.ATTR_BATTERY][self.type]
diff --git a/homeassistant/config_entries.py b/homeassistant/config_entries.py
index 15932f2c3f8..b06d6e7df55 100644
--- a/homeassistant/config_entries.py
+++ b/homeassistant/config_entries.py
@@ -140,6 +140,7 @@ FLOWS = [
     'deconz',
     'homematicip_cloud',
     'hue',
+    'ios',
     'nest',
     'openuv',
     'sonos',
diff --git a/tests/components/ios/__init__.py b/tests/components/ios/__init__.py
new file mode 100644
index 00000000000..a028090473e
--- /dev/null
+++ b/tests/components/ios/__init__.py
@@ -0,0 +1 @@
+"""Tests for the iOS component."""
diff --git a/tests/components/ios/test_init.py b/tests/components/ios/test_init.py
new file mode 100644
index 00000000000..9a45fac3ce1
--- /dev/null
+++ b/tests/components/ios/test_init.py
@@ -0,0 +1,61 @@
+"""Tests for the iOS init file."""
+from unittest.mock import patch
+
+import pytest
+
+from homeassistant import config_entries, data_entry_flow
+from homeassistant.setup import async_setup_component
+from homeassistant.components import ios
+
+from tests.common import mock_component, mock_coro
+
+
+@pytest.fixture(autouse=True)
+def mock_load_json():
+    """Mock load_json."""
+    with patch('homeassistant.components.ios.load_json', return_value={}):
+        yield
+
+
+@pytest.fixture(autouse=True)
+def mock_dependencies(hass):
+    """Mock dependencies loaded."""
+    mock_component(hass, 'zeroconf')
+    mock_component(hass, 'device_tracker')
+
+
+async def test_creating_entry_sets_up_sensor(hass):
+    """Test setting up iOS loads the sensor component."""
+    with patch('homeassistant.components.sensor.ios.async_setup_entry',
+               return_value=mock_coro(True)) as mock_setup:
+        result = await hass.config_entries.flow.async_init(
+            ios.DOMAIN, context={'source': config_entries.SOURCE_USER})
+        assert result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+
+        await hass.async_block_till_done()
+
+    assert len(mock_setup.mock_calls) == 1
+
+
+async def test_configuring_ios_creates_entry(hass):
+    """Test that specifying config will create an entry."""
+    with patch('homeassistant.components.ios.async_setup_entry',
+               return_value=mock_coro(True)) as mock_setup:
+        await async_setup_component(hass, ios.DOMAIN, {
+            'ios': {
+                'push': {}
+            }
+        })
+        await hass.async_block_till_done()
+
+    assert len(mock_setup.mock_calls) == 1
+
+
+async def test_not_configuring_ios_not_creates_entry(hass):
+    """Test that no config will not create an entry."""
+    with patch('homeassistant.components.ios.async_setup_entry',
+               return_value=mock_coro(True)) as mock_setup:
+        await async_setup_component(hass, ios.DOMAIN, {})
+        await hass.async_block_till_done()
+
+    assert len(mock_setup.mock_calls) == 0

From cb542a90ebd766d5de5badb27e974498707cd2e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=B8yer=20Iversen?= <mail@dahoiv.net>
Date: Wed, 12 Sep 2018 21:10:04 +0200
Subject: [PATCH 129/357] Switchmate (#16395)

* Switchmate

* switchmate

* swithcmate

* switchmate

* switchmate

* switchmate

* Make switchmate a bit more robust

* style

* style

* style

* Use external lib for switchmate

* add_entities

* Update requirements_all.txt

* unnecessary string format
---
 homeassistant/components/switch/switchmate.py | 27 ++++++-------------
 requirements_all.txt                          |  4 ++-
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/homeassistant/components/switch/switchmate.py b/homeassistant/components/switch/switchmate.py
index 7ccd3bee4b6..fddb878b0ba 100644
--- a/homeassistant/components/switch/switchmate.py
+++ b/homeassistant/components/switch/switchmate.py
@@ -12,16 +12,12 @@ import voluptuous as vol
 import homeassistant.helpers.config_validation as cv
 from homeassistant.components.switch import SwitchDevice, PLATFORM_SCHEMA
 from homeassistant.const import CONF_NAME, CONF_MAC
-from homeassistant.exceptions import PlatformNotReady
 
-REQUIREMENTS = ['bluepy==1.1.4']
+REQUIREMENTS = ['pySwitchmate==0.3']
 
 _LOGGER = logging.getLogger(__name__)
 
 DEFAULT_NAME = 'Switchmate'
-HANDLE = 0x2e
-ON_KEY = b'\x00'
-OFF_KEY = b'\x01'
 
 SCAN_INTERVAL = timedelta(minutes=30)
 
@@ -34,7 +30,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 def setup_platform(hass, config, add_entities, discovery_info=None) -> None:
     """Perform the setup for Switchmate devices."""
     name = config.get(CONF_NAME)
-    mac_addr = config.get(CONF_MAC)
+    mac_addr = config[CONF_MAC]
     add_entities([Switchmate(mac_addr, name)], True)
 
 
@@ -43,17 +39,10 @@ class Switchmate(SwitchDevice):
 
     def __init__(self, mac, name) -> None:
         """Initialize the Switchmate."""
-        # pylint: disable=import-error
-        import bluepy
-        self._state = False
+        import switchmate
         self._name = name
         self._mac = mac
-        try:
-            self._device = bluepy.btle.Peripheral(self._mac,
-                                                  bluepy.btle.ADDR_TYPE_RANDOM)
-        except bluepy.btle.BTLEException:
-            _LOGGER.error("Failed to set up switchmate")
-            raise PlatformNotReady()
+        self._device = switchmate.Switchmate(mac=mac)
 
     @property
     def unique_id(self) -> str:
@@ -67,17 +56,17 @@ class Switchmate(SwitchDevice):
 
     def update(self) -> None:
         """Synchronize state with switch."""
-        self._state = self._device.readCharacteristic(HANDLE) == ON_KEY
+        self._device.update()
 
     @property
     def is_on(self) -> bool:
         """Return true if it is on."""
-        return self._state
+        return self._device.state
 
     def turn_on(self, **kwargs) -> None:
         """Turn the switch on."""
-        self._device.writeCharacteristic(HANDLE, ON_KEY, True)
+        self._device.turn_on()
 
     def turn_off(self, **kwargs) -> None:
         """Turn the switch off."""
-        self._device.writeCharacteristic(HANDLE, OFF_KEY, True)
+        self._device.turn_off()
diff --git a/requirements_all.txt b/requirements_all.txt
index dfea5da4145..db753e959e8 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -190,7 +190,6 @@ blinkstick==1.1.8
 blockchain==1.4.4
 
 # homeassistant.components.light.decora
-# homeassistant.components.switch.switchmate
 # bluepy==1.1.4
 
 # homeassistant.components.sensor.bme680
@@ -749,6 +748,9 @@ pyHS100==0.3.3
 # homeassistant.components.rfxtrx
 pyRFXtrx==0.23
 
+# homeassistant.components.switch.switchmate
+pySwitchmate==0.3
+
 # homeassistant.components.sensor.tibber
 pyTibber==0.4.1
 

From d0aeb90c22b251b8dbb0c5b7ff92a4d10e9ed841 Mon Sep 17 00:00:00 2001
From: Daniel Perna <danielperna84@gmail.com>
Date: Thu, 13 Sep 2018 01:04:15 +0200
Subject: [PATCH 130/357] Update pyhomematic to 0.1.48 (#16588)

---
 homeassistant/components/homematic/__init__.py | 7 ++++---
 requirements_all.txt                           | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/homeassistant/components/homematic/__init__.py b/homeassistant/components/homematic/__init__.py
index 2b517652ad7..b9e4294f6e1 100644
--- a/homeassistant/components/homematic/__init__.py
+++ b/homeassistant/components/homematic/__init__.py
@@ -20,7 +20,7 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 from homeassistant.loader import bind_hass
 
-REQUIREMENTS = ['pyhomematic==0.1.47']
+REQUIREMENTS = ['pyhomematic==0.1.48']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -77,7 +77,8 @@ HM_DEVICE_TYPES = {
         'FillingLevel', 'ValveDrive', 'EcoLogic', 'IPThermostatWall',
         'IPSmoke', 'RFSiren', 'PresenceIP', 'IPAreaThermostat',
         'IPWeatherSensor', 'RotaryHandleSensorIP', 'IPPassageSensor',
-        'IPKeySwitchPowermeter', 'IPThermostatWall230V'],
+        'IPKeySwitchPowermeter', 'IPThermostatWall230V', 'IPWeatherSensorPlus',
+        'IPWeatherSensorBasic'],
     DISCOVER_CLIMATE: [
         'Thermostat', 'ThermostatWall', 'MAXThermostat', 'ThermostatWall2',
         'MAXWallThermostat', 'IPThermostat', 'IPThermostatWall',
@@ -87,7 +88,7 @@ HM_DEVICE_TYPES = {
         'MotionIP', 'RemoteMotion', 'WeatherSensor', 'TiltSensor',
         'IPShutterContact', 'HMWIOSwitch', 'MaxShutterContact', 'Rain',
         'WiredSensor', 'PresenceIP', 'IPWeatherSensor', 'IPPassageSensor',
-        'SmartwareMotion'],
+        'SmartwareMotion', 'IPWeatherSensorPlus'],
     DISCOVER_COVER: ['Blind', 'KeyBlind', 'IPKeyBlind', 'IPKeyBlindTilt'],
     DISCOVER_LOCKS: ['KeyMatic']
 }
diff --git a/requirements_all.txt b/requirements_all.txt
index db753e959e8..8bf267ae83c 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -895,7 +895,7 @@ pyhik==0.1.8
 pyhiveapi==0.2.14
 
 # homeassistant.components.homematic
-pyhomematic==0.1.47
+pyhomematic==0.1.48
 
 # homeassistant.components.sensor.hydroquebec
 pyhydroquebec==2.2.2

From 1586d3000c9bd378a8372d919ded05745f11425f Mon Sep 17 00:00:00 2001
From: Jason Hu <awarecan@users.noreply.github.com>
Date: Wed, 12 Sep 2018 22:52:31 -0700
Subject: [PATCH 131/357] Fix broken bluetooth tracker (#16589)

---
 homeassistant/components/device_tracker/bluetooth_tracker.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/device_tracker/bluetooth_tracker.py b/homeassistant/components/device_tracker/bluetooth_tracker.py
index 217df0aacd4..d22a1ba7c1f 100644
--- a/homeassistant/components/device_tracker/bluetooth_tracker.py
+++ b/homeassistant/components/device_tracker/bluetooth_tracker.py
@@ -80,7 +80,7 @@ def setup_scanner(hass, config, see, discovery_info=None):
 
     request_rssi = config.get(CONF_REQUEST_RSSI, False)
 
-    def update_bluetooth():
+    def update_bluetooth(_):
         """Update Bluetooth and set timer for the next update."""
         update_bluetooth_once()
         track_point_in_utc_time(
@@ -111,7 +111,7 @@ def setup_scanner(hass, config, see, discovery_info=None):
         """Update bluetooth devices on demand."""
         update_bluetooth_once()
 
-    update_bluetooth()
+    update_bluetooth(dt_util.utcnow())
 
     hass.services.register(
         DOMAIN, "bluetooth_tracker_update", handle_update_bluetooth)

From f2203e52efd03ab957ad6488ba97364b45d4dca1 Mon Sep 17 00:00:00 2001
From: Alexei Chetroi <lexoid@gmail.com>
Date: Thu, 13 Sep 2018 03:11:47 -0400
Subject: [PATCH 132/357] Add configure_reporting() method to zha component
 (#16487)

* Add zha.configure_reporting() method.

Binds a cluster and configures reporting for the specified attribute.

* git add homeassistant/components/binary_sensor/zha.py

* Refactor sensor.zha to use new 'configure_reporting() method.

* Zha configure reporting - switch (#1)

* use configure_reporting for zha switch

* lint fixes

* Rename variables/classes to properly reflect the content
---
 homeassistant/components/binary_sensor/zha.py | 27 ++++++-------
 homeassistant/components/sensor/zha.py        |  6 +--
 homeassistant/components/switch/zha.py        | 18 ++++++---
 homeassistant/components/zha/__init__.py      | 39 +++++++++++++++++++
 4 files changed, 66 insertions(+), 24 deletions(-)

diff --git a/homeassistant/components/binary_sensor/zha.py b/homeassistant/components/binary_sensor/zha.py
index cabbbd704a0..0842ab7db6e 100644
--- a/homeassistant/components/binary_sensor/zha.py
+++ b/homeassistant/components/binary_sensor/zha.py
@@ -65,28 +65,25 @@ async def _async_setup_iaszone(hass, config, async_add_entities,
 async def _async_setup_remote(hass, config, async_add_entities,
                               discovery_info):
 
-    async def safe(coro):
-        """Run coro, catching ZigBee delivery errors, and ignoring them."""
-        import zigpy.exceptions
-        try:
-            await coro
-        except zigpy.exceptions.DeliveryError as exc:
-            _LOGGER.warning("Ignoring error during setup: %s", exc)
+    remote = Remote(**discovery_info)
 
     if discovery_info['new_join']:
         from zigpy.zcl.clusters.general import OnOff, LevelControl
         out_clusters = discovery_info['out_clusters']
         if OnOff.cluster_id in out_clusters:
             cluster = out_clusters[OnOff.cluster_id]
-            await safe(cluster.bind())
-            await safe(cluster.configure_reporting(0, 0, 600, 1))
+            await zha.configure_reporting(
+                remote.entity_id, cluster, 0, min_report=0, max_report=600,
+                reportable_change=1
+            )
         if LevelControl.cluster_id in out_clusters:
             cluster = out_clusters[LevelControl.cluster_id]
-            await safe(cluster.bind())
-            await safe(cluster.configure_reporting(0, 1, 600, 1))
+            await zha.configure_reporting(
+                remote.entity_id, cluster, 0, min_report=1, max_report=600,
+                reportable_change=1
+            )
 
-    sensor = Switch(**discovery_info)
-    async_add_entities([sensor], update_before_add=True)
+    async_add_entities([remote], update_before_add=True)
 
 
 class BinarySensor(zha.Entity, BinarySensorDevice):
@@ -131,7 +128,7 @@ class BinarySensor(zha.Entity, BinarySensorDevice):
 
     async def async_update(self):
         """Retrieve latest state."""
-        from bellows.types.basic import uint16_t
+        from zigpy.types.basic import uint16_t
 
         result = await zha.safe_read(self._endpoint.ias_zone,
                                      ['zone_status'],
@@ -141,7 +138,7 @@ class BinarySensor(zha.Entity, BinarySensorDevice):
             self._state = result.get('zone_status', self._state) & 3
 
 
-class Switch(zha.Entity, BinarySensorDevice):
+class Remote(zha.Entity, BinarySensorDevice):
     """ZHA switch/remote controller/button."""
 
     _domain = DOMAIN
diff --git a/homeassistant/components/sensor/zha.py b/homeassistant/components/sensor/zha.py
index 6202f8cb7ef..0a6710f8f6c 100644
--- a/homeassistant/components/sensor/zha.py
+++ b/homeassistant/components/sensor/zha.py
@@ -57,9 +57,9 @@ def make_sensor(discovery_info):
 
     if discovery_info['new_join']:
         cluster = list(in_clusters.values())[0]
-        yield from cluster.bind()
-        yield from cluster.configure_reporting(
-            sensor.value_attribute, 300, 600, sensor.min_reportable_change,
+        yield from zha.configure_reporting(
+            sensor.entity_id, cluster, sensor.value_attribute,
+            reportable_change=sensor.min_reportable_change
         )
 
     return sensor
diff --git a/homeassistant/components/switch/zha.py b/homeassistant/components/switch/zha.py
index 9f780b631b6..7ac93180cd7 100644
--- a/homeassistant/components/switch/zha.py
+++ b/homeassistant/components/switch/zha.py
@@ -17,17 +17,23 @@ DEPENDENCIES = ['zha']
 async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the Zigbee Home Automation switches."""
+    from zigpy.zcl.clusters.general import OnOff
+
     discovery_info = zha.get_discovery_info(hass, discovery_info)
     if discovery_info is None:
         return
 
-    from zigpy.zcl.clusters.general import OnOff
-    in_clusters = discovery_info['in_clusters']
-    cluster = in_clusters[OnOff.cluster_id]
-    await cluster.bind()
-    await cluster.configure_reporting(0, 0, 600, 1,)
+    switch = Switch(**discovery_info)
 
-    async_add_entities([Switch(**discovery_info)], update_before_add=True)
+    if discovery_info['new_join']:
+        in_clusters = discovery_info['in_clusters']
+        cluster = in_clusters[OnOff.cluster_id]
+        await zha.configure_reporting(
+            switch.entity_id, cluster, switch.value_attribute,
+            min_report=0, max_report=600, reportable_change=1
+        )
+
+    async_add_entities([switch], update_before_add=True)
 
 
 class Switch(zha.Entity, SwitchDevice):
diff --git a/homeassistant/components/zha/__init__.py b/homeassistant/components/zha/__init__.py
index 48c2ad20be0..4c1109f685d 100644
--- a/homeassistant/components/zha/__init__.py
+++ b/homeassistant/components/zha/__init__.py
@@ -399,3 +399,42 @@ async def safe_read(cluster, attributes, allow_cache=True):
         return result
     except Exception:  # pylint: disable=broad-except
         return {}
+
+
+async def configure_reporting(entity_id, cluster, attr, skip_bind=False,
+                              min_report=300, max_report=900,
+                              reportable_change=1):
+    """Configure attribute reporting for a cluster.
+
+    while swallowing the DeliverError exceptions in case of unreachable
+    devices.
+    """
+    from zigpy.exceptions import DeliveryError
+
+    attr_name = cluster.attributes.get(attr, [attr])[0]
+    cluster_name = cluster.ep_attribute
+    if not skip_bind:
+        try:
+            res = await cluster.bind()
+            _LOGGER.debug(
+                "%s: bound  '%s' cluster: %s", entity_id, cluster_name, res[0]
+            )
+        except DeliveryError as ex:
+            _LOGGER.debug(
+                "%s: Failed to bind '%s' cluster: %s",
+                entity_id, cluster_name, str(ex)
+            )
+
+    try:
+        res = await cluster.configure_reporting(attr, min_report,
+                                                max_report, reportable_change)
+        _LOGGER.debug(
+            "%s: reporting '%s' attr on '%s' cluster: %d/%d/%d: Status: %s",
+            entity_id, attr_name, cluster_name, min_report, max_report,
+            reportable_change, res[0][0].status
+        )
+    except DeliveryError as ex:
+        _LOGGER.debug(
+            "%s: failed to set reporting for '%s' attr on '%s' cluster: %s",
+            entity_id, attr_name, cluster_name, str(ex)
+        )

From 7a52bbdf241ce5f79f49633a17b8bb404abd9f13 Mon Sep 17 00:00:00 2001
From: Alexei Chetroi <lexoid@gmail.com>
Date: Thu, 13 Sep 2018 03:22:50 -0400
Subject: [PATCH 133/357] Allow only_cache parameter in zha.safe_read()
 (#16553)

* Allow only_cache parameter in zha.safe_read()

* Use cache_only for binary_sensor.zha initial update.

* Use cache_only for fan.zha initial update.

* Use cache_only for sensor.zha initial update.

* Use cache_only for switch.zha initial update.

* Use cache_only for light.zha initial update.

* Refactor cached only read in zha platform.
---
 homeassistant/components/binary_sensor/zha.py |  3 ++-
 homeassistant/components/fan/zha.py           |  4 +++-
 homeassistant/components/light/zha.py         | 16 ++++++++++++----
 homeassistant/components/sensor/zha.py        |  9 +++++----
 homeassistant/components/switch/zha.py        |  4 +++-
 homeassistant/components/zha/__init__.py      |  6 +++++-
 6 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/homeassistant/components/binary_sensor/zha.py b/homeassistant/components/binary_sensor/zha.py
index 0842ab7db6e..aa07a673c97 100644
--- a/homeassistant/components/binary_sensor/zha.py
+++ b/homeassistant/components/binary_sensor/zha.py
@@ -132,7 +132,8 @@ class BinarySensor(zha.Entity, BinarySensorDevice):
 
         result = await zha.safe_read(self._endpoint.ias_zone,
                                      ['zone_status'],
-                                     allow_cache=False)
+                                     allow_cache=False,
+                                     only_cache=(not self._initialized))
         state = result.get('zone_status', self._state)
         if isinstance(state, (int, uint16_t)):
             self._state = result.get('zone_status', self._state) & 3
diff --git a/homeassistant/components/fan/zha.py b/homeassistant/components/fan/zha.py
index d86e0c3c99b..b5615f18d73 100644
--- a/homeassistant/components/fan/zha.py
+++ b/homeassistant/components/fan/zha.py
@@ -101,7 +101,9 @@ class ZhaFan(zha.Entity, FanEntity):
 
     async def async_update(self):
         """Retrieve latest state."""
-        result = await zha.safe_read(self._endpoint.fan, ['fan_mode'])
+        result = await zha.safe_read(self._endpoint.fan, ['fan_mode'],
+                                     allow_cache=False,
+                                     only_cache=(not self._initialized))
         new_value = result.get('fan_mode', None)
         self._state = VALUE_TO_SPEED.get(new_value, None)
 
diff --git a/homeassistant/components/light/zha.py b/homeassistant/components/light/zha.py
index dc5c4977944..dd675ee674d 100644
--- a/homeassistant/components/light/zha.py
+++ b/homeassistant/components/light/zha.py
@@ -154,23 +154,31 @@ class Light(zha.Entity, light.Light):
 
     async def async_update(self):
         """Retrieve latest state."""
-        result = await zha.safe_read(self._endpoint.on_off, ['on_off'])
+        result = await zha.safe_read(self._endpoint.on_off, ['on_off'],
+                                     allow_cache=False,
+                                     only_cache=(not self._initialized))
         self._state = result.get('on_off', self._state)
 
         if self._supported_features & light.SUPPORT_BRIGHTNESS:
             result = await zha.safe_read(self._endpoint.level,
-                                         ['current_level'])
+                                         ['current_level'],
+                                         allow_cache=False,
+                                         only_cache=(not self._initialized))
             self._brightness = result.get('current_level', self._brightness)
 
         if self._supported_features & light.SUPPORT_COLOR_TEMP:
             result = await zha.safe_read(self._endpoint.light_color,
-                                         ['color_temperature'])
+                                         ['color_temperature'],
+                                         allow_cache=False,
+                                         only_cache=(not self._initialized))
             self._color_temp = result.get('color_temperature',
                                           self._color_temp)
 
         if self._supported_features & light.SUPPORT_COLOR:
             result = await zha.safe_read(self._endpoint.light_color,
-                                         ['current_x', 'current_y'])
+                                         ['current_x', 'current_y'],
+                                         allow_cache=False,
+                                         only_cache=(not self._initialized))
             if 'current_x' in result and 'current_y' in result:
                 xy_color = (round(result['current_x']/65535, 3),
                             round(result['current_y']/65535, 3))
diff --git a/homeassistant/components/sensor/zha.py b/homeassistant/components/sensor/zha.py
index 0a6710f8f6c..9962270dfd7 100644
--- a/homeassistant/components/sensor/zha.py
+++ b/homeassistant/components/sensor/zha.py
@@ -95,7 +95,9 @@ class Sensor(zha.Entity):
         """Retrieve latest state."""
         result = await zha.safe_read(
             list(self._in_clusters.values())[0],
-            [self.value_attribute]
+            [self.value_attribute],
+            allow_cache=False,
+            only_cache=(not self._initialized)
         )
         self._state = result.get(self.value_attribute, self._state)
 
@@ -224,7 +226,6 @@ class ElectricalMeasurementSensor(Sensor):
         _LOGGER.debug("%s async_update", self.entity_id)
 
         result = await zha.safe_read(
-            self._endpoint.electrical_measurement,
-            ['active_power'],
-            allow_cache=False)
+            self._endpoint.electrical_measurement, ['active_power'],
+            allow_cache=False, only_cache=(not self._initialized))
         self._state = result.get('active_power', self._state)
diff --git a/homeassistant/components/switch/zha.py b/homeassistant/components/switch/zha.py
index 7ac93180cd7..4fde3565348 100644
--- a/homeassistant/components/switch/zha.py
+++ b/homeassistant/components/switch/zha.py
@@ -86,5 +86,7 @@ class Switch(zha.Entity, SwitchDevice):
     async def async_update(self):
         """Retrieve latest state."""
         result = await zha.safe_read(self._endpoint.on_off,
-                                     ['on_off'])
+                                     ['on_off'],
+                                     allow_cache=False,
+                                     only_cache=(not self._initialized))
         self._state = result.get('on_off', self._state)
diff --git a/homeassistant/components/zha/__init__.py b/homeassistant/components/zha/__init__.py
index 4c1109f685d..f6b5868ff81 100644
--- a/homeassistant/components/zha/__init__.py
+++ b/homeassistant/components/zha/__init__.py
@@ -336,6 +336,7 @@ class Entity(entity.Entity):
         self._in_listeners = {}
         self._out_listeners = {}
 
+        self._initialized = False
         application_listener.register_entity(ieee, self)
 
     async def async_added_to_hass(self):
@@ -348,6 +349,8 @@ class Entity(entity.Entity):
         for cluster_id, cluster in self._out_clusters.items():
             cluster.add_listener(self._out_listeners.get(cluster_id, self))
 
+        self._initialized = True
+
     @property
     def unique_id(self) -> str:
         """Return a unique ID."""
@@ -384,7 +387,7 @@ def get_discovery_info(hass, discovery_info):
     return all_discovery_info.get(discovery_key, None)
 
 
-async def safe_read(cluster, attributes, allow_cache=True):
+async def safe_read(cluster, attributes, allow_cache=True, only_cache=False):
     """Swallow all exceptions from network read.
 
     If we throw during initialization, setup fails. Rather have an entity that
@@ -395,6 +398,7 @@ async def safe_read(cluster, attributes, allow_cache=True):
         result, _ = await cluster.read_attributes(
             attributes,
             allow_cache=allow_cache,
+            only_cache=only_cache
         )
         return result
     except Exception:  # pylint: disable=broad-except

From 901dd9acca50daec63ef97138823eaed35514a6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=B8yer=20Iversen?= <mail@dahoiv.net>
Date: Thu, 13 Sep 2018 09:23:33 +0200
Subject: [PATCH 134/357] Update tibber lib version (#16590)

---
 homeassistant/components/sensor/tibber.py | 2 +-
 requirements_all.txt                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/sensor/tibber.py b/homeassistant/components/sensor/tibber.py
index ebc38fcb739..2dee84982da 100644
--- a/homeassistant/components/sensor/tibber.py
+++ b/homeassistant/components/sensor/tibber.py
@@ -21,7 +21,7 @@ from homeassistant.helpers.entity import Entity
 from homeassistant.util import dt as dt_util
 from homeassistant.util import Throttle
 
-REQUIREMENTS = ['pyTibber==0.4.1']
+REQUIREMENTS = ['pyTibber==0.5.0']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/requirements_all.txt b/requirements_all.txt
index 8bf267ae83c..1f708b9d1a8 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -752,7 +752,7 @@ pyRFXtrx==0.23
 pySwitchmate==0.3
 
 # homeassistant.components.sensor.tibber
-pyTibber==0.4.1
+pyTibber==0.5.0
 
 # homeassistant.components.switch.dlink
 pyW215==0.6.0

From aec134c47abde714c41ce221d1de2b23fb0ba69b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=B8yer=20Iversen?= <mail@dahoiv.net>
Date: Thu, 13 Sep 2018 09:26:46 +0200
Subject: [PATCH 135/357] xiaomi lib 0.10.0 (#16591)

---
 homeassistant/components/xiaomi_aqara.py | 2 +-
 requirements_all.txt                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/xiaomi_aqara.py b/homeassistant/components/xiaomi_aqara.py
index 2090f522709..f2d51d2fc2e 100644
--- a/homeassistant/components/xiaomi_aqara.py
+++ b/homeassistant/components/xiaomi_aqara.py
@@ -23,7 +23,7 @@ from homeassistant.helpers.event import async_track_point_in_utc_time
 from homeassistant.util.dt import utcnow
 from homeassistant.util import slugify
 
-REQUIREMENTS = ['PyXiaomiGateway==0.9.5']
+REQUIREMENTS = ['PyXiaomiGateway==0.10.0']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/requirements_all.txt b/requirements_all.txt
index 1f708b9d1a8..933245e02e8 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -58,7 +58,7 @@ PyRMVtransport==0.1
 PySwitchbot==0.3
 
 # homeassistant.components.xiaomi_aqara
-PyXiaomiGateway==0.9.5
+PyXiaomiGateway==0.10.0
 
 # homeassistant.components.rpi_gpio
 # RPi.GPIO==0.6.1

From f43d9ba6805b0b11f078dd255b13699a3d793a00 Mon Sep 17 00:00:00 2001
From: William Scanlon <william.joseph.scanlon@gmail.com>
Date: Thu, 13 Sep 2018 03:35:40 -0400
Subject: [PATCH 136/357] Support for the Quirky Nimbus (#16520)

* Support for quriky nimbu

* Fixed lint

* fixed some typos
---
 homeassistant/components/climate/wink.py    |  10 +-
 homeassistant/components/wink/__init__.py   | 163 ++++++++++++++++++--
 homeassistant/components/wink/services.yaml |  41 +++++
 requirements_all.txt                        |   2 +-
 4 files changed, 199 insertions(+), 17 deletions(-)

diff --git a/homeassistant/components/climate/wink.py b/homeassistant/components/climate/wink.py
index d8e6843bec8..3013a155380 100644
--- a/homeassistant/components/climate/wink.py
+++ b/homeassistant/components/climate/wink.py
@@ -118,7 +118,7 @@ class WinkThermostat(WinkDevice, ClimateDevice):
                 self.hass, self.target_temperature_low, self.temperature_unit,
                 PRECISION_TENTHS)
 
-        if self.external_temperature:
+        if self.external_temperature is not None:
             data[ATTR_EXTERNAL_TEMPERATURE] = show_temp(
                 self.hass, self.external_temperature, self.temperature_unit,
                 PRECISION_TENTHS)
@@ -126,16 +126,16 @@ class WinkThermostat(WinkDevice, ClimateDevice):
         if self.smart_temperature:
             data[ATTR_SMART_TEMPERATURE] = self.smart_temperature
 
-        if self.occupied:
+        if self.occupied is not None:
             data[ATTR_OCCUPIED] = self.occupied
 
-        if self.eco_target:
+        if self.eco_target is not None:
             data[ATTR_ECO_TARGET] = self.eco_target
 
-        if self.heat_on:
+        if self.heat_on is not None:
             data[ATTR_HEAT_ON] = self.heat_on
 
-        if self.cool_on:
+        if self.cool_on is not None:
             data[ATTR_COOL_ON] = self.cool_on
 
         current_humidity = self.current_humidity
diff --git a/homeassistant/components/wink/__init__.py b/homeassistant/components/wink/__init__.py
index c996572bf51..0399b25b278 100644
--- a/homeassistant/components/wink/__init__.py
+++ b/homeassistant/components/wink/__init__.py
@@ -26,7 +26,7 @@ from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.event import track_time_interval
 from homeassistant.util.json import load_json, save_json
 
-REQUIREMENTS = ['python-wink==1.9.1', 'pubnubsub-handler==1.0.2']
+REQUIREMENTS = ['python-wink==1.10.1', 'pubnubsub-handler==1.0.2']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -73,11 +73,25 @@ SERVICE_SET_AUTO_SHUTOFF = "siren_set_auto_shutoff"
 SERVICE_SIREN_STROBE_ENABLED = "set_siren_strobe_enabled"
 SERVICE_CHIME_STROBE_ENABLED = "set_chime_strobe_enabled"
 SERVICE_ENABLE_SIREN = "enable_siren"
+SERVICE_SET_DIAL_CONFIG = "set_nimbus_dial_configuration"
+SERVICE_SET_DIAL_STATE = "set_nimbus_dial_state"
 
 ATTR_VOLUME = "volume"
 ATTR_TONE = "tone"
 ATTR_ENABLED = "enabled"
 ATTR_AUTO_SHUTOFF = "auto_shutoff"
+ATTR_MIN_VALUE = "min_value"
+ATTR_MAX_VALUE = "max_value"
+ATTR_ROTATION = "rotation"
+ATTR_SCALE = "scale"
+ATTR_TICKS = "ticks"
+ATTR_MIN_POSITION = "min_position"
+ATTR_MAX_POSITION = "max_position"
+ATTR_VALUE = "value"
+ATTR_LABELS = "labels"
+
+SCALES = ["linear", "log"]
+ROTATIONS = ["cw", "ccw"]
 
 VOLUMES = ["low", "medium", "high"]
 TONES = ["doorbell", "fur_elise", "doorbell_extended", "alert",
@@ -145,6 +159,23 @@ ENABLED_SIREN_SCHEMA = vol.Schema({
     vol.Required(ATTR_ENABLED): cv.boolean
 })
 
+DIAL_CONFIG_SCHEMA = vol.Schema({
+    vol.Required(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Optional(ATTR_MIN_VALUE): vol.Coerce(int),
+    vol.Optional(ATTR_MAX_VALUE): vol.Coerce(int),
+    vol.Optional(ATTR_MIN_POSITION): cv.positive_int,
+    vol.Optional(ATTR_MAX_POSITION): cv.positive_int,
+    vol.Optional(ATTR_ROTATION): vol.In(ROTATIONS),
+    vol.Optional(ATTR_SCALE): vol.In(SCALES),
+    vol.Optional(ATTR_TICKS): cv.positive_int
+})
+
+DIAL_STATE_SCHEMA = vol.Schema({
+    vol.Required(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Required(ATTR_VALUE): vol.Coerce(int),
+    vol.Optional(ATTR_LABELS): cv.ensure_list(cv.string)
+})
+
 WINK_COMPONENTS = [
     'binary_sensor', 'sensor', 'light', 'switch', 'lock', 'cover', 'climate',
     'fan', 'alarm_control_panel', 'scene'
@@ -432,8 +463,23 @@ def setup(hass, config):
             DOMAIN, SERVICE_SET_PAIRING_MODE, set_pairing_mode,
             schema=SET_PAIRING_MODE_SCHEMA)
 
-    def service_handle(service):
-        """Handle services."""
+    def nimbus_service_handle(service):
+        """Handle nimbus services."""
+        entity_id = service.data.get('entity_id')[0]
+        _all_dials = []
+        for sensor in hass.data[DOMAIN]['entities']['sensor']:
+            if isinstance(sensor, WinkNimbusDialDevice):
+                _all_dials.append(sensor)
+        for _dial in _all_dials:
+            if _dial.entity_id == entity_id:
+                if service.service == SERVICE_SET_DIAL_CONFIG:
+                    _dial.set_configuration(**service.data)
+                if service.service == SERVICE_SET_DIAL_STATE:
+                    _dial.wink.set_state(service.data.get("value"),
+                                         service.data.get("labels"))
+
+    def siren_service_handle(service):
+        """Handle siren services."""
         entity_ids = service.data.get('entity_id')
         all_sirens = []
         for switch in hass.data[DOMAIN]['entities']['switch']:
@@ -495,41 +541,68 @@ def setup(hass, config):
     if sirens:
 
         hass.services.register(DOMAIN, SERVICE_SET_AUTO_SHUTOFF,
-                               service_handle,
+                               siren_service_handle,
                                schema=SET_AUTO_SHUTOFF_SCHEMA)
 
         hass.services.register(DOMAIN, SERVICE_ENABLE_SIREN,
-                               service_handle,
+                               siren_service_handle,
                                schema=ENABLED_SIREN_SCHEMA)
 
     if has_dome_or_wink_siren:
 
         hass.services.register(DOMAIN, SERVICE_SET_SIREN_TONE,
-                               service_handle,
+                               siren_service_handle,
                                schema=SET_SIREN_TONE_SCHEMA)
 
         hass.services.register(DOMAIN, SERVICE_ENABLE_CHIME,
-                               service_handle,
+                               siren_service_handle,
                                schema=SET_CHIME_MODE_SCHEMA)
 
         hass.services.register(DOMAIN, SERVICE_SET_SIREN_VOLUME,
-                               service_handle,
+                               siren_service_handle,
                                schema=SET_VOLUME_SCHEMA)
 
         hass.services.register(DOMAIN, SERVICE_SET_CHIME_VOLUME,
-                               service_handle,
+                               siren_service_handle,
                                schema=SET_VOLUME_SCHEMA)
 
         hass.services.register(DOMAIN, SERVICE_SIREN_STROBE_ENABLED,
-                               service_handle,
+                               siren_service_handle,
                                schema=SET_STROBE_ENABLED_SCHEMA)
 
         hass.services.register(DOMAIN, SERVICE_CHIME_STROBE_ENABLED,
-                               service_handle,
+                               siren_service_handle,
                                schema=SET_STROBE_ENABLED_SCHEMA)
 
     component.add_entities(sirens)
 
+    nimbi = []
+    dials = {}
+    all_nimbi = pywink.get_cloud_clocks()
+    all_dials = []
+    for nimbus in all_nimbi:
+        if nimbus.object_type() == "cloud_clock":
+            nimbi.append(nimbus)
+            dials[nimbus.object_id()] = []
+    for nimbus in all_nimbi:
+        if nimbus.object_type() == "dial":
+            dials[nimbus.parent_id()].append(nimbus)
+
+    for nimbus in nimbi:
+        for dial in dials[nimbus.object_id()]:
+            all_dials.append(WinkNimbusDialDevice(nimbus, dial, hass))
+
+    if nimbi:
+        hass.services.register(DOMAIN, SERVICE_SET_DIAL_CONFIG,
+                               nimbus_service_handle,
+                               schema=DIAL_CONFIG_SCHEMA)
+
+        hass.services.register(DOMAIN, SERVICE_SET_DIAL_STATE,
+                               nimbus_service_handle,
+                               schema=DIAL_STATE_SCHEMA)
+
+    component.add_entities(all_dials)
+
     return True
 
 
@@ -596,6 +669,7 @@ class WinkDevice(Entity):
                                                self.wink.name())
 
     def _pubnub_update(self, message):
+        _LOGGER.debug(message)
         try:
             if message is None:
                 _LOGGER.error("Error on pubnub update for %s "
@@ -740,3 +814,70 @@ class WinkSirenDevice(WinkDevice):
             attributes["chime_mode"] = chime_mode
 
         return attributes
+
+
+class WinkNimbusDialDevice(WinkDevice):
+    """Representation of the Quirky Nimbus device."""
+
+    def __init__(self, nimbus, dial, hass):
+        """Initialize the Nimbus dial."""
+        super().__init__(dial, hass)
+        self.parent = nimbus
+
+    @asyncio.coroutine
+    def async_added_to_hass(self):
+        """Call when entity is added to hass."""
+        self.hass.data[DOMAIN]['entities']['sensor'].append(self)
+
+    @property
+    def state(self):
+        """Return dials current value."""
+        return self.wink.state()
+
+    @property
+    def name(self):
+        """Return the name of the device."""
+        return self.parent.name() + " dial " + str(self.wink.index() + 1)
+
+    @property
+    def device_state_attributes(self):
+        """Return the device state attributes."""
+        attributes = super(WinkNimbusDialDevice, self).device_state_attributes
+        dial_attributes = self.dial_attributes()
+
+        return {**attributes, **dial_attributes}
+
+    def dial_attributes(self):
+        """Return the dial only attributes."""
+        return {
+            "labels": self.wink.labels(),
+            "position": self.wink.position(),
+            "rotation": self.wink.rotation(),
+            "max_value": self.wink.max_value(),
+            "min_value": self.wink.min_value(),
+            "num_ticks": self.wink.ticks(),
+            "scale_type": self.wink.scale(),
+            "max_position": self.wink.max_position(),
+            "min_position": self.wink.min_position()
+        }
+
+    def set_configuration(self, **kwargs):
+        """
+        Set the dial config.
+
+        Anything not sent will default to current setting.
+        """
+        attributes = {**self.dial_attributes(), **kwargs}
+
+        min_value = attributes["min_value"]
+        max_value = attributes["max_value"]
+        rotation = attributes["rotation"]
+        ticks = attributes["num_ticks"]
+        scale = attributes["scale_type"]
+        min_position = attributes["min_position"]
+        max_position = attributes["max_position"]
+
+        self.wink.set_configuration(min_value, max_value, rotation,
+                                    scale=scale, ticks=ticks,
+                                    min_position=min_position,
+                                    max_position=max_position)
diff --git a/homeassistant/components/wink/services.yaml b/homeassistant/components/wink/services.yaml
index 1dc4ecf959b..a3b489f9cf5 100644
--- a/homeassistant/components/wink/services.yaml
+++ b/homeassistant/components/wink/services.yaml
@@ -111,3 +111,44 @@ set_chime_volume:
     volume:
         description: Volume level. One of ["low", "medium", "high"]
         example: "low"
+
+set_nimbus_dial_configuration:
+  description: Set the configuration of an individual nimbus dial
+  fields:
+    entity_id:
+      description: Name of the entity to set.
+      example: 'wink.nimbus_dial_3'
+    rotation:
+      description: Direction dial hand should spin ["cw" or "ccw"]
+      example: 'cw'
+    ticks:
+      description: Number of times the hand should move
+      example: 12
+    scale:
+      description: How the dial should move in response to higher values ["log" or "linear"]
+      example: "linear"
+    min_value:
+      description: The minimum value allowed to be set
+      example: 0
+    max_value:
+      description: The maximum value allowd to be set
+      example: 500
+    min_position:
+      description: The minimum position the dial hand can rotate to generally [0-360]
+      example: 0
+    max_position:
+      description: The maximum position the dial hand can rotate to generally [0-360]
+      example: 360
+
+set_nimbus_dial_state:
+  description: Set the value and lables of an individual nimbus dial
+  fields:
+    entity_id:
+      description: Name fo the entity to set.
+      example: 'wink.nimbus_dial_3'
+    value:
+      description: The value that should be set (Should be between min_value and max_value)
+      example: 250
+    labels:
+      description: The values shown on the dial labels ["Dial 1", "test"] the first value is what is shown by default the second value is shown when the nimbus is pressed
+      example: ["example", "test"]
\ No newline at end of file
diff --git a/requirements_all.txt b/requirements_all.txt
index 933245e02e8..a5936d14169 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1160,7 +1160,7 @@ python-velbus==2.0.19
 python-vlc==1.1.2
 
 # homeassistant.components.wink
-python-wink==1.9.1
+python-wink==1.10.1
 
 # homeassistant.components.sensor.swiss_public_transport
 python_opendata_transport==0.1.3

From f63dba552142e90b42c192be4c62cbbfafa02266 Mon Sep 17 00:00:00 2001
From: Sergiy Maysak <sergey.maysak@gmail.com>
Date: Thu, 13 Sep 2018 10:48:17 +0300
Subject: [PATCH 137/357] Multiple tag managers for Wireless Sensor Tags.
 (#16353)

* Added support for multiple tag managers. Fixed typo for signal strength.

* Corrected broken merge.

* Fixed flake8/pylint error.

* Improved docstring.
---
 .../components/binary_sensor/wirelesstag.py   | 114 ++++------------
 .../components/sensor/wirelesstag.py          |  83 +++---------
 .../components/switch/wirelesstag.py          |  29 +---
 homeassistant/components/wirelesstag.py       | 128 ++++++++++--------
 requirements_all.txt                          |   2 +-
 5 files changed, 117 insertions(+), 239 deletions(-)

diff --git a/homeassistant/components/binary_sensor/wirelesstag.py b/homeassistant/components/binary_sensor/wirelesstag.py
index 4bec3a824c3..190b408abf3 100644
--- a/homeassistant/components/binary_sensor/wirelesstag.py
+++ b/homeassistant/components/binary_sensor/wirelesstag.py
@@ -14,9 +14,6 @@ from homeassistant.components.binary_sensor import (
     BinarySensorDevice, PLATFORM_SCHEMA)
 from homeassistant.components.wirelesstag import (
     DOMAIN as WIRELESSTAG_DOMAIN,
-    WIRELESSTAG_TYPE_13BIT, WIRELESSTAG_TYPE_WATER,
-    WIRELESSTAG_TYPE_ALSPRO,
-    WIRELESSTAG_TYPE_WEMO_DEVICE,
     SIGNAL_BINARY_EVENT_UPDATE,
     WirelessTagBaseSensor)
 from homeassistant.const import (
@@ -30,7 +27,7 @@ _LOGGER = logging.getLogger(__name__)
 # On means in range, Off means out of range
 SENSOR_PRESENCE = 'presence'
 
-# On means motion detected, Off means cear
+# On means motion detected, Off means clear
 SENSOR_MOTION = 'motion'
 
 # On means open, Off means closed
@@ -55,49 +52,21 @@ SENSOR_LIGHT = 'light'
 SENSOR_MOISTURE = 'moisture'
 
 # On means tag battery is low, Off means normal
-SENSOR_BATTERY = 'low_battery'
+SENSOR_BATTERY = 'battery'
 
 # Sensor types: Name, device_class, push notification type representing 'on',
 # attr to check
 SENSOR_TYPES = {
-    SENSOR_PRESENCE: ['Presence', 'presence', 'is_in_range', {
-        "on": "oor",
-        "off": "back_in_range"
-        }, 2],
-    SENSOR_MOTION: ['Motion', 'motion', 'is_moved', {
-        "on": "motion_detected",
-        }, 5],
-    SENSOR_DOOR: ['Door', 'door', 'is_door_open', {
-        "on": "door_opened",
-        "off": "door_closed"
-        }, 5],
-    SENSOR_COLD: ['Cold', 'cold', 'is_cold', {
-        "on": "temp_toolow",
-        "off": "temp_normal"
-        }, 4],
-    SENSOR_HEAT: ['Heat', 'heat', 'is_heat', {
-        "on": "temp_toohigh",
-        "off": "temp_normal"
-        }, 4],
-    SENSOR_DRY: ['Too dry', 'dry', 'is_too_dry', {
-        "on": "too_dry",
-        "off": "cap_normal"
-        }, 2],
-    SENSOR_WET: ['Too wet', 'wet', 'is_too_humid', {
-        "on": "too_humid",
-        "off": "cap_normal"
-        }, 2],
-    SENSOR_LIGHT: ['Light', 'light', 'is_light_on', {
-        "on": "too_bright",
-        "off": "light_normal"
-        }, 1],
-    SENSOR_MOISTURE: ['Leak', 'moisture', 'is_leaking', {
-        "on": "water_detected",
-        "off": "water_dried",
-        }, 1],
-    SENSOR_BATTERY: ['Low Battery', 'battery', 'is_battery_low', {
-        "on": "low_battery"
-        }, 3]
+    SENSOR_PRESENCE: 'Presence',
+    SENSOR_MOTION: 'Motion',
+    SENSOR_DOOR: 'Door',
+    SENSOR_COLD: 'Cold',
+    SENSOR_HEAT: 'Heat',
+    SENSOR_DRY: 'Too dry',
+    SENSOR_WET: 'Too wet',
+    SENSOR_LIGHT: 'Light',
+    SENSOR_MOISTURE: 'Leak',
+    SENSOR_BATTERY: 'Low Battery'
 }
 
 
@@ -114,7 +83,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     sensors = []
     tags = platform.tags
     for tag in tags.values():
-        allowed_sensor_types = WirelessTagBinarySensor.allowed_sensors(tag)
+        allowed_sensor_types = tag.supported_binary_events_types
         for sensor_type in config.get(CONF_MONITORED_CONDITIONS):
             if sensor_type in allowed_sensor_types:
                 sensors.append(WirelessTagBinarySensor(platform, tag,
@@ -127,59 +96,21 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
 class WirelessTagBinarySensor(WirelessTagBaseSensor, BinarySensorDevice):
     """A binary sensor implementation for WirelessTags."""
 
-    @classmethod
-    def allowed_sensors(cls, tag):
-        """Return list of allowed sensor types for specific tag type."""
-        sensors_map = {
-            # 13-bit tag - allows everything but not light and moisture
-            WIRELESSTAG_TYPE_13BIT: [
-                SENSOR_PRESENCE, SENSOR_BATTERY,
-                SENSOR_MOTION, SENSOR_DOOR,
-                SENSOR_COLD, SENSOR_HEAT,
-                SENSOR_DRY, SENSOR_WET],
-
-            # Moister/water sensor - temperature and moisture only
-            WIRELESSTAG_TYPE_WATER: [
-                SENSOR_PRESENCE, SENSOR_BATTERY,
-                SENSOR_COLD, SENSOR_HEAT,
-                SENSOR_MOISTURE],
-
-            # ALS Pro: allows everything, but not moisture
-            WIRELESSTAG_TYPE_ALSPRO: [
-                SENSOR_PRESENCE, SENSOR_BATTERY,
-                SENSOR_MOTION, SENSOR_DOOR,
-                SENSOR_COLD, SENSOR_HEAT,
-                SENSOR_DRY, SENSOR_WET,
-                SENSOR_LIGHT],
-
-            # Wemo are power switches.
-            WIRELESSTAG_TYPE_WEMO_DEVICE: [SENSOR_PRESENCE]
-        }
-
-        # allow everything if tag type is unknown
-        # (i just dont have full catalog of them :))
-        tag_type = tag.tag_type
-        fullset = SENSOR_TYPES.keys()
-        return sensors_map[tag_type] if tag_type in sensors_map else fullset
-
     def __init__(self, api, tag, sensor_type):
         """Initialize a binary sensor for a Wireless Sensor Tags."""
         super().__init__(api, tag)
         self._sensor_type = sensor_type
         self._name = '{0} {1}'.format(self._tag.name,
-                                      SENSOR_TYPES[self._sensor_type][0])
-        self._device_class = SENSOR_TYPES[self._sensor_type][1]
-        self._tag_attr = SENSOR_TYPES[self._sensor_type][2]
-        self.binary_spec = SENSOR_TYPES[self._sensor_type][3]
-        self.tag_id_index_template = SENSOR_TYPES[self._sensor_type][4]
+                                      self.event.human_readable_name)
 
     async def async_added_to_hass(self):
         """Register callbacks."""
         tag_id = self.tag_id
         event_type = self.device_class
+        mac = self.tag_manager_mac
         async_dispatcher_connect(
             self.hass,
-            SIGNAL_BINARY_EVENT_UPDATE.format(tag_id, event_type),
+            SIGNAL_BINARY_EVENT_UPDATE.format(tag_id, event_type, mac),
             self._on_binary_event_callback)
 
     @property
@@ -190,7 +121,12 @@ class WirelessTagBinarySensor(WirelessTagBaseSensor, BinarySensorDevice):
     @property
     def device_class(self):
         """Return the class of the binary sensor."""
-        return self._device_class
+        return self._sensor_type
+
+    @property
+    def event(self):
+        """Binary event of tag."""
+        return self._tag.event[self._sensor_type]
 
     @property
     def principal_value(self):
@@ -198,9 +134,7 @@ class WirelessTagBinarySensor(WirelessTagBaseSensor, BinarySensorDevice):
 
         Subclasses need override based on type of sensor.
         """
-        return (
-            STATE_ON if getattr(self._tag, self._tag_attr, False)
-            else STATE_OFF)
+        return STATE_ON if self.event.is_state_on else STATE_OFF
 
     def updated_state_value(self):
         """Use raw princial value."""
@@ -208,7 +142,7 @@ class WirelessTagBinarySensor(WirelessTagBaseSensor, BinarySensorDevice):
 
     @callback
     def _on_binary_event_callback(self, event):
-        """Update state from arrive push notification."""
+        """Update state from arrived push notification."""
         # state should be 'on' or 'off'
         self._state = event.data.get('state')
         self.async_schedule_update_ha_state()
diff --git a/homeassistant/components/sensor/wirelesstag.py b/homeassistant/components/sensor/wirelesstag.py
index a68fb5d0caf..eb9ce297065 100644
--- a/homeassistant/components/sensor/wirelesstag.py
+++ b/homeassistant/components/sensor/wirelesstag.py
@@ -15,13 +15,9 @@ from homeassistant.const import (
     CONF_MONITORED_CONDITIONS)
 from homeassistant.components.wirelesstag import (
     DOMAIN as WIRELESSTAG_DOMAIN,
-    WIRELESSTAG_TYPE_13BIT, WIRELESSTAG_TYPE_WATER,
-    WIRELESSTAG_TYPE_ALSPRO,
-    WIRELESSTAG_TYPE_WEMO_DEVICE,
     SIGNAL_TAG_UPDATE,
     WirelessTagBaseSensor)
 import homeassistant.helpers.config_validation as cv
-from homeassistant.const import TEMP_CELSIUS
 
 DEPENDENCIES = ['wirelesstag']
 
@@ -32,24 +28,12 @@ SENSOR_HUMIDITY = 'humidity'
 SENSOR_MOISTURE = 'moisture'
 SENSOR_LIGHT = 'light'
 
-SENSOR_TYPES = {
-    SENSOR_TEMPERATURE: {
-        'unit': TEMP_CELSIUS,
-        'attr': 'temperature'
-    },
-    SENSOR_HUMIDITY: {
-        'unit': '%',
-        'attr': 'humidity'
-    },
-    SENSOR_MOISTURE: {
-        'unit': '%',
-        'attr': 'moisture'
-    },
-    SENSOR_LIGHT: {
-        'unit': 'lux',
-        'attr': 'light'
-    }
-}
+SENSOR_TYPES = [
+    SENSOR_TEMPERATURE,
+    SENSOR_HUMIDITY,
+    SENSOR_MOISTURE,
+    SENSOR_LIGHT
+]
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Required(CONF_MONITORED_CONDITIONS, default=[]):
@@ -64,7 +48,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     tags = platform.tags
     for tag in tags.values():
         for sensor_type in config.get(CONF_MONITORED_CONDITIONS):
-            if sensor_type in WirelessTagSensor.allowed_sensors(tag):
+            if sensor_type in tag.allowed_sensor_types:
                 sensors.append(WirelessTagSensor(
                     platform, tag, sensor_type, hass.config))
 
@@ -74,36 +58,11 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
 class WirelessTagSensor(WirelessTagBaseSensor):
     """Representation of a Sensor."""
 
-    @classmethod
-    def allowed_sensors(cls, tag):
-        """Return array of allowed sensor types for tag."""
-        all_sensors = SENSOR_TYPES.keys()
-        sensors_per_tag_type = {
-            WIRELESSTAG_TYPE_13BIT: [
-                SENSOR_TEMPERATURE,
-                SENSOR_HUMIDITY],
-            WIRELESSTAG_TYPE_WATER: [
-                SENSOR_TEMPERATURE,
-                SENSOR_MOISTURE],
-            WIRELESSTAG_TYPE_ALSPRO: [
-                SENSOR_TEMPERATURE,
-                SENSOR_HUMIDITY,
-                SENSOR_LIGHT],
-            WIRELESSTAG_TYPE_WEMO_DEVICE: []
-        }
-
-        tag_type = tag.tag_type
-        return (
-            sensors_per_tag_type[tag_type] if tag_type in sensors_per_tag_type
-            else all_sensors)
-
     def __init__(self, api, tag, sensor_type, config):
         """Initialize a WirelessTag sensor."""
         super().__init__(api, tag)
 
         self._sensor_type = sensor_type
-        self._tag_attr = SENSOR_TYPES[self._sensor_type]['attr']
-        self._unit_of_measurement = SENSOR_TYPES[self._sensor_type]['unit']
         self._name = self._tag.name
 
         # I want to see entity_id as:
@@ -118,7 +77,7 @@ class WirelessTagSensor(WirelessTagBaseSensor):
         """Register callbacks."""
         async_dispatcher_connect(
             self.hass,
-            SIGNAL_TAG_UPDATE.format(self.tag_id),
+            SIGNAL_TAG_UPDATE.format(self.tag_id, self.tag_manager_mac),
             self._update_tag_info_callback)
 
     @property
@@ -144,33 +103,23 @@ class WirelessTagSensor(WirelessTagBaseSensor):
     @property
     def unit_of_measurement(self):
         """Return the unit of measurement."""
-        return self._unit_of_measurement
+        return self._sensor.unit
 
     @property
     def principal_value(self):
         """Return sensor current value."""
-        return getattr(self._tag, self._tag_attr, False)
+        return self._sensor.value
+
+    @property
+    def _sensor(self):
+        """Return tag sensor entity."""
+        return self._tag.sensor[self._sensor_type]
 
     @callback
     def _update_tag_info_callback(self, event):
         """Handle push notification sent by tag manager."""
-        if event.data.get('id') != self.tag_id:
-            return
-
         _LOGGER.info("Entity to update state: %s event data: %s",
                      self, event.data)
-        new_value = self.principal_value
-        try:
-            if self._sensor_type == SENSOR_TEMPERATURE:
-                new_value = event.data.get('temp')
-            elif (self._sensor_type == SENSOR_HUMIDITY or
-                  self._sensor_type == SENSOR_MOISTURE):
-                new_value = event.data.get('cap')
-            elif self._sensor_type == SENSOR_LIGHT:
-                new_value = event.data.get('lux')
-        except Exception as error:  # pylint: disable=broad-except
-            _LOGGER.info("Unable to update value of entity: \
-                        %s error: %s event: %s", self, error, event)
-
+        new_value = self._sensor.value_from_update_event(event.data)
         self._state = self.decorate_value(new_value)
         self.async_schedule_update_ha_state()
diff --git a/homeassistant/components/switch/wirelesstag.py b/homeassistant/components/switch/wirelesstag.py
index 5796216d50f..cbe62d107da 100644
--- a/homeassistant/components/switch/wirelesstag.py
+++ b/homeassistant/components/switch/wirelesstag.py
@@ -11,9 +11,6 @@ import voluptuous as vol
 
 from homeassistant.components.wirelesstag import (
     DOMAIN as WIRELESSTAG_DOMAIN,
-    WIRELESSTAG_TYPE_13BIT, WIRELESSTAG_TYPE_WATER,
-    WIRELESSTAG_TYPE_ALSPRO,
-    WIRELESSTAG_TYPE_WEMO_DEVICE,
     WirelessTagBaseSensor)
 from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchDevice
 from homeassistant.const import (
@@ -53,7 +50,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     tags = platform.load_tags()
     for switch_type in config.get(CONF_MONITORED_CONDITIONS):
         for _, tag in tags.items():
-            if switch_type in WirelessTagSwitch.allowed_switches(tag):
+            if switch_type in tag.allowed_monitoring_types:
                 switches.append(WirelessTagSwitch(platform, tag, switch_type))
 
     add_entities(switches, True)
@@ -62,30 +59,6 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
 class WirelessTagSwitch(WirelessTagBaseSensor, SwitchDevice):
     """A switch implementation for Wireless Sensor Tags."""
 
-    @classmethod
-    def allowed_switches(cls, tag):
-        """Return allowed switch types for wireless tag."""
-        all_sensors = SWITCH_TYPES.keys()
-        sensors_per_tag_spec = {
-            WIRELESSTAG_TYPE_13BIT: [
-                ARM_TEMPERATURE, ARM_HUMIDITY, ARM_MOTION],
-            WIRELESSTAG_TYPE_WATER: [
-                ARM_TEMPERATURE, ARM_MOISTURE],
-            WIRELESSTAG_TYPE_ALSPRO: [
-                ARM_TEMPERATURE, ARM_HUMIDITY, ARM_MOTION, ARM_LIGHT],
-            WIRELESSTAG_TYPE_WEMO_DEVICE: []
-        }
-
-        tag_type = tag.tag_type
-
-        result = (
-            sensors_per_tag_spec[tag_type]
-            if tag_type in sensors_per_tag_spec else all_sensors)
-        _LOGGER.info("Allowed switches: %s tag_type: %s",
-                     str(result), tag_type)
-
-        return result
-
     def __init__(self, api, tag, switch_type):
         """Initialize a switch for Wireless Sensor Tag."""
         super().__init__(api, tag)
diff --git a/homeassistant/components/wirelesstag.py b/homeassistant/components/wirelesstag.py
index 19fb2d40b5d..f2832100066 100644
--- a/homeassistant/components/wirelesstag.py
+++ b/homeassistant/components/wirelesstag.py
@@ -4,6 +4,7 @@ Wireless Sensor Tags platform support.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/wirelesstag/
 """
+
 import logging
 
 from requests.exceptions import HTTPError, ConnectTimeout
@@ -11,17 +12,18 @@ import voluptuous as vol
 from homeassistant.const import (
     ATTR_BATTERY_LEVEL, ATTR_VOLTAGE, CONF_USERNAME, CONF_PASSWORD)
 import homeassistant.helpers.config_validation as cv
+from homeassistant import util
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.dispatcher import (
     dispatcher_send)
 
-REQUIREMENTS = ['wirelesstagpy==0.3.0']
+REQUIREMENTS = ['wirelesstagpy==0.4.0']
 
 _LOGGER = logging.getLogger(__name__)
 
 
-# straight of signal in dBm
-ATTR_TAG_SIGNAL_STRAIGHT = 'signal_straight'
+# strength of signal in dBm
+ATTR_TAG_SIGNAL_STRENGTH = 'signal_strength'
 # indicates if tag is out of range or not
 ATTR_TAG_OUT_OF_RANGE = 'out_of_range'
 # number in percents from max power of tag receiver
@@ -34,13 +36,13 @@ NOTIFICATION_TITLE = "Wireless Sensor Tag Setup"
 DOMAIN = 'wirelesstag'
 DEFAULT_ENTITY_NAMESPACE = 'wirelesstag'
 
-WIRELESSTAG_TYPE_13BIT = 13
-WIRELESSTAG_TYPE_ALSPRO = 26
-WIRELESSTAG_TYPE_WATER = 32
-WIRELESSTAG_TYPE_WEMO_DEVICE = 82
+# template for signal - first parameter is tag_id,
+# second, tag manager mac address
+SIGNAL_TAG_UPDATE = 'wirelesstag.tag_info_updated_{}_{}'
 
-SIGNAL_TAG_UPDATE = 'wirelesstag.tag_info_updated_{}'
-SIGNAL_BINARY_EVENT_UPDATE = 'wirelesstag.binary_event_updated_{}_{}'
+# template for signal - tag_id, sensor type and
+# tag manager mac address
+SIGNAL_BINARY_EVENT_UPDATE = 'wirelesstag.binary_event_updated_{}_{}_{}'
 
 CONFIG_SCHEMA = vol.Schema({
     DOMAIN: vol.Schema({
@@ -58,6 +60,12 @@ class WirelessTagPlatform:
         self.hass = hass
         self.api = api
         self.tags = {}
+        self._local_base_url = None
+
+    @property
+    def tag_manager_macs(self):
+        """Return list of tag managers mac addresses in user account."""
+        return self.api.mac_addresses
 
     def load_tags(self):
         """Load tags from remote server."""
@@ -69,72 +77,84 @@ class WirelessTagPlatform:
         func_name = 'arm_{}'.format(switch.sensor_type)
         arm_func = getattr(self.api, func_name)
         if arm_func is not None:
-            arm_func(switch.tag_id)
+            arm_func(switch.tag_id, switch.tag_manager_mac)
 
     def disarm(self, switch):
         """Disarm entity sensor monitoring."""
         func_name = 'disarm_{}'.format(switch.sensor_type)
         disarm_func = getattr(self.api, func_name)
         if disarm_func is not None:
-            disarm_func(switch.tag_id)
+            disarm_func(switch.tag_id, switch.tag_manager_mac)
 
-    # pylint: disable=no-self-use
-    def make_push_notitication(self, name, url, content):
-        """Create notification config."""
-        from wirelesstagpy import NotificationConfig
-        return NotificationConfig(name, {
-            'url': url, 'verb': 'POST',
-            'content': content, 'disabled': False, 'nat': True})
-
-    def install_push_notifications(self, binary_sensors):
-        """Set up local push notification from tag manager."""
-        _LOGGER.info("Registering local push notifications.")
+    def make_notifications(self, binary_sensors, mac):
+        """Create configurations for push notifications."""
+        _LOGGER.info("Creating configurations for push notifications.")
         configs = []
 
-        binary_url = self.binary_event_callback_url
-        for event in binary_sensors:
-            for state, name in event.binary_spec.items():
-                content = ('{"type": "' + event.device_class +
-                           '", "id":{' + str(event.tag_id_index_template) +
-                           '}, "state": \"' + state + '\"}')
-                config = self.make_push_notitication(name, binary_url, content)
-                configs.append(config)
+        bi_url = self.binary_event_callback_url
+        for bi_sensor in binary_sensors:
+            configs.extend(bi_sensor.event.build_notifications(bi_url, mac))
 
-        content = ("{\"name\":\"{0}\",\"id\":{1},\"temp\":{2}," +
-                   "\"cap\":{3},\"lux\":{4}}")
         update_url = self.update_callback_url
-        update_config = self.make_push_notitication(
-            'update', update_url, content)
-        configs.append(update_config)
+        from wirelesstagpy import NotificationConfig as NC
+        update_config = NC.make_config_for_update_event(update_url, mac)
 
-        result = self.api.install_push_notification(0, configs, True)
-        if not result:
-            self.hass.components.persistent_notification.create(
-                "Error: failed to install local push notifications<br />",
-                title="Wireless Sensor Tag Setup Local Push Notifications",
-                notification_id="wirelesstag_failed_push_notification")
-        else:
-            _LOGGER.info("Installed push notifications for all tags.")
+        configs.append(update_config)
+        return configs
+
+    def install_push_notifications(self, binary_sensors):
+        """Register local push notification from tag manager."""
+        _LOGGER.info("Registering local push notifications.")
+        for mac in self.tag_manager_macs:
+            configs = self.make_notifications(binary_sensors, mac)
+            # install notifications for all tags in tag manager
+            # specified by mac
+            result = self.api.install_push_notification(0, configs, True, mac)
+            if not result:
+                self.hass.components.persistent_notification.create(
+                    "Error: failed to install local push notifications <br />",
+                    title="Wireless Sensor Tag Setup Local Push Notifications",
+                    notification_id="wirelesstag_failed_push_notification")
+            else:
+                _LOGGER.info("Installed push notifications for all\
+                             tags in %s.", mac)
+
+    @property
+    def local_base_url(self):
+        """Define base url of hass in local network."""
+        if self._local_base_url is None:
+            self._local_base_url = "http://{}".format(util.get_local_ip())
+
+            port = self.hass.config.api.port
+            if port is not None:
+                self._local_base_url += ':{}'.format(port)
+        return self._local_base_url
 
     @property
     def update_callback_url(self):
         """Return url for local push notifications(update event)."""
         return '{}/api/events/wirelesstag_update_tags'.format(
-            self.hass.config.api.base_url)
+            self.local_base_url)
 
     @property
     def binary_event_callback_url(self):
         """Return url for local push notifications(binary event)."""
         return '{}/api/events/wirelesstag_binary_event'.format(
-            self.hass.config.api.base_url)
+            self.local_base_url)
 
     def handle_update_tags_event(self, event):
         """Handle push event from wireless tag manager."""
         _LOGGER.info("push notification for update arrived: %s", event)
-        dispatcher_send(
-            self.hass,
-            SIGNAL_TAG_UPDATE.format(event.data.get('id')),
-            event)
+        try:
+            tag_id = event.data.get('id')
+            mac = event.data.get('mac')
+            dispatcher_send(
+                self.hass,
+                SIGNAL_TAG_UPDATE.format(tag_id, mac),
+                event)
+        except Exception as ex:  # pylint: disable=broad-except
+            _LOGGER.error("Unable to handle tag update event:\
+                          %s error: %s", str(event), str(ex))
 
     def handle_binary_event(self, event):
         """Handle push notifications for binary (on/off) events."""
@@ -142,12 +162,13 @@ class WirelessTagPlatform:
         try:
             tag_id = event.data.get('id')
             event_type = event.data.get('type')
+            mac = event.data.get('mac')
             dispatcher_send(
                 self.hass,
-                SIGNAL_BINARY_EVENT_UPDATE.format(tag_id, event_type),
+                SIGNAL_BINARY_EVENT_UPDATE.format(tag_id, event_type, mac),
                 event)
         except Exception as ex:  # pylint: disable=broad-except
-            _LOGGER.error("Unable to handle binary event:\
+            _LOGGER.error("Unable to handle tag binary event:\
                           %s error: %s", str(event), str(ex))
 
 
@@ -193,6 +214,7 @@ class WirelessTagBaseSensor(Entity):
         self._tag = tag
         self._uuid = self._tag.uuid
         self.tag_id = self._tag.tag_id
+        self.tag_manager_mac = self._tag.tag_manager_mac
         self._name = self._tag.name
         self._state = None
 
@@ -251,8 +273,8 @@ class WirelessTagBaseSensor(Entity):
         return {
             ATTR_BATTERY_LEVEL: self._tag.battery_remaining,
             ATTR_VOLTAGE: '{:.2f}V'.format(self._tag.battery_volts),
-            ATTR_TAG_SIGNAL_STRAIGHT: '{}dBm'.format(
-                self._tag.signal_straight),
+            ATTR_TAG_SIGNAL_STRENGTH: '{}dBm'.format(
+                self._tag.signal_strength),
             ATTR_TAG_OUT_OF_RANGE: not self._tag.is_in_range,
             ATTR_TAG_POWER_CONSUMPTION: '{:.2f}%'.format(
                 self._tag.power_consumption)
diff --git a/requirements_all.txt b/requirements_all.txt
index a5936d14169..88ce55d0515 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1485,7 +1485,7 @@ websocket-client==0.37.0
 websockets==6.0
 
 # homeassistant.components.wirelesstag
-wirelesstagpy==0.3.0
+wirelesstagpy==0.4.0
 
 # homeassistant.components.zigbee
 xbee-helper==0.0.7

From e59ba28fe6184034d4297dcd230765a770a0f0ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Thu, 13 Sep 2018 11:01:28 +0300
Subject: [PATCH 138/357] Add Huawei LTE router platform, device tracker, and
 sensor (#16498)

* Add Huawei LTE router platform, device tracker, and sensor

* Add myself to CODEOWNERS for huawei_lte
---
 .coveragerc                                   |   3 +
 CODEOWNERS                                    |   2 +
 .../components/device_tracker/huawei_lte.py   |  65 +++++++
 homeassistant/components/huawei_lte.py        | 123 +++++++++++++
 homeassistant/components/sensor/huawei_lte.py | 169 ++++++++++++++++++
 requirements_all.txt                          |   3 +
 6 files changed, 365 insertions(+)
 create mode 100644 homeassistant/components/device_tracker/huawei_lte.py
 create mode 100644 homeassistant/components/huawei_lte.py
 create mode 100644 homeassistant/components/sensor/huawei_lte.py

diff --git a/.coveragerc b/.coveragerc
index bd08f5c38df..336edbff736 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -141,6 +141,9 @@ omit =
     homeassistant/components/homematicip_cloud.py
     homeassistant/components/*/homematicip_cloud.py
 
+    homeassistant/components/huawei_lte.py
+    homeassistant/components/*/huawei_lte.py
+
     homeassistant/components/hydrawise.py
     homeassistant/components/*/hydrawise.py
 
diff --git a/CODEOWNERS b/CODEOWNERS
index b86e09a6b72..82262c8fa83 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -97,6 +97,8 @@ homeassistant/components/*/eight_sleep.py @mezz64
 homeassistant/components/hive.py @Rendili @KJonline
 homeassistant/components/*/hive.py @Rendili @KJonline
 homeassistant/components/homekit/* @cdce8p
+homeassistant/components/huawei_lte.py @scop
+homeassistant/components/*/huawei_lte.py @scop
 homeassistant/components/knx.py @Julius2342
 homeassistant/components/*/knx.py @Julius2342
 homeassistant/components/konnected.py @heythisisnate
diff --git a/homeassistant/components/device_tracker/huawei_lte.py b/homeassistant/components/device_tracker/huawei_lte.py
new file mode 100644
index 00000000000..4b4eb3f001a
--- /dev/null
+++ b/homeassistant/components/device_tracker/huawei_lte.py
@@ -0,0 +1,65 @@
+"""
+Support for Huawei LTE routers.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/device_tracker.huawei_lte/
+"""
+from typing import Any, Dict, List, Optional
+
+import attr
+import voluptuous as vol
+
+import homeassistant.helpers.config_validation as cv
+from homeassistant.components.device_tracker import (
+    PLATFORM_SCHEMA, DeviceScanner,
+)
+from homeassistant.const import CONF_URL
+from ..huawei_lte import DATA_KEY, RouterData
+
+
+DEPENDENCIES = ['huawei_lte']
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_URL): cv.url,
+})
+
+
+def get_scanner(hass, config):
+    """Get a Huawei LTE router scanner."""
+    data = hass.data[DATA_KEY].get_data(config)
+    return HuaweiLteScanner(data)
+
+
+@attr.s
+class HuaweiLteScanner(DeviceScanner):
+    """Huawei LTE router scanner."""
+
+    data = attr.ib(type=RouterData)
+
+    _hosts = attr.ib(init=False, factory=dict)
+
+    def scan_devices(self) -> List[str]:
+        """Scan for devices."""
+        self.data.update()
+        self._hosts = {
+            x["MacAddress"]: x
+            for x in self.data["wlan_host_list.Hosts.Host"]
+            if x.get("MacAddress")
+        }
+        return list(self._hosts)
+
+    def get_device_name(self, device: str) -> Optional[str]:
+        """Get name for a device."""
+        host = self._hosts.get(device)
+        return host.get("HostName") or None if host else None
+
+    def get_extra_attributes(self, device: str) -> Dict[str, Any]:
+        """
+        Get extra attributes of a device.
+
+        Some known extra attributes that may be returned in the dict
+        include MacAddress (MAC address), ID (client ID), IpAddress
+        (IP address), AssociatedSsid (associated SSID), AssociatedTime
+        (associated time in seconds), and HostName (host name).
+        """
+        return self._hosts.get(device) or {}
diff --git a/homeassistant/components/huawei_lte.py b/homeassistant/components/huawei_lte.py
new file mode 100644
index 00000000000..268289d2bf5
--- /dev/null
+++ b/homeassistant/components/huawei_lte.py
@@ -0,0 +1,123 @@
+"""
+Support for Huawei LTE routers.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/huawei_lte/
+"""
+from datetime import timedelta
+from functools import reduce
+import logging
+import operator
+
+import voluptuous as vol
+import attr
+
+from homeassistant.const import (
+    CONF_URL, CONF_USERNAME, CONF_PASSWORD, EVENT_HOMEASSISTANT_STOP,
+)
+from homeassistant.helpers import config_validation as cv
+from homeassistant.util import Throttle
+
+
+_LOGGER = logging.getLogger(__name__)
+
+REQUIREMENTS = ['huawei-lte-api==1.0.12']
+
+MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=10)
+
+DOMAIN = 'huawei_lte'
+DATA_KEY = 'huawei_lte'
+
+CONFIG_SCHEMA = vol.Schema({
+    DOMAIN: vol.All(cv.ensure_list, [vol.Schema({
+        vol.Required(CONF_URL): cv.url,
+        vol.Required(CONF_USERNAME): cv.string,
+        vol.Required(CONF_PASSWORD): cv.string,
+    })])
+}, extra=vol.ALLOW_EXTRA)
+
+
+@attr.s
+class RouterData:
+    """Class for router state."""
+
+    client = attr.ib()
+    device_information = attr.ib(init=False, factory=dict)
+    device_signal = attr.ib(init=False, factory=dict)
+    traffic_statistics = attr.ib(init=False, factory=dict)
+    wlan_host_list = attr.ib(init=False, factory=dict)
+
+    def __getitem__(self, path: str):
+        """
+        Get value corresponding to a dotted path.
+
+        The first path component designates a member of this class
+        such as device_information, device_signal etc, and the remaining
+        path points to a value in the member's data structure.
+        """
+        cat, *path_ = path.split(".")
+        return reduce(operator.getitem, path_, getattr(self, cat))
+
+    @Throttle(MIN_TIME_BETWEEN_UPDATES)
+    def update(self) -> None:
+        """Call API to update data."""
+        self.device_information = self.client.device.information()
+        _LOGGER.debug("device_information=%s", self.device_information)
+        self.device_signal = self.client.device.signal()
+        _LOGGER.debug("device_signal=%s", self.device_signal)
+        self.traffic_statistics = self.client.monitoring.traffic_statistics()
+        _LOGGER.debug("traffic_statistics=%s", self.traffic_statistics)
+        self.wlan_host_list = self.client.wlan.host_list()
+        _LOGGER.debug("wlan_host_list=%s", self.wlan_host_list)
+
+
+@attr.s
+class HuaweiLteData:
+    """Shared state."""
+
+    data = attr.ib(init=False, factory=dict)
+
+    def get_data(self, config):
+        """Get the requested or the only data value."""
+        if CONF_URL in config:
+            return self.data.get(config[CONF_URL])
+        if len(self.data) == 1:
+            return next(iter(self.data.values()))
+
+        return None
+
+
+def setup(hass, config) -> bool:
+    """Set up Huawei LTE component."""
+    if DATA_KEY not in hass.data:
+        hass.data[DATA_KEY] = HuaweiLteData()
+    for conf in config.get(DOMAIN, []):
+        _setup_lte(hass, conf)
+    return True
+
+
+def _setup_lte(hass, lte_config) -> None:
+    """Set up Huawei LTE router."""
+    from huawei_lte_api.AuthorizedConnection import AuthorizedConnection
+    from huawei_lte_api.Client import Client
+
+    url = lte_config[CONF_URL]
+    username = lte_config[CONF_USERNAME]
+    password = lte_config[CONF_PASSWORD]
+
+    connection = AuthorizedConnection(
+        url,
+        username=username,
+        password=password,
+    )
+    client = Client(connection)
+
+    data = RouterData(client)
+    data.update()
+    hass.data[DATA_KEY].data[url] = data
+
+    def cleanup(event):
+        """Clean up resources."""
+        client.user.logout()
+
+    hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, cleanup)
diff --git a/homeassistant/components/sensor/huawei_lte.py b/homeassistant/components/sensor/huawei_lte.py
new file mode 100644
index 00000000000..d73472a705b
--- /dev/null
+++ b/homeassistant/components/sensor/huawei_lte.py
@@ -0,0 +1,169 @@
+"""Huawei LTE sensors.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/sensor.huawei_lte/
+"""
+
+import logging
+import re
+
+import attr
+import voluptuous as vol
+
+from homeassistant.const import (
+    CONF_URL, CONF_MONITORED_CONDITIONS, STATE_UNKNOWN,
+)
+from homeassistant.components.sensor import PLATFORM_SCHEMA
+from homeassistant.helpers.entity import Entity
+import homeassistant.helpers.config_validation as cv
+
+from ..huawei_lte import DATA_KEY, RouterData
+
+
+_LOGGER = logging.getLogger(__name__)
+
+DEPENDENCIES = ['huawei_lte']
+
+DEFAULT_NAME_TEMPLATE = 'Huawei {}: {}'
+
+DEFAULT_SENSORS = [
+    "device_information.WanIPAddress",
+    "device_signal.rssi",
+]
+
+SENSOR_META = {
+    "device_information.SoftwareVersion": dict(
+        name="Software version",
+    ),
+    "device_information.WanIPAddress": dict(
+        name="WAN IP address",
+        icon="mdi:ip",
+    ),
+    "device_information.WanIPv6Address": dict(
+        name="WAN IPv6 address",
+        icon="mdi:ip",
+    ),
+    "device_signal.rsrq": dict(
+        name="RSRQ",
+        # http://www.lte-anbieter.info/technik/rsrq.php
+        icon=lambda x:
+        x >= -5 and "mdi:signal-cellular-3"
+        or x >= -8 and "mdi:signal-cellular-2"
+        or x >= -11 and "mdi:signal-cellular-1"
+        or "mdi:signal-cellular-outline"
+    ),
+    "device_signal.rsrp": dict(
+        name="RSRP",
+        # http://www.lte-anbieter.info/technik/rsrp.php
+        icon=lambda x:
+        x >= -80 and "mdi:signal-cellular-3"
+        or x >= -95 and "mdi:signal-cellular-2"
+        or x >= -110 and "mdi:signal-cellular-1"
+        or "mdi:signal-cellular-outline"
+    ),
+    "device_signal.rssi": dict(
+        name="RSSI",
+        # https://eyesaas.com/wi-fi-signal-strength/
+        icon=lambda x:
+        x >= -60 and "mdi:signal-cellular-3"
+        or x >= -70 and "mdi:signal-cellular-2"
+        or x >= -80 and "mdi:signal-cellular-1"
+        or "mdi:signal-cellular-outline"
+    ),
+    "device_signal.sinr": dict(
+        name="SINR",
+        # http://www.lte-anbieter.info/technik/sinr.php
+        icon=lambda x:
+        x >= 10 and "mdi:signal-cellular-3"
+        or x >= 5 and "mdi:signal-cellular-2"
+        or x >= 0 and "mdi:signal-cellular-1"
+        or "mdi:signal-cellular-outline"
+    ),
+}
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_URL): cv.url,
+    vol.Optional(
+        CONF_MONITORED_CONDITIONS, default=DEFAULT_SENSORS): cv.ensure_list,
+})
+
+
+def setup_platform(
+        hass, config, add_entities, discovery_info):
+    """Set up Huawei LTE sensor devices."""
+    data = hass.data[DATA_KEY].get_data(config)
+    sensors = []
+    for path in config.get(CONF_MONITORED_CONDITIONS):
+        sensors.append(HuaweiLteSensor(
+            data, path, SENSOR_META.get(path, {})))
+    add_entities(sensors, True)
+
+
+@attr.s
+class HuaweiLteSensor(Entity):
+    """Huawei LTE sensor entity."""
+
+    data = attr.ib(type=RouterData)
+    path = attr.ib(type=list)
+    meta = attr.ib(type=dict)
+
+    _state = attr.ib(init=False, default=STATE_UNKNOWN)
+    _unit = attr.ib(init=False, type=str)
+
+    @property
+    def unique_id(self) -> str:
+        """Return unique ID for sensor."""
+        return "%s_%s" % (
+            self.path,
+            self.data["device_information.SerialNumber"],
+        )
+
+    @property
+    def name(self) -> str:
+        """Return sensor name."""
+        dname = self.data["device_information.DeviceName"]
+        vname = self.meta.get("name", self.path)
+        return DEFAULT_NAME_TEMPLATE.format(dname, vname)
+
+    @property
+    def state(self):
+        """Return sensor state."""
+        return self._state
+
+    @property
+    def unit_of_measurement(self):
+        """Return sensor's unit of measurement."""
+        return self.meta.get("unit", self._unit)
+
+    @property
+    def icon(self):
+        """Return icon for sensor."""
+        icon = self.meta.get("icon")
+        if callable(icon):
+            return icon(self.state)
+        return icon
+
+    def update(self):
+        """Update state."""
+        self.data.update()
+
+        unit = None
+        try:
+            value = self.data[self.path]
+        except KeyError:
+            _LOGGER.warning("%s not in data", self.path)
+            value = None
+
+        if value is not None:
+            # Clean up value and infer unit, e.g. -71dBm, 15 dB
+            match = re.match(
+                r"(?P<value>.+?)\s*(?P<unit>[a-zA-Z]+)\s*$", str(value))
+            if match:
+                try:
+                    value = float(match.group("value"))
+                    unit = match.group("unit")
+                except ValueError:
+                    pass
+
+        self._state = value
+        self._unit = unit
diff --git a/requirements_all.txt b/requirements_all.txt
index 88ce55d0515..d740e915cbc 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -463,6 +463,9 @@ homematicip==0.9.8
 # homeassistant.components.remember_the_milk
 httplib2==0.10.3
 
+# homeassistant.components.huawei_lte
+huawei-lte-api==1.0.12
+
 # homeassistant.components.hydrawise
 hydrawiser==0.1.1
 

From d076251b189c0a11f2bd528fdfdd0fb3d5dc8f5d Mon Sep 17 00:00:00 2001
From: Harvtronix <webmaster@harvtronix.com>
Date: Thu, 13 Sep 2018 10:38:07 -0400
Subject: [PATCH 139/357] Changing z-wave brightness calculation to respect
 0x01 and 0x02 byte values (#16420)

* Changing z-wave brightness calculation to respect 0x01 and 0x02 byte
values

* adding additional line breaks to satisfy houndci

* - Update comment style for linter
- Add additional unit test to increase code coverage

* Update zwave.py
---
 homeassistant/components/light/zwave.py | 12 +++++++++++-
 tests/components/light/test_zwave.py    | 20 ++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/light/zwave.py b/homeassistant/components/light/zwave.py
index 55feef496f8..1e768eb127a 100644
--- a/homeassistant/components/light/zwave.py
+++ b/homeassistant/components/light/zwave.py
@@ -63,6 +63,16 @@ def brightness_state(value):
     return 0, STATE_OFF
 
 
+def byte_to_zwave_brightness(value):
+    """Convert brightness in 0-255 scale to 0-99 scale.
+
+    `value` -- (int) Brightness byte value from 0-255.
+    """
+    if value > 0:
+        return max(1, int((value / 255) * 99))
+    return 0
+
+
 def ct_to_hs(temp):
     """Convert color temperature (mireds) to hs."""
     colorlist = list(
@@ -187,7 +197,7 @@ class ZwaveDimmer(zwave.ZWaveDeviceEntity, Light):
         # brightness. Level 255 means to set it to previous value.
         if ATTR_BRIGHTNESS in kwargs:
             self._brightness = kwargs[ATTR_BRIGHTNESS]
-            brightness = int((self._brightness / 255) * 99)
+            brightness = byte_to_zwave_brightness(self._brightness)
         else:
             brightness = 255
 
diff --git a/tests/components/light/test_zwave.py b/tests/components/light/test_zwave.py
index 62bcf834b98..5805c8eb2fb 100644
--- a/tests/components/light/test_zwave.py
+++ b/tests/components/light/test_zwave.py
@@ -105,6 +105,26 @@ def test_dimmer_turn_on(mock_openzwave):
         assert entity_id == device.entity_id
 
 
+def test_dimmer_min_brightness(mock_openzwave):
+    """Test turning on a dimmable Z-Wave light to its minimum brightness."""
+    node = MockNode()
+    value = MockValue(data=0, node=node)
+    values = MockLightValues(primary=value)
+    device = zwave.get_device(node=node, values=values, node_config={})
+
+    assert not device.is_on
+
+    device.turn_on(**{ATTR_BRIGHTNESS: 1})
+
+    assert device.is_on
+    assert device.brightness == 1
+
+    device.turn_on(**{ATTR_BRIGHTNESS: 0})
+
+    assert device.is_on
+    assert device.brightness == 0
+
+
 def test_dimmer_transitions(mock_openzwave):
     """Test dimming transition on a dimmable Z-Wave light."""
     node = MockNode()

From 67b5b5bc85c76303e2ccc88f70251631d93141c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Fri, 14 Sep 2018 09:42:23 +0300
Subject: [PATCH 140/357] Add myself to CODEOWNERS for upcloud (#16599)

---
 CODEOWNERS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CODEOWNERS b/CODEOWNERS
index 82262c8fa83..24c19c8b694 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -119,6 +119,8 @@ homeassistant/components/*/tesla.py @zabuldon
 homeassistant/components/tellduslive.py @molobrakos @fredrike
 homeassistant/components/*/tellduslive.py @molobrakos @fredrike
 homeassistant/components/*/tradfri.py @ggravlingen
+homeassistant/components/upcloud.py @scop
+homeassistant/components/*/upcloud.py @scop
 homeassistant/components/velux.py @Julius2342
 homeassistant/components/*/velux.py @Julius2342
 homeassistant/components/*/xiaomi_aqara.py @danielhiversen @syssi

From 05c07171674ee9f40c8ae29709d04d6b3d24db3c Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Fri, 14 Sep 2018 11:57:18 +0200
Subject: [PATCH 141/357] Add websocket list APIs for the registries (#16597)

* Add websocket list APIs for the registries

* Remove identifiers

* Fix tests

* Use ordered dict
---
 homeassistant/components/config/__init__.py   | 13 +++-
 .../components/config/device_registry.py      | 46 ++++++++++++++
 .../components/config/entity_registry.py      | 32 ++++++++++
 tests/common.py                               | 15 ++++-
 .../components/config/test_device_registry.py | 60 +++++++++++++++++++
 .../components/config/test_entity_registry.py | 45 ++++++++++++++
 tests/helpers/test_device_registry.py         | 18 +-----
 7 files changed, 210 insertions(+), 19 deletions(-)
 create mode 100644 homeassistant/components/config/device_registry.py
 create mode 100644 tests/components/config/test_device_registry.py

diff --git a/homeassistant/components/config/__init__.py b/homeassistant/components/config/__init__.py
index 581d8fc3f7b..df0e2f13ac1 100644
--- a/homeassistant/components/config/__init__.py
+++ b/homeassistant/components/config/__init__.py
@@ -13,8 +13,17 @@ from homeassistant.util.yaml import load_yaml, dump
 
 DOMAIN = 'config'
 DEPENDENCIES = ['http']
-SECTIONS = ('core', 'customize', 'group', 'hassbian', 'automation', 'script',
-            'entity_registry', 'config_entries')
+SECTIONS = (
+    'automation',
+    'config_entries',
+    'core',
+    'customize',
+    'device_registry',
+    'entity_registry',
+    'group',
+    'hassbian',
+    'script',
+)
 ON_DEMAND = ('zwave',)
 
 
diff --git a/homeassistant/components/config/device_registry.py b/homeassistant/components/config/device_registry.py
new file mode 100644
index 00000000000..8383e0cdc7d
--- /dev/null
+++ b/homeassistant/components/config/device_registry.py
@@ -0,0 +1,46 @@
+"""HTTP views to interact with the device registry."""
+import voluptuous as vol
+
+from homeassistant.core import callback
+from homeassistant.helpers.device_registry import async_get_registry
+from homeassistant.components import websocket_api
+
+DEPENDENCIES = ['websocket_api']
+
+WS_TYPE_LIST = 'config/device_registry/list'
+SCHEMA_WS_LIST = websocket_api.BASE_COMMAND_MESSAGE_SCHEMA.extend({
+    vol.Required('type'): WS_TYPE_LIST,
+})
+
+
+async def async_setup(hass):
+    """Enable the Entity Registry views."""
+    hass.components.websocket_api.async_register_command(
+        WS_TYPE_LIST, websocket_list_devices,
+        SCHEMA_WS_LIST
+    )
+    return True
+
+
+@callback
+def websocket_list_devices(hass, connection, msg):
+    """Handle list devices command.
+
+    Async friendly.
+    """
+    async def retrieve_entities():
+        """Get devices from registry."""
+        registry = await async_get_registry(hass)
+        connection.send_message_outside(websocket_api.result_message(
+            msg['id'], [{
+                'config_entries': list(entry.config_entries),
+                'connections': list(entry.connections),
+                'manufacturer': entry.manufacturer,
+                'model': entry.model,
+                'name': entry.name,
+                'sw_version': entry.sw_version,
+                'id': entry.id,
+            } for entry in registry.devices.values()]
+        ))
+
+    hass.async_add_job(retrieve_entities())
diff --git a/homeassistant/components/config/entity_registry.py b/homeassistant/components/config/entity_registry.py
index 2fac420c39c..0f9abf167e5 100644
--- a/homeassistant/components/config/entity_registry.py
+++ b/homeassistant/components/config/entity_registry.py
@@ -8,6 +8,11 @@ from homeassistant.helpers import config_validation as cv
 
 DEPENDENCIES = ['websocket_api']
 
+WS_TYPE_LIST = 'config/entity_registry/list'
+SCHEMA_WS_LIST = websocket_api.BASE_COMMAND_MESSAGE_SCHEMA.extend({
+    vol.Required('type'): WS_TYPE_LIST,
+})
+
 WS_TYPE_GET = 'config/entity_registry/get'
 SCHEMA_WS_GET = websocket_api.BASE_COMMAND_MESSAGE_SCHEMA.extend({
     vol.Required('type'): WS_TYPE_GET,
@@ -26,6 +31,10 @@ SCHEMA_WS_UPDATE = websocket_api.BASE_COMMAND_MESSAGE_SCHEMA.extend({
 
 async def async_setup(hass):
     """Enable the Entity Registry views."""
+    hass.components.websocket_api.async_register_command(
+        WS_TYPE_LIST, websocket_list_entities,
+        SCHEMA_WS_LIST
+    )
     hass.components.websocket_api.async_register_command(
         WS_TYPE_GET, websocket_get_entity,
         SCHEMA_WS_GET
@@ -37,6 +46,29 @@ async def async_setup(hass):
     return True
 
 
+@callback
+def websocket_list_entities(hass, connection, msg):
+    """Handle list registry entries command.
+
+    Async friendly.
+    """
+    async def retrieve_entities():
+        """Get entities from registry."""
+        registry = await async_get_registry(hass)
+        connection.send_message_outside(websocket_api.result_message(
+            msg['id'], [{
+                'config_entry_id': entry.config_entry_id,
+                'device_id': entry.device_id,
+                'disabled_by': entry.disabled_by,
+                'entity_id': entry.entity_id,
+                'name': entry.name,
+                'platform': entry.platform,
+            } for entry in registry.entities.values()]
+        ))
+
+    hass.async_add_job(retrieve_entities())
+
+
 @callback
 def websocket_get_entity(hass, connection, msg):
     """Handle get entity registry entry command.
diff --git a/tests/common.py b/tests/common.py
index 738c51fb3f0..26cd7743acc 100644
--- a/tests/common.py
+++ b/tests/common.py
@@ -19,7 +19,7 @@ from homeassistant.setup import setup_component, async_setup_component
 from homeassistant.config import async_process_component_config
 from homeassistant.helpers import (
     intent, entity, restore_state, entity_registry,
-    entity_platform, storage)
+    entity_platform, storage, device_registry)
 from homeassistant.util.unit_system import METRIC_SYSTEM
 import homeassistant.util.dt as date_util
 import homeassistant.util.yaml as yaml
@@ -332,6 +332,19 @@ def mock_registry(hass, mock_entries=None):
     return registry
 
 
+def mock_device_registry(hass, mock_entries=None):
+    """Mock the Device Registry."""
+    registry = device_registry.DeviceRegistry(hass)
+    registry.devices = mock_entries or OrderedDict()
+
+    async def _get_reg():
+        return registry
+
+    hass.data[device_registry.DATA_REGISTRY] = \
+        hass.loop.create_task(_get_reg())
+    return registry
+
+
 class MockUser(auth_models.User):
     """Mock a user in Home Assistant."""
 
diff --git a/tests/components/config/test_device_registry.py b/tests/components/config/test_device_registry.py
new file mode 100644
index 00000000000..491319bf927
--- /dev/null
+++ b/tests/components/config/test_device_registry.py
@@ -0,0 +1,60 @@
+"""Test entity_registry API."""
+import pytest
+
+from homeassistant.components.config import device_registry
+from tests.common import mock_device_registry
+
+
+@pytest.fixture
+def client(hass, hass_ws_client):
+    """Fixture that can interact with the config manager API."""
+    hass.loop.run_until_complete(device_registry.async_setup(hass))
+    yield hass.loop.run_until_complete(hass_ws_client(hass))
+
+
+@pytest.fixture
+def registry(hass):
+    """Return an empty, loaded, registry."""
+    return mock_device_registry(hass)
+
+
+async def test_list_devices(hass, client, registry):
+    """Test list entries."""
+    registry.async_get_or_create(
+        config_entry='1234',
+        connections={('ethernet', '12:34:56:78:90:AB:CD:EF')},
+        identifiers={('bridgeid', '0123')},
+        manufacturer='manufacturer', model='model')
+    registry.async_get_or_create(
+        config_entry='1234',
+        connections={},
+        identifiers={('bridgeid', '1234')},
+        manufacturer='manufacturer', model='model')
+
+    await client.send_json({
+        'id': 5,
+        'type': 'config/device_registry/list',
+    })
+    msg = await client.receive_json()
+
+    for entry in msg['result']:
+        entry.pop('id')
+
+    assert msg['result'] == [
+        {
+            'config_entries': ['1234'],
+            'connections': [['ethernet', '12:34:56:78:90:AB:CD:EF']],
+            'manufacturer': 'manufacturer',
+            'model': 'model',
+            'name': None,
+            'sw_version': None
+        },
+        {
+            'config_entries': ['1234'],
+            'connections': [],
+            'manufacturer': 'manufacturer',
+            'model': 'model',
+            'name': None,
+            'sw_version': None
+        }
+    ]
diff --git a/tests/components/config/test_entity_registry.py b/tests/components/config/test_entity_registry.py
index 559f29372de..cd74faf1843 100644
--- a/tests/components/config/test_entity_registry.py
+++ b/tests/components/config/test_entity_registry.py
@@ -1,4 +1,6 @@
 """Test entity_registry API."""
+from collections import OrderedDict
+
 import pytest
 
 from homeassistant.helpers.entity_registry import RegistryEntry
@@ -13,6 +15,49 @@ def client(hass, hass_ws_client):
     yield hass.loop.run_until_complete(hass_ws_client(hass))
 
 
+async def test_list_entities(hass, client):
+    """Test list entries."""
+    entities = OrderedDict()
+    entities['test_domain.name'] = RegistryEntry(
+        entity_id='test_domain.name',
+        unique_id='1234',
+        platform='test_platform',
+        name='Hello World'
+    )
+    entities['test_domain.no_name'] = RegistryEntry(
+        entity_id='test_domain.no_name',
+        unique_id='6789',
+        platform='test_platform',
+    )
+
+    mock_registry(hass, entities)
+
+    await client.send_json({
+        'id': 5,
+        'type': 'config/entity_registry/list',
+    })
+    msg = await client.receive_json()
+
+    assert msg['result'] == [
+        {
+            'config_entry_id': None,
+            'device_id': None,
+            'disabled_by': None,
+            'entity_id': 'test_domain.name',
+            'name': 'Hello World',
+            'platform': 'test_platform',
+        },
+        {
+            'config_entry_id': None,
+            'device_id': None,
+            'disabled_by': None,
+            'entity_id': 'test_domain.no_name',
+            'name': None,
+            'platform': 'test_platform',
+        }
+    ]
+
+
 async def test_get_entity(hass, client):
     """Test get entry."""
     mock_registry(hass, {
diff --git a/tests/helpers/test_device_registry.py b/tests/helpers/test_device_registry.py
index a9132529bc3..5ae6b4df651 100644
--- a/tests/helpers/test_device_registry.py
+++ b/tests/helpers/test_device_registry.py
@@ -1,28 +1,14 @@
 """Tests for the Device Registry."""
 import pytest
 
-from collections import OrderedDict
-
 from homeassistant.helpers import device_registry
-
-
-def mock_registry(hass, mock_entries=None):
-    """Mock the Device Registry."""
-    registry = device_registry.DeviceRegistry(hass)
-    registry.devices = mock_entries or OrderedDict()
-
-    async def _get_reg():
-        return registry
-
-    hass.data[device_registry.DATA_REGISTRY] = \
-        hass.loop.create_task(_get_reg())
-    return registry
+from tests.common import mock_device_registry
 
 
 @pytest.fixture
 def registry(hass):
     """Return an empty, loaded, registry."""
-    return mock_registry(hass)
+    return mock_device_registry(hass)
 
 
 async def test_get_or_create_returns_same_entry(registry):

From 72e746d240c42ed552cb3c10f5c44d9d210c58ad Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Fri, 14 Sep 2018 11:57:31 +0200
Subject: [PATCH 142/357] MQTT config entry (#16594)

* MQTT config entry

* Solely rely on config entry

* Improve wawrning

* Lint

* Lint2
---
 .../components/hangouts/.translations/en.json |   2 +
 .../homematicip_cloud/.translations/en.json   |   1 -
 .../components/mqtt/.translations/en.json     |  23 +++
 homeassistant/components/mqtt/__init__.py     | 182 ++++++++++++------
 homeassistant/components/mqtt/config_flow.py  |  98 ++++++++++
 homeassistant/components/mqtt/const.py        |   2 +
 homeassistant/components/mqtt/strings.json    |  23 +++
 homeassistant/config_entries.py               |  17 ++
 tests/components/mqtt/test_config_flow.py     |  85 ++++++++
 tests/components/mqtt/test_init.py            | 111 ++++++-----
 tests/components/mqtt/test_server.py          |  24 +--
 11 files changed, 435 insertions(+), 133 deletions(-)
 create mode 100644 homeassistant/components/mqtt/.translations/en.json
 create mode 100644 homeassistant/components/mqtt/config_flow.py
 create mode 100644 homeassistant/components/mqtt/const.py
 create mode 100644 homeassistant/components/mqtt/strings.json
 create mode 100644 tests/components/mqtt/test_config_flow.py

diff --git a/homeassistant/components/hangouts/.translations/en.json b/homeassistant/components/hangouts/.translations/en.json
index f526bec4f34..08d491e7009 100644
--- a/homeassistant/components/hangouts/.translations/en.json
+++ b/homeassistant/components/hangouts/.translations/en.json
@@ -14,6 +14,7 @@
                 "data": {
                     "2fa": "2FA Pin"
                 },
+                "description": "",
                 "title": "2-Factor-Authentication"
             },
             "user": {
@@ -21,6 +22,7 @@
                     "email": "E-Mail Address",
                     "password": "Password"
                 },
+                "description": "",
                 "title": "Google Hangouts Login"
             }
         },
diff --git a/homeassistant/components/homematicip_cloud/.translations/en.json b/homeassistant/components/homematicip_cloud/.translations/en.json
index 6fcfcddd75d..605bb0d250b 100644
--- a/homeassistant/components/homematicip_cloud/.translations/en.json
+++ b/homeassistant/components/homematicip_cloud/.translations/en.json
@@ -2,7 +2,6 @@
     "config": {
         "abort": {
             "already_configured": "Access point is already configured",
-            "conection_aborted": "Could not connect to HMIP server",
             "connection_aborted": "Could not connect to HMIP server",
             "unknown": "Unknown error occurred."
         },
diff --git a/homeassistant/components/mqtt/.translations/en.json b/homeassistant/components/mqtt/.translations/en.json
new file mode 100644
index 00000000000..1f0ed341bb6
--- /dev/null
+++ b/homeassistant/components/mqtt/.translations/en.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Only a single configuration of MQTT is allowed."
+        },
+        "error": {
+            "cannot_connect": "Unable to connect to the broker."
+        },
+        "step": {
+            "broker": {
+                "data": {
+                    "broker": "Broker",
+                    "password": "Password",
+                    "port": "Port",
+                    "username": "Username"
+                },
+                "description": "Please enter the connection information of your MQTT broker.",
+                "title": "MQTT"
+            }
+        },
+        "title": "MQTT"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/mqtt/__init__.py b/homeassistant/components/mqtt/__init__.py
index 6bb08d7e8e5..ac29671667f 100644
--- a/homeassistant/components/mqtt/__init__.py
+++ b/homeassistant/components/mqtt/__init__.py
@@ -18,6 +18,7 @@ import attr
 
 import voluptuous as vol
 
+from homeassistant import config_entries
 from homeassistant.helpers.typing import HomeAssistantType, ConfigType, \
     ServiceDataType
 from homeassistant.core import callback, Event, ServiceCall
@@ -30,8 +31,12 @@ from homeassistant.util.async_ import (
     run_coroutine_threadsafe, run_callback_threadsafe)
 from homeassistant.const import (
     EVENT_HOMEASSISTANT_STOP, CONF_VALUE_TEMPLATE, CONF_USERNAME,
-    CONF_PASSWORD, CONF_PORT, CONF_PROTOCOL, CONF_PAYLOAD)
+    CONF_PASSWORD, CONF_PORT, CONF_PROTOCOL, CONF_PAYLOAD,
+    EVENT_HOMEASSISTANT_START)
 
+# Loading the config flow file will register the flow
+from . import config_flow  # noqa  # pylint: disable=unused-import
+from .const import CONF_BROKER
 from .server import HBMQTT_CONFIG_SCHEMA
 
 REQUIREMENTS = ['paho-mqtt==1.3.1']
@@ -41,11 +46,12 @@ _LOGGER = logging.getLogger(__name__)
 DOMAIN = 'mqtt'
 
 DATA_MQTT = 'mqtt'
+DATA_MQTT_CONFIG = 'mqtt_config'
 
 SERVICE_PUBLISH = 'publish'
 
 CONF_EMBEDDED = 'embedded'
-CONF_BROKER = 'broker'
+
 CONF_CLIENT_ID = 'client_id'
 CONF_DISCOVERY = 'discovery'
 CONF_DISCOVERY_PREFIX = 'discovery_prefix'
@@ -311,6 +317,7 @@ async def _async_setup_server(hass: HomeAssistantType,
 
     if not success:
         return None
+
     return broker_config
 
 
@@ -340,19 +347,15 @@ async def async_setup(hass: HomeAssistantType, config: ConfigType) -> bool:
     conf = config.get(DOMAIN)  # type: Optional[ConfigType]
 
     if conf is None:
-        conf = CONFIG_SCHEMA({DOMAIN: {}})[DOMAIN]
-    conf = cast(ConfigType, conf)
+        # If we have a config entry, setup is done by that config entry.
+        # If there is no config entry, this should fail.
+        return bool(hass.config_entries.async_entries(DOMAIN))
 
-    client_id = conf.get(CONF_CLIENT_ID)  # type: Optional[str]
-    keepalive = conf.get(CONF_KEEPALIVE)  # type: int
+    conf = dict(conf)
 
-    # Only setup if embedded config passed in or no broker specified
-    if CONF_EMBEDDED not in conf and CONF_BROKER in conf:
-        broker_config = None
-    else:
+    if CONF_EMBEDDED in conf or CONF_BROKER not in conf:
         if (conf.get(CONF_PASSWORD) is None and
-                config.get('http') is not None and
-                config['http'].get('api_password') is not None):
+                config.get('http', {}).get('api_password') is not None):
             _LOGGER.error(
                 "Starting from release 0.76, the embedded MQTT broker does not"
                 " use api_password as default password anymore. Please set"
@@ -362,48 +365,98 @@ async def async_setup(hass: HomeAssistantType, config: ConfigType) -> bool:
 
         broker_config = await _async_setup_server(hass, config)
 
-    if CONF_BROKER in conf:
-        broker = conf[CONF_BROKER]  # type: str
-        port = conf[CONF_PORT]  # type: int
-        username = conf.get(CONF_USERNAME)  # type: Optional[str]
-        password = conf.get(CONF_PASSWORD)  # type: Optional[str]
-        certificate = conf.get(CONF_CERTIFICATE)  # type: Optional[str]
-        client_key = conf.get(CONF_CLIENT_KEY)  # type: Optional[str]
-        client_cert = conf.get(CONF_CLIENT_CERT)  # type: Optional[str]
-        tls_insecure = conf.get(CONF_TLS_INSECURE)  # type: Optional[bool]
-        protocol = conf[CONF_PROTOCOL]  # type: str
-    elif broker_config is not None:
-        # If no broker passed in, auto config to internal server
-        broker, port, username, password, certificate, protocol = broker_config
-        # Embedded broker doesn't have some ssl variables
-        client_key, client_cert, tls_insecure = None, None, None
-        # hbmqtt requires a client id to be set.
-        if client_id is None:
-            client_id = 'home-assistant'
-    else:
-        err = "Unable to start MQTT broker."
-        if conf.get(CONF_EMBEDDED) is not None:
-            # Explicit embedded config, requires explicit broker config
-            err += " (Broker configuration required.)"
-        _LOGGER.error(err)
+        if broker_config is None:
+            _LOGGER.error('Unable to start embedded MQTT broker')
+            return False
+
+        conf.update({
+            CONF_BROKER: broker_config[0],
+            CONF_PORT: broker_config[1],
+            CONF_USERNAME: broker_config[2],
+            CONF_PASSWORD: broker_config[3],
+            CONF_CERTIFICATE: broker_config[4],
+            CONF_PROTOCOL: broker_config[5],
+            CONF_CLIENT_KEY: None,
+            CONF_CLIENT_CERT: None,
+            CONF_TLS_INSECURE: None,
+        })
+
+    hass.data[DATA_MQTT_CONFIG] = conf
+
+    # Only import if we haven't before.
+    if not hass.config_entries.async_entries(DOMAIN):
+        hass.async_create_task(hass.config_entries.flow.async_init(
+            DOMAIN, context={'source': config_entries.SOURCE_IMPORT},
+            data={}
+        ))
+
+    if conf.get(CONF_DISCOVERY):
+        async def async_setup_discovery(event):
+            await _async_setup_discovery(hass, config)
+
+        hass.bus.async_listen_once(
+            EVENT_HOMEASSISTANT_START, async_setup_discovery)
+
+    return True
+
+
+async def async_setup_entry(hass, entry):
+    """Load a config entry."""
+    conf = hass.data.get(DATA_MQTT_CONFIG)
+
+    # Config entry was created because user had configuration.yaml entry
+    # They removed that, so remove entry.
+    if conf is None and entry.source == config_entries.SOURCE_IMPORT:
+        hass.async_create_task(
+            hass.config_entries.async_remove(entry.entry_id))
         return False
 
+    # If user didn't have configuration.yaml config, generate defaults
+    if conf is None:
+        conf = CONFIG_SCHEMA({
+            DOMAIN: entry.data
+        })[DOMAIN]
+    elif any(key in conf for key in entry.data):
+        _LOGGER.warning(
+            'Data in your config entry is going to override your '
+            'configuration.yaml: %s', entry.data)
+
+    conf.update(entry.data)
+
+    broker = conf[CONF_BROKER]
+    port = conf[CONF_PORT]
+    client_id = conf.get(CONF_CLIENT_ID)
+    keepalive = conf[CONF_KEEPALIVE]
+    username = conf.get(CONF_USERNAME)
+    password = conf.get(CONF_PASSWORD)
+    client_key = conf.get(CONF_CLIENT_KEY)
+    client_cert = conf.get(CONF_CLIENT_CERT)
+    tls_insecure = conf.get(CONF_TLS_INSECURE)
+    protocol = conf[CONF_PROTOCOL]
+
     # For cloudmqtt.com, secured connection, auto fill in certificate
-    if (certificate is None and 19999 < port < 30000 and
-            broker.endswith('.cloudmqtt.com')):
+    if (conf.get(CONF_CERTIFICATE) is None and
+            19999 < conf[CONF_PORT] < 30000 and
+            conf[CONF_BROKER].endswith('.cloudmqtt.com')):
         certificate = os.path.join(os.path.dirname(__file__),
                                    'addtrustexternalcaroot.crt')
 
     # When the certificate is set to auto, use bundled certs from requests
-    if certificate == 'auto':
+    elif conf.get(CONF_CERTIFICATE) == 'auto':
         certificate = requests.certs.where()
 
-    will_message = None  # type: Optional[Message]
-    if conf.get(CONF_WILL_MESSAGE) is not None:
-        will_message = Message(**conf.get(CONF_WILL_MESSAGE))
-    birth_message = None  # type: Optional[Message]
-    if conf.get(CONF_BIRTH_MESSAGE) is not None:
-        birth_message = Message(**conf.get(CONF_BIRTH_MESSAGE))
+    else:
+        certificate = None
+
+    if CONF_WILL_MESSAGE in conf:
+        will_message = Message(**conf[CONF_WILL_MESSAGE])
+    else:
+        will_message = None
+
+    if CONF_BIRTH_MESSAGE in conf:
+        birth_message = Message(**conf[CONF_BIRTH_MESSAGE])
+    else:
+        birth_message = None
 
     # Be able to override versions other than TLSv1.0 under Python3.6
     conf_tls_version = conf.get(CONF_TLS_VERSION)  # type: str
@@ -421,14 +474,27 @@ async def async_setup(hass: HomeAssistantType, config: ConfigType) -> bool:
         else:
             tls_version = ssl.PROTOCOL_TLSv1
 
-    try:
-        hass.data[DATA_MQTT] = MQTT(
-            hass, broker, port, client_id, keepalive, username, password,
-            certificate, client_key, client_cert, tls_insecure, protocol,
-            will_message, birth_message, tls_version)
-    except socket.error:
-        _LOGGER.exception("Can't connect to the broker. "
-                          "Please check your settings and the broker itself")
+    hass.data[DATA_MQTT] = MQTT(
+        hass,
+        broker=broker,
+        port=port,
+        client_id=client_id,
+        keepalive=keepalive,
+        username=username,
+        password=password,
+        certificate=certificate,
+        client_key=client_key,
+        client_cert=client_cert,
+        tls_insecure=tls_insecure,
+        protocol=protocol,
+        will_message=will_message,
+        birth_message=birth_message,
+        tls_version=tls_version,
+    )
+
+    success = await hass.data[DATA_MQTT].async_connect()  # type: bool
+
+    if not success:
         return False
 
     async def async_stop_mqtt(event: Event):
@@ -437,10 +503,6 @@ async def async_setup(hass: HomeAssistantType, config: ConfigType) -> bool:
 
     hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, async_stop_mqtt)
 
-    success = await hass.data[DATA_MQTT].async_connect()  # type: bool
-    if not success:
-        return False
-
     async def async_publish_service(call: ServiceCall):
         """Handle MQTT publish service calls."""
         msg_topic = call.data[ATTR_TOPIC]  # type: str
@@ -466,9 +528,6 @@ async def async_setup(hass: HomeAssistantType, config: ConfigType) -> bool:
         DOMAIN, SERVICE_PUBLISH, async_publish_service,
         schema=MQTT_PUBLISH_SCHEMA)
 
-    if conf.get(CONF_DISCOVERY):
-        await _async_setup_discovery(hass, config)
-
     return True
 
 
@@ -501,7 +560,8 @@ class MQTT:
                  certificate: Optional[str], client_key: Optional[str],
                  client_cert: Optional[str], tls_insecure: Optional[bool],
                  protocol: Optional[str], will_message: Optional[Message],
-                 birth_message: Optional[Message], tls_version) -> None:
+                 birth_message: Optional[Message],
+                 tls_version: Optional[int]) -> None:
         """Initialize Home Assistant MQTT client."""
         import paho.mqtt.client as mqtt
 
diff --git a/homeassistant/components/mqtt/config_flow.py b/homeassistant/components/mqtt/config_flow.py
new file mode 100644
index 00000000000..42bc324f8fc
--- /dev/null
+++ b/homeassistant/components/mqtt/config_flow.py
@@ -0,0 +1,98 @@
+"""Config flow for MQTT."""
+from collections import OrderedDict
+import queue
+
+import voluptuous as vol
+
+from homeassistant import config_entries
+from homeassistant.const import CONF_USERNAME, CONF_PASSWORD, CONF_PORT
+
+from .const import CONF_BROKER
+
+
+@config_entries.HANDLERS.register('mqtt')
+class FlowHandler(config_entries.ConfigFlow):
+    """Handle a config flow."""
+
+    VERSION = 1
+
+    async def async_step_user(self, user_input=None):
+        """Handle a flow initialized by the user."""
+        if self._async_current_entries():
+            return self.async_abort(
+                reason='single_instance_allowed'
+            )
+
+        return await self.async_step_broker()
+
+    async def async_step_broker(self, user_input=None):
+        """Confirm setup."""
+        errors = {}
+
+        if user_input is not None:
+            can_connect = await self.hass.async_add_executor_job(
+                try_connection, user_input[CONF_BROKER], user_input[CONF_PORT],
+                user_input.get(CONF_USERNAME), user_input.get(CONF_PASSWORD))
+
+            if can_connect:
+                return self.async_create_entry(
+                    title=user_input[CONF_BROKER],
+                    data=user_input
+                )
+
+            errors['base'] = 'cannot_connect'
+
+        fields = OrderedDict()
+        fields[vol.Required(CONF_BROKER)] = str
+        fields[vol.Required(CONF_PORT, default=1883)] = vol.Coerce(int)
+        fields[vol.Optional(CONF_USERNAME)] = str
+        fields[vol.Optional(CONF_PASSWORD)] = str
+
+        return self.async_show_form(
+            step_id='broker',
+            data_schema=vol.Schema(fields),
+            errors=errors,
+        )
+
+    async def async_step_import(self, user_input):
+        """Import a config entry.
+
+        Special type of import, we're not actually going to store any data.
+        Instead, we're going to rely on the values that are in config file.
+        """
+        if self._async_current_entries():
+            return self.async_abort(
+                reason='single_instance_allowed'
+            )
+
+        return self.async_create_entry(
+            title='configuration.yaml',
+            data={}
+        )
+
+
+def try_connection(broker, port, username, password):
+    """Test if we can connect to an MQTT broker."""
+    import paho.mqtt.client as mqtt
+    client = mqtt.Client()
+    if username and password:
+        client.username_pw_set(username, password)
+
+    result = queue.Queue(maxsize=1)
+
+    def on_connect(client_, userdata, flags, result_code):
+        """Handle connection result."""
+        result.put(result_code == mqtt.CONNACK_ACCEPTED)
+
+    client.on_connect = on_connect
+
+    client.connect_async(broker, port)
+    client.loop_start()
+
+    try:
+        return result.get(timeout=5)
+    except queue.Empty:
+        return False
+    finally:
+        client.disconnect()
+        client.loop_stop()
diff --git a/homeassistant/components/mqtt/const.py b/homeassistant/components/mqtt/const.py
new file mode 100644
index 00000000000..8f9d938cf88
--- /dev/null
+++ b/homeassistant/components/mqtt/const.py
@@ -0,0 +1,2 @@
+"""Constants used by multiple MQTT modules."""
+CONF_BROKER = 'broker'
diff --git a/homeassistant/components/mqtt/strings.json b/homeassistant/components/mqtt/strings.json
new file mode 100644
index 00000000000..a38983125ae
--- /dev/null
+++ b/homeassistant/components/mqtt/strings.json
@@ -0,0 +1,23 @@
+{
+  "config": {
+    "title": "MQTT",
+    "step": {
+      "broker": {
+        "title": "MQTT",
+        "description": "Please enter the connection information of your MQTT broker.",
+        "data": {
+          "broker": "Broker",
+          "port": "Port",
+          "username": "Username",
+          "password": "Password"
+        }
+      }
+    },
+    "abort": {
+      "single_instance_allowed": "Only a single configuration of MQTT is allowed."
+    },
+    "error": {
+      "cannot_connect": "Unable to connect to the broker."
+    }
+  }
+}
diff --git a/homeassistant/config_entries.py b/homeassistant/config_entries.py
index b06d6e7df55..b1e98d31048 100644
--- a/homeassistant/config_entries.py
+++ b/homeassistant/config_entries.py
@@ -141,6 +141,7 @@ FLOWS = [
     'homematicip_cloud',
     'hue',
     'ios',
+    'mqtt',
     'nest',
     'openuv',
     'sonos',
@@ -463,3 +464,19 @@ class ConfigEntries:
 async def _old_conf_migrator(old_config):
     """Migrate the pre-0.73 config format to the latest version."""
     return {'entries': old_config}
+
+
+class ConfigFlow(data_entry_flow.FlowHandler):
+    """Base class for config flows with some helpers."""
+
+    @callback
+    def _async_current_entries(self):
+        """Return current entries."""
+        return self.hass.config_entries.async_entries(self.handler)
+
+    @callback
+    def _async_in_progress(self):
+        """Return other in progress flows for current domain."""
+        return [flw for flw in self.hass.config_entries.flow.async_progress()
+                if flw['handler'] == self.handler and
+                flw['flow_id'] != self.flow_id]
diff --git a/tests/components/mqtt/test_config_flow.py b/tests/components/mqtt/test_config_flow.py
new file mode 100644
index 00000000000..4a4d783940f
--- /dev/null
+++ b/tests/components/mqtt/test_config_flow.py
@@ -0,0 +1,85 @@
+"""Test config flow."""
+from unittest.mock import patch
+
+import pytest
+
+from homeassistant.setup import async_setup_component
+
+from tests.common import mock_coro
+
+
+@pytest.fixture(autouse=True)
+def mock_finish_setup():
+    """Mock out the finish setup method."""
+    with patch('homeassistant.components.mqtt.MQTT.async_connect',
+               return_value=mock_coro(True)) as mock_finish:
+        yield mock_finish
+
+
+@pytest.fixture
+def mock_try_connection():
+    """Mock the try connection method."""
+    with patch(
+        'homeassistant.components.mqtt.config_flow.try_connection'
+    ) as mock_try:
+        yield mock_try
+
+
+async def test_user_connection_works(hass, mock_try_connection,
+                                     mock_finish_setup):
+    """Test we can finish a config flow."""
+    mock_try_connection.return_value = True
+
+    result = await hass.config_entries.flow.async_init(
+        'mqtt', context={'source': 'user'})
+    assert result['type'] == 'form'
+
+    result = await hass.config_entries.flow.async_configure(
+        result['flow_id'], {
+            'broker': '127.0.0.1',
+        }
+    )
+
+    assert result['type'] == 'create_entry'
+    # Check we tried the connection
+    assert len(mock_try_connection.mock_calls) == 1
+    # Check config entry got setup
+    assert len(mock_finish_setup.mock_calls) == 1
+
+
+async def test_user_connection_fails(hass, mock_try_connection,
+                                     mock_finish_setup):
+    """Test if connnection cannot be made."""
+    mock_try_connection.return_value = False
+
+    result = await hass.config_entries.flow.async_init(
+        'mqtt', context={'source': 'user'})
+    assert result['type'] == 'form'
+
+    result = await hass.config_entries.flow.async_configure(
+        result['flow_id'], {
+            'broker': '127.0.0.1',
+        }
+    )
+
+    assert result['type'] == 'form'
+    assert result['errors']['base'] == 'cannot_connect'
+
+    # Check we tried the connection
+    assert len(mock_try_connection.mock_calls) == 1
+    # Check config entry did not setup
+    assert len(mock_finish_setup.mock_calls) == 0
+
+
+async def test_manual_config_set(hass, mock_try_connection,
+                                 mock_finish_setup):
+    """Test we ignore entry if manual config available."""
+    assert await async_setup_component(
+        hass, 'mqtt', {'mqtt': {'broker': 'bla'}})
+    assert len(mock_finish_setup.mock_calls) == 1
+
+    mock_try_connection.return_value = True
+
+    result = await hass.config_entries.flow.async_init(
+        'mqtt', context={'source': 'user'})
+    assert result['type'] == 'abort'
diff --git a/tests/components/mqtt/test_init.py b/tests/components/mqtt/test_init.py
index 51bd75f66e3..831bcaa1d24 100644
--- a/tests/components/mqtt/test_init.py
+++ b/tests/components/mqtt/test_init.py
@@ -2,21 +2,29 @@
 import asyncio
 import unittest
 from unittest import mock
-import socket
 import ssl
 
+import pytest
 import voluptuous as vol
 
 from homeassistant.core import callback
 from homeassistant.setup import async_setup_component
-import homeassistant.components.mqtt as mqtt
+from homeassistant.components import mqtt
 from homeassistant.const import (EVENT_CALL_SERVICE, ATTR_DOMAIN, ATTR_SERVICE,
                                  EVENT_HOMEASSISTANT_STOP)
 
 from tests.common import (get_test_home_assistant, mock_coro,
                           mock_mqtt_component,
                           threadsafe_coroutine_factory, fire_mqtt_message,
-                          async_fire_mqtt_message)
+                          async_fire_mqtt_message, MockConfigEntry)
+
+
+@pytest.fixture
+def mock_MQTT():
+    """Make sure connection is established."""
+    with mock.patch('homeassistant.components.mqtt.MQTT') as mock_MQTT:
+        mock_MQTT.return_value.async_connect.return_value = mock_coro(True)
+        yield mock_MQTT
 
 
 @asyncio.coroutine
@@ -533,64 +541,59 @@ def test_setup_embedded_with_embedded(hass):
         assert _start.call_count == 1
 
 
-@asyncio.coroutine
-def test_setup_fails_if_no_connect_broker(hass):
+async def test_setup_fails_if_no_connect_broker(hass):
     """Test for setup failure if connection to broker is missing."""
-    test_broker_cfg = {mqtt.DOMAIN: {mqtt.CONF_BROKER: 'test-broker'}}
-
-    with mock.patch('homeassistant.components.mqtt.MQTT',
-                    side_effect=socket.error()):
-        result = yield from async_setup_component(hass, mqtt.DOMAIN,
-                                                  test_broker_cfg)
-        assert not result
+    entry = MockConfigEntry(domain=mqtt.DOMAIN, data={
+        mqtt.CONF_BROKER: 'test-broker'
+    })
 
     with mock.patch('paho.mqtt.client.Client') as mock_client:
         mock_client().connect = lambda *args: 1
-        result = yield from async_setup_component(hass, mqtt.DOMAIN,
-                                                  test_broker_cfg)
-        assert not result
+        assert not await mqtt.async_setup_entry(hass, entry)
 
 
-@asyncio.coroutine
-def test_setup_uses_certificate_on_certificate_set_to_auto(hass):
+async def test_setup_uses_certificate_on_certificate_set_to_auto(
+        hass, mock_MQTT):
     """Test setup uses bundled certs when certificate is set to auto."""
-    test_broker_cfg = {mqtt.DOMAIN: {mqtt.CONF_BROKER: 'test-broker',
-                                     'certificate': 'auto'}}
+    entry = MockConfigEntry(domain=mqtt.DOMAIN, data={
+        mqtt.CONF_BROKER: 'test-broker',
+        'certificate': 'auto'
+    })
 
-    with mock.patch('homeassistant.components.mqtt.MQTT') as mock_MQTT:
-        yield from async_setup_component(hass, mqtt.DOMAIN, test_broker_cfg)
+    assert await mqtt.async_setup_entry(hass, entry)
 
     assert mock_MQTT.called
 
     import requests.certs
     expectedCertificate = requests.certs.where()
-    assert mock_MQTT.mock_calls[0][1][7] == expectedCertificate
+    assert mock_MQTT.mock_calls[0][2]['certificate'] == expectedCertificate
 
 
-@asyncio.coroutine
-def test_setup_does_not_use_certificate_on_mqtts_port(hass):
-    """Test setup doesn't use bundled certs when certificate is not set."""
-    test_broker_cfg = {mqtt.DOMAIN: {mqtt.CONF_BROKER: 'test-broker',
-                                     'port': 8883}}
+async def test_setup_does_not_use_certificate_on_mqtts_port(hass, mock_MQTT):
+    """Test setup doesn't use bundled certs when ssl set."""
+    entry = MockConfigEntry(domain=mqtt.DOMAIN, data={
+        mqtt.CONF_BROKER: 'test-broker',
+        'port': 8883
+    })
 
-    with mock.patch('homeassistant.components.mqtt.MQTT') as mock_MQTT:
-        yield from async_setup_component(hass, mqtt.DOMAIN, test_broker_cfg)
+    assert await mqtt.async_setup_entry(hass, entry)
 
     assert mock_MQTT.called
-    assert mock_MQTT.mock_calls[0][1][2] == 8883
+    assert mock_MQTT.mock_calls[0][2]['port'] == 8883
 
     import requests.certs
     mqttsCertificateBundle = requests.certs.where()
-    assert mock_MQTT.mock_calls[0][1][7] != mqttsCertificateBundle
+    assert mock_MQTT.mock_calls[0][2]['port'] != mqttsCertificateBundle
 
 
-@asyncio.coroutine
-def test_setup_without_tls_config_uses_tlsv1_under_python36(hass):
+async def test_setup_without_tls_config_uses_tlsv1_under_python36(
+        hass, mock_MQTT):
     """Test setup defaults to TLSv1 under python3.6."""
-    test_broker_cfg = {mqtt.DOMAIN: {mqtt.CONF_BROKER: 'test-broker'}}
+    entry = MockConfigEntry(domain=mqtt.DOMAIN, data={
+        mqtt.CONF_BROKER: 'test-broker',
+    })
 
-    with mock.patch('homeassistant.components.mqtt.MQTT') as mock_MQTT:
-        yield from async_setup_component(hass, mqtt.DOMAIN, test_broker_cfg)
+    assert await mqtt.async_setup_entry(hass, entry)
 
     assert mock_MQTT.called
 
@@ -600,34 +603,35 @@ def test_setup_without_tls_config_uses_tlsv1_under_python36(hass):
     else:
         expectedTlsVersion = ssl.PROTOCOL_TLSv1
 
-    assert mock_MQTT.mock_calls[0][1][14] == expectedTlsVersion
+    assert mock_MQTT.mock_calls[0][2]['tls_version'] == expectedTlsVersion
 
 
-@asyncio.coroutine
-def test_setup_with_tls_config_uses_tls_version1_2(hass):
+async def test_setup_with_tls_config_uses_tls_version1_2(hass, mock_MQTT):
     """Test setup uses specified TLS version."""
-    test_broker_cfg = {mqtt.DOMAIN: {mqtt.CONF_BROKER: 'test-broker',
-                                     'tls_version': '1.2'}}
+    entry = MockConfigEntry(domain=mqtt.DOMAIN, data={
+        mqtt.CONF_BROKER: 'test-broker',
+        'tls_version': '1.2'
+    })
 
-    with mock.patch('homeassistant.components.mqtt.MQTT') as mock_MQTT:
-        yield from async_setup_component(hass, mqtt.DOMAIN, test_broker_cfg)
+    assert await mqtt.async_setup_entry(hass, entry)
 
     assert mock_MQTT.called
 
-    assert mock_MQTT.mock_calls[0][1][14] == ssl.PROTOCOL_TLSv1_2
+    assert mock_MQTT.mock_calls[0][2]['tls_version'] == ssl.PROTOCOL_TLSv1_2
 
 
-@asyncio.coroutine
-def test_setup_with_tls_config_of_v1_under_python36_only_uses_v1(hass):
+async def test_setup_with_tls_config_of_v1_under_python36_only_uses_v1(
+        hass, mock_MQTT):
     """Test setup uses TLSv1.0 if explicitly chosen."""
-    test_broker_cfg = {mqtt.DOMAIN: {mqtt.CONF_BROKER: 'test-broker',
-                                     'tls_version': '1.0'}}
+    entry = MockConfigEntry(domain=mqtt.DOMAIN, data={
+        mqtt.CONF_BROKER: 'test-broker',
+        'tls_version': '1.0'
+    })
 
-    with mock.patch('homeassistant.components.mqtt.MQTT') as mock_MQTT:
-        yield from async_setup_component(hass, mqtt.DOMAIN, test_broker_cfg)
+    assert await mqtt.async_setup_entry(hass, entry)
 
     assert mock_MQTT.called
-    assert mock_MQTT.mock_calls[0][1][14] == ssl.PROTOCOL_TLSv1
+    assert mock_MQTT.mock_calls[0][2]['tls_version'] == ssl.PROTOCOL_TLSv1
 
 
 @asyncio.coroutine
@@ -671,3 +675,8 @@ def test_mqtt_subscribes_topics_on_connect(hass):
     }
     calls = {call[1][1]: call[1][2] for call in hass.add_job.mock_calls}
     assert calls == expected
+
+
+async def test_setup_fails_without_config(hass):
+    """Test if the MQTT component fails to load with no config."""
+    assert not await async_setup_component(hass, mqtt.DOMAIN, {})
diff --git a/tests/components/mqtt/test_server.py b/tests/components/mqtt/test_server.py
index 976fdd3d15c..9f80f753690 100644
--- a/tests/components/mqtt/test_server.py
+++ b/tests/components/mqtt/test_server.py
@@ -57,8 +57,8 @@ class TestMQTT:
         assert mock_mqtt.called
         from pprint import pprint
         pprint(mock_mqtt.mock_calls)
-        assert mock_mqtt.mock_calls[1][1][5] == 'homeassistant'
-        assert mock_mqtt.mock_calls[1][1][6] == password
+        assert mock_mqtt.mock_calls[1][2]['username'] == 'homeassistant'
+        assert mock_mqtt.mock_calls[1][2]['password'] == password
 
     @patch('passlib.apps.custom_app_context', Mock(return_value=''))
     @patch('tempfile.NamedTemporaryFile', Mock(return_value=MagicMock()))
@@ -82,24 +82,8 @@ class TestMQTT:
         assert mock_mqtt.called
         from pprint import pprint
         pprint(mock_mqtt.mock_calls)
-        assert mock_mqtt.mock_calls[1][1][5] == 'homeassistant'
-        assert mock_mqtt.mock_calls[1][1][6] == password
-
-    @patch('passlib.apps.custom_app_context', Mock(return_value=''))
-    @patch('tempfile.NamedTemporaryFile', Mock(return_value=MagicMock()))
-    @patch('hbmqtt.broker.Broker', Mock(return_value=MagicMock()))
-    @patch('hbmqtt.broker.Broker.start', Mock(return_value=mock_coro()))
-    @patch('homeassistant.components.mqtt.MQTT')
-    def test_creating_config_without_pass(self, mock_mqtt):
-        """Test if the MQTT server gets started without password."""
-        mock_mqtt().async_connect.return_value = mock_coro(True)
-        self.hass.bus.listen_once = MagicMock()
-
-        self.hass.config.api = MagicMock(api_password=None)
-        assert setup_component(self.hass, mqtt.DOMAIN, {})
-        assert mock_mqtt.called
-        assert mock_mqtt.mock_calls[1][1][5] is None
-        assert mock_mqtt.mock_calls[1][1][6] is None
+        assert mock_mqtt.mock_calls[1][2]['username'] == 'homeassistant'
+        assert mock_mqtt.mock_calls[1][2]['password'] == password
 
     @patch('tempfile.NamedTemporaryFile', Mock(return_value=MagicMock()))
     @patch('hbmqtt.broker.Broker.start', return_value=mock_coro())

From 481f6e09face53c4c422700f8d774447fe475f22 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 14 Sep 2018 12:08:33 +0200
Subject: [PATCH 143/357] Upgrade python-twitch-client to 0.6.0 (#16602)

---
 homeassistant/components/sensor/twitch.py | 4 ++--
 requirements_all.txt                      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/sensor/twitch.py b/homeassistant/components/sensor/twitch.py
index 57e98bc273d..3e00f799dcf 100644
--- a/homeassistant/components/sensor/twitch.py
+++ b/homeassistant/components/sensor/twitch.py
@@ -12,7 +12,7 @@ from homeassistant.components.sensor import PLATFORM_SCHEMA
 from homeassistant.helpers.entity import Entity
 import homeassistant.helpers.config_validation as cv
 
-REQUIREMENTS = ['python-twitch-client==0.5.1']
+REQUIREMENTS = ['python-twitch-client==0.6.0']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -45,7 +45,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
         client.ingests.get_server_list()
     except HTTPError:
         _LOGGER.error("Client ID is not valid")
-        return False
+        return
 
     users = client.users.translate_usernames_to_ids(channels)
 
diff --git a/requirements_all.txt b/requirements_all.txt
index d740e915cbc..05e8c1d5ae1 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1154,7 +1154,7 @@ python-tado==0.2.3
 python-telegram-bot==11.0.0
 
 # homeassistant.components.sensor.twitch
-python-twitch-client==0.5.1
+python-twitch-client==0.6.0
 
 # homeassistant.components.velbus
 python-velbus==2.0.19

From e82e75baf3456ad16786562a6f0efb88e3ba4ad9 Mon Sep 17 00:00:00 2001
From: Anders Melchiorsen <amelchio@nogoto.net>
Date: Fri, 14 Sep 2018 12:28:09 +0200
Subject: [PATCH 144/357] Improve precision of timer ticks (#16598)

---
 homeassistant/core.py |  3 ++-
 tests/test_core.py    | 26 ++++++++++++++++++++------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/homeassistant/core.py b/homeassistant/core.py
index 39ee20cb1a8..18520ed5d0c 100644
--- a/homeassistant/core.py
+++ b/homeassistant/core.py
@@ -1256,4 +1256,5 @@ def _async_create_timer(hass: HomeAssistant) -> None:
     hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, stop_timer)
 
     _LOGGER.info("Timer:starting")
-    fire_time_event(monotonic())
+    slp_seconds = 1 - (dt_util.utcnow().microsecond / 10**6)
+    hass.loop.call_later(slp_seconds, lambda: fire_time_event(monotonic()))
diff --git a/tests/test_core.py b/tests/test_core.py
index 7e6d57136e4..4eecf995811 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -862,21 +862,29 @@ def test_create_timer(mock_monotonic, loop):
 
     with patch.object(ha, 'callback', mock_callback), \
             patch('homeassistant.core.dt_util.utcnow',
-                  return_value=sentinel.mock_date):
+                  return_value=datetime(2018, 12, 31, 3, 4, 5, 333333)):
         ha._async_create_timer(hass)
 
+    assert len(hass.loop.call_later.mock_calls) == 1
+    slp_seconds, action = hass.loop.call_later.mock_calls[0][1]
+    assert abs(slp_seconds - 0.666667) < 0.001
+
+    with patch('homeassistant.core.dt_util.utcnow',
+               return_value=sentinel.mock_date):
+        action()
+
         assert len(funcs) == 2
         fire_time_event, stop_timer = funcs
 
     assert len(hass.bus.async_listen_once.mock_calls) == 1
     assert len(hass.bus.async_fire.mock_calls) == 1
-    assert len(hass.loop.call_later.mock_calls) == 1
+    assert len(hass.loop.call_later.mock_calls) == 2
 
     event_type, callback = hass.bus.async_listen_once.mock_calls[0][1]
     assert event_type == EVENT_HOMEASSISTANT_STOP
     assert callback is stop_timer
 
-    slp_seconds, callback, nxt = hass.loop.call_later.mock_calls[0][1]
+    slp_seconds, callback, nxt = hass.loop.call_later.mock_calls[1][1]
     assert abs(slp_seconds - 0.9) < 0.001
     assert callback is fire_time_event
     assert abs(nxt - 11.2) < 0.001
@@ -901,15 +909,21 @@ def test_timer_out_of_sync(mock_monotonic, loop):
 
     with patch.object(ha, 'callback', mock_callback), \
             patch('homeassistant.core.dt_util.utcnow',
-                  return_value=sentinel.mock_date):
+                  return_value=datetime(2018, 12, 31, 3, 4, 5, 333333)):
         ha._async_create_timer(hass)
 
+    _, action = hass.loop.call_later.mock_calls[0][1]
+
+    with patch('homeassistant.core.dt_util.utcnow',
+               return_value=sentinel.mock_date):
+        action()
+
         assert len(funcs) == 2
         fire_time_event, stop_timer = funcs
 
-    assert len(hass.loop.call_later.mock_calls) == 1
+    assert len(hass.loop.call_later.mock_calls) == 2
 
-    slp_seconds, callback, nxt = hass.loop.call_later.mock_calls[0][1]
+    slp_seconds, callback, nxt = hass.loop.call_later.mock_calls[1][1]
     assert slp_seconds == 1
     assert callback is fire_time_event
     assert abs(nxt - 12.3) < 0.001

From 7705666061ce7afe1660780d97534805c89b14e4 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pascal.vizeli@syshack.ch>
Date: Fri, 14 Sep 2018 13:49:20 +0200
Subject: [PATCH 145/357] Rewrite bluetooth le (#16592)

* Rewrite bluetooth le

* Update requirements_all.txt

* Update gen_requirements_all.py

* Update bluetooth_le_tracker.py

* Update bluetooth_le_tracker.py

* Update bluetooth_le_tracker.py

* Update bluetooth_le_tracker.py

* Update bluetooth_le_tracker.py

* Update bluetooth_le_tracker.py
---
 .../device_tracker/bluetooth_le_tracker.py    | 35 +++++++------------
 requirements_all.txt                          |  4 +--
 script/gen_requirements_all.py                |  1 -
 3 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/homeassistant/components/device_tracker/bluetooth_le_tracker.py b/homeassistant/components/device_tracker/bluetooth_le_tracker.py
index d9cda24b699..47b86ab9ab2 100644
--- a/homeassistant/components/device_tracker/bluetooth_le_tracker.py
+++ b/homeassistant/components/device_tracker/bluetooth_le_tracker.py
@@ -6,35 +6,25 @@ https://home-assistant.io/components/device_tracker.bluetooth_le_tracker/
 """
 import logging
 
-import voluptuous as vol
 from homeassistant.helpers.event import track_point_in_utc_time
 from homeassistant.components.device_tracker import (
     YAML_DEVICES, CONF_TRACK_NEW, CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL,
-    PLATFORM_SCHEMA, load_config, SOURCE_TYPE_BLUETOOTH_LE
+    load_config, SOURCE_TYPE_BLUETOOTH_LE
 )
 import homeassistant.util.dt as dt_util
-import homeassistant.helpers.config_validation as cv
 
 _LOGGER = logging.getLogger(__name__)
 
-REQUIREMENTS = ['gattlib==0.20150805']
+REQUIREMENTS = ['pygatt==3.2.0']
 
 BLE_PREFIX = 'BLE_'
 MIN_SEEN_NEW = 5
-CONF_SCAN_DURATION = 'scan_duration'
-CONF_BLUETOOTH_DEVICE = 'device_id'
-
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Optional(CONF_SCAN_DURATION, default=10): cv.positive_int,
-    vol.Optional(CONF_BLUETOOTH_DEVICE, default='hci0'): cv.string
-})
 
 
 def setup_scanner(hass, config, see, discovery_info=None):
     """Set up the Bluetooth LE Scanner."""
     # pylint: disable=import-error
-    from gattlib import DiscoveryService
-
+    import pygatt
     new_devices = {}
 
     def see_device(address, name, new_device=False):
@@ -61,17 +51,17 @@ def setup_scanner(hass, config, see, discovery_info=None):
         """Discover Bluetooth LE devices."""
         _LOGGER.debug("Discovering Bluetooth LE devices")
         try:
-            service = DiscoveryService(ble_dev_id)
-            devices = service.discover(duration)
+            adapter = pygatt.GATTToolBackend()
+            devs = adapter.scan()
+
+            devices = {x['address']: x['name'] for x in devs}
             _LOGGER.debug("Bluetooth LE devices discovered = %s", devices)
         except RuntimeError as error:
             _LOGGER.error("Error during Bluetooth LE scan: %s", error)
-            devices = []
+            return {}
         return devices
 
     yaml_path = hass.config.path(YAML_DEVICES)
-    duration = config.get(CONF_SCAN_DURATION)
-    ble_dev_id = config.get(CONF_BLUETOOTH_DEVICE)
     devs_to_track = []
     devs_donot_track = []
 
@@ -102,11 +92,11 @@ def setup_scanner(hass, config, see, discovery_info=None):
         """Lookup Bluetooth LE devices and update status."""
         devs = discover_ble_devices()
         for mac in devs_to_track:
-            _LOGGER.debug("Checking %s", mac)
-            result = mac in devs
-            if not result:
-                # Could not lookup device name
+            if mac not in devs:
                 continue
+
+            if devs[mac] is None:
+                devs[mac] = mac
             see_device(mac, devs[mac])
 
         if track_new:
@@ -119,5 +109,4 @@ def setup_scanner(hass, config, see, discovery_info=None):
         track_point_in_utc_time(hass, update_ble, dt_util.utcnow() + interval)
 
     update_ble(dt_util.utcnow())
-
     return True
diff --git a/requirements_all.txt b/requirements_all.txt
index 05e8c1d5ae1..4aa1161ddcd 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -384,9 +384,6 @@ fritzhome==1.0.4
 # homeassistant.components.tts.google
 gTTS-token==1.1.1
 
-# homeassistant.components.device_tracker.bluetooth_le_tracker
-# gattlib==0.20150805
-
 # homeassistant.components.sensor.gearbest
 gearbest_parser==1.0.7
 
@@ -879,6 +876,7 @@ pyfritzhome==0.3.7
 # homeassistant.components.ifttt
 pyfttt==0.3
 
+# homeassistant.components.device_tracker.bluetooth_le_tracker
 # homeassistant.components.sensor.skybeacon
 pygatt==3.2.0
 
diff --git a/script/gen_requirements_all.py b/script/gen_requirements_all.py
index a307ec9ee15..ec024bef614 100755
--- a/script/gen_requirements_all.py
+++ b/script/gen_requirements_all.py
@@ -19,7 +19,6 @@ COMMENT_REQUIREMENTS = (
     'bluepy',
     'opencv-python',
     'python-lirc',
-    'gattlib',
     'pyuserinput',
     'evdev',
     'pycups',

From 0d0bda9658616d955bc410bf3d3eee30189b9395 Mon Sep 17 00:00:00 2001
From: Alexei Chetroi <lexoid@gmail.com>
Date: Fri, 14 Sep 2018 15:29:10 -0400
Subject: [PATCH 146/357] Switch components.sensor.zha to await syntax.
 (#16619)

---
 homeassistant/components/sensor/zha.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/homeassistant/components/sensor/zha.py b/homeassistant/components/sensor/zha.py
index 9962270dfd7..0d5b40d1d98 100644
--- a/homeassistant/components/sensor/zha.py
+++ b/homeassistant/components/sensor/zha.py
@@ -4,7 +4,6 @@ Sensors on Zigbee Home Automation networks.
 For more details on this platform, please refer to the documentation
 at https://home-assistant.io/components/sensor.zha/
 """
-import asyncio
 import logging
 
 from homeassistant.components.sensor import DOMAIN
@@ -17,20 +16,18 @@ _LOGGER = logging.getLogger(__name__)
 DEPENDENCIES = ['zha']
 
 
-@asyncio.coroutine
-def async_setup_platform(hass, config, async_add_entities,
-                         discovery_info=None):
+async def async_setup_platform(hass, config, async_add_entities,
+                               discovery_info=None):
     """Set up Zigbee Home Automation sensors."""
     discovery_info = zha.get_discovery_info(hass, discovery_info)
     if discovery_info is None:
         return
 
-    sensor = yield from make_sensor(discovery_info)
+    sensor = await make_sensor(discovery_info)
     async_add_entities([sensor], update_before_add=True)
 
 
-@asyncio.coroutine
-def make_sensor(discovery_info):
+async def make_sensor(discovery_info):
     """Create ZHA sensors factory."""
     from zigpy.zcl.clusters.measurement import (
         RelativeHumidity, TemperatureMeasurement, PressureMeasurement,
@@ -57,7 +54,7 @@ def make_sensor(discovery_info):
 
     if discovery_info['new_join']:
         cluster = list(in_clusters.values())[0]
-        yield from zha.configure_reporting(
+        await zha.configure_reporting(
             sensor.entity_id, cluster, sensor.value_attribute,
             reportable_change=sensor.min_reportable_change
         )

From 9c1a539f904ad81d815dc633739342af14214566 Mon Sep 17 00:00:00 2001
From: christopheBfr <43133099+christopheBfr@users.noreply.github.com>
Date: Fri, 14 Sep 2018 21:31:08 +0200
Subject: [PATCH 147/357] =?UTF-8?q?Adding=20support=20for=20RTDSContactSen?=
 =?UTF-8?q?sor=20and=20RTDSMotionSensor=20in=20Tahoma=20=E2=80=A6=20(RTS?=
 =?UTF-8?q?=20Alarms=20sensors=20and=20contacts=20for=20Somfy=20Protexiom?=
 =?UTF-8?q?=20alarms)=20(#16609)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Adding support for RTDSContactSensor and RTDSContactSensor in Tahoma component

* Removing extra blank lines
---
 homeassistant/components/sensor/tahoma.py | 19 ++++++++++++++++---
 homeassistant/components/tahoma.py        |  2 ++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/sensor/tahoma.py b/homeassistant/components/sensor/tahoma.py
index a59eb705498..5918bd7c9f8 100644
--- a/homeassistant/components/sensor/tahoma.py
+++ b/homeassistant/components/sensor/tahoma.py
@@ -56,6 +56,10 @@ class TahomaSensor(TahomaDevice, Entity):
             return 'lx'
         if self.tahoma_device.type == 'Humidity Sensor':
             return '%'
+        if self.tahoma_device.type == 'rtds:RTDSContactSensor':
+            return None
+        if self.tahoma_device.type == 'rtds:RTDSMotionSensor':
+            return None
 
     def update(self):
         """Update the state."""
@@ -63,12 +67,21 @@ class TahomaSensor(TahomaDevice, Entity):
         if self.tahoma_device.type == 'io:LightIOSystemSensor':
             self.current_value = self.tahoma_device.active_states[
                 'core:LuminanceState']
+            self._available = bool(self.tahoma_device.active_states.get(
+                'core:StatusState') == 'available')
         if self.tahoma_device.type == 'io:SomfyContactIOSystemSensor':
             self.current_value = self.tahoma_device.active_states[
                 'core:ContactState']
-
-        self._available = bool(self.tahoma_device.active_states.get(
-            'core:StatusState') == 'available')
+            self._available = bool(self.tahoma_device.active_states.get(
+                'core:StatusState') == 'available')
+        if self.tahoma_device.type == 'rtds:RTDSContactSensor':
+            self.current_value = self.tahoma_device.active_states[
+                'core:ContactState']
+            self._available = True
+        if self.tahoma_device.type == 'rtds:RTDSMotionSensor':
+            self.current_value = self.tahoma_device.active_states[
+                'core:OccupancyState']
+            self._available = True
 
         _LOGGER.debug("Update %s, value: %d", self._name, self.current_value)
 
diff --git a/homeassistant/components/tahoma.py b/homeassistant/components/tahoma.py
index 64071ddb037..366799b872c 100644
--- a/homeassistant/components/tahoma.py
+++ b/homeassistant/components/tahoma.py
@@ -54,6 +54,8 @@ TAHOMA_TYPES = {
     'io:HorizontalAwningIOComponent': 'cover',
     'io:OnOffLightIOComponent': 'switch',
     'rtds:RTDSSmokeSensor': 'smoke',
+    'rtds:RTDSContactSensor': 'sensor',
+    'rtds:RTDSMotionSensor': 'sensor'
 }
 
 

From 8ce2d701c294b7310b00648591fc6ebfae6f5243 Mon Sep 17 00:00:00 2001
From: Nate Clark <nate@nateclark.com>
Date: Fri, 14 Sep 2018 15:31:41 -0400
Subject: [PATCH 148/357] fix bug where momentary switch with activation low
 does not reset (#16603)

---
 homeassistant/components/switch/konnected.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/components/switch/konnected.py b/homeassistant/components/switch/konnected.py
index 20774accbd5..84016dac28d 100644
--- a/homeassistant/components/switch/konnected.py
+++ b/homeassistant/components/switch/konnected.py
@@ -83,7 +83,7 @@ class KonnectedSwitch(ToggleEntity):
 
             if self._momentary and resp.get(ATTR_STATE) != -1:
                 # Immediately set the state back off for momentary switches
-                self._set_state(self._boolean_state(False))
+                self._set_state(False)
 
     def turn_off(self, **kwargs):
         """Send a command to turn off the switch."""

From 1ca09ea36f80458cd9819d85b9aae29c1ed343a4 Mon Sep 17 00:00:00 2001
From: Rohan Kapoor <rohan@rohankapoor.com>
Date: Fri, 14 Sep 2018 23:44:48 -0700
Subject: [PATCH 149/357] Extracting zoneminder to a new library (#16527)

* Migrating out the zoneminder platform (and camera.zoneminder) to a new library

* Clean up the global variable ZM usage

* Modify camera.zoneminder to use the new Monitor class implementation

* Refactor camera.zoneminder after latest refactor in zm-py

* Implementing changes to switch.zoneminder to use zm-py native methods

* Complete migrating over sensor.zoneminder to the zm-py library

* Tweaking ZoneMinder components from code review

* Linting fixes for the zoneminder components

* Directly assign value when turning on/off in switch.zoneminder
---
 homeassistant/components/camera/zoneminder.py | 91 ++++-------------
 homeassistant/components/sensor/zoneminder.py | 76 +++++----------
 homeassistant/components/switch/zoneminder.py | 51 ++++------
 homeassistant/components/zoneminder.py        | 97 ++-----------------
 requirements_all.txt                          |  3 +
 5 files changed, 76 insertions(+), 242 deletions(-)

diff --git a/homeassistant/components/camera/zoneminder.py b/homeassistant/components/camera/zoneminder.py
index e48caa42a34..bda50a6f75c 100644
--- a/homeassistant/components/camera/zoneminder.py
+++ b/homeassistant/components/camera/zoneminder.py
@@ -4,91 +4,47 @@ Support for ZoneMinder camera streaming.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/camera.zoneminder/
 """
-import asyncio
 import logging
-from urllib.parse import urljoin, urlencode
 
 from homeassistant.const import CONF_NAME
 from homeassistant.components.camera.mjpeg import (
     CONF_MJPEG_URL, CONF_STILL_IMAGE_URL, MjpegCamera)
-
-from homeassistant.components import zoneminder
+from homeassistant.components.zoneminder import DOMAIN as ZONEMINDER_DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
 DEPENDENCIES = ['zoneminder']
-DOMAIN = 'zoneminder'
-
-# From ZoneMinder's web/includes/config.php.in
-ZM_STATE_ALARM = "2"
 
 
-def _get_image_url(hass, monitor, mode):
-    zm_data = hass.data[DOMAIN]
-    query = urlencode({
-        'mode': mode,
-        'buffer': monitor['StreamReplayBuffer'],
-        'monitor': monitor['Id'],
-    })
-    url = '{zms_url}?{query}'.format(
-        zms_url=urljoin(zm_data['server_origin'], zm_data['path_zms']),
-        query=query,
-    )
-    _LOGGER.debug('Monitor %s %s URL (without auth): %s',
-                  monitor['Id'], mode, url)
-
-    if not zm_data['username']:
-        return url
-
-    url += '&user={:s}'.format(zm_data['username'])
-
-    if not zm_data['password']:
-        return url
-
-    return url + '&pass={:s}'.format(zm_data['password'])
-
-
-@asyncio.coroutine
-def async_setup_platform(hass, config, async_add_entities,
-                         discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the ZoneMinder cameras."""
-    cameras = []
-    monitors = zoneminder.get_state('api/monitors.json')
+    zm_client = hass.data[ZONEMINDER_DOMAIN]
+
+    monitors = zm_client.get_monitors()
     if not monitors:
         _LOGGER.warning("Could not fetch monitors from ZoneMinder")
         return
 
-    for i in monitors['monitors']:
-        monitor = i['Monitor']
-
-        if monitor['Function'] == 'None':
-            _LOGGER.info("Skipping camera %s", monitor['Id'])
-            continue
-
-        _LOGGER.info("Initializing camera %s", monitor['Id'])
-
-        device_info = {
-            CONF_NAME: monitor['Name'],
-            CONF_MJPEG_URL: _get_image_url(hass, monitor, 'jpeg'),
-            CONF_STILL_IMAGE_URL: _get_image_url(hass, monitor, 'single')
-        }
-        cameras.append(ZoneMinderCamera(hass, device_info, monitor))
-
-    if not cameras:
-        _LOGGER.warning("No active cameras found")
-        return
-
-    async_add_entities(cameras)
+    cameras = []
+    for monitor in monitors:
+        _LOGGER.info("Initializing camera %s", monitor.id)
+        cameras.append(ZoneMinderCamera(hass, monitor))
+    add_entities(cameras)
 
 
 class ZoneMinderCamera(MjpegCamera):
     """Representation of a ZoneMinder Monitor Stream."""
 
-    def __init__(self, hass, device_info, monitor):
+    def __init__(self, hass, monitor):
         """Initialize as a subclass of MjpegCamera."""
+        device_info = {
+            CONF_NAME: monitor.name,
+            CONF_MJPEG_URL: monitor.mjpeg_image_url,
+            CONF_STILL_IMAGE_URL: monitor.still_image_url
+        }
         super().__init__(hass, device_info)
-        self._monitor_id = int(monitor['Id'])
         self._is_recording = None
+        self._monitor = monitor
 
     @property
     def should_poll(self):
@@ -97,17 +53,8 @@ class ZoneMinderCamera(MjpegCamera):
 
     def update(self):
         """Update our recording state from the ZM API."""
-        _LOGGER.debug("Updating camera state for monitor %i", self._monitor_id)
-        status_response = zoneminder.get_state(
-            'api/monitors/alarm/id:%i/command:status.json' % self._monitor_id
-        )
-
-        if not status_response:
-            _LOGGER.warning("Could not get status for monitor %i",
-                            self._monitor_id)
-            return
-
-        self._is_recording = status_response.get('status') == ZM_STATE_ALARM
+        _LOGGER.debug("Updating camera state for monitor %i", self._monitor.id)
+        self._is_recording = self._monitor.is_recording
 
     @property
     def is_recording(self):
diff --git a/homeassistant/components/sensor/zoneminder.py b/homeassistant/components/sensor/zoneminder.py
index 80f8529d847..d4164bbf721 100644
--- a/homeassistant/components/sensor/zoneminder.py
+++ b/homeassistant/components/sensor/zoneminder.py
@@ -8,12 +8,11 @@ import logging
 
 import voluptuous as vol
 
+import homeassistant.helpers.config_validation as cv
 from homeassistant.components.sensor import PLATFORM_SCHEMA
-from homeassistant.const import STATE_UNKNOWN
+from homeassistant.components.zoneminder import DOMAIN as ZONEMINDER_DOMAIN
 from homeassistant.const import CONF_MONITORED_CONDITIONS
 from homeassistant.helpers.entity import Entity
-from homeassistant.components import zoneminder
-import homeassistant.helpers.config_validation as cv
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -43,20 +42,17 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the ZoneMinder sensor platform."""
     include_archived = config.get(CONF_INCLUDE_ARCHIVED)
 
-    sensors = []
+    zm_client = hass.data[ZONEMINDER_DOMAIN]
+    monitors = zm_client.get_monitors()
+    if not monitors:
+        _LOGGER.warning('Could not fetch any monitors from ZoneMinder')
 
-    monitors = zoneminder.get_state('api/monitors.json')
-    for i in monitors['monitors']:
-        sensors.append(
-            ZMSensorMonitors(int(i['Monitor']['Id']), i['Monitor']['Name'])
-        )
+    sensors = []
+    for monitor in monitors:
+        sensors.append(ZMSensorMonitors(monitor))
 
         for sensor in config[CONF_MONITORED_CONDITIONS]:
-            sensors.append(
-                ZMSensorEvents(int(i['Monitor']['Id']),
-                               i['Monitor']['Name'],
-                               include_archived, sensor)
-            )
+            sensors.append(ZMSensorEvents(monitor, include_archived, sensor))
 
     add_entities(sensors)
 
@@ -64,16 +60,15 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
 class ZMSensorMonitors(Entity):
     """Get the status of each ZoneMinder monitor."""
 
-    def __init__(self, monitor_id, monitor_name):
+    def __init__(self, monitor):
         """Initialize monitor sensor."""
-        self._monitor_id = monitor_id
-        self._monitor_name = monitor_name
-        self._state = None
+        self._monitor = monitor
+        self._state = monitor.function.value
 
     @property
     def name(self):
         """Return the name of the sensor."""
-        return '{} Status'.format(self._monitor_name)
+        return '{} Status'.format(self._monitor.name)
 
     @property
     def state(self):
@@ -82,32 +77,28 @@ class ZMSensorMonitors(Entity):
 
     def update(self):
         """Update the sensor."""
-        monitor = zoneminder.get_state(
-            'api/monitors/{}.json'.format(self._monitor_id)
-        )
-        if monitor['monitor']['Monitor']['Function'] is None:
-            self._state = STATE_UNKNOWN
+        state = self._monitor.function
+        if not state:
+            self._state = None
         else:
-            self._state = monitor['monitor']['Monitor']['Function']
+            self._state = state.value
 
 
 class ZMSensorEvents(Entity):
     """Get the number of events for each monitor."""
 
-    def __init__(self, monitor_id, monitor_name, include_archived,
-                 sensor_type):
+    def __init__(self, monitor, include_archived, sensor_type):
         """Initialize event sensor."""
-        self._monitor_id = monitor_id
-        self._monitor_name = monitor_name
+        from zoneminder.monitor import TimePeriod
+        self._monitor = monitor
         self._include_archived = include_archived
-        self._type = sensor_type
-        self._name = SENSOR_TYPES[sensor_type][0]
+        self.time_period = TimePeriod.get_time_period(sensor_type)
         self._state = None
 
     @property
     def name(self):
         """Return the name of the sensor."""
-        return '{} {}'.format(self._monitor_name, self._name)
+        return '{} {}'.format(self._monitor.name, self.time_period.title)
 
     @property
     def unit_of_measurement(self):
@@ -121,22 +112,5 @@ class ZMSensorEvents(Entity):
 
     def update(self):
         """Update the sensor."""
-        date_filter = '1%20{}'.format(self._type)
-        if self._type == 'all':
-            # The consoleEvents API uses DATE_SUB, so give it
-            # something large
-            date_filter = '100%20year'
-
-        archived_filter = '/Archived=:0'
-        if self._include_archived:
-            archived_filter = ''
-
-        event = zoneminder.get_state(
-            'api/events/consoleEvents/{}{}.json'.format(date_filter,
-                                                        archived_filter)
-        )
-
-        try:
-            self._state = event['results'][str(self._monitor_id)]
-        except (TypeError, KeyError):
-            self._state = '0'
+        self._state = self._monitor.get_events(
+            self.time_period, self._include_archived)
diff --git a/homeassistant/components/switch/zoneminder.py b/homeassistant/components/switch/zoneminder.py
index 496e7549aaa..265f94fbbb1 100644
--- a/homeassistant/components/switch/zoneminder.py
+++ b/homeassistant/components/switch/zoneminder.py
@@ -9,8 +9,8 @@ import logging
 import voluptuous as vol
 
 from homeassistant.components.switch import (SwitchDevice, PLATFORM_SCHEMA)
+from homeassistant.components.zoneminder import DOMAIN as ZONEMINDER_DOMAIN
 from homeassistant.const import (CONF_COMMAND_ON, CONF_COMMAND_OFF)
-from homeassistant.components import zoneminder
 import homeassistant.helpers.config_validation as cv
 
 _LOGGER = logging.getLogger(__name__)
@@ -25,22 +25,20 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the ZoneMinder switch platform."""
-    on_state = config.get(CONF_COMMAND_ON)
-    off_state = config.get(CONF_COMMAND_OFF)
+    from zoneminder.monitor import MonitorState
+    on_state = MonitorState(config.get(CONF_COMMAND_ON))
+    off_state = MonitorState(config.get(CONF_COMMAND_OFF))
+
+    zm_client = hass.data[ZONEMINDER_DOMAIN]
+
+    monitors = zm_client.get_monitors()
+    if not monitors:
+        _LOGGER.warning('Could not fetch monitors from ZoneMinder')
+        return
 
     switches = []
-
-    monitors = zoneminder.get_state('api/monitors.json')
-    for i in monitors['monitors']:
-        switches.append(
-            ZMSwitchMonitors(
-                int(i['Monitor']['Id']),
-                i['Monitor']['Name'],
-                on_state,
-                off_state
-            )
-        )
-
+    for monitor in monitors:
+        switches.append(ZMSwitchMonitors(monitor, on_state, off_state))
     add_entities(switches)
 
 
@@ -49,10 +47,9 @@ class ZMSwitchMonitors(SwitchDevice):
 
     icon = 'mdi:record-rec'
 
-    def __init__(self, monitor_id, monitor_name, on_state, off_state):
+    def __init__(self, monitor, on_state, off_state):
         """Initialize the switch."""
-        self._monitor_id = monitor_id
-        self._monitor_name = monitor_name
+        self._monitor = monitor
         self._on_state = on_state
         self._off_state = off_state
         self._state = None
@@ -60,15 +57,11 @@ class ZMSwitchMonitors(SwitchDevice):
     @property
     def name(self):
         """Return the name of the switch."""
-        return "%s State" % self._monitor_name
+        return '{}\'s State'.format(self._monitor.name)
 
     def update(self):
         """Update the switch value."""
-        monitor = zoneminder.get_state(
-            'api/monitors/%i.json' % self._monitor_id
-        )
-        current_state = monitor['monitor']['Monitor']['Function']
-        self._state = True if current_state == self._on_state else False
+        self._state = self._monitor.function == self._on_state
 
     @property
     def is_on(self):
@@ -77,14 +70,8 @@ class ZMSwitchMonitors(SwitchDevice):
 
     def turn_on(self, **kwargs):
         """Turn the entity on."""
-        zoneminder.change_state(
-            'api/monitors/%i.json' % self._monitor_id,
-            {'Monitor[Function]': self._on_state}
-        )
+        self._monitor.function = self._on_state
 
     def turn_off(self, **kwargs):
         """Turn the entity off."""
-        zoneminder.change_state(
-            'api/monitors/%i.json' % self._monitor_id,
-            {'Monitor[Function]': self._off_state}
-        )
+        self._monitor.function = self._off_state
diff --git a/homeassistant/components/zoneminder.py b/homeassistant/components/zoneminder.py
index 5c045544456..0778d9d7ef7 100644
--- a/homeassistant/components/zoneminder.py
+++ b/homeassistant/components/zoneminder.py
@@ -5,9 +5,7 @@ For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/zoneminder/
 """
 import logging
-from urllib.parse import urljoin
 
-import requests
 import voluptuous as vol
 
 from homeassistant.const import (
@@ -17,6 +15,8 @@ import homeassistant.helpers.config_validation as cv
 
 _LOGGER = logging.getLogger(__name__)
 
+REQUIREMENTS = ['zm-py==0.0.1']
+
 CONF_PATH_ZMS = 'path_zms'
 
 DEFAULT_PATH = '/zm/'
@@ -26,10 +26,6 @@ DEFAULT_TIMEOUT = 10
 DEFAULT_VERIFY_SSL = True
 DOMAIN = 'zoneminder'
 
-LOGIN_RETRIES = 2
-
-ZM = {}
-
 CONFIG_SCHEMA = vol.Schema({
     DOMAIN: vol.Schema({
         vol.Required(CONF_HOST): cv.string,
@@ -45,8 +41,7 @@ CONFIG_SCHEMA = vol.Schema({
 
 def setup(hass, config):
     """Set up the ZoneMinder component."""
-    global ZM
-    ZM = {}
+    from zoneminder.zm import ZoneMinder
 
     conf = config[DOMAIN]
     if conf[CONF_SSL]:
@@ -55,83 +50,11 @@ def setup(hass, config):
         schema = 'http'
 
     server_origin = '{}://{}'.format(schema, conf[CONF_HOST])
-    url = urljoin(server_origin, conf[CONF_PATH])
-    username = conf.get(CONF_USERNAME, None)
-    password = conf.get(CONF_PASSWORD, None)
+    hass.data[DOMAIN] = ZoneMinder(server_origin,
+                                   conf.get(CONF_USERNAME),
+                                   conf.get(CONF_PASSWORD),
+                                   conf.get(CONF_PATH),
+                                   conf.get(CONF_PATH_ZMS),
+                                   conf.get(CONF_VERIFY_SSL))
 
-    ssl_verification = conf.get(CONF_VERIFY_SSL)
-
-    ZM['server_origin'] = server_origin
-    ZM['url'] = url
-    ZM['username'] = username
-    ZM['password'] = password
-    ZM['path_zms'] = conf.get(CONF_PATH_ZMS)
-    ZM['ssl_verification'] = ssl_verification
-
-    hass.data[DOMAIN] = ZM
-
-    return login()
-
-
-def login():
-    """Login to the ZoneMinder API."""
-    _LOGGER.debug("Attempting to login to ZoneMinder")
-
-    login_post = {'view': 'console', 'action': 'login'}
-    if ZM['username']:
-        login_post['username'] = ZM['username']
-    if ZM['password']:
-        login_post['password'] = ZM['password']
-
-    req = requests.post(ZM['url'] + '/index.php', data=login_post,
-                        verify=ZM['ssl_verification'], timeout=DEFAULT_TIMEOUT)
-
-    ZM['cookies'] = req.cookies
-
-    # Login calls returns a 200 response on both failure and success.
-    # The only way to tell if you logged in correctly is to issue an api call.
-    req = requests.get(
-        ZM['url'] + 'api/host/getVersion.json', cookies=ZM['cookies'],
-        timeout=DEFAULT_TIMEOUT, verify=ZM['ssl_verification'])
-
-    if not req.ok:
-        _LOGGER.error("Connection error logging into ZoneMinder")
-        return False
-
-    return True
-
-
-def _zm_request(method, api_url, data=None):
-    """Perform a Zoneminder request."""
-    # Since the API uses sessions that expire, sometimes we need to re-auth
-    # if the call fails.
-    for _ in range(LOGIN_RETRIES):
-        req = requests.request(
-            method, urljoin(ZM['url'], api_url), data=data,
-            cookies=ZM['cookies'], timeout=DEFAULT_TIMEOUT,
-            verify=ZM['ssl_verification'])
-
-        if not req.ok:
-            login()
-        else:
-            break
-
-    else:
-        _LOGGER.error("Unable to get API response from ZoneMinder")
-
-    try:
-        return req.json()
-    except ValueError:
-        _LOGGER.exception(
-            "JSON decode exception caught while attempting to decode: %s",
-            req.text)
-
-
-def get_state(api_url):
-    """Get a state from the ZoneMinder API service."""
-    return _zm_request('get', api_url)
-
-
-def change_state(api_url, post_data):
-    """Update a state using the Zoneminder API."""
-    return _zm_request('post', api_url, data=post_data)
+    return hass.data[DOMAIN].login()
diff --git a/requirements_all.txt b/requirements_all.txt
index 4aa1161ddcd..ec5bf752393 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1541,3 +1541,6 @@ zigpy-xbee==0.1.1
 
 # homeassistant.components.zha
 zigpy==0.2.0
+
+# homeassistant.components.zoneminder
+zm-py==0.0.1

From 0c945d81c83f37adeade33217e224cc3990c7b67 Mon Sep 17 00:00:00 2001
From: Rohan Kapoor <rohan@rohankapoor.com>
Date: Sat, 15 Sep 2018 00:25:21 -0700
Subject: [PATCH 150/357] Add @rohankapoorcom to CODEOWNERS for the zoneminder
 platform (#16627)

---
 CODEOWNERS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CODEOWNERS b/CODEOWNERS
index 24c19c8b694..68d0d4a833d 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -125,5 +125,7 @@ homeassistant/components/velux.py @Julius2342
 homeassistant/components/*/velux.py @Julius2342
 homeassistant/components/*/xiaomi_aqara.py @danielhiversen @syssi
 homeassistant/components/*/xiaomi_miio.py @rytilahti @syssi
+homeassistant/components/zoneminder.py @rohankapoorcom
+homeassistant/components/*/zoneminder.py @rohankapoorcom
 
 homeassistant/scripts/check_config.py @kellerza

From e054e4da1bc89e505d066c8f749bc599e50d1c64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 15 Sep 2018 10:42:36 +0300
Subject: [PATCH 151/357] Small huawei_lte improvements (#16626)

* Add bunch of RouterData tests

* Avoid raising AttributeError from RouterData.__getitem__

* Use new style string formatting

* Use {key: value} instead of dict(key=value)
---
 homeassistant/components/huawei_lte.py        |  8 +++-
 homeassistant/components/sensor/huawei_lte.py |  2 +-
 tests/components/huawei_lte.py                | 48 +++++++++++++++++++
 3 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 tests/components/huawei_lte.py

diff --git a/homeassistant/components/huawei_lte.py b/homeassistant/components/huawei_lte.py
index 268289d2bf5..33da6be56db 100644
--- a/homeassistant/components/huawei_lte.py
+++ b/homeassistant/components/huawei_lte.py
@@ -55,8 +55,12 @@ class RouterData:
         such as device_information, device_signal etc, and the remaining
         path points to a value in the member's data structure.
         """
-        cat, *path_ = path.split(".")
-        return reduce(operator.getitem, path_, getattr(self, cat))
+        root, *rest = path.split(".")
+        try:
+            data = getattr(self, root)
+        except AttributeError as err:
+            raise KeyError from err
+        return reduce(operator.getitem, rest, data)
 
     @Throttle(MIN_TIME_BETWEEN_UPDATES)
     def update(self) -> None:
diff --git a/homeassistant/components/sensor/huawei_lte.py b/homeassistant/components/sensor/huawei_lte.py
index d73472a705b..f5a21999ab8 100644
--- a/homeassistant/components/sensor/huawei_lte.py
+++ b/homeassistant/components/sensor/huawei_lte.py
@@ -113,7 +113,7 @@ class HuaweiLteSensor(Entity):
     @property
     def unique_id(self) -> str:
         """Return unique ID for sensor."""
-        return "%s_%s" % (
+        return "{}_{}".format(
             self.path,
             self.data["device_information.SerialNumber"],
         )
diff --git a/tests/components/huawei_lte.py b/tests/components/huawei_lte.py
new file mode 100644
index 00000000000..0fe803208ff
--- /dev/null
+++ b/tests/components/huawei_lte.py
@@ -0,0 +1,48 @@
+"""Huawei LTE component tests."""
+import pytest
+
+from homeassistant.components import huawei_lte
+
+
+@pytest.fixture(autouse=True)
+def routerdata():
+    """Set up a router data for testing."""
+    rd = huawei_lte.RouterData(None)
+    rd.device_information = {
+        'SoftwareVersion': '1.0',
+        'nested': {'foo': 'bar'},
+    }
+    return rd
+
+
+async def test_routerdata_get_nonexistent_root(routerdata):
+    """Test that accessing a nonexistent root element raises KeyError."""
+    with pytest.raises(KeyError):  # NOT AttributeError
+        routerdata["nonexistent_root.foo"]
+
+
+async def test_routerdata_get_nonexistent_leaf(routerdata):
+    """Test that accessing a nonexistent leaf element raises KeyError."""
+    with pytest.raises(KeyError):
+        routerdata["device_information.foo"]
+
+
+async def test_routerdata_get_nonexistent_leaf_path(routerdata):
+    """Test that accessing a nonexistent long path raises KeyError."""
+    with pytest.raises(KeyError):
+        routerdata["device_information.long.path.foo"]
+
+
+async def test_routerdata_get_simple(routerdata):
+    """Test that accessing a short, simple path works."""
+    assert routerdata["device_information.SoftwareVersion"] == "1.0"
+
+
+async def test_routerdata_get_longer(routerdata):
+    """Test that accessing a longer path works."""
+    assert routerdata["device_information.nested.foo"] == "bar"
+
+
+async def test_routerdata_get_dict(routerdata):
+    """Test that returning an intermediate dict works."""
+    assert routerdata["device_information.nested"] == {'foo': 'bar'}

From 00918af94df0ed9be4e7243ebecbb54b4e85533c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Oldag?= <soeren_oldag@freenet.de>
Date: Sat, 15 Sep 2018 10:08:52 +0200
Subject: [PATCH 152/357] Upgrade pwmled to 1.3.0 (#16624)

---
 homeassistant/components/light/rpi_gpio_pwm.py | 2 +-
 requirements_all.txt                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/light/rpi_gpio_pwm.py b/homeassistant/components/light/rpi_gpio_pwm.py
index 5a0e0546b1f..25c72c247ee 100644
--- a/homeassistant/components/light/rpi_gpio_pwm.py
+++ b/homeassistant/components/light/rpi_gpio_pwm.py
@@ -15,7 +15,7 @@ from homeassistant.components.light import (
 import homeassistant.helpers.config_validation as cv
 import homeassistant.util.color as color_util
 
-REQUIREMENTS = ['pwmled==1.2.1']
+REQUIREMENTS = ['pwmled==1.3.0']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/requirements_all.txt b/requirements_all.txt
index ec5bf752393..d9cf55041cc 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -721,7 +721,7 @@ pushbullet.py==0.11.0
 pushetta==1.0.15
 
 # homeassistant.components.light.rpi_gpio_pwm
-pwmled==1.2.1
+pwmled==1.3.0
 
 # homeassistant.components.august
 py-august==0.6.0

From 19514ea500c444d11ed05879c7da734b16143d2a Mon Sep 17 00:00:00 2001
From: Rohan Kapoor <rohan@rohankapoor.com>
Date: Sat, 15 Sep 2018 02:26:29 -0700
Subject: [PATCH 153/357] Clean up MjpegCamera by removing unnused hass object
 in __init__ (#16628)

---
 homeassistant/components/camera/axis.py       | 2 +-
 homeassistant/components/camera/mjpeg.py      | 4 ++--
 homeassistant/components/camera/zoneminder.py | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/homeassistant/components/camera/axis.py b/homeassistant/components/camera/axis.py
index 5630759a7f8..4227cca7e2f 100644
--- a/homeassistant/components/camera/axis.py
+++ b/homeassistant/components/camera/axis.py
@@ -50,7 +50,7 @@ class AxisCamera(MjpegCamera):
 
     def __init__(self, hass, config, port):
         """Initialize Axis Communications camera component."""
-        super().__init__(hass, config)
+        super().__init__(config)
         self.port = port
         dispatcher_connect(
             hass, DOMAIN + '_' + config[CONF_NAME] + '_new_ip', self._new_ip)
diff --git a/homeassistant/components/camera/mjpeg.py b/homeassistant/components/camera/mjpeg.py
index ed7d58658ed..f1917aaf23e 100644
--- a/homeassistant/components/camera/mjpeg.py
+++ b/homeassistant/components/camera/mjpeg.py
@@ -47,7 +47,7 @@ def async_setup_platform(hass, config, async_add_entities,
     """Set up a MJPEG IP Camera."""
     if discovery_info:
         config = PLATFORM_SCHEMA(discovery_info)
-    async_add_entities([MjpegCamera(hass, config)])
+    async_add_entities([MjpegCamera(config)])
 
 
 def extract_image_from_mjpeg(stream):
@@ -65,7 +65,7 @@ def extract_image_from_mjpeg(stream):
 class MjpegCamera(Camera):
     """An implementation of an IP camera that is reachable over a URL."""
 
-    def __init__(self, hass, device_info):
+    def __init__(self, device_info):
         """Initialize a MJPEG camera."""
         super().__init__()
         self._name = device_info.get(CONF_NAME)
diff --git a/homeassistant/components/camera/zoneminder.py b/homeassistant/components/camera/zoneminder.py
index bda50a6f75c..55d8d91d3ee 100644
--- a/homeassistant/components/camera/zoneminder.py
+++ b/homeassistant/components/camera/zoneminder.py
@@ -28,21 +28,21 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     cameras = []
     for monitor in monitors:
         _LOGGER.info("Initializing camera %s", monitor.id)
-        cameras.append(ZoneMinderCamera(hass, monitor))
+        cameras.append(ZoneMinderCamera(monitor))
     add_entities(cameras)
 
 
 class ZoneMinderCamera(MjpegCamera):
     """Representation of a ZoneMinder Monitor Stream."""
 
-    def __init__(self, hass, monitor):
+    def __init__(self, monitor):
         """Initialize as a subclass of MjpegCamera."""
         device_info = {
             CONF_NAME: monitor.name,
             CONF_MJPEG_URL: monitor.mjpeg_image_url,
             CONF_STILL_IMAGE_URL: monitor.still_image_url
         }
-        super().__init__(hass, device_info)
+        super().__init__(device_info)
         self._is_recording = None
         self._monitor = monitor
 

From 336289d7e7528294b4266a87f57db9686b0cdc0b Mon Sep 17 00:00:00 2001
From: Jason Hu <awarecan@users.noreply.github.com>
Date: Wed, 12 Sep 2018 04:42:54 -0700
Subject: [PATCH 154/357] Add retry limit for chromecast connection (#16471)

---
 homeassistant/components/media_player/cast.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/media_player/cast.py b/homeassistant/components/media_player/cast.py
index 83b84f5c3bb..088aef82373 100644
--- a/homeassistant/components/media_player/cast.py
+++ b/homeassistant/components/media_player/cast.py
@@ -62,6 +62,10 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
         vol.All(cv.ensure_list, [cv.string]),
 })
 
+CONNECTION_RETRY = 3
+CONNECTION_RETRY_WAIT = 2
+CONNECTION_TIMEOUT = 10
+
 
 @attr.s(slots=True, frozen=True)
 class ChromecastInfo:
@@ -369,15 +373,13 @@ class CastDevice(MediaPlayerDevice):
                 return
             await self._async_disconnect()
 
-        # Failed connection will unfortunately never raise an exception, it
-        # will instead just try connecting indefinitely.
         # pylint: disable=protected-access
         _LOGGER.debug("Connecting to cast device %s", cast_info)
         chromecast = await self.hass.async_add_job(
             pychromecast._get_chromecast_from_host, (
                 cast_info.host, cast_info.port, cast_info.uuid,
                 cast_info.model_name, cast_info.friendly_name
-            ))
+            ), CONNECTION_RETRY, CONNECTION_RETRY_WAIT, CONNECTION_TIMEOUT)
         self._chromecast = chromecast
         self._status_listener = CastStatusListener(self, chromecast)
         # Initialise connection status as connected because we can only

From b231fa26163f54ee9460c34ebb40305c1065bb49 Mon Sep 17 00:00:00 2001
From: Jason Hu <awarecan@users.noreply.github.com>
Date: Wed, 12 Sep 2018 22:52:31 -0700
Subject: [PATCH 155/357] Fix broken bluetooth tracker (#16589)

---
 homeassistant/components/device_tracker/bluetooth_tracker.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/device_tracker/bluetooth_tracker.py b/homeassistant/components/device_tracker/bluetooth_tracker.py
index 217df0aacd4..d22a1ba7c1f 100644
--- a/homeassistant/components/device_tracker/bluetooth_tracker.py
+++ b/homeassistant/components/device_tracker/bluetooth_tracker.py
@@ -80,7 +80,7 @@ def setup_scanner(hass, config, see, discovery_info=None):
 
     request_rssi = config.get(CONF_REQUEST_RSSI, False)
 
-    def update_bluetooth():
+    def update_bluetooth(_):
         """Update Bluetooth and set timer for the next update."""
         update_bluetooth_once()
         track_point_in_utc_time(
@@ -111,7 +111,7 @@ def setup_scanner(hass, config, see, discovery_info=None):
         """Update bluetooth devices on demand."""
         update_bluetooth_once()
 
-    update_bluetooth()
+    update_bluetooth(dt_util.utcnow())
 
     hass.services.register(
         DOMAIN, "bluetooth_tracker_update", handle_update_bluetooth)

From abe61c55296596ec569f40dfbb82002de9509cc2 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pascal.vizeli@syshack.ch>
Date: Fri, 14 Sep 2018 13:49:20 +0200
Subject: [PATCH 156/357] Rewrite bluetooth le (#16592)

* Rewrite bluetooth le

* Update requirements_all.txt

* Update gen_requirements_all.py

* Update bluetooth_le_tracker.py

* Update bluetooth_le_tracker.py

* Update bluetooth_le_tracker.py

* Update bluetooth_le_tracker.py

* Update bluetooth_le_tracker.py

* Update bluetooth_le_tracker.py
---
 .../device_tracker/bluetooth_le_tracker.py    | 35 +++++++------------
 requirements_all.txt                          |  4 +--
 script/gen_requirements_all.py                |  1 -
 3 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/homeassistant/components/device_tracker/bluetooth_le_tracker.py b/homeassistant/components/device_tracker/bluetooth_le_tracker.py
index d9cda24b699..47b86ab9ab2 100644
--- a/homeassistant/components/device_tracker/bluetooth_le_tracker.py
+++ b/homeassistant/components/device_tracker/bluetooth_le_tracker.py
@@ -6,35 +6,25 @@ https://home-assistant.io/components/device_tracker.bluetooth_le_tracker/
 """
 import logging
 
-import voluptuous as vol
 from homeassistant.helpers.event import track_point_in_utc_time
 from homeassistant.components.device_tracker import (
     YAML_DEVICES, CONF_TRACK_NEW, CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL,
-    PLATFORM_SCHEMA, load_config, SOURCE_TYPE_BLUETOOTH_LE
+    load_config, SOURCE_TYPE_BLUETOOTH_LE
 )
 import homeassistant.util.dt as dt_util
-import homeassistant.helpers.config_validation as cv
 
 _LOGGER = logging.getLogger(__name__)
 
-REQUIREMENTS = ['gattlib==0.20150805']
+REQUIREMENTS = ['pygatt==3.2.0']
 
 BLE_PREFIX = 'BLE_'
 MIN_SEEN_NEW = 5
-CONF_SCAN_DURATION = 'scan_duration'
-CONF_BLUETOOTH_DEVICE = 'device_id'
-
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Optional(CONF_SCAN_DURATION, default=10): cv.positive_int,
-    vol.Optional(CONF_BLUETOOTH_DEVICE, default='hci0'): cv.string
-})
 
 
 def setup_scanner(hass, config, see, discovery_info=None):
     """Set up the Bluetooth LE Scanner."""
     # pylint: disable=import-error
-    from gattlib import DiscoveryService
-
+    import pygatt
     new_devices = {}
 
     def see_device(address, name, new_device=False):
@@ -61,17 +51,17 @@ def setup_scanner(hass, config, see, discovery_info=None):
         """Discover Bluetooth LE devices."""
         _LOGGER.debug("Discovering Bluetooth LE devices")
         try:
-            service = DiscoveryService(ble_dev_id)
-            devices = service.discover(duration)
+            adapter = pygatt.GATTToolBackend()
+            devs = adapter.scan()
+
+            devices = {x['address']: x['name'] for x in devs}
             _LOGGER.debug("Bluetooth LE devices discovered = %s", devices)
         except RuntimeError as error:
             _LOGGER.error("Error during Bluetooth LE scan: %s", error)
-            devices = []
+            return {}
         return devices
 
     yaml_path = hass.config.path(YAML_DEVICES)
-    duration = config.get(CONF_SCAN_DURATION)
-    ble_dev_id = config.get(CONF_BLUETOOTH_DEVICE)
     devs_to_track = []
     devs_donot_track = []
 
@@ -102,11 +92,11 @@ def setup_scanner(hass, config, see, discovery_info=None):
         """Lookup Bluetooth LE devices and update status."""
         devs = discover_ble_devices()
         for mac in devs_to_track:
-            _LOGGER.debug("Checking %s", mac)
-            result = mac in devs
-            if not result:
-                # Could not lookup device name
+            if mac not in devs:
                 continue
+
+            if devs[mac] is None:
+                devs[mac] = mac
             see_device(mac, devs[mac])
 
         if track_new:
@@ -119,5 +109,4 @@ def setup_scanner(hass, config, see, discovery_info=None):
         track_point_in_utc_time(hass, update_ble, dt_util.utcnow() + interval)
 
     update_ble(dt_util.utcnow())
-
     return True
diff --git a/requirements_all.txt b/requirements_all.txt
index 7dba008becb..318b92bba1e 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -385,9 +385,6 @@ fritzhome==1.0.4
 # homeassistant.components.tts.google
 gTTS-token==1.1.1
 
-# homeassistant.components.device_tracker.bluetooth_le_tracker
-# gattlib==0.20150805
-
 # homeassistant.components.sensor.gearbest
 gearbest_parser==1.0.7
 
@@ -874,6 +871,7 @@ pyfritzhome==0.3.7
 # homeassistant.components.ifttt
 pyfttt==0.3
 
+# homeassistant.components.device_tracker.bluetooth_le_tracker
 # homeassistant.components.sensor.skybeacon
 pygatt==3.2.0
 
diff --git a/script/gen_requirements_all.py b/script/gen_requirements_all.py
index a307ec9ee15..ec024bef614 100755
--- a/script/gen_requirements_all.py
+++ b/script/gen_requirements_all.py
@@ -19,7 +19,6 @@ COMMENT_REQUIREMENTS = (
     'bluepy',
     'opencv-python',
     'python-lirc',
-    'gattlib',
     'pyuserinput',
     'evdev',
     'pycups',

From 7f7372198ab1e414fc74b1d3cda9aab6b285df37 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Sat, 15 Sep 2018 12:45:45 +0200
Subject: [PATCH 157/357] Update translations

---
 .../components/auth/.translations/fr.json     |  2 +-
 .../components/cast/.translations/ca.json     |  2 +-
 .../components/cast/.translations/fr.json     |  2 +-
 .../components/hangouts/.translations/fr.json |  5 ++++
 .../homematicip_cloud/.translations/fr.json   | 15 ++++++++----
 .../components/hue/.translations/fr.json      |  2 +-
 .../components/ios/.translations/ca.json      | 14 +++++++++++
 .../components/ios/.translations/cs.json      | 10 ++++++++
 .../components/ios/.translations/fr.json      | 14 +++++++++++
 .../components/ios/.translations/ko.json      | 14 +++++++++++
 .../components/ios/.translations/nl.json      | 14 +++++++++++
 .../components/ios/.translations/pl.json      | 14 +++++++++++
 .../components/ios/.translations/zh-Hans.json | 14 +++++++++++
 .../components/mqtt/.translations/ca.json     | 23 +++++++++++++++++++
 .../components/mqtt/.translations/fr.json     | 23 +++++++++++++++++++
 .../components/mqtt/.translations/ko.json     | 23 +++++++++++++++++++
 .../components/nest/.translations/fr.json     |  6 ++++-
 .../components/openuv/.translations/nl.json   |  1 +
 .../components/sonos/.translations/ca.json    |  2 +-
 .../components/sonos/.translations/fr.json    |  2 +-
 20 files changed, 191 insertions(+), 11 deletions(-)
 create mode 100644 homeassistant/components/ios/.translations/ca.json
 create mode 100644 homeassistant/components/ios/.translations/cs.json
 create mode 100644 homeassistant/components/ios/.translations/fr.json
 create mode 100644 homeassistant/components/ios/.translations/ko.json
 create mode 100644 homeassistant/components/ios/.translations/nl.json
 create mode 100644 homeassistant/components/ios/.translations/pl.json
 create mode 100644 homeassistant/components/ios/.translations/zh-Hans.json
 create mode 100644 homeassistant/components/mqtt/.translations/ca.json
 create mode 100644 homeassistant/components/mqtt/.translations/fr.json
 create mode 100644 homeassistant/components/mqtt/.translations/ko.json

diff --git a/homeassistant/components/auth/.translations/fr.json b/homeassistant/components/auth/.translations/fr.json
index e8a8037c39a..b8d10dc89d0 100644
--- a/homeassistant/components/auth/.translations/fr.json
+++ b/homeassistant/components/auth/.translations/fr.json
@@ -2,7 +2,7 @@
     "mfa_setup": {
         "totp": {
             "error": {
-                "invalid_code": "Code invalide. S'il vous pla\u00eet essayez \u00e0 nouveau. Si cette erreur persiste, assurez-vous que l'horloge de votre syst\u00e8me Home Assistant est correcte."
+                "invalid_code": "Code invalide. Veuillez essayez \u00e0 nouveau. Si cette erreur persiste, assurez-vous que l'horloge de votre syst\u00e8me Home Assistant est correcte."
             },
             "step": {
                 "init": {
diff --git a/homeassistant/components/cast/.translations/ca.json b/homeassistant/components/cast/.translations/ca.json
index e65e00f8624..570cc7fdc00 100644
--- a/homeassistant/components/cast/.translations/ca.json
+++ b/homeassistant/components/cast/.translations/ca.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "no_devices_found": "No s'han trobat dispositius de Google Cast a la xarxa.",
-            "single_instance_allowed": "Nom\u00e9s cal una \u00fanica configuraci\u00f3 de Google Cast."
+            "single_instance_allowed": "Nom\u00e9s cal una sola configuraci\u00f3 de Google Cast."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/cast/.translations/fr.json b/homeassistant/components/cast/.translations/fr.json
index d3b95121de6..99feeb3c898 100644
--- a/homeassistant/components/cast/.translations/fr.json
+++ b/homeassistant/components/cast/.translations/fr.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "no_devices_found": "Aucun appareil Google Cast trouv\u00e9 sur le r\u00e9seau.",
-            "single_instance_allowed": "Seulement une seule configuration de Google Cast est n\u00e9cessaire."
+            "single_instance_allowed": "Une seule configuration de Google Cast est n\u00e9cessaire."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/hangouts/.translations/fr.json b/homeassistant/components/hangouts/.translations/fr.json
index 53759f9b534..00a7d5fd80d 100644
--- a/homeassistant/components/hangouts/.translations/fr.json
+++ b/homeassistant/components/hangouts/.translations/fr.json
@@ -5,10 +5,15 @@
             "unknown": "Une erreur inconnue s'est produite"
         },
         "error": {
+            "invalid_2fa": "Authentification \u00e0 2 facteurs invalide, veuillez r\u00e9essayer.",
+            "invalid_2fa_method": "M\u00e9thode 2FA non valide (v\u00e9rifiez sur le t\u00e9l\u00e9phone).",
             "invalid_login": "Login invalide, veuillez r\u00e9essayer."
         },
         "step": {
             "2fa": {
+                "data": {
+                    "2fa": "Code PIN d'authentification \u00e0 2 facteurs"
+                },
                 "title": "Authentification \u00e0 2 facteurs"
             },
             "user": {
diff --git a/homeassistant/components/homematicip_cloud/.translations/fr.json b/homeassistant/components/homematicip_cloud/.translations/fr.json
index 8405946daa2..6cab0993c01 100644
--- a/homeassistant/components/homematicip_cloud/.translations/fr.json
+++ b/homeassistant/components/homematicip_cloud/.translations/fr.json
@@ -4,12 +4,13 @@
             "already_configured": "Le point d'acc\u00e8s est d\u00e9j\u00e0 configur\u00e9",
             "conection_aborted": "Impossible de se connecter au serveur HMIP",
             "connection_aborted": "Impossible de se connecter au serveur HMIP",
-            "unknown": "Une erreur inconnue s'est produite"
+            "unknown": "Une erreur inconnue s'est produite."
         },
         "error": {
             "invalid_pin": "Code PIN invalide, veuillez r\u00e9essayer.",
             "press_the_button": "Veuillez appuyer sur le bouton bleu.",
-            "register_failed": "\u00c9chec d'enregistrement. Veuillez r\u00e9essayer."
+            "register_failed": "\u00c9chec d'enregistrement. Veuillez r\u00e9essayer.",
+            "timeout_button": "D\u00e9lai d'attente expir\u00e9, veuillez r\u00e9\u00e9ssayer."
         },
         "step": {
             "init": {
@@ -17,8 +18,14 @@
                     "hapid": "ID du point d'acc\u00e8s (SGTIN)",
                     "name": "Nom (facultatif, utilis\u00e9 comme pr\u00e9fixe de nom pour tous les p\u00e9riph\u00e9riques)",
                     "pin": "Code PIN (facultatif)"
-                }
+                },
+                "title": "Choisissez le point d'acc\u00e8s HomematicIP"
+            },
+            "link": {
+                "description": "Appuyez sur le bouton bleu du point d'acc\u00e8s et sur le bouton Envoyer pour enregistrer HomematicIP avec Home Assistant. \n\n ![Emplacement du bouton sur le pont](/static/images/config_flows/config_homematicip_cloud.png)",
+                "title": "Lier le point d'acc\u00e8s"
             }
-        }
+        },
+        "title": "HomematicIP Cloud"
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/hue/.translations/fr.json b/homeassistant/components/hue/.translations/fr.json
index 73613f237da..5414bf01ea7 100644
--- a/homeassistant/components/hue/.translations/fr.json
+++ b/homeassistant/components/hue/.translations/fr.json
@@ -24,6 +24,6 @@
                 "title": "Hub de liaison"
             }
         },
-        "title": "Pont Philips Hue"
+        "title": "Philips Hue"
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/ios/.translations/ca.json b/homeassistant/components/ios/.translations/ca.json
new file mode 100644
index 00000000000..1b1ed732ab3
--- /dev/null
+++ b/homeassistant/components/ios/.translations/ca.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Nom\u00e9s cal una sola configuraci\u00f3 de Home Assistant iOS."
+        },
+        "step": {
+            "confirm": {
+                "description": "Voleu configurar el component Home Assistant iOS?",
+                "title": "Home Assistant iOS"
+            }
+        },
+        "title": "Home Assistant iOS"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ios/.translations/cs.json b/homeassistant/components/ios/.translations/cs.json
new file mode 100644
index 00000000000..95d675076da
--- /dev/null
+++ b/homeassistant/components/ios/.translations/cs.json
@@ -0,0 +1,10 @@
+{
+    "config": {
+        "step": {
+            "confirm": {
+                "title": "Home Assistant iOS"
+            }
+        },
+        "title": "Home Assistant iOS"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ios/.translations/fr.json b/homeassistant/components/ios/.translations/fr.json
new file mode 100644
index 00000000000..934849549e7
--- /dev/null
+++ b/homeassistant/components/ios/.translations/fr.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Seule une configuration de Home Assistant iOS est n\u00e9cessaire."
+        },
+        "step": {
+            "confirm": {
+                "description": "Voulez-vous configurer le composant Home Assistant iOS?",
+                "title": "Home Assistant iOS"
+            }
+        },
+        "title": "Home Assistant iOS"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ios/.translations/ko.json b/homeassistant/components/ios/.translations/ko.json
new file mode 100644
index 00000000000..6d69ea3126c
--- /dev/null
+++ b/homeassistant/components/ios/.translations/ko.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\ud558\ub098\uc758 Home Assistant iOS \uad6c\uc131\ub9cc \ud544\uc694\ud569\ub2c8\ub2e4."
+        },
+        "step": {
+            "confirm": {
+                "description": "Home Assistant iOS \ucef4\ud3ec\ub10c\ud2b8\uc758 \uc124\uc815\uc744 \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?",
+                "title": "Home Assistant iOS"
+            }
+        },
+        "title": "Home Assistant iOS"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ios/.translations/nl.json b/homeassistant/components/ios/.translations/nl.json
new file mode 100644
index 00000000000..8e5c46692a0
--- /dev/null
+++ b/homeassistant/components/ios/.translations/nl.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Er is slechts \u00e9\u00e9n configuratie van Home Assistant iOS nodig."
+        },
+        "step": {
+            "confirm": {
+                "description": "Wilt u het Home Assistant iOS component instellen?",
+                "title": "Home Assistant iOS"
+            }
+        },
+        "title": "Home Assistant iOS"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ios/.translations/pl.json b/homeassistant/components/ios/.translations/pl.json
new file mode 100644
index 00000000000..6240f074cfc
--- /dev/null
+++ b/homeassistant/components/ios/.translations/pl.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Wymagana jest tylko jedna konfiguracja Home Assistant iOS."
+        },
+        "step": {
+            "confirm": {
+                "description": "Czy chcesz skonfigurowa\u0107 Home Assistant iOS?",
+                "title": "Home Assistant iOS"
+            }
+        },
+        "title": "Home Assistant iOS"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ios/.translations/zh-Hans.json b/homeassistant/components/ios/.translations/zh-Hans.json
new file mode 100644
index 00000000000..0de30f0f3da
--- /dev/null
+++ b/homeassistant/components/ios/.translations/zh-Hans.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Home Assistant iOS \u53ea\u9700\u8981\u914d\u7f6e\u4e00\u6b21\u3002"
+        },
+        "step": {
+            "confirm": {
+                "description": "\u662f\u5426\u8981\u8bbe\u7f6e Home Assistant iOS \u7ec4\u4ef6\uff1f",
+                "title": "Home Assistant iOS"
+            }
+        },
+        "title": "Home Assistant iOS"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/mqtt/.translations/ca.json b/homeassistant/components/mqtt/.translations/ca.json
new file mode 100644
index 00000000000..57e9a83d201
--- /dev/null
+++ b/homeassistant/components/mqtt/.translations/ca.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Nom\u00e9s es permet una \u00fanica configuraci\u00f3 de MQTT."
+        },
+        "error": {
+            "cannot_connect": "No es pot connectar amb el broker."
+        },
+        "step": {
+            "broker": {
+                "data": {
+                    "broker": "Broker",
+                    "password": "Contrasenya",
+                    "port": "Port",
+                    "username": "Nom d'usuari"
+                },
+                "description": "Introdu\u00efu la informaci\u00f3 de connexi\u00f3 del vostre broker MQTT.",
+                "title": "MQTT"
+            }
+        },
+        "title": "MQTT"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/mqtt/.translations/fr.json b/homeassistant/components/mqtt/.translations/fr.json
new file mode 100644
index 00000000000..1870c598e3b
--- /dev/null
+++ b/homeassistant/components/mqtt/.translations/fr.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Une seule configuration de MQTT est autoris\u00e9e."
+        },
+        "error": {
+            "cannot_connect": "Impossible de se connecter au broker."
+        },
+        "step": {
+            "broker": {
+                "data": {
+                    "broker": "Broker",
+                    "password": "Mot de passe",
+                    "port": "Port",
+                    "username": "Nom d'utilisateur"
+                },
+                "description": "Veuillez entrer les informations de connexion de votre broker MQTT.",
+                "title": "MQTT"
+            }
+        },
+        "title": "MQTT"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/mqtt/.translations/ko.json b/homeassistant/components/mqtt/.translations/ko.json
new file mode 100644
index 00000000000..a38b00fd68d
--- /dev/null
+++ b/homeassistant/components/mqtt/.translations/ko.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\ud558\ub098\uc758 MQTT \ube0c\ub85c\ucee4\ub9cc \uad6c\uc131\uc774 \uac00\ub2a5\ud569\ub2c8\ub2e4."
+        },
+        "error": {
+            "cannot_connect": "MQTT \ube0c\ub85c\ucee4\uc5d0 \uc5f0\uacb0\ud560 \uc218 \uc5c6\uc74c"
+        },
+        "step": {
+            "broker": {
+                "data": {
+                    "broker": "\ube0c\ub85c\ucee4",
+                    "password": "\ube44\ubc00\ubc88\ud638",
+                    "port": "\ud3ec\ud2b8",
+                    "username": "\uc0ac\uc6a9\uc790 \uc774\ub984"
+                },
+                "description": "MQTT \ube0c\ub85c\ucee4\uc640\uc758 \uc5f0\uacb0 \uc815\ubcf4\ub97c \uc785\ub825\ud558\uc138\uc694.",
+                "title": "MQTT"
+            }
+        },
+        "title": "MQTT"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/nest/.translations/fr.json b/homeassistant/components/nest/.translations/fr.json
index fd2cb435eb2..822ec6ae836 100644
--- a/homeassistant/components/nest/.translations/fr.json
+++ b/homeassistant/components/nest/.translations/fr.json
@@ -2,18 +2,22 @@
     "config": {
         "abort": {
             "already_setup": "Vous ne pouvez configurer qu'un seul compte Nest.",
+            "authorize_url_fail": "Erreur inconnue lors de la g\u00e9n\u00e9ration d'une URL d'autorisation.",
             "authorize_url_timeout": "D\u00e9lai de g\u00e9n\u00e9ration de l'URL d'authentification d\u00e9pass\u00e9.",
             "no_flows": "Vous devez configurer Nest avant de pouvoir vous authentifier avec celui-ci. [Veuillez lire les instructions] (https://www.home-assistant.io/components/nest/)."
         },
         "error": {
             "internal_error": "Erreur interne lors de la validation du code",
-            "invalid_code": "Code invalide"
+            "invalid_code": "Code invalide",
+            "timeout": "D\u00e9lai de la validation du code expir\u00e9",
+            "unknown": "Erreur inconnue lors de la validation du code"
         },
         "step": {
             "init": {
                 "data": {
                     "flow_impl": "Fournisseur"
                 },
+                "description": "S\u00e9lectionnez via quel fournisseur d'authentification vous souhaitez vous authentifier avec Nest.",
                 "title": "Fournisseur d'authentification"
             },
             "link": {
diff --git a/homeassistant/components/openuv/.translations/nl.json b/homeassistant/components/openuv/.translations/nl.json
index 2c5086b3365..e2b264182d0 100644
--- a/homeassistant/components/openuv/.translations/nl.json
+++ b/homeassistant/components/openuv/.translations/nl.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "error": {
+            "identifier_exists": "Co\u00f6rdinaten al geregistreerd",
             "invalid_api_key": "Ongeldige API-sleutel"
         },
         "step": {
diff --git a/homeassistant/components/sonos/.translations/ca.json b/homeassistant/components/sonos/.translations/ca.json
index 9a745784b25..a6f1f99a379 100644
--- a/homeassistant/components/sonos/.translations/ca.json
+++ b/homeassistant/components/sonos/.translations/ca.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "no_devices_found": "No s'han trobat dispositius Sonos a la xarxa.",
-            "single_instance_allowed": "Nom\u00e9s cal una \u00fanica configuraci\u00f3 de Sonos."
+            "single_instance_allowed": "Nom\u00e9s cal una sola configuraci\u00f3 de Sonos."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/sonos/.translations/fr.json b/homeassistant/components/sonos/.translations/fr.json
index 809591dee7c..fd2a77bd129 100644
--- a/homeassistant/components/sonos/.translations/fr.json
+++ b/homeassistant/components/sonos/.translations/fr.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "no_devices_found": "Aucun p\u00e9riph\u00e9rique Sonos trouv\u00e9 sur le r\u00e9seau.",
-            "single_instance_allowed": "Seulement une seule configuration de Sonos est n\u00e9cessaire."
+            "single_instance_allowed": "Une seule configuration de Sonos est n\u00e9cessaire."
         },
         "step": {
             "confirm": {

From 18ce5092b4c8cf42ce40a6002b5bd11d2c87054c Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Sat, 15 Sep 2018 12:46:02 +0200
Subject: [PATCH 158/357] Bumped version to 0.78.0b3

---
 homeassistant/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/const.py b/homeassistant/const.py
index 6bdb431d1ff..128fb8dbce6 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -2,7 +2,7 @@
 """Constants used by Home Assistant components."""
 MAJOR_VERSION = 0
 MINOR_VERSION = 78
-PATCH_VERSION = '0b2'
+PATCH_VERSION = '0b3'
 __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
 __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
 REQUIRED_PYTHON_VER = (3, 5, 3)

From cc38981a38ed2c97ab45df5b536ad34ce742f39b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 15 Sep 2018 14:27:37 +0300
Subject: [PATCH 159/357] Update developer doc links to
 developers.home-assistant.io (#16622)

---
 CONTRIBUTING.md                           | 2 +-
 README.rst                                | 4 ++--
 docs/source/index.rst                     | 2 +-
 homeassistant/components/websocket_api.py | 2 +-
 script/gen_requirements_all.py            | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 86e212bb11d..fbe77c7756f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,5 +10,5 @@ The process is straight-forward.
  - Ensure tests work.
  - Create a Pull Request against the [**dev**](https://github.com/home-assistant/home-assistant/tree/dev) branch of Home Assistant.
 
-Still interested? Then you should take a peek at the [developer documentation](https://home-assistant.io/developers/) to get more details.
+Still interested? Then you should take a peek at the [developer documentation](https://developers.home-assistant.io/) to get more details.
 
diff --git a/README.rst b/README.rst
index 6cf19d89c3c..4f459162a7e 100644
--- a/README.rst
+++ b/README.rst
@@ -21,8 +21,8 @@ Featured integrations
 
 |screenshot-components|
 
-The system is built using a modular approach so support for other devices or actions can be implemented easily. See also the `section on architecture <https://home-assistant.io/developers/architecture/>`__ and the `section on creating your own
-components <https://home-assistant.io/developers/creating_components/>`__.
+The system is built using a modular approach so support for other devices or actions can be implemented easily. See also the `section on architecture <https://developers.home-assistant.io/docs/en/architecture_index.html>`__ and the `section on creating your own
+components <https://developers.home-assistant.io/docs/en/creating_component_index.html>`__.
 
 If you run into issues while using Home Assistant or during development
 of a component, check the `Home Assistant help section <https://home-assistant.io/help/>`__ of our website for further help and information.
diff --git a/docs/source/index.rst b/docs/source/index.rst
index a6157dc7aac..c592f66c070 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -19,4 +19,4 @@ Indices and tables
 * :ref:`modindex`
 * :ref:`search`
 
-.. _Home Assistant developers: https://home-assistant.io/developers/
+.. _Home Assistant developers: https://developers.home-assistant.io/
diff --git a/homeassistant/components/websocket_api.py b/homeassistant/components/websocket_api.py
index e9db666c032..6f4c4d47fe9 100644
--- a/homeassistant/components/websocket_api.py
+++ b/homeassistant/components/websocket_api.py
@@ -2,7 +2,7 @@
 Websocket based API for Home Assistant.
 
 For more details about this component, please refer to the documentation at
-https://home-assistant.io/developers/websocket_api/
+https://developers.home-assistant.io/docs/external_api_websocket.html
 """
 import asyncio
 from concurrent import futures
diff --git a/script/gen_requirements_all.py b/script/gen_requirements_all.py
index ec024bef614..d1d29affeff 100755
--- a/script/gen_requirements_all.py
+++ b/script/gen_requirements_all.py
@@ -115,8 +115,8 @@ IGNORE_REQ = (
     'colorama<=1',  # Windows only requirement in check_config
 )
 
-URL_PIN = ('https://home-assistant.io/developers/code_review_platform/'
-           '#1-requirements')
+URL_PIN = ('https://developers.home-assistant.io/docs/'
+           'creating_platform_code_review.html#1-requirements')
 
 
 CONSTRAINT_PATH = os.path.join(os.path.dirname(__file__),

From 34deaf88496b2c7f8db88c918ae1f8be2570462c Mon Sep 17 00:00:00 2001
From: Jason Hu <awarecan@users.noreply.github.com>
Date: Sat, 15 Sep 2018 04:28:25 -0700
Subject: [PATCH 160/357] Add valid_window=1 to TOTP verify (#16625)

---
 homeassistant/auth/mfa_modules/totp.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/auth/mfa_modules/totp.py b/homeassistant/auth/mfa_modules/totp.py
index 0914658a655..50cd9d33466 100644
--- a/homeassistant/auth/mfa_modules/totp.py
+++ b/homeassistant/auth/mfa_modules/totp.py
@@ -149,10 +149,10 @@ class TotpAuthModule(MultiFactorAuthModule):
         if ota_secret is None:
             # even we cannot find user, we still do verify
             # to make timing the same as if user was found.
-            pyotp.TOTP(DUMMY_SECRET).verify(code)
+            pyotp.TOTP(DUMMY_SECRET).verify(code, valid_window=1)
             return False
 
-        return bool(pyotp.TOTP(ota_secret).verify(code))
+        return bool(pyotp.TOTP(ota_secret).verify(code, valid_window=1))
 
 
 class TotpSetupFlow(SetupFlow):

From 05922ac56a6d03b51250691e38a28a79d5110652 Mon Sep 17 00:00:00 2001
From: Mattias Welponer <mattias@welponer.net>
Date: Sat, 15 Sep 2018 21:28:50 +0200
Subject: [PATCH 161/357] Add new devices to HomematicIP Cloud (#16636)

* Add support for outdoor temperature sensor and cleanup

* Add support for rotary handle and water sensor

* Fix comment
---
 .../binary_sensor/homematicip_cloud.py        | 21 +++++++++++++++++--
 .../components/sensor/homematicip_cloud.py    | 16 +++++++-------
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/homeassistant/components/binary_sensor/homematicip_cloud.py b/homeassistant/components/binary_sensor/homematicip_cloud.py
index dd22a835504..6c8b7ff191e 100644
--- a/homeassistant/components/binary_sensor/homematicip_cloud.py
+++ b/homeassistant/components/binary_sensor/homematicip_cloud.py
@@ -27,17 +27,20 @@ async def async_setup_platform(
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the HomematicIP Cloud binary sensor from a config entry."""
     from homematicip.aio.device import (
-        AsyncShutterContact, AsyncMotionDetectorIndoor, AsyncSmokeDetector)
+        AsyncShutterContact, AsyncMotionDetectorIndoor, AsyncSmokeDetector,
+        AsyncWaterSensor, AsyncRotaryHandleSensor)
 
     home = hass.data[HMIPC_DOMAIN][config_entry.data[HMIPC_HAPID]].home
     devices = []
     for device in home.devices:
-        if isinstance(device, AsyncShutterContact):
+        if isinstance(device, (AsyncShutterContact, AsyncRotaryHandleSensor)):
             devices.append(HomematicipShutterContact(home, device))
         elif isinstance(device, AsyncMotionDetectorIndoor):
             devices.append(HomematicipMotionDetector(home, device))
         elif isinstance(device, AsyncSmokeDetector):
             devices.append(HomematicipSmokeDetector(home, device))
+        elif isinstance(device, AsyncWaterSensor):
+            devices.append(HomematicipWaterDetector(home, device))
 
     if devices:
         async_add_entities(devices)
@@ -91,3 +94,17 @@ class HomematicipSmokeDetector(HomematicipGenericDevice, BinarySensorDevice):
     def is_on(self):
         """Return true if smoke is detected."""
         return self._device.smokeDetectorAlarmType != STATE_SMOKE_OFF
+
+
+class HomematicipWaterDetector(HomematicipGenericDevice, BinarySensorDevice):
+    """Representation of a HomematicIP Cloud water detector."""
+
+    @property
+    def device_class(self):
+        """Return the class of this sensor."""
+        return 'moisture'
+
+    @property
+    def is_on(self):
+        """Return true if moisture or waterlevel is detected."""
+        return self._device.moistureDetected or self._device.waterlevelDetected
diff --git a/homeassistant/components/sensor/homematicip_cloud.py b/homeassistant/components/sensor/homematicip_cloud.py
index 2b8365b8f64..73fef98fb76 100644
--- a/homeassistant/components/sensor/homematicip_cloud.py
+++ b/homeassistant/components/sensor/homematicip_cloud.py
@@ -32,20 +32,22 @@ async def async_setup_platform(
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the HomematicIP Cloud sensors from a config entry."""
-    from homematicip.device import (
-        HeatingThermostat, TemperatureHumiditySensorWithoutDisplay,
-        TemperatureHumiditySensorDisplay, MotionDetectorIndoor)
+    from homematicip.aio.device import (
+        AsyncHeatingThermostat, AsyncTemperatureHumiditySensorWithoutDisplay,
+        AsyncTemperatureHumiditySensorDisplay, AsyncMotionDetectorIndoor,
+        AsyncTemperatureHumiditySensorOutdoor)
 
     home = hass.data[HMIPC_DOMAIN][config_entry.data[HMIPC_HAPID]].home
     devices = [HomematicipAccesspointStatus(home)]
     for device in home.devices:
-        if isinstance(device, HeatingThermostat):
+        if isinstance(device, AsyncHeatingThermostat):
             devices.append(HomematicipHeatingThermostat(home, device))
-        if isinstance(device, (TemperatureHumiditySensorDisplay,
-                               TemperatureHumiditySensorWithoutDisplay)):
+        if isinstance(device, (AsyncTemperatureHumiditySensorDisplay,
+                               AsyncTemperatureHumiditySensorWithoutDisplay,
+                               AsyncTemperatureHumiditySensorOutdoor)):
             devices.append(HomematicipTemperatureSensor(home, device))
             devices.append(HomematicipHumiditySensor(home, device))
-        if isinstance(device, MotionDetectorIndoor):
+        if isinstance(device, AsyncMotionDetectorIndoor):
             devices.append(HomematicipIlluminanceSensor(home, device))
 
     if devices:

From 9c9df793b4548ccce52b1dff6cc15a0a460e7713 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ab=C3=ADlio=20Costa?= <abmantis@users.noreply.github.com>
Date: Sun, 16 Sep 2018 00:17:47 +0100
Subject: [PATCH 162/357] New EDP re:dy component (#16426)

* add new EDP re:dy platform

* lint

* move api code to pypi module; fix lint

* fix lint; remove unused import

* pass aiohttp client session and hass loop to platform

* update requirements_all.txt

* fix docstring lint

* normalize quotes

* use async setup_platform

* improve entities update mechanism

* doc lint

* send update topic only after loading platforms

* lint whitespaces

* mute used-before-assignment pylint false error
---
 .coveragerc                                 |   3 +
 homeassistant/components/edp_redy.py        | 135 ++++++++++++++++++++
 homeassistant/components/sensor/edp_redy.py | 115 +++++++++++++++++
 homeassistant/components/switch/edp_redy.py |  94 ++++++++++++++
 requirements_all.txt                        |   3 +
 5 files changed, 350 insertions(+)
 create mode 100644 homeassistant/components/edp_redy.py
 create mode 100644 homeassistant/components/sensor/edp_redy.py
 create mode 100644 homeassistant/components/switch/edp_redy.py

diff --git a/.coveragerc b/.coveragerc
index 336edbff736..9b7111b21e1 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -92,6 +92,9 @@ omit =
     homeassistant/components/ecobee.py
     homeassistant/components/*/ecobee.py
 
+    homeassistant/components/edp_redy.py
+    homeassistant/components/*/edp_redy.py
+
     homeassistant/components/egardia.py
     homeassistant/components/*/egardia.py
 
diff --git a/homeassistant/components/edp_redy.py b/homeassistant/components/edp_redy.py
new file mode 100644
index 00000000000..caf4ad41d99
--- /dev/null
+++ b/homeassistant/components/edp_redy.py
@@ -0,0 +1,135 @@
+"""
+Support for EDP re:dy.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/edp_redy/
+"""
+
+import logging
+from datetime import timedelta
+
+import voluptuous as vol
+
+from homeassistant.const import (CONF_USERNAME, CONF_PASSWORD,
+                                 EVENT_HOMEASSISTANT_START)
+from homeassistant.core import callback
+from homeassistant.helpers import discovery, dispatcher, aiohttp_client
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.entity import Entity
+from homeassistant.helpers.event import async_track_point_in_time
+from homeassistant.util import dt as dt_util
+
+_LOGGER = logging.getLogger(__name__)
+
+DOMAIN = 'edp_redy'
+EDP_REDY = 'edp_redy'
+DATA_UPDATE_TOPIC = '{0}_data_update'.format(DOMAIN)
+UPDATE_INTERVAL = 30
+
+REQUIREMENTS = ['edp_redy==0.0.2']
+
+CONFIG_SCHEMA = vol.Schema({
+    DOMAIN: vol.Schema({
+        vol.Required(CONF_USERNAME): cv.string,
+        vol.Required(CONF_PASSWORD): cv.string
+    })
+}, extra=vol.ALLOW_EXTRA)
+
+
+async def async_setup(hass, config):
+    """Set up the EDP re:dy component."""
+    from edp_redy import EdpRedySession
+
+    session = EdpRedySession(config[DOMAIN][CONF_USERNAME],
+                             config[DOMAIN][CONF_PASSWORD],
+                             aiohttp_client.async_get_clientsession(hass),
+                             hass.loop)
+    hass.data[EDP_REDY] = session
+    platform_loaded = False
+
+    async def async_update_and_sched(time):
+        update_success = await session.async_update()
+
+        if update_success:
+            nonlocal platform_loaded
+            # pylint: disable=used-before-assignment
+            if not platform_loaded:
+                for component in ['sensor', 'switch']:
+                    await discovery.async_load_platform(hass, component,
+                                                        DOMAIN, {}, config)
+                platform_loaded = True
+
+            dispatcher.async_dispatcher_send(hass, DATA_UPDATE_TOPIC)
+
+        # schedule next update
+        async_track_point_in_time(hass, async_update_and_sched,
+                                  time + timedelta(seconds=UPDATE_INTERVAL))
+
+    async def start_component(event):
+        _LOGGER.debug("Starting updates")
+        await async_update_and_sched(dt_util.utcnow())
+
+    # only start fetching data after HA boots to prevent delaying the boot
+    # process
+    hass.bus.async_listen_once(EVENT_HOMEASSISTANT_START, start_component)
+
+    return True
+
+
+class EdpRedyDevice(Entity):
+    """Representation a base re:dy device."""
+
+    def __init__(self, session, device_id, name):
+        """Initialize the device."""
+        self._session = session
+        self._state = None
+        self._is_available = True
+        self._device_state_attributes = {}
+        self._id = device_id
+        self._unique_id = device_id
+        self._name = name if name else device_id
+
+    async def async_added_to_hass(self):
+        """Subscribe to the data updates topic."""
+        dispatcher.async_dispatcher_connect(
+            self.hass, DATA_UPDATE_TOPIC, self._data_updated)
+
+    @property
+    def name(self):
+        """Return the name of the device."""
+        return self._name
+
+    @property
+    def unique_id(self) -> str:
+        """Return a unique ID."""
+        return self._unique_id
+
+    @property
+    def available(self):
+        """Return True if entity is available."""
+        return self._is_available
+
+    @property
+    def should_poll(self):
+        """Return the polling state. No polling needed."""
+        return False
+
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes."""
+        return self._device_state_attributes
+
+    @callback
+    def _data_updated(self):
+        """Update state, trigger updates."""
+        self.async_schedule_update_ha_state(True)
+
+    def _parse_data(self, data):
+        """Parse data received from the server."""
+        if "OutOfOrder" in data:
+            try:
+                self._is_available = not data['OutOfOrder']
+            except ValueError:
+                _LOGGER.error(
+                    "Could not parse OutOfOrder for %s", self._id)
+                self._is_available = False
diff --git a/homeassistant/components/sensor/edp_redy.py b/homeassistant/components/sensor/edp_redy.py
new file mode 100644
index 00000000000..0f259ec673a
--- /dev/null
+++ b/homeassistant/components/sensor/edp_redy.py
@@ -0,0 +1,115 @@
+"""Support for EDP re:dy sensors."""
+import logging
+
+from homeassistant.helpers.entity import Entity
+
+from homeassistant.components.edp_redy import EdpRedyDevice, EDP_REDY
+
+_LOGGER = logging.getLogger(__name__)
+
+DEPENDENCIES = ['edp_redy']
+
+# Load power in watts (W)
+ATTR_ACTIVE_POWER = 'active_power'
+
+
+async def async_setup_platform(hass, config, async_add_entities,
+                               discovery_info=None):
+    """Perform the setup for re:dy devices."""
+    from edp_redy.session import ACTIVE_POWER_ID
+
+    session = hass.data[EDP_REDY]
+    devices = []
+
+    # Create sensors for modules
+    for device_json in session.modules_dict.values():
+        if 'HA_POWER_METER' not in device_json['Capabilities']:
+            continue
+        devices.append(EdpRedyModuleSensor(session, device_json))
+
+    # Create a sensor for global active power
+    devices.append(EdpRedySensor(session, ACTIVE_POWER_ID, "Power Home",
+                                 'mdi:flash', 'W'))
+
+    async_add_entities(devices, True)
+
+
+class EdpRedySensor(EdpRedyDevice, Entity):
+    """Representation of a EDP re:dy generic sensor."""
+
+    def __init__(self, session, sensor_id, name, icon, unit):
+        """Initialize the sensor."""
+        super().__init__(session, sensor_id, name)
+
+        self._icon = icon
+        self._unit = unit
+
+    @property
+    def state(self):
+        """Return the state of the sensor."""
+        return self._state
+
+    @property
+    def icon(self):
+        """Return the icon to use in the frontend."""
+        return self._icon
+
+    @property
+    def unit_of_measurement(self):
+        """Return the unit of measurement of this sensor."""
+        return self._unit
+
+    async def async_update(self):
+        """Parse the data for this sensor."""
+        if self._id in self._session.values_dict:
+            self._state = self._session.values_dict[self._id]
+            self._is_available = True
+        else:
+            self._is_available = False
+
+
+class EdpRedyModuleSensor(EdpRedyDevice, Entity):
+    """Representation of a EDP re:dy module sensor."""
+
+    def __init__(self, session, device_json):
+        """Initialize the sensor."""
+        super().__init__(session, device_json['PKID'],
+                         "Power {0}".format(device_json['Name']))
+
+    @property
+    def state(self):
+        """Return the state of the sensor."""
+        return self._state
+
+    @property
+    def icon(self):
+        """Return the icon to use in the frontend."""
+        return 'mdi:flash'
+
+    @property
+    def unit_of_measurement(self):
+        """Return the unit of measurement of this sensor."""
+        return 'W'
+
+    async def async_update(self):
+        """Parse the data for this sensor."""
+        if self._id in self._session.modules_dict:
+            device_json = self._session.modules_dict[self._id]
+            self._parse_data(device_json)
+        else:
+            self._is_available = False
+
+    def _parse_data(self, data):
+        """Parse data received from the server."""
+        super()._parse_data(data)
+
+        _LOGGER.debug("Sensor data: %s", str(data))
+
+        for state_var in data['StateVars']:
+            if state_var['Name'] == 'ActivePower':
+                try:
+                    self._state = float(state_var['Value']) * 1000
+                except ValueError:
+                    _LOGGER.error("Could not parse power for %s", self._id)
+                    self._state = 0
+                    self._is_available = False
diff --git a/homeassistant/components/switch/edp_redy.py b/homeassistant/components/switch/edp_redy.py
new file mode 100644
index 00000000000..1576361da33
--- /dev/null
+++ b/homeassistant/components/switch/edp_redy.py
@@ -0,0 +1,94 @@
+"""Support for EDP re:dy plugs/switches."""
+import logging
+
+from homeassistant.components.edp_redy import EdpRedyDevice, EDP_REDY
+from homeassistant.components.switch import SwitchDevice
+
+_LOGGER = logging.getLogger(__name__)
+
+DEPENDENCIES = ['edp_redy']
+
+# Load power in watts (W)
+ATTR_ACTIVE_POWER = 'active_power'
+
+
+async def async_setup_platform(hass, config, async_add_entities,
+                               discovery_info=None):
+    """Perform the setup for re:dy devices."""
+    session = hass.data[EDP_REDY]
+    devices = []
+    for device_json in session.modules_dict.values():
+        if 'HA_SWITCH' not in device_json['Capabilities']:
+            continue
+        devices.append(EdpRedySwitch(session, device_json))
+
+    async_add_entities(devices, True)
+
+
+class EdpRedySwitch(EdpRedyDevice, SwitchDevice):
+    """Representation of a Edp re:dy switch (plugs, switches, etc)."""
+
+    def __init__(self, session, device_json):
+        """Initialize the switch."""
+        super().__init__(session, device_json['PKID'], device_json['Name'])
+
+        self._active_power = None
+
+    @property
+    def icon(self):
+        """Return the icon to use in the frontend."""
+        return 'mdi:power-plug'
+
+    @property
+    def is_on(self):
+        """Return true if it is on."""
+        return self._state
+
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes."""
+        if self._active_power is not None:
+            attrs = {ATTR_ACTIVE_POWER: self._active_power}
+        else:
+            attrs = {}
+        attrs.update(super().device_state_attributes)
+        return attrs
+
+    async def async_turn_on(self, **kwargs):
+        """Turn the switch on."""
+        if await self._async_send_state_cmd(True):
+            self._state = True
+            self.async_schedule_update_ha_state()
+
+    async def async_turn_off(self, **kwargs):
+        """Turn the switch off."""
+        if await self._async_send_state_cmd(False):
+            self._state = False
+            self.async_schedule_update_ha_state()
+
+    async def _async_send_state_cmd(self, state):
+        state_json = {'devModuleId': self._id, 'key': 'RelayState',
+                      'value': state}
+        return await self._session.async_set_state_var(state_json)
+
+    async def async_update(self):
+        """Parse the data for this switch."""
+        if self._id in self._session.modules_dict:
+            device_json = self._session.modules_dict[self._id]
+            self._parse_data(device_json)
+        else:
+            self._is_available = False
+
+    def _parse_data(self, data):
+        """Parse data received from the server."""
+        super()._parse_data(data)
+
+        for state_var in data['StateVars']:
+            if state_var['Name'] == 'RelayState':
+                self._state = state_var['Value'] == 'true'
+            elif state_var['Name'] == 'ActivePower':
+                try:
+                    self._active_power = float(state_var['Value']) * 1000
+                except ValueError:
+                    _LOGGER.error("Could not parse power for %s", self._id)
+                    self._active_power = None
diff --git a/requirements_all.txt b/requirements_all.txt
index d9cf55041cc..8bcb6faa285 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -311,6 +311,9 @@ dsmr_parser==0.11
 # homeassistant.components.sensor.dweet
 dweepy==0.3.0
 
+# homeassistant.components.edp_redy
+edp_redy==0.0.2
+
 # homeassistant.components.media_player.horizon
 einder==0.3.1
 

From baeb791d84035cd9bc354514ac1f5095eeb6f71c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=B8yer=20Iversen?= <mail@dahoiv.net>
Date: Sun, 16 Sep 2018 13:58:26 +0200
Subject: [PATCH 163/357] Upgrade Switchmate lib (#16637)

* new version switchmate lib, fix bug, and enable more logging in lib

* new version switchmate lib, fix bug, and enable more logging in lib
---
 homeassistant/components/switch/switchmate.py | 13 ++++++++-----
 requirements_all.txt                          |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/homeassistant/components/switch/switchmate.py b/homeassistant/components/switch/switchmate.py
index fddb878b0ba..4955d72c5e3 100644
--- a/homeassistant/components/switch/switchmate.py
+++ b/homeassistant/components/switch/switchmate.py
@@ -13,10 +13,11 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.components.switch import SwitchDevice, PLATFORM_SCHEMA
 from homeassistant.const import CONF_NAME, CONF_MAC
 
-REQUIREMENTS = ['pySwitchmate==0.3']
+REQUIREMENTS = ['pySwitchmate==0.4.1']
 
 _LOGGER = logging.getLogger(__name__)
 
+CONF_FLIP_ON_OFF = 'flip_on_off'
 DEFAULT_NAME = 'Switchmate'
 
 SCAN_INTERVAL = timedelta(minutes=30)
@@ -24,6 +25,7 @@ SCAN_INTERVAL = timedelta(minutes=30)
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Required(CONF_MAC): cv.string,
     vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_FLIP_ON_OFF, default=False): cv.boolean,
 })
 
 
@@ -31,18 +33,19 @@ def setup_platform(hass, config, add_entities, discovery_info=None) -> None:
     """Perform the setup for Switchmate devices."""
     name = config.get(CONF_NAME)
     mac_addr = config[CONF_MAC]
-    add_entities([Switchmate(mac_addr, name)], True)
+    flip_on_off = config[CONF_FLIP_ON_OFF]
+    add_entities([Switchmate(mac_addr, name, flip_on_off)], True)
 
 
 class Switchmate(SwitchDevice):
     """Representation of a Switchmate."""
 
-    def __init__(self, mac, name) -> None:
+    def __init__(self, mac, name, flip_on_off) -> None:
         """Initialize the Switchmate."""
         import switchmate
-        self._name = name
         self._mac = mac
-        self._device = switchmate.Switchmate(mac=mac)
+        self._name = name
+        self._device = switchmate.Switchmate(mac=mac, flip_on_off=flip_on_off)
 
     @property
     def unique_id(self) -> str:
diff --git a/requirements_all.txt b/requirements_all.txt
index 8bcb6faa285..74f5e2605e6 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -752,7 +752,7 @@ pyHS100==0.3.3
 pyRFXtrx==0.23
 
 # homeassistant.components.switch.switchmate
-pySwitchmate==0.3
+pySwitchmate==0.4.1
 
 # homeassistant.components.sensor.tibber
 pyTibber==0.5.0

From 2002497d090336a0de95308afd2d807064564f8b Mon Sep 17 00:00:00 2001
From: tadly <git@tadly.de>
Date: Sun, 16 Sep 2018 22:53:25 +0200
Subject: [PATCH 164/357] Upgrade zeroconf to 0.21.0 (#16647)

---
 homeassistant/components/zeroconf.py | 2 +-
 requirements_all.txt                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/zeroconf.py b/homeassistant/components/zeroconf.py
index 675c3a65e5f..1f20ebad086 100644
--- a/homeassistant/components/zeroconf.py
+++ b/homeassistant/components/zeroconf.py
@@ -12,7 +12,7 @@ import voluptuous as vol
 from homeassistant import util
 from homeassistant.const import (EVENT_HOMEASSISTANT_STOP, __version__)
 
-REQUIREMENTS = ['zeroconf==0.20.0']
+REQUIREMENTS = ['zeroconf==0.21.0']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/requirements_all.txt b/requirements_all.txt
index 74f5e2605e6..2d0d784e6dd 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1531,7 +1531,7 @@ youtube_dl==2018.09.10
 zengge==0.2
 
 # homeassistant.components.zeroconf
-zeroconf==0.20.0
+zeroconf==0.21.0
 
 # homeassistant.components.climate.zhong_hong
 zhong_hong_hvac==1.0.9

From a1e6e04a5ebbdcfd5c14db80eeeaeed04cf51ca4 Mon Sep 17 00:00:00 2001
From: Daniel Perna <danielperna84@gmail.com>
Date: Sun, 16 Sep 2018 22:56:01 +0200
Subject: [PATCH 165/357] Update pyhomematic to 0.1.49 (#16649)

---
 homeassistant/components/homematic/__init__.py | 3 ++-
 requirements_all.txt                           | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/homematic/__init__.py b/homeassistant/components/homematic/__init__.py
index b9e4294f6e1..4e6b3f04ee1 100644
--- a/homeassistant/components/homematic/__init__.py
+++ b/homeassistant/components/homematic/__init__.py
@@ -20,7 +20,7 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 from homeassistant.loader import bind_hass
 
-REQUIREMENTS = ['pyhomematic==0.1.48']
+REQUIREMENTS = ['pyhomematic==0.1.49']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -108,6 +108,7 @@ HM_ATTRIBUTE_SUPPORT = {
     'ERROR': ['sabotage', {0: 'No', 1: 'Yes'}],
     'SABOTAGE': ['sabotage', {0: 'No', 1: 'Yes'}],
     'RSSI_PEER': ['rssi', {}],
+    'RSSI_DEVICE': ['rssi', {}],
     'VALVE_STATE': ['valve', {}],
     'BATTERY_STATE': ['battery', {}],
     'CONTROL_MODE': ['mode', {
diff --git a/requirements_all.txt b/requirements_all.txt
index 2d0d784e6dd..a13068532ba 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -899,7 +899,7 @@ pyhik==0.1.8
 pyhiveapi==0.2.14
 
 # homeassistant.components.homematic
-pyhomematic==0.1.48
+pyhomematic==0.1.49
 
 # homeassistant.components.sensor.hydroquebec
 pyhydroquebec==2.2.2

From 5e3e441aa0e11b8acc1f180c4ca5db1497e1e430 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 17 Sep 2018 07:44:23 +0200
Subject: [PATCH 166/357] Upgrade holidays to 0.9.7 (#16651)

---
 .../components/binary_sensor/workday.py       | 39 ++++++++++---------
 requirements_all.txt                          |  2 +-
 requirements_test_all.txt                     |  2 +-
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/homeassistant/components/binary_sensor/workday.py b/homeassistant/components/binary_sensor/workday.py
index 3fb2d7f7f86..1d85d9c9a47 100644
--- a/homeassistant/components/binary_sensor/workday.py
+++ b/homeassistant/components/binary_sensor/workday.py
@@ -15,35 +15,38 @@ from homeassistant.const import CONF_NAME, WEEKDAYS
 from homeassistant.components.binary_sensor import BinarySensorDevice
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
+REQUIREMENTS = ['holidays==0.9.7']
 
-REQUIREMENTS = ['holidays==0.9.6']
+_LOGGER = logging.getLogger(__name__)
 
 # List of all countries currently supported by holidays
 # There seems to be no way to get the list out at runtime
-ALL_COUNTRIES = ['Argentina', 'AR', 'Australia', 'AU', 'Austria', 'AT',
-                 'Belgium', 'BE', 'Canada', 'CA', 'Colombia', 'CO', 'Czech',
-                 'CZ', 'Denmark', 'DK', 'England', 'EuropeanCentralBank',
-                 'ECB', 'TAR', 'Finland', 'FI', 'France', 'FRA', 'Germany',
-                 'DE', 'Hungary', 'HU', 'India', 'IND', 'Ireland',
-                 'Isle of Man', 'Italy', 'IT', 'Japan', 'JP', 'Mexico', 'MX',
-                 'Netherlands', 'NL', 'NewZealand', 'NZ', 'Northern Ireland',
-                 'Norway', 'NO', 'Polish', 'PL', 'Portugal', 'PT',
-                 'PortugalExt', 'PTE', 'Scotland', 'Slovenia', 'SI',
-                 'Slovakia', 'SK', 'South Africa', 'ZA', 'Spain', 'ES',
-                 'Sweden', 'SE', 'Switzerland', 'CH', 'UnitedKingdom', 'UK',
-                 'UnitedStates', 'US', 'Wales']
+ALL_COUNTRIES = [
+    'Argentina', 'AR', 'Australia', 'AU', 'Austria', 'AT', 'Belarus', 'BY'
+    'Belgium', 'BE', 'Canada', 'CA', 'Colombia', 'CO', 'Czech', 'CZ',
+    'Denmark', 'DK', 'England', 'EuropeanCentralBank', 'ECB', 'TAR',
+    'Finland', 'FI', 'France', 'FRA', 'Germany', 'DE', 'Hungary', 'HU',
+    'India', 'IND', 'Ireland', 'Isle of Man', 'Italy', 'IT', 'Japan', 'JP',
+    'Mexico', 'MX', 'Netherlands', 'NL', 'NewZealand', 'NZ',
+    'Northern Ireland', 'Norway', 'NO', 'Polish', 'PL', 'Portugal', 'PT',
+    'PortugalExt', 'PTE', 'Scotland', 'Slovenia', 'SI', 'Slovakia', 'SK',
+    'South Africa', 'ZA', 'Spain', 'ES', 'Sweden', 'SE', 'Switzerland', 'CH',
+    'UnitedKingdom', 'UK', 'UnitedStates', 'US', 'Wales',
+]
+
+ALLOWED_DAYS = WEEKDAYS + ['holiday']
+
 CONF_COUNTRY = 'country'
 CONF_PROVINCE = 'province'
 CONF_WORKDAYS = 'workdays'
+CONF_EXCLUDES = 'excludes'
+CONF_OFFSET = 'days_offset'
+
 # By default, Monday - Friday are workdays
 DEFAULT_WORKDAYS = ['mon', 'tue', 'wed', 'thu', 'fri']
-CONF_EXCLUDES = 'excludes'
 # By default, public holidays, Saturdays and Sundays are excluded from workdays
 DEFAULT_EXCLUDES = ['sat', 'sun', 'holiday']
 DEFAULT_NAME = 'Workday Sensor'
-ALLOWED_DAYS = WEEKDAYS + ['holiday']
-CONF_OFFSET = 'days_offset'
 DEFAULT_OFFSET = 0
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
@@ -86,7 +89,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
         else:
             _LOGGER.error("There is no province/state %s in country %s",
                           province, country)
-            return False
+            return
 
     _LOGGER.debug("Found the following holidays for your configuration:")
     for date, name in sorted(obj_holidays.items()):
diff --git a/requirements_all.txt b/requirements_all.txt
index a13068532ba..4f0ea37f32d 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -448,7 +448,7 @@ hipnotify==1.0.8
 hole==0.3.0
 
 # homeassistant.components.binary_sensor.workday
-holidays==0.9.6
+holidays==0.9.7
 
 # homeassistant.components.frontend
 home-assistant-frontend==20180912.0
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index e8bdd85a3e5..6268efc664b 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -81,7 +81,7 @@ haversine==0.4.5
 hbmqtt==0.9.4
 
 # homeassistant.components.binary_sensor.workday
-holidays==0.9.6
+holidays==0.9.7
 
 # homeassistant.components.frontend
 home-assistant-frontend==20180912.0

From fea1c921fc7665e1a6ed6527a5088841ec8c3ad2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 17 Sep 2018 07:45:01 +0200
Subject: [PATCH 167/357] Fix link to docs (#16652)

---
 homeassistant/components/vacuum/ecovacs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/components/vacuum/ecovacs.py b/homeassistant/components/vacuum/ecovacs.py
index ac01d8e7a20..b92ae598f80 100644
--- a/homeassistant/components/vacuum/ecovacs.py
+++ b/homeassistant/components/vacuum/ecovacs.py
@@ -2,7 +2,7 @@
 Support for Ecovacs Ecovacs Vaccums.
 
 For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/vacuum.neato/
+https://home-assistant.io/components/vacuum.ecovacs/
 """
 import logging
 

From 44fdfdf695d1562a8e2e49076295e72448c5ce48 Mon Sep 17 00:00:00 2001
From: Alexei Chetroi <lexoid@gmail.com>
Date: Mon, 17 Sep 2018 01:45:44 -0400
Subject: [PATCH 168/357] Log raw result of configure_reporting() command.
 (#16655)

---
 homeassistant/components/zha/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/zha/__init__.py b/homeassistant/components/zha/__init__.py
index f6b5868ff81..573f432f4c0 100644
--- a/homeassistant/components/zha/__init__.py
+++ b/homeassistant/components/zha/__init__.py
@@ -433,9 +433,9 @@ async def configure_reporting(entity_id, cluster, attr, skip_bind=False,
         res = await cluster.configure_reporting(attr, min_report,
                                                 max_report, reportable_change)
         _LOGGER.debug(
-            "%s: reporting '%s' attr on '%s' cluster: %d/%d/%d: Status: %s",
+            "%s: reporting '%s' attr on '%s' cluster: %d/%d/%d: Result: '%s'",
             entity_id, attr_name, cluster_name, min_report, max_report,
-            reportable_change, res[0][0].status
+            reportable_change, res
         )
     except DeliveryError as ex:
         _LOGGER.debug(

From 3e0c6c176a739f4b4507a309f59384f59a3b8e96 Mon Sep 17 00:00:00 2001
From: Anders Melchiorsen <amelchio@nogoto.net>
Date: Mon, 17 Sep 2018 10:10:50 +0200
Subject: [PATCH 169/357] Rework timer delays (#16650)

* Calibrate timer for each tick

* Return of timer out of sync detection
---
 homeassistant/core.py | 27 ++++++++++++++-----------
 tests/test_core.py    | 47 ++++++++++++++++++++++++-------------------
 2 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/homeassistant/core.py b/homeassistant/core.py
index 18520ed5d0c..e8d50e003d9 100644
--- a/homeassistant/core.py
+++ b/homeassistant/core.py
@@ -1230,22 +1230,26 @@ def _async_create_timer(hass: HomeAssistant) -> None:
     """Create a timer that will start on HOMEASSISTANT_START."""
     handle = None
 
-    @callback
-    def fire_time_event(nxt: float) -> None:
-        """Fire next time event."""
+    def schedule_tick(now: datetime.datetime) -> None:
+        """Schedule a timer tick when the next second rolls around."""
         nonlocal handle
 
+        slp_seconds = 1 - (now.microsecond / 10**6)
+        target = monotonic() + slp_seconds
+        handle = hass.loop.call_later(slp_seconds, fire_time_event, target)
+
+    @callback
+    def fire_time_event(target: float) -> None:
+        """Fire next time event."""
+        now = dt_util.utcnow()
+
         hass.bus.async_fire(EVENT_TIME_CHANGED,
-                            {ATTR_NOW: dt_util.utcnow()})
-        nxt += 1
-        slp_seconds = nxt - monotonic()
+                            {ATTR_NOW: now})
 
-        if slp_seconds < 0:
+        if monotonic() > target + 1:
             _LOGGER.error('Timer got out of sync. Resetting')
-            nxt = monotonic() + 1
-            slp_seconds = 1
 
-        handle = hass.loop.call_later(slp_seconds, fire_time_event, nxt)
+        schedule_tick(now)
 
     @callback
     def stop_timer(_: Event) -> None:
@@ -1256,5 +1260,4 @@ def _async_create_timer(hass: HomeAssistant) -> None:
     hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, stop_timer)
 
     _LOGGER.info("Timer:starting")
-    slp_seconds = 1 - (dt_util.utcnow().microsecond / 10**6)
-    hass.loop.call_later(slp_seconds, lambda: fire_time_event(monotonic()))
+    schedule_tick(dt_util.utcnow())
diff --git a/tests/test_core.py b/tests/test_core.py
index 4eecf995811..d88257abfb4 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -4,7 +4,7 @@ import asyncio
 import logging
 import os
 import unittest
-from unittest.mock import patch, MagicMock, sentinel
+from unittest.mock import patch, MagicMock
 from datetime import datetime, timedelta
 from tempfile import TemporaryDirectory
 
@@ -858,23 +858,25 @@ def test_create_timer(mock_monotonic, loop):
         funcs.append(func)
         return orig_callback(func)
 
-    mock_monotonic.side_effect = 10.2, 10.3
+    mock_monotonic.side_effect = 10.2, 10.8, 11.3
 
     with patch.object(ha, 'callback', mock_callback), \
             patch('homeassistant.core.dt_util.utcnow',
                   return_value=datetime(2018, 12, 31, 3, 4, 5, 333333)):
         ha._async_create_timer(hass)
 
+    assert len(funcs) == 2
+    fire_time_event, stop_timer = funcs
+
     assert len(hass.loop.call_later.mock_calls) == 1
-    slp_seconds, action = hass.loop.call_later.mock_calls[0][1]
-    assert abs(slp_seconds - 0.666667) < 0.001
+    delay, callback, target = hass.loop.call_later.mock_calls[0][1]
+    assert abs(delay - 0.666667) < 0.001
+    assert callback is fire_time_event
+    assert abs(target - 10.866667) < 0.001
 
     with patch('homeassistant.core.dt_util.utcnow',
-               return_value=sentinel.mock_date):
-        action()
-
-        assert len(funcs) == 2
-        fire_time_event, stop_timer = funcs
+               return_value=datetime(2018, 12, 31, 3, 4, 6, 100000)):
+        callback(target)
 
     assert len(hass.bus.async_listen_once.mock_calls) == 1
     assert len(hass.bus.async_fire.mock_calls) == 1
@@ -884,14 +886,14 @@ def test_create_timer(mock_monotonic, loop):
     assert event_type == EVENT_HOMEASSISTANT_STOP
     assert callback is stop_timer
 
-    slp_seconds, callback, nxt = hass.loop.call_later.mock_calls[1][1]
-    assert abs(slp_seconds - 0.9) < 0.001
+    delay, callback, target = hass.loop.call_later.mock_calls[1][1]
+    assert abs(delay - 0.9) < 0.001
     assert callback is fire_time_event
-    assert abs(nxt - 11.2) < 0.001
+    assert abs(target - 12.2) < 0.001
 
     event_type, event_data = hass.bus.async_fire.mock_calls[0][1]
     assert event_type == EVENT_TIME_CHANGED
-    assert event_data[ATTR_NOW] is sentinel.mock_date
+    assert event_data[ATTR_NOW] == datetime(2018, 12, 31, 3, 4, 6, 100000)
 
 
 @patch('homeassistant.core.monotonic')
@@ -905,28 +907,31 @@ def test_timer_out_of_sync(mock_monotonic, loop):
         funcs.append(func)
         return orig_callback(func)
 
-    mock_monotonic.side_effect = 10.2, 11.3, 11.3
+    mock_monotonic.side_effect = 10.2, 13.3, 13.4
 
     with patch.object(ha, 'callback', mock_callback), \
             patch('homeassistant.core.dt_util.utcnow',
                   return_value=datetime(2018, 12, 31, 3, 4, 5, 333333)):
         ha._async_create_timer(hass)
 
-    _, action = hass.loop.call_later.mock_calls[0][1]
+    delay, callback, target = hass.loop.call_later.mock_calls[0][1]
 
-    with patch('homeassistant.core.dt_util.utcnow',
-               return_value=sentinel.mock_date):
-        action()
+    with patch.object(ha, '_LOGGER', MagicMock()) as mock_logger, \
+            patch('homeassistant.core.dt_util.utcnow',
+                  return_value=datetime(2018, 12, 31, 3, 4, 8, 200000)):
+        callback(target)
+
+        assert len(mock_logger.error.mock_calls) == 1
 
         assert len(funcs) == 2
         fire_time_event, stop_timer = funcs
 
     assert len(hass.loop.call_later.mock_calls) == 2
 
-    slp_seconds, callback, nxt = hass.loop.call_later.mock_calls[1][1]
-    assert slp_seconds == 1
+    delay, callback, target = hass.loop.call_later.mock_calls[1][1]
+    assert abs(delay - 0.8) < 0.001
     assert callback is fire_time_event
-    assert abs(nxt - 12.3) < 0.001
+    assert abs(target - 14.2) < 0.001
 
 
 @asyncio.coroutine

From 201fd4afeec56f031dab027f0b84debea5bced77 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Mon, 17 Sep 2018 10:12:46 +0200
Subject: [PATCH 170/357] Add config entries to connection class (#16618)

---
 homeassistant/components/cast/__init__.py     |  3 +-
 .../components/config/config_entries.py       |  1 +
 .../components/deconz/config_flow.py          |  5 ++-
 .../components/hangouts/config_flow.py        |  5 ++-
 .../homematicip_cloud/config_flow.py          |  5 ++-
 homeassistant/components/hue/config_flow.py   |  5 ++-
 homeassistant/components/ios/__init__.py      |  3 +-
 homeassistant/components/mqtt/config_flow.py  |  1 +
 homeassistant/components/nest/config_flow.py  |  5 ++-
 .../components/openuv/config_flow.py          |  5 ++-
 homeassistant/components/sonos/__init__.py    |  3 +-
 homeassistant/components/zone/config_flow.py  |  4 +-
 homeassistant/config_entries.py               | 37 ++++++++++++++++---
 homeassistant/helpers/config_entry_flow.py    | 26 ++++---------
 tests/common.py                               |  6 ++-
 tests/components/binary_sensor/test_deconz.py |  3 +-
 .../components/config/test_config_entries.py  | 21 ++++++-----
 tests/components/light/test_deconz.py         |  2 +-
 tests/components/light/test_hue.py            |  2 +-
 tests/components/scene/test_deconz.py         |  3 +-
 tests/components/sensor/test_deconz.py        |  3 +-
 tests/components/switch/test_deconz.py        |  3 +-
 tests/helpers/test_config_entry_flow.py       |  3 +-
 tests/test_config_entries.py                  | 13 ++++---
 24 files changed, 104 insertions(+), 63 deletions(-)

diff --git a/homeassistant/components/cast/__init__.py b/homeassistant/components/cast/__init__.py
index 6885f24269a..53f5e704019 100644
--- a/homeassistant/components/cast/__init__.py
+++ b/homeassistant/components/cast/__init__.py
@@ -35,4 +35,5 @@ async def _async_has_devices(hass):
 
 
 config_entry_flow.register_discovery_flow(
-    DOMAIN, 'Google Cast', _async_has_devices)
+    DOMAIN, 'Google Cast', _async_has_devices,
+    config_entries.CONN_CLASS_LOCAL_PUSH)
diff --git a/homeassistant/components/config/config_entries.py b/homeassistant/components/config/config_entries.py
index e0c0e7daaf4..73b2767be4b 100644
--- a/homeassistant/components/config/config_entries.py
+++ b/homeassistant/components/config/config_entries.py
@@ -54,6 +54,7 @@ class ConfigManagerEntryIndexView(HomeAssistantView):
             'title': entry.title,
             'source': entry.source,
             'state': entry.state,
+            'connection_class': entry.connection_class,
         } for entry in hass.config_entries.async_entries()])
 
 
diff --git a/homeassistant/components/deconz/config_flow.py b/homeassistant/components/deconz/config_flow.py
index fb2eb54232a..65fcf51b930 100644
--- a/homeassistant/components/deconz/config_flow.py
+++ b/homeassistant/components/deconz/config_flow.py
@@ -2,7 +2,7 @@
 
 import voluptuous as vol
 
-from homeassistant import config_entries, data_entry_flow
+from homeassistant import config_entries
 from homeassistant.core import callback
 from homeassistant.const import CONF_API_KEY, CONF_HOST, CONF_PORT
 from homeassistant.helpers import aiohttp_client
@@ -23,10 +23,11 @@ def configured_hosts(hass):
 
 
 @config_entries.HANDLERS.register(DOMAIN)
-class DeconzFlowHandler(data_entry_flow.FlowHandler):
+class DeconzFlowHandler(config_entries.ConfigFlow):
     """Handle a deCONZ config flow."""
 
     VERSION = 1
+    CONNECTION_CLASS = config_entries.CONN_CLASS_LOCAL_PUSH
 
     def __init__(self):
         """Initialize the deCONZ config flow."""
diff --git a/homeassistant/components/hangouts/config_flow.py b/homeassistant/components/hangouts/config_flow.py
index 74eb14b050d..9d66338dff0 100644
--- a/homeassistant/components/hangouts/config_flow.py
+++ b/homeassistant/components/hangouts/config_flow.py
@@ -1,7 +1,7 @@
 """Config flow to configure Google Hangouts."""
 import voluptuous as vol
 
-from homeassistant import config_entries, data_entry_flow
+from homeassistant import config_entries
 from homeassistant.const import CONF_EMAIL, CONF_PASSWORD
 from homeassistant.core import callback
 
@@ -19,10 +19,11 @@ def configured_hangouts(hass):
 
 
 @config_entries.HANDLERS.register(HANGOUTS_DOMAIN)
-class HangoutsFlowHandler(data_entry_flow.FlowHandler):
+class HangoutsFlowHandler(config_entries.ConfigFlow):
     """Config flow Google Hangouts."""
 
     VERSION = 1
+    CONNECTION_CLASS = config_entries.CONN_CLASS_CLOUD_PUSH
 
     def __init__(self):
         """Initialize Google Hangouts config flow."""
diff --git a/homeassistant/components/homematicip_cloud/config_flow.py b/homeassistant/components/homematicip_cloud/config_flow.py
index d5045cf151b..ea251a3bf87 100644
--- a/homeassistant/components/homematicip_cloud/config_flow.py
+++ b/homeassistant/components/homematicip_cloud/config_flow.py
@@ -1,7 +1,7 @@
 """Config flow to configure the HomematicIP Cloud component."""
 import voluptuous as vol
 
-from homeassistant import config_entries, data_entry_flow
+from homeassistant import config_entries
 from homeassistant.core import callback
 
 from .const import DOMAIN as HMIPC_DOMAIN
@@ -18,10 +18,11 @@ def configured_haps(hass):
 
 
 @config_entries.HANDLERS.register(HMIPC_DOMAIN)
-class HomematicipCloudFlowHandler(data_entry_flow.FlowHandler):
+class HomematicipCloudFlowHandler(config_entries.ConfigFlow):
     """Config flow for the HomematicIP Cloud component."""
 
     VERSION = 1
+    CONNECTION_CLASS = config_entries.CONN_CLASS_CLOUD_PUSH
 
     def __init__(self):
         """Initialize HomematicIP Cloud config flow."""
diff --git a/homeassistant/components/hue/config_flow.py b/homeassistant/components/hue/config_flow.py
index 49ebbdaabf5..24ad65e1feb 100644
--- a/homeassistant/components/hue/config_flow.py
+++ b/homeassistant/components/hue/config_flow.py
@@ -6,7 +6,7 @@ import os
 import async_timeout
 import voluptuous as vol
 
-from homeassistant import config_entries, data_entry_flow
+from homeassistant import config_entries
 from homeassistant.core import callback
 from homeassistant.helpers import aiohttp_client
 
@@ -41,10 +41,11 @@ def _find_username_from_config(hass, filename):
 
 
 @config_entries.HANDLERS.register(DOMAIN)
-class HueFlowHandler(data_entry_flow.FlowHandler):
+class HueFlowHandler(config_entries.ConfigFlow):
     """Handle a Hue config flow."""
 
     VERSION = 1
+    CONNECTION_CLASS = config_entries.CONN_CLASS_LOCAL_POLL
 
     def __init__(self):
         """Initialize the Hue flow."""
diff --git a/homeassistant/components/ios/__init__.py b/homeassistant/components/ios/__init__.py
index 3766e00879d..a4884739f96 100644
--- a/homeassistant/components/ios/__init__.py
+++ b/homeassistant/components/ios/__init__.py
@@ -293,4 +293,5 @@ class iOSIdentifyDeviceView(HomeAssistantView):
 
 
 config_entry_flow.register_discovery_flow(
-    DOMAIN, 'Home Assistant iOS', lambda *_: True)
+    DOMAIN, 'Home Assistant iOS', lambda *_: True,
+    config_entries.CONN_CLASS_CLOUD_PUSH)
diff --git a/homeassistant/components/mqtt/config_flow.py b/homeassistant/components/mqtt/config_flow.py
index 42bc324f8fc..82b6f35056b 100644
--- a/homeassistant/components/mqtt/config_flow.py
+++ b/homeassistant/components/mqtt/config_flow.py
@@ -15,6 +15,7 @@ class FlowHandler(config_entries.ConfigFlow):
     """Handle a config flow."""
 
     VERSION = 1
+    CONNECTION_CLASS = config_entries.CONN_CLASS_LOCAL_PUSH
 
     async def async_step_user(self, user_input=None):
         """Handle a flow initialized by the user."""
diff --git a/homeassistant/components/nest/config_flow.py b/homeassistant/components/nest/config_flow.py
index c9987693b1a..3385fd4f850 100644
--- a/homeassistant/components/nest/config_flow.py
+++ b/homeassistant/components/nest/config_flow.py
@@ -7,7 +7,7 @@ import os
 import async_timeout
 import voluptuous as vol
 
-from homeassistant import config_entries, data_entry_flow
+from homeassistant import config_entries
 from homeassistant.core import callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.util.json import load_json
@@ -49,10 +49,11 @@ class CodeInvalid(NestAuthError):
 
 
 @config_entries.HANDLERS.register(DOMAIN)
-class NestFlowHandler(data_entry_flow.FlowHandler):
+class NestFlowHandler(config_entries.ConfigFlow):
     """Handle a Nest config flow."""
 
     VERSION = 1
+    CONNECTION_CLASS = config_entries.CONN_CLASS_CLOUD_PUSH
 
     def __init__(self):
         """Initialize the Nest config flow."""
diff --git a/homeassistant/components/openuv/config_flow.py b/homeassistant/components/openuv/config_flow.py
index 55ee566268e..6d7ae0f65bd 100644
--- a/homeassistant/components/openuv/config_flow.py
+++ b/homeassistant/components/openuv/config_flow.py
@@ -4,7 +4,7 @@ from collections import OrderedDict
 
 import voluptuous as vol
 
-from homeassistant import config_entries, data_entry_flow
+from homeassistant import config_entries
 from homeassistant.core import callback
 from homeassistant.const import (
     CONF_API_KEY, CONF_ELEVATION, CONF_LATITUDE, CONF_LONGITUDE)
@@ -23,10 +23,11 @@ def configured_instances(hass):
 
 
 @config_entries.HANDLERS.register(DOMAIN)
-class OpenUvFlowHandler(data_entry_flow.FlowHandler):
+class OpenUvFlowHandler(config_entries.ConfigFlow):
     """Handle an OpenUV config flow."""
 
     VERSION = 1
+    CONNECTION_CLASS = config_entries.CONN_CLASS_CLOUD_POLL
 
     def __init__(self):
         """Initialize the config flow."""
diff --git a/homeassistant/components/sonos/__init__.py b/homeassistant/components/sonos/__init__.py
index 6c9280195cc..60f3a8858b2 100644
--- a/homeassistant/components/sonos/__init__.py
+++ b/homeassistant/components/sonos/__init__.py
@@ -34,4 +34,5 @@ async def _async_has_devices(hass):
     return await hass.async_add_executor_job(soco.discover)
 
 
-config_entry_flow.register_discovery_flow(DOMAIN, 'Sonos', _async_has_devices)
+config_entry_flow.register_discovery_flow(
+    DOMAIN, 'Sonos', _async_has_devices, config_entries.CONN_CLASS_LOCAL_PUSH)
diff --git a/homeassistant/components/zone/config_flow.py b/homeassistant/components/zone/config_flow.py
index 01577de4c8f..bf221a828ad 100644
--- a/homeassistant/components/zone/config_flow.py
+++ b/homeassistant/components/zone/config_flow.py
@@ -3,7 +3,7 @@
 import voluptuous as vol
 
 import homeassistant.helpers.config_validation as cv
-from homeassistant import config_entries, data_entry_flow
+from homeassistant import config_entries
 from homeassistant.const import (
     CONF_NAME, CONF_LATITUDE, CONF_LONGITUDE, CONF_ICON, CONF_RADIUS)
 from homeassistant.core import callback
@@ -20,7 +20,7 @@ def configured_zones(hass):
 
 
 @config_entries.HANDLERS.register(DOMAIN)
-class ZoneFlowHandler(data_entry_flow.FlowHandler):
+class ZoneFlowHandler(config_entries.ConfigFlow):
     """Zone config flow."""
 
     VERSION = 1
diff --git a/homeassistant/config_entries.py b/homeassistant/config_entries.py
index b1e98d31048..e4c4b5c0327 100644
--- a/homeassistant/config_entries.py
+++ b/homeassistant/config_entries.py
@@ -27,9 +27,10 @@ At a minimum, each config flow will have to define a version number and the
 'user' step.
 
     @config_entries.HANDLERS.register(DOMAIN)
-    class ExampleConfigFlow(data_entry_flow.FlowHandler):
+    class ExampleConfigFlow(config_entries.ConfigFlow):
 
         VERSION = 1
+        CONNETION_CLASS = config_entries.CONN_CLASS_LOCAL_PUSH
 
         async def async_step_user(self, user_input=None):
             …
@@ -117,7 +118,7 @@ the flow from the config panel.
 
 import logging
 import uuid
-from typing import Set, Optional, List  # noqa pylint: disable=unused-import
+from typing import Set, Optional, List, Dict  # noqa pylint: disable=unused-import
 
 from homeassistant import data_entry_flow
 from homeassistant.core import callback, HomeAssistant
@@ -170,15 +171,23 @@ DISCOVERY_SOURCES = (
 
 EVENT_FLOW_DISCOVERED = 'config_entry_discovered'
 
+CONN_CLASS_CLOUD_PUSH = 'cloud_push'
+CONN_CLASS_CLOUD_POLL = 'cloud_poll'
+CONN_CLASS_LOCAL_PUSH = 'local_push'
+CONN_CLASS_LOCAL_POLL = 'local_poll'
+CONN_CLASS_ASSUMED = 'assumed'
+CONN_CLASS_UNKNOWN = 'unknown'
+
 
 class ConfigEntry:
     """Hold a configuration entry."""
 
     __slots__ = ('entry_id', 'version', 'domain', 'title', 'data', 'source',
-                 'state')
+                 'connection_class', 'state')
 
     def __init__(self, version: str, domain: str, title: str, data: dict,
-                 source: str, entry_id: Optional[str] = None,
+                 source: str, connection_class: str,
+                 entry_id: Optional[str] = None,
                  state: str = ENTRY_STATE_NOT_LOADED) -> None:
         """Initialize a config entry."""
         # Unique id of the config entry
@@ -199,6 +208,9 @@ class ConfigEntry:
         # Source of the configuration (user, discovery, cloud)
         self.source = source
 
+        # Connection class
+        self.connection_class = connection_class
+
         # State of the entry (LOADED, NOT_LOADED)
         self.state = state
 
@@ -266,6 +278,7 @@ class ConfigEntry:
             'title': self.title,
             'data': self.data,
             'source': self.source,
+            'connection_class': self.connection_class,
         }
 
 
@@ -352,7 +365,18 @@ class ConfigEntries:
             self._entries = []
             return
 
-        self._entries = [ConfigEntry(**entry) for entry in config['entries']]
+        self._entries = [
+            ConfigEntry(
+                version=entry['version'],
+                domain=entry['domain'],
+                entry_id=entry['entry_id'],
+                data=entry['data'],
+                source=entry['source'],
+                title=entry['title'],
+                # New in 0.79
+                connection_class=entry.get('connection_class',
+                                           CONN_CLASS_UNKNOWN))
+            for entry in config['entries']]
 
     async def async_forward_entry_setup(self, entry, component):
         """Forward the setup of an entry to a different component.
@@ -402,6 +426,7 @@ class ConfigEntries:
             title=result['title'],
             data=result['data'],
             source=flow.context['source'],
+            connection_class=flow.CONNECTION_CLASS,
         )
         self._entries.append(entry)
         self._async_schedule_save()
@@ -469,6 +494,8 @@ async def _old_conf_migrator(old_config):
 class ConfigFlow(data_entry_flow.FlowHandler):
     """Base class for config flows with some helpers."""
 
+    CONNECTION_CLASS = CONN_CLASS_UNKNOWN
+
     @callback
     def _async_current_entries(self):
         """Return current entries."""
diff --git a/homeassistant/helpers/config_entry_flow.py b/homeassistant/helpers/config_entry_flow.py
index e17d5071c6a..d940afc1152 100644
--- a/homeassistant/helpers/config_entry_flow.py
+++ b/homeassistant/helpers/config_entry_flow.py
@@ -1,26 +1,28 @@
 """Helpers for data entry flows for config entries."""
 from functools import partial
 
-from homeassistant.core import callback
-from homeassistant import config_entries, data_entry_flow
+from homeassistant import config_entries
 
 
-def register_discovery_flow(domain, title, discovery_function):
+def register_discovery_flow(domain, title, discovery_function,
+                            connection_class):
     """Register flow for discovered integrations that not require auth."""
     config_entries.HANDLERS.register(domain)(
-        partial(DiscoveryFlowHandler, domain, title, discovery_function))
+        partial(DiscoveryFlowHandler, domain, title, discovery_function,
+                connection_class))
 
 
-class DiscoveryFlowHandler(data_entry_flow.FlowHandler):
+class DiscoveryFlowHandler(config_entries.ConfigFlow):
     """Handle a discovery config flow."""
 
     VERSION = 1
 
-    def __init__(self, domain, title, discovery_function):
+    def __init__(self, domain, title, discovery_function, connection_class):
         """Initialize the discovery config flow."""
         self._domain = domain
         self._title = title
         self._discovery_function = discovery_function
+        self.CONNECTION_CLASS = connection_class  # pylint: disable=C0103
 
     async def async_step_user(self, user_input=None):
         """Handle a flow initialized by the user."""
@@ -83,15 +85,3 @@ class DiscoveryFlowHandler(data_entry_flow.FlowHandler):
             title=self._title,
             data={},
         )
-
-    @callback
-    def _async_current_entries(self):
-        """Return current entries."""
-        return self.hass.config_entries.async_entries(self._domain)
-
-    @callback
-    def _async_in_progress(self):
-        """Return other in progress flows for current domain."""
-        return [flw for flw in self.hass.config_entries.flow.async_progress()
-                if flw['handler'] == self._domain and
-                flw['flow_id'] != self.flow_id]
diff --git a/tests/common.py b/tests/common.py
index 26cd7743acc..6629207b288 100644
--- a/tests/common.py
+++ b/tests/common.py
@@ -550,14 +550,16 @@ class MockConfigEntry(config_entries.ConfigEntry):
 
     def __init__(self, *, domain='test', data=None, version=0, entry_id=None,
                  source=config_entries.SOURCE_USER, title='Mock Title',
-                 state=None):
+                 state=None,
+                 connection_class=config_entries.CONN_CLASS_UNKNOWN):
         """Initialize a mock config entry."""
         kwargs = {
             'entry_id': entry_id or 'mock-id',
             'domain': domain,
             'data': data or {},
             'version': version,
-            'title': title
+            'title': title,
+            'connection_class': connection_class,
         }
         if source is not None:
             kwargs['source'] = source
diff --git a/tests/components/binary_sensor/test_deconz.py b/tests/components/binary_sensor/test_deconz.py
index 2e33e28fa57..c2d20bd47c8 100644
--- a/tests/components/binary_sensor/test_deconz.py
+++ b/tests/components/binary_sensor/test_deconz.py
@@ -42,7 +42,8 @@ async def setup_bridge(hass, data, allow_clip_sensor=True):
     hass.data[deconz.DATA_DECONZ_ID] = {}
     config_entry = config_entries.ConfigEntry(
         1, deconz.DOMAIN, 'Mock Title',
-        {'host': 'mock-host', 'allow_clip_sensor': allow_clip_sensor}, 'test')
+        {'host': 'mock-host', 'allow_clip_sensor': allow_clip_sensor}, 'test',
+        config_entries.CONN_CLASS_LOCAL_PUSH)
     await hass.config_entries.async_forward_entry_setup(
         config_entry, 'binary_sensor')
     # To flush out the service call to update the group
diff --git a/tests/components/config/test_config_entries.py b/tests/components/config/test_config_entries.py
index ba053050f99..66d29aac757 100644
--- a/tests/components/config/test_config_entries.py
+++ b/tests/components/config/test_config_entries.py
@@ -9,7 +9,6 @@ import voluptuous as vol
 
 from homeassistant import config_entries as core_ce
 from homeassistant.config_entries import HANDLERS
-from homeassistant.data_entry_flow import FlowHandler
 from homeassistant.setup import async_setup_component
 from homeassistant.components.config import config_entries
 from homeassistant.loader import set_component
@@ -37,13 +36,15 @@ def test_get_entries(hass, client):
     MockConfigEntry(
        domain='comp',
        title='Test 1',
-       source='bla'
+       source='bla',
+       connection_class=core_ce.CONN_CLASS_LOCAL_POLL,
     ).add_to_hass(hass)
     MockConfigEntry(
        domain='comp2',
        title='Test 2',
        source='bla2',
        state=core_ce.ENTRY_STATE_LOADED,
+       connection_class=core_ce.CONN_CLASS_ASSUMED,
     ).add_to_hass(hass)
     resp = yield from client.get('/api/config/config_entries/entry')
     assert resp.status == 200
@@ -55,13 +56,15 @@ def test_get_entries(hass, client):
             'domain': 'comp',
             'title': 'Test 1',
             'source': 'bla',
-            'state': 'not_loaded'
+            'state': 'not_loaded',
+            'connection_class': 'local_poll',
         },
         {
             'domain': 'comp2',
             'title': 'Test 2',
             'source': 'bla2',
             'state': 'loaded',
+            'connection_class': 'assumed',
         },
     ]
 
@@ -100,7 +103,7 @@ def test_available_flows(hass, client):
 @asyncio.coroutine
 def test_initialize_flow(hass, client):
     """Test we can initialize a flow."""
-    class TestFlow(FlowHandler):
+    class TestFlow(core_ce.ConfigFlow):
         @asyncio.coroutine
         def async_step_user(self, user_input=None):
             schema = OrderedDict()
@@ -155,7 +158,7 @@ def test_initialize_flow(hass, client):
 @asyncio.coroutine
 def test_abort(hass, client):
     """Test a flow that aborts."""
-    class TestFlow(FlowHandler):
+    class TestFlow(core_ce.ConfigFlow):
         @asyncio.coroutine
         def async_step_user(self, user_input=None):
             return self.async_abort(reason='bla')
@@ -181,7 +184,7 @@ def test_create_account(hass, client):
         hass, 'test',
         MockModule('test', async_setup_entry=mock_coro_func(True)))
 
-    class TestFlow(FlowHandler):
+    class TestFlow(core_ce.ConfigFlow):
         VERSION = 1
 
         @asyncio.coroutine
@@ -213,7 +216,7 @@ def test_two_step_flow(hass, client):
         hass, 'test',
         MockModule('test', async_setup_entry=mock_coro_func(True)))
 
-    class TestFlow(FlowHandler):
+    class TestFlow(core_ce.ConfigFlow):
         VERSION = 1
 
         @asyncio.coroutine
@@ -269,7 +272,7 @@ def test_two_step_flow(hass, client):
 @asyncio.coroutine
 def test_get_progress_index(hass, client):
     """Test querying for the flows that are in progress."""
-    class TestFlow(FlowHandler):
+    class TestFlow(core_ce.ConfigFlow):
         VERSION = 5
 
         @asyncio.coroutine
@@ -301,7 +304,7 @@ def test_get_progress_index(hass, client):
 @asyncio.coroutine
 def test_get_progress_flow(hass, client):
     """Test we can query the API for same result as we get from init a flow."""
-    class TestFlow(FlowHandler):
+    class TestFlow(core_ce.ConfigFlow):
         @asyncio.coroutine
         def async_step_user(self, user_input=None):
             schema = OrderedDict()
diff --git a/tests/components/light/test_deconz.py b/tests/components/light/test_deconz.py
index df088d7a1b5..f52219beaa8 100644
--- a/tests/components/light/test_deconz.py
+++ b/tests/components/light/test_deconz.py
@@ -64,7 +64,7 @@ async def setup_bridge(hass, data, allow_deconz_groups=True):
     config_entry = config_entries.ConfigEntry(
         1, deconz.DOMAIN, 'Mock Title',
         {'host': 'mock-host', 'allow_deconz_groups': allow_deconz_groups},
-        'test')
+        'test', config_entries.CONN_CLASS_LOCAL_PUSH)
     await hass.config_entries.async_forward_entry_setup(config_entry, 'light')
     # To flush out the service call to update the group
     await hass.async_block_till_done()
diff --git a/tests/components/light/test_hue.py b/tests/components/light/test_hue.py
index db8d7e5f1e1..ad4026e7f31 100644
--- a/tests/components/light/test_hue.py
+++ b/tests/components/light/test_hue.py
@@ -199,7 +199,7 @@ async def setup_bridge(hass, mock_bridge):
     hass.data[hue.DOMAIN] = {'mock-host': mock_bridge}
     config_entry = config_entries.ConfigEntry(1, hue.DOMAIN, 'Mock Title', {
         'host': 'mock-host'
-    }, 'test')
+    }, 'test', config_entries.CONN_CLASS_LOCAL_POLL)
     await hass.config_entries.async_forward_entry_setup(config_entry, 'light')
     # To flush out the service call to update the group
     await hass.async_block_till_done()
diff --git a/tests/components/scene/test_deconz.py b/tests/components/scene/test_deconz.py
index 8c22f718fa0..89bb5297e78 100644
--- a/tests/components/scene/test_deconz.py
+++ b/tests/components/scene/test_deconz.py
@@ -36,7 +36,8 @@ async def setup_bridge(hass, data):
     hass.data[deconz.DATA_DECONZ_UNSUB] = []
     hass.data[deconz.DATA_DECONZ_ID] = {}
     config_entry = config_entries.ConfigEntry(
-        1, deconz.DOMAIN, 'Mock Title', {'host': 'mock-host'}, 'test')
+        1, deconz.DOMAIN, 'Mock Title', {'host': 'mock-host'}, 'test',
+        config_entries.CONN_CLASS_LOCAL_PUSH)
     await hass.config_entries.async_forward_entry_setup(config_entry, 'scene')
     # To flush out the service call to update the group
     await hass.async_block_till_done()
diff --git a/tests/components/sensor/test_deconz.py b/tests/components/sensor/test_deconz.py
index d7cdb458646..f40ba631d94 100644
--- a/tests/components/sensor/test_deconz.py
+++ b/tests/components/sensor/test_deconz.py
@@ -58,7 +58,8 @@ async def setup_bridge(hass, data, allow_clip_sensor=True):
     hass.data[deconz.DATA_DECONZ_ID] = {}
     config_entry = config_entries.ConfigEntry(
         1, deconz.DOMAIN, 'Mock Title',
-        {'host': 'mock-host', 'allow_clip_sensor': allow_clip_sensor}, 'test')
+        {'host': 'mock-host', 'allow_clip_sensor': allow_clip_sensor}, 'test',
+        config_entries.CONN_CLASS_LOCAL_PUSH)
     await hass.config_entries.async_forward_entry_setup(config_entry, 'sensor')
     # To flush out the service call to update the group
     await hass.async_block_till_done()
diff --git a/tests/components/switch/test_deconz.py b/tests/components/switch/test_deconz.py
index 57fc8b3bcd9..f4aac63166f 100644
--- a/tests/components/switch/test_deconz.py
+++ b/tests/components/switch/test_deconz.py
@@ -54,7 +54,8 @@ async def setup_bridge(hass, data):
     hass.data[deconz.DATA_DECONZ_UNSUB] = []
     hass.data[deconz.DATA_DECONZ_ID] = {}
     config_entry = config_entries.ConfigEntry(
-        1, deconz.DOMAIN, 'Mock Title', {'host': 'mock-host'}, 'test')
+        1, deconz.DOMAIN, 'Mock Title', {'host': 'mock-host'}, 'test',
+        config_entries.CONN_CLASS_LOCAL_PUSH)
     await hass.config_entries.async_forward_entry_setup(config_entry, 'switch')
     # To flush out the service call to update the group
     await hass.async_block_till_done()
diff --git a/tests/helpers/test_config_entry_flow.py b/tests/helpers/test_config_entry_flow.py
index a9b4dc158e0..a578afae1d2 100644
--- a/tests/helpers/test_config_entry_flow.py
+++ b/tests/helpers/test_config_entry_flow.py
@@ -21,7 +21,8 @@ def flow_conf(hass):
 
     with patch.dict(config_entries.HANDLERS):
         config_entry_flow.register_discovery_flow(
-            'test', 'Test', has_discovered_devices)
+            'test', 'Test', has_discovered_devices,
+            config_entries.CONN_CLASS_LOCAL_POLL)
         yield handler_conf
 
 
diff --git a/tests/test_config_entries.py b/tests/test_config_entries.py
index d8756d87a19..57d63eb8271 100644
--- a/tests/test_config_entries.py
+++ b/tests/test_config_entries.py
@@ -103,7 +103,7 @@ def test_add_entry_calls_setup_entry(hass, manager):
         hass, 'comp',
         MockModule('comp', async_setup_entry=mock_setup_entry))
 
-    class TestFlow(data_entry_flow.FlowHandler):
+    class TestFlow(config_entries.ConfigFlow):
 
         VERSION = 1
 
@@ -159,8 +159,9 @@ async def test_saving_and_loading(hass):
         hass, 'test',
         MockModule('test', async_setup_entry=lambda *args: mock_coro(True)))
 
-    class TestFlow(data_entry_flow.FlowHandler):
+    class TestFlow(config_entries.ConfigFlow):
         VERSION = 5
+        CONNECTION_CLASS = config_entries.CONN_CLASS_LOCAL_POLL
 
         @asyncio.coroutine
         def async_step_user(self, user_input=None):
@@ -175,8 +176,9 @@ async def test_saving_and_loading(hass):
         await hass.config_entries.flow.async_init(
             'test', context={'source': config_entries.SOURCE_USER})
 
-    class Test2Flow(data_entry_flow.FlowHandler):
+    class Test2Flow(config_entries.ConfigFlow):
         VERSION = 3
+        CONNECTION_CLASS = config_entries.CONN_CLASS_CLOUD_PUSH
 
         @asyncio.coroutine
         def async_step_user(self, user_input=None):
@@ -209,6 +211,7 @@ async def test_saving_and_loading(hass):
         assert orig.title == loaded.title
         assert orig.data == loaded.data
         assert orig.source == loaded.source
+        assert orig.connection_class == loaded.connection_class
 
 
 async def test_forward_entry_sets_up_component(hass):
@@ -252,7 +255,7 @@ async def test_discovery_notification(hass):
     loader.set_component(hass, 'test', MockModule('test'))
     await async_setup_component(hass, 'persistent_notification', {})
 
-    class TestFlow(data_entry_flow.FlowHandler):
+    class TestFlow(config_entries.ConfigFlow):
         VERSION = 5
 
         async def async_step_discovery(self, user_input=None):
@@ -289,7 +292,7 @@ async def test_discovery_notification_not_created(hass):
     loader.set_component(hass, 'test', MockModule('test'))
     await async_setup_component(hass, 'persistent_notification', {})
 
-    class TestFlow(data_entry_flow.FlowHandler):
+    class TestFlow(config_entries.ConfigFlow):
         VERSION = 5
 
         async def async_step_discovery(self, user_input=None):

From 1c251009fe7cef1834186887b08d8e60861a2647 Mon Sep 17 00:00:00 2001
From: damarco <schmidt.d@aon.at>
Date: Mon, 17 Sep 2018 10:42:21 +0200
Subject: [PATCH 171/357] Add zha device entity (#14579)

* Add endpoint entity

* Fix lint error

* Add nwk address as device state attribute

* Change to ZhaDeviceEntity

* Show last_seen only if offline

* Remove obsolete _discover_endpoint_info()
---
 homeassistant/components/zha/__init__.py | 89 ++++++++++++++++++++++++
 1 file changed, 89 insertions(+)

diff --git a/homeassistant/components/zha/__init__.py b/homeassistant/components/zha/__init__.py
index 573f432f4c0..7c48a577850 100644
--- a/homeassistant/components/zha/__init__.py
+++ b/homeassistant/components/zha/__init__.py
@@ -7,6 +7,7 @@ https://home-assistant.io/components/zha/
 import collections
 import enum
 import logging
+import time
 
 import voluptuous as vol
 
@@ -14,6 +15,7 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant import const as ha_const
 from homeassistant.helpers import discovery, entity
 from homeassistant.util import slugify
+from homeassistant.helpers.entity_component import EntityComponent
 
 REQUIREMENTS = [
     'bellows==0.7.0',
@@ -139,6 +141,7 @@ class ApplicationListener:
         """Initialize the listener."""
         self._hass = hass
         self._config = config
+        self._component = EntityComponent(_LOGGER, DOMAIN, hass)
         self._device_registry = collections.defaultdict(list)
         hass.data[DISCOVERY_KEY] = hass.data.get(DISCOVERY_KEY, {})
 
@@ -175,10 +178,17 @@ class ApplicationListener:
         import homeassistant.components.zha.const as zha_const
         zha_const.populate_data()
 
+        device_manufacturer = device_model = None
+
         for endpoint_id, endpoint in device.endpoints.items():
             if endpoint_id == 0:  # ZDO
                 continue
 
+            if endpoint.manufacturer is not None:
+                device_manufacturer = endpoint.manufacturer
+            if endpoint.model is not None:
+                device_model = endpoint.model
+
             component = None
             profile_clusters = ([], [])
             device_key = "{}-{}".format(device.ieee, endpoint_id)
@@ -247,6 +257,14 @@ class ApplicationListener:
                     join,
                 )
 
+        endpoint_entity = ZhaDeviceEntity(
+            device,
+            device_manufacturer,
+            device_model,
+            self,
+        )
+        await self._component.async_add_entities([endpoint_entity])
+
     def register_entity(self, ieee, entity_obj):
         """Record the creation of a hass entity associated with ieee."""
         self._device_registry[ieee].append(entity_obj)
@@ -370,6 +388,77 @@ class Entity(entity.Entity):
         pass
 
 
+class ZhaDeviceEntity(entity.Entity):
+    """A base class for ZHA devices."""
+
+    def __init__(self, device, manufacturer, model, application_listener,
+                 keepalive_interval=7200, **kwargs):
+        """Init ZHA endpoint entity."""
+        self._device_state_attributes = {
+            'nwk': '0x{0:04x}'.format(device.nwk),
+            'ieee': str(device.ieee),
+            'lqi': device.lqi,
+            'rssi': device.rssi,
+        }
+
+        ieee = device.ieee
+        ieeetail = ''.join(['%02x' % (o, ) for o in ieee[-4:]])
+        if manufacturer is not None and model is not None:
+            self._unique_id = "{}_{}_{}".format(
+                slugify(manufacturer),
+                slugify(model),
+                ieeetail,
+            )
+            self._device_state_attributes['friendly_name'] = "{} {}".format(
+                manufacturer,
+                model,
+            )
+        else:
+            self._unique_id = str(ieeetail)
+
+        self._device = device
+        self._state = 'offline'
+        self._keepalive_interval = keepalive_interval
+
+        application_listener.register_entity(ieee, self)
+
+    @property
+    def unique_id(self) -> str:
+        """Return a unique ID."""
+        return self._unique_id
+
+    @property
+    def state(self) -> str:
+        """Return the state of the entity."""
+        return self._state
+
+    @property
+    def device_state_attributes(self):
+        """Return device specific state attributes."""
+        update_time = None
+        if self._device.last_seen is not None and self._state == 'offline':
+            time_struct = time.localtime(self._device.last_seen)
+            update_time = time.strftime("%Y-%m-%dT%H:%M:%S", time_struct)
+            self._device_state_attributes['last_seen'] = update_time
+        if ('last_seen' in self._device_state_attributes and
+                self._state != 'offline'):
+            del self._device_state_attributes['last_seen']
+        self._device_state_attributes['lqi'] = self._device.lqi
+        self._device_state_attributes['rssi'] = self._device.rssi
+        return self._device_state_attributes
+
+    async def async_update(self):
+        """Handle polling."""
+        if self._device.last_seen is None:
+            self._state = 'offline'
+        else:
+            difference = time.time() - self._device.last_seen
+            if difference > self._keepalive_interval:
+                self._state = 'offline'
+            else:
+                self._state = 'online'
+
+
 def get_discovery_info(hass, discovery_info):
     """Get the full discovery info for a device.
 

From f918d625719444f7bdf4eb8df6548371293237cc Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 17 Sep 2018 10:48:09 +0200
Subject: [PATCH 172/357] version bump to 0.78.0

---
 homeassistant/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/const.py b/homeassistant/const.py
index 128fb8dbce6..546f47a62b3 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -2,7 +2,7 @@
 """Constants used by Home Assistant components."""
 MAJOR_VERSION = 0
 MINOR_VERSION = 78
-PATCH_VERSION = '0b3'
+PATCH_VERSION = '0'
 __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
 __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
 REQUIRED_PYTHON_VER = (3, 5, 3)

From 849a93e0a641336de99721542e41631769656244 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Sat, 15 Sep 2018 12:45:45 +0200
Subject: [PATCH 173/357] Update translations

---
 .../components/auth/.translations/fr.json     |  2 +-
 .../components/cast/.translations/ca.json     |  2 +-
 .../components/cast/.translations/fr.json     |  2 +-
 .../components/hangouts/.translations/en.json |  2 --
 .../components/hangouts/.translations/fr.json |  5 ++++
 .../homematicip_cloud/.translations/en.json   |  1 +
 .../homematicip_cloud/.translations/fr.json   | 15 ++++++++----
 .../components/hue/.translations/fr.json      |  2 +-
 .../components/ios/.translations/ca.json      | 14 +++++++++++
 .../components/ios/.translations/cs.json      | 10 ++++++++
 .../components/ios/.translations/fr.json      | 14 +++++++++++
 .../components/ios/.translations/ko.json      | 14 +++++++++++
 .../components/ios/.translations/nl.json      | 14 +++++++++++
 .../components/ios/.translations/pl.json      | 14 +++++++++++
 .../components/ios/.translations/zh-Hans.json | 14 +++++++++++
 .../components/mqtt/.translations/ca.json     | 23 +++++++++++++++++++
 .../components/mqtt/.translations/fr.json     | 23 +++++++++++++++++++
 .../components/mqtt/.translations/ko.json     | 23 +++++++++++++++++++
 .../components/nest/.translations/fr.json     |  6 ++++-
 .../components/openuv/.translations/nl.json   |  1 +
 .../components/sonos/.translations/ca.json    |  2 +-
 .../components/sonos/.translations/fr.json    |  2 +-
 22 files changed, 192 insertions(+), 13 deletions(-)
 create mode 100644 homeassistant/components/ios/.translations/ca.json
 create mode 100644 homeassistant/components/ios/.translations/cs.json
 create mode 100644 homeassistant/components/ios/.translations/fr.json
 create mode 100644 homeassistant/components/ios/.translations/ko.json
 create mode 100644 homeassistant/components/ios/.translations/nl.json
 create mode 100644 homeassistant/components/ios/.translations/pl.json
 create mode 100644 homeassistant/components/ios/.translations/zh-Hans.json
 create mode 100644 homeassistant/components/mqtt/.translations/ca.json
 create mode 100644 homeassistant/components/mqtt/.translations/fr.json
 create mode 100644 homeassistant/components/mqtt/.translations/ko.json

diff --git a/homeassistant/components/auth/.translations/fr.json b/homeassistant/components/auth/.translations/fr.json
index e8a8037c39a..b8d10dc89d0 100644
--- a/homeassistant/components/auth/.translations/fr.json
+++ b/homeassistant/components/auth/.translations/fr.json
@@ -2,7 +2,7 @@
     "mfa_setup": {
         "totp": {
             "error": {
-                "invalid_code": "Code invalide. S'il vous pla\u00eet essayez \u00e0 nouveau. Si cette erreur persiste, assurez-vous que l'horloge de votre syst\u00e8me Home Assistant est correcte."
+                "invalid_code": "Code invalide. Veuillez essayez \u00e0 nouveau. Si cette erreur persiste, assurez-vous que l'horloge de votre syst\u00e8me Home Assistant est correcte."
             },
             "step": {
                 "init": {
diff --git a/homeassistant/components/cast/.translations/ca.json b/homeassistant/components/cast/.translations/ca.json
index e65e00f8624..570cc7fdc00 100644
--- a/homeassistant/components/cast/.translations/ca.json
+++ b/homeassistant/components/cast/.translations/ca.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "no_devices_found": "No s'han trobat dispositius de Google Cast a la xarxa.",
-            "single_instance_allowed": "Nom\u00e9s cal una \u00fanica configuraci\u00f3 de Google Cast."
+            "single_instance_allowed": "Nom\u00e9s cal una sola configuraci\u00f3 de Google Cast."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/cast/.translations/fr.json b/homeassistant/components/cast/.translations/fr.json
index d3b95121de6..99feeb3c898 100644
--- a/homeassistant/components/cast/.translations/fr.json
+++ b/homeassistant/components/cast/.translations/fr.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "no_devices_found": "Aucun appareil Google Cast trouv\u00e9 sur le r\u00e9seau.",
-            "single_instance_allowed": "Seulement une seule configuration de Google Cast est n\u00e9cessaire."
+            "single_instance_allowed": "Une seule configuration de Google Cast est n\u00e9cessaire."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/hangouts/.translations/en.json b/homeassistant/components/hangouts/.translations/en.json
index 08d491e7009..f526bec4f34 100644
--- a/homeassistant/components/hangouts/.translations/en.json
+++ b/homeassistant/components/hangouts/.translations/en.json
@@ -14,7 +14,6 @@
                 "data": {
                     "2fa": "2FA Pin"
                 },
-                "description": "",
                 "title": "2-Factor-Authentication"
             },
             "user": {
@@ -22,7 +21,6 @@
                     "email": "E-Mail Address",
                     "password": "Password"
                 },
-                "description": "",
                 "title": "Google Hangouts Login"
             }
         },
diff --git a/homeassistant/components/hangouts/.translations/fr.json b/homeassistant/components/hangouts/.translations/fr.json
index 53759f9b534..00a7d5fd80d 100644
--- a/homeassistant/components/hangouts/.translations/fr.json
+++ b/homeassistant/components/hangouts/.translations/fr.json
@@ -5,10 +5,15 @@
             "unknown": "Une erreur inconnue s'est produite"
         },
         "error": {
+            "invalid_2fa": "Authentification \u00e0 2 facteurs invalide, veuillez r\u00e9essayer.",
+            "invalid_2fa_method": "M\u00e9thode 2FA non valide (v\u00e9rifiez sur le t\u00e9l\u00e9phone).",
             "invalid_login": "Login invalide, veuillez r\u00e9essayer."
         },
         "step": {
             "2fa": {
+                "data": {
+                    "2fa": "Code PIN d'authentification \u00e0 2 facteurs"
+                },
                 "title": "Authentification \u00e0 2 facteurs"
             },
             "user": {
diff --git a/homeassistant/components/homematicip_cloud/.translations/en.json b/homeassistant/components/homematicip_cloud/.translations/en.json
index 605bb0d250b..6fcfcddd75d 100644
--- a/homeassistant/components/homematicip_cloud/.translations/en.json
+++ b/homeassistant/components/homematicip_cloud/.translations/en.json
@@ -2,6 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "Access point is already configured",
+            "conection_aborted": "Could not connect to HMIP server",
             "connection_aborted": "Could not connect to HMIP server",
             "unknown": "Unknown error occurred."
         },
diff --git a/homeassistant/components/homematicip_cloud/.translations/fr.json b/homeassistant/components/homematicip_cloud/.translations/fr.json
index 8405946daa2..6cab0993c01 100644
--- a/homeassistant/components/homematicip_cloud/.translations/fr.json
+++ b/homeassistant/components/homematicip_cloud/.translations/fr.json
@@ -4,12 +4,13 @@
             "already_configured": "Le point d'acc\u00e8s est d\u00e9j\u00e0 configur\u00e9",
             "conection_aborted": "Impossible de se connecter au serveur HMIP",
             "connection_aborted": "Impossible de se connecter au serveur HMIP",
-            "unknown": "Une erreur inconnue s'est produite"
+            "unknown": "Une erreur inconnue s'est produite."
         },
         "error": {
             "invalid_pin": "Code PIN invalide, veuillez r\u00e9essayer.",
             "press_the_button": "Veuillez appuyer sur le bouton bleu.",
-            "register_failed": "\u00c9chec d'enregistrement. Veuillez r\u00e9essayer."
+            "register_failed": "\u00c9chec d'enregistrement. Veuillez r\u00e9essayer.",
+            "timeout_button": "D\u00e9lai d'attente expir\u00e9, veuillez r\u00e9\u00e9ssayer."
         },
         "step": {
             "init": {
@@ -17,8 +18,14 @@
                     "hapid": "ID du point d'acc\u00e8s (SGTIN)",
                     "name": "Nom (facultatif, utilis\u00e9 comme pr\u00e9fixe de nom pour tous les p\u00e9riph\u00e9riques)",
                     "pin": "Code PIN (facultatif)"
-                }
+                },
+                "title": "Choisissez le point d'acc\u00e8s HomematicIP"
+            },
+            "link": {
+                "description": "Appuyez sur le bouton bleu du point d'acc\u00e8s et sur le bouton Envoyer pour enregistrer HomematicIP avec Home Assistant. \n\n ![Emplacement du bouton sur le pont](/static/images/config_flows/config_homematicip_cloud.png)",
+                "title": "Lier le point d'acc\u00e8s"
             }
-        }
+        },
+        "title": "HomematicIP Cloud"
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/hue/.translations/fr.json b/homeassistant/components/hue/.translations/fr.json
index 73613f237da..5414bf01ea7 100644
--- a/homeassistant/components/hue/.translations/fr.json
+++ b/homeassistant/components/hue/.translations/fr.json
@@ -24,6 +24,6 @@
                 "title": "Hub de liaison"
             }
         },
-        "title": "Pont Philips Hue"
+        "title": "Philips Hue"
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/ios/.translations/ca.json b/homeassistant/components/ios/.translations/ca.json
new file mode 100644
index 00000000000..1b1ed732ab3
--- /dev/null
+++ b/homeassistant/components/ios/.translations/ca.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Nom\u00e9s cal una sola configuraci\u00f3 de Home Assistant iOS."
+        },
+        "step": {
+            "confirm": {
+                "description": "Voleu configurar el component Home Assistant iOS?",
+                "title": "Home Assistant iOS"
+            }
+        },
+        "title": "Home Assistant iOS"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ios/.translations/cs.json b/homeassistant/components/ios/.translations/cs.json
new file mode 100644
index 00000000000..95d675076da
--- /dev/null
+++ b/homeassistant/components/ios/.translations/cs.json
@@ -0,0 +1,10 @@
+{
+    "config": {
+        "step": {
+            "confirm": {
+                "title": "Home Assistant iOS"
+            }
+        },
+        "title": "Home Assistant iOS"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ios/.translations/fr.json b/homeassistant/components/ios/.translations/fr.json
new file mode 100644
index 00000000000..934849549e7
--- /dev/null
+++ b/homeassistant/components/ios/.translations/fr.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Seule une configuration de Home Assistant iOS est n\u00e9cessaire."
+        },
+        "step": {
+            "confirm": {
+                "description": "Voulez-vous configurer le composant Home Assistant iOS?",
+                "title": "Home Assistant iOS"
+            }
+        },
+        "title": "Home Assistant iOS"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ios/.translations/ko.json b/homeassistant/components/ios/.translations/ko.json
new file mode 100644
index 00000000000..6d69ea3126c
--- /dev/null
+++ b/homeassistant/components/ios/.translations/ko.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\ud558\ub098\uc758 Home Assistant iOS \uad6c\uc131\ub9cc \ud544\uc694\ud569\ub2c8\ub2e4."
+        },
+        "step": {
+            "confirm": {
+                "description": "Home Assistant iOS \ucef4\ud3ec\ub10c\ud2b8\uc758 \uc124\uc815\uc744 \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?",
+                "title": "Home Assistant iOS"
+            }
+        },
+        "title": "Home Assistant iOS"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ios/.translations/nl.json b/homeassistant/components/ios/.translations/nl.json
new file mode 100644
index 00000000000..8e5c46692a0
--- /dev/null
+++ b/homeassistant/components/ios/.translations/nl.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Er is slechts \u00e9\u00e9n configuratie van Home Assistant iOS nodig."
+        },
+        "step": {
+            "confirm": {
+                "description": "Wilt u het Home Assistant iOS component instellen?",
+                "title": "Home Assistant iOS"
+            }
+        },
+        "title": "Home Assistant iOS"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ios/.translations/pl.json b/homeassistant/components/ios/.translations/pl.json
new file mode 100644
index 00000000000..6240f074cfc
--- /dev/null
+++ b/homeassistant/components/ios/.translations/pl.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Wymagana jest tylko jedna konfiguracja Home Assistant iOS."
+        },
+        "step": {
+            "confirm": {
+                "description": "Czy chcesz skonfigurowa\u0107 Home Assistant iOS?",
+                "title": "Home Assistant iOS"
+            }
+        },
+        "title": "Home Assistant iOS"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ios/.translations/zh-Hans.json b/homeassistant/components/ios/.translations/zh-Hans.json
new file mode 100644
index 00000000000..0de30f0f3da
--- /dev/null
+++ b/homeassistant/components/ios/.translations/zh-Hans.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Home Assistant iOS \u53ea\u9700\u8981\u914d\u7f6e\u4e00\u6b21\u3002"
+        },
+        "step": {
+            "confirm": {
+                "description": "\u662f\u5426\u8981\u8bbe\u7f6e Home Assistant iOS \u7ec4\u4ef6\uff1f",
+                "title": "Home Assistant iOS"
+            }
+        },
+        "title": "Home Assistant iOS"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/mqtt/.translations/ca.json b/homeassistant/components/mqtt/.translations/ca.json
new file mode 100644
index 00000000000..57e9a83d201
--- /dev/null
+++ b/homeassistant/components/mqtt/.translations/ca.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Nom\u00e9s es permet una \u00fanica configuraci\u00f3 de MQTT."
+        },
+        "error": {
+            "cannot_connect": "No es pot connectar amb el broker."
+        },
+        "step": {
+            "broker": {
+                "data": {
+                    "broker": "Broker",
+                    "password": "Contrasenya",
+                    "port": "Port",
+                    "username": "Nom d'usuari"
+                },
+                "description": "Introdu\u00efu la informaci\u00f3 de connexi\u00f3 del vostre broker MQTT.",
+                "title": "MQTT"
+            }
+        },
+        "title": "MQTT"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/mqtt/.translations/fr.json b/homeassistant/components/mqtt/.translations/fr.json
new file mode 100644
index 00000000000..1870c598e3b
--- /dev/null
+++ b/homeassistant/components/mqtt/.translations/fr.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Une seule configuration de MQTT est autoris\u00e9e."
+        },
+        "error": {
+            "cannot_connect": "Impossible de se connecter au broker."
+        },
+        "step": {
+            "broker": {
+                "data": {
+                    "broker": "Broker",
+                    "password": "Mot de passe",
+                    "port": "Port",
+                    "username": "Nom d'utilisateur"
+                },
+                "description": "Veuillez entrer les informations de connexion de votre broker MQTT.",
+                "title": "MQTT"
+            }
+        },
+        "title": "MQTT"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/mqtt/.translations/ko.json b/homeassistant/components/mqtt/.translations/ko.json
new file mode 100644
index 00000000000..a38b00fd68d
--- /dev/null
+++ b/homeassistant/components/mqtt/.translations/ko.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\ud558\ub098\uc758 MQTT \ube0c\ub85c\ucee4\ub9cc \uad6c\uc131\uc774 \uac00\ub2a5\ud569\ub2c8\ub2e4."
+        },
+        "error": {
+            "cannot_connect": "MQTT \ube0c\ub85c\ucee4\uc5d0 \uc5f0\uacb0\ud560 \uc218 \uc5c6\uc74c"
+        },
+        "step": {
+            "broker": {
+                "data": {
+                    "broker": "\ube0c\ub85c\ucee4",
+                    "password": "\ube44\ubc00\ubc88\ud638",
+                    "port": "\ud3ec\ud2b8",
+                    "username": "\uc0ac\uc6a9\uc790 \uc774\ub984"
+                },
+                "description": "MQTT \ube0c\ub85c\ucee4\uc640\uc758 \uc5f0\uacb0 \uc815\ubcf4\ub97c \uc785\ub825\ud558\uc138\uc694.",
+                "title": "MQTT"
+            }
+        },
+        "title": "MQTT"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/nest/.translations/fr.json b/homeassistant/components/nest/.translations/fr.json
index fd2cb435eb2..822ec6ae836 100644
--- a/homeassistant/components/nest/.translations/fr.json
+++ b/homeassistant/components/nest/.translations/fr.json
@@ -2,18 +2,22 @@
     "config": {
         "abort": {
             "already_setup": "Vous ne pouvez configurer qu'un seul compte Nest.",
+            "authorize_url_fail": "Erreur inconnue lors de la g\u00e9n\u00e9ration d'une URL d'autorisation.",
             "authorize_url_timeout": "D\u00e9lai de g\u00e9n\u00e9ration de l'URL d'authentification d\u00e9pass\u00e9.",
             "no_flows": "Vous devez configurer Nest avant de pouvoir vous authentifier avec celui-ci. [Veuillez lire les instructions] (https://www.home-assistant.io/components/nest/)."
         },
         "error": {
             "internal_error": "Erreur interne lors de la validation du code",
-            "invalid_code": "Code invalide"
+            "invalid_code": "Code invalide",
+            "timeout": "D\u00e9lai de la validation du code expir\u00e9",
+            "unknown": "Erreur inconnue lors de la validation du code"
         },
         "step": {
             "init": {
                 "data": {
                     "flow_impl": "Fournisseur"
                 },
+                "description": "S\u00e9lectionnez via quel fournisseur d'authentification vous souhaitez vous authentifier avec Nest.",
                 "title": "Fournisseur d'authentification"
             },
             "link": {
diff --git a/homeassistant/components/openuv/.translations/nl.json b/homeassistant/components/openuv/.translations/nl.json
index 2c5086b3365..e2b264182d0 100644
--- a/homeassistant/components/openuv/.translations/nl.json
+++ b/homeassistant/components/openuv/.translations/nl.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "error": {
+            "identifier_exists": "Co\u00f6rdinaten al geregistreerd",
             "invalid_api_key": "Ongeldige API-sleutel"
         },
         "step": {
diff --git a/homeassistant/components/sonos/.translations/ca.json b/homeassistant/components/sonos/.translations/ca.json
index 9a745784b25..a6f1f99a379 100644
--- a/homeassistant/components/sonos/.translations/ca.json
+++ b/homeassistant/components/sonos/.translations/ca.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "no_devices_found": "No s'han trobat dispositius Sonos a la xarxa.",
-            "single_instance_allowed": "Nom\u00e9s cal una \u00fanica configuraci\u00f3 de Sonos."
+            "single_instance_allowed": "Nom\u00e9s cal una sola configuraci\u00f3 de Sonos."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/sonos/.translations/fr.json b/homeassistant/components/sonos/.translations/fr.json
index 809591dee7c..fd2a77bd129 100644
--- a/homeassistant/components/sonos/.translations/fr.json
+++ b/homeassistant/components/sonos/.translations/fr.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "no_devices_found": "Aucun p\u00e9riph\u00e9rique Sonos trouv\u00e9 sur le r\u00e9seau.",
-            "single_instance_allowed": "Seulement une seule configuration de Sonos est n\u00e9cessaire."
+            "single_instance_allowed": "Une seule configuration de Sonos est n\u00e9cessaire."
         },
         "step": {
             "confirm": {

From b8257866f5d7aaa56f5ed4491967c3bb8f395d59 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Mon, 17 Sep 2018 13:39:30 +0200
Subject: [PATCH 174/357] Clean up device update, add via-hub (#16659)

* Clean up device update, add via-hub

* Test loading/saving data

* Lint

* Add to Hue"

* Lint + tests
---
 .../components/config/device_registry.py      |   1 +
 homeassistant/components/deconz/__init__.py   |   2 +-
 homeassistant/components/hue/__init__.py      |   2 +-
 homeassistant/components/light/hue.py         |   1 +
 homeassistant/helpers/device_registry.py      | 105 +++++++++++----
 homeassistant/helpers/entity_platform.py      |  13 +-
 homeassistant/helpers/entity_registry.py      |  14 +-
 tests/common.py                               |   5 +
 .../components/config/test_device_registry.py |  16 ++-
 tests/components/hue/test_init.py             |   4 +-
 tests/helpers/test_device_registry.py         | 125 +++++++++++++++---
 tests/helpers/test_entity_platform.py         |  52 ++++++++
 tests/helpers/test_entity_registry.py         |   7 +-
 13 files changed, 269 insertions(+), 78 deletions(-)

diff --git a/homeassistant/components/config/device_registry.py b/homeassistant/components/config/device_registry.py
index 8383e0cdc7d..88aa5727a97 100644
--- a/homeassistant/components/config/device_registry.py
+++ b/homeassistant/components/config/device_registry.py
@@ -40,6 +40,7 @@ def websocket_list_devices(hass, connection, msg):
                 'name': entry.name,
                 'sw_version': entry.sw_version,
                 'id': entry.id,
+                'hub_device_id': entry.hub_device_id,
             } for entry in registry.devices.values()]
         ))
 
diff --git a/homeassistant/components/deconz/__init__.py b/homeassistant/components/deconz/__init__.py
index 6ed0a6e2c11..82f4233a7da 100644
--- a/homeassistant/components/deconz/__init__.py
+++ b/homeassistant/components/deconz/__init__.py
@@ -127,7 +127,7 @@ async def async_setup_entry(hass, config_entry):
     device_registry = await \
         hass.helpers.device_registry.async_get_registry()
     device_registry.async_get_or_create(
-        config_entry=config_entry.entry_id,
+        config_entry_id=config_entry.entry_id,
         connections={(CONNECTION_NETWORK_MAC, deconz.config.mac)},
         identifiers={(DOMAIN, deconz.config.bridgeid)},
         manufacturer='Dresden Elektronik', model=deconz.config.modelid,
diff --git a/homeassistant/components/hue/__init__.py b/homeassistant/components/hue/__init__.py
index 38b521078f4..7a781c99f53 100644
--- a/homeassistant/components/hue/__init__.py
+++ b/homeassistant/components/hue/__init__.py
@@ -140,7 +140,7 @@ async def async_setup_entry(hass, entry):
     config = bridge.api.config
     device_registry = await dr.async_get_registry(hass)
     device_registry.async_get_or_create(
-        config_entry=entry.entry_id,
+        config_entry_id=entry.entry_id,
         connections={
             (dr.CONNECTION_NETWORK_MAC, config.mac)
         },
diff --git a/homeassistant/components/light/hue.py b/homeassistant/components/light/hue.py
index 6f6e0ed617e..958abaca033 100644
--- a/homeassistant/components/light/hue.py
+++ b/homeassistant/components/light/hue.py
@@ -302,6 +302,7 @@ class HueLight(Light):
             'model': self.light.productname or self.light.modelid,
             # Not yet exposed as properties in aiohue
             'sw_version': self.light.raw['swversion'],
+            'via_hub': (hue.DOMAIN, self.bridge.api.config.bridgeid),
         }
 
     async def async_turn_on(self, **kwargs):
diff --git a/homeassistant/helpers/device_registry.py b/homeassistant/helpers/device_registry.py
index e6ff45af2fe..8d4cd0a5bbf 100644
--- a/homeassistant/helpers/device_registry.py
+++ b/homeassistant/helpers/device_registry.py
@@ -10,6 +10,7 @@ from homeassistant.core import callback
 from homeassistant.loader import bind_hass
 
 _LOGGER = logging.getLogger(__name__)
+_UNDEF = object()
 
 DATA_REGISTRY = 'device_registry'
 
@@ -32,6 +33,7 @@ class DeviceEntry:
     model = attr.ib(type=str)
     name = attr.ib(type=str, default=None)
     sw_version = attr.ib(type=str, default=None)
+    hub_device_id = attr.ib(type=str, default=None)
     id = attr.ib(type=str, default=attr.Factory(lambda: uuid.uuid4().hex))
 
 
@@ -54,28 +56,36 @@ class DeviceRegistry:
         return None
 
     @callback
-    def async_get_or_create(self, *, config_entry, connections, identifiers,
-                            manufacturer, model, name=None, sw_version=None):
+    def async_get_or_create(self, *, config_entry_id, connections, identifiers,
+                            manufacturer, model, name=None, sw_version=None,
+                            via_hub=None):
         """Get device. Create if it doesn't exist."""
         if not identifiers and not connections:
             return None
 
         device = self.async_get_device(identifiers, connections)
 
+        if via_hub is not None:
+            hub_device = self.async_get_device({via_hub}, set())
+            hub_device_id = hub_device.id if hub_device else None
+        else:
+            hub_device_id = None
+
         if device is not None:
-            if config_entry not in device.config_entries:
-                device.config_entries.add(config_entry)
-                self.async_schedule_save()
-            return device
+            return self._async_update_device(
+                device.id, config_entry_id=config_entry_id,
+                hub_device_id=hub_device_id
+            )
 
         device = DeviceEntry(
-            config_entries=[config_entry],
+            config_entries={config_entry_id},
             connections=connections,
             identifiers=identifiers,
             manufacturer=manufacturer,
             model=model,
             name=name,
-            sw_version=sw_version
+            sw_version=sw_version,
+            hub_device_id=hub_device_id
         )
         self.devices[device.id] = device
 
@@ -83,24 +93,64 @@ class DeviceRegistry:
 
         return device
 
+    @callback
+    def _async_update_device(self, device_id, *, config_entry_id=_UNDEF,
+                             remove_config_entry_id=_UNDEF,
+                             hub_device_id=_UNDEF):
+        """Update device attributes."""
+        old = self.devices[device_id]
+
+        changes = {}
+
+        config_entries = old.config_entries
+
+        if (config_entry_id is not _UNDEF and
+                config_entry_id not in old.config_entries):
+            config_entries = old.config_entries | {config_entry_id}
+
+        if (remove_config_entry_id is not _UNDEF and
+                remove_config_entry_id in config_entries):
+            config_entries = set(config_entries)
+            config_entries.remove(remove_config_entry_id)
+
+        if config_entries is not old.config_entries:
+            changes['config_entries'] = config_entries
+
+        if (hub_device_id is not _UNDEF and
+                hub_device_id != old.hub_device_id):
+            changes['hub_device_id'] = hub_device_id
+
+        if not changes:
+            return old
+
+        new = self.devices[device_id] = attr.evolve(old, **changes)
+        self.async_schedule_save()
+        return new
+
     async def async_load(self):
         """Load the device registry."""
-        devices = await self._store.async_load()
+        data = await self._store.async_load()
 
-        if devices is None:
-            self.devices = OrderedDict()
-            return
+        devices = OrderedDict()
 
-        self.devices = {device['id']: DeviceEntry(
-            config_entries=device['config_entries'],
-            connections={tuple(conn) for conn in device['connections']},
-            identifiers={tuple(iden) for iden in device['identifiers']},
-            manufacturer=device['manufacturer'],
-            model=device['model'],
-            name=device['name'],
-            sw_version=device['sw_version'],
-            id=device['id'],
-        ) for device in devices['devices']}
+        if data is not None:
+            for device in data['devices']:
+                devices[device['id']] = DeviceEntry(
+                    config_entries=set(device['config_entries']),
+                    connections={tuple(conn) for conn
+                                 in device['connections']},
+                    identifiers={tuple(iden) for iden
+                                 in device['identifiers']},
+                    manufacturer=device['manufacturer'],
+                    model=device['model'],
+                    name=device['name'],
+                    sw_version=device['sw_version'],
+                    id=device['id'],
+                    # Introduced in 0.79
+                    hub_device_id=device.get('hub_device_id'),
+                )
+
+        self.devices = devices
 
     @callback
     def async_schedule_save(self):
@@ -122,18 +172,19 @@ class DeviceRegistry:
                 'name': entry.name,
                 'sw_version': entry.sw_version,
                 'id': entry.id,
+                'hub_device_id': entry.hub_device_id,
             } for entry in self.devices.values()
         ]
 
         return data
 
     @callback
-    def async_clear_config_entry(self, config_entry):
+    def async_clear_config_entry(self, config_entry_id):
         """Clear config entry from registry entries."""
-        for device in self.devices.values():
-            if config_entry in device.config_entries:
-                device.config_entries.remove(config_entry)
-                self.async_schedule_save()
+        for dev_id, device in self.devices.items():
+            if config_entry_id in device.config_entries:
+                self._async_update_device(
+                    dev_id, remove_config_entry_id=config_entry_id)
 
 
 @bind_hass
diff --git a/homeassistant/helpers/entity_platform.py b/homeassistant/helpers/entity_platform.py
index 083a2946122..f2913e37339 100644
--- a/homeassistant/helpers/entity_platform.py
+++ b/homeassistant/helpers/entity_platform.py
@@ -273,16 +273,19 @@ class EntityPlatform:
                 config_entry_id = None
 
             device_info = entity.device_info
+
             if config_entry_id is not None and device_info is not None:
                 device = device_registry.async_get_or_create(
-                    config_entry=config_entry_id,
-                    connections=device_info.get('connections', []),
-                    identifiers=device_info.get('identifiers', []),
+                    config_entry_id=config_entry_id,
+                    connections=device_info.get('connections') or set(),
+                    identifiers=device_info.get('identifiers') or set(),
                     manufacturer=device_info.get('manufacturer'),
                     model=device_info.get('model'),
                     name=device_info.get('name'),
-                    sw_version=device_info.get('sw_version'))
-                device_id = device.id
+                    sw_version=device_info.get('sw_version'),
+                    via_hub=device_info.get('via_hub'))
+                if device:
+                    device_id = device.id
             else:
                 device_id = None
 
diff --git a/homeassistant/helpers/entity_registry.py b/homeassistant/helpers/entity_registry.py
index da3645a96fe..01c8419dc04 100644
--- a/homeassistant/helpers/entity_registry.py
+++ b/homeassistant/helpers/entity_registry.py
@@ -31,7 +31,7 @@ STORAGE_VERSION = 1
 STORAGE_KEY = 'core.entity_registry'
 
 
-@attr.s(slots=True)
+@attr.s(slots=True, frozen=True)
 class RegistryEntry:
     """Entity Registry Entry."""
 
@@ -113,14 +113,9 @@ class EntityRegistry:
         """Get entity. Create if it doesn't exist."""
         entity_id = self.async_get_entity_id(domain, platform, unique_id)
         if entity_id:
-            entry = self.entities[entity_id]
-            if entry.config_entry_id == config_entry_id:
-                return entry
-
-            self._async_update_entity(
+            return self._async_update_entity(
                 entity_id, config_entry_id=config_entry_id,
                 device_id=device_id)
-            return self.entities[entity_id]
 
         entity_id = self.async_generate_entity_id(
             domain, suggested_object_id or '{}_{}'.format(platform, unique_id))
@@ -253,10 +248,9 @@ class EntityRegistry:
     @callback
     def async_clear_config_entry(self, config_entry):
         """Clear config entry from registry entries."""
-        for entry in self.entities.values():
+        for entity_id, entry in self.entities.items():
             if config_entry == entry.config_entry_id:
-                entry.config_entry_id = None
-                self.async_schedule_save()
+                self._async_update_entity(entity_id, config_entry_id=None)
 
 
 @bind_hass
diff --git a/tests/common.py b/tests/common.py
index 6629207b288..56e86a4cd5c 100644
--- a/tests/common.py
+++ b/tests/common.py
@@ -763,6 +763,11 @@ class MockEntity(entity.Entity):
         """Return True if entity is available."""
         return self._handle('available')
 
+    @property
+    def device_info(self):
+        """Info how it links to a device."""
+        return self._handle('device_info')
+
     def _handle(self, attr):
         """Return attribute value."""
         if attr in self._values:
diff --git a/tests/components/config/test_device_registry.py b/tests/components/config/test_device_registry.py
index 491319bf927..f8ea51cfdc8 100644
--- a/tests/components/config/test_device_registry.py
+++ b/tests/components/config/test_device_registry.py
@@ -21,15 +21,16 @@ def registry(hass):
 async def test_list_devices(hass, client, registry):
     """Test list entries."""
     registry.async_get_or_create(
-        config_entry='1234',
+        config_entry_id='1234',
         connections={('ethernet', '12:34:56:78:90:AB:CD:EF')},
         identifiers={('bridgeid', '0123')},
         manufacturer='manufacturer', model='model')
     registry.async_get_or_create(
-        config_entry='1234',
+        config_entry_id='1234',
         connections={},
         identifiers={('bridgeid', '1234')},
-        manufacturer='manufacturer', model='model')
+        manufacturer='manufacturer', model='model',
+        via_hub=('bridgeid', '0123'))
 
     await client.send_json({
         'id': 5,
@@ -37,8 +38,7 @@ async def test_list_devices(hass, client, registry):
     })
     msg = await client.receive_json()
 
-    for entry in msg['result']:
-        entry.pop('id')
+    dev1, dev2 = [entry.pop('id') for entry in msg['result']]
 
     assert msg['result'] == [
         {
@@ -47,7 +47,8 @@ async def test_list_devices(hass, client, registry):
             'manufacturer': 'manufacturer',
             'model': 'model',
             'name': None,
-            'sw_version': None
+            'sw_version': None,
+            'hub_device_id': None,
         },
         {
             'config_entries': ['1234'],
@@ -55,6 +56,7 @@ async def test_list_devices(hass, client, registry):
             'manufacturer': 'manufacturer',
             'model': 'model',
             'name': None,
-            'sw_version': None
+            'sw_version': None,
+            'hub_device_id': dev1,
         }
     ]
diff --git a/tests/components/hue/test_init.py b/tests/components/hue/test_init.py
index 1c4768746d5..5da6d5b709a 100644
--- a/tests/components/hue/test_init.py
+++ b/tests/components/hue/test_init.py
@@ -182,7 +182,7 @@ async def test_config_passed_to_config_entry(hass):
 
     assert len(mock_registry.mock_calls) == 1
     assert mock_registry.mock_calls[0][2] == {
-        'config_entry': entry.entry_id,
+        'config_entry_id': entry.entry_id,
         'connections': {
             ('mac', 'mock-mac')
         },
@@ -192,7 +192,7 @@ async def test_config_passed_to_config_entry(hass):
         'manufacturer': 'Signify',
         'name': 'mock-name',
         'model': 'mock-modelid',
-        'sw_version': 'mock-swversion'
+        'sw_version': 'mock-swversion',
     }
 
 
diff --git a/tests/helpers/test_device_registry.py b/tests/helpers/test_device_registry.py
index 5ae6b4df651..b251846c491 100644
--- a/tests/helpers/test_device_registry.py
+++ b/tests/helpers/test_device_registry.py
@@ -2,7 +2,7 @@
 import pytest
 
 from homeassistant.helpers import device_registry
-from tests.common import mock_device_registry
+from tests.common import mock_device_registry, flush_store
 
 
 @pytest.fixture
@@ -14,41 +14,41 @@ def registry(hass):
 async def test_get_or_create_returns_same_entry(registry):
     """Make sure we do not duplicate entries."""
     entry = registry.async_get_or_create(
-        config_entry='1234',
+        config_entry_id='1234',
         connections={('ethernet', '12:34:56:78:90:AB:CD:EF')},
         identifiers={('bridgeid', '0123')},
         manufacturer='manufacturer', model='model')
     entry2 = registry.async_get_or_create(
-        config_entry='1234',
+        config_entry_id='1234',
         connections={('ethernet', '11:22:33:44:55:66:77:88')},
         identifiers={('bridgeid', '0123')},
         manufacturer='manufacturer', model='model')
     entry3 = registry.async_get_or_create(
-        config_entry='1234',
+        config_entry_id='1234',
         connections={('ethernet', '12:34:56:78:90:AB:CD:EF')},
         identifiers={('bridgeid', '1234')},
         manufacturer='manufacturer', model='model')
 
     assert len(registry.devices) == 1
-    assert entry is entry2
-    assert entry is entry3
+    assert entry.id == entry2.id
+    assert entry.id == entry3.id
     assert entry.identifiers == {('bridgeid', '0123')}
 
 
 async def test_requirement_for_identifier_or_connection(registry):
     """Make sure we do require some descriptor of device."""
     entry = registry.async_get_or_create(
-        config_entry='1234',
+        config_entry_id='1234',
         connections={('ethernet', '12:34:56:78:90:AB:CD:EF')},
         identifiers=set(),
         manufacturer='manufacturer', model='model')
     entry2 = registry.async_get_or_create(
-        config_entry='1234',
+        config_entry_id='1234',
         connections=set(),
         identifiers={('bridgeid', '0123')},
         manufacturer='manufacturer', model='model')
     entry3 = registry.async_get_or_create(
-        config_entry='1234',
+        config_entry_id='1234',
         connections=set(),
         identifiers=set(),
         manufacturer='manufacturer', model='model')
@@ -62,25 +62,25 @@ async def test_requirement_for_identifier_or_connection(registry):
 async def test_multiple_config_entries(registry):
     """Make sure we do not get duplicate entries."""
     entry = registry.async_get_or_create(
-        config_entry='123',
+        config_entry_id='123',
         connections={('ethernet', '12:34:56:78:90:AB:CD:EF')},
         identifiers={('bridgeid', '0123')},
         manufacturer='manufacturer', model='model')
     entry2 = registry.async_get_or_create(
-        config_entry='456',
+        config_entry_id='456',
         connections={('ethernet', '12:34:56:78:90:AB:CD:EF')},
         identifiers={('bridgeid', '0123')},
         manufacturer='manufacturer', model='model')
     entry3 = registry.async_get_or_create(
-        config_entry='123',
+        config_entry_id='123',
         connections={('ethernet', '12:34:56:78:90:AB:CD:EF')},
         identifiers={('bridgeid', '0123')},
         manufacturer='manufacturer', model='model')
 
     assert len(registry.devices) == 1
-    assert entry is entry2
-    assert entry is entry3
-    assert entry.config_entries == {'123', '456'}
+    assert entry.id == entry2.id
+    assert entry.id == entry3.id
+    assert entry2.config_entries == {'123', '456'}
 
 
 async def test_loading_from_storage(hass, hass_storage):
@@ -118,7 +118,7 @@ async def test_loading_from_storage(hass, hass_storage):
     registry = await device_registry.async_get_registry(hass)
 
     entry = registry.async_get_or_create(
-        config_entry='1234',
+        config_entry_id='1234',
         connections={('Zigbee', '01.23.45.67.89')},
         identifiers={('serial', '12:34:56:78:90:AB:CD:EF')},
         manufacturer='manufacturer', model='model')
@@ -129,25 +129,106 @@ async def test_loading_from_storage(hass, hass_storage):
 async def test_removing_config_entries(registry):
     """Make sure we do not get duplicate entries."""
     entry = registry.async_get_or_create(
-        config_entry='123',
+        config_entry_id='123',
         connections={('ethernet', '12:34:56:78:90:AB:CD:EF')},
         identifiers={('bridgeid', '0123')},
         manufacturer='manufacturer', model='model')
     entry2 = registry.async_get_or_create(
-        config_entry='456',
+        config_entry_id='456',
         connections={('ethernet', '12:34:56:78:90:AB:CD:EF')},
         identifiers={('bridgeid', '0123')},
         manufacturer='manufacturer', model='model')
     entry3 = registry.async_get_or_create(
-        config_entry='123',
+        config_entry_id='123',
         connections={('ethernet', '34:56:78:90:AB:CD:EF:12')},
         identifiers={('bridgeid', '4567')},
         manufacturer='manufacturer', model='model')
 
     assert len(registry.devices) == 2
-    assert entry is entry2
-    assert entry is not entry3
-    assert entry.config_entries == {'123', '456'}
+    assert entry.id == entry2.id
+    assert entry.id != entry3.id
+    assert entry2.config_entries == {'123', '456'}
+
     registry.async_clear_config_entry('123')
+    entry = registry.async_get_device({('bridgeid', '0123')}, set())
+    entry3 = registry.async_get_device({('bridgeid', '4567')}, set())
+
     assert entry.config_entries == {'456'}
     assert entry3.config_entries == set()
+
+
+async def test_specifying_hub_device_create(registry):
+    """Test specifying a hub and updating."""
+    hub = registry.async_get_or_create(
+        config_entry_id='123',
+        connections={('ethernet', '12:34:56:78:90:AB:CD:EF')},
+        identifiers={('hue', '0123')},
+        manufacturer='manufacturer', model='hub')
+
+    light = registry.async_get_or_create(
+        config_entry_id='456',
+        connections=set(),
+        identifiers={('hue', '456')},
+        manufacturer='manufacturer', model='light',
+        via_hub=('hue', '0123'))
+
+    assert light.hub_device_id == hub.id
+
+
+async def test_specifying_hub_device_update(registry):
+    """Test specifying a hub and updating."""
+    light = registry.async_get_or_create(
+        config_entry_id='456',
+        connections=set(),
+        identifiers={('hue', '456')},
+        manufacturer='manufacturer', model='light',
+        via_hub=('hue', '0123'))
+
+    assert light.hub_device_id is None
+
+    hub = registry.async_get_or_create(
+        config_entry_id='123',
+        connections={('ethernet', '12:34:56:78:90:AB:CD:EF')},
+        identifiers={('hue', '0123')},
+        manufacturer='manufacturer', model='hub')
+
+    light = registry.async_get_or_create(
+        config_entry_id='456',
+        connections=set(),
+        identifiers={('hue', '456')},
+        manufacturer='manufacturer', model='light',
+        via_hub=('hue', '0123'))
+
+    assert light.hub_device_id == hub.id
+
+
+async def test_loading_saving_data(hass, registry):
+    """Test that we load/save data correctly."""
+    orig_hub = registry.async_get_or_create(
+        config_entry_id='123',
+        connections={('ethernet', '12:34:56:78:90:AB:CD:EF')},
+        identifiers={('hue', '0123')},
+        manufacturer='manufacturer', model='hub')
+
+    orig_light = registry.async_get_or_create(
+        config_entry_id='456',
+        connections=set(),
+        identifiers={('hue', '456')},
+        manufacturer='manufacturer', model='light',
+        via_hub=('hue', '0123'))
+
+    assert len(registry.devices) == 2
+
+    # Now load written data in new registry
+    registry2 = device_registry.DeviceRegistry(hass)
+    await flush_store(registry._store)
+    await registry2.async_load()
+
+    # Ensure same order
+    assert list(registry.devices) == list(registry2.devices)
+
+    new_hub = registry2.async_get_device({('hue', '0123')}, set())
+    new_light = registry2.async_get_device({('hue', '456')}, set())
+
+    assert orig_hub == new_hub
+    assert orig_light == new_light
diff --git a/tests/helpers/test_entity_platform.py b/tests/helpers/test_entity_platform.py
index b51219ddbed..631d446d186 100644
--- a/tests/helpers/test_entity_platform.py
+++ b/tests/helpers/test_entity_platform.py
@@ -676,3 +676,55 @@ async def test_entity_registry_updates_invalid_entity_id(hass):
     assert hass.states.get('test_domain.world') is not None
     assert hass.states.get('invalid_entity_id') is None
     assert hass.states.get('diff_domain.world') is None
+
+
+async def test_device_info_called(hass):
+    """Test device info is forwarded correctly."""
+    registry = await hass.helpers.device_registry.async_get_registry()
+    hub = registry.async_get_or_create(
+        config_entry_id='123',
+        connections=set(),
+        identifiers={('hue', 'hub-id')},
+        manufacturer='manufacturer', model='hub'
+    )
+
+    async def async_setup_entry(hass, config_entry, async_add_entities):
+        """Mock setup entry method."""
+        async_add_entities([
+            # Invalid device info
+            MockEntity(unique_id='abcd', device_info={}),
+            # Valid device info
+            MockEntity(unique_id='qwer', device_info={
+                'identifiers': {('hue', '1234')},
+                'connections': {('mac', 'abcd')},
+                'manufacturer': 'test-manuf',
+                'model': 'test-model',
+                'name': 'test-name',
+                'sw_version': 'test-sw',
+                'via_hub': ('hue', 'hub-id'),
+            }),
+        ])
+        return True
+
+    platform = MockPlatform(
+        async_setup_entry=async_setup_entry
+    )
+    config_entry = MockConfigEntry(entry_id='super-mock-id')
+    entity_platform = MockEntityPlatform(
+        hass,
+        platform_name=config_entry.domain,
+        platform=platform
+    )
+
+    assert await entity_platform.async_setup_entry(config_entry)
+    await hass.async_block_till_done()
+
+    device = registry.async_get_device({('hue', '1234')}, set())
+    assert device is not None
+    assert device.identifiers == {('hue', '1234')}
+    assert device.connections == {('mac', 'abcd')}
+    assert device.manufacturer == 'test-manuf'
+    assert device.model == 'test-model'
+    assert device.name == 'test-name'
+    assert device.sw_version == 'test-sw'
+    assert device.hub_device_id == hub.id
diff --git a/tests/helpers/test_entity_registry.py b/tests/helpers/test_entity_registry.py
index bb28287ddd8..a8c9086b2d2 100644
--- a/tests/helpers/test_entity_registry.py
+++ b/tests/helpers/test_entity_registry.py
@@ -6,7 +6,7 @@ import pytest
 
 from homeassistant.helpers import entity_registry
 
-from tests.common import mock_registry
+from tests.common import mock_registry, flush_store
 
 
 YAML__OPEN_PATH = 'homeassistant.util.yaml.open'
@@ -77,8 +77,7 @@ async def test_loading_saving_data(hass, registry):
 
     # Now load written data in new registry
     registry2 = entity_registry.EntityRegistry(hass)
-    registry2._store = registry._store
-
+    await flush_store(registry._store)
     await registry2.async_load()
 
     # Ensure same order
@@ -192,6 +191,8 @@ async def test_removing_config_entry_id(registry):
         'light', 'hue', '5678', config_entry_id='mock-id-1')
     assert entry.config_entry_id == 'mock-id-1'
     registry.async_clear_config_entry('mock-id-1')
+
+    entry = registry.entities[entry.entity_id]
     assert entry.config_entry_id is None
 
 

From 41ac2a3c7373a6edb6b4701179fba82c574acb01 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 17 Sep 2018 14:18:04 +0200
Subject: [PATCH 175/357] Bump frontend to 20180917.0

---
 homeassistant/components/frontend/__init__.py | 2 +-
 requirements_all.txt                          | 2 +-
 requirements_test_all.txt                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/frontend/__init__.py b/homeassistant/components/frontend/__init__.py
index a7a6187c939..529d7d5fb3d 100644
--- a/homeassistant/components/frontend/__init__.py
+++ b/homeassistant/components/frontend/__init__.py
@@ -26,7 +26,7 @@ from homeassistant.helpers.translation import async_get_translations
 from homeassistant.loader import bind_hass
 from homeassistant.util.yaml import load_yaml
 
-REQUIREMENTS = ['home-assistant-frontend==20180912.0']
+REQUIREMENTS = ['home-assistant-frontend==20180917.0']
 
 DOMAIN = 'frontend'
 DEPENDENCIES = ['api', 'websocket_api', 'http', 'system_log',
diff --git a/requirements_all.txt b/requirements_all.txt
index 4f0ea37f32d..13cf9082e6c 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -451,7 +451,7 @@ hole==0.3.0
 holidays==0.9.7
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180912.0
+home-assistant-frontend==20180917.0
 
 # homeassistant.components.homekit_controller
 # homekit==0.10
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 6268efc664b..8693627ba95 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -84,7 +84,7 @@ hbmqtt==0.9.4
 holidays==0.9.7
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180912.0
+home-assistant-frontend==20180917.0
 
 # homeassistant.components.homematicip_cloud
 homematicip==0.9.8

From 4b30cbbf3b69eb6e4fb93e706aaa011b385fbce9 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 17 Sep 2018 14:18:20 +0200
Subject: [PATCH 176/357] Update translations

---
 .../components/ios/.translations/hu.json      | 14 +++++++++++
 .../components/ios/.translations/ru.json      | 14 +++++++++++
 .../components/ios/.translations/zh-Hant.json | 14 +++++++++++
 .../components/mqtt/.translations/hu.json     | 23 +++++++++++++++++++
 .../components/mqtt/.translations/ko.json     |  2 +-
 .../components/mqtt/.translations/pl.json     | 23 +++++++++++++++++++
 .../components/mqtt/.translations/ru.json     | 23 +++++++++++++++++++
 .../mqtt/.translations/zh-Hans.json           | 23 +++++++++++++++++++
 .../mqtt/.translations/zh-Hant.json           | 23 +++++++++++++++++++
 9 files changed, 158 insertions(+), 1 deletion(-)
 create mode 100644 homeassistant/components/ios/.translations/hu.json
 create mode 100644 homeassistant/components/ios/.translations/ru.json
 create mode 100644 homeassistant/components/ios/.translations/zh-Hant.json
 create mode 100644 homeassistant/components/mqtt/.translations/hu.json
 create mode 100644 homeassistant/components/mqtt/.translations/pl.json
 create mode 100644 homeassistant/components/mqtt/.translations/ru.json
 create mode 100644 homeassistant/components/mqtt/.translations/zh-Hans.json
 create mode 100644 homeassistant/components/mqtt/.translations/zh-Hant.json

diff --git a/homeassistant/components/ios/.translations/hu.json b/homeassistant/components/ios/.translations/hu.json
new file mode 100644
index 00000000000..5ee001db3c5
--- /dev/null
+++ b/homeassistant/components/ios/.translations/hu.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Csak egyetlen Home Assistant iOS konfigur\u00e1ci\u00f3 sz\u00fcks\u00e9ges."
+        },
+        "step": {
+            "confirm": {
+                "description": "Be szeretn\u00e9d \u00e1ll\u00edtani a Home Assistant iOS komponenst?",
+                "title": "Home Assistant iOS"
+            }
+        },
+        "title": "Home Assistant iOS"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ios/.translations/ru.json b/homeassistant/components/ios/.translations/ru.json
new file mode 100644
index 00000000000..7030f18b729
--- /dev/null
+++ b/homeassistant/components/ios/.translations/ru.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\u0414\u043e\u043f\u0443\u0441\u043a\u0430\u0435\u0442\u0441\u044f \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0430 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f Home Assistant iOS."
+        },
+        "step": {
+            "confirm": {
+                "description": "\u0412\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442 Home Assistant iOS?",
+                "title": "Home Assistant iOS"
+            }
+        },
+        "title": "Home Assistant iOS"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ios/.translations/zh-Hant.json b/homeassistant/components/ios/.translations/zh-Hant.json
new file mode 100644
index 00000000000..8cfedf31673
--- /dev/null
+++ b/homeassistant/components/ios/.translations/zh-Hant.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\u50c5\u9700\u8a2d\u5b9a\u4e00\u6b21 Home Assistant iOS \u5373\u53ef\u3002"
+        },
+        "step": {
+            "confirm": {
+                "description": "\u662f\u5426\u8981\u8a2d\u5b9a Home Assistant iOS \u5143\u4ef6\uff1f",
+                "title": "Home Assistant iOS"
+            }
+        },
+        "title": "Home Assistant iOS"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/mqtt/.translations/hu.json b/homeassistant/components/mqtt/.translations/hu.json
new file mode 100644
index 00000000000..d85814e917c
--- /dev/null
+++ b/homeassistant/components/mqtt/.translations/hu.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Csak egyetlen MQTT konfigur\u00e1ci\u00f3 megengedett."
+        },
+        "error": {
+            "cannot_connect": "Nem siker\u00fclt csatlakozni a br\u00f3kerhez."
+        },
+        "step": {
+            "broker": {
+                "data": {
+                    "broker": "Br\u00f3ker",
+                    "password": "Jelsz\u00f3",
+                    "port": "Port",
+                    "username": "Felhaszn\u00e1l\u00f3n\u00e9v"
+                },
+                "description": "K\u00e9rlek, add meg az MQTT br\u00f3ker kapcsol\u00f3d\u00e1si adatait.",
+                "title": "MQTT"
+            }
+        },
+        "title": "MQTT"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/mqtt/.translations/ko.json b/homeassistant/components/mqtt/.translations/ko.json
index a38b00fd68d..a1e130c59cf 100644
--- a/homeassistant/components/mqtt/.translations/ko.json
+++ b/homeassistant/components/mqtt/.translations/ko.json
@@ -4,7 +4,7 @@
             "single_instance_allowed": "\ud558\ub098\uc758 MQTT \ube0c\ub85c\ucee4\ub9cc \uad6c\uc131\uc774 \uac00\ub2a5\ud569\ub2c8\ub2e4."
         },
         "error": {
-            "cannot_connect": "MQTT \ube0c\ub85c\ucee4\uc5d0 \uc5f0\uacb0\ud560 \uc218 \uc5c6\uc74c"
+            "cannot_connect": "MQTT \ube0c\ub85c\ucee4\uc5d0 \uc5f0\uacb0\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4."
         },
         "step": {
             "broker": {
diff --git a/homeassistant/components/mqtt/.translations/pl.json b/homeassistant/components/mqtt/.translations/pl.json
new file mode 100644
index 00000000000..f3ccaf8f37e
--- /dev/null
+++ b/homeassistant/components/mqtt/.translations/pl.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Wymagana jest tylko jedna konfiguracja MQTT."
+        },
+        "error": {
+            "cannot_connect": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z po\u015brednikiem."
+        },
+        "step": {
+            "broker": {
+                "data": {
+                    "broker": "Po\u015brednik",
+                    "password": "Has\u0142o",
+                    "port": "Port",
+                    "username": "Nazwa u\u017cytkownika"
+                },
+                "description": "Wprowad\u017a informacje o po\u0142\u0105czeniu po\u015brednika MQTT.",
+                "title": "MQTT"
+            }
+        },
+        "title": "MQTT"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/mqtt/.translations/ru.json b/homeassistant/components/mqtt/.translations/ru.json
new file mode 100644
index 00000000000..c9dc3c2fd60
--- /dev/null
+++ b/homeassistant/components/mqtt/.translations/ru.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\u0414\u043e\u043f\u0443\u0441\u043a\u0430\u0435\u0442\u0441\u044f \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0430 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f MQTT."
+        },
+        "error": {
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u0435\u0442\u0441\u044f \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0431\u0440\u043e\u043a\u0435\u0440\u0443."
+        },
+        "step": {
+            "broker": {
+                "data": {
+                    "broker": "\u0411\u0440\u043e\u043a\u0435\u0440",
+                    "password": "\u041f\u0430\u0440\u043e\u043b\u044c",
+                    "port": "\u041f\u043e\u0440\u0442",
+                    "username": "\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f"
+                },
+                "description": "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e \u043e \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0438 \u043a \u0432\u0430\u0448\u0435\u043c\u0443 \u0431\u0440\u043e\u043a\u0435\u0440\u0443 MQTT.",
+                "title": "MQTT"
+            }
+        },
+        "title": "MQTT"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/mqtt/.translations/zh-Hans.json b/homeassistant/components/mqtt/.translations/zh-Hans.json
new file mode 100644
index 00000000000..f539bd2a630
--- /dev/null
+++ b/homeassistant/components/mqtt/.translations/zh-Hans.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\u53ea\u5141\u8bb8\u4e00\u4e2a MQTT \u914d\u7f6e\u3002"
+        },
+        "error": {
+            "cannot_connect": "\u65e0\u6cd5\u8fde\u63a5\u5230\u670d\u52a1\u5668\u3002"
+        },
+        "step": {
+            "broker": {
+                "data": {
+                    "broker": "\u670d\u52a1\u5668",
+                    "password": "\u5bc6\u7801",
+                    "port": "\u7aef\u53e3",
+                    "username": "\u7528\u6237\u540d"
+                },
+                "description": "\u8bf7\u8f93\u5165\u60a8\u7684 MQTT \u670d\u52a1\u5668\u7684\u8fde\u63a5\u4fe1\u606f\u3002",
+                "title": "MQTT"
+            }
+        },
+        "title": "MQTT"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/mqtt/.translations/zh-Hant.json b/homeassistant/components/mqtt/.translations/zh-Hant.json
new file mode 100644
index 00000000000..e6f27a439d5
--- /dev/null
+++ b/homeassistant/components/mqtt/.translations/zh-Hant.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\u50c5\u5141\u8a31\u8a2d\u5b9a\u4e00\u7d44 MQTT\u3002"
+        },
+        "error": {
+            "cannot_connect": "\u7121\u6cd5\u9023\u7dda\u81f3 Broker\u3002"
+        },
+        "step": {
+            "broker": {
+                "data": {
+                    "broker": "Broker",
+                    "password": "\u4f7f\u7528\u8005\u5bc6\u78bc",
+                    "port": "\u901a\u8a0a\u57e0",
+                    "username": "\u4f7f\u7528\u8005\u540d\u7a31"
+                },
+                "description": "\u8acb\u8f38\u5165 MQTT Broker \u9023\u7dda\u8cc7\u8a0a\u3002",
+                "title": "MQTT"
+            }
+        },
+        "title": "MQTT"
+    }
+}
\ No newline at end of file

From 366e270e94c33d4428f0f06a8c05190a48ddb3ef Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 17 Sep 2018 18:33:41 +0200
Subject: [PATCH 177/357] Bump frontend to 20180916.0

---
 homeassistant/components/frontend/__init__.py | 2 +-
 requirements_all.txt                          | 2 +-
 requirements_test_all.txt                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/frontend/__init__.py b/homeassistant/components/frontend/__init__.py
index a7a6187c939..6dd4be7ecec 100644
--- a/homeassistant/components/frontend/__init__.py
+++ b/homeassistant/components/frontend/__init__.py
@@ -26,7 +26,7 @@ from homeassistant.helpers.translation import async_get_translations
 from homeassistant.loader import bind_hass
 from homeassistant.util.yaml import load_yaml
 
-REQUIREMENTS = ['home-assistant-frontend==20180912.0']
+REQUIREMENTS = ['home-assistant-frontend==20180916.0']
 
 DOMAIN = 'frontend'
 DEPENDENCIES = ['api', 'websocket_api', 'http', 'system_log',
diff --git a/requirements_all.txt b/requirements_all.txt
index 318b92bba1e..de30bc379d9 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -449,7 +449,7 @@ hole==0.3.0
 holidays==0.9.6
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180912.0
+home-assistant-frontend==20180916.0
 
 # homeassistant.components.homekit_controller
 # homekit==0.10
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index c333b3d6ca5..e1276da644c 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -84,7 +84,7 @@ hbmqtt==0.9.4
 holidays==0.9.6
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180912.0
+home-assistant-frontend==20180916.0
 
 # homeassistant.components.homematicip_cloud
 homematicip==0.9.8

From 25712f16b3b60aa5067ff29425190ff5552afb9b Mon Sep 17 00:00:00 2001
From: Tsvi Mostovicz <ttmost@gmail.com>
Date: Mon, 17 Sep 2018 23:43:31 +0300
Subject: [PATCH 178/357] Jewish calendar sensor (#16393)

* Initial commit for  jewish calendar sensor

* Make check for logging errors into it's own function

* Can't use f-strings as we need to support python3.5

* Implement basic functionality: printing of date

* Update requirements_all.txt

* Allow user to specify date for sensor

* Add hdate to test requirements

* Update to match pull request

* Support date output in hebrew

* Limit languages to english and hebrew

* Add name back to sensor

* Change icon to be calendar-today

* Add multiple sensors

* Fix tests

* Make Hound happy, remove unused imported class

* hdate expects datetime.date not datetime.datetime

* Return sensor name

* Times should be returned as time object, not datetime

* Add myself to codeowners for jewish calendar component

* Return actual reading, not index

* Add more tests. Currently failing.

Will need to update hdate API and version before continuing.

* Fix weekly portion test

* Make all tests pass

* Make travis happy and add a test so it doesnt happen again

* Remove defaults in __init__ method

* Change sensor state variable to local variable in update() method

* Minor changes
---
 CODEOWNERS                                    |   1 +
 .../components/sensor/jewish_calendar.py      | 134 ++++++++++++++++++
 requirements_all.txt                          |   3 +
 requirements_test_all.txt                     |   3 +
 script/gen_requirements_all.py                |   1 +
 .../components/sensor/test_jewish_calendar.py | 134 ++++++++++++++++++
 6 files changed, 276 insertions(+)
 create mode 100644 homeassistant/components/sensor/jewish_calendar.py
 create mode 100644 tests/components/sensor/test_jewish_calendar.py

diff --git a/CODEOWNERS b/CODEOWNERS
index 68d0d4a833d..b6ce8c04909 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -72,6 +72,7 @@ homeassistant/components/sensor/airvisual.py @bachya
 homeassistant/components/sensor/filter.py @dgomes
 homeassistant/components/sensor/gearbest.py @HerrHofrat
 homeassistant/components/sensor/irish_rail_transport.py @ttroy50
+homeassistant/components/sensor/jewish_calendar.py @tsvi
 homeassistant/components/sensor/miflora.py @danielhiversen @ChristianKuehnel
 homeassistant/components/sensor/nsw_fuel_station.py @nickw444
 homeassistant/components/sensor/pollen.py @bachya
diff --git a/homeassistant/components/sensor/jewish_calendar.py b/homeassistant/components/sensor/jewish_calendar.py
new file mode 100644
index 00000000000..544b7be0c5d
--- /dev/null
+++ b/homeassistant/components/sensor/jewish_calendar.py
@@ -0,0 +1,134 @@
+"""
+Platform to retrieve Jewish calendar information for Home Assistant.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/sensor.jewish_calendar/
+"""
+import logging
+
+import voluptuous as vol
+
+from homeassistant.components.sensor import PLATFORM_SCHEMA
+from homeassistant.const import CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.entity import Entity
+import homeassistant.util.dt as dt_util
+
+REQUIREMENTS = ['hdate==0.6.3']
+
+_LOGGER = logging.getLogger(__name__)
+
+SENSOR_TYPES = {
+    'date': ['Date', 'mdi:judaism'],
+    'weekly_portion': ['Parshat Hashavua', 'mdi:book-open-variant'],
+    'holiday_name': ['Holiday', 'mdi:calendar-star'],
+    'holyness': ['Holyness', 'mdi:counter'],
+    'first_light': ['Alot Hashachar', 'mdi:weather-sunset-up'],
+    'gra_end_shma': ['Latest time for Shm"a GR"A', 'mdi:calendar-clock'],
+    'mga_end_shma': ['Latest time for Shm"a MG"A', 'mdi:calendar-clock'],
+    'plag_mincha': ['Plag Hamincha', 'mdi:weather-sunset-down'],
+    'first_stars': ['T\'set Hakochavim', 'mdi:weather-night'],
+}
+
+CONF_DIASPORA = 'diaspora'
+CONF_LANGUAGE = 'language'
+CONF_SENSORS = 'sensors'
+
+DEFAULT_NAME = 'Jewish Calendar'
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_DIASPORA, default=False): cv.boolean,
+    vol.Optional(CONF_LATITUDE): cv.latitude,
+    vol.Optional(CONF_LONGITUDE): cv.longitude,
+    vol.Optional(CONF_LANGUAGE, default='english'):
+        vol.In(['hebrew', 'english']),
+    vol.Optional(CONF_SENSORS, default=['date']):
+        vol.All(cv.ensure_list, vol.Length(min=1), [vol.In(SENSOR_TYPES)]),
+})
+
+
+async def async_setup_platform(
+        hass, config, async_add_entities, discovery_info=None):
+    """Set up the Jewish calendar sensor platform."""
+    language = config.get(CONF_LANGUAGE)
+    name = config.get(CONF_NAME)
+    latitude = config.get(CONF_LATITUDE, hass.config.latitude)
+    longitude = config.get(CONF_LONGITUDE, hass.config.longitude)
+    diaspora = config.get(CONF_DIASPORA)
+
+    if None in (latitude, longitude):
+        _LOGGER.error("Latitude or longitude not set in Home Assistant config")
+        return
+
+    dev = []
+    for sensor_type in config[CONF_SENSORS]:
+        dev.append(JewishCalSensor(
+            name, language, sensor_type, latitude, longitude, diaspora))
+    async_add_entities(dev, True)
+
+
+class JewishCalSensor(Entity):
+    """Representation of an Jewish calendar sensor."""
+
+    def __init__(
+            self, name, language, sensor_type, latitude, longitude, diaspora):
+        """Initialize the Jewish calendar sensor."""
+        self.client_name = name
+        self._name = SENSOR_TYPES[sensor_type][0]
+        self.type = sensor_type
+        self._hebrew = (language == 'hebrew')
+        self._state = None
+        self.latitude = latitude
+        self.longitude = longitude
+        self.diaspora = diaspora
+        _LOGGER.debug("Sensor %s initialized", self.type)
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return '{} {}'.format(self.client_name, self._name)
+
+    @property
+    def icon(self):
+        """Icon to display in the front end."""
+        return SENSOR_TYPES[self.type][1]
+
+    @property
+    def state(self):
+        """Return the state of the sensor."""
+        return self._state
+
+    async def async_update(self):
+        """Update the state of the sensor."""
+        import hdate
+
+        today = dt_util.now().date()
+
+        date = hdate.HDate(
+            today, diaspora=self.diaspora, hebrew=self._hebrew)
+
+        if self.type == 'date':
+            self._state = hdate.date.get_hebrew_date(
+                date.h_day, date.h_month, date.h_year, hebrew=self._hebrew)
+        elif self.type == 'weekly_portion':
+            self._state = hdate.date.get_parashe(
+                date.get_reading(self.diaspora), hebrew=self._hebrew)
+        elif self.type == 'holiday_name':
+            try:
+                self._state = next(
+                    x.description[self._hebrew].long
+                    for x in hdate.htables.HOLIDAYS
+                    if x.index == date.get_holyday())
+            except StopIteration:
+                self._state = None
+        elif self.type == 'holyness':
+            self._state = hdate.date.get_holyday_type(date.get_holyday())
+        else:
+            times = hdate.Zmanim(
+                date=today,
+                latitude=self.latitude, longitude=self.longitude,
+                hebrew=self._hebrew).zmanim
+            self._state = times[self.type].time()
+
+        _LOGGER.debug("New value: %s", self._state)
diff --git a/requirements_all.txt b/requirements_all.txt
index 13cf9082e6c..96e5ed0b1e3 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -435,6 +435,9 @@ haversine==0.4.5
 # homeassistant.components.mqtt.server
 hbmqtt==0.9.4
 
+# homeassistant.components.sensor.jewish_calendar
+hdate==0.6.3
+
 # homeassistant.components.climate.heatmiser
 heatmiserV3==0.9.1
 
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 8693627ba95..42561336ff9 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -80,6 +80,9 @@ haversine==0.4.5
 # homeassistant.components.mqtt.server
 hbmqtt==0.9.4
 
+# homeassistant.components.sensor.jewish_calendar
+hdate==0.6.3
+
 # homeassistant.components.binary_sensor.workday
 holidays==0.9.7
 
diff --git a/script/gen_requirements_all.py b/script/gen_requirements_all.py
index d1d29affeff..3cde13a2a97 100755
--- a/script/gen_requirements_all.py
+++ b/script/gen_requirements_all.py
@@ -55,6 +55,7 @@ TEST_REQUIREMENTS = (
     'ha-ffmpeg',
     'haversine',
     'hbmqtt',
+    'hdate',
     'holidays',
     'home-assistant-frontend',
     'homematicip',
diff --git a/tests/components/sensor/test_jewish_calendar.py b/tests/components/sensor/test_jewish_calendar.py
new file mode 100644
index 00000000000..3260512495f
--- /dev/null
+++ b/tests/components/sensor/test_jewish_calendar.py
@@ -0,0 +1,134 @@
+"""The tests for the Jewish calendar sensor platform."""
+import unittest
+from datetime import datetime as dt
+from unittest.mock import patch
+
+from homeassistant.util.async_ import run_coroutine_threadsafe
+from homeassistant.setup import setup_component
+from homeassistant.components.sensor.jewish_calendar import JewishCalSensor
+from tests.common import get_test_home_assistant
+
+
+class TestJewishCalenderSensor(unittest.TestCase):
+    """Test the Jewish Calendar sensor."""
+
+    TEST_LATITUDE = 31.778
+    TEST_LONGITUDE = 35.235
+
+    def setUp(self):
+        """Set up things to run when tests begin."""
+        self.hass = get_test_home_assistant()
+
+    def tearDown(self):
+        """Stop everything that was started."""
+        self.hass.stop()
+
+    def checkForLoggingErrors(self):
+        """Check whether logger spitted out errors."""
+        errors = [rec for rec in self.cm.records if rec.levelname == "ERROR"]
+        self.assertFalse(errors, ("Logger reported error(s): ",
+                                  [err.getMessage() for err in errors]))
+
+    def test_jewish_calendar_min_config(self):
+        """Test minimum jewish calendar configuration."""
+        config = {
+            'sensor': {
+                'platform': 'jewish_calendar'
+            }
+        }
+        with self.assertLogs() as self.cm:
+            assert setup_component(self.hass, 'sensor', config)
+        self.checkForLoggingErrors()
+
+    def test_jewish_calendar_hebrew(self):
+        """Test jewish calendar sensor with language set to hebrew."""
+        config = {
+            'sensor': {
+                'platform': 'jewish_calendar',
+                'language': 'hebrew',
+            }
+        }
+        with self.assertLogs() as self.cm:
+            assert setup_component(self.hass, 'sensor', config)
+        self.checkForLoggingErrors()
+
+    def test_jewish_calendar_multiple_sensors(self):
+        """Test jewish calendar sensor with multiple sensors setup."""
+        config = {
+            'sensor': {
+                'platform': 'jewish_calendar',
+                'sensors': [
+                    'date', 'weekly_portion', 'holiday_name',
+                    'holyness', 'first_light', 'gra_end_shma',
+                    'mga_end_shma', 'plag_mincha', 'first_stars'
+                ]
+            }
+        }
+        with self.assertLogs() as self.cm:
+            assert setup_component(self.hass, 'sensor', config)
+        self.checkForLoggingErrors()
+
+    def test_jewish_calendar_sensor_date_output(self):
+        """Test Jewish calendar sensor date output."""
+        test_time = dt(2018, 9, 3)
+        sensor = JewishCalSensor(
+            name='test', language='english', sensor_type='date',
+            latitude=self.TEST_LATITUDE, longitude=self.TEST_LONGITUDE,
+            diaspora=False)
+        with patch('homeassistant.util.dt.now', return_value=test_time):
+            run_coroutine_threadsafe(
+                sensor.async_update(),
+                self.hass.loop).result()
+            self.assertEqual(sensor.state, '23 Elul 5778')
+
+    def test_jewish_calendar_sensor_date_output_hebrew(self):
+        """Test Jewish calendar sensor date output in hebrew."""
+        test_time = dt(2018, 9, 3)
+        sensor = JewishCalSensor(
+            name='test', language='hebrew', sensor_type='date',
+            latitude=self.TEST_LATITUDE, longitude=self.TEST_LONGITUDE,
+            diaspora=False)
+        with patch('homeassistant.util.dt.now', return_value=test_time):
+            run_coroutine_threadsafe(
+                sensor.async_update(),
+                self.hass.loop).result()
+            self.assertEqual(sensor.state, "כ\"ג באלול ה\' תשע\"ח")
+
+    def test_jewish_calendar_sensor_holiday_name(self):
+        """Test Jewish calendar sensor date output in hebrew."""
+        test_time = dt(2018, 9, 10)
+        sensor = JewishCalSensor(
+            name='test', language='hebrew', sensor_type='holiday_name',
+            latitude=self.TEST_LATITUDE, longitude=self.TEST_LONGITUDE,
+            diaspora=False)
+        with patch('homeassistant.util.dt.now', return_value=test_time):
+            run_coroutine_threadsafe(
+                sensor.async_update(),
+                self.hass.loop).result()
+            self.assertEqual(sensor.state, "א\' ראש השנה")
+
+    def test_jewish_calendar_sensor_holyness(self):
+        """Test Jewish calendar sensor date output in hebrew."""
+        test_time = dt(2018, 9, 10)
+        sensor = JewishCalSensor(
+            name='test', language='hebrew', sensor_type='holyness',
+            latitude=self.TEST_LATITUDE, longitude=self.TEST_LONGITUDE,
+            diaspora=False)
+        with patch('homeassistant.util.dt.now', return_value=test_time):
+            run_coroutine_threadsafe(
+                sensor.async_update(),
+                self.hass.loop).result()
+            self.assertEqual(sensor.state, 1)
+
+    def test_jewish_calendar_sensor_torah_reading(self):
+        """Test Jewish calendar sensor date output in hebrew."""
+        test_time = dt(2018, 9, 8)
+        sensor = JewishCalSensor(
+            name='test', language='hebrew', sensor_type='weekly_portion',
+            latitude=self.TEST_LATITUDE, longitude=self.TEST_LONGITUDE,
+            diaspora=False)
+        with patch('homeassistant.util.dt.now', return_value=test_time):
+            run_coroutine_threadsafe(
+                sensor.async_update(),
+                self.hass.loop).result()
+            self.assertEqual(sensor.state, "פרשת נצבים")

From 27d50d388fe61e38f5623d0e63c4bdc28764ebe2 Mon Sep 17 00:00:00 2001
From: Aaron Bach <bachya1208@gmail.com>
Date: Mon, 17 Sep 2018 14:44:18 -0600
Subject: [PATCH 179/357] Fixes an AirVisual bug where response data is missing
 (#16673)

---
 homeassistant/components/sensor/airvisual.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/components/sensor/airvisual.py b/homeassistant/components/sensor/airvisual.py
index dcd89ccb78a..6837b9e1b2f 100644
--- a/homeassistant/components/sensor/airvisual.py
+++ b/homeassistant/components/sensor/airvisual.py
@@ -281,7 +281,7 @@ class AirVisualData:
             _LOGGER.debug("New data retrieved: %s", resp)
 
             self.pollution_info = resp['current']['pollution']
-        except AirVisualError as err:
+        except (KeyError, AirVisualError) as err:
             if self.city and self.state and self.country:
                 location = (self.city, self.state, self.country)
             else:

From a7325ebe1fa440f2f6dbde815f19417547de929f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 18 Sep 2018 07:55:13 +0200
Subject: [PATCH 180/357] Suppress traceback and log error (#16669)

---
 homeassistant/components/sensor/scrape.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/homeassistant/components/sensor/scrape.py b/homeassistant/components/sensor/scrape.py
index e702c52e06a..9a43c3ff295 100644
--- a/homeassistant/components/sensor/scrape.py
+++ b/homeassistant/components/sensor/scrape.py
@@ -114,11 +114,16 @@ class ScrapeSensor(Entity):
 
         raw_data = BeautifulSoup(self.rest.data, 'html.parser')
         _LOGGER.debug(raw_data)
-        if self._attr is not None:
-            value = raw_data.select(self._select)[0][self._attr]
-        else:
-            value = raw_data.select(self._select)[0].text
-        _LOGGER.debug(value)
+
+        try:
+            if self._attr is not None:
+                value = raw_data.select(self._select)[0][self._attr]
+            else:
+                value = raw_data.select(self._select)[0].text
+            _LOGGER.debug(value)
+        except IndexError:
+            _LOGGER.error("Unable to extract data from HTML")
+            return
 
         if self._value_template is not None:
             self._state = self._value_template.render_with_possible_json_value(

From 72419a1afe5aa09c8e5e5d79c32d9c09a7af4241 Mon Sep 17 00:00:00 2001
From: Greg Laabs <OverloadUT@gmail.com>
Date: Mon, 17 Sep 2018 23:30:20 -0700
Subject: [PATCH 181/357] Fix Ecovacs vacuums showing "None" for name (#16654)

Was previously checking for a missing key, when should have been checking for the value being None
---
 homeassistant/components/ecovacs.py        | 7 ++++---
 homeassistant/components/vacuum/ecovacs.py | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/homeassistant/components/ecovacs.py b/homeassistant/components/ecovacs.py
index 2e51b048d15..53761a1013f 100644
--- a/homeassistant/components/ecovacs.py
+++ b/homeassistant/components/ecovacs.py
@@ -59,8 +59,9 @@ def setup(hass, config):
     _LOGGER.debug("Ecobot devices: %s", devices)
 
     for device in devices:
-        _LOGGER.info("Discovered Ecovacs device on account: %s",
-                     device['nick'])
+        _LOGGER.info(
+            "Discovered Ecovacs device on account: %s with nickname %s",
+            device['did'], device['nick'])
         vacbot = VacBot(ecovacs_api.uid,
                         ecovacs_api.REALM,
                         ecovacs_api.resource,
@@ -74,7 +75,7 @@ def setup(hass, config):
         """Shut down open connections to Ecovacs XMPP server."""
         for device in hass.data[ECOVACS_DEVICES]:
             _LOGGER.info("Shutting down connection to Ecovacs device %s",
-                         device.vacuum['nick'])
+                         device.vacuum['did'])
             device.disconnect()
 
     # Listen for HA stop to disconnect.
diff --git a/homeassistant/components/vacuum/ecovacs.py b/homeassistant/components/vacuum/ecovacs.py
index b92ae598f80..927362ac9db 100644
--- a/homeassistant/components/vacuum/ecovacs.py
+++ b/homeassistant/components/vacuum/ecovacs.py
@@ -43,9 +43,9 @@ class EcovacsVacuum(VacuumDevice):
         """Initialize the Ecovacs Vacuum."""
         self.device = device
         self.device.connect_and_wait_until_ready()
-        try:
+        if self.device.vacuum.get('nick', None) is not None:
             self._name = '{}'.format(self.device.vacuum['nick'])
-        except KeyError:
+        else:
             # In case there is no nickname defined, use the device id
             self._name = '{}'.format(self.device.vacuum['did'])
 

From d2246d5a4fd84fcd85d249c7654c8654484f03c8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 18 Sep 2018 12:15:55 +0200
Subject: [PATCH 182/357] Fix test

---
 .../components/sensor/jewish_calendar.py      |  3 +-
 .../components/sensor/test_jewish_calendar.py | 32 ++++++-------------
 2 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/homeassistant/components/sensor/jewish_calendar.py b/homeassistant/components/sensor/jewish_calendar.py
index 544b7be0c5d..e5838fa8543 100644
--- a/homeassistant/components/sensor/jewish_calendar.py
+++ b/homeassistant/components/sensor/jewish_calendar.py
@@ -126,8 +126,7 @@ class JewishCalSensor(Entity):
             self._state = hdate.date.get_holyday_type(date.get_holyday())
         else:
             times = hdate.Zmanim(
-                date=today,
-                latitude=self.latitude, longitude=self.longitude,
+                date=today, latitude=self.latitude, longitude=self.longitude,
                 hebrew=self._hebrew).zmanim
             self._state = times[self.type].time()
 
diff --git a/tests/components/sensor/test_jewish_calendar.py b/tests/components/sensor/test_jewish_calendar.py
index 3260512495f..990f26d6ea7 100644
--- a/tests/components/sensor/test_jewish_calendar.py
+++ b/tests/components/sensor/test_jewish_calendar.py
@@ -23,12 +23,6 @@ class TestJewishCalenderSensor(unittest.TestCase):
         """Stop everything that was started."""
         self.hass.stop()
 
-    def checkForLoggingErrors(self):
-        """Check whether logger spitted out errors."""
-        errors = [rec for rec in self.cm.records if rec.levelname == "ERROR"]
-        self.assertFalse(errors, ("Logger reported error(s): ",
-                                  [err.getMessage() for err in errors]))
-
     def test_jewish_calendar_min_config(self):
         """Test minimum jewish calendar configuration."""
         config = {
@@ -36,9 +30,7 @@ class TestJewishCalenderSensor(unittest.TestCase):
                 'platform': 'jewish_calendar'
             }
         }
-        with self.assertLogs() as self.cm:
-            assert setup_component(self.hass, 'sensor', config)
-        self.checkForLoggingErrors()
+        assert setup_component(self.hass, 'sensor', config)
 
     def test_jewish_calendar_hebrew(self):
         """Test jewish calendar sensor with language set to hebrew."""
@@ -48,9 +40,8 @@ class TestJewishCalenderSensor(unittest.TestCase):
                 'language': 'hebrew',
             }
         }
-        with self.assertLogs() as self.cm:
-            assert setup_component(self.hass, 'sensor', config)
-        self.checkForLoggingErrors()
+
+        assert setup_component(self.hass, 'sensor', config)
 
     def test_jewish_calendar_multiple_sensors(self):
         """Test jewish calendar sensor with multiple sensors setup."""
@@ -64,9 +55,8 @@ class TestJewishCalenderSensor(unittest.TestCase):
                 ]
             }
         }
-        with self.assertLogs() as self.cm:
-            assert setup_component(self.hass, 'sensor', config)
-        self.checkForLoggingErrors()
+
+        assert setup_component(self.hass, 'sensor', config)
 
     def test_jewish_calendar_sensor_date_output(self):
         """Test Jewish calendar sensor date output."""
@@ -90,8 +80,7 @@ class TestJewishCalenderSensor(unittest.TestCase):
             diaspora=False)
         with patch('homeassistant.util.dt.now', return_value=test_time):
             run_coroutine_threadsafe(
-                sensor.async_update(),
-                self.hass.loop).result()
+                sensor.async_update(), self.hass.loop).result()
             self.assertEqual(sensor.state, "כ\"ג באלול ה\' תשע\"ח")
 
     def test_jewish_calendar_sensor_holiday_name(self):
@@ -103,8 +92,7 @@ class TestJewishCalenderSensor(unittest.TestCase):
             diaspora=False)
         with patch('homeassistant.util.dt.now', return_value=test_time):
             run_coroutine_threadsafe(
-                sensor.async_update(),
-                self.hass.loop).result()
+                sensor.async_update(), self.hass.loop).result()
             self.assertEqual(sensor.state, "א\' ראש השנה")
 
     def test_jewish_calendar_sensor_holyness(self):
@@ -116,8 +104,7 @@ class TestJewishCalenderSensor(unittest.TestCase):
             diaspora=False)
         with patch('homeassistant.util.dt.now', return_value=test_time):
             run_coroutine_threadsafe(
-                sensor.async_update(),
-                self.hass.loop).result()
+                sensor.async_update(), self.hass.loop).result()
             self.assertEqual(sensor.state, 1)
 
     def test_jewish_calendar_sensor_torah_reading(self):
@@ -129,6 +116,5 @@ class TestJewishCalenderSensor(unittest.TestCase):
             diaspora=False)
         with patch('homeassistant.util.dt.now', return_value=test_time):
             run_coroutine_threadsafe(
-                sensor.async_update(),
-                self.hass.loop).result()
+                sensor.async_update(), self.hass.loop).result()
             self.assertEqual(sensor.state, "פרשת נצבים")

From cba3a5b055912ced76045a44f9f346728733b98e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 18 Sep 2018 14:59:39 +0200
Subject: [PATCH 183/357] Upgrade paho-mqtt to 1.4.0 (#16688)

---
 homeassistant/components/mqtt/__init__.py    | 76 ++++++++++----------
 homeassistant/components/mqtt/config_flow.py | 26 ++-----
 homeassistant/components/mqtt/discovery.py   |  4 +-
 homeassistant/components/mqtt/server.py      |  5 +-
 homeassistant/components/shiftr.py           |  2 +-
 requirements_all.txt                         |  2 +-
 requirements_test_all.txt                    |  2 +-
 7 files changed, 52 insertions(+), 65 deletions(-)

diff --git a/homeassistant/components/mqtt/__init__.py b/homeassistant/components/mqtt/__init__.py
index ac29671667f..bcb0d60902b 100644
--- a/homeassistant/components/mqtt/__init__.py
+++ b/homeassistant/components/mqtt/__init__.py
@@ -6,40 +6,40 @@ https://home-assistant.io/components/mqtt/
 """
 import asyncio
 from itertools import groupby
-from typing import Optional, Any, Union, Callable, List, cast  # noqa: F401
-from operator import attrgetter
 import logging
+from operator import attrgetter
 import os
 import socket
-import time
 import ssl
-import requests.certs
-import attr
+import time
+from typing import Any, Callable, List, Optional, Union, cast  # noqa: F401
 
+import attr
+import requests.certs
 import voluptuous as vol
 
 from homeassistant import config_entries
-from homeassistant.helpers.typing import HomeAssistantType, ConfigType, \
-    ServiceDataType
-from homeassistant.core import callback, Event, ServiceCall
-from homeassistant.setup import async_prepare_setup_platform
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.loader import bind_hass
-from homeassistant.helpers import template, config_validation as cv
-from homeassistant.helpers.entity import Entity
-from homeassistant.util.async_ import (
-    run_coroutine_threadsafe, run_callback_threadsafe)
 from homeassistant.const import (
-    EVENT_HOMEASSISTANT_STOP, CONF_VALUE_TEMPLATE, CONF_USERNAME,
-    CONF_PASSWORD, CONF_PORT, CONF_PROTOCOL, CONF_PAYLOAD,
-    EVENT_HOMEASSISTANT_START)
+    CONF_PASSWORD, CONF_PAYLOAD, CONF_PORT, CONF_PROTOCOL, CONF_USERNAME,
+    CONF_VALUE_TEMPLATE, EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP)
+from homeassistant.core import Event, ServiceCall, callback
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers import template
+from homeassistant.helpers.entity import Entity
+from homeassistant.helpers.typing import (
+    ConfigType, HomeAssistantType, ServiceDataType)
+from homeassistant.loader import bind_hass
+from homeassistant.setup import async_prepare_setup_platform
+from homeassistant.util.async_ import (
+    run_callback_threadsafe, run_coroutine_threadsafe)
 
 # Loading the config flow file will register the flow
 from . import config_flow  # noqa  # pylint: disable=unused-import
 from .const import CONF_BROKER
 from .server import HBMQTT_CONFIG_SCHEMA
 
-REQUIREMENTS = ['paho-mqtt==1.3.1']
+REQUIREMENTS = ['paho-mqtt==1.4.0']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -296,8 +296,7 @@ def subscribe(hass: HomeAssistantType, topic: str,
     return remove
 
 
-async def _async_setup_server(hass: HomeAssistantType,
-                              config: ConfigType):
+async def _async_setup_server(hass: HomeAssistantType, config: ConfigType):
     """Try to start embedded MQTT broker.
 
     This method is a coroutine.
@@ -366,7 +365,7 @@ async def async_setup(hass: HomeAssistantType, config: ConfigType) -> bool:
         broker_config = await _async_setup_server(hass, config)
 
         if broker_config is None:
-            _LOGGER.error('Unable to start embedded MQTT broker')
+            _LOGGER.error("Unable to start embedded MQTT broker")
             return False
 
         conf.update({
@@ -418,8 +417,8 @@ async def async_setup_entry(hass, entry):
         })[DOMAIN]
     elif any(key in conf for key in entry.data):
         _LOGGER.warning(
-            'Data in your config entry is going to override your '
-            'configuration.yaml: %s', entry.data)
+            "Data in your config entry is going to override your "
+            "configuration.yaml: %s", entry.data)
 
     conf.update(entry.data)
 
@@ -438,8 +437,8 @@ async def async_setup_entry(hass, entry):
     if (conf.get(CONF_CERTIFICATE) is None and
             19999 < conf[CONF_PORT] < 30000 and
             conf[CONF_BROKER].endswith('.cloudmqtt.com')):
-        certificate = os.path.join(os.path.dirname(__file__),
-                                   'addtrustexternalcaroot.crt')
+        certificate = os.path.join(
+            os.path.dirname(__file__), 'addtrustexternalcaroot.crt')
 
     # When the certificate is set to auto, use bundled certs from requests
     elif conf.get(CONF_CERTIFICATE) == 'auto':
@@ -623,12 +622,12 @@ class MQTT:
             result = await self.hass.async_add_job(
                 self._mqttc.connect, self.broker, self.port, self.keepalive)
         except OSError as err:
-            _LOGGER.error('Failed to connect due to exception: %s', err)
+            _LOGGER.error("Failed to connect due to exception: %s", err)
             return False
 
         if result != 0:
             import paho.mqtt.client as mqtt
-            _LOGGER.error('Failed to connect: %s', mqtt.error_string(result))
+            _LOGGER.error("Failed to connect: %s", mqtt.error_string(result))
             return False
 
         self._mqttc.loop_start()
@@ -655,7 +654,7 @@ class MQTT:
         This method is a coroutine.
         """
         if not isinstance(topic, str):
-            raise HomeAssistantError("topic needs to be a string!")
+            raise HomeAssistantError("Topic needs to be a string!")
 
         subscription = Subscription(topic, msg_callback, qos, encoding)
         self.subscriptions.append(subscription)
@@ -697,8 +696,8 @@ class MQTT:
                 self._mqttc.subscribe, topic, qos)
             _raise_on_error(result)
 
-    def _mqtt_on_connect(self, _mqttc, _userdata, _flags,
-                         result_code: int) -> None:
+    def _mqtt_on_connect(
+            self, _mqttc, _userdata, _flags, result_code: int) -> None:
         """On connect callback.
 
         Resubscribe to all topics we were subscribed to and publish birth
@@ -707,7 +706,7 @@ class MQTT:
         import paho.mqtt.client as mqtt
 
         if result_code != mqtt.CONNACK_ACCEPTED:
-            _LOGGER.error('Unable to connect to the MQTT broker: %s',
+            _LOGGER.error("Unable to connect to the MQTT broker: %s",
                           mqtt.connack_string(result_code))
             self._mqttc.disconnect()
             return
@@ -741,14 +740,13 @@ class MQTT:
                 try:
                     payload = msg.payload.decode(subscription.encoding)
                 except (AttributeError, UnicodeDecodeError):
-                    _LOGGER.warning("Can't decode payload %s on %s "
-                                    "with encoding %s",
-                                    msg.payload, msg.topic,
-                                    subscription.encoding)
+                    _LOGGER.warning(
+                        "Can't decode payload %s on %s with encoding %s",
+                        msg.payload, msg.topic, subscription.encoding)
                     continue
 
-            self.hass.async_run_job(subscription.callback,
-                                    msg.topic, payload, msg.qos)
+            self.hass.async_run_job(
+                subscription.callback, msg.topic, payload, msg.qos)
 
     def _mqtt_on_disconnect(self, _mqttc, _userdata, result_code: int) -> None:
         """Disconnected callback."""
@@ -810,7 +808,7 @@ class MqttAvailability(Entity):
         self._payload_not_available = payload_not_available
 
     async def async_added_to_hass(self) -> None:
-        """Subscribe mqtt events.
+        """Subscribe MQTT events.
 
         This method must be run in the event loop and returns a coroutine.
         """
diff --git a/homeassistant/components/mqtt/config_flow.py b/homeassistant/components/mqtt/config_flow.py
index 82b6f35056b..a8987a19742 100644
--- a/homeassistant/components/mqtt/config_flow.py
+++ b/homeassistant/components/mqtt/config_flow.py
@@ -5,7 +5,7 @@ import queue
 import voluptuous as vol
 
 from homeassistant import config_entries
-from homeassistant.const import CONF_USERNAME, CONF_PASSWORD, CONF_PORT
+from homeassistant.const import CONF_PASSWORD, CONF_PORT, CONF_USERNAME
 
 from .const import CONF_BROKER
 
@@ -20,14 +20,12 @@ class FlowHandler(config_entries.ConfigFlow):
     async def async_step_user(self, user_input=None):
         """Handle a flow initialized by the user."""
         if self._async_current_entries():
-            return self.async_abort(
-                reason='single_instance_allowed'
-            )
+            return self.async_abort(reason='single_instance_allowed')
 
         return await self.async_step_broker()
 
     async def async_step_broker(self, user_input=None):
-        """Confirm setup."""
+        """Confirm the setup."""
         errors = {}
 
         if user_input is not None:
@@ -37,9 +35,7 @@ class FlowHandler(config_entries.ConfigFlow):
 
             if can_connect:
                 return self.async_create_entry(
-                    title=user_input[CONF_BROKER],
-                    data=user_input
-                )
+                    title=user_input[CONF_BROKER], data=user_input)
 
             errors['base'] = 'cannot_connect'
 
@@ -50,10 +46,7 @@ class FlowHandler(config_entries.ConfigFlow):
         fields[vol.Optional(CONF_PASSWORD)] = str
 
         return self.async_show_form(
-            step_id='broker',
-            data_schema=vol.Schema(fields),
-            errors=errors,
-        )
+            step_id='broker', data_schema=vol.Schema(fields), errors=errors)
 
     async def async_step_import(self, user_input):
         """Import a config entry.
@@ -62,14 +55,9 @@ class FlowHandler(config_entries.ConfigFlow):
         Instead, we're going to rely on the values that are in config file.
         """
         if self._async_current_entries():
-            return self.async_abort(
-                reason='single_instance_allowed'
-            )
+            return self.async_abort(reason='single_instance_allowed')
 
-        return self.async_create_entry(
-            title='configuration.yaml',
-            data={}
-        )
+        return self.async_create_entry(title='configuration.yaml', data={})
 
 
 def try_connection(broker, port, username, password):
diff --git a/homeassistant/components/mqtt/discovery.py b/homeassistant/components/mqtt/discovery.py
index 128c45f1311..689515f64c8 100644
--- a/homeassistant/components/mqtt/discovery.py
+++ b/homeassistant/components/mqtt/discovery.py
@@ -9,9 +9,9 @@ import logging
 import re
 
 from homeassistant.components import mqtt
-from homeassistant.helpers.discovery import async_load_platform
-from homeassistant.const import CONF_PLATFORM
 from homeassistant.components.mqtt import CONF_STATE_TOPIC
+from homeassistant.const import CONF_PLATFORM
+from homeassistant.helpers.discovery import async_load_platform
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/mqtt/server.py b/homeassistant/components/mqtt/server.py
index 45529411ed5..dda2214ce46 100644
--- a/homeassistant/components/mqtt/server.py
+++ b/homeassistant/components/mqtt/server.py
@@ -14,6 +14,9 @@ from homeassistant.const import EVENT_HOMEASSISTANT_STOP
 import homeassistant.helpers.config_validation as cv
 
 REQUIREMENTS = ['hbmqtt==0.9.4']
+
+_LOGGER = logging.getLogger(__name__)
+
 DEPENDENCIES = ['http']
 
 # None allows custom config to be created through generate_config
@@ -27,8 +30,6 @@ HBMQTT_CONFIG_SCHEMA = vol.Any(None, vol.Schema({
     })
 }, extra=vol.ALLOW_EXTRA))
 
-_LOGGER = logging.getLogger(__name__)
-
 
 @asyncio.coroutine
 def async_start(hass, password, server_config):
diff --git a/homeassistant/components/shiftr.py b/homeassistant/components/shiftr.py
index 67baa045b18..17a46be4734 100644
--- a/homeassistant/components/shiftr.py
+++ b/homeassistant/components/shiftr.py
@@ -14,7 +14,7 @@ from homeassistant.const import (
     EVENT_HOMEASSISTANT_STOP)
 from homeassistant.helpers import state as state_helper
 
-REQUIREMENTS = ['paho-mqtt==1.3.1']
+REQUIREMENTS = ['paho-mqtt==1.4.0']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/requirements_all.txt b/requirements_all.txt
index 96e5ed0b1e3..ff438baecd1 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -660,7 +660,7 @@ orvibo==1.1.1
 
 # homeassistant.components.mqtt
 # homeassistant.components.shiftr
-paho-mqtt==1.3.1
+paho-mqtt==1.4.0
 
 # homeassistant.components.media_player.panasonic_viera
 panasonic_viera==0.3.1
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 42561336ff9..6990c4da543 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -112,7 +112,7 @@ numpy==1.15.1
 
 # homeassistant.components.mqtt
 # homeassistant.components.shiftr
-paho-mqtt==1.3.1
+paho-mqtt==1.4.0
 
 # homeassistant.components.device_tracker.aruba
 # homeassistant.components.device_tracker.asuswrt

From 2a85ed723697b792dfaeca9f2bf3a038fc184246 Mon Sep 17 00:00:00 2001
From: Glenn Waters <gwwaters@gmail.com>
Date: Tue, 18 Sep 2018 09:06:52 -0400
Subject: [PATCH 184/357] Streamline log messages (#16243)

---
 homeassistant/core.py               | 2 +-
 tests/components/zwave/test_init.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/core.py b/homeassistant/core.py
index e8d50e003d9..6b1ea3f4263 100644
--- a/homeassistant/core.py
+++ b/homeassistant/core.py
@@ -476,7 +476,7 @@ class EventBus:
         event = Event(event_type, event_data, origin, None, context)
 
         if event_type != EVENT_TIME_CHANGED:
-            _LOGGER.info("Bus:Handling %s", event)
+            _LOGGER.debug("Bus:Handling %s", event)
 
         if not listeners:
             return
diff --git a/tests/components/zwave/test_init.py b/tests/components/zwave/test_init.py
index c9224885bbc..1857d14ad84 100644
--- a/tests/components/zwave/test_init.py
+++ b/tests/components/zwave/test_init.py
@@ -1180,7 +1180,7 @@ class TestZWaveServices(unittest.TestCase):
 
         self.zwave_network.nodes = {14: node}
 
-        with self.assertLogs(level='INFO') as mock_logger:
+        with self.assertLogs(level='DEBUG') as mock_logger:
             self.hass.services.call('zwave', 'print_node', {
                 const.ATTR_NODE_ID: 14
             })

From 1913d07c394ad29e446c7f87b6fba83ead580dd0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 18 Sep 2018 15:49:54 +0200
Subject: [PATCH 185/357] Upgrade zeroconf to 0.21.1 (#16687)

---
 homeassistant/components/zeroconf.py | 2 +-
 requirements_all.txt                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/zeroconf.py b/homeassistant/components/zeroconf.py
index 1f20ebad086..d63b532ccbb 100644
--- a/homeassistant/components/zeroconf.py
+++ b/homeassistant/components/zeroconf.py
@@ -12,7 +12,7 @@ import voluptuous as vol
 from homeassistant import util
 from homeassistant.const import (EVENT_HOMEASSISTANT_STOP, __version__)
 
-REQUIREMENTS = ['zeroconf==0.21.0']
+REQUIREMENTS = ['zeroconf==0.21.1']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/requirements_all.txt b/requirements_all.txt
index ff438baecd1..9f3fa57ddba 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1534,7 +1534,7 @@ youtube_dl==2018.09.10
 zengge==0.2
 
 # homeassistant.components.zeroconf
-zeroconf==0.21.0
+zeroconf==0.21.1
 
 # homeassistant.components.climate.zhong_hong
 zhong_hong_hvac==1.0.9

From 8e7f783da80afa5a91760f1275b3deb63014102f Mon Sep 17 00:00:00 2001
From: Maikel Punie <maikel.punie@gmail.com>
Date: Tue, 18 Sep 2018 15:51:22 +0200
Subject: [PATCH 186/357] Added velbus counter sensors, updated to py-velbus
 2.0.20 (#16683)

---
 homeassistant/components/sensor/velbus.py | 14 ++++++--------
 homeassistant/components/velbus.py        |  6 +++---
 requirements_all.txt                      |  2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/homeassistant/components/sensor/velbus.py b/homeassistant/components/sensor/velbus.py
index ea4af320add..8e9aafd3605 100644
--- a/homeassistant/components/sensor/velbus.py
+++ b/homeassistant/components/sensor/velbus.py
@@ -6,8 +6,6 @@ https://home-assistant.io/components/sensor.velbus/
 """
 import logging
 
-from homeassistant.const import (
-    TEMP_CELSIUS, DEVICE_CLASS_TEMPERATURE)
 from homeassistant.components.velbus import (
     DOMAIN as VELBUS_DOMAIN, VelbusEntity)
 
@@ -25,24 +23,24 @@ async def async_setup_platform(hass, config, async_add_entities,
     for sensor in discovery_info:
         module = hass.data[VELBUS_DOMAIN].get_module(sensor[0])
         channel = sensor[1]
-        sensors.append(VelbusTempSensor(module, channel))
+        sensors.append(VelbusSensor(module, channel))
     async_add_entities(sensors)
 
 
-class VelbusTempSensor(VelbusEntity):
-    """Representation of a temperature sensor."""
+class VelbusSensor(VelbusEntity):
+    """Representation of a sensor."""
 
     @property
     def device_class(self):
         """Return the device class of the sensor."""
-        return DEVICE_CLASS_TEMPERATURE
+        return self._module.get_class(self._channel)
 
     @property
     def state(self):
         """Return the state of the sensor."""
-        return self._module.getCurTemp()
+        return self._module.get_state(self._channel)
 
     @property
     def unit_of_measurement(self):
         """Return the unit this state is expressed in."""
-        return TEMP_CELSIUS
+        return self._module.get_unit(self._channel)
diff --git a/homeassistant/components/velbus.py b/homeassistant/components/velbus.py
index d2def6f96bc..2304054c404 100644
--- a/homeassistant/components/velbus.py
+++ b/homeassistant/components/velbus.py
@@ -12,7 +12,7 @@ from homeassistant.const import EVENT_HOMEASSISTANT_STOP, CONF_PORT
 from homeassistant.helpers.discovery import load_platform
 from homeassistant.helpers.entity import Entity
 
-REQUIREMENTS = ['python-velbus==2.0.19']
+REQUIREMENTS = ['python-velbus==2.0.20']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -48,7 +48,7 @@ async def async_setup(hass, config):
         discovery_info = {
             'switch': [],
             'binary_sensor': [],
-            'temp_sensor': []
+            'sensor': []
         }
         for module in modules:
             for channel in range(1, module.number_of_channels() + 1):
@@ -63,7 +63,7 @@ async def async_setup(hass, config):
         load_platform(hass, 'binary_sensor', DOMAIN,
                       discovery_info['binary_sensor'], config)
         load_platform(hass, 'sensor', DOMAIN,
-                      discovery_info['temp_sensor'], config)
+                      discovery_info['sensor'], config)
 
     controller.scan(callback)
 
diff --git a/requirements_all.txt b/requirements_all.txt
index 9f3fa57ddba..ca00fad60c6 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1161,7 +1161,7 @@ python-telegram-bot==11.0.0
 python-twitch-client==0.6.0
 
 # homeassistant.components.velbus
-python-velbus==2.0.19
+python-velbus==2.0.20
 
 # homeassistant.components.media_player.vlc
 python-vlc==1.1.2

From 56b0d2e99fb748f25344f11ec21e3163a71729cd Mon Sep 17 00:00:00 2001
From: Adam Dullage <adam@dullage.com>
Date: Tue, 18 Sep 2018 14:55:10 +0100
Subject: [PATCH 187/357] Added support for Starling Bank (#16522)

* Added support for Starling Bank

* Fixing Lint Issues

* Resolving Change Requests

* HTTP Error Handling & Sandbox URL Option

* Update starlingbank Requirement to v1.2

* Minor changes
---
 .coveragerc                                   |   1 +
 .../components/sensor/starlingbank.py         | 103 ++++++++++++++++++
 requirements_all.txt                          |   3 +
 3 files changed, 107 insertions(+)
 create mode 100644 homeassistant/components/sensor/starlingbank.py

diff --git a/.coveragerc b/.coveragerc
index 9b7111b21e1..25765254c4d 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -747,6 +747,7 @@ omit =
     homeassistant/components/sensor/sonarr.py
     homeassistant/components/sensor/speedtest.py
     homeassistant/components/sensor/spotcrime.py
+    homeassistant/components/sensor/starlingbank.py
     homeassistant/components/sensor/steam_online.py
     homeassistant/components/sensor/supervisord.py
     homeassistant/components/sensor/swiss_hydrological_data.py
diff --git a/homeassistant/components/sensor/starlingbank.py b/homeassistant/components/sensor/starlingbank.py
new file mode 100644
index 00000000000..a0c6f23e496
--- /dev/null
+++ b/homeassistant/components/sensor/starlingbank.py
@@ -0,0 +1,103 @@
+"""
+Support for balance data via the Starling Bank API.
+
+For more details about this platform, please refer to the documentation at
+https://www.home-assistant.io/components/sensor.starlingbank/
+"""
+import logging
+
+import requests
+import voluptuous as vol
+
+from homeassistant.components.sensor import PLATFORM_SCHEMA
+from homeassistant.const import CONF_ACCESS_TOKEN, CONF_NAME
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.entity import Entity
+
+REQUIREMENTS = ['starlingbank==1.2']
+
+_LOGGER = logging.getLogger(__name__)
+
+BALANCE_TYPES = ['cleared_balance', 'effective_balance']
+
+CONF_ACCOUNTS = 'accounts'
+CONF_BALANCE_TYPES = 'balance_types'
+CONF_SANDBOX = 'sandbox'
+
+DEFAULT_SANDBOX = False
+DEFAULT_ACCOUNT_NAME = 'Starling'
+
+ICON = 'mdi:currency-gbp'
+
+ACCOUNT_SCHEMA = vol.Schema({
+    vol.Required(CONF_ACCESS_TOKEN): cv.string,
+    vol.Optional(CONF_BALANCE_TYPES, default=BALANCE_TYPES):
+        vol.All(cv.ensure_list, [vol.In(BALANCE_TYPES)]),
+    vol.Optional(CONF_NAME, default=DEFAULT_ACCOUNT_NAME): cv.string,
+    vol.Optional(CONF_SANDBOX, default=DEFAULT_SANDBOX): cv.boolean,
+})
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_ACCOUNTS): vol.Schema([ACCOUNT_SCHEMA]),
+})
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Set up the Sterling Bank sensor platform."""
+    from starlingbank import StarlingAccount
+
+    sensors = []
+    for account in config[CONF_ACCOUNTS]:
+        try:
+            starling_account = StarlingAccount(
+                account[CONF_ACCESS_TOKEN], sandbox=account[CONF_SANDBOX])
+            for balance_type in account[CONF_BALANCE_TYPES]:
+                sensors.append(StarlingBalanceSensor(
+                    starling_account, account[CONF_NAME], balance_type))
+        except requests.exceptions.HTTPError as error:
+            _LOGGER.error(
+                "Unable to set up Starling account '%s': %s",
+                account[CONF_NAME], error)
+
+    add_devices(sensors, True)
+
+
+class StarlingBalanceSensor(Entity):
+    """Representation of a Starling balance sensor."""
+
+    def __init__(self, starling_account, account_name, balance_data_type):
+        """Initialize the sensor."""
+        self._starling_account = starling_account
+        self._balance_data_type = balance_data_type
+        self._state = None
+        self._account_name = account_name
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return "{0} {1}".format(
+            self._account_name,
+            self._balance_data_type.replace('_', ' ').capitalize())
+
+    @property
+    def state(self):
+        """Return the state of the sensor."""
+        return self._state
+
+    @property
+    def unit_of_measurement(self):
+        """Return the unit of measurement."""
+        return self._starling_account.currency
+
+    @property
+    def icon(self):
+        """Return the entity icon."""
+        return ICON
+
+    def update(self):
+        """Fetch new state data for the sensor."""
+        self._starling_account.balance.update()
+        if self._balance_data_type == 'cleared_balance':
+            self._state = self._starling_account.balance.cleared_balance
+        elif self._balance_data_type == 'effective_balance':
+            self._state = self._starling_account.balance.effective_balance
diff --git a/requirements_all.txt b/requirements_all.txt
index ca00fad60c6..203a61041aa 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1366,6 +1366,9 @@ spotipy-homeassistant==2.4.4.dev1
 # homeassistant.components.sensor.sql
 sqlalchemy==1.2.11
 
+# homeassistant.components.sensor.starlingbank
+starlingbank==1.2
+
 # homeassistant.components.statsd
 statsd==3.2.1
 

From b7ef4dddb418273d7c2e7df13bd641ba857eb42f Mon Sep 17 00:00:00 2001
From: Fabien Piuzzi <fabien@reefab.net>
Date: Wed, 19 Sep 2018 00:42:09 +0200
Subject: [PATCH 188/357] Netdata configuration change: Allows multiple
 elements per group (#16656)

Allows multiple Netdata elements per group
---
 homeassistant/components/sensor/netdata.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/homeassistant/components/sensor/netdata.py b/homeassistant/components/sensor/netdata.py
index 79fb59b4f7b..dc517a0c50d 100644
--- a/homeassistant/components/sensor/netdata.py
+++ b/homeassistant/components/sensor/netdata.py
@@ -24,6 +24,7 @@ _LOGGER = logging.getLogger(__name__)
 
 MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=1)
 
+CONF_DATA_GROUP = 'data_group'
 CONF_ELEMENT = 'element'
 
 DEFAULT_HOST = 'localhost'
@@ -33,9 +34,9 @@ DEFAULT_PORT = 19999
 DEFAULT_ICON = 'mdi:desktop-classic'
 
 RESOURCE_SCHEMA = vol.Any({
+    vol.Required(CONF_DATA_GROUP): cv.string,
     vol.Required(CONF_ELEMENT): cv.string,
     vol.Optional(CONF_ICON, default=DEFAULT_ICON): cv.icon,
-    vol.Optional(CONF_NAME): cv.string,
 })
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
@@ -65,16 +66,14 @@ async def async_setup_platform(
 
     dev = []
     for entry, data in resources.items():
-        sensor = entry
+        icon = data[CONF_ICON]
+        sensor = data[CONF_DATA_GROUP]
         element = data[CONF_ELEMENT]
-        sensor_name = icon = None
+        sensor_name = entry
         try:
             resource_data = netdata.api.metrics[sensor]
             unit = '%' if resource_data['units'] == 'percentage' else \
                 resource_data['units']
-            if data is not None:
-                sensor_name = data.get(CONF_NAME)
-                icon = data.get(CONF_ICON)
         except KeyError:
             _LOGGER.error("Sensor is not available: %s", sensor)
             continue

From 7f462ba0ecc6dd043ce16e1c30954bae5cb71bc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Wed, 19 Sep 2018 09:58:58 +0300
Subject: [PATCH 189/357] Upgrade mypy to 0.630 (#16674)

---
 requirements_test.txt     | 2 +-
 requirements_test_all.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements_test.txt b/requirements_test.txt
index 4144c6866df..15e06c4e53d 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -6,7 +6,7 @@ coveralls==1.2.0
 flake8-docstrings==1.3.0
 flake8==3.5
 mock-open==1.3.1
-mypy==0.620
+mypy==0.630
 pydocstyle==2.1.1
 pylint==2.1.1
 pytest-aiohttp==0.3.0
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 6990c4da543..d1853d20879 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -7,7 +7,7 @@ coveralls==1.2.0
 flake8-docstrings==1.3.0
 flake8==3.5
 mock-open==1.3.1
-mypy==0.620
+mypy==0.630
 pydocstyle==2.1.1
 pylint==2.1.1
 pytest-aiohttp==0.3.0

From d376049a3f9369e5d24951a96268d0995e70a580 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pascal.vizeli@syshack.ch>
Date: Wed, 19 Sep 2018 12:57:55 +0200
Subject: [PATCH 190/357] Use one regex for Hass.io URL check (#16710)

---
 homeassistant/components/hassio/http.py | 43 ++++++++++++-------------
 tests/components/hassio/test_http.py    |  8 +++--
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/homeassistant/components/hassio/http.py b/homeassistant/components/hassio/http.py
index c51d45cc339..55cc7f54787 100644
--- a/homeassistant/components/hassio/http.py
+++ b/homeassistant/components/hassio/http.py
@@ -22,23 +22,24 @@ _LOGGER = logging.getLogger(__name__)
 
 X_HASSIO = 'X-HASSIO-KEY'
 
-NO_TIMEOUT = {
-    re.compile(r'^homeassistant/update$'),
-    re.compile(r'^host/update$'),
-    re.compile(r'^supervisor/update$'),
-    re.compile(r'^addons/[^/]*/update$'),
-    re.compile(r'^addons/[^/]*/install$'),
-    re.compile(r'^addons/[^/]*/rebuild$'),
-    re.compile(r'^snapshots/.*/full$'),
-    re.compile(r'^snapshots/.*/partial$'),
-    re.compile(r'^snapshots/[^/]*/upload$'),
-    re.compile(r'^snapshots/[^/]*/download$'),
-}
+NO_TIMEOUT = re.compile(
+    r'^(?:'
+    r'|homeassistant/update'
+    r'|host/update'
+    r'|supervisor/update'
+    r'|addons/[^/]+/(?:update|install|rebuild)'
+    r'|snapshots/.+/full'
+    r'|snapshots/.+/partial'
+    r'|snapshots/[^/]+/(?:upload|download)'
+    r')$'
+)
 
-NO_AUTH = {
-    re.compile(r'^app/.*$'),
-    re.compile(r'^addons/[^/]*/logo$')
-}
+NO_AUTH = re.compile(
+    r'^(?:'
+    r'|app/.*'
+    r'|addons/[^/]+/logo'
+    r')$'
+)
 
 
 class HassIOView(HomeAssistantView):
@@ -128,15 +129,13 @@ def _create_response_log(client, data):
 
 def _get_timeout(path):
     """Return timeout for a URL path."""
-    for re_path in NO_TIMEOUT:
-        if re_path.match(path):
-            return 0
+    if NO_TIMEOUT.match(path):
+        return 0
     return 300
 
 
 def _need_auth(path):
     """Return if a path need authentication."""
-    for re_path in NO_AUTH:
-        if re_path.match(path):
-            return False
+    if NO_AUTH.match(path):
+        return False
     return True
diff --git a/tests/components/hassio/test_http.py b/tests/components/hassio/test_http.py
index ce260225097..4370c011891 100644
--- a/tests/components/hassio/test_http.py
+++ b/tests/components/hassio/test_http.py
@@ -36,9 +36,13 @@ def test_forward_request(hassio_client):
 
 
 @asyncio.coroutine
-def test_auth_required_forward_request(hassio_client):
+@pytest.mark.parametrize(
+    'build_type', [
+        'supervisor/info', 'homeassistant/update', 'host/info'
+    ])
+def test_auth_required_forward_request(hassio_client, build_type):
     """Test auth required for normal request."""
-    resp = yield from hassio_client.post('/api/hassio/beer')
+    resp = yield from hassio_client.post("/api/hassio/{}".format(build_type))
 
     # Check we got right response
     assert resp.status == 401

From da108f1999e9d232852c589fddce552e3eecd1a0 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Wed, 19 Sep 2018 15:17:05 +0200
Subject: [PATCH 191/357] bump frontend to 20180919.0

---
 homeassistant/components/frontend/__init__.py | 2 +-
 requirements_all.txt                          | 2 +-
 requirements_test_all.txt                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/frontend/__init__.py b/homeassistant/components/frontend/__init__.py
index 529d7d5fb3d..861c4a95d69 100644
--- a/homeassistant/components/frontend/__init__.py
+++ b/homeassistant/components/frontend/__init__.py
@@ -26,7 +26,7 @@ from homeassistant.helpers.translation import async_get_translations
 from homeassistant.loader import bind_hass
 from homeassistant.util.yaml import load_yaml
 
-REQUIREMENTS = ['home-assistant-frontend==20180917.0']
+REQUIREMENTS = ['home-assistant-frontend==20180919.0']
 
 DOMAIN = 'frontend'
 DEPENDENCIES = ['api', 'websocket_api', 'http', 'system_log',
diff --git a/requirements_all.txt b/requirements_all.txt
index 203a61041aa..ca477091dc5 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -454,7 +454,7 @@ hole==0.3.0
 holidays==0.9.7
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180917.0
+home-assistant-frontend==20180919.0
 
 # homeassistant.components.homekit_controller
 # homekit==0.10
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index d1853d20879..a2d556511b9 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -87,7 +87,7 @@ hdate==0.6.3
 holidays==0.9.7
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180917.0
+home-assistant-frontend==20180919.0
 
 # homeassistant.components.homematicip_cloud
 homematicip==0.9.8

From 0121e3cb041c5aedd6d809275e494a945c06cb8b Mon Sep 17 00:00:00 2001
From: Matthias Urlichs <matthias@urlichs.de>
Date: Wed, 19 Sep 2018 15:40:02 +0200
Subject: [PATCH 192/357] Remove usage of "run_until_complete" (#16617)

* De-run_forever()-ization

* Use asyncio.run (or our own implementation on Python <3.7)
* hass.start is only used by tests
* setup_and_run_hass() is now async
* Add "main" async hass.run method
* move SIGINT handling to helpers/signal.py
  * add flag to .run to disable hass's signal handlers
* Teach async_start and async_stop to not step on each other
  (more than necessary)

* shorten over-long lines

* restore missing "import asyncio"

* move run_asyncio to homeassistant.util.async_

* LOGGER: warn => warning

* Add "force" flag to async_stop

only useful for testing

* Add 'attrs==18.2.0' to requirements_all.txt

Required for keeping requirements_test_all.txt in sync, where it is in
turn required to prevent auto-downgrading "attrs" during "pip install"

* Fixes for mypy

* Fix "mock_signal" fixture

* Revert mistaken edit

* Flake8 fixes

* mypy fixes

* pylint fix

* Revert adding attrs== to requirements_test*.txt

solved by using "pip -c"

* Rename "run" to "async_run", as per calling conventions
---
 homeassistant/__main__.py                     | 34 ++++-----
 homeassistant/bootstrap.py                    |  2 -
 homeassistant/core.py                         | 70 ++++++++++++++++---
 homeassistant/helpers/signal.py               | 14 +++-
 homeassistant/util/async_.py                  | 22 +++++-
 .../alarm_control_panel/test_spc.py           |  2 +-
 tests/components/binary_sensor/test_spc.py    |  2 +-
 tests/components/sensor/test_dsmr.py          | 11 ++-
 tests/conftest.py                             |  2 +-
 tests/helpers/test_discovery.py               |  2 +-
 tests/test_bootstrap.py                       |  2 -
 11 files changed, 126 insertions(+), 37 deletions(-)

diff --git a/homeassistant/__main__.py b/homeassistant/__main__.py
index 80bc1dccff4..af89564f102 100644
--- a/homeassistant/__main__.py
+++ b/homeassistant/__main__.py
@@ -22,12 +22,12 @@ from homeassistant.const import (
 def attempt_use_uvloop() -> None:
     """Attempt to use uvloop."""
     import asyncio
-
     try:
         import uvloop
-        asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
     except ImportError:
         pass
+    else:
+        asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
 
 
 def validate_python() -> None:
@@ -239,10 +239,10 @@ def cmdline() -> List[str]:
     return [arg for arg in sys.argv if arg != '--daemon']
 
 
-def setup_and_run_hass(config_dir: str,
-                       args: argparse.Namespace) -> int:
+async def setup_and_run_hass(config_dir: str,
+                             args: argparse.Namespace) -> int:
     """Set up HASS and run."""
-    from homeassistant import bootstrap
+    from homeassistant import bootstrap, core
 
     # Run a simple daemon runner process on Windows to handle restarts
     if os.name == 'nt' and '--runner' not in sys.argv:
@@ -255,35 +255,34 @@ def setup_and_run_hass(config_dir: str,
                 if exc.returncode != RESTART_EXIT_CODE:
                     sys.exit(exc.returncode)
 
+    hass = core.HomeAssistant()
+
     if args.demo_mode:
         config = {
             'frontend': {},
             'demo': {}
         }  # type: Dict[str, Any]
-        hass = bootstrap.from_config_dict(
-            config, config_dir=config_dir, verbose=args.verbose,
+        bootstrap.async_from_config_dict(
+            config, hass, config_dir=config_dir, verbose=args.verbose,
             skip_pip=args.skip_pip, log_rotate_days=args.log_rotate_days,
             log_file=args.log_file, log_no_color=args.log_no_color)
     else:
         config_file = ensure_config_file(config_dir)
         print('Config directory:', config_dir)
-        hass = bootstrap.from_config_file(
-            config_file, verbose=args.verbose, skip_pip=args.skip_pip,
+        await bootstrap.async_from_config_file(
+            config_file, hass, verbose=args.verbose, skip_pip=args.skip_pip,
             log_rotate_days=args.log_rotate_days, log_file=args.log_file,
             log_no_color=args.log_no_color)
 
-    if hass is None:
-        return -1
-
     if args.open_ui:
         # Imported here to avoid importing asyncio before monkey patch
         from homeassistant.util.async_ import run_callback_threadsafe
 
         def open_browser(_: Any) -> None:
             """Open the web interface in a browser."""
-            if hass.config.api is not None:  # type: ignore
+            if hass.config.api is not None:
                 import webbrowser
-                webbrowser.open(hass.config.api.base_url)  # type: ignore
+                webbrowser.open(hass.config.api.base_url)
 
         run_callback_threadsafe(
             hass.loop,
@@ -291,7 +290,7 @@ def setup_and_run_hass(config_dir: str,
             EVENT_HOMEASSISTANT_START, open_browser
         )
 
-    return hass.start()
+    return await hass.async_run()
 
 
 def try_to_restart() -> None:
@@ -365,11 +364,12 @@ def main() -> int:
     if args.pid_file:
         write_pid(args.pid_file)
 
-    exit_code = setup_and_run_hass(config_dir, args)
+    from homeassistant.util.async_ import asyncio_run
+    exit_code = asyncio_run(setup_and_run_hass(config_dir, args))
     if exit_code == RESTART_EXIT_CODE and not args.runner:
         try_to_restart()
 
-    return exit_code
+    return exit_code  # type: ignore # mypy cannot yet infer it
 
 
 if __name__ == "__main__":
diff --git a/homeassistant/bootstrap.py b/homeassistant/bootstrap.py
index 2125ab46a8c..0676cec7fad 100644
--- a/homeassistant/bootstrap.py
+++ b/homeassistant/bootstrap.py
@@ -18,7 +18,6 @@ from homeassistant.util.logging import AsyncHandler
 from homeassistant.util.package import async_get_user_site, is_virtual_env
 from homeassistant.util.yaml import clear_secret_cache
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.signal import async_register_signal_handling
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -159,7 +158,6 @@ async def async_from_config_dict(config: Dict[str, Any],
     stop = time()
     _LOGGER.info("Home Assistant initialized in %.2fs", stop-start)
 
-    async_register_signal_handling(hass)
     return hass
 
 
diff --git a/homeassistant/core.py b/homeassistant/core.py
index 6b1ea3f4263..653f95ccece 100644
--- a/homeassistant/core.py
+++ b/homeassistant/core.py
@@ -154,6 +154,8 @@ class HomeAssistant:
         self.state = CoreState.not_running
         self.exit_code = 0  # type: int
         self.config_entries = None  # type: Optional[ConfigEntries]
+        # If not None, use to signal end-of-loop
+        self._stopped = None  # type: Optional[asyncio.Event]
 
     @property
     def is_running(self) -> bool:
@@ -161,23 +163,45 @@ class HomeAssistant:
         return self.state in (CoreState.starting, CoreState.running)
 
     def start(self) -> int:
-        """Start home assistant."""
+        """Start home assistant.
+
+        Note: This function is only used for testing.
+        For regular use, use "await hass.run()".
+        """
         # Register the async start
         fire_coroutine_threadsafe(self.async_start(), self.loop)
 
-        # Run forever and catch keyboard interrupt
+        # Run forever
         try:
             # Block until stopped
             _LOGGER.info("Starting Home Assistant core loop")
             self.loop.run_forever()
-        except KeyboardInterrupt:
-            self.loop.call_soon_threadsafe(
-                self.loop.create_task, self.async_stop())
-            self.loop.run_forever()
         finally:
             self.loop.close()
         return self.exit_code
 
+    async def async_run(self, *, attach_signals: bool = True) -> int:
+        """Home Assistant main entry point.
+
+        Start Home Assistant and block until stopped.
+
+        This method is a coroutine.
+        """
+        if self.state != CoreState.not_running:
+            raise RuntimeError("HASS is already running")
+
+        # _async_stop will set this instead of stopping the loop
+        self._stopped = asyncio.Event()
+
+        await self.async_start()
+        if attach_signals:
+            from homeassistant.helpers.signal \
+                    import async_register_signal_handling
+            async_register_signal_handling(self)
+
+        await self._stopped.wait()
+        return self.exit_code
+
     async def async_start(self) -> None:
         """Finalize startup from inside the event loop.
 
@@ -203,6 +227,13 @@ class HomeAssistant:
 
         # Allow automations to set up the start triggers before changing state
         await asyncio.sleep(0)
+
+        if self.state != CoreState.starting:
+            _LOGGER.warning(
+                'Home Assistant startup has been interrupted. '
+                'Its state may be inconsistent.')
+            return
+
         self.state = CoreState.running
         _async_create_timer(self)
 
@@ -321,13 +352,32 @@ class HomeAssistant:
 
     def stop(self) -> None:
         """Stop Home Assistant and shuts down all threads."""
+        if self.state == CoreState.not_running:  # just ignore
+            return
         fire_coroutine_threadsafe(self.async_stop(), self.loop)
 
-    async def async_stop(self, exit_code: int = 0) -> None:
+    async def async_stop(self, exit_code: int = 0, *,
+                         force: bool = False) -> None:
         """Stop Home Assistant and shuts down all threads.
 
+        The "force" flag commands async_stop to proceed regardless of
+        Home Assistan't current state. You should not set this flag
+        unless you're testing.
+
         This method is a coroutine.
         """
+        if not force:
+            # Some tests require async_stop to run,
+            # regardless of the state of the loop.
+            if self.state == CoreState.not_running:  # just ignore
+                return
+            if self.state == CoreState.stopping:
+                _LOGGER.info("async_stop called twice: ignored")
+                return
+            if self.state == CoreState.starting:
+                # This may not work
+                _LOGGER.warning("async_stop called before startup is complete")
+
         # stage 1
         self.state = CoreState.stopping
         self.async_track_tasks()
@@ -341,7 +391,11 @@ class HomeAssistant:
         self.executor.shutdown()
 
         self.exit_code = exit_code
-        self.loop.stop()
+
+        if self._stopped is not None:
+            self._stopped.set()
+        else:
+            self.loop.stop()
 
 
 @attr.s(slots=True, frozen=True)
diff --git a/homeassistant/helpers/signal.py b/homeassistant/helpers/signal.py
index 824b32177cd..6068cad33af 100644
--- a/homeassistant/helpers/signal.py
+++ b/homeassistant/helpers/signal.py
@@ -17,7 +17,13 @@ def async_register_signal_handling(hass: HomeAssistant) -> None:
     if sys.platform != 'win32':
         @callback
         def async_signal_handle(exit_code):
-            """Wrap signal handling."""
+            """Wrap signal handling.
+
+            * queue call to shutdown task
+            * re-instate default handler
+            """
+            hass.loop.remove_signal_handler(signal.SIGTERM)
+            hass.loop.remove_signal_handler(signal.SIGINT)
             hass.async_create_task(hass.async_stop(exit_code))
 
         try:
@@ -26,6 +32,12 @@ def async_register_signal_handling(hass: HomeAssistant) -> None:
         except ValueError:
             _LOGGER.warning("Could not bind to SIGTERM")
 
+        try:
+            hass.loop.add_signal_handler(
+                signal.SIGINT, async_signal_handle, 0)
+        except ValueError:
+            _LOGGER.warning("Could not bind to SIGINT")
+
         try:
             hass.loop.add_signal_handler(
                 signal.SIGHUP, async_signal_handle, RESTART_EXIT_CODE)
diff --git a/homeassistant/util/async_.py b/homeassistant/util/async_.py
index aa030bf13c7..04456b8cb2f 100644
--- a/homeassistant/util/async_.py
+++ b/homeassistant/util/async_.py
@@ -6,12 +6,32 @@ from asyncio import coroutines
 from asyncio.events import AbstractEventLoop
 from asyncio.futures import Future
 
+import asyncio
 from asyncio import ensure_future
-from typing import Any, Union, Coroutine, Callable, Generator
+from typing import Any, Union, Coroutine, Callable, Generator, TypeVar, \
+                   Awaitable
 
 _LOGGER = logging.getLogger(__name__)
 
 
+try:
+    # pylint: disable=invalid-name
+    asyncio_run = asyncio.run  # type: ignore
+except AttributeError:
+    _T = TypeVar('_T')
+
+    def asyncio_run(main: Awaitable[_T], *, debug: bool = False) -> _T:
+        """Minimal re-implementation of asyncio.run (since 3.7)."""
+        loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(loop)
+        loop.set_debug(debug)
+        try:
+            return loop.run_until_complete(main)
+        finally:
+            asyncio.set_event_loop(None)  # type: ignore # not a bug
+            loop.close()
+
+
 def _set_result_unless_cancelled(fut: Future, result: Any) -> None:
     """Set the result only if the Future was not cancelled."""
     if fut.cancelled():
diff --git a/tests/components/alarm_control_panel/test_spc.py b/tests/components/alarm_control_panel/test_spc.py
index 0a4ba0916ea..a0793943c2f 100644
--- a/tests/components/alarm_control_panel/test_spc.py
+++ b/tests/components/alarm_control_panel/test_spc.py
@@ -17,7 +17,7 @@ def hass(loop):
     hass.data['spc_registry'] = SpcRegistry()
     hass.data['spc_api'] = None
     yield hass
-    loop.run_until_complete(hass.async_stop())
+    loop.run_until_complete(hass.async_stop(force=True))
 
 
 @asyncio.coroutine
diff --git a/tests/components/binary_sensor/test_spc.py b/tests/components/binary_sensor/test_spc.py
index 0a91b59e14d..966f73682e8 100644
--- a/tests/components/binary_sensor/test_spc.py
+++ b/tests/components/binary_sensor/test_spc.py
@@ -14,7 +14,7 @@ def hass(loop):
     hass = loop.run_until_complete(async_test_home_assistant(loop))
     hass.data['spc_registry'] = SpcRegistry()
     yield hass
-    loop.run_until_complete(hass.async_stop())
+    loop.run_until_complete(hass.async_stop(force=True))
 
 
 @asyncio.coroutine
diff --git a/tests/components/sensor/test_dsmr.py b/tests/components/sensor/test_dsmr.py
index e5fca461a23..9ab8d61f739 100644
--- a/tests/components/sensor/test_dsmr.py
+++ b/tests/components/sensor/test_dsmr.py
@@ -182,10 +182,14 @@ def test_reconnect(hass, monkeypatch, mock_connection_factory):
 
     # mock waiting coroutine while connection lasts
     closed = asyncio.Event(loop=hass.loop)
+    # Handshake so that `hass.async_block_till_done()` doesn't cycle forever
+    closed2 = asyncio.Event(loop=hass.loop)
 
     @asyncio.coroutine
     def wait_closed():
         yield from closed.wait()
+        closed2.set()
+        closed.clear()
     protocol.wait_closed = wait_closed
 
     yield from async_setup_component(hass, 'sensor', {'sensor': config})
@@ -195,8 +199,11 @@ def test_reconnect(hass, monkeypatch, mock_connection_factory):
     # indicate disconnect, release wait lock and allow reconnect to happen
     closed.set()
     # wait for lock set to resolve
-    yield from hass.async_block_till_done()
-    # wait for sleep to resolve
+    yield from closed2.wait()
+    closed2.clear()
+    assert not closed.is_set()
+
+    closed.set()
     yield from hass.async_block_till_done()
 
     assert connection_factory.call_count >= 2, \
diff --git a/tests/conftest.py b/tests/conftest.py
index 61c5c1c7dd5..84b72189a8d 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -73,7 +73,7 @@ def hass(loop, hass_storage):
 
     yield hass
 
-    loop.run_until_complete(hass.async_stop())
+    loop.run_until_complete(hass.async_stop(force=True))
 
 
 @pytest.fixture
diff --git a/tests/helpers/test_discovery.py b/tests/helpers/test_discovery.py
index a8d78bde1f4..64f90ee7452 100644
--- a/tests/helpers/test_discovery.py
+++ b/tests/helpers/test_discovery.py
@@ -154,7 +154,7 @@ class TestHelpersDiscovery:
         assert 'test_component' in self.hass.config.components
         assert 'switch' in self.hass.config.components
 
-    @patch('homeassistant.bootstrap.async_register_signal_handling')
+    @patch('homeassistant.helpers.signal.async_register_signal_handling')
     def test_1st_discovers_2nd_component(self, mock_signal):
         """Test that we don't break if one component discovers the other.
 
diff --git a/tests/test_bootstrap.py b/tests/test_bootstrap.py
index 4f258bc2b09..978b0b9d450 100644
--- a/tests/test_bootstrap.py
+++ b/tests/test_bootstrap.py
@@ -22,7 +22,6 @@ _LOGGER = logging.getLogger(__name__)
     'homeassistant.bootstrap.conf_util.process_ha_config_upgrade', Mock())
 @patch('homeassistant.util.location.detect_location_info',
        Mock(return_value=None))
-@patch('homeassistant.bootstrap.async_register_signal_handling', Mock())
 @patch('os.path.isfile', Mock(return_value=True))
 @patch('os.access', Mock(return_value=True))
 @patch('homeassistant.bootstrap.async_enable_logging',
@@ -41,7 +40,6 @@ def test_from_config_file(hass):
 
 
 @patch('homeassistant.bootstrap.async_enable_logging', Mock())
-@patch('homeassistant.bootstrap.async_register_signal_handling', Mock())
 @asyncio.coroutine
 def test_home_assistant_core_config_validation(hass):
     """Test if we pass in wrong information for HA conf."""

From 227a1b919b5bd30b8f841a77a03b744ab66db405 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Wed, 19 Sep 2018 16:40:36 +0300
Subject: [PATCH 193/357] More isort preparations (#16633)

* Adjust config closer to currently established style conventions

* Adjust some imports for better outcome with their comments
---
 homeassistant/components/binary_sensor/zwave.py | 4 ++--
 homeassistant/components/climate/zwave.py       | 4 ++--
 homeassistant/components/cover/zwave.py         | 5 ++---
 homeassistant/components/ios/__init__.py        | 6 +++---
 setup.cfg                                       | 5 +++++
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/homeassistant/components/binary_sensor/zwave.py b/homeassistant/components/binary_sensor/zwave.py
index 784a96d8615..3bb3a3c79c5 100644
--- a/homeassistant/components/binary_sensor/zwave.py
+++ b/homeassistant/components/binary_sensor/zwave.py
@@ -9,8 +9,8 @@ import datetime
 import homeassistant.util.dt as dt_util
 from homeassistant.helpers.event import track_point_in_time
 from homeassistant.components import zwave
-from homeassistant.components.zwave import workaround
-from homeassistant.components.zwave import async_setup_platform  # noqa pylint: disable=unused-import
+from homeassistant.components.zwave import (  # noqa pylint: disable=unused-import
+    async_setup_platform, workaround)
 from homeassistant.components.binary_sensor import (
     DOMAIN,
     BinarySensorDevice)
diff --git a/homeassistant/components/climate/zwave.py b/homeassistant/components/climate/zwave.py
index f87f2e83f5d..77b5e111686 100644
--- a/homeassistant/components/climate/zwave.py
+++ b/homeassistant/components/climate/zwave.py
@@ -10,8 +10,8 @@ from homeassistant.components.climate import (
     DOMAIN, ClimateDevice, STATE_AUTO, STATE_COOL, STATE_HEAT,
     SUPPORT_TARGET_TEMPERATURE, SUPPORT_FAN_MODE,
     SUPPORT_OPERATION_MODE, SUPPORT_SWING_MODE)
-from homeassistant.components.zwave import ZWaveDeviceEntity
-from homeassistant.components.zwave import async_setup_platform  # noqa pylint: disable=unused-import
+from homeassistant.components.zwave import (  # noqa pylint: disable=unused-import
+    ZWaveDeviceEntity, async_setup_platform)
 from homeassistant.const import (
     STATE_OFF, TEMP_CELSIUS, TEMP_FAHRENHEIT, ATTR_TEMPERATURE)
 
diff --git a/homeassistant/components/cover/zwave.py b/homeassistant/components/cover/zwave.py
index 8c8c88ecb87..258087702e0 100644
--- a/homeassistant/components/cover/zwave.py
+++ b/homeassistant/components/cover/zwave.py
@@ -9,10 +9,9 @@ https://home-assistant.io/components/cover.zwave/
 import logging
 from homeassistant.components.cover import (
     DOMAIN, SUPPORT_OPEN, SUPPORT_CLOSE, ATTR_POSITION)
-from homeassistant.components.zwave import ZWaveDeviceEntity
 from homeassistant.components import zwave
-from homeassistant.components.zwave import async_setup_platform  # noqa pylint: disable=unused-import
-from homeassistant.components.zwave import workaround
+from homeassistant.components.zwave import (  # noqa pylint: disable=unused-import
+    ZWaveDeviceEntity, async_setup_platform, workaround)
 from homeassistant.components.cover import CoverDevice
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/ios/__init__.py b/homeassistant/components/ios/__init__.py
index a4884739f96..a67be0a63de 100644
--- a/homeassistant/components/ios/__init__.py
+++ b/homeassistant/components/ios/__init__.py
@@ -9,7 +9,6 @@ import logging
 import datetime
 
 import voluptuous as vol
-# from voluptuous.humanize import humanize_error
 
 from homeassistant import config_entries
 from homeassistant.components.http import HomeAssistantView
@@ -274,8 +273,9 @@ class iOSIdentifyDeviceView(HomeAssistantView):
         # try:
         #     data = IDENTIFY_SCHEMA(req_data)
         # except vol.Invalid as ex:
-        #     return self.json_message(humanize_error(request.json, ex),
-        #                              HTTP_BAD_REQUEST)
+        #     return self.json_message(
+        #         vol.humanize.humanize_error(request.json, ex),
+        #         HTTP_BAD_REQUEST)
 
         data[ATTR_LAST_SEEN_AT] = datetime.datetime.now().isoformat()
 
diff --git a/setup.cfg b/setup.cfg
index a8bd819c792..b2bbb4081f0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -33,3 +33,8 @@ not_skip = __init__.py
 # will group `import x` and `from x import` of the same module.
 force_sort_within_sections = true
 sections = FUTURE,STDLIB,INBETWEENS,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
+default_section = THIRDPARTY
+known_first_party = homeassistant,tests
+forced_separate = tests
+combine_as_imports = true
+use_parentheses = true

From d4b7057a3de1c120df5c2daac016b6190a3b986f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Wed, 19 Sep 2018 16:48:04 +0300
Subject: [PATCH 194/357] Use posargs in tox lint env (#16646)

Allows linting specified files or dirs only.
---
 tox.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index e1261457c47..60dacd5d8cb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -49,8 +49,8 @@ deps =
      -r{toxinidir}/requirements_test.txt
 commands =
          python script/gen_requirements_all.py validate
-         flake8
-         pydocstyle homeassistant tests
+         flake8 {posargs}
+         pydocstyle {posargs:homeassistant tests}
 
 [testenv:typing]
 basepython = {env:PYTHON3_PATH:python3}

From 3160fa5de869cbc6f8fa1eebff75c966e2a022bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Wed, 19 Sep 2018 16:51:57 +0300
Subject: [PATCH 195/357] Make pylint report non-LF linefeeds per the style
 guidelines (#16601)

---
 pylintrc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pylintrc b/pylintrc
index b72502248d7..be06f83e6f2 100644
--- a/pylintrc
+++ b/pylintrc
@@ -42,5 +42,8 @@ reports=no
 ignored-classes=_CountingAttr
 generated-members=botocore.errorfactory
 
+[FORMAT]
+expected-line-ending-format=LF
+
 [EXCEPTIONS]
 overgeneral-exceptions=Exception,HomeAssistantError

From a1c524d3728abbe0bad5de229e514f5e13b537a8 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Wed, 19 Sep 2018 21:21:43 +0200
Subject: [PATCH 196/357] Config flow tradfri (#16665)

* Fix comments

* Add config flow tests

* Fix Tradfri light tests

* Lint

* Remove import group from config flow

* fix stale comments
---
 homeassistant/components/discovery.py         |   2 +-
 homeassistant/components/light/tradfri.py     |  28 ++-
 homeassistant/components/sensor/tradfri.py    |  18 +-
 homeassistant/components/tradfri.py           | 173 ------------------
 .../components/tradfri/.translations/en.json  |  23 +++
 homeassistant/components/tradfri/__init__.py  | 102 +++++++++++
 .../components/tradfri/config_flow.py         | 172 +++++++++++++++++
 homeassistant/components/tradfri/const.py     |   7 +
 homeassistant/components/tradfri/strings.json |  23 +++
 homeassistant/config_entries.py               |   1 +
 tests/components/light/test_tradfri.py        |  75 ++------
 tests/components/tradfri/__init__.py          |   1 +
 tests/components/tradfri/test_config_flow.py  | 156 ++++++++++++++++
 13 files changed, 519 insertions(+), 262 deletions(-)
 delete mode 100644 homeassistant/components/tradfri.py
 create mode 100644 homeassistant/components/tradfri/.translations/en.json
 create mode 100644 homeassistant/components/tradfri/__init__.py
 create mode 100644 homeassistant/components/tradfri/config_flow.py
 create mode 100644 homeassistant/components/tradfri/const.py
 create mode 100644 homeassistant/components/tradfri/strings.json
 create mode 100644 tests/components/tradfri/__init__.py
 create mode 100644 tests/components/tradfri/test_config_flow.py

diff --git a/homeassistant/components/discovery.py b/homeassistant/components/discovery.py
index 41cf3791256..22d7ae87b8d 100644
--- a/homeassistant/components/discovery.py
+++ b/homeassistant/components/discovery.py
@@ -48,6 +48,7 @@ CONFIG_ENTRY_HANDLERS = {
     SERVICE_DECONZ: 'deconz',
     'google_cast': 'cast',
     SERVICE_HUE: 'hue',
+    SERVICE_IKEA_TRADFRI: 'tradfri',
     'sonos': 'sonos',
 }
 
@@ -55,7 +56,6 @@ SERVICE_HANDLERS = {
     SERVICE_HASS_IOS_APP: ('ios', None),
     SERVICE_NETGEAR: ('device_tracker', None),
     SERVICE_WEMO: ('wemo', None),
-    SERVICE_IKEA_TRADFRI: ('tradfri', None),
     SERVICE_HASSIO: ('hassio', None),
     SERVICE_AXIS: ('axis', None),
     SERVICE_APPLE_TV: ('apple_tv', None),
diff --git a/homeassistant/components/light/tradfri.py b/homeassistant/components/light/tradfri.py
index 0d12d095bb6..bd432b5dedc 100644
--- a/homeassistant/components/light/tradfri.py
+++ b/homeassistant/components/light/tradfri.py
@@ -13,8 +13,9 @@ from homeassistant.components.light import (
     SUPPORT_COLOR, Light)
 from homeassistant.components.light import \
     PLATFORM_SCHEMA as LIGHT_PLATFORM_SCHEMA
-from homeassistant.components.tradfri import KEY_GATEWAY, KEY_TRADFRI_GROUPS, \
-    KEY_API
+from homeassistant.components.tradfri import KEY_GATEWAY, KEY_API
+from homeassistant.components.tradfri.const import (
+    CONF_IMPORT_GROUPS, CONF_GATEWAY_ID)
 import homeassistant.util.color as color_util
 
 _LOGGER = logging.getLogger(__name__)
@@ -31,28 +32,21 @@ SUPPORTED_FEATURES = SUPPORT_TRANSITION
 SUPPORTED_GROUP_FEATURES = SUPPORT_BRIGHTNESS | SUPPORT_TRANSITION
 
 
-async def async_setup_platform(hass, config,
-                               async_add_entities, discovery_info=None):
-    """Set up the IKEA Tradfri Light platform."""
-    if discovery_info is None:
-        return
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Load Tradfri lights based on a config entry."""
+    gateway_id = config_entry.data[CONF_GATEWAY_ID]
+    api = hass.data[KEY_API][config_entry.entry_id]
+    gateway = hass.data[KEY_GATEWAY][config_entry.entry_id]
 
-    gateway_id = discovery_info['gateway']
-    api = hass.data[KEY_API][gateway_id]
-    gateway = hass.data[KEY_GATEWAY][gateway_id]
-
-    devices_command = gateway.get_devices()
-    devices_commands = await api(devices_command)
+    devices_commands = await api(gateway.get_devices())
     devices = await api(devices_commands)
     lights = [dev for dev in devices if dev.has_light_control]
     if lights:
         async_add_entities(
             TradfriLight(light, api, gateway_id) for light in lights)
 
-    allow_tradfri_groups = hass.data[KEY_TRADFRI_GROUPS][gateway_id]
-    if allow_tradfri_groups:
-        groups_command = gateway.get_groups()
-        groups_commands = await api(groups_command)
+    if config_entry.data[CONF_IMPORT_GROUPS]:
+        groups_commands = await api(gateway.get_groups())
         groups = await api(groups_commands)
         if groups:
             async_add_entities(
diff --git a/homeassistant/components/sensor/tradfri.py b/homeassistant/components/sensor/tradfri.py
index 0849169b747..86d0c1abc19 100644
--- a/homeassistant/components/sensor/tradfri.py
+++ b/homeassistant/components/sensor/tradfri.py
@@ -19,20 +19,14 @@ DEPENDENCIES = ['tradfri']
 SCAN_INTERVAL = timedelta(minutes=5)
 
 
-async def async_setup_platform(hass, config, async_add_entities,
-                               discovery_info=None):
-    """Set up the IKEA Tradfri device platform."""
-    if discovery_info is None:
-        return
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up a Tradfri config entry."""
+    api = hass.data[KEY_API][config_entry.entry_id]
+    gateway = hass.data[KEY_GATEWAY][config_entry.entry_id]
 
-    gateway_id = discovery_info['gateway']
-    api = hass.data[KEY_API][gateway_id]
-    gateway = hass.data[KEY_GATEWAY][gateway_id]
-
-    devices_command = gateway.get_devices()
-    devices_commands = await api(devices_command)
+    devices_commands = await api(gateway.get_devices())
     all_devices = await api(devices_commands)
-    devices = [dev for dev in all_devices if not dev.has_light_control]
+    devices = (dev for dev in all_devices if not dev.has_light_control)
     async_add_entities(TradfriDevice(device, api) for device in devices)
 
 
diff --git a/homeassistant/components/tradfri.py b/homeassistant/components/tradfri.py
deleted file mode 100644
index b2e41902552..00000000000
--- a/homeassistant/components/tradfri.py
+++ /dev/null
@@ -1,173 +0,0 @@
-"""
-Support for IKEA Tradfri.
-
-For more details about this component, please refer to the documentation at
-https://home-assistant.io/components/ikea_tradfri/
-"""
-import logging
-from uuid import uuid4
-
-import voluptuous as vol
-
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers import discovery
-from homeassistant.const import CONF_HOST
-from homeassistant.components.discovery import SERVICE_IKEA_TRADFRI
-from homeassistant.util.json import load_json, save_json
-
-REQUIREMENTS = ['pytradfri[async]==5.5.1']
-
-DOMAIN = 'tradfri'
-GATEWAY_IDENTITY = 'homeassistant'
-CONFIG_FILE = '.tradfri_psk.conf'
-KEY_CONFIG = 'tradfri_configuring'
-KEY_GATEWAY = 'tradfri_gateway'
-KEY_API = 'tradfri_api'
-KEY_TRADFRI_GROUPS = 'tradfri_allow_tradfri_groups'
-CONF_ALLOW_TRADFRI_GROUPS = 'allow_tradfri_groups'
-DEFAULT_ALLOW_TRADFRI_GROUPS = True
-
-CONFIG_SCHEMA = vol.Schema({
-    DOMAIN: vol.Schema({
-        vol.Inclusive(CONF_HOST, 'gateway'): cv.string,
-        vol.Optional(CONF_ALLOW_TRADFRI_GROUPS,
-                     default=DEFAULT_ALLOW_TRADFRI_GROUPS): cv.boolean,
-    })
-}, extra=vol.ALLOW_EXTRA)
-
-_LOGGER = logging.getLogger(__name__)
-
-
-def request_configuration(hass, config, host):
-    """Request configuration steps from the user."""
-    configurator = hass.components.configurator
-    hass.data.setdefault(KEY_CONFIG, {})
-    instance = hass.data[KEY_CONFIG].get(host)
-
-    # Configuration already in progress
-    if instance:
-        return
-
-    async def configuration_callback(callback_data):
-        """Handle the submitted configuration."""
-        try:
-            from pytradfri.api.aiocoap_api import APIFactory
-            from pytradfri import RequestError
-        except ImportError:
-            _LOGGER.exception("Looks like something isn't installed!")
-            return
-
-        identity = uuid4().hex
-        security_code = callback_data.get('security_code')
-
-        api_factory = APIFactory(host, psk_id=identity, loop=hass.loop)
-        # Need To Fix: currently entering a wrong security code sends
-        # pytradfri aiocoap API into an endless loop.
-        # Should just raise a requestError or something.
-        try:
-            key = await api_factory.generate_psk(security_code)
-        except RequestError:
-            configurator.async_notify_errors(hass, instance,
-                                             "Security Code not accepted.")
-            return
-
-        res = await _setup_gateway(hass, config, host, identity, key,
-                                   DEFAULT_ALLOW_TRADFRI_GROUPS)
-
-        if not res:
-            configurator.async_notify_errors(hass, instance,
-                                             "Unable to connect.")
-            return
-
-        def success():
-            """Set up was successful."""
-            conf = load_json(hass.config.path(CONFIG_FILE))
-            conf[host] = {'identity': identity,
-                          'key': key}
-            save_json(hass.config.path(CONFIG_FILE), conf)
-            configurator.request_done(instance)
-
-        hass.async_add_job(success)
-
-    instance = configurator.request_config(
-        "IKEA Trådfri", configuration_callback,
-        description='Please enter the security code written at the bottom of '
-                    'your IKEA Trådfri Gateway.',
-        submit_caption="Confirm",
-        fields=[{'id': 'security_code', 'name': 'Security Code',
-                 'type': 'password'}]
-    )
-
-
-async def async_setup(hass, config):
-    """Set up the Tradfri component."""
-    conf = config.get(DOMAIN, {})
-    host = conf.get(CONF_HOST)
-    allow_tradfri_groups = conf.get(CONF_ALLOW_TRADFRI_GROUPS)
-    known_hosts = await hass.async_add_job(load_json,
-                                           hass.config.path(CONFIG_FILE))
-
-    async def gateway_discovered(service, info,
-                                 allow_groups=DEFAULT_ALLOW_TRADFRI_GROUPS):
-        """Run when a gateway is discovered."""
-        host = info['host']
-
-        if host in known_hosts:
-            # use fallbacks for old config style
-            # identity was hard coded as 'homeassistant'
-            identity = known_hosts[host].get('identity', 'homeassistant')
-            key = known_hosts[host].get('key')
-            await _setup_gateway(hass, config, host, identity, key,
-                                 allow_groups)
-        else:
-            hass.async_add_job(request_configuration, hass, config, host)
-
-    discovery.async_listen(hass, SERVICE_IKEA_TRADFRI, gateway_discovered)
-
-    if host:
-        await gateway_discovered(None,
-                                 {'host': host},
-                                 allow_tradfri_groups)
-    return True
-
-
-async def _setup_gateway(hass, hass_config, host, identity, key,
-                         allow_tradfri_groups):
-    """Create a gateway."""
-    from pytradfri import Gateway, RequestError  # pylint: disable=import-error
-    try:
-        from pytradfri.api.aiocoap_api import APIFactory
-    except ImportError:
-        _LOGGER.exception("Looks like something isn't installed!")
-        return False
-
-    try:
-        factory = APIFactory(host, psk_id=identity, psk=key,
-                             loop=hass.loop)
-        api = factory.request
-        gateway = Gateway()
-        gateway_info_result = await api(gateway.get_gateway_info())
-    except RequestError:
-        _LOGGER.exception("Tradfri setup failed.")
-        return False
-
-    gateway_id = gateway_info_result.id
-    hass.data.setdefault(KEY_API, {})
-    hass.data.setdefault(KEY_GATEWAY, {})
-    gateways = hass.data[KEY_GATEWAY]
-    hass.data[KEY_API][gateway_id] = api
-
-    hass.data.setdefault(KEY_TRADFRI_GROUPS, {})
-    tradfri_groups = hass.data[KEY_TRADFRI_GROUPS]
-    tradfri_groups[gateway_id] = allow_tradfri_groups
-
-    # Check if already set up
-    if gateway_id in gateways:
-        return True
-
-    gateways[gateway_id] = gateway
-    hass.async_create_task(discovery.async_load_platform(
-        hass, 'light', DOMAIN, {'gateway': gateway_id}, hass_config))
-    hass.async_create_task(discovery.async_load_platform(
-        hass, 'sensor', DOMAIN, {'gateway': gateway_id}, hass_config))
-    return True
diff --git a/homeassistant/components/tradfri/.translations/en.json b/homeassistant/components/tradfri/.translations/en.json
new file mode 100644
index 00000000000..7b0d2005c2a
--- /dev/null
+++ b/homeassistant/components/tradfri/.translations/en.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Bridge is already configured"
+        },
+        "error": {
+            "cannot_connect": "Unable to connect to the gateway.",
+            "invalid_key": "Failed to register with provided key. If this keeps happening, try restarting the gateway.",
+            "timeout": "Timeout validating the code."
+        },
+        "step": {
+            "auth": {
+                "data": {
+                    "host": "Host",
+                    "security_code": "Security Code"
+                },
+                "description": "You can find the security code on the back of your gateway.",
+                "title": "Enter security code"
+            }
+        },
+        "title": "IKEA TR\u00c5DFRI"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tradfri/__init__.py b/homeassistant/components/tradfri/__init__.py
new file mode 100644
index 00000000000..771f2b44c3d
--- /dev/null
+++ b/homeassistant/components/tradfri/__init__.py
@@ -0,0 +1,102 @@
+"""
+Support for IKEA Tradfri.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/ikea_tradfri/
+"""
+import logging
+
+import voluptuous as vol
+
+from homeassistant import config_entries
+import homeassistant.helpers.config_validation as cv
+from homeassistant.util.json import load_json
+
+from .const import CONF_IMPORT_GROUPS, CONF_IDENTITY, CONF_HOST, CONF_KEY
+
+from . import config_flow  # noqa  pylint_disable=unused-import
+
+REQUIREMENTS = ['pytradfri[async]==5.5.1']
+
+DOMAIN = 'tradfri'
+CONFIG_FILE = '.tradfri_psk.conf'
+KEY_GATEWAY = 'tradfri_gateway'
+KEY_API = 'tradfri_api'
+CONF_ALLOW_TRADFRI_GROUPS = 'allow_tradfri_groups'
+DEFAULT_ALLOW_TRADFRI_GROUPS = True
+
+CONFIG_SCHEMA = vol.Schema({
+    DOMAIN: vol.Schema({
+        vol.Inclusive(CONF_HOST, 'gateway'): cv.string,
+        vol.Optional(CONF_ALLOW_TRADFRI_GROUPS,
+                     default=DEFAULT_ALLOW_TRADFRI_GROUPS): cv.boolean,
+    })
+}, extra=vol.ALLOW_EXTRA)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_setup(hass, config):
+    """Set up the Tradfri component."""
+    conf = config.get(DOMAIN)
+
+    if conf is None:
+        return True
+
+    known_hosts = await hass.async_add_executor_job(
+        load_json, hass.config.path(CONFIG_FILE))
+
+    for host, info in known_hosts.items():
+        info[CONF_HOST] = host
+        info[CONF_IMPORT_GROUPS] = conf[CONF_ALLOW_TRADFRI_GROUPS]
+
+        hass.async_create_task(hass.config_entries.flow.async_init(
+            DOMAIN, context={'source': config_entries.SOURCE_IMPORT},
+            data=info
+        ))
+
+    host = conf.get(CONF_HOST)
+
+    if host is None or host in known_hosts:
+        return True
+
+    hass.async_create_task(hass.config_entries.flow.async_init(
+        DOMAIN, context={'source': config_entries.SOURCE_IMPORT},
+        data={'host': host}
+    ))
+
+    return True
+
+
+async def async_setup_entry(hass, entry):
+    """Create a gateway."""
+    # host, identity, key, allow_tradfri_groups
+    from pytradfri import Gateway, RequestError  # pylint: disable=import-error
+    from pytradfri.api.aiocoap_api import APIFactory
+
+    factory = APIFactory(
+        entry.data[CONF_HOST],
+        psk_id=entry.data[CONF_IDENTITY],
+        psk=entry.data[CONF_KEY],
+        loop=hass.loop
+    )
+    api = factory.request
+    gateway = Gateway()
+
+    try:
+        await api(gateway.get_gateway_info())
+    except RequestError:
+        _LOGGER.error("Tradfri setup failed.")
+        return False
+
+    hass.data.setdefault(KEY_API, {})[entry.entry_id] = api
+    hass.data.setdefault(KEY_GATEWAY, {})[entry.entry_id] = gateway
+
+    hass.async_create_task(hass.config_entries.async_forward_entry_setup(
+        entry, 'light'
+    ))
+    hass.async_create_task(hass.config_entries.async_forward_entry_setup(
+        entry, 'sensor'
+    ))
+
+    return True
diff --git a/homeassistant/components/tradfri/config_flow.py b/homeassistant/components/tradfri/config_flow.py
new file mode 100644
index 00000000000..4de43c79e0c
--- /dev/null
+++ b/homeassistant/components/tradfri/config_flow.py
@@ -0,0 +1,172 @@
+"""Config flow for Tradfri."""
+import asyncio
+from collections import OrderedDict
+from uuid import uuid4
+
+import async_timeout
+import voluptuous as vol
+
+from homeassistant import config_entries
+
+from .const import (
+    CONF_IMPORT_GROUPS, CONF_IDENTITY, CONF_HOST, CONF_KEY, CONF_GATEWAY_ID)
+
+KEY_HOST = 'host'
+KEY_SECURITY_CODE = 'security_code'
+KEY_IMPORT_GROUPS = 'import_groups'
+
+
+class AuthError(Exception):
+    """Exception if authentication occurs."""
+
+    def __init__(self, code):
+        """Initialize exception."""
+        super().__init__()
+        self.code = code
+
+
+@config_entries.HANDLERS.register('tradfri')
+class FlowHandler(config_entries.ConfigFlow):
+    """Handle a config flow."""
+
+    VERSION = 1
+
+    def __init__(self):
+        """Initialize flow."""
+        self._host = None
+
+    async def async_step_user(self, user_input=None):
+        """Handle a flow initialized by the user."""
+        return await self.async_step_auth()
+
+    async def async_step_auth(self, user_input=None):
+        """Handle the authentication with a gateway."""
+        errors = {}
+
+        if user_input is not None:
+            host = user_input.get(KEY_HOST, self._host)
+            try:
+                auth = await authenticate(
+                    self.hass, host,
+                    user_input[KEY_SECURITY_CODE])
+
+                # We don't ask for import group anymore as group state
+                # is not reliable, don't want to show that to the user.
+                auth[CONF_IMPORT_GROUPS] = False
+
+                return await self._entry_from_data(auth)
+
+            except AuthError as err:
+                if err.code == 'invalid_security_code':
+                    errors[KEY_SECURITY_CODE] = err.code
+                else:
+                    errors['base'] = err.code
+
+        fields = OrderedDict()
+
+        if self._host is None:
+            fields[vol.Required(KEY_HOST)] = str
+
+        fields[vol.Required(KEY_SECURITY_CODE)] = str
+
+        return self.async_show_form(
+            step_id='auth',
+            data_schema=vol.Schema(fields),
+            errors=errors,
+        )
+
+    async def async_step_discovery(self, user_input):
+        """Handle discovery."""
+        self._host = user_input['host']
+        return await self.async_step_auth()
+
+    async def async_step_import(self, user_input):
+        """Import a config entry."""
+        for entry in self._async_current_entries():
+            if entry.data[CONF_HOST] == user_input['host']:
+                return self.async_abort(
+                    reason='already_configured'
+                )
+
+        # Happens if user has host directly in configuration.yaml
+        if 'key' not in user_input:
+            self._host = user_input['host']
+            return await self.async_step_auth()
+
+        try:
+            data = await get_gateway_info(
+                self.hass, user_input['host'], user_input['identity'],
+                user_input['key'])
+
+            data[CONF_IMPORT_GROUPS] = user_input[CONF_IMPORT_GROUPS]
+
+            return await self._entry_from_data(data)
+        except AuthError:
+            # If we fail to connect, just pass it on to discovery
+            self._host = user_input['host']
+            return await self.async_step_auth()
+
+    async def _entry_from_data(self, data):
+        """Create an entry from data."""
+        host = data[CONF_HOST]
+        gateway_id = data[CONF_GATEWAY_ID]
+
+        same_hub_entries = [entry.entry_id for entry
+                            in self._async_current_entries()
+                            if entry.data[CONF_GATEWAY_ID] == gateway_id or
+                            entry.data[CONF_HOST] == host]
+
+        if same_hub_entries:
+            await asyncio.wait([self.hass.config_entries.async_remove(entry_id)
+                                for entry_id in same_hub_entries])
+
+        return self.async_create_entry(
+            title=host,
+            data=data
+        )
+
+
+async def authenticate(hass, host, security_code):
+    """Authenticate with a Tradfri hub."""
+    from pytradfri.api.aiocoap_api import APIFactory
+    from pytradfri import RequestError
+
+    identity = uuid4().hex
+
+    api_factory = APIFactory(host, psk_id=identity, loop=hass.loop)
+
+    try:
+        with async_timeout.timeout(5):
+            key = await api_factory.generate_psk(security_code)
+    except RequestError:
+        raise AuthError('invalid_security_code')
+    except asyncio.TimeoutError:
+        raise AuthError('timeout')
+
+    return await get_gateway_info(hass, host, identity, key)
+
+
+async def get_gateway_info(hass, host, identity, key):
+    """Return info for the gateway."""
+    from pytradfri.api.aiocoap_api import APIFactory
+    from pytradfri import Gateway, RequestError
+
+    try:
+        factory = APIFactory(
+            host,
+            psk_id=identity,
+            psk=key,
+            loop=hass.loop
+        )
+        api = factory.request
+        gateway = Gateway()
+        gateway_info_result = await api(gateway.get_gateway_info())
+    except RequestError:
+        raise AuthError('cannot_connect')
+
+    return {
+        CONF_HOST: host,
+        CONF_IDENTITY: identity,
+        CONF_KEY: key,
+        CONF_GATEWAY_ID: gateway_info_result.id,
+    }
diff --git a/homeassistant/components/tradfri/const.py b/homeassistant/components/tradfri/const.py
new file mode 100644
index 00000000000..15177bc1a20
--- /dev/null
+++ b/homeassistant/components/tradfri/const.py
@@ -0,0 +1,7 @@
+"""Consts used by Tradfri."""
+from homeassistant.const import CONF_HOST  # noqa pylint: disable=unused-import
+
+CONF_IMPORT_GROUPS = 'import_groups'
+CONF_IDENTITY = 'identity'
+CONF_KEY = 'key'
+CONF_GATEWAY_ID = 'gateway_id'
diff --git a/homeassistant/components/tradfri/strings.json b/homeassistant/components/tradfri/strings.json
new file mode 100644
index 00000000000..38c58486a6a
--- /dev/null
+++ b/homeassistant/components/tradfri/strings.json
@@ -0,0 +1,23 @@
+{
+  "config": {
+    "title": "IKEA TRÅDFRI",
+    "step": {
+      "auth": {
+        "title": "Enter security code",
+        "description": "You can find the security code on the back of your gateway.",
+        "data": {
+          "host": "Host",
+          "security_code": "Security Code"
+        }
+      }
+    },
+    "error": {
+      "invalid_key": "Failed to register with provided key. If this keeps happening, try restarting the gateway.",
+      "cannot_connect": "Unable to connect to the gateway.",
+      "timeout": "Timeout validating the code."
+    },
+    "abort": {
+      "already_configured": "Bridge is already configured"
+    }
+  }
+}
diff --git a/homeassistant/config_entries.py b/homeassistant/config_entries.py
index e4c4b5c0327..7763594e0e1 100644
--- a/homeassistant/config_entries.py
+++ b/homeassistant/config_entries.py
@@ -146,6 +146,7 @@ FLOWS = [
     'nest',
     'openuv',
     'sonos',
+    'tradfri',
     'zone',
 ]
 
diff --git a/tests/components/light/test_tradfri.py b/tests/components/light/test_tradfri.py
index 12c596f3f09..337031cf92c 100644
--- a/tests/components/light/test_tradfri.py
+++ b/tests/components/light/test_tradfri.py
@@ -5,10 +5,10 @@ from unittest.mock import Mock, MagicMock, patch, PropertyMock
 
 import pytest
 from pytradfri.device import Device, LightControl, Light
-from pytradfri import RequestError
 
 from homeassistant.components import tradfri
-from homeassistant.setup import async_setup_component
+
+from tests.common import MockConfigEntry
 
 
 DEFAULT_TEST_FEATURES = {'can_set_dimmer': False,
@@ -199,7 +199,7 @@ def mock_gateway():
 @pytest.fixture
 def mock_api(mock_gateway):
     """Mock api."""
-    async def api(self, command):
+    async def api(command):
         """Mock api function."""
         # Store the data for "real" command objects.
         if(hasattr(command, '_data') and not isinstance(command, Mock)):
@@ -213,63 +213,20 @@ async def generate_psk(self, code):
     return "mock"
 
 
-async def setup_gateway(hass, mock_gateway, mock_api,
-                        generate_psk=generate_psk,
-                        known_hosts=None):
+async def setup_gateway(hass, mock_gateway, mock_api):
     """Load the Tradfri platform with a mock gateway."""
-    def request_config(_, callback, description, submit_caption, fields):
-        """Mock request_config."""
-        hass.async_add_job(callback, {'security_code': 'mock'})
-
-    if known_hosts is None:
-        known_hosts = {}
-
-    with patch('pytradfri.api.aiocoap_api.APIFactory.generate_psk',
-               generate_psk), \
-            patch('pytradfri.api.aiocoap_api.APIFactory.request', mock_api), \
-            patch('pytradfri.Gateway', return_value=mock_gateway), \
-            patch.object(tradfri, 'load_json', return_value=known_hosts), \
-            patch.object(tradfri, 'save_json'), \
-            patch.object(hass.components.configurator, 'request_config',
-                         request_config):
-
-        await async_setup_component(hass, tradfri.DOMAIN,
-                                    {
-                                        tradfri.DOMAIN: {
-                                            'host': 'mock-host',
-                                            'allow_tradfri_groups': True
-                                        }
-                                    })
-        await hass.async_block_till_done()
-
-
-async def test_setup_gateway(hass, mock_gateway, mock_api):
-    """Test that the gateway can be setup without errors."""
-    await setup_gateway(hass, mock_gateway, mock_api)
-
-
-async def test_setup_gateway_known_host(hass, mock_gateway, mock_api):
-    """Test gateway setup with a known host."""
-    await setup_gateway(hass, mock_gateway, mock_api,
-                        known_hosts={
-                            'mock-host': {
-                                'identity': 'mock',
-                                'key': 'mock-key'
-                                }
-                            })
-
-
-async def test_incorrect_security_code(hass, mock_gateway, mock_api):
-    """Test that an error is shown if the security code is incorrect."""
-    async def psk_error(self, code):
-        """Raise RequestError when called."""
-        raise RequestError
-
-    with patch.object(hass.components.configurator, 'async_notify_errors') \
-            as notify_error:
-        await setup_gateway(hass, mock_gateway, mock_api,
-                            generate_psk=psk_error)
-        assert len(notify_error.mock_calls) > 0
+    entry = MockConfigEntry(domain=tradfri.DOMAIN, data={
+        'host': 'mock-host',
+        'identity': 'mock-identity',
+        'key': 'mock-key',
+        'import_groups': True,
+        'gateway_id': 'mock-gateway-id',
+    })
+    hass.data[tradfri.KEY_GATEWAY] = {entry.entry_id: mock_gateway}
+    hass.data[tradfri.KEY_API] = {entry.entry_id: mock_api}
+    await hass.config_entries.async_forward_entry_setup(
+        entry, 'light'
+    )
 
 
 def mock_light(test_features={}, test_state={}, n=0):
diff --git a/tests/components/tradfri/__init__.py b/tests/components/tradfri/__init__.py
new file mode 100644
index 00000000000..4d1b505abc9
--- /dev/null
+++ b/tests/components/tradfri/__init__.py
@@ -0,0 +1 @@
+"""Tests for the tradfri component."""
diff --git a/tests/components/tradfri/test_config_flow.py b/tests/components/tradfri/test_config_flow.py
new file mode 100644
index 00000000000..4650fb5d9bc
--- /dev/null
+++ b/tests/components/tradfri/test_config_flow.py
@@ -0,0 +1,156 @@
+"""Test the Tradfri config flow."""
+from unittest.mock import patch
+
+import pytest
+
+from homeassistant import data_entry_flow
+from homeassistant.components.tradfri import config_flow
+
+from tests.common import mock_coro
+
+
+@pytest.fixture
+def mock_auth():
+    """Mock authenticate."""
+    with patch('homeassistant.components.tradfri.config_flow.'
+               'authenticate') as mock_auth:
+        yield mock_auth
+
+
+@pytest.fixture
+def mock_gateway_info():
+    """Mock get_gateway_info."""
+    with patch('homeassistant.components.tradfri.config_flow.'
+               'get_gateway_info') as mock_gateway:
+        yield mock_gateway
+
+
+@pytest.fixture
+def mock_entry_setup():
+    """Mock entry setup."""
+    with patch('homeassistant.components.tradfri.'
+               'async_setup_entry') as mock_setup:
+        mock_setup.return_value = mock_coro(True)
+        yield mock_setup
+
+
+async def test_user_connection_successful(hass, mock_auth, mock_entry_setup):
+    """Test a successful connection."""
+    mock_auth.side_effect = lambda hass, host, code: mock_coro({
+        'host': host,
+        'gateway_id': 'bla'
+    })
+
+    flow = await hass.config_entries.flow.async_init(
+        'tradfri', context={'source': 'user'})
+
+    result = await hass.config_entries.flow.async_configure(flow['flow_id'], {
+        'host': '123.123.123.123',
+        'security_code': 'abcd',
+    })
+
+    assert len(mock_entry_setup.mock_calls) == 1
+
+    assert result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result['result'].data == {
+        'host': '123.123.123.123',
+        'gateway_id': 'bla',
+        'import_groups': False
+    }
+
+
+async def test_user_connection_timeout(hass, mock_auth, mock_entry_setup):
+    """Test a connection timeout."""
+    mock_auth.side_effect = config_flow.AuthError('timeout')
+
+    flow = await hass.config_entries.flow.async_init(
+        'tradfri', context={'source': 'user'})
+
+    result = await hass.config_entries.flow.async_configure(flow['flow_id'], {
+        'host': '127.0.0.1',
+        'security_code': 'abcd',
+    })
+
+    assert len(mock_entry_setup.mock_calls) == 0
+
+    assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
+    assert result['errors'] == {
+        'base': 'timeout'
+    }
+
+
+async def test_user_connection_bad_key(hass, mock_auth, mock_entry_setup):
+    """Test a connection with bad key."""
+    mock_auth.side_effect = config_flow.AuthError('invalid_security_code')
+
+    flow = await hass.config_entries.flow.async_init(
+        'tradfri', context={'source': 'user'})
+
+    result = await hass.config_entries.flow.async_configure(flow['flow_id'], {
+        'host': '127.0.0.1',
+        'security_code': 'abcd',
+    })
+
+    assert len(mock_entry_setup.mock_calls) == 0
+
+    assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
+    assert result['errors'] == {
+        'security_code': 'invalid_security_code'
+    }
+
+
+async def test_discovery_connection(hass, mock_auth, mock_entry_setup):
+    """Test a connection via discovery."""
+    mock_auth.side_effect = lambda hass, host, code: mock_coro({
+        'host': host,
+        'gateway_id': 'bla'
+    })
+
+    flow = await hass.config_entries.flow.async_init(
+        'tradfri', context={'source': 'discovery'}, data={
+            'host': '123.123.123.123'
+        })
+
+    result = await hass.config_entries.flow.async_configure(flow['flow_id'], {
+        'security_code': 'abcd',
+    })
+
+    assert len(mock_entry_setup.mock_calls) == 1
+
+    assert result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result['result'].data == {
+        'host': '123.123.123.123',
+        'gateway_id': 'bla',
+        'import_groups': False
+    }
+
+
+async def test_import_connection(hass, mock_gateway_info, mock_entry_setup):
+    """Test a connection via import."""
+    mock_gateway_info.side_effect = \
+        lambda hass, host, identity, key: mock_coro({
+            'host': host,
+            'identity': identity,
+            'key': key,
+            'gateway_id': 'mock-gateway'
+        })
+
+    result = await hass.config_entries.flow.async_init(
+        'tradfri', context={'source': 'import'}, data={
+            'host': '123.123.123.123',
+            'identity': 'mock-iden',
+            'key': 'mock-key',
+            'import_groups': True
+        })
+
+    assert result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result['result'].data == {
+        'host': '123.123.123.123',
+        'gateway_id': 'mock-gateway',
+        'identity': 'mock-iden',
+        'key': 'mock-key',
+        'import_groups': True
+    }
+
+    assert len(mock_gateway_info.mock_calls) == 1
+    assert len(mock_entry_setup.mock_calls) == 1

From 6e4a6cc06979512a7aaf79caf4b8e3cc97764155 Mon Sep 17 00:00:00 2001
From: Andreas Oberritter <obi@saftware.de>
Date: Wed, 19 Sep 2018 22:01:54 +0200
Subject: [PATCH 197/357] SnmpSensor: Fix async_update (#16679) (#16716)

Bugfix provided by awarecan.
---
 homeassistant/components/sensor/snmp.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/components/sensor/snmp.py b/homeassistant/components/sensor/snmp.py
index d66a24524fb..718e4f6fb0d 100644
--- a/homeassistant/components/sensor/snmp.py
+++ b/homeassistant/components/sensor/snmp.py
@@ -182,7 +182,7 @@ class SnmpSensor(Entity):
         if value is None:
             value = STATE_UNKNOWN
         elif self._value_template is not None:
-            value = self._value_template.render_with_possible_json_value(
+            value = self._value_template.async_render_with_possible_json_value(
                 value, STATE_UNKNOWN)
 
         self._state = value

From 60dfd680834ef3f384f27756d26cdf625ef37413 Mon Sep 17 00:00:00 2001
From: geekofweek <aaron@suermann.org>
Date: Wed, 19 Sep 2018 16:03:47 -0400
Subject: [PATCH 198/357] MyQ Open State Fix (#16681)

* MyQ Open State Fix

Fixes issues with MyQ reporting an open state

* Update myq.py

* MyQ STATE_OPEN Fix

remove un-needed code
---
 homeassistant/components/cover/myq.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/cover/myq.py b/homeassistant/components/cover/myq.py
index 413794505db..78b6f891f11 100644
--- a/homeassistant/components/cover/myq.py
+++ b/homeassistant/components/cover/myq.py
@@ -11,8 +11,8 @@ import voluptuous as vol
 from homeassistant.components.cover import (
     CoverDevice, SUPPORT_CLOSE, SUPPORT_OPEN)
 from homeassistant.const import (
-    CONF_PASSWORD, CONF_TYPE, CONF_USERNAME, STATE_CLOSED, STATE_CLOSING,
-    STATE_OPENING)
+    CONF_PASSWORD, CONF_TYPE, CONF_USERNAME, STATE_CLOSED, STATE_OPEN,
+    STATE_CLOSING, STATE_OPENING)
 import homeassistant.helpers.config_validation as cv
 
 REQUIREMENTS = ['pymyq==0.0.15']
@@ -23,6 +23,7 @@ DEFAULT_NAME = 'myq'
 
 MYQ_TO_HASS = {
     'closed': STATE_CLOSED,
+    'open': STATE_OPEN,
     'closing': STATE_CLOSING,
     'opening': STATE_OPENING
 }

From da882672bd12c65de6d9a4bf3fb1b3a65f7d358e Mon Sep 17 00:00:00 2001
From: Charles Garwood <cgarwood@newdealmultimedia.com>
Date: Wed, 19 Sep 2018 18:52:10 -0400
Subject: [PATCH 199/357] Save disabled_by in entity registry (#16699)

* Save disabled_by in entity registry

* Add trailing comma
---
 homeassistant/helpers/entity_registry.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/homeassistant/helpers/entity_registry.py b/homeassistant/helpers/entity_registry.py
index 01c8419dc04..4a5daa182fa 100644
--- a/homeassistant/helpers/entity_registry.py
+++ b/homeassistant/helpers/entity_registry.py
@@ -240,6 +240,7 @@ class EntityRegistry:
                 'unique_id': entry.unique_id,
                 'platform': entry.platform,
                 'name': entry.name,
+                'disabled_by': entry.disabled_by,
             } for entry in self.entities.values()
         ]
 

From 258beb9cd3a8a30157fecf43482102bea6c03482 Mon Sep 17 00:00:00 2001
From: kunago <miris@kunago.com>
Date: Thu, 20 Sep 2018 07:52:06 +0200
Subject: [PATCH 200/357] Upgrading librouteros version (#16718)

---
 homeassistant/components/device_tracker/mikrotik.py | 2 +-
 requirements_all.txt                                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/device_tracker/mikrotik.py b/homeassistant/components/device_tracker/mikrotik.py
index dfc66a412c3..320468159e0 100644
--- a/homeassistant/components/device_tracker/mikrotik.py
+++ b/homeassistant/components/device_tracker/mikrotik.py
@@ -14,7 +14,7 @@ from homeassistant.components.device_tracker import (
 from homeassistant.const import (
     CONF_HOST, CONF_PASSWORD, CONF_USERNAME, CONF_PORT)
 
-REQUIREMENTS = ['librouteros==2.1.0']
+REQUIREMENTS = ['librouteros==2.1.1']
 
 MTK_DEFAULT_API_PORT = '8728'
 
diff --git a/requirements_all.txt b/requirements_all.txt
index ca477091dc5..e77995681e5 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -532,7 +532,7 @@ libpurecoollink==0.4.2
 libpyfoscam==1.0
 
 # homeassistant.components.device_tracker.mikrotik
-librouteros==2.1.0
+librouteros==2.1.1
 
 # homeassistant.components.media_player.soundtouch
 libsoundtouch==0.7.2

From 27eede724cc7cfe4dd9eab4efd59ce53b81e3a85 Mon Sep 17 00:00:00 2001
From: Nikolay Kasyanov <nikolaykasyanov@users.noreply.github.com>
Date: Thu, 20 Sep 2018 08:15:17 +0200
Subject: [PATCH 201/357] Add unique_id to mqtt_json light (#16721)

Applies changes from #16303 to mqtt_json component.
Fixes #16600.
---
 homeassistant/components/light/mqtt_json.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/light/mqtt_json.py b/homeassistant/components/light/mqtt_json.py
index 239c924ed2b..ed4d350d96d 100644
--- a/homeassistant/components/light/mqtt_json.py
+++ b/homeassistant/components/light/mqtt_json.py
@@ -53,6 +53,7 @@ CONF_EFFECT_LIST = 'effect_list'
 CONF_FLASH_TIME_LONG = 'flash_time_long'
 CONF_FLASH_TIME_SHORT = 'flash_time_short'
 CONF_HS = 'hs'
+CONF_UNIQUE_ID = 'unique_id'
 
 # Stealing some of these from the base MQTT configs.
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
@@ -67,6 +68,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_FLASH_TIME_LONG, default=DEFAULT_FLASH_TIME_LONG):
         cv.positive_int,
     vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_UNIQUE_ID): cv.string,
     vol.Optional(CONF_OPTIMISTIC, default=DEFAULT_OPTIMISTIC): cv.boolean,
     vol.Optional(CONF_QOS, default=mqtt.DEFAULT_QOS):
         vol.All(vol.Coerce(int), vol.In([0, 1, 2])),
@@ -87,6 +89,7 @@ async def async_setup_platform(hass: HomeAssistantType, config: ConfigType,
         config = PLATFORM_SCHEMA(discovery_info)
     async_add_entities([MqttJson(
         config.get(CONF_NAME),
+        config.get(CONF_UNIQUE_ID),
         config.get(CONF_EFFECT_LIST),
         {
             key: config.get(key) for key in (
@@ -120,14 +123,15 @@ async def async_setup_platform(hass: HomeAssistantType, config: ConfigType,
 class MqttJson(MqttAvailability, Light):
     """Representation of a MQTT JSON light."""
 
-    def __init__(self, name, effect_list, topic, qos, retain, optimistic,
-                 brightness, color_temp, effect, rgb, white_value, xy, hs,
-                 flash_times, availability_topic, payload_available,
+    def __init__(self, name, unique_id, effect_list, topic, qos, retain,
+                 optimistic, brightness, color_temp, effect, rgb, white_value,
+                 xy, hs, flash_times, availability_topic, payload_available,
                  payload_not_available, brightness_scale):
         """Initialize MQTT JSON light."""
         super().__init__(availability_topic, qos, payload_available,
                          payload_not_available)
         self._name = name
+        self._unique_id = unique_id
         self._effect_list = effect_list
         self._topic = topic
         self._qos = qos
@@ -316,6 +320,11 @@ class MqttJson(MqttAvailability, Light):
         """Return the name of the device if any."""
         return self._name
 
+    @property
+    def unique_id(self):
+        """Return a unique ID."""
+        return self._unique_id
+
     @property
     def is_on(self):
         """Return true if device is on."""

From fcb84d951e8022ace87bb19be259f401c9920ddc Mon Sep 17 00:00:00 2001
From: Vikram Gorla <vikram.gorla@gmail.com>
Date: Thu, 20 Sep 2018 08:45:16 +0200
Subject: [PATCH 202/357] On-demand update of swiss public transport sensor 
 (#16723)

* Sensor values to be updated only when required (only after the train has crossed).
Looking at the documentation on https://transport.opendata.ch/docs.html, delay information is available only on stationboard, so no need to query often if there is no "real"time info.

* Bumping up version of python_opendata_transport to 0.1.4 in order to catch client errors like throttling rejection (HTTP 429)

* pleasing the hound

* bumping python_opendata_transport to 0.1.4
---
 .../components/sensor/swiss_public_transport.py        | 10 ++++++----
 requirements_all.txt                                   |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/homeassistant/components/sensor/swiss_public_transport.py b/homeassistant/components/sensor/swiss_public_transport.py
index 6f44350c5cf..6b34930075a 100644
--- a/homeassistant/components/sensor/swiss_public_transport.py
+++ b/homeassistant/components/sensor/swiss_public_transport.py
@@ -16,7 +16,7 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 import homeassistant.util.dt as dt_util
 
-REQUIREMENTS = ['python_opendata_transport==0.1.3']
+REQUIREMENTS = ['python_opendata_transport==0.1.4']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -80,6 +80,7 @@ class SwissPublicTransportSensor(Entity):
         self._name = name
         self._from = start
         self._to = destination
+        self._remaining_time = ""
 
     @property
     def name(self):
@@ -98,7 +99,7 @@ class SwissPublicTransportSensor(Entity):
         if self._opendata is None:
             return
 
-        remaining_time = dt_util.parse_datetime(
+        self._remaining_time = dt_util.parse_datetime(
             self._opendata.connections[0]['departure']) -\
             dt_util.as_local(dt_util.utcnow())
 
@@ -111,7 +112,7 @@ class SwissPublicTransportSensor(Entity):
             ATTR_DEPARTURE_TIME2: self._opendata.connections[2]['departure'],
             ATTR_START: self._opendata.from_name,
             ATTR_TARGET: self._opendata.to_name,
-            ATTR_REMAINING_TIME: '{}'.format(remaining_time),
+            ATTR_REMAINING_TIME: '{}'.format(self._remaining_time),
             ATTR_ATTRIBUTION: CONF_ATTRIBUTION,
         }
         return attr
@@ -126,6 +127,7 @@ class SwissPublicTransportSensor(Entity):
         from opendata_transport.exceptions import OpendataTransportError
 
         try:
-            await self._opendata.async_get_data()
+            if self._remaining_time.total_seconds() < 0:
+                await self._opendata.async_get_data()
         except OpendataTransportError:
             _LOGGER.error("Unable to retrieve data from transport.opendata.ch")
diff --git a/requirements_all.txt b/requirements_all.txt
index e77995681e5..cea393faa6b 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1170,7 +1170,7 @@ python-vlc==1.1.2
 python-wink==1.10.1
 
 # homeassistant.components.sensor.swiss_public_transport
-python_opendata_transport==0.1.3
+python_opendata_transport==0.1.4
 
 # homeassistant.components.zwave
 python_openzwave==0.4.9

From dfe38b4d5afd258f2e980737ed3fe495c168408e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 20 Sep 2018 09:37:44 +0200
Subject: [PATCH 203/357] Upgrade youtube_dl to 2018.09.18 (#16729)

---
 homeassistant/components/media_extractor.py | 2 +-
 requirements_all.txt                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/media_extractor.py b/homeassistant/components/media_extractor.py
index 0d7d76c4447..a7093579805 100644
--- a/homeassistant/components/media_extractor.py
+++ b/homeassistant/components/media_extractor.py
@@ -14,7 +14,7 @@ from homeassistant.components.media_player import (
     SERVICE_PLAY_MEDIA)
 from homeassistant.helpers import config_validation as cv
 
-REQUIREMENTS = ['youtube_dl==2018.09.10']
+REQUIREMENTS = ['youtube_dl==2018.09.18']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/requirements_all.txt b/requirements_all.txt
index cea393faa6b..d03cb3ccce0 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1531,7 +1531,7 @@ yeelight==0.4.0
 yeelightsunflower==0.0.10
 
 # homeassistant.components.media_extractor
-youtube_dl==2018.09.10
+youtube_dl==2018.09.18
 
 # homeassistant.components.light.zengge
 zengge==0.2

From d3658c4af9fcabeab8ad876b36653d21982a1d88 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 20 Sep 2018 09:38:35 +0200
Subject: [PATCH 204/357] Upgrade zeroconf to 0.21.2 (#16730)

---
 homeassistant/components/zeroconf.py | 2 +-
 requirements_all.txt                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/zeroconf.py b/homeassistant/components/zeroconf.py
index d63b532ccbb..f3917078f34 100644
--- a/homeassistant/components/zeroconf.py
+++ b/homeassistant/components/zeroconf.py
@@ -12,7 +12,7 @@ import voluptuous as vol
 from homeassistant import util
 from homeassistant.const import (EVENT_HOMEASSISTANT_STOP, __version__)
 
-REQUIREMENTS = ['zeroconf==0.21.1']
+REQUIREMENTS = ['zeroconf==0.21.2']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/requirements_all.txt b/requirements_all.txt
index d03cb3ccce0..563a6497644 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1537,7 +1537,7 @@ youtube_dl==2018.09.18
 zengge==0.2
 
 # homeassistant.components.zeroconf
-zeroconf==0.21.1
+zeroconf==0.21.2
 
 # homeassistant.components.climate.zhong_hong
 zhong_hong_hvac==1.0.9

From aa7635398ac270d2e7fb0c077a25ebd9424d2f43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=B8yer=20Iversen?= <mail@dahoiv.net>
Date: Thu, 20 Sep 2018 10:32:14 +0200
Subject: [PATCH 205/357] Met.no weather platform (#16582)

* Add met.no weather component

* requirements .coveragerx

* use lib

* style

* style

* renam function to _fetch_data

* Only update once per hour

* style
---
 .coveragerc                             |   1 +
 homeassistant/components/weather/met.py | 225 ++++++++++++++++++++++++
 requirements_all.txt                    |   3 +
 3 files changed, 229 insertions(+)
 create mode 100644 homeassistant/components/weather/met.py

diff --git a/.coveragerc b/.coveragerc
index 25765254c4d..2345cc13df2 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -821,6 +821,7 @@ omit =
     homeassistant/components/weather/bom.py
     homeassistant/components/weather/buienradar.py
     homeassistant/components/weather/darksky.py
+    homeassistant/components/weather/met.py
     homeassistant/components/weather/metoffice.py
     homeassistant/components/weather/openweathermap.py
     homeassistant/components/weather/zamg.py
diff --git a/homeassistant/components/weather/met.py b/homeassistant/components/weather/met.py
new file mode 100644
index 00000000000..f888af2e909
--- /dev/null
+++ b/homeassistant/components/weather/met.py
@@ -0,0 +1,225 @@
+"""
+Support for Met.no weather service.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/weather.met/
+"""
+import logging
+from random import randrange
+
+import voluptuous as vol
+
+from homeassistant.components.weather import PLATFORM_SCHEMA, WeatherEntity
+from homeassistant.const import (CONF_ELEVATION, CONF_LATITUDE, CONF_LONGITUDE,
+                                 CONF_NAME, TEMP_CELSIUS)
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.event import (async_track_utc_time_change,
+                                         async_call_later)
+from homeassistant.util import dt as dt_util
+
+REQUIREMENTS = ['pyMetno==0.2.0']
+
+_LOGGER = logging.getLogger(__name__)
+
+CONF_ATTRIBUTION = "Weather forecast from met.no, delivered " \
+                   "by the Norwegian Meteorological Institute."
+DEFAULT_NAME = "Met.no"
+
+# https://api.met.no/weatherapi/weathericon/_/documentation/#___top
+CONDITIONS = {1: 'sunny',
+              2: 'partlycloudy',
+              3: 'partlycloudy',
+              4: 'cloudy',
+              5: 'rainy',
+              6: 'lightning-rainy',
+              7: 'snowy-rainy',
+              8: 'snowy',
+              9: 'rainy',
+              10: 'rainy',
+              11: 'lightning-rainy',
+              12: 'snowy-rainy',
+              13: 'snowy',
+              14: 'snowy',
+              15: 'fog',
+              20: 'lightning-rainy',
+              21: 'lightning-rainy',
+              22: 'lightning-rainy',
+              23: 'lightning-rainy',
+              24: 'lightning-rainy',
+              25: 'lightning-rainy',
+              26: 'lightning-rainy',
+              27: 'lightning-rainy',
+              28: 'lightning-rainy',
+              29: 'lightning-rainy',
+              30: 'lightning-rainy',
+              31: 'lightning-rainy',
+              32: 'lightning-rainy',
+              33: 'lightning-rainy',
+              34: 'lightning-rainy',
+              40: 'rainy',
+              41: 'rainy',
+              42: 'snowy-rainy',
+              43: 'snowy-rainy',
+              44: 'snowy',
+              45: 'snowy',
+              46: 'rainy',
+              47: 'snowy-rainy',
+              48: 'snowy-rainy',
+              49: 'snowy',
+              50: 'snowy',
+              }
+URL = 'https://aa015h6buqvih86i1.api.met.no/weatherapi/locationforecast/1.9/'
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Inclusive(CONF_LATITUDE, 'coordinates',
+                  'Latitude and longitude must exist together'): cv.latitude,
+    vol.Inclusive(CONF_LONGITUDE, 'coordinates',
+                  'Latitude and longitude must exist together'): cv.longitude,
+})
+
+
+async def async_setup_platform(hass, config, async_add_entities,
+                               discovery_info=None):
+    """Set up the Met.no weather platform."""
+    elevation = config.get(CONF_ELEVATION, hass.config.elevation or 0)
+    latitude = config.get(CONF_LATITUDE, hass.config.latitude)
+    longitude = config.get(CONF_LONGITUDE, hass.config.longitude)
+    name = config.get(CONF_NAME)
+
+    if None in (latitude, longitude):
+        _LOGGER.error("Latitude or longitude not set in Home Assistant config")
+        return
+
+    coordinates = {
+        'lat': str(latitude),
+        'lon': str(longitude),
+        'msl': str(elevation),
+    }
+
+    async_add_entities([MetWeather(name, coordinates,
+                                   async_get_clientsession(hass))])
+
+
+class MetWeather(WeatherEntity):
+    """Implementation of a Met.no weather condition."""
+
+    def __init__(self, name, coordinates, clientsession):
+        """Initialise the platform with a data instance and site."""
+        import metno
+        self._name = name
+        self._weather_data = metno.MetWeatherData(coordinates,
+                                                  clientsession,
+                                                  URL
+                                                  )
+        self._temperature = None
+        self._condition = None
+        self._pressure = None
+        self._humidity = None
+        self._wind_speed = None
+        self._wind_bearing = None
+
+    async def async_added_to_hass(self):
+        """Start fetching data."""
+        await self._fetch_data()
+        async_track_utc_time_change(self.hass, self._update,
+                                    minute=31, second=0)
+
+    async def _fetch_data(self, *_):
+        """Get the latest data from met.no."""
+        if not await self._weather_data.fetching_data():
+            # Retry in 15 to 20 minutes.
+            minutes = 15 + randrange(6)
+            _LOGGER.error("Retrying in %i minutes", minutes)
+            async_call_later(self.hass, minutes*60, self._fetch_data)
+            return
+
+        async_call_later(self.hass, 60*60, self._fetch_data)
+        await self._update()
+
+    @property
+    def should_poll(self):
+        """No polling needed."""
+        return False
+
+    async def _update(self, *_):
+        """Get the latest data from Met.no."""
+        import metno
+        if self._weather_data is None:
+            return
+
+        now = dt_util.utcnow()
+
+        ordered_entries = []
+        for time_entry in self._weather_data.data['product']['time']:
+            valid_from = dt_util.parse_datetime(time_entry['@from'])
+            valid_to = dt_util.parse_datetime(time_entry['@to'])
+
+            if now >= valid_to:
+                # Has already passed. Never select this.
+                continue
+
+            average_dist = (abs((valid_to - now).total_seconds()) +
+                            abs((valid_from - now).total_seconds()))
+
+            ordered_entries.append((average_dist, time_entry))
+
+        if not ordered_entries:
+            return
+        ordered_entries.sort(key=lambda item: item[0])
+
+        self._temperature = metno.get_forecast('temperature', ordered_entries)
+        self._condition = CONDITIONS.get(metno.get_forecast('symbol',
+                                                            ordered_entries))
+        self._pressure = metno.get_forecast('pressure', ordered_entries)
+        self._humidity = metno.get_forecast('humidity', ordered_entries)
+        self._wind_speed = metno.get_forecast('windSpeed', ordered_entries)
+        self._wind_bearing = metno.get_forecast('windDirection',
+                                                ordered_entries)
+        self.async_schedule_update_ha_state()
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return self._name
+
+    @property
+    def condition(self):
+        """Return the current condition."""
+        return self._condition
+
+    @property
+    def temperature(self):
+        """Return the temperature."""
+        return self._temperature
+
+    @property
+    def temperature_unit(self):
+        """Return the unit of measurement."""
+        return TEMP_CELSIUS
+
+    @property
+    def pressure(self):
+        """Return the pressure."""
+        return self._pressure
+
+    @property
+    def humidity(self):
+        """Return the humidity."""
+        return self._humidity
+
+    @property
+    def wind_speed(self):
+        """Return the wind speed."""
+        return self._wind_speed
+
+    @property
+    def wind_bearing(self):
+        """Return the wind direction."""
+        return self._wind_bearing
+
+    @property
+    def attribution(self):
+        """Return the attribution."""
+        return CONF_ATTRIBUTION
diff --git a/requirements_all.txt b/requirements_all.txt
index 563a6497644..fbab5bf68f2 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -751,6 +751,9 @@ pyCEC==0.4.13
 # homeassistant.components.switch.tplink
 pyHS100==0.3.3
 
+# homeassistant.components.weather.met
+pyMetno==0.2.0
+
 # homeassistant.components.rfxtrx
 pyRFXtrx==0.23
 

From 3a45481b5b11aa22f8dcd121af89e72ea296f602 Mon Sep 17 00:00:00 2001
From: Jason Hu <awarecan@users.noreply.github.com>
Date: Thu, 20 Sep 2018 01:48:45 -0700
Subject: [PATCH 206/357] Handle chromecast CONNECTION_STATUS_DISCONNECTED
 event (#16732)

---
 homeassistant/components/media_player/cast.py | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/homeassistant/components/media_player/cast.py b/homeassistant/components/media_player/cast.py
index beec1e5609c..a05653cd115 100644
--- a/homeassistant/components/media_player/cast.py
+++ b/homeassistant/components/media_player/cast.py
@@ -368,7 +368,8 @@ class CastDevice(MediaPlayerDevice):
 
         if self._chromecast is not None:
             if old_cast_info.host_port == cast_info.host_port:
-                # Nothing connection-related updated
+                _LOGGER.debug("No connection related update: %s",
+                              cast_info.host_port)
                 return
             await self._async_disconnect()
 
@@ -402,7 +403,12 @@ class CastDevice(MediaPlayerDevice):
 
         await self.hass.async_add_job(self._chromecast.disconnect)
 
-        # Invalidate some attributes
+        self._invalidate()
+
+        self.async_schedule_update_ha_state()
+
+    def _invalidate(self):
+        """Invalidate some attributes."""
         self._chromecast = None
         self.cast_status = None
         self.media_status = None
@@ -411,8 +417,6 @@ class CastDevice(MediaPlayerDevice):
             self._status_listener.invalidate()
             self._status_listener = None
 
-        self.async_schedule_update_ha_state()
-
     # ========== Callbacks ==========
     def new_cast_status(self, cast_status):
         """Handle updates of the cast status."""
@@ -427,7 +431,16 @@ class CastDevice(MediaPlayerDevice):
 
     def new_connection_status(self, connection_status):
         """Handle updates of connection status."""
-        from pychromecast.socket_client import CONNECTION_STATUS_CONNECTED
+        from pychromecast.socket_client import CONNECTION_STATUS_CONNECTED, \
+            CONNECTION_STATUS_DISCONNECTED
+
+        _LOGGER.debug("Received cast device connection status: %s",
+                      connection_status.status)
+        if connection_status.status == CONNECTION_STATUS_DISCONNECTED:
+            self._available = False
+            self._invalidate()
+            self.schedule_update_ha_state()
+            return
 
         new_available = connection_status.status == CONNECTION_STATUS_CONNECTED
         if new_available != self._available:

From 35005474f8760da8b4f2a49e66441f8722b34d21 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 20 Sep 2018 11:11:08 +0200
Subject: [PATCH 207/357] Upgrade keyring to 15.1.0 (#16734)

---
 homeassistant/scripts/keyring.py | 2 +-
 requirements_all.txt             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/scripts/keyring.py b/homeassistant/scripts/keyring.py
index e48fa809d19..76a9d9318f2 100644
--- a/homeassistant/scripts/keyring.py
+++ b/homeassistant/scripts/keyring.py
@@ -5,7 +5,7 @@ import os
 
 from homeassistant.util.yaml import _SECRET_NAMESPACE
 
-REQUIREMENTS = ['keyring==15.0.0', 'keyrings.alt==3.1']
+REQUIREMENTS = ['keyring==15.1.0', 'keyrings.alt==3.1']
 
 
 def run(args):
diff --git a/requirements_all.txt b/requirements_all.txt
index fbab5bf68f2..8050cc9a67a 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -507,7 +507,7 @@ jsonrpc-async==0.6
 jsonrpc-websocket==0.6
 
 # homeassistant.scripts.keyring
-keyring==15.0.0
+keyring==15.1.0
 
 # homeassistant.scripts.keyring
 keyrings.alt==3.1

From d1acb0326c1aeb3cdea857435bcb5db5ec67564b Mon Sep 17 00:00:00 2001
From: Jason Hu <awarecan@users.noreply.github.com>
Date: Thu, 20 Sep 2018 02:11:39 -0700
Subject: [PATCH 208/357] Upgrade netdisco to 2.1.0 (#16735)

---
 homeassistant/components/discovery.py | 2 +-
 requirements_all.txt                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/discovery.py b/homeassistant/components/discovery.py
index 22d7ae87b8d..91f9dea704b 100644
--- a/homeassistant/components/discovery.py
+++ b/homeassistant/components/discovery.py
@@ -21,7 +21,7 @@ from homeassistant.helpers.event import async_track_point_in_utc_time
 from homeassistant.helpers.discovery import async_load_platform, async_discover
 import homeassistant.util.dt as dt_util
 
-REQUIREMENTS = ['netdisco==2.0.0']
+REQUIREMENTS = ['netdisco==2.1.0']
 
 DOMAIN = 'discovery'
 
diff --git a/requirements_all.txt b/requirements_all.txt
index 8050cc9a67a..e51e94fd85f 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -619,7 +619,7 @@ ndms2_client==0.0.4
 netdata==0.1.2
 
 # homeassistant.components.discovery
-netdisco==2.0.0
+netdisco==2.1.0
 
 # homeassistant.components.sensor.neurio_energy
 neurio==0.3.1

From 93af3c57ff8c213bc1933444bb4cd732ea475d10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=B8yer=20Iversen?= <mail@dahoiv.net>
Date: Thu, 20 Sep 2018 11:31:05 +0200
Subject: [PATCH 209/357] Avoid calling yr update every second for a minute
 ones every hour (#16731)

* Avoid calling yr update every second for a minute one every hour

* style
---
 homeassistant/components/sensor/yr.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/sensor/yr.py b/homeassistant/components/sensor/yr.py
index f081be1a2f1..0cb9c3765ec 100644
--- a/homeassistant/components/sensor/yr.py
+++ b/homeassistant/components/sensor/yr.py
@@ -91,7 +91,8 @@ async def async_setup_platform(hass, config, async_add_entities,
     async_add_entities(dev)
 
     weather = YrData(hass, coordinates, forecast, dev)
-    async_track_utc_time_change(hass, weather.updating_devices, minute=31)
+    async_track_utc_time_change(hass, weather.updating_devices,
+                                minute=31, second=0)
     await weather.fetching_data()
 
 

From 83795676364f2d6f3f1bc9bdc2b0719e74d07d7d Mon Sep 17 00:00:00 2001
From: Andreas Oberritter <obi@saftware.de>
Date: Wed, 19 Sep 2018 22:01:54 +0200
Subject: [PATCH 210/357] SnmpSensor: Fix async_update (#16679) (#16716)

Bugfix provided by awarecan.
---
 homeassistant/components/sensor/snmp.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/components/sensor/snmp.py b/homeassistant/components/sensor/snmp.py
index d66a24524fb..718e4f6fb0d 100644
--- a/homeassistant/components/sensor/snmp.py
+++ b/homeassistant/components/sensor/snmp.py
@@ -182,7 +182,7 @@ class SnmpSensor(Entity):
         if value is None:
             value = STATE_UNKNOWN
         elif self._value_template is not None:
-            value = self._value_template.render_with_possible_json_value(
+            value = self._value_template.async_render_with_possible_json_value(
                 value, STATE_UNKNOWN)
 
         self._state = value

From 7a7a164cb8925216da68012174bcc26da64ed85c Mon Sep 17 00:00:00 2001
From: Jason Hu <awarecan@users.noreply.github.com>
Date: Thu, 20 Sep 2018 01:48:45 -0700
Subject: [PATCH 211/357] Handle chromecast CONNECTION_STATUS_DISCONNECTED
 event (#16732)

---
 homeassistant/components/media_player/cast.py | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/homeassistant/components/media_player/cast.py b/homeassistant/components/media_player/cast.py
index 088aef82373..e14244793cf 100644
--- a/homeassistant/components/media_player/cast.py
+++ b/homeassistant/components/media_player/cast.py
@@ -369,7 +369,8 @@ class CastDevice(MediaPlayerDevice):
 
         if self._chromecast is not None:
             if old_cast_info.host_port == cast_info.host_port:
-                # Nothing connection-related updated
+                _LOGGER.debug("No connection related update: %s",
+                              cast_info.host_port)
                 return
             await self._async_disconnect()
 
@@ -403,7 +404,12 @@ class CastDevice(MediaPlayerDevice):
 
         await self.hass.async_add_job(self._chromecast.disconnect)
 
-        # Invalidate some attributes
+        self._invalidate()
+
+        self.async_schedule_update_ha_state()
+
+    def _invalidate(self):
+        """Invalidate some attributes."""
         self._chromecast = None
         self.cast_status = None
         self.media_status = None
@@ -412,8 +418,6 @@ class CastDevice(MediaPlayerDevice):
             self._status_listener.invalidate()
             self._status_listener = None
 
-        self.async_schedule_update_ha_state()
-
     # ========== Callbacks ==========
     def new_cast_status(self, cast_status):
         """Handle updates of the cast status."""
@@ -428,7 +432,16 @@ class CastDevice(MediaPlayerDevice):
 
     def new_connection_status(self, connection_status):
         """Handle updates of connection status."""
-        from pychromecast.socket_client import CONNECTION_STATUS_CONNECTED
+        from pychromecast.socket_client import CONNECTION_STATUS_CONNECTED, \
+            CONNECTION_STATUS_DISCONNECTED
+
+        _LOGGER.debug("Received cast device connection status: %s",
+                      connection_status.status)
+        if connection_status.status == CONNECTION_STATUS_DISCONNECTED:
+            self._available = False
+            self._invalidate()
+            self.schedule_update_ha_state()
+            return
 
         new_available = connection_status.status == CONNECTION_STATUS_CONNECTED
         if new_available != self._available:

From 9bbd61cbe4ca9a56b3b7c751ec7f1d00d3551d65 Mon Sep 17 00:00:00 2001
From: Jason Hu <awarecan@users.noreply.github.com>
Date: Thu, 20 Sep 2018 02:11:39 -0700
Subject: [PATCH 212/357] Upgrade netdisco to 2.1.0 (#16735)

---
 homeassistant/components/discovery.py | 2 +-
 requirements_all.txt                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/discovery.py b/homeassistant/components/discovery.py
index 41cf3791256..7784f3771de 100644
--- a/homeassistant/components/discovery.py
+++ b/homeassistant/components/discovery.py
@@ -21,7 +21,7 @@ from homeassistant.helpers.event import async_track_point_in_utc_time
 from homeassistant.helpers.discovery import async_load_platform, async_discover
 import homeassistant.util.dt as dt_util
 
-REQUIREMENTS = ['netdisco==2.0.0']
+REQUIREMENTS = ['netdisco==2.1.0']
 
 DOMAIN = 'discovery'
 
diff --git a/requirements_all.txt b/requirements_all.txt
index de30bc379d9..1297d421b67 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -611,7 +611,7 @@ ndms2_client==0.0.4
 netdata==0.1.2
 
 # homeassistant.components.discovery
-netdisco==2.0.0
+netdisco==2.1.0
 
 # homeassistant.components.sensor.neurio_energy
 neurio==0.3.1

From c7d5f7698e1191f68d4ca4e6bfd2b2536feecb06 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Thu, 20 Sep 2018 11:32:26 +0200
Subject: [PATCH 213/357] Bumped version to 0.78.1

---
 homeassistant/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/const.py b/homeassistant/const.py
index 546f47a62b3..4719e934109 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -2,7 +2,7 @@
 """Constants used by Home Assistant components."""
 MAJOR_VERSION = 0
 MINOR_VERSION = 78
-PATCH_VERSION = '0'
+PATCH_VERSION = '1'
 __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
 __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
 REQUIRED_PYTHON_VER = (3, 5, 3)

From 39ea9a8c90ee2a9a6311d2adc21c5e71eb8c392d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 20 Sep 2018 11:34:37 +0200
Subject: [PATCH 214/357] Upgrade shodan to 1.10.2 (#16736)

---
 homeassistant/components/sensor/shodan.py | 2 +-
 requirements_all.txt                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/sensor/shodan.py b/homeassistant/components/sensor/shodan.py
index 6f228df3a93..bd74bcaeb2c 100644
--- a/homeassistant/components/sensor/shodan.py
+++ b/homeassistant/components/sensor/shodan.py
@@ -14,7 +14,7 @@ from homeassistant.components.sensor import PLATFORM_SCHEMA
 from homeassistant.const import ATTR_ATTRIBUTION, CONF_API_KEY, CONF_NAME
 from homeassistant.helpers.entity import Entity
 
-REQUIREMENTS = ['shodan==1.10.1']
+REQUIREMENTS = ['shodan==1.10.2']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/requirements_all.txt b/requirements_all.txt
index e51e94fd85f..93097e3abc0 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1309,7 +1309,7 @@ sense_energy==0.4.2
 sharp_aquos_rc==0.3.2
 
 # homeassistant.components.sensor.shodan
-shodan==1.10.1
+shodan==1.10.2
 
 # homeassistant.components.notify.simplepush
 simplepush==1.1.4

From fc6cc22b6ddc1a075ab0ba7f99fc0879606f6d11 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Thu, 20 Sep 2018 10:54:37 +0200
Subject: [PATCH 215/357] Bump frontend to 20180920.0

---
 homeassistant/components/frontend/__init__.py | 2 +-
 requirements_all.txt                          | 2 +-
 requirements_test_all.txt                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/frontend/__init__.py b/homeassistant/components/frontend/__init__.py
index 861c4a95d69..73282830bbc 100644
--- a/homeassistant/components/frontend/__init__.py
+++ b/homeassistant/components/frontend/__init__.py
@@ -26,7 +26,7 @@ from homeassistant.helpers.translation import async_get_translations
 from homeassistant.loader import bind_hass
 from homeassistant.util.yaml import load_yaml
 
-REQUIREMENTS = ['home-assistant-frontend==20180919.0']
+REQUIREMENTS = ['home-assistant-frontend==20180920.0']
 
 DOMAIN = 'frontend'
 DEPENDENCIES = ['api', 'websocket_api', 'http', 'system_log',
diff --git a/requirements_all.txt b/requirements_all.txt
index 93097e3abc0..21104fab416 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -454,7 +454,7 @@ hole==0.3.0
 holidays==0.9.7
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180919.0
+home-assistant-frontend==20180920.0
 
 # homeassistant.components.homekit_controller
 # homekit==0.10
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index a2d556511b9..83566a0bc30 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -87,7 +87,7 @@ hdate==0.6.3
 holidays==0.9.7
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180919.0
+home-assistant-frontend==20180920.0
 
 # homeassistant.components.homematicip_cloud
 homematicip==0.9.8

From e58836f99f60a7d5e91c3a27481303e8c4985cbc Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Thu, 20 Sep 2018 14:53:13 +0200
Subject: [PATCH 216/357] Add subscription info endpoint (#16727)

* Add subscription info endpoint

* Lint

* Lint

* Make decorator

* Lint
---
 homeassistant/components/cloud/__init__.py |  18 ++-
 homeassistant/components/cloud/const.py    |   2 +
 homeassistant/components/cloud/http_api.py |  86 ++++++++---
 homeassistant/components/websocket_api.py  |  58 +++++---
 tests/components/cloud/test_http_api.py    | 159 +++++++++++++++------
 tests/components/cloud/test_init.py        |   2 +
 6 files changed, 237 insertions(+), 88 deletions(-)

diff --git a/homeassistant/components/cloud/__init__.py b/homeassistant/components/cloud/__init__.py
index 8c1a9751c19..74625f7363b 100644
--- a/homeassistant/components/cloud/__init__.py
+++ b/homeassistant/components/cloud/__init__.py
@@ -23,7 +23,7 @@ from homeassistant.components.alexa import smart_home as alexa_sh
 from homeassistant.components.google_assistant import helpers as ga_h
 from homeassistant.components.google_assistant import const as ga_c
 
-from . import http_api, iot
+from . import http_api, iot, auth_api
 from .const import CONFIG_DIR, DOMAIN, SERVERS
 
 REQUIREMENTS = ['warrant==0.6.1']
@@ -39,6 +39,7 @@ CONF_GOOGLE_ACTIONS = 'google_actions'
 CONF_RELAYER = 'relayer'
 CONF_USER_POOL_ID = 'user_pool_id'
 CONF_GOOGLE_ACTIONS_SYNC_URL = 'google_actions_sync_url'
+CONF_SUBSCRIPTION_INFO_URL = 'subscription_info_url'
 
 DEFAULT_MODE = 'production'
 DEPENDENCIES = ['http']
@@ -79,6 +80,7 @@ CONFIG_SCHEMA = vol.Schema({
         vol.Optional(CONF_REGION): str,
         vol.Optional(CONF_RELAYER): str,
         vol.Optional(CONF_GOOGLE_ACTIONS_SYNC_URL): str,
+        vol.Optional(CONF_SUBSCRIPTION_INFO_URL): str,
         vol.Optional(CONF_ALEXA): ALEXA_SCHEMA,
         vol.Optional(CONF_GOOGLE_ACTIONS): GACTIONS_SCHEMA,
     }),
@@ -114,7 +116,8 @@ class Cloud:
 
     def __init__(self, hass, mode, alexa, google_actions,
                  cognito_client_id=None, user_pool_id=None, region=None,
-                 relayer=None, google_actions_sync_url=None):
+                 relayer=None, google_actions_sync_url=None,
+                 subscription_info_url=None):
         """Create an instance of Cloud."""
         self.hass = hass
         self.mode = mode
@@ -133,6 +136,7 @@ class Cloud:
             self.region = region
             self.relayer = relayer
             self.google_actions_sync_url = google_actions_sync_url
+            self.subscription_info_url = subscription_info_url
 
         else:
             info = SERVERS[mode]
@@ -142,6 +146,7 @@ class Cloud:
             self.region = info['region']
             self.relayer = info['relayer']
             self.google_actions_sync_url = info['google_actions_sync_url']
+            self.subscription_info_url = info['subscription_info_url']
 
     @property
     def is_logged_in(self):
@@ -195,6 +200,15 @@ class Cloud:
         """
         return self.hass.config.path(CONFIG_DIR, *parts)
 
+    async def fetch_subscription_info(self):
+        """Fetch subscription info."""
+        await self.hass.async_add_executor_job(auth_api.check_token, self)
+        websession = self.hass.helpers.aiohttp_client.async_get_clientsession()
+        return await websession.get(
+            self.subscription_info_url, headers={
+                'authorization': self.id_token
+            })
+
     @asyncio.coroutine
     def logout(self):
         """Close connection and remove all credentials."""
diff --git a/homeassistant/components/cloud/const.py b/homeassistant/components/cloud/const.py
index 82128206d47..88fb88474a1 100644
--- a/homeassistant/components/cloud/const.py
+++ b/homeassistant/components/cloud/const.py
@@ -11,6 +11,8 @@ SERVERS = {
         'relayer': 'wss://cloud.hass.io:8000/websocket',
         'google_actions_sync_url': ('https://24ab3v80xd.execute-api.us-east-1.'
                                     'amazonaws.com/prod/smart_home_sync'),
+        'subscription_info_url': ('https://stripe-api.nabucasa.com/payments/'
+                                  'subscription_info')
     }
 }
 
diff --git a/homeassistant/components/cloud/http_api.py b/homeassistant/components/cloud/http_api.py
index a4b3b59f333..24617bb1f17 100644
--- a/homeassistant/components/cloud/http_api.py
+++ b/homeassistant/components/cloud/http_api.py
@@ -6,22 +6,44 @@ import logging
 import async_timeout
 import voluptuous as vol
 
+from homeassistant.core import callback
 from homeassistant.components.http import HomeAssistantView
 from homeassistant.components.http.data_validator import (
     RequestDataValidator)
+from homeassistant.components import websocket_api
 
 from . import auth_api
 from .const import DOMAIN, REQUEST_TIMEOUT
+from .iot import STATE_DISCONNECTED
 
 _LOGGER = logging.getLogger(__name__)
 
 
+WS_TYPE_STATUS = 'cloud/status'
+SCHEMA_WS_STATUS = websocket_api.BASE_COMMAND_MESSAGE_SCHEMA.extend({
+    vol.Required('type'): WS_TYPE_STATUS,
+})
+
+
+WS_TYPE_SUBSCRIPTION = 'cloud/subscription'
+SCHEMA_WS_SUBSCRIPTION = websocket_api.BASE_COMMAND_MESSAGE_SCHEMA.extend({
+    vol.Required('type'): WS_TYPE_SUBSCRIPTION,
+})
+
+
 async def async_setup(hass):
     """Initialize the HTTP API."""
+    hass.components.websocket_api.async_register_command(
+        WS_TYPE_STATUS, websocket_cloud_status,
+        SCHEMA_WS_STATUS
+    )
+    hass.components.websocket_api.async_register_command(
+        WS_TYPE_SUBSCRIPTION, websocket_subscription,
+        SCHEMA_WS_SUBSCRIPTION
+    )
     hass.http.register_view(GoogleActionsSyncView)
     hass.http.register_view(CloudLoginView)
     hass.http.register_view(CloudLogoutView)
-    hass.http.register_view(CloudAccountView)
     hass.http.register_view(CloudRegisterView)
     hass.http.register_view(CloudResendConfirmView)
     hass.http.register_view(CloudForgotPasswordView)
@@ -102,9 +124,7 @@ class CloudLoginView(HomeAssistantView):
                                      data['password'])
 
         hass.async_add_job(cloud.iot.connect)
-        # Allow cloud to start connecting.
-        await asyncio.sleep(0, loop=hass.loop)
-        return self.json(_account_data(cloud))
+        return self.json({'success': True})
 
 
 class CloudLogoutView(HomeAssistantView):
@@ -125,23 +145,6 @@ class CloudLogoutView(HomeAssistantView):
         return self.json_message('ok')
 
 
-class CloudAccountView(HomeAssistantView):
-    """View to retrieve account info."""
-
-    url = '/api/cloud/account'
-    name = 'api:cloud:account'
-
-    async def get(self, request):
-        """Get account info."""
-        hass = request.app['hass']
-        cloud = hass.data[DOMAIN]
-
-        if not cloud.is_logged_in:
-            return self.json_message('Not logged in', 400)
-
-        return self.json(_account_data(cloud))
-
-
 class CloudRegisterView(HomeAssistantView):
     """Register on the Home Assistant cloud."""
 
@@ -209,12 +212,51 @@ class CloudForgotPasswordView(HomeAssistantView):
         return self.json_message('ok')
 
 
+@callback
+def websocket_cloud_status(hass, connection, msg):
+    """Handle request for account info.
+
+    Async friendly.
+    """
+    cloud = hass.data[DOMAIN]
+    connection.to_write.put_nowait(
+        websocket_api.result_message(msg['id'], _account_data(cloud)))
+
+
+@websocket_api.async_response
+async def websocket_subscription(hass, connection, msg):
+    """Handle request for account info."""
+    cloud = hass.data[DOMAIN]
+
+    if not cloud.is_logged_in:
+        connection.to_write.put_nowait(websocket_api.error_message(
+            msg['id'], 'not_logged_in',
+            'You need to be logged in to the cloud.'))
+        return
+
+    with async_timeout.timeout(REQUEST_TIMEOUT, loop=hass.loop):
+        response = await cloud.fetch_subscription_info()
+
+    if response.status == 200:
+        connection.send_message_outside(websocket_api.result_message(
+            msg['id'], await response.json()))
+    else:
+        connection.send_message_outside(websocket_api.error_message(
+            msg['id'], 'request_failed', 'Failed to request subscription'))
+
+
 def _account_data(cloud):
     """Generate the auth data JSON response."""
+    if not cloud.is_logged_in:
+        return {
+            'logged_in': False,
+            'cloud': STATE_DISCONNECTED,
+        }
+
     claims = cloud.claims
 
     return {
+        'logged_in': True,
         'email': claims['email'],
-        'sub_exp': claims['custom:sub-exp'],
         'cloud': cloud.iot.state,
     }
diff --git a/homeassistant/components/websocket_api.py b/homeassistant/components/websocket_api.py
index 6f4c4d47fe9..9bd4aac4b6a 100644
--- a/homeassistant/components/websocket_api.py
+++ b/homeassistant/components/websocket_api.py
@@ -480,6 +480,26 @@ class ActiveConnection:
         return wsock
 
 
+def async_response(func):
+    """Decorate an async function to handle WebSocket API messages."""
+    async def handle_msg_response(hass, connection, msg):
+        """Create a response and handle exception."""
+        try:
+            await func(hass, connection, msg)
+        except Exception:  # pylint: disable=broad-except
+            _LOGGER.exception("Unexpected exception")
+            connection.send_message_outside(error_message(
+                msg['id'], 'unknown', 'Unexpected error occurred'))
+
+    @callback
+    @wraps(func)
+    def schedule_handler(hass, connection, msg):
+        """Schedule the handler."""
+        hass.async_create_task(handle_msg_response(hass, connection, msg))
+
+    return schedule_handler
+
+
 @callback
 def handle_subscribe_events(hass, connection, msg):
     """Handle subscribe events command.
@@ -515,24 +535,20 @@ def handle_unsubscribe_events(hass, connection, msg):
             msg['id'], ERR_NOT_FOUND, 'Subscription not found.'))
 
 
-@callback
-def handle_call_service(hass, connection, msg):
+@async_response
+async def handle_call_service(hass, connection, msg):
     """Handle call service command.
 
     Async friendly.
     """
-    async def call_service_helper(msg):
-        """Call a service and fire complete message."""
-        blocking = True
-        if (msg['domain'] == 'homeassistant' and
-                msg['service'] in ['restart', 'stop']):
-            blocking = False
-        await hass.services.async_call(
-            msg['domain'], msg['service'], msg.get('service_data'), blocking,
-            connection.context(msg))
-        connection.send_message_outside(result_message(msg['id']))
-
-    hass.async_add_job(call_service_helper(msg))
+    blocking = True
+    if (msg['domain'] == 'homeassistant' and
+            msg['service'] in ['restart', 'stop']):
+        blocking = False
+    await hass.services.async_call(
+        msg['domain'], msg['service'], msg.get('service_data'), blocking,
+        connection.context(msg))
+    connection.send_message_outside(result_message(msg['id']))
 
 
 @callback
@@ -545,19 +561,15 @@ def handle_get_states(hass, connection, msg):
         msg['id'], hass.states.async_all()))
 
 
-@callback
-def handle_get_services(hass, connection, msg):
+@async_response
+async def handle_get_services(hass, connection, msg):
     """Handle get services command.
 
     Async friendly.
     """
-    async def get_services_helper(msg):
-        """Get available services and fire complete message."""
-        descriptions = await async_get_all_descriptions(hass)
-        connection.send_message_outside(
-            result_message(msg['id'], descriptions))
-
-    hass.async_add_job(get_services_helper(msg))
+    descriptions = await async_get_all_descriptions(hass)
+    connection.send_message_outside(
+        result_message(msg['id'], descriptions))
 
 
 @callback
diff --git a/tests/components/cloud/test_http_api.py b/tests/components/cloud/test_http_api.py
index 55c6290c158..531cd09f011 100644
--- a/tests/components/cloud/test_http_api.py
+++ b/tests/components/cloud/test_http_api.py
@@ -12,25 +12,40 @@ from tests.common import mock_coro
 
 
 GOOGLE_ACTIONS_SYNC_URL = 'https://api-test.hass.io/google_actions_sync'
+SUBSCRIPTION_INFO_URL = 'https://api-test.hass.io/subscription_info'
+
+
+@pytest.fixture()
+def mock_auth():
+    """Mock check token."""
+    with patch('homeassistant.components.cloud.auth_api.check_token'):
+        yield
+
+
+@pytest.fixture(autouse=True)
+def setup_api(hass):
+    """Initialize HTTP API."""
+    with patch('homeassistant.components.cloud.Cloud.async_start',
+               return_value=mock_coro()):
+        assert hass.loop.run_until_complete(async_setup_component(
+            hass, 'cloud', {
+                'cloud': {
+                    'mode': 'development',
+                    'cognito_client_id': 'cognito_client_id',
+                    'user_pool_id': 'user_pool_id',
+                    'region': 'region',
+                    'relayer': 'relayer',
+                    'google_actions_sync_url': GOOGLE_ACTIONS_SYNC_URL,
+                    'subscription_info_url': SUBSCRIPTION_INFO_URL,
+                }
+            }))
+    hass.data['cloud']._decode_claims = \
+        lambda token: jwt.get_unverified_claims(token)
 
 
 @pytest.fixture
 def cloud_client(hass, aiohttp_client):
     """Fixture that can fetch from the cloud client."""
-    with patch('homeassistant.components.cloud.Cloud.async_start',
-               return_value=mock_coro()):
-        hass.loop.run_until_complete(async_setup_component(hass, 'cloud', {
-            'cloud': {
-                'mode': 'development',
-                'cognito_client_id': 'cognito_client_id',
-                'user_pool_id': 'user_pool_id',
-                'region': 'region',
-                'relayer': 'relayer',
-                'google_actions_sync_url': GOOGLE_ACTIONS_SYNC_URL,
-            }
-        }))
-    hass.data['cloud']._decode_claims = \
-        lambda token: jwt.get_unverified_claims(token)
     with patch('homeassistant.components.cloud.Cloud.write_user_info'):
         yield hass.loop.run_until_complete(aiohttp_client(hass.http.app))
 
@@ -57,31 +72,6 @@ async def test_google_actions_sync_fails(mock_cognito, cloud_client,
     assert req.status == 403
 
 
-@asyncio.coroutine
-def test_account_view_no_account(cloud_client):
-    """Test fetching account if no account available."""
-    req = yield from cloud_client.get('/api/cloud/account')
-    assert req.status == 400
-
-
-@asyncio.coroutine
-def test_account_view(hass, cloud_client):
-    """Test fetching account if no account available."""
-    hass.data[DOMAIN].id_token = jwt.encode({
-        'email': 'hello@home-assistant.io',
-        'custom:sub-exp': '2018-01-03'
-    }, 'test')
-    hass.data[DOMAIN].iot.state = iot.STATE_CONNECTED
-    req = yield from cloud_client.get('/api/cloud/account')
-    assert req.status == 200
-    result = yield from req.json()
-    assert result == {
-        'email': 'hello@home-assistant.io',
-        'sub_exp': '2018-01-03',
-        'cloud': iot.STATE_CONNECTED,
-    }
-
-
 @asyncio.coroutine
 def test_login_view(hass, cloud_client, mock_cognito):
     """Test logging in."""
@@ -103,8 +93,7 @@ def test_login_view(hass, cloud_client, mock_cognito):
 
     assert req.status == 200
     result = yield from req.json()
-    assert result['email'] == 'hello@home-assistant.io'
-    assert result['sub_exp'] == '2018-01-03'
+    assert result == {'success': True}
 
     assert len(mock_connect.mock_calls) == 1
 
@@ -330,3 +319,91 @@ def test_resend_confirm_view_unknown_error(mock_cognito, cloud_client):
         'email': 'hello@bla.com',
     })
     assert req.status == 502
+
+
+async def test_websocket_status(hass, hass_ws_client):
+    """Test querying the status."""
+    hass.data[DOMAIN].id_token = jwt.encode({
+        'email': 'hello@home-assistant.io',
+        'custom:sub-exp': '2018-01-03'
+    }, 'test')
+    hass.data[DOMAIN].iot.state = iot.STATE_CONNECTED
+    client = await hass_ws_client(hass)
+    await client.send_json({
+        'id': 5,
+        'type': 'cloud/status'
+    })
+    response = await client.receive_json()
+    assert response['result'] == {
+        'logged_in': True,
+        'email': 'hello@home-assistant.io',
+        'cloud': 'connected',
+    }
+
+
+async def test_websocket_status_not_logged_in(hass, hass_ws_client):
+    """Test querying the status."""
+    client = await hass_ws_client(hass)
+    await client.send_json({
+        'id': 5,
+        'type': 'cloud/status'
+    })
+    response = await client.receive_json()
+    assert response['result'] == {
+        'logged_in': False,
+        'cloud': 'disconnected'
+    }
+
+
+async def test_websocket_subscription(hass, hass_ws_client, aioclient_mock,
+                                      mock_auth):
+    """Test querying the status."""
+    aioclient_mock.get(SUBSCRIPTION_INFO_URL, json={'return': 'value'})
+    hass.data[DOMAIN].id_token = jwt.encode({
+        'email': 'hello@home-assistant.io',
+        'custom:sub-exp': '2018-01-03'
+    }, 'test')
+    client = await hass_ws_client(hass)
+    await client.send_json({
+        'id': 5,
+        'type': 'cloud/subscription'
+    })
+    response = await client.receive_json()
+
+    assert response['result'] == {
+        'return': 'value'
+    }
+
+
+async def test_websocket_subscription_fail(hass, hass_ws_client,
+                                           aioclient_mock, mock_auth):
+    """Test querying the status."""
+    aioclient_mock.get(SUBSCRIPTION_INFO_URL, status=500)
+    hass.data[DOMAIN].id_token = jwt.encode({
+        'email': 'hello@home-assistant.io',
+        'custom:sub-exp': '2018-01-03'
+    }, 'test')
+    client = await hass_ws_client(hass)
+    await client.send_json({
+        'id': 5,
+        'type': 'cloud/subscription'
+    })
+    response = await client.receive_json()
+
+    assert not response['success']
+    assert response['error']['code'] == 'request_failed'
+
+
+async def test_websocket_subscription_not_logged_in(hass, hass_ws_client):
+    """Test querying the status."""
+    client = await hass_ws_client(hass)
+    with patch('homeassistant.components.cloud.Cloud.fetch_subscription_info',
+               return_value=mock_coro({'return': 'value'})):
+        await client.send_json({
+            'id': 5,
+            'type': 'cloud/subscription'
+        })
+        response = await client.receive_json()
+
+    assert not response['success']
+    assert response['error']['code'] == 'not_logged_in'
diff --git a/tests/components/cloud/test_init.py b/tests/components/cloud/test_init.py
index 014cdb1c6c6..9b090a96ca1 100644
--- a/tests/components/cloud/test_init.py
+++ b/tests/components/cloud/test_init.py
@@ -30,6 +30,7 @@ def test_constructor_loads_info_from_constant():
             'region': 'test-region',
             'relayer': 'test-relayer',
             'google_actions_sync_url': 'test-google_actions_sync_url',
+            'subscription_info_url': 'test-subscription-info-url'
         }
     }), patch('homeassistant.components.cloud.Cloud._fetch_jwt_keyset',
               return_value=mock_coro(True)):
@@ -45,6 +46,7 @@ def test_constructor_loads_info_from_constant():
     assert cl.region == 'test-region'
     assert cl.relayer == 'test-relayer'
     assert cl.google_actions_sync_url == 'test-google_actions_sync_url'
+    assert cl.subscription_info_url == 'test-subscription-info-url'
 
 
 @asyncio.coroutine

From c6ccbed8283ecca4a589415e4f30a2eb3563415d Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pascal.vizeli@syshack.ch>
Date: Thu, 20 Sep 2018 15:14:43 +0200
Subject: [PATCH 217/357] Small cleanup for slack (#16743)

---
 homeassistant/components/notify/slack.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/notify/slack.py b/homeassistant/components/notify/slack.py
index d4c5a196a3f..d576cdcc95e 100644
--- a/homeassistant/components/notify/slack.py
+++ b/homeassistant/components/notify/slack.py
@@ -136,9 +136,9 @@ class SlackNotificationService(BaseNotificationService):
                   password=None, auth=None):
         """Load image/document/etc from a local path or URL."""
         try:
-            if url is not None:
+            if url:
                 # Check whether authentication parameters are provided
-                if username is not None and password is not None:
+                if username:
                     # Use digest or basic authentication
                     if ATTR_FILE_AUTH_DIGEST == auth:
                         auth_ = HTTPDigestAuth(username, password)
@@ -151,7 +151,7 @@ class SlackNotificationService(BaseNotificationService):
                     req = requests.get(url, timeout=CONF_TIMEOUT)
                 return req.content
 
-            elif local_path is not None:
+            elif local_path:
                 # Check whether path is whitelisted in configuration.yaml
                 if self.is_allowed_path(local_path):
                     return open(local_path, "rb")

From 3ea8c25e1fc483fc6018e828e990106fc5228096 Mon Sep 17 00:00:00 2001
From: Alexei Chetroi <lexoid@gmail.com>
Date: Thu, 20 Sep 2018 14:23:09 -0400
Subject: [PATCH 218/357] light.zha: Catch exceptions for all commands.
 (#16752)

Catch exceptions for all operations which may fail because of device
reachibility
More verbose debug logging on operations
---
 homeassistant/components/light/zha.py | 59 +++++++++++++++++++--------
 1 file changed, 43 insertions(+), 16 deletions(-)

diff --git a/homeassistant/components/light/zha.py b/homeassistant/components/light/zha.py
index dd675ee674d..56a1e9e5169 100644
--- a/homeassistant/components/light/zha.py
+++ b/homeassistant/components/light/zha.py
@@ -81,40 +81,65 @@ class Light(zha.Entity, light.Light):
 
     async def async_turn_on(self, **kwargs):
         """Turn the entity on."""
+        from zigpy.exceptions import DeliveryError
+
         duration = kwargs.get(light.ATTR_TRANSITION, DEFAULT_DURATION)
         duration = duration * 10  # tenths of s
         if light.ATTR_COLOR_TEMP in kwargs:
             temperature = kwargs[light.ATTR_COLOR_TEMP]
-            await self._endpoint.light_color.move_to_color_temp(
-                temperature, duration)
+            try:
+                res = await self._endpoint.light_color.move_to_color_temp(
+                    temperature, duration)
+                _LOGGER.debug("%s: moved to %i color temp: %s",
+                              self.entity_id, temperature, res)
+            except DeliveryError as ex:
+                _LOGGER.error("%s: Couldn't change color temp: %s",
+                              self.entity_id, ex)
+                return
             self._color_temp = temperature
 
         if light.ATTR_HS_COLOR in kwargs:
             self._hs_color = kwargs[light.ATTR_HS_COLOR]
             xy_color = color_util.color_hs_to_xy(*self._hs_color)
-            await self._endpoint.light_color.move_to_color(
-                int(xy_color[0] * 65535),
-                int(xy_color[1] * 65535),
-                duration,
-            )
+            try:
+                res = await self._endpoint.light_color.move_to_color(
+                    int(xy_color[0] * 65535),
+                    int(xy_color[1] * 65535),
+                    duration,
+                )
+                _LOGGER.debug("%s: moved XY color to (%1.2f, %1.2f): %s",
+                              self.entity_id, xy_color[0], xy_color[1], res)
+            except DeliveryError as ex:
+                _LOGGER.error("%s: Couldn't change color temp: %s",
+                              self.entity_id, ex)
+                return
 
         if self._brightness is not None:
             brightness = kwargs.get(
                 light.ATTR_BRIGHTNESS, self._brightness or 255)
             self._brightness = brightness
             # Move to level with on/off:
-            await self._endpoint.level.move_to_level_with_on_off(
-                brightness,
-                duration
-            )
+            try:
+                res = await self._endpoint.level.move_to_level_with_on_off(
+                    brightness,
+                    duration
+                )
+                _LOGGER.debug("%s: moved to %i level with on/off: %s",
+                              self.entity_id, brightness, res)
+            except DeliveryError as ex:
+                _LOGGER.error("%s: Couldn't change brightness level: %s",
+                              self.entity_id, ex)
+                return
             self._state = 1
             self.async_schedule_update_ha_state()
             return
-        from zigpy.exceptions import DeliveryError
+
         try:
-            await self._endpoint.on_off.on()
+            res = await self._endpoint.on_off.on()
+            _LOGGER.debug("%s was turned on: %s", self.entity_id, res)
         except DeliveryError as ex:
-            _LOGGER.error("Unable to turn the light on: %s", ex)
+            _LOGGER.error("%s: Unable to turn the light on: %s",
+                          self.entity_id, ex)
             return
 
         self._state = 1
@@ -124,9 +149,11 @@ class Light(zha.Entity, light.Light):
         """Turn the entity off."""
         from zigpy.exceptions import DeliveryError
         try:
-            await self._endpoint.on_off.off()
+            res = await self._endpoint.on_off.off()
+            _LOGGER.debug("%s was turned off: %s", self.entity_id, res)
         except DeliveryError as ex:
-            _LOGGER.error("Unable to turn the light off: %s", ex)
+            _LOGGER.error("%s: Unable to turn the light off: %s",
+                          self.entity_id, ex)
             return
 
         self._state = 0

From 03de658d4d6700fb4aafa727390919a4bdbbd1ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zo=C3=A9=20B=C5=91le?= <github@astech.hu>
Date: Thu, 20 Sep 2018 20:24:01 +0200
Subject: [PATCH 219/357] Changed save_on_change to default to False (#16744)

---
 homeassistant/components/light/yeelight.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/components/light/yeelight.py b/homeassistant/components/light/yeelight.py
index a08ebe459b4..b14b1f96e69 100644
--- a/homeassistant/components/light/yeelight.py
+++ b/homeassistant/components/light/yeelight.py
@@ -45,7 +45,7 @@ DEVICE_SCHEMA = vol.Schema({
     vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
     vol.Optional(CONF_TRANSITION, default=DEFAULT_TRANSITION): cv.positive_int,
     vol.Optional(CONF_MODE_MUSIC, default=False): cv.boolean,
-    vol.Optional(CONF_SAVE_ON_CHANGE, default=True): cv.boolean,
+    vol.Optional(CONF_SAVE_ON_CHANGE, default=False): cv.boolean,
 })
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(

From 092c146eaef6054011f26a4cd73420693a9030fa Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Thu, 20 Sep 2018 23:46:51 +0200
Subject: [PATCH 220/357] Add option to disable specific integrations (#16757)

* Add option to disable specific integrations

* Lint
---
 homeassistant/components/alexa/smart_home.py  |  5 ++
 homeassistant/components/cloud/__init__.py    | 47 +++++++++++++--
 homeassistant/components/cloud/http_api.py    | 34 +++++++++++
 homeassistant/components/cloud/iot.py         |  6 ++
 .../components/google_assistant/smart_home.py |  8 +++
 tests/components/cloud/__init__.py            | 31 ++++++++++
 tests/components/cloud/conftest.py            | 11 ++++
 tests/components/cloud/test_http_api.py       | 58 +++++++++++++------
 tests/components/cloud/test_init.py           |  8 +--
 tests/components/cloud/test_iot.py            | 42 +++++++++++++-
 10 files changed, 222 insertions(+), 28 deletions(-)
 create mode 100644 tests/components/cloud/conftest.py

diff --git a/homeassistant/components/alexa/smart_home.py b/homeassistant/components/alexa/smart_home.py
index eab725c4653..176c286ebc3 100644
--- a/homeassistant/components/alexa/smart_home.py
+++ b/homeassistant/components/alexa/smart_home.py
@@ -1529,3 +1529,8 @@ async def async_api_reportstate(hass, config, request, context, entity):
         name='StateReport',
         context={'properties': properties}
     )
+
+
+def turned_off_response(message):
+    """Return a device turned off response."""
+    return api_error(message[API_DIRECTIVE], error_type='BRIDGE_UNREACHABLE')
diff --git a/homeassistant/components/cloud/__init__.py b/homeassistant/components/cloud/__init__.py
index 74625f7363b..33a939bf9d0 100644
--- a/homeassistant/components/cloud/__init__.py
+++ b/homeassistant/components/cloud/__init__.py
@@ -27,8 +27,13 @@ from . import http_api, iot, auth_api
 from .const import CONFIG_DIR, DOMAIN, SERVERS
 
 REQUIREMENTS = ['warrant==0.6.1']
+STORAGE_KEY = DOMAIN
+STORAGE_VERSION = 1
+STORAGE_ENABLE_ALEXA = 'alexa_enabled'
+STORAGE_ENABLE_GOOGLE = 'google_enabled'
 
 _LOGGER = logging.getLogger(__name__)
+_UNDEF = object()
 
 CONF_ALEXA = 'alexa'
 CONF_ALIASES = 'aliases'
@@ -124,11 +129,13 @@ class Cloud:
         self.alexa_config = alexa
         self._google_actions = google_actions
         self._gactions_config = None
+        self._prefs = None
         self.jwt_keyset = None
         self.id_token = None
         self.access_token = None
         self.refresh_token = None
         self.iot = iot.CloudIoT(self)
+        self._store = hass.helpers.storage.Store(STORAGE_VERSION, STORAGE_KEY)
 
         if mode == MODE_DEV:
             self.cognito_client_id = cognito_client_id
@@ -193,6 +200,16 @@ class Cloud:
 
         return self._gactions_config
 
+    @property
+    def alexa_enabled(self):
+        """Return if Alexa is enabled."""
+        return self._prefs[STORAGE_ENABLE_ALEXA]
+
+    @property
+    def google_enabled(self):
+        """Return if Google is enabled."""
+        return self._prefs[STORAGE_ENABLE_GOOGLE]
+
     def path(self, *parts):
         """Get config path inside cloud dir.
 
@@ -231,10 +248,23 @@ class Cloud:
                 'refresh_token': self.refresh_token,
             }, indent=4))
 
-    @asyncio.coroutine
-    def async_start(self, _):
+    async def async_start(self, _):
         """Start the cloud component."""
-        success = yield from self._fetch_jwt_keyset()
+        prefs = await self._store.async_load()
+        if prefs is None:
+            prefs = {}
+        if self.mode not in prefs:
+            # Default to True if already logged in to make this not a
+            # breaking change.
+            enabled = await self.hass.async_add_executor_job(
+                os.path.isfile, self.user_info_path)
+            prefs = {
+                STORAGE_ENABLE_ALEXA: enabled,
+                STORAGE_ENABLE_GOOGLE: enabled,
+            }
+        self._prefs = prefs
+
+        success = await self._fetch_jwt_keyset()
 
         # Fetching keyset can fail if internet is not up yet.
         if not success:
@@ -255,7 +285,7 @@ class Cloud:
             with open(user_info, 'rt') as file:
                 return json.loads(file.read())
 
-        info = yield from self.hass.async_add_job(load_config)
+        info = await self.hass.async_add_job(load_config)
 
         if info is None:
             return
@@ -274,6 +304,15 @@ class Cloud:
 
         self.hass.add_job(self.iot.connect())
 
+    async def update_preferences(self, *, google_enabled=_UNDEF,
+                                 alexa_enabled=_UNDEF):
+        """Update user preferences."""
+        if google_enabled is not _UNDEF:
+            self._prefs[STORAGE_ENABLE_GOOGLE] = google_enabled
+        if alexa_enabled is not _UNDEF:
+            self._prefs[STORAGE_ENABLE_ALEXA] = alexa_enabled
+        await self._store.async_save(self._prefs)
+
     @asyncio.coroutine
     def _fetch_jwt_keyset(self):
         """Fetch the JWT keyset for the Cognito instance."""
diff --git a/homeassistant/components/cloud/http_api.py b/homeassistant/components/cloud/http_api.py
index 24617bb1f17..c81ec38bace 100644
--- a/homeassistant/components/cloud/http_api.py
+++ b/homeassistant/components/cloud/http_api.py
@@ -25,6 +25,14 @@ SCHEMA_WS_STATUS = websocket_api.BASE_COMMAND_MESSAGE_SCHEMA.extend({
 })
 
 
+WS_TYPE_UPDATE_PREFS = 'cloud/update_prefs'
+SCHEMA_WS_UPDATE_PREFS = websocket_api.BASE_COMMAND_MESSAGE_SCHEMA.extend({
+    vol.Required('type'): WS_TYPE_UPDATE_PREFS,
+    vol.Optional('google_enabled'): bool,
+    vol.Optional('alexa_enabled'): bool,
+})
+
+
 WS_TYPE_SUBSCRIPTION = 'cloud/subscription'
 SCHEMA_WS_SUBSCRIPTION = websocket_api.BASE_COMMAND_MESSAGE_SCHEMA.extend({
     vol.Required('type'): WS_TYPE_SUBSCRIPTION,
@@ -41,6 +49,10 @@ async def async_setup(hass):
         WS_TYPE_SUBSCRIPTION, websocket_subscription,
         SCHEMA_WS_SUBSCRIPTION
     )
+    hass.components.websocket_api.async_register_command(
+        WS_TYPE_UPDATE_PREFS, websocket_update_prefs,
+        SCHEMA_WS_UPDATE_PREFS
+    )
     hass.http.register_view(GoogleActionsSyncView)
     hass.http.register_view(CloudLoginView)
     hass.http.register_view(CloudLogoutView)
@@ -245,6 +257,26 @@ async def websocket_subscription(hass, connection, msg):
             msg['id'], 'request_failed', 'Failed to request subscription'))
 
 
+@websocket_api.async_response
+async def websocket_update_prefs(hass, connection, msg):
+    """Handle request for account info."""
+    cloud = hass.data[DOMAIN]
+
+    if not cloud.is_logged_in:
+        connection.to_write.put_nowait(websocket_api.error_message(
+            msg['id'], 'not_logged_in',
+            'You need to be logged in to the cloud.'))
+        return
+
+    changes = dict(msg)
+    changes.pop('id')
+    changes.pop('type')
+    await cloud.update_preferences(**changes)
+
+    connection.send_message_outside(websocket_api.result_message(
+        msg['id'], {'success': True}))
+
+
 def _account_data(cloud):
     """Generate the auth data JSON response."""
     if not cloud.is_logged_in:
@@ -259,4 +291,6 @@ def _account_data(cloud):
         'logged_in': True,
         'email': claims['email'],
         'cloud': cloud.iot.state,
+        'google_enabled': cloud.google_enabled,
+        'alexa_enabled': cloud.alexa_enabled,
     }
diff --git a/homeassistant/components/cloud/iot.py b/homeassistant/components/cloud/iot.py
index f4ce7bb3d1a..fd525ed33a8 100644
--- a/homeassistant/components/cloud/iot.py
+++ b/homeassistant/components/cloud/iot.py
@@ -227,6 +227,9 @@ def async_handle_message(hass, cloud, handler_name, payload):
 @asyncio.coroutine
 def async_handle_alexa(hass, cloud, payload):
     """Handle an incoming IoT message for Alexa."""
+    if not cloud.alexa_enabled:
+        return alexa.turned_off_response(payload)
+
     result = yield from alexa.async_handle_message(
         hass, cloud.alexa_config, payload)
     return result
@@ -236,6 +239,9 @@ def async_handle_alexa(hass, cloud, payload):
 @asyncio.coroutine
 def async_handle_google_actions(hass, cloud, payload):
     """Handle an incoming IoT message for Google Actions."""
+    if not cloud.google_enabled:
+        return ga.turned_off_response(payload)
+
     result = yield from ga.async_handle_message(
         hass, cloud.gactions_config, payload)
     return result
diff --git a/homeassistant/components/google_assistant/smart_home.py b/homeassistant/components/google_assistant/smart_home.py
index 675e86f9d39..1cb4bf4cb32 100644
--- a/homeassistant/components/google_assistant/smart_home.py
+++ b/homeassistant/components/google_assistant/smart_home.py
@@ -324,3 +324,11 @@ async def handle_devices_execute(hass, config, payload):
         })
 
     return {'commands': final_results}
+
+
+def turned_off_response(message):
+    """Return a device turned off response."""
+    return {
+        'requestId': message.get('requestId'),
+        'payload': {'errorCode': 'deviceTurnedOff'}
+    }
diff --git a/tests/components/cloud/__init__.py b/tests/components/cloud/__init__.py
index 7a4e9f2950e..108e5c45137 100644
--- a/tests/components/cloud/__init__.py
+++ b/tests/components/cloud/__init__.py
@@ -1 +1,32 @@
 """Tests for the cloud component."""
+from unittest.mock import patch
+from homeassistant.setup import async_setup_component
+from homeassistant.components import cloud
+
+from jose import jwt
+
+from tests.common import mock_coro
+
+
+def mock_cloud(hass, config={}):
+    """Mock cloud."""
+    with patch('homeassistant.components.cloud.Cloud.async_start',
+               return_value=mock_coro()):
+        assert hass.loop.run_until_complete(async_setup_component(
+            hass, cloud.DOMAIN, {
+                'cloud': config
+            }))
+
+    hass.data[cloud.DOMAIN]._decode_claims = \
+        lambda token: jwt.get_unverified_claims(token)
+
+
+def mock_cloud_prefs(hass, prefs={}):
+    """Fixture for cloud component."""
+    prefs_to_set = {
+        cloud.STORAGE_ENABLE_ALEXA: True,
+        cloud.STORAGE_ENABLE_GOOGLE: True,
+    }
+    prefs_to_set.update(prefs)
+    hass.data[cloud.DOMAIN]._prefs = prefs_to_set
+    return prefs_to_set
diff --git a/tests/components/cloud/conftest.py b/tests/components/cloud/conftest.py
new file mode 100644
index 00000000000..81ecb7250ef
--- /dev/null
+++ b/tests/components/cloud/conftest.py
@@ -0,0 +1,11 @@
+"""Fixtures for cloud tests."""
+import pytest
+
+from . import mock_cloud, mock_cloud_prefs
+
+
+@pytest.fixture
+def mock_cloud_fixture(hass):
+    """Fixture for cloud component."""
+    mock_cloud(hass)
+    return mock_cloud_prefs(hass)
diff --git a/tests/components/cloud/test_http_api.py b/tests/components/cloud/test_http_api.py
index 531cd09f011..5d4b356b9b2 100644
--- a/tests/components/cloud/test_http_api.py
+++ b/tests/components/cloud/test_http_api.py
@@ -5,11 +5,12 @@ from unittest.mock import patch, MagicMock
 import pytest
 from jose import jwt
 
-from homeassistant.bootstrap import async_setup_component
-from homeassistant.components.cloud import DOMAIN, auth_api, iot
+from homeassistant.components.cloud import (
+    DOMAIN, auth_api, iot, STORAGE_ENABLE_GOOGLE, STORAGE_ENABLE_ALEXA)
 
 from tests.common import mock_coro
 
+from . import mock_cloud, mock_cloud_prefs
 
 GOOGLE_ACTIONS_SYNC_URL = 'https://api-test.hass.io/google_actions_sync'
 SUBSCRIPTION_INFO_URL = 'https://api-test.hass.io/subscription_info'
@@ -25,22 +26,16 @@ def mock_auth():
 @pytest.fixture(autouse=True)
 def setup_api(hass):
     """Initialize HTTP API."""
-    with patch('homeassistant.components.cloud.Cloud.async_start',
-               return_value=mock_coro()):
-        assert hass.loop.run_until_complete(async_setup_component(
-            hass, 'cloud', {
-                'cloud': {
-                    'mode': 'development',
-                    'cognito_client_id': 'cognito_client_id',
-                    'user_pool_id': 'user_pool_id',
-                    'region': 'region',
-                    'relayer': 'relayer',
-                    'google_actions_sync_url': GOOGLE_ACTIONS_SYNC_URL,
-                    'subscription_info_url': SUBSCRIPTION_INFO_URL,
-                }
-            }))
-    hass.data['cloud']._decode_claims = \
-        lambda token: jwt.get_unverified_claims(token)
+    mock_cloud(hass, {
+        'mode': 'development',
+        'cognito_client_id': 'cognito_client_id',
+        'user_pool_id': 'user_pool_id',
+        'region': 'region',
+        'relayer': 'relayer',
+        'google_actions_sync_url': GOOGLE_ACTIONS_SYNC_URL,
+        'subscription_info_url': SUBSCRIPTION_INFO_URL,
+    })
+    return mock_cloud_prefs(hass)
 
 
 @pytest.fixture
@@ -321,7 +316,7 @@ def test_resend_confirm_view_unknown_error(mock_cognito, cloud_client):
     assert req.status == 502
 
 
-async def test_websocket_status(hass, hass_ws_client):
+async def test_websocket_status(hass, hass_ws_client, mock_cloud_fixture):
     """Test querying the status."""
     hass.data[DOMAIN].id_token = jwt.encode({
         'email': 'hello@home-assistant.io',
@@ -338,6 +333,8 @@ async def test_websocket_status(hass, hass_ws_client):
         'logged_in': True,
         'email': 'hello@home-assistant.io',
         'cloud': 'connected',
+        'alexa_enabled': True,
+        'google_enabled': True,
     }
 
 
@@ -407,3 +404,26 @@ async def test_websocket_subscription_not_logged_in(hass, hass_ws_client):
 
     assert not response['success']
     assert response['error']['code'] == 'not_logged_in'
+
+
+async def test_websocket_update_preferences(hass, hass_ws_client,
+                                            aioclient_mock, setup_api):
+    """Test updating preference."""
+    assert setup_api[STORAGE_ENABLE_GOOGLE]
+    assert setup_api[STORAGE_ENABLE_ALEXA]
+    hass.data[DOMAIN].id_token = jwt.encode({
+        'email': 'hello@home-assistant.io',
+        'custom:sub-exp': '2018-01-03'
+    }, 'test')
+    client = await hass_ws_client(hass)
+    await client.send_json({
+        'id': 5,
+        'type': 'cloud/update_prefs',
+        'alexa_enabled': False,
+        'google_enabled': False,
+    })
+    response = await client.receive_json()
+
+    assert response['success']
+    assert not setup_api[STORAGE_ENABLE_GOOGLE]
+    assert not setup_api[STORAGE_ENABLE_ALEXA]
diff --git a/tests/components/cloud/test_init.py b/tests/components/cloud/test_init.py
index 9b090a96ca1..1fdbda496a9 100644
--- a/tests/components/cloud/test_init.py
+++ b/tests/components/cloud/test_init.py
@@ -141,9 +141,9 @@ def test_write_user_info():
 
 
 @asyncio.coroutine
-def test_subscription_expired():
+def test_subscription_expired(hass):
     """Test subscription being expired."""
-    cl = cloud.Cloud(None, cloud.MODE_DEV, None, None)
+    cl = cloud.Cloud(hass, cloud.MODE_DEV, None, None)
     token_val = {
         'custom:sub-exp': '2017-11-13'
     }
@@ -154,9 +154,9 @@ def test_subscription_expired():
 
 
 @asyncio.coroutine
-def test_subscription_not_expired():
+def test_subscription_not_expired(hass):
     """Test subscription not being expired."""
-    cl = cloud.Cloud(None, cloud.MODE_DEV, None, None)
+    cl = cloud.Cloud(hass, cloud.MODE_DEV, None, None)
     token_val = {
         'custom:sub-exp': '2017-11-13'
     }
diff --git a/tests/components/cloud/test_iot.py b/tests/components/cloud/test_iot.py
index 1b580d0eb9b..07ec1851fbe 100644
--- a/tests/components/cloud/test_iot.py
+++ b/tests/components/cloud/test_iot.py
@@ -6,10 +6,14 @@ from aiohttp import WSMsgType, client_exceptions
 import pytest
 
 from homeassistant.setup import async_setup_component
-from homeassistant.components.cloud import Cloud, iot, auth_api, MODE_DEV
+from homeassistant.components.cloud import (
+    Cloud, iot, auth_api, MODE_DEV, STORAGE_ENABLE_ALEXA,
+    STORAGE_ENABLE_GOOGLE)
 from tests.components.alexa import test_smart_home as test_alexa
 from tests.common import mock_coro
 
+from . import mock_cloud_prefs
+
 
 @pytest.fixture
 def mock_client():
@@ -284,6 +288,8 @@ def test_handler_alexa(hass):
         })
         assert setup
 
+    mock_cloud_prefs(hass)
+
     resp = yield from iot.async_handle_alexa(
         hass, hass.data['cloud'],
         test_alexa.get_new_request('Alexa.Discovery', 'Discover'))
@@ -299,6 +305,20 @@ def test_handler_alexa(hass):
     assert device['manufacturerName'] == 'Home Assistant'
 
 
+@asyncio.coroutine
+def test_handler_alexa_disabled(hass, mock_cloud_fixture):
+    """Test handler Alexa when user has disabled it."""
+    mock_cloud_fixture[STORAGE_ENABLE_ALEXA] = False
+
+    resp = yield from iot.async_handle_alexa(
+        hass, hass.data['cloud'],
+        test_alexa.get_new_request('Alexa.Discovery', 'Discover'))
+
+    assert resp['event']['header']['namespace'] == 'Alexa'
+    assert resp['event']['header']['name'] == 'ErrorResponse'
+    assert resp['event']['payload']['type'] == 'BRIDGE_UNREACHABLE'
+
+
 @asyncio.coroutine
 def test_handler_google_actions(hass):
     """Test handler Google Actions."""
@@ -327,6 +347,8 @@ def test_handler_google_actions(hass):
         })
         assert setup
 
+    mock_cloud_prefs(hass)
+
     reqid = '5711642932632160983'
     data = {'requestId': reqid, 'inputs': [{'intent': 'action.devices.SYNC'}]}
 
@@ -351,6 +373,24 @@ def test_handler_google_actions(hass):
     assert device['roomHint'] == 'living room'
 
 
+async def test_handler_google_actions_disabled(hass, mock_cloud_fixture):
+    """Test handler Google Actions when user has disabled it."""
+    mock_cloud_fixture[STORAGE_ENABLE_GOOGLE] = False
+
+    with patch('homeassistant.components.cloud.Cloud.async_start',
+               return_value=mock_coro()):
+        assert await async_setup_component(hass, 'cloud', {})
+
+    reqid = '5711642932632160983'
+    data = {'requestId': reqid, 'inputs': [{'intent': 'action.devices.SYNC'}]}
+
+    resp = await iot.async_handle_google_actions(
+        hass, hass.data['cloud'], data)
+
+    assert resp['requestId'] == reqid
+    assert resp['payload']['errorCode'] == 'deviceTurnedOff'
+
+
 async def test_refresh_token_expired(hass):
     """Test handling Unauthenticated error raised if refresh token expired."""
     cloud = Cloud(hass, MODE_DEV, None, None)

From 78b6439ee6a07e3aacbd6555dca2595e74d2e8b5 Mon Sep 17 00:00:00 2001
From: Anders Melchiorsen <amelchio@nogoto.net>
Date: Thu, 20 Sep 2018 23:50:11 +0200
Subject: [PATCH 221/357] Use pysonos for Sonos media player (#16753)

---
 .../components/media_player/sonos.py          | 38 +++++-----
 homeassistant/components/sonos/__init__.py    |  6 +-
 requirements_all.txt                          |  6 +-
 requirements_test_all.txt                     |  6 +-
 script/gen_requirements_all.py                |  2 +-
 tests/components/media_player/test_sonos.py   | 70 +++++++++----------
 tests/components/sonos/test_init.py           |  6 +-
 7 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/homeassistant/components/media_player/sonos.py b/homeassistant/components/media_player/sonos.py
index 72ac0a046a3..fd735a5b830 100644
--- a/homeassistant/components/media_player/sonos.py
+++ b/homeassistant/components/media_player/sonos.py
@@ -1,5 +1,5 @@
 """
-Support to interface with Sonos players (via SoCo).
+Support to interface with Sonos players.
 
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/media_player.sonos/
@@ -31,11 +31,11 @@ DEPENDENCIES = ('sonos',)
 
 _LOGGER = logging.getLogger(__name__)
 
-# Quiet down soco logging to just actual problems.
-logging.getLogger('soco').setLevel(logging.WARNING)
-logging.getLogger('soco.events').setLevel(logging.ERROR)
-logging.getLogger('soco.data_structures_entry').setLevel(logging.ERROR)
-_SOCO_SERVICES_LOGGER = logging.getLogger('soco.services')
+# Quiet down pysonos logging to just actual problems.
+logging.getLogger('pysonos').setLevel(logging.WARNING)
+logging.getLogger('pysonos.events').setLevel(logging.ERROR)
+logging.getLogger('pysonos.data_structures_entry').setLevel(logging.ERROR)
+_SOCO_SERVICES_LOGGER = logging.getLogger('pysonos.services')
 
 SUPPORT_SONOS = SUPPORT_VOLUME_SET | SUPPORT_VOLUME_MUTE |\
     SUPPORT_PLAY | SUPPORT_PAUSE | SUPPORT_STOP | SUPPORT_SELECT_SOURCE |\
@@ -143,18 +143,18 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
 
 def _setup_platform(hass, config, add_entities, discovery_info):
     """Set up the Sonos platform."""
-    import soco
+    import pysonos
 
     if DATA_SONOS not in hass.data:
         hass.data[DATA_SONOS] = SonosData()
 
     advertise_addr = config.get(CONF_ADVERTISE_ADDR)
     if advertise_addr:
-        soco.config.EVENT_ADVERTISE_IP = advertise_addr
+        pysonos.config.EVENT_ADVERTISE_IP = advertise_addr
 
     players = []
     if discovery_info:
-        player = soco.SoCo(discovery_info.get('host'))
+        player = pysonos.SoCo(discovery_info.get('host'))
 
         # If device already exists by config
         if player.uid in hass.data[DATA_SONOS].uids:
@@ -174,11 +174,11 @@ def _setup_platform(hass, config, add_entities, discovery_info):
             hosts = hosts.split(',') if isinstance(hosts, str) else hosts
             for host in hosts:
                 try:
-                    players.append(soco.SoCo(socket.gethostbyname(host)))
+                    players.append(pysonos.SoCo(socket.gethostbyname(host)))
                 except OSError:
                     _LOGGER.warning("Failed to initialize '%s'", host)
         else:
-            players = soco.discover(
+            players = pysonos.discover(
                 interface_addr=config.get(CONF_INTERFACE_ADDR))
 
         if not players:
@@ -287,7 +287,7 @@ def soco_error(errorcodes=None):
         @ft.wraps(funct)
         def wrapper(*args, **kwargs):
             """Wrap for all soco UPnP exception."""
-            from soco.exceptions import SoCoUPnPException, SoCoException
+            from pysonos.exceptions import SoCoUPnPException, SoCoException
 
             # Temporarily disable SoCo logging because it will log the
             # UPnP exception otherwise
@@ -612,9 +612,9 @@ class SonosDevice(MediaPlayerDevice):
         current_uri_metadata = media_info["CurrentURIMetaData"]
         if current_uri_metadata not in ('', 'NOT_IMPLEMENTED', None):
             # currently soco does not have an API for this
-            import soco
-            current_uri_metadata = soco.xml.XML.fromstring(
-                soco.utils.really_utf8(current_uri_metadata))
+            import pysonos
+            current_uri_metadata = pysonos.xml.XML.fromstring(
+                pysonos.utils.really_utf8(current_uri_metadata))
 
             md_title = current_uri_metadata.findtext(
                 './/{http://purl.org/dc/elements/1.1/}title')
@@ -950,7 +950,7 @@ class SonosDevice(MediaPlayerDevice):
         If ATTR_MEDIA_ENQUEUE is True, add `media_id` to the queue.
         """
         if kwargs.get(ATTR_MEDIA_ENQUEUE):
-            from soco.exceptions import SoCoUPnPException
+            from pysonos.exceptions import SoCoUPnPException
             try:
                 self.soco.add_uri_to_queue(media_id)
             except SoCoUPnPException:
@@ -981,7 +981,7 @@ class SonosDevice(MediaPlayerDevice):
     @soco_error()
     def snapshot(self, with_group=True):
         """Snapshot the player."""
-        from soco.snapshot import Snapshot
+        from pysonos.snapshot import Snapshot
 
         self._soco_snapshot = Snapshot(self.soco)
         self._soco_snapshot.snapshot()
@@ -996,7 +996,7 @@ class SonosDevice(MediaPlayerDevice):
     @soco_error()
     def restore(self, with_group=True):
         """Restore snapshot for the player."""
-        from soco.exceptions import SoCoException
+        from pysonos.exceptions import SoCoException
         try:
             # need catch exception if a coordinator is going to slave.
             # this state will recover with group part.
@@ -1060,7 +1060,7 @@ class SonosDevice(MediaPlayerDevice):
     @soco_coordinator
     def set_alarm(self, **data):
         """Set the alarm clock on the player."""
-        from soco import alarms
+        from pysonos import alarms
         alarm = None
         for one_alarm in alarms.get_alarms(self.soco):
             # pylint: disable=protected-access
diff --git a/homeassistant/components/sonos/__init__.py b/homeassistant/components/sonos/__init__.py
index 60f3a8858b2..30573ee03ee 100644
--- a/homeassistant/components/sonos/__init__.py
+++ b/homeassistant/components/sonos/__init__.py
@@ -4,7 +4,7 @@ from homeassistant.helpers import config_entry_flow
 
 
 DOMAIN = 'sonos'
-REQUIREMENTS = ['SoCo==0.16']
+REQUIREMENTS = ['pysonos==0.0.1']
 
 
 async def async_setup(hass, config):
@@ -29,9 +29,9 @@ async def async_setup_entry(hass, entry):
 
 async def _async_has_devices(hass):
     """Return if there are devices that can be discovered."""
-    import soco
+    import pysonos
 
-    return await hass.async_add_executor_job(soco.discover)
+    return await hass.async_add_executor_job(pysonos.discover)
 
 
 config_entry_flow.register_discovery_flow(
diff --git a/requirements_all.txt b/requirements_all.txt
index 21104fab416..f9296ae28cd 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -66,9 +66,6 @@ PyXiaomiGateway==0.10.0
 # homeassistant.components.remember_the_milk
 RtmAPI==0.7.0
 
-# homeassistant.components.sonos
-SoCo==0.16
-
 # homeassistant.components.sensor.travisci
 TravisPy==0.3.5
 
@@ -1060,6 +1057,9 @@ pysma==0.2
 # homeassistant.components.switch.snmp
 pysnmp==4.4.5
 
+# homeassistant.components.sonos
+pysonos==0.0.1
+
 # homeassistant.components.notify.stride
 pystride==0.1.7
 
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 83566a0bc30..78fc33dde71 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -24,9 +24,6 @@ HAP-python==2.2.2
 # homeassistant.components.sensor.rmvtransport
 PyRMVtransport==0.1
 
-# homeassistant.components.sonos
-SoCo==0.16
-
 # homeassistant.components.device_tracker.automatic
 aioautomatic==0.6.5
 
@@ -167,6 +164,9 @@ pyotp==2.2.6
 # homeassistant.components.qwikswitch
 pyqwikswitch==0.8
 
+# homeassistant.components.sonos
+pysonos==0.0.1
+
 # homeassistant.components.sensor.darksky
 # homeassistant.components.weather.darksky
 python-forecastio==1.4.0
diff --git a/script/gen_requirements_all.py b/script/gen_requirements_all.py
index 3cde13a2a97..c4776e74f93 100755
--- a/script/gen_requirements_all.py
+++ b/script/gen_requirements_all.py
@@ -79,6 +79,7 @@ TEST_REQUIREMENTS = (
     'pynx584',
     'pyopenuv',
     'pyotp',
+    'pysonos',
     'pyqwikswitch',
     'PyRMVtransport',
     'python-forecastio',
@@ -92,7 +93,6 @@ TEST_REQUIREMENTS = (
     'ring_doorbell',
     'rxv',
     'sleepyq',
-    'SoCo',
     'somecomfort',
     'sqlalchemy',
     'statsd',
diff --git a/tests/components/media_player/test_sonos.py b/tests/components/media_player/test_sonos.py
index 5a845738fa3..cb3da3ab899 100644
--- a/tests/components/media_player/test_sonos.py
+++ b/tests/components/media_player/test_sonos.py
@@ -2,10 +2,10 @@
 import datetime
 import socket
 import unittest
-import soco.snapshot
+import pysonos.snapshot
 from unittest import mock
-import soco
-from soco import alarms
+import pysonos
+from pysonos import alarms
 
 from homeassistant.setup import setup_component
 from homeassistant.components.media_player import sonos, DOMAIN
@@ -17,16 +17,16 @@ from tests.common import get_test_home_assistant
 ENTITY_ID = 'media_player.kitchen'
 
 
-class socoDiscoverMock():
-    """Mock class for the soco.discover method."""
+class pysonosDiscoverMock():
+    """Mock class for the pysonos.discover method."""
 
     def discover(interface_addr):
-        """Return tuple of soco.SoCo objects representing found speakers."""
+        """Return tuple of pysonos.SoCo objects representing found speakers."""
         return {SoCoMock('192.0.2.1')}
 
 
 class AvTransportMock():
-    """Mock class for the avTransport property on soco.SoCo object."""
+    """Mock class for the avTransport property on pysonos.SoCo object."""
 
     def __init__(self):
         """Initialize ethe Transport mock."""
@@ -41,7 +41,7 @@ class AvTransportMock():
 
 
 class MusicLibraryMock():
-    """Mock class for the music_library property on soco.SoCo object."""
+    """Mock class for the music_library property on pysonos.SoCo object."""
 
     def get_sonos_favorites(self):
         """Return favorites."""
@@ -49,10 +49,10 @@ class MusicLibraryMock():
 
 
 class SoCoMock():
-    """Mock class for the soco.SoCo object."""
+    """Mock class for the pysonos.SoCo object."""
 
     def __init__(self, ip):
-        """Initialize soco object."""
+        """Initialize SoCo object."""
         self.ip_address = ip
         self.is_visible = True
         self.volume = 50
@@ -153,7 +153,7 @@ class TestSonosMediaPlayer(unittest.TestCase):
         sonos.SonosDevice.available = self.real_available
         self.hass.stop()
 
-    @mock.patch('soco.SoCo', new=SoCoMock)
+    @mock.patch('pysonos.SoCo', new=SoCoMock)
     @mock.patch('socket.create_connection', side_effect=socket.error())
     def test_ensure_setup_discovery(self, *args):
         """Test a single device using the autodiscovery provided by HASS."""
@@ -165,9 +165,9 @@ class TestSonosMediaPlayer(unittest.TestCase):
         self.assertEqual(len(devices), 1)
         self.assertEqual(devices[0].name, 'Kitchen')
 
-    @mock.patch('soco.SoCo', new=SoCoMock)
+    @mock.patch('pysonos.SoCo', new=SoCoMock)
     @mock.patch('socket.create_connection', side_effect=socket.error())
-    @mock.patch('soco.discover')
+    @mock.patch('pysonos.discover')
     def test_ensure_setup_config_interface_addr(self, discover_mock, *args):
         """Test an interface address config'd by the HASS config file."""
         discover_mock.return_value = {SoCoMock('192.0.2.1')}
@@ -184,7 +184,7 @@ class TestSonosMediaPlayer(unittest.TestCase):
         self.assertEqual(len(self.hass.data[sonos.DATA_SONOS].devices), 1)
         self.assertEqual(discover_mock.call_count, 1)
 
-    @mock.patch('soco.SoCo', new=SoCoMock)
+    @mock.patch('pysonos.SoCo', new=SoCoMock)
     @mock.patch('socket.create_connection', side_effect=socket.error())
     def test_ensure_setup_config_hosts_string_single(self, *args):
         """Test a single address config'd by the HASS config file."""
@@ -201,7 +201,7 @@ class TestSonosMediaPlayer(unittest.TestCase):
         self.assertEqual(len(devices), 1)
         self.assertEqual(devices[0].name, 'Kitchen')
 
-    @mock.patch('soco.SoCo', new=SoCoMock)
+    @mock.patch('pysonos.SoCo', new=SoCoMock)
     @mock.patch('socket.create_connection', side_effect=socket.error())
     def test_ensure_setup_config_hosts_string_multiple(self, *args):
         """Test multiple address string config'd by the HASS config file."""
@@ -218,7 +218,7 @@ class TestSonosMediaPlayer(unittest.TestCase):
         self.assertEqual(len(devices), 2)
         self.assertEqual(devices[0].name, 'Kitchen')
 
-    @mock.patch('soco.SoCo', new=SoCoMock)
+    @mock.patch('pysonos.SoCo', new=SoCoMock)
     @mock.patch('socket.create_connection', side_effect=socket.error())
     def test_ensure_setup_config_hosts_list(self, *args):
         """Test a multiple address list config'd by the HASS config file."""
@@ -235,8 +235,8 @@ class TestSonosMediaPlayer(unittest.TestCase):
         self.assertEqual(len(devices), 2)
         self.assertEqual(devices[0].name, 'Kitchen')
 
-    @mock.patch('soco.SoCo', new=SoCoMock)
-    @mock.patch.object(soco, 'discover', new=socoDiscoverMock.discover)
+    @mock.patch('pysonos.SoCo', new=SoCoMock)
+    @mock.patch.object(pysonos, 'discover', new=pysonosDiscoverMock.discover)
     @mock.patch('socket.create_connection', side_effect=socket.error())
     def test_ensure_setup_sonos_discovery(self, *args):
         """Test a single device using the autodiscovery provided by Sonos."""
@@ -245,11 +245,11 @@ class TestSonosMediaPlayer(unittest.TestCase):
         self.assertEqual(len(devices), 1)
         self.assertEqual(devices[0].name, 'Kitchen')
 
-    @mock.patch('soco.SoCo', new=SoCoMock)
+    @mock.patch('pysonos.SoCo', new=SoCoMock)
     @mock.patch('socket.create_connection', side_effect=socket.error())
     @mock.patch.object(SoCoMock, 'set_sleep_timer')
     def test_sonos_set_sleep_timer(self, set_sleep_timerMock, *args):
-        """Ensuring soco methods called for sonos_set_sleep_timer service."""
+        """Ensure pysonos methods called for sonos_set_sleep_timer service."""
         sonos.setup_platform(self.hass, {}, add_entities_factory(self.hass), {
             'host': '192.0.2.1'
         })
@@ -259,11 +259,11 @@ class TestSonosMediaPlayer(unittest.TestCase):
         device.set_sleep_timer(30)
         set_sleep_timerMock.assert_called_once_with(30)
 
-    @mock.patch('soco.SoCo', new=SoCoMock)
+    @mock.patch('pysonos.SoCo', new=SoCoMock)
     @mock.patch('socket.create_connection', side_effect=socket.error())
     @mock.patch.object(SoCoMock, 'set_sleep_timer')
     def test_sonos_clear_sleep_timer(self, set_sleep_timerMock, *args):
-        """Ensuring soco methods called for sonos_clear_sleep_timer service."""
+        """Ensure pysonos method called for sonos_clear_sleep_timer service."""
         sonos.setup_platform(self.hass, {}, add_entities_factory(self.hass), {
             'host': '192.0.2.1'
         })
@@ -273,20 +273,20 @@ class TestSonosMediaPlayer(unittest.TestCase):
         device.set_sleep_timer(None)
         set_sleep_timerMock.assert_called_once_with(None)
 
-    @mock.patch('soco.SoCo', new=SoCoMock)
-    @mock.patch('soco.alarms.Alarm')
+    @mock.patch('pysonos.SoCo', new=SoCoMock)
+    @mock.patch('pysonos.alarms.Alarm')
     @mock.patch('socket.create_connection', side_effect=socket.error())
-    def test_set_alarm(self, soco_mock, alarm_mock, *args):
-        """Ensuring soco methods called for sonos_set_sleep_timer service."""
+    def test_set_alarm(self, pysonos_mock, alarm_mock, *args):
+        """Ensure pysonos methods called for sonos_set_sleep_timer service."""
         sonos.setup_platform(self.hass, {}, add_entities_factory(self.hass), {
             'host': '192.0.2.1'
         })
         device = list(self.hass.data[sonos.DATA_SONOS].devices)[-1]
         device.hass = self.hass
-        alarm1 = alarms.Alarm(soco_mock)
+        alarm1 = alarms.Alarm(pysonos_mock)
         alarm1.configure_mock(_alarm_id="1", start_time=None, enabled=False,
                               include_linked_zones=False, volume=100)
-        with mock.patch('soco.alarms.get_alarms', return_value=[alarm1]):
+        with mock.patch('pysonos.alarms.get_alarms', return_value=[alarm1]):
             attrs = {
                 'time': datetime.time(12, 00),
                 'enabled': True,
@@ -303,11 +303,11 @@ class TestSonosMediaPlayer(unittest.TestCase):
             self.assertEqual(alarm1.volume, 30)
             alarm1.save.assert_called_once_with()
 
-    @mock.patch('soco.SoCo', new=SoCoMock)
+    @mock.patch('pysonos.SoCo', new=SoCoMock)
     @mock.patch('socket.create_connection', side_effect=socket.error())
-    @mock.patch.object(soco.snapshot.Snapshot, 'snapshot')
+    @mock.patch.object(pysonos.snapshot.Snapshot, 'snapshot')
     def test_sonos_snapshot(self, snapshotMock, *args):
-        """Ensuring soco methods called for sonos_snapshot service."""
+        """Ensure pysonos methods called for sonos_snapshot service."""
         sonos.setup_platform(self.hass, {}, add_entities_factory(self.hass), {
             'host': '192.0.2.1'
         })
@@ -319,12 +319,12 @@ class TestSonosMediaPlayer(unittest.TestCase):
         self.assertEqual(snapshotMock.call_count, 1)
         self.assertEqual(snapshotMock.call_args, mock.call())
 
-    @mock.patch('soco.SoCo', new=SoCoMock)
+    @mock.patch('pysonos.SoCo', new=SoCoMock)
     @mock.patch('socket.create_connection', side_effect=socket.error())
-    @mock.patch.object(soco.snapshot.Snapshot, 'restore')
+    @mock.patch.object(pysonos.snapshot.Snapshot, 'restore')
     def test_sonos_restore(self, restoreMock, *args):
-        """Ensuring soco methods called for sonos_restor service."""
-        from soco.snapshot import Snapshot
+        """Ensure pysonos methods called for sonos_restore service."""
+        from pysonos.snapshot import Snapshot
 
         sonos.setup_platform(self.hass, {}, add_entities_factory(self.hass), {
             'host': '192.0.2.1'
diff --git a/tests/components/sonos/test_init.py b/tests/components/sonos/test_init.py
index ab4eed31fee..455ce6d4cc2 100644
--- a/tests/components/sonos/test_init.py
+++ b/tests/components/sonos/test_init.py
@@ -12,7 +12,7 @@ async def test_creating_entry_sets_up_media_player(hass):
     """Test setting up Sonos loads the media player."""
     with patch('homeassistant.components.media_player.sonos.async_setup_entry',
                return_value=mock_coro(True)) as mock_setup, \
-            patch('soco.discover', return_value=True):
+            patch('pysonos.discover', return_value=True):
         result = await hass.config_entries.flow.async_init(
             sonos.DOMAIN, context={'source': config_entries.SOURCE_USER})
         assert result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
@@ -26,7 +26,7 @@ async def test_configuring_sonos_creates_entry(hass):
     """Test that specifying config will create an entry."""
     with patch('homeassistant.components.sonos.async_setup_entry',
                return_value=mock_coro(True)) as mock_setup, \
-            patch('soco.discover', return_value=True):
+            patch('pysonos.discover', return_value=True):
         await async_setup_component(hass, sonos.DOMAIN, {
             'sonos': {
                 'some_config': 'to_trigger_import'
@@ -41,7 +41,7 @@ async def test_not_configuring_sonos_not_creates_entry(hass):
     """Test that no config will not create an entry."""
     with patch('homeassistant.components.sonos.async_setup_entry',
                return_value=mock_coro(True)) as mock_setup, \
-            patch('soco.discover', return_value=True):
+            patch('pysonos.discover', return_value=True):
         await async_setup_component(hass, sonos.DOMAIN, {})
         await hass.async_block_till_done()
 

From 90c18d1c157712491500b5c5a910a13fe86af65e Mon Sep 17 00:00:00 2001
From: Robert Svensson <Kane610@users.noreply.github.com>
Date: Fri, 21 Sep 2018 09:21:44 +0200
Subject: [PATCH 222/357] deCONZ add via_hub attribute for device registry
 (#16760)

* deCONZ add via_hub attribute for device registry

* A shorter way to get bridgeid
---
 homeassistant/components/binary_sensor/deconz.py | 2 ++
 homeassistant/components/light/deconz.py         | 2 ++
 homeassistant/components/sensor/deconz.py        | 4 ++++
 homeassistant/components/switch/deconz.py        | 2 ++
 tests/components/binary_sensor/test_deconz.py    | 1 +
 tests/components/light/test_deconz.py            | 1 +
 tests/components/sensor/test_deconz.py           | 1 +
 tests/components/switch/test_deconz.py           | 1 +
 8 files changed, 14 insertions(+)

diff --git a/homeassistant/components/binary_sensor/deconz.py b/homeassistant/components/binary_sensor/deconz.py
index d2ca9e7c5e8..b0728ad167c 100644
--- a/homeassistant/components/binary_sensor/deconz.py
+++ b/homeassistant/components/binary_sensor/deconz.py
@@ -127,6 +127,7 @@ class DeconzBinarySensor(BinarySensorDevice):
                 self._sensor.uniqueid.count(':') != 7):
             return None
         serial = self._sensor.uniqueid.split('-', 1)[0]
+        bridgeid = self.hass.data[DATA_DECONZ].config.bridgeid
         return {
             'connections': {(CONNECTION_ZIGBEE, serial)},
             'identifiers': {(DECONZ_DOMAIN, serial)},
@@ -134,4 +135,5 @@ class DeconzBinarySensor(BinarySensorDevice):
             'model': self._sensor.modelid,
             'name': self._sensor.name,
             'sw_version': self._sensor.swversion,
+            'via_hub': (DECONZ_DOMAIN, bridgeid),
         }
diff --git a/homeassistant/components/light/deconz.py b/homeassistant/components/light/deconz.py
index ff3fe609924..3fb6e1dff00 100644
--- a/homeassistant/components/light/deconz.py
+++ b/homeassistant/components/light/deconz.py
@@ -213,6 +213,7 @@ class DeconzLight(Light):
                 self._light.uniqueid.count(':') != 7):
             return None
         serial = self._light.uniqueid.split('-', 1)[0]
+        bridgeid = self.hass.data[DATA_DECONZ].config.bridgeid
         return {
             'connections': {(CONNECTION_ZIGBEE, serial)},
             'identifiers': {(DECONZ_DOMAIN, serial)},
@@ -220,4 +221,5 @@ class DeconzLight(Light):
             'model': self._light.modelid,
             'name': self._light.name,
             'sw_version': self._light.swversion,
+            'via_hub': (DECONZ_DOMAIN, bridgeid),
         }
diff --git a/homeassistant/components/sensor/deconz.py b/homeassistant/components/sensor/deconz.py
index 37fab727299..c66bda2bc1d 100644
--- a/homeassistant/components/sensor/deconz.py
+++ b/homeassistant/components/sensor/deconz.py
@@ -147,6 +147,7 @@ class DeconzSensor(Entity):
                 self._sensor.uniqueid.count(':') != 7):
             return None
         serial = self._sensor.uniqueid.split('-', 1)[0]
+        bridgeid = self.hass.data[DATA_DECONZ].config.bridgeid
         return {
             'connections': {(CONNECTION_ZIGBEE, serial)},
             'identifiers': {(DECONZ_DOMAIN, serial)},
@@ -154,6 +155,7 @@ class DeconzSensor(Entity):
             'model': self._sensor.modelid,
             'name': self._sensor.name,
             'sw_version': self._sensor.swversion,
+            'via_hub': (DECONZ_DOMAIN, bridgeid),
         }
 
 
@@ -227,6 +229,7 @@ class DeconzBattery(Entity):
                 self._sensor.uniqueid.count(':') != 7):
             return None
         serial = self._sensor.uniqueid.split('-', 1)[0]
+        bridgeid = self.hass.data[DATA_DECONZ].config.bridgeid
         return {
             'connections': {(CONNECTION_ZIGBEE, serial)},
             'identifiers': {(DECONZ_DOMAIN, serial)},
@@ -234,4 +237,5 @@ class DeconzBattery(Entity):
             'model': self._sensor.modelid,
             'name': self._sensor.name,
             'sw_version': self._sensor.swversion,
+            'via_hub': (DECONZ_DOMAIN, bridgeid),
         }
diff --git a/homeassistant/components/switch/deconz.py b/homeassistant/components/switch/deconz.py
index bd8167d89a0..f8911d65d98 100644
--- a/homeassistant/components/switch/deconz.py
+++ b/homeassistant/components/switch/deconz.py
@@ -92,6 +92,7 @@ class DeconzSwitch(SwitchDevice):
                 self._switch.uniqueid.count(':') != 7):
             return None
         serial = self._switch.uniqueid.split('-', 1)[0]
+        bridgeid = self.hass.data[DATA_DECONZ].config.bridgeid
         return {
             'connections': {(CONNECTION_ZIGBEE, serial)},
             'identifiers': {(DECONZ_DOMAIN, serial)},
@@ -99,6 +100,7 @@ class DeconzSwitch(SwitchDevice):
             'model': self._switch.modelid,
             'name': self._switch.name,
             'sw_version': self._switch.swversion,
+            'via_hub': (DECONZ_DOMAIN, bridgeid),
         }
 
 
diff --git a/tests/components/binary_sensor/test_deconz.py b/tests/components/binary_sensor/test_deconz.py
index c2d20bd47c8..5fd6e132e03 100644
--- a/tests/components/binary_sensor/test_deconz.py
+++ b/tests/components/binary_sensor/test_deconz.py
@@ -34,6 +34,7 @@ async def setup_bridge(hass, data, allow_clip_sensor=True):
     entry = Mock()
     entry.data = {'host': '1.2.3.4', 'port': 80, 'api_key': '1234567890ABCDEF'}
     bridge = DeconzSession(loop, session, **entry.data)
+    bridge.config = Mock()
     with patch('pydeconz.DeconzSession.async_get_state',
                return_value=mock_coro(data)):
         await bridge.async_load_parameters()
diff --git a/tests/components/light/test_deconz.py b/tests/components/light/test_deconz.py
index f52219beaa8..96f180505b8 100644
--- a/tests/components/light/test_deconz.py
+++ b/tests/components/light/test_deconz.py
@@ -55,6 +55,7 @@ async def setup_bridge(hass, data, allow_deconz_groups=True):
     entry = Mock()
     entry.data = {'host': '1.2.3.4', 'port': 80, 'api_key': '1234567890ABCDEF'}
     bridge = DeconzSession(loop, session, **entry.data)
+    bridge.config = Mock()
     with patch('pydeconz.DeconzSession.async_get_state',
                return_value=mock_coro(data)):
         await bridge.async_load_parameters()
diff --git a/tests/components/sensor/test_deconz.py b/tests/components/sensor/test_deconz.py
index f40ba631d94..ae9e75d6a41 100644
--- a/tests/components/sensor/test_deconz.py
+++ b/tests/components/sensor/test_deconz.py
@@ -49,6 +49,7 @@ async def setup_bridge(hass, data, allow_clip_sensor=True):
     entry = Mock()
     entry.data = {'host': '1.2.3.4', 'port': 80, 'api_key': '1234567890ABCDEF'}
     bridge = DeconzSession(loop, session, **entry.data)
+    bridge.config = Mock()
     with patch('pydeconz.DeconzSession.async_get_state',
                return_value=mock_coro(data)):
         await bridge.async_load_parameters()
diff --git a/tests/components/switch/test_deconz.py b/tests/components/switch/test_deconz.py
index f4aac63166f..7d2bea7a9fa 100644
--- a/tests/components/switch/test_deconz.py
+++ b/tests/components/switch/test_deconz.py
@@ -47,6 +47,7 @@ async def setup_bridge(hass, data):
     entry = Mock()
     entry.data = {'host': '1.2.3.4', 'port': 80, 'api_key': '1234567890ABCDEF'}
     bridge = DeconzSession(loop, session, **entry.data)
+    bridge.config = Mock()
     with patch('pydeconz.DeconzSession.async_get_state',
                return_value=mock_coro(data)):
         await bridge.async_load_parameters()

From c475a876ce888305ab982a5140f4812b5920b39e Mon Sep 17 00:00:00 2001
From: Anders Melchiorsen <amelchio@nogoto.net>
Date: Fri, 21 Sep 2018 09:21:56 +0200
Subject: [PATCH 223/357] Upgrade pysonos to 0.0.2 (#16761)

---
 homeassistant/components/sonos/__init__.py | 2 +-
 requirements_all.txt                       | 2 +-
 requirements_test_all.txt                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/sonos/__init__.py b/homeassistant/components/sonos/__init__.py
index 30573ee03ee..b4565794844 100644
--- a/homeassistant/components/sonos/__init__.py
+++ b/homeassistant/components/sonos/__init__.py
@@ -4,7 +4,7 @@ from homeassistant.helpers import config_entry_flow
 
 
 DOMAIN = 'sonos'
-REQUIREMENTS = ['pysonos==0.0.1']
+REQUIREMENTS = ['pysonos==0.0.2']
 
 
 async def async_setup(hass, config):
diff --git a/requirements_all.txt b/requirements_all.txt
index f9296ae28cd..1758e96c643 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1058,7 +1058,7 @@ pysma==0.2
 pysnmp==4.4.5
 
 # homeassistant.components.sonos
-pysonos==0.0.1
+pysonos==0.0.2
 
 # homeassistant.components.notify.stride
 pystride==0.1.7
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 78fc33dde71..a62b5534c30 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -165,7 +165,7 @@ pyotp==2.2.6
 pyqwikswitch==0.8
 
 # homeassistant.components.sonos
-pysonos==0.0.1
+pysonos==0.0.2
 
 # homeassistant.components.sensor.darksky
 # homeassistant.components.weather.darksky

From df6709344196b1789fb5572545948bf4b3b252a7 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Fri, 21 Sep 2018 10:51:46 +0200
Subject: [PATCH 224/357] Fix faulty color temp crashing google (#16758)

* Fix faulty color temp crashing google

* Rename

* Print warning for incorrect color temp
---
 .../components/google_assistant/trait.py         | 10 +++++++++-
 tests/components/google_assistant/test_trait.py  | 16 ++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/google_assistant/trait.py b/homeassistant/components/google_assistant/trait.py
index 26e80e6f03b..1ee9d4e2364 100644
--- a/homeassistant/components/google_assistant/trait.py
+++ b/homeassistant/components/google_assistant/trait.py
@@ -1,4 +1,6 @@
 """Implement the Smart Home traits."""
+import logging
+
 from homeassistant.core import DOMAIN as HA_DOMAIN
 from homeassistant.components import (
     climate,
@@ -25,6 +27,8 @@ from homeassistant.util import color as color_util, temperature as temp_util
 from .const import ERR_VALUE_OUT_OF_RANGE
 from .helpers import SmartHomeError
 
+_LOGGER = logging.getLogger(__name__)
+
 PREFIX_TRAITS = 'action.devices.traits.'
 TRAIT_ONOFF = PREFIX_TRAITS + 'OnOff'
 TRAIT_BRIGHTNESS = PREFIX_TRAITS + 'Brightness'
@@ -317,7 +321,11 @@ class ColorTemperatureTrait(_Trait):
         response = {}
 
         temp = self.state.attributes.get(light.ATTR_COLOR_TEMP)
-        if temp is not None:
+        # Some faulty integrations might put 0 in here, raising exception.
+        if temp == 0:
+            _LOGGER.warning('Entity %s has incorrect color temperature %s',
+                            self.state.entity_id, temp)
+        elif temp is not None:
             response['color'] = {
                 'temperature':
                     color_util.color_temperature_mired_to_kelvin(temp)
diff --git a/tests/components/google_assistant/test_trait.py b/tests/components/google_assistant/test_trait.py
index c18ed4b7bf3..52dac7ddb61 100644
--- a/tests/components/google_assistant/test_trait.py
+++ b/tests/components/google_assistant/test_trait.py
@@ -457,6 +457,22 @@ async def test_color_temperature_light(hass):
     }
 
 
+async def test_color_temperature_light_bad_temp(hass):
+    """Test ColorTemperature trait support for light domain."""
+    assert not trait.ColorTemperatureTrait.supported(light.DOMAIN, 0)
+    assert trait.ColorTemperatureTrait.supported(light.DOMAIN,
+                                                 light.SUPPORT_COLOR_TEMP)
+
+    trt = trait.ColorTemperatureTrait(hass, State('light.bla', STATE_ON, {
+        light.ATTR_MIN_MIREDS: 200,
+        light.ATTR_COLOR_TEMP: 0,
+        light.ATTR_MAX_MIREDS: 500,
+    }))
+
+    assert trt.query_attributes() == {
+    }
+
+
 async def test_scene_scene(hass):
     """Test Scene trait support for scene domain."""
     assert trait.SceneTrait.supported(scene.DOMAIN, 0)

From 98b92c78c0b1bdef993b20fcdb0581d9e23aed59 Mon Sep 17 00:00:00 2001
From: PhracturedBlue <rc2012@pblue.org>
Date: Fri, 21 Sep 2018 02:55:12 -0700
Subject: [PATCH 225/357] Add Call Data Log platform.  Mailboxes no longer
 require media (#16579)

* Add multiple mailbox support

* Fix extraneous debugging

* Add cdr support

* liniting errors

* Mailbox log messages should mostly be debug.  Fix race condition with initializing CDR

* async decorators to async

* Lint fixes

* Typo

* remove unneeded parameter

* Fix variable names

* Fix async calls from worker thread.  Other minor cleanups

* more variable renames
---
 .coveragerc                                   |  1 +
 homeassistant/components/asterisk_mbox.py     | 67 ++++++++++++---
 homeassistant/components/mailbox/__init__.py  | 83 ++++++++++---------
 .../components/mailbox/asterisk_cdr.py        | 64 ++++++++++++++
 .../components/mailbox/asterisk_mbox.py       | 30 ++++---
 homeassistant/components/mailbox/demo.py      | 24 ++++--
 tests/components/mailbox/test_init.py         |  2 +-
 7 files changed, 198 insertions(+), 73 deletions(-)
 create mode 100644 homeassistant/components/mailbox/asterisk_cdr.py

diff --git a/.coveragerc b/.coveragerc
index 2345cc13df2..39c2bce5ae5 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -42,6 +42,7 @@ omit =
 
     homeassistant/components/asterisk_mbox.py
     homeassistant/components/*/asterisk_mbox.py
+    homeassistant/components/*/asterisk_cdr.py
 
     homeassistant/components/august.py
     homeassistant/components/*/august.py
diff --git a/homeassistant/components/asterisk_mbox.py b/homeassistant/components/asterisk_mbox.py
index 0d6d811db70..0907e48b256 100644
--- a/homeassistant/components/asterisk_mbox.py
+++ b/homeassistant/components/asterisk_mbox.py
@@ -13,7 +13,7 @@ from homeassistant.core import callback
 from homeassistant.helpers import discovery
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.dispatcher import (
-    async_dispatcher_connect, async_dispatcher_send)
+    async_dispatcher_send, dispatcher_connect)
 
 REQUIREMENTS = ['asterisk_mbox==0.5.0']
 
@@ -21,8 +21,11 @@ _LOGGER = logging.getLogger(__name__)
 
 DOMAIN = 'asterisk_mbox'
 
+SIGNAL_DISCOVER_PLATFORM = "asterisk_mbox.discover_platform"
 SIGNAL_MESSAGE_REQUEST = 'asterisk_mbox.message_request'
 SIGNAL_MESSAGE_UPDATE = 'asterisk_mbox.message_updated'
+SIGNAL_CDR_UPDATE = 'asterisk_mbox.message_updated'
+SIGNAL_CDR_REQUEST = 'asterisk_mbox.message_request'
 
 CONFIG_SCHEMA = vol.Schema({
     DOMAIN: vol.Schema({
@@ -41,9 +44,7 @@ def setup(hass, config):
     port = conf.get(CONF_PORT)
     password = conf.get(CONF_PASSWORD)
 
-    hass.data[DOMAIN] = AsteriskData(hass, host, port, password)
-
-    discovery.load_platform(hass, 'mailbox', DOMAIN, {}, config)
+    hass.data[DOMAIN] = AsteriskData(hass, host, port, password, config)
 
     return True
 
@@ -51,31 +52,71 @@ def setup(hass, config):
 class AsteriskData:
     """Store Asterisk mailbox data."""
 
-    def __init__(self, hass, host, port, password):
+    def __init__(self, hass, host, port, password, config):
         """Init the Asterisk data object."""
         from asterisk_mbox import Client as asteriskClient
-
         self.hass = hass
-        self.client = asteriskClient(host, port, password, self.handle_data)
-        self.messages = []
+        self.config = config
+        self.messages = None
+        self.cdr = None
 
-        async_dispatcher_connect(
+        dispatcher_connect(
             self.hass, SIGNAL_MESSAGE_REQUEST, self._request_messages)
+        dispatcher_connect(
+            self.hass, SIGNAL_CDR_REQUEST, self._request_cdr)
+        dispatcher_connect(
+            self.hass, SIGNAL_DISCOVER_PLATFORM, self._discover_platform)
+        # Only connect after signal connection to ensure we don't miss any
+        self.client = asteriskClient(host, port, password, self.handle_data)
+
+    @callback
+    def _discover_platform(self, component):
+        _LOGGER.debug("Adding mailbox %s", component)
+        self.hass.async_create_task(discovery.async_load_platform(
+            self.hass, "mailbox", component, {}, self.config))
 
     @callback
     def handle_data(self, command, msg):
         """Handle changes to the mailbox."""
-        from asterisk_mbox.commands import CMD_MESSAGE_LIST
+        from asterisk_mbox.commands import (CMD_MESSAGE_LIST,
+                                            CMD_MESSAGE_CDR_AVAILABLE,
+                                            CMD_MESSAGE_CDR)
 
         if command == CMD_MESSAGE_LIST:
-            _LOGGER.debug("AsteriskVM sent updated message list")
+            _LOGGER.debug("AsteriskVM sent updated message list: Len %d",
+                          len(msg))
+            old_messages = self.messages
             self.messages = sorted(
                 msg, key=lambda item: item['info']['origtime'], reverse=True)
-            async_dispatcher_send(
-                self.hass, SIGNAL_MESSAGE_UPDATE, self.messages)
+            if not isinstance(old_messages, list):
+                async_dispatcher_send(self.hass, SIGNAL_DISCOVER_PLATFORM,
+                                      DOMAIN)
+            async_dispatcher_send(self.hass, SIGNAL_MESSAGE_UPDATE,
+                                  self.messages)
+        elif command == CMD_MESSAGE_CDR:
+            _LOGGER.debug("AsteriskVM sent updated CDR list: Len %d",
+                          len(msg.get('entries', [])))
+            self.cdr = msg['entries']
+            async_dispatcher_send(self.hass, SIGNAL_CDR_UPDATE, self.cdr)
+        elif command == CMD_MESSAGE_CDR_AVAILABLE:
+            if not isinstance(self.cdr, list):
+                _LOGGER.debug("AsteriskVM adding CDR platform")
+                self.cdr = []
+                async_dispatcher_send(self.hass, SIGNAL_DISCOVER_PLATFORM,
+                                      "asterisk_cdr")
+            async_dispatcher_send(self.hass, SIGNAL_CDR_REQUEST)
+        else:
+            _LOGGER.debug("AsteriskVM sent unknown message '%d' len: %d",
+                          command, len(msg))
 
     @callback
     def _request_messages(self):
         """Handle changes to the mailbox."""
         _LOGGER.debug("Requesting message list")
         self.client.messages()
+
+    @callback
+    def _request_cdr(self):
+        """Handle changes to the CDR."""
+        _LOGGER.debug("Requesting CDR list")
+        self.client.get_cdr()
diff --git a/homeassistant/components/mailbox/__init__.py b/homeassistant/components/mailbox/__init__.py
index 0c5dabb6eeb..2ed12b23164 100644
--- a/homeassistant/components/mailbox/__init__.py
+++ b/homeassistant/components/mailbox/__init__.py
@@ -23,36 +23,34 @@ from homeassistant.setup import async_prepare_setup_platform
 
 _LOGGER = logging.getLogger(__name__)
 
-CONTENT_TYPE_MPEG = 'audio/mpeg'
-
 DEPENDENCIES = ['http']
 DOMAIN = 'mailbox'
 
 EVENT = 'mailbox_updated'
+CONTENT_TYPE_MPEG = 'audio/mpeg'
+CONTENT_TYPE_NONE = 'none'
 
 SCAN_INTERVAL = timedelta(seconds=30)
 
 
-@asyncio.coroutine
-def async_setup(hass, config):
+async def async_setup(hass, config):
     """Track states and offer events for mailboxes."""
     mailboxes = []
-    yield from hass.components.frontend.async_register_built_in_panel(
+    await hass.components.frontend.async_register_built_in_panel(
         'mailbox', 'mailbox', 'mdi:mailbox')
     hass.http.register_view(MailboxPlatformsView(mailboxes))
     hass.http.register_view(MailboxMessageView(mailboxes))
     hass.http.register_view(MailboxMediaView(mailboxes))
     hass.http.register_view(MailboxDeleteView(mailboxes))
 
-    @asyncio.coroutine
-    def async_setup_platform(p_type, p_config=None, discovery_info=None):
+    async def async_setup_platform(p_type, p_config=None, discovery_info=None):
         """Set up a mailbox platform."""
         if p_config is None:
             p_config = {}
         if discovery_info is None:
             discovery_info = {}
 
-        platform = yield from async_prepare_setup_platform(
+        platform = await async_prepare_setup_platform(
             hass, config, DOMAIN, p_type)
 
         if platform is None:
@@ -63,10 +61,10 @@ def async_setup(hass, config):
         mailbox = None
         try:
             if hasattr(platform, 'async_get_handler'):
-                mailbox = yield from \
+                mailbox = await \
                     platform.async_get_handler(hass, p_config, discovery_info)
             elif hasattr(platform, 'get_handler'):
-                mailbox = yield from hass.async_add_job(
+                mailbox = await hass.async_add_executor_job(
                     platform.get_handler, hass, p_config, discovery_info)
             else:
                 raise HomeAssistantError("Invalid mailbox platform.")
@@ -81,21 +79,20 @@ def async_setup(hass, config):
             return
 
         mailboxes.append(mailbox)
-        mailbox_entity = MailboxEntity(hass, mailbox)
+        mailbox_entity = MailboxEntity(mailbox)
         component = EntityComponent(
             logging.getLogger(__name__), DOMAIN, hass, SCAN_INTERVAL)
-        yield from component.async_add_entities([mailbox_entity])
+        await component.async_add_entities([mailbox_entity])
 
     setup_tasks = [async_setup_platform(p_type, p_config) for p_type, p_config
                    in config_per_platform(config, DOMAIN)]
 
     if setup_tasks:
-        yield from asyncio.wait(setup_tasks, loop=hass.loop)
+        await asyncio.wait(setup_tasks, loop=hass.loop)
 
-    @asyncio.coroutine
-    def async_platform_discovered(platform, info):
+    async def async_platform_discovered(platform, info):
         """Handle for discovered platform."""
-        yield from async_setup_platform(platform, discovery_info=info)
+        await async_setup_platform(platform, discovery_info=info)
 
     discovery.async_listen_platform(hass, DOMAIN, async_platform_discovered)
 
@@ -103,19 +100,21 @@ def async_setup(hass, config):
 
 
 class MailboxEntity(Entity):
-    """Entity for each mailbox platform."""
+    """Entity for each mailbox platform to provide a badge display."""
 
-    def __init__(self, hass, mailbox):
+    def __init__(self, mailbox):
         """Initialize mailbox entity."""
         self.mailbox = mailbox
-        self.hass = hass
         self.message_count = 0
 
+    async def async_added_to_hass(self):
+        """Complete entity initialization."""
         @callback
         def _mailbox_updated(event):
             self.async_schedule_update_ha_state(True)
 
-        hass.bus.async_listen(EVENT, _mailbox_updated)
+        self.hass.bus.async_listen(EVENT, _mailbox_updated)
+        self.async_schedule_update_ha_state(True)
 
     @property
     def state(self):
@@ -127,10 +126,9 @@ class MailboxEntity(Entity):
         """Return the name of the entity."""
         return self.mailbox.name
 
-    @asyncio.coroutine
-    def async_update(self):
+    async def async_update(self):
         """Retrieve messages from platform."""
-        messages = yield from self.mailbox.async_get_messages()
+        messages = await self.mailbox.async_get_messages()
         self.message_count = len(messages)
 
 
@@ -151,13 +149,21 @@ class Mailbox:
         """Return the supported media type."""
         raise NotImplementedError()
 
-    @asyncio.coroutine
-    def async_get_media(self, msgid):
+    @property
+    def can_delete(self):
+        """Return if messages can be deleted."""
+        return False
+
+    @property
+    def has_media(self):
+        """Return if messages have attached media files."""
+        return False
+
+    async def async_get_media(self, msgid):
         """Return the media blob for the msgid."""
         raise NotImplementedError()
 
-    @asyncio.coroutine
-    def async_get_messages(self):
+    async def async_get_messages(self):
         """Return a list of the current messages."""
         raise NotImplementedError()
 
@@ -193,12 +199,16 @@ class MailboxPlatformsView(MailboxView):
     url = "/api/mailbox/platforms"
     name = "api:mailbox:platforms"
 
-    @asyncio.coroutine
-    def get(self, request):
+    async def get(self, request):
         """Retrieve list of platforms."""
         platforms = []
         for mailbox in self.mailboxes:
-            platforms.append(mailbox.name)
+            platforms.append(
+                {
+                    'name': mailbox.name,
+                    'has_media': mailbox.has_media,
+                    'can_delete': mailbox.can_delete
+                })
         return self.json(platforms)
 
 
@@ -208,11 +218,10 @@ class MailboxMessageView(MailboxView):
     url = "/api/mailbox/messages/{platform}"
     name = "api:mailbox:messages"
 
-    @asyncio.coroutine
-    def get(self, request, platform):
+    async def get(self, request, platform):
         """Retrieve messages."""
         mailbox = self.get_mailbox(platform)
-        messages = yield from mailbox.async_get_messages()
+        messages = await mailbox.async_get_messages()
         return self.json(messages)
 
 
@@ -222,8 +231,7 @@ class MailboxDeleteView(MailboxView):
     url = "/api/mailbox/delete/{platform}/{msgid}"
     name = "api:mailbox:delete"
 
-    @asyncio.coroutine
-    def delete(self, request, platform, msgid):
+    async def delete(self, request, platform, msgid):
         """Delete items."""
         mailbox = self.get_mailbox(platform)
         mailbox.async_delete(msgid)
@@ -235,8 +243,7 @@ class MailboxMediaView(MailboxView):
     url = r"/api/mailbox/media/{platform}/{msgid}"
     name = "api:asteriskmbox:media"
 
-    @asyncio.coroutine
-    def get(self, request, platform, msgid):
+    async def get(self, request, platform, msgid):
         """Retrieve media."""
         mailbox = self.get_mailbox(platform)
 
@@ -244,7 +251,7 @@ class MailboxMediaView(MailboxView):
         with suppress(asyncio.CancelledError, asyncio.TimeoutError):
             with async_timeout.timeout(10, loop=hass.loop):
                 try:
-                    stream = yield from mailbox.async_get_media(msgid)
+                    stream = await mailbox.async_get_media(msgid)
                 except StreamError as err:
                     error_msg = "Error getting media: %s" % (err)
                     _LOGGER.error(error_msg)
diff --git a/homeassistant/components/mailbox/asterisk_cdr.py b/homeassistant/components/mailbox/asterisk_cdr.py
new file mode 100644
index 00000000000..ae0939c3da5
--- /dev/null
+++ b/homeassistant/components/mailbox/asterisk_cdr.py
@@ -0,0 +1,64 @@
+"""
+Asterisk CDR interface.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/mailbox.asterisk_cdr/
+"""
+import logging
+import hashlib
+import datetime
+
+from homeassistant.core import callback
+from homeassistant.components.asterisk_mbox import SIGNAL_CDR_UPDATE
+from homeassistant.components.asterisk_mbox import DOMAIN as ASTERISK_DOMAIN
+from homeassistant.components.mailbox import Mailbox
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
+
+DEPENDENCIES = ['asterisk_mbox']
+_LOGGER = logging.getLogger(__name__)
+MAILBOX_NAME = "asterisk_cdr"
+
+
+async def async_get_handler(hass, config, discovery_info=None):
+    """Set up the Asterix CDR platform."""
+    return AsteriskCDR(hass, MAILBOX_NAME)
+
+
+class AsteriskCDR(Mailbox):
+    """Asterisk VM Call Data Record mailbox."""
+
+    def __init__(self, hass, name):
+        """Initialize Asterisk CDR."""
+        super().__init__(hass, name)
+        self.cdr = []
+        async_dispatcher_connect(
+            self.hass, SIGNAL_CDR_UPDATE, self._update_callback)
+
+    @callback
+    def _update_callback(self, msg):
+        """Update the message count in HA, if needed."""
+        self._build_message()
+        self.async_update()
+
+    def _build_message(self):
+        """Build message structure."""
+        cdr = []
+        for entry in self.hass.data[ASTERISK_DOMAIN].cdr:
+            timestamp = datetime.datetime.strptime(
+                entry['time'], "%Y-%m-%d %H:%M:%S").timestamp()
+            info = {
+                'origtime': timestamp,
+                'callerid': entry['callerid'],
+                'duration': entry['duration'],
+            }
+            sha = hashlib.sha256(str(entry).encode('utf-8')).hexdigest()
+            msg = "Destination: {}\nApplication: {}\n Context: {}".format(
+                entry['dest'], entry['application'], entry['context'])
+            cdr.append({'info': info, 'sha': sha, 'text': msg})
+        self.cdr = cdr
+
+    async def async_get_messages(self):
+        """Return a list of the current messages."""
+        if not self.cdr:
+            self._build_message()
+        return self.cdr
diff --git a/homeassistant/components/mailbox/asterisk_mbox.py b/homeassistant/components/mailbox/asterisk_mbox.py
index 29b34f3e512..087018084f2 100644
--- a/homeassistant/components/mailbox/asterisk_mbox.py
+++ b/homeassistant/components/mailbox/asterisk_mbox.py
@@ -4,10 +4,9 @@ Asterisk Voicemail interface.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/mailbox.asteriskvm/
 """
-import asyncio
 import logging
 
-from homeassistant.components.asterisk_mbox import DOMAIN
+from homeassistant.components.asterisk_mbox import DOMAIN as ASTERISK_DOMAIN
 from homeassistant.components.mailbox import (
     CONTENT_TYPE_MPEG, Mailbox, StreamError)
 from homeassistant.core import callback
@@ -21,10 +20,9 @@ SIGNAL_MESSAGE_REQUEST = 'asterisk_mbox.message_request'
 SIGNAL_MESSAGE_UPDATE = 'asterisk_mbox.message_updated'
 
 
-@asyncio.coroutine
-def async_get_handler(hass, config, async_add_entities, discovery_info=None):
+async def async_get_handler(hass, config, discovery_info=None):
     """Set up the Asterix VM platform."""
-    return AsteriskMailbox(hass, DOMAIN)
+    return AsteriskMailbox(hass, ASTERISK_DOMAIN)
 
 
 class AsteriskMailbox(Mailbox):
@@ -46,24 +44,32 @@ class AsteriskMailbox(Mailbox):
         """Return the supported media type."""
         return CONTENT_TYPE_MPEG
 
-    @asyncio.coroutine
-    def async_get_media(self, msgid):
+    @property
+    def can_delete(self):
+        """Return if messages can be deleted."""
+        return True
+
+    @property
+    def has_media(self):
+        """Return if messages have attached media files."""
+        return True
+
+    async def async_get_media(self, msgid):
         """Return the media blob for the msgid."""
         from asterisk_mbox import ServerError
-        client = self.hass.data[DOMAIN].client
+        client = self.hass.data[ASTERISK_DOMAIN].client
         try:
             return client.mp3(msgid, sync=True)
         except ServerError as err:
             raise StreamError(err)
 
-    @asyncio.coroutine
-    def async_get_messages(self):
+    async def async_get_messages(self):
         """Return a list of the current messages."""
-        return self.hass.data[DOMAIN].messages
+        return self.hass.data[ASTERISK_DOMAIN].messages
 
     def async_delete(self, msgid):
         """Delete the specified messages."""
-        client = self.hass.data[DOMAIN].client
+        client = self.hass.data[ASTERISK_DOMAIN].client
         _LOGGER.info("Deleting: %s", msgid)
         client.delete(msgid)
         return True
diff --git a/homeassistant/components/mailbox/demo.py b/homeassistant/components/mailbox/demo.py
index e0d2618ac4e..2aabde42b36 100644
--- a/homeassistant/components/mailbox/demo.py
+++ b/homeassistant/components/mailbox/demo.py
@@ -4,7 +4,6 @@ Asterisk Voicemail interface.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/mailbox.asteriskvm/
 """
-import asyncio
 from hashlib import sha1
 import logging
 import os
@@ -15,13 +14,12 @@ from homeassistant.util import dt
 
 _LOGGER = logging.getLogger(__name__)
 
-DOMAIN = "DemoMailbox"
+MAILBOX_NAME = "DemoMailbox"
 
 
-@asyncio.coroutine
-def async_get_handler(hass, config, discovery_info=None):
+async def async_get_handler(hass, config, discovery_info=None):
     """Set up the Demo mailbox."""
-    return DemoMailbox(hass, DOMAIN)
+    return DemoMailbox(hass, MAILBOX_NAME)
 
 
 class DemoMailbox(Mailbox):
@@ -54,8 +52,17 @@ class DemoMailbox(Mailbox):
         """Return the supported media type."""
         return CONTENT_TYPE_MPEG
 
-    @asyncio.coroutine
-    def async_get_media(self, msgid):
+    @property
+    def can_delete(self):
+        """Return if messages can be deleted."""
+        return True
+
+    @property
+    def has_media(self):
+        """Return if messages have attached media files."""
+        return True
+
+    async def async_get_media(self, msgid):
         """Return the media blob for the msgid."""
         if msgid not in self._messages:
             raise StreamError("Message not found")
@@ -65,8 +72,7 @@ class DemoMailbox(Mailbox):
         with open(audio_path, 'rb') as file:
             return file.read()
 
-    @asyncio.coroutine
-    def async_get_messages(self):
+    async def async_get_messages(self):
         """Return a list of the current messages."""
         return sorted(self._messages.values(),
                       key=lambda item: item['info']['origtime'],
diff --git a/tests/components/mailbox/test_init.py b/tests/components/mailbox/test_init.py
index 3377fcefcf5..2c69a5effa7 100644
--- a/tests/components/mailbox/test_init.py
+++ b/tests/components/mailbox/test_init.py
@@ -29,7 +29,7 @@ def test_get_platforms_from_mailbox(mock_http_client):
     req = yield from mock_http_client.get(url)
     assert req.status == 200
     result = yield from req.json()
-    assert len(result) == 1 and "DemoMailbox" in result
+    assert len(result) == 1 and "DemoMailbox" == result[0].get('name', None)
 
 
 @asyncio.coroutine

From 3d1c8ee467697805f383158af20f14fb6eee4b71 Mon Sep 17 00:00:00 2001
From: Rohan Kapoor <rohan@rohankapoor.com>
Date: Fri, 21 Sep 2018 02:57:01 -0700
Subject: [PATCH 226/357] Implement support for complex templates in script
 delays (#16442)

* Implement support for complex templates in script delays

* Swap out dict instead of collections.Mapping
---
 homeassistant/helpers/config_validation.py |  2 +-
 homeassistant/helpers/script.py            |  5 ++
 tests/helpers/test_script.py               | 64 ++++++++++++++++++++++
 3 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/homeassistant/helpers/config_validation.py b/homeassistant/helpers/config_validation.py
index 3363b199b0b..bb4dcf6a55f 100644
--- a/homeassistant/helpers/config_validation.py
+++ b/homeassistant/helpers/config_validation.py
@@ -590,7 +590,7 @@ _SCRIPT_DELAY_SCHEMA = vol.Schema({
     vol.Optional(CONF_ALIAS): string,
     vol.Required("delay"): vol.Any(
         vol.All(time_period, positive_timedelta),
-        template)
+        template, template_complex)
 })
 
 _SCRIPT_WAIT_TEMPLATE_SCHEMA = vol.Schema({
diff --git a/homeassistant/helpers/script.py b/homeassistant/helpers/script.py
index 8a33b57e9d1..96f9b2d5069 100644
--- a/homeassistant/helpers/script.py
+++ b/homeassistant/helpers/script.py
@@ -107,6 +107,11 @@ class Script():
                             cv.time_period,
                             cv.positive_timedelta)(
                                 delay.async_render(variables))
+                    elif isinstance(delay, dict):
+                        delay_data = {}
+                        delay_data.update(
+                            template.render_complex(delay, variables))
+                        delay = cv.time_period(delay_data)
                 except (TemplateError, vol.Invalid) as ex:
                     _LOGGER.error("Error rendering '%s' delay template: %s",
                                   self.name, ex)
diff --git a/tests/helpers/test_script.py b/tests/helpers/test_script.py
index 2956d82c2ba..d217b99b3a8 100644
--- a/tests/helpers/test_script.py
+++ b/tests/helpers/test_script.py
@@ -255,6 +255,70 @@ class TestScriptHelper(unittest.TestCase):
         assert not script_obj.is_running
         assert len(events) == 1
 
+    def test_delay_complex_template(self):
+        """Test the delay with a working complex template."""
+        event = 'test_event'
+        events = []
+
+        @callback
+        def record_event(event):
+            """Add recorded event to set."""
+            events.append(event)
+
+        self.hass.bus.listen(event, record_event)
+
+        script_obj = script.Script(self.hass, cv.SCRIPT_SCHEMA([
+            {'event': event},
+            {'delay': {
+                'seconds': '{{ 5 }}'
+            }},
+            {'event': event}]))
+
+        script_obj.run()
+        self.hass.block_till_done()
+
+        assert script_obj.is_running
+        assert script_obj.can_cancel
+        assert script_obj.last_action == event
+        assert len(events) == 1
+
+        future = dt_util.utcnow() + timedelta(seconds=5)
+        fire_time_changed(self.hass, future)
+        self.hass.block_till_done()
+
+        assert not script_obj.is_running
+        assert len(events) == 2
+
+    def test_delay_complex_invalid_template(self):
+        """Test the delay with a complex template that fails."""
+        event = 'test_event'
+        events = []
+
+        @callback
+        def record_event(event):
+            """Add recorded event to set."""
+            events.append(event)
+
+        self.hass.bus.listen(event, record_event)
+
+        script_obj = script.Script(self.hass, cv.SCRIPT_SCHEMA([
+            {'event': event},
+            {'delay': {
+                 'seconds': '{{ invalid_delay }}'
+            }},
+            {'delay': {
+                'seconds': '{{ 5 }}'
+            }},
+            {'event': event}]))
+
+        with mock.patch.object(script, '_LOGGER') as mock_logger:
+            script_obj.run()
+            self.hass.block_till_done()
+            assert mock_logger.error.called
+
+        assert not script_obj.is_running
+        assert len(events) == 1
+
     def test_cancel_while_delay(self):
         """Test the cancelling while the delay is present."""
         event = 'test_event'

From aeaf6945521ae37a232435c32ee6991bd86e98db Mon Sep 17 00:00:00 2001
From: Evan Bruhn <evan.bruhn@gmail.com>
Date: Fri, 21 Sep 2018 20:00:15 +1000
Subject: [PATCH 227/357] Add Logi Circle component, camera and sensor platform
 (#16540)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Added Logi Circle platform, camera and sensor

* Integrated with Logo Circle API’s feature detection to exclude sensors not supported by device. Added services for recording livestream and taking a snapshot from the livestream.

* Migrated livestream snapshot and recording functionality out of home assistant components and into the logi circle API wrapper. Added services.yaml entries for logi services.

* Added new Logi sensor types, updated to latest version of `logi_circle` and tidy up in preparation for pull request.

- Renamed `logi_set_mode` to `logi_set_config`.
- Live stream recording and snapshot methods now respect whitelisted path configuration.
- Added `streaming_mode` and `speaker_volume` sensors.
- Moved model-specific turn on/off logic to `logi_circle` library.

* Renamed `logi` component domain to `logi_circle`.

* Updates based on PR feedback

* Added timeout of 15s to logi_circle initial setup requests (login and grabbing cameras).
* Added unique ID (uses MAC address for camera platform, MAC address + sensor type for sensor platform).
* Added battery level and battery charging attributes to camera.
* Removed static attributes from device_state_attributes.
* Replaced STATE_UNKNOWN with None, replaced ‘on’ & ‘off’ with STATE_ON and STATE_OFF.
* Removed redundant SCAN_INTERVAL in sensor, removed redundant hass param from async_setup_platform in camera and sensor.
* Style tweaks.

* Replaced `asyncio.wait_for` with `async_timeout` to be consistent with other components.
---
 .coveragerc                                   |   3 +
 .../components/camera/logi_circle.py          | 210 ++++++++++++++++++
 homeassistant/components/camera/services.yaml |  36 +++
 homeassistant/components/logi_circle.py       |  80 +++++++
 .../components/sensor/logi_circle.py          | 156 +++++++++++++
 requirements_all.txt                          |   3 +
 6 files changed, 488 insertions(+)
 create mode 100644 homeassistant/components/camera/logi_circle.py
 create mode 100644 homeassistant/components/logi_circle.py
 create mode 100644 homeassistant/components/sensor/logi_circle.py

diff --git a/.coveragerc b/.coveragerc
index 39c2bce5ae5..79afac5709f 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -191,6 +191,9 @@ omit =
     homeassistant/components/linode.py
     homeassistant/components/*/linode.py
 
+    homeassistant/components/logi_circle.py
+    homeassistant/components/*/logi_circle.py
+
     homeassistant/components/lutron.py
     homeassistant/components/*/lutron.py
 
diff --git a/homeassistant/components/camera/logi_circle.py b/homeassistant/components/camera/logi_circle.py
new file mode 100644
index 00000000000..1dae58ad0f7
--- /dev/null
+++ b/homeassistant/components/camera/logi_circle.py
@@ -0,0 +1,210 @@
+"""
+This component provides support to the Logi Circle camera.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/camera.logi_circle/
+"""
+import logging
+import asyncio
+from datetime import timedelta
+
+import voluptuous as vol
+
+from homeassistant.helpers import config_validation as cv
+from homeassistant.components.logi_circle import (
+    DOMAIN as LOGI_CIRCLE_DOMAIN, CONF_ATTRIBUTION)
+from homeassistant.components.camera import (
+    Camera, PLATFORM_SCHEMA, CAMERA_SERVICE_SCHEMA, SUPPORT_ON_OFF,
+    ATTR_ENTITY_ID, ATTR_FILENAME, DOMAIN)
+from homeassistant.const import (
+    ATTR_ATTRIBUTION, ATTR_BATTERY_CHARGING, ATTR_BATTERY_LEVEL,
+    CONF_SCAN_INTERVAL, STATE_ON, STATE_OFF)
+
+DEPENDENCIES = ['logi_circle']
+
+_LOGGER = logging.getLogger(__name__)
+
+SCAN_INTERVAL = timedelta(seconds=60)
+
+SERVICE_SET_CONFIG = 'logi_circle_set_config'
+SERVICE_LIVESTREAM_SNAPSHOT = 'logi_circle_livestream_snapshot'
+SERVICE_LIVESTREAM_RECORD = 'logi_circle_livestream_record'
+DATA_KEY = 'camera.logi_circle'
+
+BATTERY_SAVING_MODE_KEY = 'BATTERY_SAVING'
+PRIVACY_MODE_KEY = 'PRIVACY_MODE'
+LED_MODE_KEY = 'LED'
+
+ATTR_MODE = 'mode'
+ATTR_VALUE = 'value'
+ATTR_DURATION = 'duration'
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_SCAN_INTERVAL, default=SCAN_INTERVAL):
+        cv.time_period,
+})
+
+LOGI_CIRCLE_SERVICE_SET_CONFIG = CAMERA_SERVICE_SCHEMA.extend({
+    vol.Required(ATTR_MODE): vol.In([BATTERY_SAVING_MODE_KEY, LED_MODE_KEY,
+                                     PRIVACY_MODE_KEY]),
+    vol.Required(ATTR_VALUE): cv.boolean
+})
+
+LOGI_CIRCLE_SERVICE_SNAPSHOT = CAMERA_SERVICE_SCHEMA.extend({
+    vol.Required(ATTR_FILENAME): cv.template
+})
+
+LOGI_CIRCLE_SERVICE_RECORD = CAMERA_SERVICE_SCHEMA.extend({
+    vol.Required(ATTR_FILENAME): cv.template,
+    vol.Required(ATTR_DURATION): cv.positive_int
+})
+
+
+async def async_setup_platform(
+        hass, config, async_add_entities, discovery_info=None):
+    """Set up a Logi Circle Camera."""
+    devices = hass.data[LOGI_CIRCLE_DOMAIN]
+
+    cameras = []
+    for device in devices:
+        cameras.append(LogiCam(device, config))
+
+    async_add_entities(cameras, True)
+
+    async def service_handler(service):
+        """Dispatch service calls to target entities."""
+        params = {key: value for key, value in service.data.items()
+                  if key != ATTR_ENTITY_ID}
+        entity_ids = service.data.get(ATTR_ENTITY_ID)
+        if entity_ids:
+            target_devices = [dev for dev in cameras
+                              if dev.entity_id in entity_ids]
+        else:
+            target_devices = cameras
+
+        for target_device in target_devices:
+            if service.service == SERVICE_SET_CONFIG:
+                await target_device.set_config(**params)
+            if service.service == SERVICE_LIVESTREAM_SNAPSHOT:
+                await target_device.livestream_snapshot(**params)
+            if service.service == SERVICE_LIVESTREAM_RECORD:
+                await target_device.download_livestream(**params)
+
+    hass.services.async_register(
+        DOMAIN, SERVICE_SET_CONFIG, service_handler,
+        schema=LOGI_CIRCLE_SERVICE_SET_CONFIG)
+
+    hass.services.async_register(
+        DOMAIN, SERVICE_LIVESTREAM_SNAPSHOT, service_handler,
+        schema=LOGI_CIRCLE_SERVICE_SNAPSHOT)
+
+    hass.services.async_register(
+        DOMAIN, SERVICE_LIVESTREAM_RECORD, service_handler,
+        schema=LOGI_CIRCLE_SERVICE_RECORD)
+
+
+class LogiCam(Camera):
+    """An implementation of a Logi Circle camera."""
+
+    def __init__(self, camera, device_info):
+        """Initialize Logi Circle camera."""
+        super().__init__()
+        self._camera = camera
+        self._name = self._camera.name
+        self._id = self._camera.mac_address
+        self._has_battery = self._camera.supports_feature('battery_level')
+
+    @property
+    def unique_id(self):
+        """Return a unique ID."""
+        return self._id
+
+    @property
+    def name(self):
+        """Return the name of this camera."""
+        return self._name
+
+    @property
+    def supported_features(self):
+        """Logi Circle camera's support turning on and off ("soft" switch)."""
+        return SUPPORT_ON_OFF
+
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes."""
+        state = {
+            ATTR_ATTRIBUTION: CONF_ATTRIBUTION,
+            'battery_saving_mode': (
+                STATE_ON if self._camera.battery_saving else STATE_OFF),
+            'ip_address': self._camera.ip_address,
+            'microphone_gain': self._camera.microphone_gain
+        }
+
+        # Add battery attributes if camera is battery-powered
+        if self._has_battery:
+            state[ATTR_BATTERY_CHARGING] = self._camera.is_charging
+            state[ATTR_BATTERY_LEVEL] = self._camera.battery_level
+
+        return state
+
+    async def async_camera_image(self):
+        """Return a still image from the camera."""
+        return await self._camera.get_snapshot_image()
+
+    async def async_turn_off(self):
+        """Disable streaming mode for this camera."""
+        await self._camera.set_streaming_mode(False)
+
+    async def async_turn_on(self):
+        """Enable streaming mode for this camera."""
+        await self._camera.set_streaming_mode(True)
+
+    @property
+    def should_poll(self):
+        """Update the image periodically."""
+        return True
+
+    async def set_config(self, mode, value):
+        """Set an configuration property for the target camera."""
+        if mode == LED_MODE_KEY:
+            await self._camera.set_led(value)
+        if mode == PRIVACY_MODE_KEY:
+            await self._camera.set_privacy_mode(value)
+        if mode == BATTERY_SAVING_MODE_KEY:
+            await self._camera.set_battery_saving_mode(value)
+
+    async def download_livestream(self, filename, duration):
+        """Download a recording from the camera's livestream."""
+        # Render filename from template.
+        filename.hass = self.hass
+        stream_file = filename.async_render(
+            variables={ATTR_ENTITY_ID: self.entity_id})
+
+        # Respect configured path whitelist.
+        if not self.hass.config.is_allowed_path(stream_file):
+            _LOGGER.error(
+                "Can't write %s, no access to path!", stream_file)
+            return
+
+        asyncio.shield(self._camera.record_livestream(
+            stream_file, timedelta(seconds=duration)), loop=self.hass.loop)
+
+    async def livestream_snapshot(self, filename):
+        """Download a still frame from the camera's livestream."""
+        # Render filename from template.
+        filename.hass = self.hass
+        snapshot_file = filename.async_render(
+            variables={ATTR_ENTITY_ID: self.entity_id})
+
+        # Respect configured path whitelist.
+        if not self.hass.config.is_allowed_path(snapshot_file):
+            _LOGGER.error(
+                "Can't write %s, no access to path!", snapshot_file)
+            return
+
+        asyncio.shield(self._camera.get_livestream_image(
+            snapshot_file), loop=self.hass.loop)
+
+    async def async_update(self):
+        """Update camera entity and refresh attributes."""
+        await self._camera.update()
diff --git a/homeassistant/components/camera/services.yaml b/homeassistant/components/camera/services.yaml
index b977fcd5c52..1cae5baf1cf 100644
--- a/homeassistant/components/camera/services.yaml
+++ b/homeassistant/components/camera/services.yaml
@@ -63,3 +63,39 @@ onvif_ptz:
     zoom:
       description: "Zoom. Allowed values: ZOOM_IN, ZOOM_OUT"
       example: "ZOOM_IN"
+
+logi_circle_set_config:
+  description: Set a configuration property.
+  fields:
+    entity_id:
+      description: Name(s) of entities to apply the operation mode to.
+      example: "camera.living_room_camera"
+    mode:
+      description: "Operation mode. Allowed values: BATTERY_SAVING, LED, PRIVACY_MODE."
+      example: "PRIVACY_MODE"
+    value:
+      description: "Operation value. Allowed values: true, false"
+      example: true
+
+logi_circle_livestream_snapshot:
+  description: Take a snapshot from the camera's livestream. Will wake the camera from sleep if required.
+  fields:
+    entity_id:
+      description: Name(s) of entities to create snapshots from.
+      example: "camera.living_room_camera"
+    filename:
+      description: Template of a Filename. Variable is entity_id.
+      example: "/tmp/snapshot_{{ entity_id }}.jpg"
+
+logi_circle_livestream_record:
+  description: Take a video recording from the camera's livestream.
+  fields:
+    entity_id:
+      description: Name(s) of entities to create recordings from.
+      example: "camera.living_room_camera"
+    filename:
+      description: Template of a Filename. Variable is entity_id.
+      example: "/tmp/snapshot_{{ entity_id }}.mp4"
+    duration:
+      description: Recording duration in seconds.
+      example: 60
diff --git a/homeassistant/components/logi_circle.py b/homeassistant/components/logi_circle.py
new file mode 100644
index 00000000000..c0a7f4c2621
--- /dev/null
+++ b/homeassistant/components/logi_circle.py
@@ -0,0 +1,80 @@
+"""
+Support for Logi Circle cameras.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/logi_circle/
+"""
+import logging
+import asyncio
+
+import voluptuous as vol
+import async_timeout
+
+import homeassistant.helpers.config_validation as cv
+from homeassistant.const import CONF_USERNAME, CONF_PASSWORD
+
+REQUIREMENTS = ['logi_circle==0.1.7']
+
+_LOGGER = logging.getLogger(__name__)
+_TIMEOUT = 15  # seconds
+
+CONF_ATTRIBUTION = "Data provided by circle.logi.com"
+
+NOTIFICATION_ID = 'logi_notification'
+NOTIFICATION_TITLE = 'Logi Circle Setup'
+
+DOMAIN = 'logi_circle'
+DEFAULT_CACHEDB = '.logi_cache.pickle'
+DEFAULT_ENTITY_NAMESPACE = 'logi_circle'
+
+CONFIG_SCHEMA = vol.Schema({
+    DOMAIN: vol.Schema({
+        vol.Required(CONF_USERNAME): cv.string,
+        vol.Required(CONF_PASSWORD): cv.string,
+    }),
+}, extra=vol.ALLOW_EXTRA)
+
+
+async def async_setup(hass, config):
+    """Set up the Logi Circle component."""
+    conf = config[DOMAIN]
+    username = conf[CONF_USERNAME]
+    password = conf[CONF_PASSWORD]
+
+    try:
+        from logi_circle import Logi
+        from logi_circle.exception import BadLogin
+        from aiohttp.client_exceptions import ClientResponseError
+
+        cache = hass.config.path(DEFAULT_CACHEDB)
+        logi = Logi(username=username, password=password, cache_file=cache)
+
+        with async_timeout.timeout(_TIMEOUT, loop=hass.loop):
+            await logi.login()
+            hass.data[DOMAIN] = await logi.cameras
+
+        if not logi.is_connected:
+            return False
+    except (BadLogin, ClientResponseError) as ex:
+        _LOGGER.error('Unable to connect to Logi Circle API: %s', str(ex))
+        hass.components.persistent_notification.create(
+            'Error: {}<br />'
+            'You will need to restart hass after fixing.'
+            ''.format(ex),
+            title=NOTIFICATION_TITLE,
+            notification_id=NOTIFICATION_ID)
+        return False
+    except asyncio.TimeoutError:
+        # The TimeoutError exception object returns nothing when casted to a
+        # string, so we'll handle it separately.
+        err = '{}s timeout exceeded when connecting to Logi Circle API'.format(
+            _TIMEOUT)
+        _LOGGER.error(err)
+        hass.components.persistent_notification.create(
+            'Error: {}<br />'
+            'You will need to restart hass after fixing.'
+            ''.format(err),
+            title=NOTIFICATION_TITLE,
+            notification_id=NOTIFICATION_ID)
+        return False
+    return True
diff --git a/homeassistant/components/sensor/logi_circle.py b/homeassistant/components/sensor/logi_circle.py
new file mode 100644
index 00000000000..a0a2ca96444
--- /dev/null
+++ b/homeassistant/components/sensor/logi_circle.py
@@ -0,0 +1,156 @@
+"""
+This component provides HA sensor support for Logi Circle cameras.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/sensor.logi_circle/
+"""
+import logging
+
+import voluptuous as vol
+
+import homeassistant.helpers.config_validation as cv
+from homeassistant.components.logi_circle import (
+    CONF_ATTRIBUTION, DEFAULT_ENTITY_NAMESPACE, DOMAIN as LOGI_CIRCLE_DOMAIN)
+from homeassistant.components.sensor import PLATFORM_SCHEMA
+from homeassistant.const import (
+    ATTR_ATTRIBUTION, ATTR_BATTERY_CHARGING,
+    CONF_ENTITY_NAMESPACE, CONF_MONITORED_CONDITIONS,
+    STATE_ON, STATE_OFF)
+from homeassistant.helpers.entity import Entity
+from homeassistant.helpers.icon import icon_for_battery_level
+from homeassistant.util.dt import as_local
+
+DEPENDENCIES = ['logi_circle']
+
+_LOGGER = logging.getLogger(__name__)
+
+# Sensor types: Name, unit of measure, icon per sensor key.
+SENSOR_TYPES = {
+    'battery_level': [
+        'Battery', '%', 'battery-50'],
+
+    'last_activity_time': [
+        'Last Activity', None, 'history'],
+
+    'privacy_mode': [
+        'Privacy Mode', None, 'eye'],
+
+    'signal_strength_category': [
+        'WiFi Signal Category', None, 'wifi'],
+
+    'signal_strength_percentage': [
+        'WiFi Signal Strength', '%', 'wifi'],
+
+    'speaker_volume': [
+        'Volume', '%', 'volume-high'],
+
+    'streaming_mode': [
+        'Streaming Mode', None, 'camera'],
+}
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_ENTITY_NAMESPACE, default=DEFAULT_ENTITY_NAMESPACE):
+        cv.string,
+    vol.Required(CONF_MONITORED_CONDITIONS, default=list(SENSOR_TYPES)):
+        vol.All(cv.ensure_list, [vol.In(SENSOR_TYPES)]),
+})
+
+
+async def async_setup_platform(
+        hass, config, async_add_entities, discovery_info=None):
+    """Set up a sensor for a Logi Circle device."""
+    devices = hass.data[LOGI_CIRCLE_DOMAIN]
+    time_zone = str(hass.config.time_zone)
+
+    sensors = []
+    for sensor_type in config.get(CONF_MONITORED_CONDITIONS):
+        for device in devices:
+            if device.supports_feature(sensor_type):
+                sensors.append(LogiSensor(device, time_zone, sensor_type))
+
+    async_add_entities(sensors, True)
+
+
+class LogiSensor(Entity):
+    """A sensor implementation for a Logi Circle camera."""
+
+    def __init__(self, camera, time_zone, sensor_type):
+        """Initialize a sensor for Logi Circle camera."""
+        self._sensor_type = sensor_type
+        self._camera = camera
+        self._id = '{}-{}'.format(self._camera.mac_address, self._sensor_type)
+        self._icon = 'mdi:{}'.format(SENSOR_TYPES.get(self._sensor_type)[2])
+        self._name = "{0} {1}".format(
+            self._camera.name, SENSOR_TYPES.get(self._sensor_type)[0])
+        self._state = None
+        self._tz = time_zone
+
+    @property
+    def unique_id(self):
+        """Return a unique ID."""
+        return self._id
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return self._name
+
+    @property
+    def state(self):
+        """Return the state of the sensor."""
+        return self._state
+
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes."""
+        state = {
+            ATTR_ATTRIBUTION: CONF_ATTRIBUTION,
+            'battery_saving_mode': (
+                STATE_ON if self._camera.battery_saving else STATE_OFF),
+            'ip_address': self._camera.ip_address,
+            'microphone_gain': self._camera.microphone_gain
+        }
+
+        if self._sensor_type == 'battery_level':
+            state[ATTR_BATTERY_CHARGING] = self._camera.is_charging
+
+        return state
+
+    @property
+    def icon(self):
+        """Icon to use in the frontend, if any."""
+        if (self._sensor_type == 'battery_level' and
+                self._state is not None):
+            return icon_for_battery_level(battery_level=int(self._state),
+                                          charging=False)
+        if (self._sensor_type == 'privacy_mode' and
+                self._state is not None):
+            return 'mdi:eye-off' if self._state == STATE_ON else 'mdi:eye'
+        if (self._sensor_type == 'streaming_mode' and
+                self._state is not None):
+            return (
+                'mdi:camera' if self._state == STATE_ON else 'mdi:camera-off')
+        return self._icon
+
+    @property
+    def unit_of_measurement(self):
+        """Return the units of measurement."""
+        return SENSOR_TYPES.get(self._sensor_type)[1]
+
+    async def update(self):
+        """Get the latest data and updates the state."""
+        _LOGGER.debug("Pulling data from %s sensor", self._name)
+        await self._camera.update()
+
+        if self._sensor_type == 'last_activity_time':
+            last_activity = await self._camera.last_activity
+            if last_activity is not None:
+                last_activity_time = as_local(last_activity.end_time_utc)
+                self._state = '{0:0>2}:{1:0>2}'.format(
+                    last_activity_time.hour, last_activity_time.minute)
+        else:
+            state = getattr(self._camera, self._sensor_type, None)
+            if isinstance(state, bool):
+                self._state = STATE_ON if state is True else STATE_OFF
+            else:
+                self._state = state
diff --git a/requirements_all.txt b/requirements_all.txt
index 1758e96c643..2c9871962f9 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -556,6 +556,9 @@ lmnotify==0.0.4
 # homeassistant.components.device_tracker.google_maps
 locationsharinglib==2.0.11
 
+# homeassistant.components.logi_circle
+logi_circle==0.1.7
+
 # homeassistant.components.sensor.luftdaten
 luftdaten==0.2.0
 

From 9fdf123a2fa290f7d39f7f6564e327ffb415f1e7 Mon Sep 17 00:00:00 2001
From: Alexei Chetroi <lexoid@gmail.com>
Date: Fri, 21 Sep 2018 06:11:23 -0400
Subject: [PATCH 228/357] Zha switch schedule update state (#16621)

* switch.zha: Schedule state update.

if turning switch On or Off operation was successful, then schedule
state update

* switch.zha: Update debug logging.
---
 homeassistant/components/switch/zha.py | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/homeassistant/components/switch/zha.py b/homeassistant/components/switch/zha.py
index 4fde3565348..68a94cc1ca5 100644
--- a/homeassistant/components/switch/zha.py
+++ b/homeassistant/components/switch/zha.py
@@ -44,7 +44,10 @@ class Switch(zha.Entity, SwitchDevice):
 
     def attribute_updated(self, attribute, value):
         """Handle attribute update from device."""
-        _LOGGER.debug("Attribute updated: %s %s %s", self, attribute, value)
+        cluster = self._endpoint.on_off
+        attr_name = cluster.attributes.get(attribute, [attribute])[0]
+        _LOGGER.debug("%s: Attribute '%s' on cluster '%s' updated to %s",
+                      self.entity_id, attr_name, cluster.ep_attribute, value)
         if attribute == self.value_attribute:
             self._state = value
             self.async_schedule_update_ha_state()
@@ -65,23 +68,29 @@ class Switch(zha.Entity, SwitchDevice):
         """Turn the entity on."""
         from zigpy.exceptions import DeliveryError
         try:
-            await self._endpoint.on_off.on()
+            res = await self._endpoint.on_off.on()
+            _LOGGER.debug("%s: turned 'on': %s", self.entity_id, res[1])
         except DeliveryError as ex:
-            _LOGGER.error("Unable to turn the switch on: %s", ex)
+            _LOGGER.error("%s: Unable to turn the switch on: %s",
+                          self.entity_id, ex)
             return
 
         self._state = 1
+        self.async_schedule_update_ha_state()
 
     async def async_turn_off(self, **kwargs):
         """Turn the entity off."""
         from zigpy.exceptions import DeliveryError
         try:
-            await self._endpoint.on_off.off()
+            res = await self._endpoint.on_off.off()
+            _LOGGER.debug("%s: turned 'off': %s", self.entity_id, res[1])
         except DeliveryError as ex:
-            _LOGGER.error("Unable to turn the switch off: %s", ex)
+            _LOGGER.error("%s: Unable to turn the switch off: %s",
+                          self.entity_id, ex)
             return
 
         self._state = 0
+        self.async_schedule_update_ha_state()
 
     async def async_update(self):
         """Retrieve latest state."""

From 3bfe9e757ef950d7c4a80d6c8c6ef582d36758ec Mon Sep 17 00:00:00 2001
From: cdce8p <30130371+cdce8p@users.noreply.github.com>
Date: Fri, 21 Sep 2018 12:51:02 +0200
Subject: [PATCH 229/357] Add Carbon Monoxide HomeKit Sensor (#16664)

---
 homeassistant/components/homekit/__init__.py  |  8 ++-
 homeassistant/components/homekit/const.py     |  7 +++
 .../components/homekit/type_sensors.py        | 47 +++++++++++---
 .../homekit/test_get_accessories.py           |  2 +
 tests/components/homekit/test_type_sensors.py | 62 ++++++++++++++++---
 5 files changed, 105 insertions(+), 21 deletions(-)

diff --git a/homeassistant/components/homekit/__init__.py b/homeassistant/components/homekit/__init__.py
index eac02855b0b..8c12243ee8f 100644
--- a/homeassistant/components/homekit/__init__.py
+++ b/homeassistant/components/homekit/__init__.py
@@ -22,9 +22,9 @@ from homeassistant.util import get_local_ip
 from homeassistant.util.decorator import Registry
 from .const import (
     BRIDGE_NAME, CONF_AUTO_START, CONF_ENTITY_CONFIG, CONF_FEATURE_LIST,
-    CONF_FILTER, DEFAULT_AUTO_START, DEFAULT_PORT, DEVICE_CLASS_CO2,
-    DEVICE_CLASS_PM25, DOMAIN, HOMEKIT_FILE, SERVICE_HOMEKIT_START,
-    TYPE_OUTLET, TYPE_SWITCH)
+    CONF_FILTER, DEFAULT_AUTO_START, DEFAULT_PORT, DEVICE_CLASS_CO,
+    DEVICE_CLASS_CO2, DEVICE_CLASS_PM25, DOMAIN, HOMEKIT_FILE,
+    SERVICE_HOMEKIT_START, TYPE_OUTLET, TYPE_SWITCH)
 from .util import (
     show_setup_message, validate_entity_config, validate_media_player_features)
 
@@ -150,6 +150,8 @@ def get_accessory(hass, driver, state, aid, config):
         elif device_class == DEVICE_CLASS_PM25 \
                 or DEVICE_CLASS_PM25 in state.entity_id:
             a_type = 'AirQualitySensor'
+        elif device_class == DEVICE_CLASS_CO:
+            a_type = 'CarbonMonoxideSensor'
         elif device_class == DEVICE_CLASS_CO2 \
                 or DEVICE_CLASS_CO2 in state.entity_id:
             a_type = 'CarbonDioxideSensor'
diff --git a/homeassistant/components/homekit/const.py b/homeassistant/components/homekit/const.py
index 33d2c0bfb85..df488d4a73a 100644
--- a/homeassistant/components/homekit/const.py
+++ b/homeassistant/components/homekit/const.py
@@ -69,6 +69,8 @@ CHAR_CARBON_DIOXIDE_DETECTED = 'CarbonDioxideDetected'
 CHAR_CARBON_DIOXIDE_LEVEL = 'CarbonDioxideLevel'
 CHAR_CARBON_DIOXIDE_PEAK_LEVEL = 'CarbonDioxidePeakLevel'
 CHAR_CARBON_MONOXIDE_DETECTED = 'CarbonMonoxideDetected'
+CHAR_CARBON_MONOXIDE_LEVEL = 'CarbonMonoxideLevel'
+CHAR_CARBON_MONOXIDE_PEAK_LEVEL = 'CarbonMonoxidePeakLevel'
 CHAR_CHARGING_STATE = 'ChargingState'
 CHAR_COLOR_TEMPERATURE = 'ColorTemperature'
 CHAR_CONTACT_SENSOR_STATE = 'ContactSensorState'
@@ -114,6 +116,7 @@ PROP_MIN_VALUE = 'minValue'
 PROP_CELSIUS = {'minValue': -273, 'maxValue': 999}
 
 # #### Device Classes ####
+DEVICE_CLASS_CO = 'co'
 DEVICE_CLASS_CO2 = 'co2'
 DEVICE_CLASS_DOOR = 'door'
 DEVICE_CLASS_GARAGE_DOOR = 'garage_door'
@@ -125,3 +128,7 @@ DEVICE_CLASS_OPENING = 'opening'
 DEVICE_CLASS_PM25 = 'pm25'
 DEVICE_CLASS_SMOKE = 'smoke'
 DEVICE_CLASS_WINDOW = 'window'
+
+# #### Thresholds ####
+THRESHOLD_CO = 25
+THRESHOLD_CO2 = 1000
diff --git a/homeassistant/components/homekit/type_sensors.py b/homeassistant/components/homekit/type_sensors.py
index d4c2cb58209..d2101b1e6f9 100644
--- a/homeassistant/components/homekit/type_sensors.py
+++ b/homeassistant/components/homekit/type_sensors.py
@@ -13,6 +13,7 @@ from .const import (
     CHAR_AIR_PARTICULATE_DENSITY, CHAR_AIR_QUALITY,
     CHAR_CARBON_DIOXIDE_DETECTED, CHAR_CARBON_DIOXIDE_LEVEL,
     CHAR_CARBON_DIOXIDE_PEAK_LEVEL, CHAR_CARBON_MONOXIDE_DETECTED,
+    CHAR_CARBON_MONOXIDE_LEVEL, CHAR_CARBON_MONOXIDE_PEAK_LEVEL,
     CHAR_CONTACT_SENSOR_STATE, CHAR_CURRENT_AMBIENT_LIGHT_LEVEL,
     CHAR_CURRENT_HUMIDITY, CHAR_CURRENT_TEMPERATURE, CHAR_LEAK_DETECTED,
     CHAR_MOTION_DETECTED, CHAR_OCCUPANCY_DETECTED, CHAR_SMOKE_DETECTED,
@@ -23,7 +24,7 @@ from .const import (
     SERV_CARBON_DIOXIDE_SENSOR, SERV_CARBON_MONOXIDE_SENSOR,
     SERV_CONTACT_SENSOR, SERV_HUMIDITY_SENSOR, SERV_LEAK_SENSOR,
     SERV_LIGHT_SENSOR, SERV_MOTION_SENSOR, SERV_OCCUPANCY_SENSOR,
-    SERV_SMOKE_SENSOR, SERV_TEMPERATURE_SENSOR)
+    SERV_SMOKE_SENSOR, SERV_TEMPERATURE_SENSOR, THRESHOLD_CO, THRESHOLD_CO2)
 from .util import (
     convert_to_float, temperature_to_homekit, density_to_air_quality)
 
@@ -114,6 +115,34 @@ class AirQualitySensor(HomeAccessory):
             _LOGGER.debug('%s: Set to %d', self.entity_id, density)
 
 
+@TYPES.register('CarbonMonoxideSensor')
+class CarbonMonoxideSensor(HomeAccessory):
+    """Generate a CarbonMonoxidSensor accessory as CO sensor."""
+
+    def __init__(self, *args):
+        """Initialize a CarbonMonoxideSensor accessory object."""
+        super().__init__(*args, category=CATEGORY_SENSOR)
+
+        serv_co = self.add_preload_service(SERV_CARBON_MONOXIDE_SENSOR, [
+            CHAR_CARBON_MONOXIDE_LEVEL, CHAR_CARBON_MONOXIDE_PEAK_LEVEL])
+        self.char_level = serv_co.configure_char(
+            CHAR_CARBON_MONOXIDE_LEVEL, value=0)
+        self.char_peak = serv_co.configure_char(
+            CHAR_CARBON_MONOXIDE_PEAK_LEVEL, value=0)
+        self.char_detected = serv_co.configure_char(
+            CHAR_CARBON_MONOXIDE_DETECTED, value=0)
+
+    def update_state(self, new_state):
+        """Update accessory after state change."""
+        value = convert_to_float(new_state.state)
+        if value:
+            self.char_level.set_value(value)
+            if value > self.char_peak.value:
+                self.char_peak.set_value(value)
+            self.char_detected.set_value(value > THRESHOLD_CO)
+            _LOGGER.debug('%s: Set to %d', self.entity_id, value)
+
+
 @TYPES.register('CarbonDioxideSensor')
 class CarbonDioxideSensor(HomeAccessory):
     """Generate a CarbonDioxideSensor accessory as CO2 sensor."""
@@ -124,7 +153,7 @@ class CarbonDioxideSensor(HomeAccessory):
 
         serv_co2 = self.add_preload_service(SERV_CARBON_DIOXIDE_SENSOR, [
             CHAR_CARBON_DIOXIDE_LEVEL, CHAR_CARBON_DIOXIDE_PEAK_LEVEL])
-        self.char_co2 = serv_co2.configure_char(
+        self.char_level = serv_co2.configure_char(
             CHAR_CARBON_DIOXIDE_LEVEL, value=0)
         self.char_peak = serv_co2.configure_char(
             CHAR_CARBON_DIOXIDE_PEAK_LEVEL, value=0)
@@ -133,13 +162,13 @@ class CarbonDioxideSensor(HomeAccessory):
 
     def update_state(self, new_state):
         """Update accessory after state change."""
-        co2 = convert_to_float(new_state.state)
-        if co2:
-            self.char_co2.set_value(co2)
-            if co2 > self.char_peak.value:
-                self.char_peak.set_value(co2)
-            self.char_detected.set_value(co2 > 1000)
-            _LOGGER.debug('%s: Set to %d', self.entity_id, co2)
+        value = convert_to_float(new_state.state)
+        if value:
+            self.char_level.set_value(value)
+            if value > self.char_peak.value:
+                self.char_peak.set_value(value)
+            self.char_detected.set_value(value > THRESHOLD_CO2)
+            _LOGGER.debug('%s: Set to %d', self.entity_id, value)
 
 
 @TYPES.register('LightSensor')
diff --git a/tests/components/homekit/test_get_accessories.py b/tests/components/homekit/test_get_accessories.py
index 92f8736d1fe..5b76618d460 100644
--- a/tests/components/homekit/test_get_accessories.py
+++ b/tests/components/homekit/test_get_accessories.py
@@ -106,6 +106,8 @@ def test_type_covers(type_name, entity_id, state, attrs):
     ('AirQualitySensor', 'sensor.air_quality_pm25', '40', {}),
     ('AirQualitySensor', 'sensor.air_quality', '40',
      {ATTR_DEVICE_CLASS: 'pm25'}),
+    ('CarbonMonoxideSensor', 'sensor.airmeter', '2',
+     {ATTR_DEVICE_CLASS: 'co'}),
     ('CarbonDioxideSensor', 'sensor.airmeter_co2', '500', {}),
     ('CarbonDioxideSensor', 'sensor.airmeter', '500',
      {ATTR_DEVICE_CLASS: 'co2'}),
diff --git a/tests/components/homekit/test_type_sensors.py b/tests/components/homekit/test_type_sensors.py
index 901a8e76856..ebc1c3e1306 100644
--- a/tests/components/homekit/test_type_sensors.py
+++ b/tests/components/homekit/test_type_sensors.py
@@ -1,8 +1,9 @@
 """Test different accessory types: Sensors."""
-from homeassistant.components.homekit.const import PROP_CELSIUS
+from homeassistant.components.homekit.const import (
+    PROP_CELSIUS, THRESHOLD_CO, THRESHOLD_CO2)
 from homeassistant.components.homekit.type_sensors import (
-    AirQualitySensor, BinarySensor, CarbonDioxideSensor, HumiditySensor,
-    LightSensor, TemperatureSensor, BINARY_SENSOR_SERVICE_MAP)
+    AirQualitySensor, BinarySensor, CarbonMonoxideSensor, CarbonDioxideSensor,
+    HumiditySensor, LightSensor, TemperatureSensor, BINARY_SENSOR_SERVICE_MAP)
 from homeassistant.const import (
     ATTR_DEVICE_CLASS, ATTR_UNIT_OF_MEASUREMENT, STATE_HOME, STATE_NOT_HOME,
     STATE_OFF, STATE_ON, STATE_UNKNOWN, TEMP_CELSIUS, TEMP_FAHRENHEIT)
@@ -94,6 +95,45 @@ async def test_air_quality(hass, hk_driver):
     assert acc.char_quality.value == 5
 
 
+async def test_co(hass, hk_driver):
+    """Test if accessory is updated after state change."""
+    entity_id = 'sensor.co'
+
+    hass.states.async_set(entity_id, None)
+    await hass.async_block_till_done()
+    acc = CarbonMonoxideSensor(hass, hk_driver, 'CO', entity_id, 2, None)
+    await hass.async_add_job(acc.run)
+
+    assert acc.aid == 2
+    assert acc.category == 10  # Sensor
+
+    assert acc.char_level.value == 0
+    assert acc.char_peak.value == 0
+    assert acc.char_detected.value == 0
+
+    hass.states.async_set(entity_id, STATE_UNKNOWN)
+    await hass.async_block_till_done()
+    assert acc.char_level.value == 0
+    assert acc.char_peak.value == 0
+    assert acc.char_detected.value == 0
+
+    value = 32
+    assert value > THRESHOLD_CO
+    hass.states.async_set(entity_id, str(value))
+    await hass.async_block_till_done()
+    assert acc.char_level.value == 32
+    assert acc.char_peak.value == 32
+    assert acc.char_detected.value == 1
+
+    value = 10
+    assert value < THRESHOLD_CO
+    hass.states.async_set(entity_id, str(value))
+    await hass.async_block_till_done()
+    assert acc.char_level.value == 10
+    assert acc.char_peak.value == 32
+    assert acc.char_detected.value == 0
+
+
 async def test_co2(hass, hk_driver):
     """Test if accessory is updated after state change."""
     entity_id = 'sensor.co2'
@@ -106,25 +146,29 @@ async def test_co2(hass, hk_driver):
     assert acc.aid == 2
     assert acc.category == 10  # Sensor
 
-    assert acc.char_co2.value == 0
+    assert acc.char_level.value == 0
     assert acc.char_peak.value == 0
     assert acc.char_detected.value == 0
 
     hass.states.async_set(entity_id, STATE_UNKNOWN)
     await hass.async_block_till_done()
-    assert acc.char_co2.value == 0
+    assert acc.char_level.value == 0
     assert acc.char_peak.value == 0
     assert acc.char_detected.value == 0
 
-    hass.states.async_set(entity_id, '1100')
+    value = 1100
+    assert value > THRESHOLD_CO2
+    hass.states.async_set(entity_id, str(value))
     await hass.async_block_till_done()
-    assert acc.char_co2.value == 1100
+    assert acc.char_level.value == 1100
     assert acc.char_peak.value == 1100
     assert acc.char_detected.value == 1
 
-    hass.states.async_set(entity_id, '800')
+    value = 800
+    assert value < THRESHOLD_CO2
+    hass.states.async_set(entity_id, str(value))
     await hass.async_block_till_done()
-    assert acc.char_co2.value == 800
+    assert acc.char_level.value == 800
     assert acc.char_peak.value == 1100
     assert acc.char_detected.value == 0
 

From a0a54dfd5beb1ed24bd29d690d18503a571583a9 Mon Sep 17 00:00:00 2001
From: Maciej Bieniek <bieniu@users.noreply.github.com>
Date: Fri, 21 Sep 2018 13:09:54 +0200
Subject: [PATCH 230/357] Add unique_id to mqtt camera (#16569)

* Add unique_id to mqtt camera

* Remove whitespaces

* Add test for unique_id

* Add blank line
---
 homeassistant/components/camera/mqtt.py | 11 ++++++++++-
 tests/components/camera/test_mqtt.py    | 23 +++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/camera/mqtt.py b/homeassistant/components/camera/mqtt.py
index cf5c969c650..13c1745615d 100644
--- a/homeassistant/components/camera/mqtt.py
+++ b/homeassistant/components/camera/mqtt.py
@@ -19,12 +19,14 @@ from homeassistant.helpers import config_validation as cv
 _LOGGER = logging.getLogger(__name__)
 
 CONF_TOPIC = 'topic'
+CONF_UNIQUE_ID = 'unique_id'
 DEFAULT_NAME = 'MQTT Camera'
 
 DEPENDENCIES = ['mqtt']
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Required(CONF_TOPIC): mqtt.valid_subscribe_topic,
+    vol.Optional(CONF_UNIQUE_ID): cv.string,
     vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string
 })
 
@@ -38,6 +40,7 @@ def async_setup_platform(hass, config, async_add_entities,
 
     async_add_entities([MqttCamera(
         config.get(CONF_NAME),
+        config.get(CONF_UNIQUE_ID),
         config.get(CONF_TOPIC)
     )])
 
@@ -45,11 +48,12 @@ def async_setup_platform(hass, config, async_add_entities,
 class MqttCamera(Camera):
     """representation of a MQTT camera."""
 
-    def __init__(self, name, topic):
+    def __init__(self, name, unique_id, topic):
         """Initialize the MQTT Camera."""
         super().__init__()
 
         self._name = name
+        self._unique_id = unique_id
         self._topic = topic
         self._qos = 0
         self._last_image = None
@@ -64,6 +68,11 @@ class MqttCamera(Camera):
         """Return the name of this camera."""
         return self._name
 
+    @property
+    def unique_id(self):
+        """Return a unique ID."""
+        return self._unique_id
+
     @asyncio.coroutine
     def async_added_to_hass(self):
         """Subscribe MQTT events."""
diff --git a/tests/components/camera/test_mqtt.py b/tests/components/camera/test_mqtt.py
index d83054d7732..8665f26aba9 100644
--- a/tests/components/camera/test_mqtt.py
+++ b/tests/components/camera/test_mqtt.py
@@ -29,3 +29,26 @@ def test_run_camera_setup(hass, aiohttp_client):
     assert resp.status == 200
     body = yield from resp.text()
     assert body == 'beer'
+
+
+@asyncio.coroutine
+def test_unique_id(hass):
+    """Test unique id option only creates one camera per unique_id."""
+    yield from async_mock_mqtt_component(hass)
+    yield from async_setup_component(hass, 'camera', {
+        'camera': [{
+            'platform': 'mqtt',
+            'name': 'Test Camera 1',
+            'topic': 'test-topic',
+            'unique_id': 'TOTALLY_UNIQUE'
+        }, {
+            'platform': 'mqtt',
+            'name': 'Test Camera 2',
+            'topic': 'test-topic',
+            'unique_id': 'TOTALLY_UNIQUE'
+        }]
+    })
+
+    async_fire_mqtt_message(hass, 'test-topic', 'payload')
+    yield from hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 1

From 3e59ffb33a1542bf94199160f17de53fdec05abf Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Fri, 21 Sep 2018 14:47:52 +0200
Subject: [PATCH 231/357] Add tradfri device info (#16768)

---
 homeassistant/components/light/tradfri.py    | 20 +++++++++++++++++++-
 homeassistant/components/nest/local_auth.py  |  3 ++-
 homeassistant/components/tradfri/__init__.py | 19 +++++++++++++++++--
 tests/common.py                              |  2 +-
 4 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/homeassistant/components/light/tradfri.py b/homeassistant/components/light/tradfri.py
index bd432b5dedc..b62900b204c 100644
--- a/homeassistant/components/light/tradfri.py
+++ b/homeassistant/components/light/tradfri.py
@@ -13,7 +13,8 @@ from homeassistant.components.light import (
     SUPPORT_COLOR, Light)
 from homeassistant.components.light import \
     PLATFORM_SCHEMA as LIGHT_PLATFORM_SCHEMA
-from homeassistant.components.tradfri import KEY_GATEWAY, KEY_API
+from homeassistant.components.tradfri import (
+    KEY_GATEWAY, KEY_API, DOMAIN as TRADFRI_DOMAIN)
 from homeassistant.components.tradfri.const import (
     CONF_IMPORT_GROUPS, CONF_GATEWAY_ID)
 import homeassistant.util.color as color_util
@@ -161,6 +162,7 @@ class TradfriLight(Light):
         self._hs_color = None
         self._features = SUPPORTED_FEATURES
         self._available = True
+        self._gateway_id = gateway_id
 
         self._refresh(light)
 
@@ -169,6 +171,22 @@ class TradfriLight(Light):
         """Return unique ID for light."""
         return self._unique_id
 
+    @property
+    def device_info(self):
+        """Return the device info."""
+        info = self._light.device_info
+
+        return {
+            'identifiers': {
+                (TRADFRI_DOMAIN, self._light.id)
+            },
+            'name': self._name,
+            'manufacturer': info.manufacturer,
+            'model': info.model_number,
+            'sw_version': info.firmware_version,
+            'via_hub': (TRADFRI_DOMAIN, self._gateway_id),
+        }
+
     @property
     def min_mireds(self):
         """Return the coldest color_temp that this light supports."""
diff --git a/homeassistant/components/nest/local_auth.py b/homeassistant/components/nest/local_auth.py
index 5ab10cc2a5e..393a36e4a9c 100644
--- a/homeassistant/components/nest/local_auth.py
+++ b/homeassistant/components/nest/local_auth.py
@@ -11,7 +11,8 @@ from .const import DOMAIN
 def initialize(hass, client_id, client_secret):
     """Initialize a local auth provider."""
     config_flow.register_flow_implementation(
-        hass, DOMAIN, 'local', partial(generate_auth_url, client_id),
+        hass, DOMAIN, 'configuration.yaml',
+        partial(generate_auth_url, client_id),
         partial(resolve_auth_code, hass, client_id, client_secret)
     )
 
diff --git a/homeassistant/components/tradfri/__init__.py b/homeassistant/components/tradfri/__init__.py
index 771f2b44c3d..079381f8b45 100644
--- a/homeassistant/components/tradfri/__init__.py
+++ b/homeassistant/components/tradfri/__init__.py
@@ -12,7 +12,8 @@ from homeassistant import config_entries
 import homeassistant.helpers.config_validation as cv
 from homeassistant.util.json import load_json
 
-from .const import CONF_IMPORT_GROUPS, CONF_IDENTITY, CONF_HOST, CONF_KEY
+from .const import (
+    CONF_IMPORT_GROUPS, CONF_IDENTITY, CONF_HOST, CONF_KEY, CONF_GATEWAY_ID)
 
 from . import config_flow  # noqa  pylint_disable=unused-import
 
@@ -84,7 +85,7 @@ async def async_setup_entry(hass, entry):
     gateway = Gateway()
 
     try:
-        await api(gateway.get_gateway_info())
+        gateway_info = await api(gateway.get_gateway_info())
     except RequestError:
         _LOGGER.error("Tradfri setup failed.")
         return False
@@ -92,6 +93,20 @@ async def async_setup_entry(hass, entry):
     hass.data.setdefault(KEY_API, {})[entry.entry_id] = api
     hass.data.setdefault(KEY_GATEWAY, {})[entry.entry_id] = gateway
 
+    dev_reg = await hass.helpers.device_registry.async_get_registry()
+    dev_reg.async_get_or_create(
+        config_entry_id=entry.entry_id,
+        connections=set(),
+        identifiers={
+            (DOMAIN, entry.data[CONF_GATEWAY_ID])
+        },
+        manufacturer='IKEA',
+        name='Gateway',
+        # They just have 1 gateway model. Type is not exposed yet.
+        model='E1526',
+        sw_version=gateway_info.firmware_version,
+    )
+
     hass.async_create_task(hass.config_entries.async_forward_entry_setup(
         entry, 'light'
     ))
diff --git a/tests/common.py b/tests/common.py
index 56e86a4cd5c..287f1e24ee5 100644
--- a/tests/common.py
+++ b/tests/common.py
@@ -322,7 +322,7 @@ def mock_component(hass, component):
 def mock_registry(hass, mock_entries=None):
     """Mock the Entity Registry."""
     registry = entity_registry.EntityRegistry(hass)
-    registry.entities = mock_entries or {}
+    registry.entities = mock_entries or OrderedDict()
 
     async def _get_reg():
         return registry

From d5813cf167dc4899e241c823d71243375c5d40c4 Mon Sep 17 00:00:00 2001
From: Malte Franken <exxamalte@users.noreply.github.com>
Date: Fri, 21 Sep 2018 23:24:50 +0930
Subject: [PATCH 232/357] Make rest sensor and binary sensor more efficient
 (#14484)

* create binary sensor even if initial update fails

* fixed broken test assertion

* fixed broken test assertion

* avoid fetching resource twice - manually in the setup_platform and then through add_devices

* raising PlatformNotReady instead of creating the sensor if the initial rest call fails; throttling the update to avoid fetching the same resource again immediately after setting up sensor

* rolled back throttling of the rest update call; can still avoid updating the binary sensor's rest resoure twice; fixed tests

* typo
---
 .../components/binary_sensor/rest.py          |   9 +-
 homeassistant/components/sensor/rest.py       |   6 +
 tests/components/binary_sensor/test_rest.py   | 117 ++++++++++--------
 tests/components/sensor/test_rest.py          | 100 ++++++++-------
 4 files changed, 129 insertions(+), 103 deletions(-)

diff --git a/homeassistant/components/binary_sensor/rest.py b/homeassistant/components/binary_sensor/rest.py
index 412aeb46a3a..ac82ab126fd 100644
--- a/homeassistant/components/binary_sensor/rest.py
+++ b/homeassistant/components/binary_sensor/rest.py
@@ -18,6 +18,7 @@ from homeassistant.const import (
     CONF_HEADERS, CONF_AUTHENTICATION, HTTP_BASIC_AUTHENTICATION,
     HTTP_DIGEST_AUTHENTICATION, CONF_DEVICE_CLASS)
 import homeassistant.helpers.config_validation as cv
+from homeassistant.exceptions import PlatformNotReady
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -66,13 +67,13 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
 
     rest = RestData(method, resource, auth, headers, payload, verify_ssl)
     rest.update()
-
     if rest.data is None:
-        _LOGGER.error("Unable to fetch REST data from %s", resource)
-        return False
+        raise PlatformNotReady
 
+    # No need to update the sensor now because it will determine its state
+    # based in the rest resource that has just been retrieved.
     add_entities([RestBinarySensor(
-        hass, rest, name, device_class, value_template)], True)
+        hass, rest, name, device_class, value_template)])
 
 
 class RestBinarySensor(BinarySensorDevice):
diff --git a/homeassistant/components/sensor/rest.py b/homeassistant/components/sensor/rest.py
index 53aab3f1ff7..f2fbe6cd191 100644
--- a/homeassistant/components/sensor/rest.py
+++ b/homeassistant/components/sensor/rest.py
@@ -18,6 +18,7 @@ from homeassistant.const import (
     CONF_UNIT_OF_MEASUREMENT, CONF_USERNAME,
     CONF_VALUE_TEMPLATE, CONF_VERIFY_SSL,
     HTTP_BASIC_AUTHENTICATION, HTTP_DIGEST_AUTHENTICATION, STATE_UNKNOWN)
+from homeassistant.exceptions import PlatformNotReady
 from homeassistant.helpers.entity import Entity
 import homeassistant.helpers.config_validation as cv
 
@@ -76,7 +77,11 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
         auth = None
     rest = RestData(method, resource, auth, headers, payload, verify_ssl)
     rest.update()
+    if rest.data is None:
+        raise PlatformNotReady
 
+    # Must update the sensor now (including fetching the rest resource) to
+    # ensure it's updating its state.
     add_entities([RestSensor(
         hass, rest, name, unit, value_template, json_attrs, force_update
     )], True)
@@ -170,6 +175,7 @@ class RestData:
 
     def update(self):
         """Get the latest data from REST service with provided method."""
+        _LOGGER.debug("Updating from %s", self._request.url)
         try:
             with requests.Session() as sess:
                 response = sess.send(
diff --git a/tests/components/binary_sensor/test_rest.py b/tests/components/binary_sensor/test_rest.py
index d1c26624452..db70303e217 100644
--- a/tests/components/binary_sensor/test_rest.py
+++ b/tests/components/binary_sensor/test_rest.py
@@ -1,11 +1,13 @@
 """The tests for the REST binary sensor platform."""
 import unittest
+from pytest import raises
 from unittest.mock import patch, Mock
 
 import requests
 from requests.exceptions import Timeout, MissingSchema
 import requests_mock
 
+from homeassistant.exceptions import PlatformNotReady
 from homeassistant.setup import setup_component
 import homeassistant.components.binary_sensor as binary_sensor
 import homeassistant.components.binary_sensor.rest as rest
@@ -18,9 +20,18 @@ from tests.common import get_test_home_assistant, assert_setup_component
 class TestRestBinarySensorSetup(unittest.TestCase):
     """Tests for setting up the REST binary sensor platform."""
 
+    DEVICES = []
+
+    def add_devices(self, devices, update_before_add=False):
+        """Mock add devices."""
+        for device in devices:
+            self.DEVICES.append(device)
+
     def setUp(self):
         """Set up things to be run when tests are started."""
         self.hass = get_test_home_assistant()
+        # Reset for this test.
+        self.DEVICES = []
 
     def tearDown(self):
         """Stop everything that was started."""
@@ -45,76 +56,80 @@ class TestRestBinarySensorSetup(unittest.TestCase):
            side_effect=requests.exceptions.ConnectionError())
     def test_setup_failed_connect(self, mock_req):
         """Test setup when connection error occurs."""
-        self.assertFalse(rest.setup_platform(self.hass, {
-            'platform': 'rest',
-            'resource': 'http://localhost',
-        }, lambda devices, update=True: None))
+        with raises(PlatformNotReady):
+            rest.setup_platform(self.hass, {
+                'platform': 'rest',
+                'resource': 'http://localhost',
+            }, self.add_devices, None)
+        self.assertEqual(len(self.DEVICES), 0)
 
     @patch('requests.Session.send', side_effect=Timeout())
     def test_setup_timeout(self, mock_req):
         """Test setup when connection timeout occurs."""
-        self.assertFalse(rest.setup_platform(self.hass, {
-            'platform': 'rest',
-            'resource': 'http://localhost',
-        }, lambda devices, update=True: None))
+        with raises(PlatformNotReady):
+            rest.setup_platform(self.hass, {
+                'platform': 'rest',
+                'resource': 'http://localhost',
+            }, self.add_devices, None)
+        self.assertEqual(len(self.DEVICES), 0)
 
     @requests_mock.Mocker()
     def test_setup_minimum(self, mock_req):
         """Test setup with minimum configuration."""
         mock_req.get('http://localhost', status_code=200)
-        self.assertTrue(setup_component(self.hass, 'binary_sensor', {
-            'binary_sensor': {
-                'platform': 'rest',
-                'resource': 'http://localhost'
-            }
-        }))
-        self.assertEqual(2, mock_req.call_count)
-        assert_setup_component(1, 'switch')
+        with assert_setup_component(1, 'binary_sensor'):
+            self.assertTrue(setup_component(self.hass, 'binary_sensor', {
+                'binary_sensor': {
+                    'platform': 'rest',
+                    'resource': 'http://localhost'
+                }
+            }))
+        self.assertEqual(1, mock_req.call_count)
 
     @requests_mock.Mocker()
     def test_setup_get(self, mock_req):
         """Test setup with valid configuration."""
         mock_req.get('http://localhost', status_code=200)
-        self.assertTrue(setup_component(self.hass, 'binary_sensor', {
-            'binary_sensor': {
-                'platform': 'rest',
-                'resource': 'http://localhost',
-                'method': 'GET',
-                'value_template': '{{ value_json.key }}',
-                'name': 'foo',
-                'unit_of_measurement': 'MB',
-                'verify_ssl': 'true',
-                'authentication': 'basic',
-                'username': 'my username',
-                'password': 'my password',
-                'headers': {'Accept': 'application/json'}
-            }
-        }))
-        self.assertEqual(2, mock_req.call_count)
-        assert_setup_component(1, 'binary_sensor')
+        with assert_setup_component(1, 'binary_sensor'):
+            self.assertTrue(setup_component(self.hass, 'binary_sensor', {
+                'binary_sensor': {
+                    'platform': 'rest',
+                    'resource': 'http://localhost',
+                    'method': 'GET',
+                    'value_template': '{{ value_json.key }}',
+                    'name': 'foo',
+                    'unit_of_measurement': 'MB',
+                    'verify_ssl': 'true',
+                    'authentication': 'basic',
+                    'username': 'my username',
+                    'password': 'my password',
+                    'headers': {'Accept': 'application/json'}
+                }
+            }))
+        self.assertEqual(1, mock_req.call_count)
 
     @requests_mock.Mocker()
     def test_setup_post(self, mock_req):
         """Test setup with valid configuration."""
         mock_req.post('http://localhost', status_code=200)
-        self.assertTrue(setup_component(self.hass, 'binary_sensor', {
-            'binary_sensor': {
-                'platform': 'rest',
-                'resource': 'http://localhost',
-                'method': 'POST',
-                'value_template': '{{ value_json.key }}',
-                'payload': '{ "device": "toaster"}',
-                'name': 'foo',
-                'unit_of_measurement': 'MB',
-                'verify_ssl': 'true',
-                'authentication': 'basic',
-                'username': 'my username',
-                'password': 'my password',
-                'headers': {'Accept': 'application/json'}
-            }
-        }))
-        self.assertEqual(2, mock_req.call_count)
-        assert_setup_component(1, 'binary_sensor')
+        with assert_setup_component(1, 'binary_sensor'):
+            self.assertTrue(setup_component(self.hass, 'binary_sensor', {
+                'binary_sensor': {
+                    'platform': 'rest',
+                    'resource': 'http://localhost',
+                    'method': 'POST',
+                    'value_template': '{{ value_json.key }}',
+                    'payload': '{ "device": "toaster"}',
+                    'name': 'foo',
+                    'unit_of_measurement': 'MB',
+                    'verify_ssl': 'true',
+                    'authentication': 'basic',
+                    'username': 'my username',
+                    'password': 'my password',
+                    'headers': {'Accept': 'application/json'}
+                }
+            }))
+        self.assertEqual(1, mock_req.call_count)
 
 
 class TestRestBinarySensor(unittest.TestCase):
diff --git a/tests/components/sensor/test_rest.py b/tests/components/sensor/test_rest.py
index 4d40ad394cd..7f818193a29 100644
--- a/tests/components/sensor/test_rest.py
+++ b/tests/components/sensor/test_rest.py
@@ -1,11 +1,13 @@
 """The tests for the REST sensor platform."""
 import unittest
+from pytest import raises
 from unittest.mock import patch, Mock
 
 import requests
 from requests.exceptions import Timeout, MissingSchema, RequestException
 import requests_mock
 
+from homeassistant.exceptions import PlatformNotReady
 from homeassistant.setup import setup_component
 import homeassistant.components.sensor as sensor
 import homeassistant.components.sensor.rest as rest
@@ -45,76 +47,78 @@ class TestRestSensorSetup(unittest.TestCase):
            side_effect=requests.exceptions.ConnectionError())
     def test_setup_failed_connect(self, mock_req):
         """Test setup when connection error occurs."""
-        self.assertTrue(rest.setup_platform(self.hass, {
-            'platform': 'rest',
-            'resource': 'http://localhost',
-        }, lambda devices, update=True: None) is None)
+        with raises(PlatformNotReady):
+            rest.setup_platform(self.hass, {
+                'platform': 'rest',
+                'resource': 'http://localhost',
+            }, lambda devices, update=True: None)
 
     @patch('requests.Session.send', side_effect=Timeout())
     def test_setup_timeout(self, mock_req):
         """Test setup when connection timeout occurs."""
-        self.assertTrue(rest.setup_platform(self.hass, {
-            'platform': 'rest',
-            'resource': 'http://localhost',
-        }, lambda devices, update=True: None) is None)
+        with raises(PlatformNotReady):
+            rest.setup_platform(self.hass, {
+                'platform': 'rest',
+                'resource': 'http://localhost',
+            }, lambda devices, update=True: None)
 
     @requests_mock.Mocker()
     def test_setup_minimum(self, mock_req):
         """Test setup with minimum configuration."""
         mock_req.get('http://localhost', status_code=200)
-        self.assertTrue(setup_component(self.hass, 'sensor', {
-            'sensor': {
-                'platform': 'rest',
-                'resource': 'http://localhost'
-            }
-        }))
+        with assert_setup_component(1, 'sensor'):
+            self.assertTrue(setup_component(self.hass, 'sensor', {
+                'sensor': {
+                    'platform': 'rest',
+                    'resource': 'http://localhost'
+                }
+            }))
         self.assertEqual(2, mock_req.call_count)
-        assert_setup_component(1, 'switch')
 
     @requests_mock.Mocker()
     def test_setup_get(self, mock_req):
         """Test setup with valid configuration."""
         mock_req.get('http://localhost', status_code=200)
-        self.assertTrue(setup_component(self.hass, 'sensor', {
-            'sensor': {
-                'platform': 'rest',
-                'resource': 'http://localhost',
-                'method': 'GET',
-                'value_template': '{{ value_json.key }}',
-                'name': 'foo',
-                'unit_of_measurement': 'MB',
-                'verify_ssl': 'true',
-                'authentication': 'basic',
-                'username': 'my username',
-                'password': 'my password',
-                'headers': {'Accept': 'application/json'}
-            }
-        }))
+        with assert_setup_component(1, 'sensor'):
+            self.assertTrue(setup_component(self.hass, 'sensor', {
+                'sensor': {
+                    'platform': 'rest',
+                    'resource': 'http://localhost',
+                    'method': 'GET',
+                    'value_template': '{{ value_json.key }}',
+                    'name': 'foo',
+                    'unit_of_measurement': 'MB',
+                    'verify_ssl': 'true',
+                    'authentication': 'basic',
+                    'username': 'my username',
+                    'password': 'my password',
+                    'headers': {'Accept': 'application/json'}
+                }
+            }))
         self.assertEqual(2, mock_req.call_count)
-        assert_setup_component(1, 'sensor')
 
     @requests_mock.Mocker()
     def test_setup_post(self, mock_req):
         """Test setup with valid configuration."""
         mock_req.post('http://localhost', status_code=200)
-        self.assertTrue(setup_component(self.hass, 'sensor', {
-            'sensor': {
-                'platform': 'rest',
-                'resource': 'http://localhost',
-                'method': 'POST',
-                'value_template': '{{ value_json.key }}',
-                'payload': '{ "device": "toaster"}',
-                'name': 'foo',
-                'unit_of_measurement': 'MB',
-                'verify_ssl': 'true',
-                'authentication': 'basic',
-                'username': 'my username',
-                'password': 'my password',
-                'headers': {'Accept': 'application/json'}
-            }
-        }))
+        with assert_setup_component(1, 'sensor'):
+            self.assertTrue(setup_component(self.hass, 'sensor', {
+                'sensor': {
+                    'platform': 'rest',
+                    'resource': 'http://localhost',
+                    'method': 'POST',
+                    'value_template': '{{ value_json.key }}',
+                    'payload': '{ "device": "toaster"}',
+                    'name': 'foo',
+                    'unit_of_measurement': 'MB',
+                    'verify_ssl': 'true',
+                    'authentication': 'basic',
+                    'username': 'my username',
+                    'password': 'my password',
+                    'headers': {'Accept': 'application/json'}
+                }
+            }))
         self.assertEqual(2, mock_req.call_count)
-        assert_setup_component(1, 'sensor')
 
 
 class TestRestSensor(unittest.TestCase):

From 213171769d63a77c173ed5fbec050896dea80c52 Mon Sep 17 00:00:00 2001
From: Giuseppe <giuseppe.lopresti@cern.ch>
Date: Fri, 21 Sep 2018 15:55:07 +0200
Subject: [PATCH 233/357] Refactored units and icons for the Dyson sensors
 (#14550)

* Refactored units and icons for the Dyson sensors

* Adapted unit tests to the new device names and unit of measurements

* Use None as empty unit of measurement

* Unrelated overall improvements following code review

* Adapted tests to new constructors as per previous commit

* Make sure the sensors have their `hass` attribute set in the test environment
---
 homeassistant/components/sensor/dyson.py | 100 +++++++++++------------
 tests/components/sensor/test_dyson.py    |  92 +++++++++++----------
 2 files changed, 97 insertions(+), 95 deletions(-)

diff --git a/homeassistant/components/sensor/dyson.py b/homeassistant/components/sensor/dyson.py
index 0619e3f6069..4097bff32bf 100644
--- a/homeassistant/components/sensor/dyson.py
+++ b/homeassistant/components/sensor/dyson.py
@@ -14,12 +14,20 @@ from homeassistant.helpers.entity import Entity
 DEPENDENCIES = ['dyson']
 
 SENSOR_UNITS = {
-    'air_quality': 'level',
-    'dust': 'level',
+    'air_quality': None,
+    'dust': None,
     'filter_life': 'hours',
     'humidity': '%',
 }
 
+SENSOR_ICONS = {
+    'air_quality': 'mdi:fan',
+    'dust': 'mdi:cloud',
+    'filter_life': 'mdi:filter-outline',
+    'humidity': 'mdi:water-percent',
+    'temperature': 'mdi:thermometer',
+}
+
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -32,23 +40,23 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     from libpurecoollink.dyson_pure_cool_link import DysonPureCoolLink
     for device in [d for d in hass.data[DYSON_DEVICES] if
                    isinstance(d, DysonPureCoolLink)]:
-        devices.append(DysonFilterLifeSensor(hass, device))
-        devices.append(DysonDustSensor(hass, device))
-        devices.append(DysonHumiditySensor(hass, device))
-        devices.append(DysonTemperatureSensor(hass, device, unit))
-        devices.append(DysonAirQualitySensor(hass, device))
+        devices.append(DysonFilterLifeSensor(device))
+        devices.append(DysonDustSensor(device))
+        devices.append(DysonHumiditySensor(device))
+        devices.append(DysonTemperatureSensor(device, unit))
+        devices.append(DysonAirQualitySensor(device))
     add_entities(devices)
 
 
 class DysonSensor(Entity):
-    """Representation of Dyson sensor."""
+    """Representation of a generic Dyson sensor."""
 
-    def __init__(self, hass, device):
-        """Create a new Dyson filter life sensor."""
-        self.hass = hass
+    def __init__(self, device, sensor_type):
+        """Create a new generic Dyson sensor."""
         self._device = device
         self._old_value = None
         self._name = None
+        self._sensor_type = sensor_type
 
     @asyncio.coroutine
     def async_added_to_hass(self):
@@ -72,17 +80,27 @@ class DysonSensor(Entity):
 
     @property
     def name(self):
-        """Return the name of the dyson sensor name."""
+        """Return the name of the Dyson sensor name."""
         return self._name
 
+    @property
+    def unit_of_measurement(self):
+        """Return the unit the value is expressed in."""
+        return SENSOR_UNITS[self._sensor_type]
+
+    @property
+    def icon(self):
+        """Return the icon for this sensor."""
+        return SENSOR_ICONS[self._sensor_type]
+
 
 class DysonFilterLifeSensor(DysonSensor):
-    """Representation of Dyson filter life sensor (in hours)."""
+    """Representation of Dyson Filter Life sensor (in hours)."""
 
-    def __init__(self, hass, device):
-        """Create a new Dyson filter life sensor."""
-        DysonSensor.__init__(self, hass, device)
-        self._name = "{} filter life".format(self._device.name)
+    def __init__(self, device):
+        """Create a new Dyson Filter Life sensor."""
+        super().__init__(device, 'filter_life')
+        self._name = "{} Filter Life".format(self._device.name)
 
     @property
     def state(self):
@@ -91,19 +109,14 @@ class DysonFilterLifeSensor(DysonSensor):
             return int(self._device.state.filter_life)
         return None
 
-    @property
-    def unit_of_measurement(self):
-        """Return the unit the value is expressed in."""
-        return SENSOR_UNITS['filter_life']
-
 
 class DysonDustSensor(DysonSensor):
     """Representation of Dyson Dust sensor (lower is better)."""
 
-    def __init__(self, hass, device):
+    def __init__(self, device):
         """Create a new Dyson Dust sensor."""
-        DysonSensor.__init__(self, hass, device)
-        self._name = "{} dust".format(self._device.name)
+        super().__init__(device, 'dust')
+        self._name = "{} Dust".format(self._device.name)
 
     @property
     def state(self):
@@ -112,47 +125,37 @@ class DysonDustSensor(DysonSensor):
             return self._device.environmental_state.dust
         return None
 
-    @property
-    def unit_of_measurement(self):
-        """Return the unit the value is expressed in."""
-        return SENSOR_UNITS['dust']
-
 
 class DysonHumiditySensor(DysonSensor):
     """Representation of Dyson Humidity sensor."""
 
-    def __init__(self, hass, device):
+    def __init__(self, device):
         """Create a new Dyson Humidity sensor."""
-        DysonSensor.__init__(self, hass, device)
-        self._name = "{} humidity".format(self._device.name)
+        super().__init__(device, 'humidity')
+        self._name = "{} Humidity".format(self._device.name)
 
     @property
     def state(self):
-        """Return Dust value."""
+        """Return Humidity value."""
         if self._device.environmental_state:
             if self._device.environmental_state.humidity == 0:
                 return STATE_OFF
             return self._device.environmental_state.humidity
         return None
 
-    @property
-    def unit_of_measurement(self):
-        """Return the unit the value is expressed in."""
-        return SENSOR_UNITS['humidity']
-
 
 class DysonTemperatureSensor(DysonSensor):
     """Representation of Dyson Temperature sensor."""
 
-    def __init__(self, hass, device, unit):
+    def __init__(self, device, unit):
         """Create a new Dyson Temperature sensor."""
-        DysonSensor.__init__(self, hass, device)
-        self._name = "{} temperature".format(self._device.name)
+        super().__init__(device, 'temperature')
+        self._name = "{} Temperature".format(self._device.name)
         self._unit = unit
 
     @property
     def state(self):
-        """Return Dust value."""
+        """Return Temperature value."""
         if self._device.environmental_state:
             temperature_kelvin = self._device.environmental_state.temperature
             if temperature_kelvin == 0:
@@ -171,10 +174,10 @@ class DysonTemperatureSensor(DysonSensor):
 class DysonAirQualitySensor(DysonSensor):
     """Representation of Dyson Air Quality sensor (lower is better)."""
 
-    def __init__(self, hass, device):
+    def __init__(self, device):
         """Create a new Dyson Air Quality sensor."""
-        DysonSensor.__init__(self, hass, device)
-        self._name = "{} air quality".format(self._device.name)
+        super().__init__(device, 'air_quality')
+        self._name = "{} AQI".format(self._device.name)
 
     @property
     def state(self):
@@ -182,8 +185,3 @@ class DysonAirQualitySensor(DysonSensor):
         if self._device.environmental_state:
             return self._device.environmental_state.volatil_organic_compounds
         return None
-
-    @property
-    def unit_of_measurement(self):
-        """Return the unit the value is expressed in."""
-        return SENSOR_UNITS['air_quality']
diff --git a/tests/components/sensor/test_dyson.py b/tests/components/sensor/test_dyson.py
index 5b5be4a587d..baab96a61f0 100644
--- a/tests/components/sensor/test_dyson.py
+++ b/tests/components/sensor/test_dyson.py
@@ -70,11 +70,11 @@ class DysonTest(unittest.TestCase):
         """Test setup component with devices."""
         def _add_device(devices):
             assert len(devices) == 5
-            assert devices[0].name == "Device_name filter life"
-            assert devices[1].name == "Device_name dust"
-            assert devices[2].name == "Device_name humidity"
-            assert devices[3].name == "Device_name temperature"
-            assert devices[4].name == "Device_name air quality"
+            assert devices[0].name == "Device_name Filter Life"
+            assert devices[1].name == "Device_name Dust"
+            assert devices[2].name == "Device_name Humidity"
+            assert devices[3].name == "Device_name Temperature"
+            assert devices[4].name == "Device_name AQI"
 
         device_fan = _get_device_without_state()
         device_non_fan = _get_with_state()
@@ -83,143 +83,147 @@ class DysonTest(unittest.TestCase):
 
     def test_dyson_filter_life_sensor(self):
         """Test filter life sensor with no value."""
-        sensor = dyson.DysonFilterLifeSensor(self.hass,
-                                             _get_device_without_state())
+        sensor = dyson.DysonFilterLifeSensor(_get_device_without_state())
+        sensor.hass = self.hass
         sensor.entity_id = "sensor.dyson_1"
         self.assertFalse(sensor.should_poll)
         self.assertIsNone(sensor.state)
         self.assertEqual(sensor.unit_of_measurement, "hours")
-        self.assertEqual(sensor.name, "Device_name filter life")
+        self.assertEqual(sensor.name, "Device_name Filter Life")
         self.assertEqual(sensor.entity_id, "sensor.dyson_1")
         sensor.on_message('message')
 
     def test_dyson_filter_life_sensor_with_values(self):
         """Test filter sensor with values."""
-        sensor = dyson.DysonFilterLifeSensor(self.hass, _get_with_state())
+        sensor = dyson.DysonFilterLifeSensor(_get_with_state())
+        sensor.hass = self.hass
         sensor.entity_id = "sensor.dyson_1"
         self.assertFalse(sensor.should_poll)
         self.assertEqual(sensor.state, 100)
         self.assertEqual(sensor.unit_of_measurement, "hours")
-        self.assertEqual(sensor.name, "Device_name filter life")
+        self.assertEqual(sensor.name, "Device_name Filter Life")
         self.assertEqual(sensor.entity_id, "sensor.dyson_1")
         sensor.on_message('message')
 
     def test_dyson_dust_sensor(self):
         """Test dust sensor with no value."""
-        sensor = dyson.DysonDustSensor(self.hass,
-                                       _get_device_without_state())
+        sensor = dyson.DysonDustSensor(_get_device_without_state())
+        sensor.hass = self.hass
         sensor.entity_id = "sensor.dyson_1"
         self.assertFalse(sensor.should_poll)
         self.assertIsNone(sensor.state)
-        self.assertEqual(sensor.unit_of_measurement, 'level')
-        self.assertEqual(sensor.name, "Device_name dust")
+        self.assertEqual(sensor.unit_of_measurement, None)
+        self.assertEqual(sensor.name, "Device_name Dust")
         self.assertEqual(sensor.entity_id, "sensor.dyson_1")
 
     def test_dyson_dust_sensor_with_values(self):
         """Test dust sensor with values."""
-        sensor = dyson.DysonDustSensor(self.hass, _get_with_state())
+        sensor = dyson.DysonDustSensor(_get_with_state())
+        sensor.hass = self.hass
         sensor.entity_id = "sensor.dyson_1"
         self.assertFalse(sensor.should_poll)
         self.assertEqual(sensor.state, 5)
-        self.assertEqual(sensor.unit_of_measurement, 'level')
-        self.assertEqual(sensor.name, "Device_name dust")
+        self.assertEqual(sensor.unit_of_measurement, None)
+        self.assertEqual(sensor.name, "Device_name Dust")
         self.assertEqual(sensor.entity_id, "sensor.dyson_1")
 
     def test_dyson_humidity_sensor(self):
         """Test humidity sensor with no value."""
-        sensor = dyson.DysonHumiditySensor(self.hass,
-                                           _get_device_without_state())
+        sensor = dyson.DysonHumiditySensor(_get_device_without_state())
+        sensor.hass = self.hass
         sensor.entity_id = "sensor.dyson_1"
         self.assertFalse(sensor.should_poll)
         self.assertIsNone(sensor.state)
         self.assertEqual(sensor.unit_of_measurement, '%')
-        self.assertEqual(sensor.name, "Device_name humidity")
+        self.assertEqual(sensor.name, "Device_name Humidity")
         self.assertEqual(sensor.entity_id, "sensor.dyson_1")
 
     def test_dyson_humidity_sensor_with_values(self):
         """Test humidity sensor with values."""
-        sensor = dyson.DysonHumiditySensor(self.hass, _get_with_state())
+        sensor = dyson.DysonHumiditySensor(_get_with_state())
+        sensor.hass = self.hass
         sensor.entity_id = "sensor.dyson_1"
         self.assertFalse(sensor.should_poll)
         self.assertEqual(sensor.state, 45)
         self.assertEqual(sensor.unit_of_measurement, '%')
-        self.assertEqual(sensor.name, "Device_name humidity")
+        self.assertEqual(sensor.name, "Device_name Humidity")
         self.assertEqual(sensor.entity_id, "sensor.dyson_1")
 
     def test_dyson_humidity_standby_monitoring(self):
         """Test humidity sensor while device is in standby monitoring."""
-        sensor = dyson.DysonHumiditySensor(self.hass,
-                                           _get_with_standby_monitoring())
+        sensor = dyson.DysonHumiditySensor(_get_with_standby_monitoring())
+        sensor.hass = self.hass
         sensor.entity_id = "sensor.dyson_1"
         self.assertFalse(sensor.should_poll)
         self.assertEqual(sensor.state, STATE_OFF)
         self.assertEqual(sensor.unit_of_measurement, '%')
-        self.assertEqual(sensor.name, "Device_name humidity")
+        self.assertEqual(sensor.name, "Device_name Humidity")
         self.assertEqual(sensor.entity_id, "sensor.dyson_1")
 
     def test_dyson_temperature_sensor(self):
         """Test temperature sensor with no value."""
-        sensor = dyson.DysonTemperatureSensor(self.hass,
-                                              _get_device_without_state(),
+        sensor = dyson.DysonTemperatureSensor(_get_device_without_state(),
                                               TEMP_CELSIUS)
+        sensor.hass = self.hass
         sensor.entity_id = "sensor.dyson_1"
         self.assertFalse(sensor.should_poll)
         self.assertIsNone(sensor.state)
         self.assertEqual(sensor.unit_of_measurement, '°C')
-        self.assertEqual(sensor.name, "Device_name temperature")
+        self.assertEqual(sensor.name, "Device_name Temperature")
         self.assertEqual(sensor.entity_id, "sensor.dyson_1")
 
     def test_dyson_temperature_sensor_with_values(self):
         """Test temperature sensor with values."""
-        sensor = dyson.DysonTemperatureSensor(self.hass,
-                                              _get_with_state(),
+        sensor = dyson.DysonTemperatureSensor(_get_with_state(),
                                               TEMP_CELSIUS)
+        sensor.hass = self.hass
         sensor.entity_id = "sensor.dyson_1"
         self.assertFalse(sensor.should_poll)
         self.assertEqual(sensor.state, 21.9)
         self.assertEqual(sensor.unit_of_measurement, '°C')
-        self.assertEqual(sensor.name, "Device_name temperature")
+        self.assertEqual(sensor.name, "Device_name Temperature")
         self.assertEqual(sensor.entity_id, "sensor.dyson_1")
 
-        sensor = dyson.DysonTemperatureSensor(self.hass,
-                                              _get_with_state(),
+        sensor = dyson.DysonTemperatureSensor(_get_with_state(),
                                               TEMP_FAHRENHEIT)
+        sensor.hass = self.hass
         sensor.entity_id = "sensor.dyson_1"
         self.assertFalse(sensor.should_poll)
         self.assertEqual(sensor.state, 71.3)
         self.assertEqual(sensor.unit_of_measurement, '°F')
-        self.assertEqual(sensor.name, "Device_name temperature")
+        self.assertEqual(sensor.name, "Device_name Temperature")
         self.assertEqual(sensor.entity_id, "sensor.dyson_1")
 
     def test_dyson_temperature_standby_monitoring(self):
         """Test temperature sensor while device is in standby monitoring."""
-        sensor = dyson.DysonTemperatureSensor(self.hass,
-                                              _get_with_standby_monitoring(),
+        sensor = dyson.DysonTemperatureSensor(_get_with_standby_monitoring(),
                                               TEMP_CELSIUS)
+        sensor.hass = self.hass
         sensor.entity_id = "sensor.dyson_1"
         self.assertFalse(sensor.should_poll)
         self.assertEqual(sensor.state, STATE_OFF)
         self.assertEqual(sensor.unit_of_measurement, '°C')
-        self.assertEqual(sensor.name, "Device_name temperature")
+        self.assertEqual(sensor.name, "Device_name Temperature")
         self.assertEqual(sensor.entity_id, "sensor.dyson_1")
 
     def test_dyson_air_quality_sensor(self):
         """Test air quality sensor with no value."""
-        sensor = dyson.DysonAirQualitySensor(self.hass,
-                                             _get_device_without_state())
+        sensor = dyson.DysonAirQualitySensor(_get_device_without_state())
+        sensor.hass = self.hass
         sensor.entity_id = "sensor.dyson_1"
         self.assertFalse(sensor.should_poll)
         self.assertIsNone(sensor.state)
-        self.assertEqual(sensor.unit_of_measurement, 'level')
-        self.assertEqual(sensor.name, "Device_name air quality")
+        self.assertEqual(sensor.unit_of_measurement, None)
+        self.assertEqual(sensor.name, "Device_name AQI")
         self.assertEqual(sensor.entity_id, "sensor.dyson_1")
 
     def test_dyson_air_quality_sensor_with_values(self):
         """Test air quality sensor with values."""
-        sensor = dyson.DysonAirQualitySensor(self.hass, _get_with_state())
+        sensor = dyson.DysonAirQualitySensor(_get_with_state())
+        sensor.hass = self.hass
         sensor.entity_id = "sensor.dyson_1"
         self.assertFalse(sensor.should_poll)
         self.assertEqual(sensor.state, 2)
-        self.assertEqual(sensor.unit_of_measurement, 'level')
-        self.assertEqual(sensor.name, "Device_name air quality")
+        self.assertEqual(sensor.unit_of_measurement, None)
+        self.assertEqual(sensor.name, "Device_name AQI")
         self.assertEqual(sensor.entity_id, "sensor.dyson_1")

From 8b42d0c4718e275893cc6a9ad482cb13cb1248c2 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Fri, 21 Sep 2018 16:34:37 +0200
Subject: [PATCH 234/357] Add confirmation to Cast/Sonos/iOS config entries
 (#16769)

* Add confirmation to Cast/Sonos/iOS config entries

* Remove redundant code
---
 homeassistant/helpers/config_entry_flow.py | 49 +++++++++++-----------
 tests/components/cast/test_init.py         |  6 +++
 tests/components/ios/test_init.py          |  6 +++
 tests/components/sonos/test_init.py        |  6 +++
 tests/helpers/test_config_entry_flow.py    | 25 +++++++----
 5 files changed, 59 insertions(+), 33 deletions(-)

diff --git a/homeassistant/helpers/config_entry_flow.py b/homeassistant/helpers/config_entry_flow.py
index d940afc1152..569a101b3dd 100644
--- a/homeassistant/helpers/config_entry_flow.py
+++ b/homeassistant/helpers/config_entry_flow.py
@@ -31,40 +31,39 @@ class DiscoveryFlowHandler(config_entries.ConfigFlow):
                 reason='single_instance_allowed'
             )
 
-        # Get current discovered entries.
-        in_progress = self._async_in_progress()
+        return await self.async_step_confirm()
 
-        has_devices = in_progress
-        if not has_devices:
-            has_devices = await self.hass.async_add_job(
-                self._discovery_function, self.hass)
-
-        if not has_devices:
-            return self.async_abort(
-                reason='no_devices_found'
+    async def async_step_confirm(self, user_input=None):
+        """Confirm setup."""
+        if user_input is None:
+            return self.async_show_form(
+                step_id='confirm',
             )
 
-        # Cancel the discovered one.
-        for flow in in_progress:
-            self.hass.config_entries.flow.async_abort(flow['flow_id'])
+        if self.context and self.context.get('source') != \
+                config_entries.SOURCE_DISCOVERY:
+            # Get current discovered entries.
+            in_progress = self._async_in_progress()
+
+            has_devices = in_progress
+            if not has_devices:
+                has_devices = await self.hass.async_add_job(
+                    self._discovery_function, self.hass)
+
+            if not has_devices:
+                return self.async_abort(
+                    reason='no_devices_found'
+                )
+
+            # Cancel the discovered one.
+            for flow in in_progress:
+                self.hass.config_entries.flow.async_abort(flow['flow_id'])
 
         return self.async_create_entry(
             title=self._title,
             data={},
         )
 
-    async def async_step_confirm(self, user_input=None):
-        """Confirm setup."""
-        if user_input is not None:
-            return self.async_create_entry(
-                title=self._title,
-                data={},
-            )
-
-        return self.async_show_form(
-            step_id='confirm',
-        )
-
     async def async_step_discovery(self, discovery_info):
         """Handle a flow initialized by discovery."""
         if self._async_in_progress() or self._async_current_entries():
diff --git a/tests/components/cast/test_init.py b/tests/components/cast/test_init.py
index 1ffbd375b75..0121cd1c794 100644
--- a/tests/components/cast/test_init.py
+++ b/tests/components/cast/test_init.py
@@ -17,6 +17,12 @@ async def test_creating_entry_sets_up_media_player(hass):
                   return_value=True):
         result = await hass.config_entries.flow.async_init(
             cast.DOMAIN, context={'source': config_entries.SOURCE_USER})
+
+        # Confirmation form
+        assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
+
+        result = await hass.config_entries.flow.async_configure(
+            result['flow_id'], {})
         assert result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
 
         await hass.async_block_till_done()
diff --git a/tests/components/ios/test_init.py b/tests/components/ios/test_init.py
index 9a45fac3ce1..ad1ab328325 100644
--- a/tests/components/ios/test_init.py
+++ b/tests/components/ios/test_init.py
@@ -30,6 +30,12 @@ async def test_creating_entry_sets_up_sensor(hass):
                return_value=mock_coro(True)) as mock_setup:
         result = await hass.config_entries.flow.async_init(
             ios.DOMAIN, context={'source': config_entries.SOURCE_USER})
+
+        # Confirmation form
+        assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
+
+        result = await hass.config_entries.flow.async_configure(
+            result['flow_id'], {})
         assert result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
 
         await hass.async_block_till_done()
diff --git a/tests/components/sonos/test_init.py b/tests/components/sonos/test_init.py
index 455ce6d4cc2..8d46f4d57a3 100644
--- a/tests/components/sonos/test_init.py
+++ b/tests/components/sonos/test_init.py
@@ -15,6 +15,12 @@ async def test_creating_entry_sets_up_media_player(hass):
             patch('pysonos.discover', return_value=True):
         result = await hass.config_entries.flow.async_init(
             sonos.DOMAIN, context={'source': config_entries.SOURCE_USER})
+
+        # Confirmation form
+        assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
+
+        result = await hass.config_entries.flow.async_configure(
+            result['flow_id'], {})
         assert result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
 
         await hass.async_block_till_done()
diff --git a/tests/helpers/test_config_entry_flow.py b/tests/helpers/test_config_entry_flow.py
index a578afae1d2..9d858e31a06 100644
--- a/tests/helpers/test_config_entry_flow.py
+++ b/tests/helpers/test_config_entry_flow.py
@@ -42,22 +42,24 @@ async def test_user_no_devices_found(hass, flow_conf):
     """Test if no devices found."""
     flow = config_entries.HANDLERS['test']()
     flow.hass = hass
-
-    result = await flow.async_step_user()
+    flow.context = {
+        'source': config_entries.SOURCE_USER
+    }
+    result = await flow.async_step_confirm(user_input={})
 
     assert result['type'] == data_entry_flow.RESULT_TYPE_ABORT
     assert result['reason'] == 'no_devices_found'
 
 
-async def test_user_no_confirmation(hass, flow_conf):
-    """Test user requires no confirmation to set up."""
+async def test_user_has_confirmation(hass, flow_conf):
+    """Test user requires no confirmation to setup."""
     flow = config_entries.HANDLERS['test']()
     flow.hass = hass
     flow_conf['discovered'] = True
 
     result = await flow.async_step_user()
 
-    assert result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
 
 
 async def test_discovery_single_instance(hass, flow_conf):
@@ -100,7 +102,7 @@ async def test_multiple_discoveries(hass, flow_conf):
     assert result['type'] == data_entry_flow.RESULT_TYPE_ABORT
 
 
-async def test_user_init_trumps_discovery(hass, flow_conf):
+async def test_only_one_in_progress(hass, flow_conf):
     """Test a user initialized one will finish and cancel discovered one."""
     loader.set_component(hass, 'test', MockModule('test'))
 
@@ -112,9 +114,16 @@ async def test_user_init_trumps_discovery(hass, flow_conf):
     # User starts flow
     result = await hass.config_entries.flow.async_init(
         'test', context={'source': config_entries.SOURCE_USER}, data={})
-    assert result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
 
-    # Discovery flow has been aborted
+    assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
+
+    # Discovery flow has not been aborted
+    assert len(hass.config_entries.flow.async_progress()) == 2
+
+    # Discovery should be aborted once user confirms
+    result = await hass.config_entries.flow.async_configure(
+        result['flow_id'], {})
+    assert result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
     assert len(hass.config_entries.flow.async_progress()) == 0
 
 

From 7fe0d8b2f44c16d8d3f126e489b13e23994177bf Mon Sep 17 00:00:00 2001
From: Robert Svensson <Kane610@users.noreply.github.com>
Date: Fri, 21 Sep 2018 19:59:20 +0200
Subject: [PATCH 235/357] deCONZ cover support (#16759)

deCONZ cover platform for Keen vents
---
 homeassistant/components/cover/__init__.py  |  15 +-
 homeassistant/components/cover/deconz.py    | 146 ++++++++++++++++++++
 homeassistant/components/deconz/__init__.py |   7 +-
 homeassistant/components/deconz/const.py    |   2 +
 homeassistant/components/light/deconz.py    |   5 +-
 tests/components/cover/test_deconz.py       |  84 +++++++++++
 tests/components/deconz/test_init.py        |  14 +-
 tests/components/switch/test_deconz.py      |   2 +-
 8 files changed, 263 insertions(+), 12 deletions(-)
 create mode 100644 homeassistant/components/cover/deconz.py
 create mode 100644 tests/components/cover/test_deconz.py

diff --git a/homeassistant/components/cover/__init__.py b/homeassistant/components/cover/__init__.py
index 05c5e46e44e..e9a33c27d34 100644
--- a/homeassistant/components/cover/__init__.py
+++ b/homeassistant/components/cover/__init__.py
@@ -35,8 +35,9 @@ ENTITY_ID_ALL_COVERS = group.ENTITY_ID_FORMAT.format('all_covers')
 ENTITY_ID_FORMAT = DOMAIN + '.{}'
 
 DEVICE_CLASSES = [
-    'window',        # Window control
+    'damper',
     'garage',        # Garage door control
+    'window',        # Window control
 ]
 
 DEVICE_CLASSES_SCHEMA = vol.All(vol.Lower, vol.In(DEVICE_CLASSES))
@@ -140,7 +141,7 @@ def stop_cover_tilt(hass, entity_id=None):
 
 async def async_setup(hass, config):
     """Track states and offer events for covers."""
-    component = EntityComponent(
+    component = hass.data[DOMAIN] = EntityComponent(
         _LOGGER, DOMAIN, hass, SCAN_INTERVAL, GROUP_NAME_ALL_COVERS)
 
     await component.async_setup(config)
@@ -195,6 +196,16 @@ async def async_setup(hass, config):
     return True
 
 
+async def async_setup_entry(hass, entry):
+    """Set up a config entry."""
+    return await hass.data[DOMAIN].async_setup_entry(entry)
+
+
+async def async_unload_entry(hass, entry):
+    """Unload a config entry."""
+    return await hass.data[DOMAIN].async_unload_entry(entry)
+
+
 class CoverDevice(Entity):
     """Representation a cover."""
 
diff --git a/homeassistant/components/cover/deconz.py b/homeassistant/components/cover/deconz.py
new file mode 100644
index 00000000000..9fe65596336
--- /dev/null
+++ b/homeassistant/components/cover/deconz.py
@@ -0,0 +1,146 @@
+"""
+Support for deCONZ covers.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/cover.deconz/
+"""
+from homeassistant.components.deconz.const import (
+    COVER_TYPES, DOMAIN as DATA_DECONZ, DATA_DECONZ_ID, DATA_DECONZ_UNSUB,
+    DECONZ_DOMAIN)
+from homeassistant.components.cover import (
+    ATTR_POSITION, CoverDevice, SUPPORT_CLOSE, SUPPORT_OPEN,
+    SUPPORT_SET_POSITION)
+from homeassistant.core import callback
+from homeassistant.helpers.device_registry import CONNECTION_ZIGBEE
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
+
+DEPENDENCIES = ['deconz']
+
+
+async def async_setup_platform(hass, config, async_add_entities,
+                               discovery_info=None):
+    """Unsupported way of setting up deCONZ covers."""
+    pass
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up covers for deCONZ component.
+
+    Covers are based on same device class as lights in deCONZ.
+    """
+    @callback
+    def async_add_cover(lights):
+        """Add cover from deCONZ."""
+        entities = []
+        for light in lights:
+            if light.type in COVER_TYPES:
+                entities.append(DeconzCover(light))
+        async_add_entities(entities, True)
+
+    hass.data[DATA_DECONZ_UNSUB].append(
+        async_dispatcher_connect(hass, 'deconz_new_light', async_add_cover))
+
+    async_add_cover(hass.data[DATA_DECONZ].lights.values())
+
+
+class DeconzCover(CoverDevice):
+    """Representation of a deCONZ cover."""
+
+    def __init__(self, cover):
+        """Set up cover and add update callback to get data from websocket."""
+        self._cover = cover
+        self._features = SUPPORT_OPEN | SUPPORT_CLOSE | SUPPORT_SET_POSITION
+
+    async def async_added_to_hass(self):
+        """Subscribe to covers events."""
+        self._cover.register_async_callback(self.async_update_callback)
+        self.hass.data[DATA_DECONZ_ID][self.entity_id] = self._cover.deconz_id
+
+    async def async_will_remove_from_hass(self) -> None:
+        """Disconnect cover object when removed."""
+        self._cover.remove_callback(self.async_update_callback)
+        self._cover = None
+
+    @callback
+    def async_update_callback(self, reason):
+        """Update the cover's state."""
+        self.async_schedule_update_ha_state()
+
+    @property
+    def current_cover_position(self):
+        """Return the current position of the cover."""
+        if self.is_closed:
+            return 0
+        return int(self._cover.brightness / 255 * 100)
+
+    @property
+    def is_closed(self):
+        """Return if the cover is closed."""
+        return not self._cover.state
+
+    @property
+    def name(self):
+        """Return the name of the cover."""
+        return self._cover.name
+
+    @property
+    def unique_id(self):
+        """Return a unique identifier for this cover."""
+        return self._cover.uniqueid
+
+    @property
+    def device_class(self):
+        """Return the class of the cover."""
+        return 'damper'
+
+    @property
+    def supported_features(self):
+        """Flag supported features."""
+        return self._features
+
+    @property
+    def available(self):
+        """Return True if light is available."""
+        return self._cover.reachable
+
+    @property
+    def should_poll(self):
+        """No polling needed."""
+        return False
+
+    async def async_set_cover_position(self, **kwargs):
+        """Move the cover to a specific position."""
+        position = kwargs[ATTR_POSITION]
+        data = {'on': False}
+        if position > 0:
+            data['on'] = True
+            data['bri'] = int(position / 100 * 255)
+        await self._cover.async_set_state(data)
+
+    async def async_open_cover(self, **kwargs):
+        """Open cover."""
+        data = {ATTR_POSITION: 100}
+        await self.async_set_cover_position(**data)
+
+    async def async_close_cover(self, **kwargs):
+        """Close cover."""
+        data = {ATTR_POSITION: 0}
+        await self.async_set_cover_position(**data)
+
+    @property
+    def device_info(self):
+        """Return a device description for device registry."""
+        if (self._cover.uniqueid is None or
+                self._cover.uniqueid.count(':') != 7):
+            return None
+        serial = self._cover.uniqueid.split('-', 1)[0]
+        bridgeid = self.hass.data[DATA_DECONZ].config.bridgeid
+        return {
+            'connections': {(CONNECTION_ZIGBEE, serial)},
+            'identifiers': {(DECONZ_DOMAIN, serial)},
+            'manufacturer': self._cover.manufacturer,
+            'model': self._cover.modelid,
+            'name': self._cover.name,
+            'sw_version': self._cover.swversion,
+            'via_hub': (DECONZ_DOMAIN, bridgeid),
+        }
diff --git a/homeassistant/components/deconz/__init__.py b/homeassistant/components/deconz/__init__.py
index 82f4233a7da..56b03c89a37 100644
--- a/homeassistant/components/deconz/__init__.py
+++ b/homeassistant/components/deconz/__init__.py
@@ -26,6 +26,9 @@ from .const import (
 
 REQUIREMENTS = ['pydeconz==47']
 
+SUPPORTED_PLATFORMS = ['binary_sensor', 'cover',
+                       'light', 'scene', 'sensor', 'switch']
+
 CONFIG_SCHEMA = vol.Schema({
     DOMAIN: vol.Schema({
         vol.Optional(CONF_API_KEY): cv.string,
@@ -104,7 +107,7 @@ async def async_setup_entry(hass, config_entry):
     hass.data[DATA_DECONZ_EVENT] = []
     hass.data[DATA_DECONZ_UNSUB] = []
 
-    for component in ['binary_sensor', 'light', 'scene', 'sensor', 'switch']:
+    for component in SUPPORTED_PLATFORMS:
         hass.async_create_task(hass.config_entries.async_forward_entry_setup(
             config_entry, component))
 
@@ -228,7 +231,7 @@ async def async_unload_entry(hass, config_entry):
     hass.services.async_remove(DOMAIN, SERVICE_DECONZ)
     deconz.close()
 
-    for component in ['binary_sensor', 'light', 'scene', 'sensor', 'switch']:
+    for component in SUPPORTED_PLATFORMS:
         await hass.config_entries.async_forward_entry_unload(
             config_entry, component)
 
diff --git a/homeassistant/components/deconz/const.py b/homeassistant/components/deconz/const.py
index e629d57f201..617d231f92e 100644
--- a/homeassistant/components/deconz/const.py
+++ b/homeassistant/components/deconz/const.py
@@ -16,6 +16,8 @@ CONF_ALLOW_DECONZ_GROUPS = 'allow_deconz_groups'
 ATTR_DARK = 'dark'
 ATTR_ON = 'on'
 
+COVER_TYPES = ["Level controllable output"]
+
 POWER_PLUGS = ["On/Off plug-in unit", "Smart plug"]
 SIRENS = ["Warning device"]
 SWITCH_TYPES = POWER_PLUGS + SIRENS
diff --git a/homeassistant/components/light/deconz.py b/homeassistant/components/light/deconz.py
index 3fb6e1dff00..d3bec079a4c 100644
--- a/homeassistant/components/light/deconz.py
+++ b/homeassistant/components/light/deconz.py
@@ -6,7 +6,8 @@ https://home-assistant.io/components/light.deconz/
 """
 from homeassistant.components.deconz.const import (
     CONF_ALLOW_DECONZ_GROUPS, DOMAIN as DATA_DECONZ,
-    DATA_DECONZ_ID, DATA_DECONZ_UNSUB, DECONZ_DOMAIN, SWITCH_TYPES)
+    DATA_DECONZ_ID, DATA_DECONZ_UNSUB, DECONZ_DOMAIN,
+    COVER_TYPES, SWITCH_TYPES)
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS, ATTR_COLOR_TEMP, ATTR_EFFECT, ATTR_FLASH, ATTR_HS_COLOR,
     ATTR_TRANSITION, EFFECT_COLORLOOP, FLASH_LONG, FLASH_SHORT,
@@ -33,7 +34,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
         """Add light from deCONZ."""
         entities = []
         for light in lights:
-            if light.type not in SWITCH_TYPES:
+            if light.type not in COVER_TYPES + SWITCH_TYPES:
                 entities.append(DeconzLight(light))
         async_add_entities(entities, True)
 
diff --git a/tests/components/cover/test_deconz.py b/tests/components/cover/test_deconz.py
new file mode 100644
index 00000000000..60de9cffdc1
--- /dev/null
+++ b/tests/components/cover/test_deconz.py
@@ -0,0 +1,84 @@
+"""deCONZ cover platform tests."""
+from unittest.mock import Mock, patch
+
+from homeassistant import config_entries
+from homeassistant.components import deconz
+from homeassistant.components.deconz.const import COVER_TYPES
+from homeassistant.helpers.dispatcher import async_dispatcher_send
+
+from tests.common import mock_coro
+
+SUPPORTED_COVERS = {
+    "1": {
+        "id": "Cover 1 id",
+        "name": "Cover 1 name",
+        "type": "Level controllable output",
+        "state": {}
+    }
+}
+
+UNSUPPORTED_COVER = {
+    "1": {
+        "id": "Cover id",
+        "name": "Unsupported switch",
+        "type": "Not a cover",
+        "state": {}
+    }
+}
+
+
+async def setup_bridge(hass, data):
+    """Load the deCONZ cover platform."""
+    from pydeconz import DeconzSession
+    loop = Mock()
+    session = Mock()
+    entry = Mock()
+    entry.data = {'host': '1.2.3.4', 'port': 80, 'api_key': '1234567890ABCDEF'}
+    bridge = DeconzSession(loop, session, **entry.data)
+    with patch('pydeconz.DeconzSession.async_get_state',
+               return_value=mock_coro(data)):
+        await bridge.async_load_parameters()
+    hass.data[deconz.DOMAIN] = bridge
+    hass.data[deconz.DATA_DECONZ_UNSUB] = []
+    hass.data[deconz.DATA_DECONZ_ID] = {}
+    config_entry = config_entries.ConfigEntry(
+        1, deconz.DOMAIN, 'Mock Title', {'host': 'mock-host'}, 'test',
+        config_entries.CONN_CLASS_LOCAL_PUSH)
+    await hass.config_entries.async_forward_entry_setup(config_entry, 'cover')
+    # To flush out the service call to update the group
+    await hass.async_block_till_done()
+
+
+async def test_no_switches(hass):
+    """Test that no cover entities are created."""
+    data = {}
+    await setup_bridge(hass, data)
+    assert len(hass.data[deconz.DATA_DECONZ_ID]) == 0
+    assert len(hass.states.async_all()) == 0
+
+
+async def test_cover(hass):
+    """Test that all supported cover entities are created."""
+    await setup_bridge(hass, {"lights": SUPPORTED_COVERS})
+    assert "cover.cover_1_name" in hass.data[deconz.DATA_DECONZ_ID]
+    assert len(SUPPORTED_COVERS) == len(COVER_TYPES)
+    assert len(hass.states.async_all()) == 2
+
+
+async def test_add_new_cover(hass):
+    """Test successful creation of cover entity."""
+    data = {}
+    await setup_bridge(hass, data)
+    cover = Mock()
+    cover.name = 'name'
+    cover.type = "Level controllable output"
+    cover.register_async_callback = Mock()
+    async_dispatcher_send(hass, 'deconz_new_light', [cover])
+    await hass.async_block_till_done()
+    assert "cover.name" in hass.data[deconz.DATA_DECONZ_ID]
+
+
+async def test_unsupported_cover(hass):
+    """Test that unsupported covers are not created."""
+    await setup_bridge(hass, {"lights": UNSUPPORTED_COVER})
+    assert len(hass.states.async_all()) == 0
diff --git a/tests/components/deconz/test_init.py b/tests/components/deconz/test_init.py
index 049a3b961b6..cfda1232e93 100644
--- a/tests/components/deconz/test_init.py
+++ b/tests/components/deconz/test_init.py
@@ -112,17 +112,21 @@ async def test_setup_entry_successful(hass):
     assert hass.data[deconz.DOMAIN]
     assert hass.data[deconz.DATA_DECONZ_ID] == {}
     assert len(hass.data[deconz.DATA_DECONZ_UNSUB]) == 1
-    assert len(mock_add_job.mock_calls) == 5
-    assert len(mock_config_entries.async_forward_entry_setup.mock_calls) == 5
+    assert len(mock_add_job.mock_calls) ==  \
+        len(deconz.SUPPORTED_PLATFORMS)
+    assert len(mock_config_entries.async_forward_entry_setup.mock_calls) == \
+        len(deconz.SUPPORTED_PLATFORMS)
     assert mock_config_entries.async_forward_entry_setup.mock_calls[0][1] == \
         (entry, 'binary_sensor')
     assert mock_config_entries.async_forward_entry_setup.mock_calls[1][1] == \
-        (entry, 'light')
+        (entry, 'cover')
     assert mock_config_entries.async_forward_entry_setup.mock_calls[2][1] == \
-        (entry, 'scene')
+        (entry, 'light')
     assert mock_config_entries.async_forward_entry_setup.mock_calls[3][1] == \
-        (entry, 'sensor')
+        (entry, 'scene')
     assert mock_config_entries.async_forward_entry_setup.mock_calls[4][1] == \
+        (entry, 'sensor')
+    assert mock_config_entries.async_forward_entry_setup.mock_calls[5][1] == \
         (entry, 'switch')
 
 
diff --git a/tests/components/switch/test_deconz.py b/tests/components/switch/test_deconz.py
index 7d2bea7a9fa..6833cab33d7 100644
--- a/tests/components/switch/test_deconz.py
+++ b/tests/components/switch/test_deconz.py
@@ -71,7 +71,7 @@ async def test_no_switches(hass):
 
 
 async def test_switch(hass):
-    """Test that all supported switch entities and switch group are created."""
+    """Test that all supported switch entities are created."""
     await setup_bridge(hass, {"lights": SUPPORTED_SWITCHES})
     assert "switch.switch_1_name" in hass.data[deconz.DATA_DECONZ_ID]
     assert "switch.switch_2_name" in hass.data[deconz.DATA_DECONZ_ID]

From 18d37ff0fd2d108eebaaacdc4d9fa9cd4dfd8f97 Mon Sep 17 00:00:00 2001
From: Malte Franken <exxamalte@users.noreply.github.com>
Date: Sat, 22 Sep 2018 04:45:57 +0930
Subject: [PATCH 236/357] GeoJSON platform (#16610)

* initial version of geojson platform

* unit tests for geo json platform added; smaller bugfixes and code cleanups

* fixing pylint issues

* moved all code accessing the external feed into separate library; refactored platform and tests to work with that new library

* fixing lint

* small refactorings
---
 .../components/geo_location/__init__.py       |   1 +
 .../geo_location/geo_json_events.py           | 196 ++++++++++++++++++
 requirements_all.txt                          |   3 +
 requirements_test_all.txt                     |   3 +
 script/gen_requirements_all.py                |   1 +
 .../geo_location/test_geo_json_events.py      | 136 ++++++++++++
 6 files changed, 340 insertions(+)
 create mode 100644 homeassistant/components/geo_location/geo_json_events.py
 create mode 100644 tests/components/geo_location/test_geo_json_events.py

diff --git a/homeassistant/components/geo_location/__init__.py b/homeassistant/components/geo_location/__init__.py
index 67ed9520fa4..66753aad221 100644
--- a/homeassistant/components/geo_location/__init__.py
+++ b/homeassistant/components/geo_location/__init__.py
@@ -14,6 +14,7 @@ from typing import Optional
 from homeassistant.const import ATTR_LATITUDE, ATTR_LONGITUDE
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_component import EntityComponent
+from homeassistant.helpers.config_validation import PLATFORM_SCHEMA  # noqa
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/geo_location/geo_json_events.py b/homeassistant/components/geo_location/geo_json_events.py
new file mode 100644
index 00000000000..bb17fb2450e
--- /dev/null
+++ b/homeassistant/components/geo_location/geo_json_events.py
@@ -0,0 +1,196 @@
+"""
+Generic GeoJSON events platform.
+
+Retrieves current events (typically incidents or alerts) in GeoJSON format, and
+displays information on events filtered by distance to the HA instance's
+location.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/geo_location/geo_json_events/
+"""
+import logging
+from datetime import timedelta
+from typing import Optional
+
+import voluptuous as vol
+
+import homeassistant.helpers.config_validation as cv
+from homeassistant.components.geo_location import GeoLocationEvent
+from homeassistant.const import CONF_RADIUS, CONF_URL, CONF_SCAN_INTERVAL, \
+    EVENT_HOMEASSISTANT_START
+from homeassistant.components.geo_location import PLATFORM_SCHEMA
+from homeassistant.helpers.event import track_time_interval
+
+REQUIREMENTS = ['geojson_client==0.1']
+
+_LOGGER = logging.getLogger(__name__)
+
+ATTR_EXTERNAL_ID = 'external_id'
+
+DEFAULT_RADIUS_IN_KM = 20.0
+DEFAULT_UNIT_OF_MEASUREMENT = "km"
+
+SCAN_INTERVAL = timedelta(minutes=5)
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_URL): cv.string,
+    vol.Optional(CONF_RADIUS, default=DEFAULT_RADIUS_IN_KM):
+        vol.Coerce(float),
+})
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Set up the GeoJSON Events platform."""
+    url = config[CONF_URL]
+    scan_interval = config.get(CONF_SCAN_INTERVAL, SCAN_INTERVAL)
+    radius_in_km = config[CONF_RADIUS]
+    # Initialize the entity manager.
+    GeoJsonFeedManager(hass, add_entities, scan_interval, url, radius_in_km)
+
+
+class GeoJsonFeedManager:
+    """Feed Manager for GeoJSON feeds."""
+
+    def __init__(self, hass, add_entities, scan_interval, url, radius_in_km):
+        """Initialize the GeoJSON Feed Manager."""
+        from geojson_client.generic_feed import GenericFeed
+        self._hass = hass
+        self._feed = GenericFeed((hass.config.latitude, hass.config.longitude),
+                                 filter_radius=radius_in_km, url=url)
+        self._add_entities = add_entities
+        self._scan_interval = scan_interval
+        self._feed_entries = []
+        self._managed_entities = []
+        hass.bus.listen_once(
+            EVENT_HOMEASSISTANT_START, lambda _: self._update())
+        self._init_regular_updates()
+
+    def _init_regular_updates(self):
+        """Schedule regular updates at the specified interval."""
+        track_time_interval(self._hass, lambda now: self._update(),
+                            self._scan_interval)
+
+    def _update(self):
+        """Update the feed and then update connected entities."""
+        import geojson_client
+        status, feed_entries = self._feed.update()
+        if status == geojson_client.UPDATE_OK:
+            _LOGGER.debug("Data retrieved %s", feed_entries)
+            # Keep a copy of all feed entries for future lookups by entities.
+            self._feed_entries = feed_entries.copy()
+            keep_entries = self._update_or_remove_entities(feed_entries)
+            self._generate_new_entities(keep_entries)
+        elif status == geojson_client.UPDATE_OK_NO_DATA:
+            _LOGGER.debug("Update successful, but no data received from %s",
+                          self._feed)
+        else:
+            _LOGGER.warning("Update not successful, no data received from %s",
+                            self._feed)
+            # Remove all entities.
+            self._update_or_remove_entities([])
+
+    def _update_or_remove_entities(self, feed_entries):
+        """Update existing entries and remove obsolete entities."""
+        _LOGGER.debug("Entries for updating: %s", feed_entries)
+        remove_entry = None
+        # Remove obsolete entities for events that have disappeared
+        managed_entities = self._managed_entities.copy()
+        for entity in managed_entities:
+            # Remove entry from previous iteration - if applicable.
+            if remove_entry:
+                feed_entries.remove(remove_entry)
+                remove_entry = None
+            for entry in feed_entries:
+                if entity.external_id == entry.external_id:
+                    # Existing entity - update details.
+                    _LOGGER.debug("Existing entity found %s", entity)
+                    remove_entry = entry
+                    entity.schedule_update_ha_state(True)
+                    break
+            else:
+                # Remove obsolete entity.
+                _LOGGER.debug("Entity not current anymore %s", entity)
+                self._managed_entities.remove(entity)
+                self._hass.add_job(entity.async_remove())
+        # Remove entry from very last iteration - if applicable.
+        if remove_entry:
+            feed_entries.remove(remove_entry)
+        # Return the remaining entries that new entities must be created for.
+        return feed_entries
+
+    def _generate_new_entities(self, entries):
+        """Generate new entities for events."""
+        new_entities = []
+        for entry in entries:
+            new_entity = GeoJsonLocationEvent(self, entry)
+            _LOGGER.debug("New entity added %s", new_entity)
+            new_entities.append(new_entity)
+        # Add new entities to HA and keep track of them in this manager.
+        self._add_entities(new_entities, True)
+        self._managed_entities.extend(new_entities)
+
+    def get_feed_entry(self, external_id):
+        """Return a feed entry identified by external id."""
+        return next((entry for entry in self._feed_entries
+                     if entry.external_id == external_id), None)
+
+
+class GeoJsonLocationEvent(GeoLocationEvent):
+    """This represents an external event with GeoJSON data."""
+
+    def __init__(self, feed_manager, feed_entry):
+        """Initialize entity with data from feed entry."""
+        self._feed_manager = feed_manager
+        self._update_from_feed(feed_entry)
+
+    @property
+    def should_poll(self):
+        """No polling needed for GeoJSON location events."""
+        return False
+
+    async def async_update(self):
+        """Update this entity from the data held in the feed manager."""
+        feed_entry = self._feed_manager.get_feed_entry(self.external_id)
+        if feed_entry:
+            self._update_from_feed(feed_entry)
+
+    def _update_from_feed(self, feed_entry):
+        """Update the internal state from the provided feed entry."""
+        self._name = feed_entry.title
+        self._distance = feed_entry.distance_to_home
+        self._latitude = feed_entry.coordinates[0]
+        self._longitude = feed_entry.coordinates[1]
+        self.external_id = feed_entry.external_id
+
+    @property
+    def name(self) -> Optional[str]:
+        """Return the name of the entity."""
+        return self._name
+
+    @property
+    def distance(self) -> Optional[float]:
+        """Return distance value of this external event."""
+        return self._distance
+
+    @property
+    def latitude(self) -> Optional[float]:
+        """Return latitude value of this external event."""
+        return self._latitude
+
+    @property
+    def longitude(self) -> Optional[float]:
+        """Return longitude value of this external event."""
+        return self._longitude
+
+    @property
+    def unit_of_measurement(self):
+        """Return the unit of measurement."""
+        return DEFAULT_UNIT_OF_MEASUREMENT
+
+    @property
+    def device_state_attributes(self):
+        """Return the device state attributes."""
+        attributes = {}
+        if self.external_id:
+            attributes[ATTR_EXTERNAL_ID] = self.external_id
+        return attributes
diff --git a/requirements_all.txt b/requirements_all.txt
index 2c9871962f9..2caa1b0b14e 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -390,6 +390,9 @@ gearbest_parser==1.0.7
 # homeassistant.components.sensor.geizhals
 geizhals==0.0.7
 
+# homeassistant.components.geo_location.geo_json_events
+geojson_client==0.1
+
 # homeassistant.components.sensor.gitter
 gitterpy==0.1.7
 
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index a62b5534c30..3262e1849c1 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -65,6 +65,9 @@ foobot_async==0.3.1
 # homeassistant.components.tts.google
 gTTS-token==1.1.1
 
+# homeassistant.components.geo_location.geo_json_events
+geojson_client==0.1
+
 # homeassistant.components.ffmpeg
 ha-ffmpeg==1.9
 
diff --git a/script/gen_requirements_all.py b/script/gen_requirements_all.py
index c4776e74f93..90036c5bf33 100755
--- a/script/gen_requirements_all.py
+++ b/script/gen_requirements_all.py
@@ -50,6 +50,7 @@ TEST_REQUIREMENTS = (
     'feedparser',
     'foobot_async',
     'gTTS-token',
+    'geojson_client',
     'hangups',
     'HAP-python',
     'ha-ffmpeg',
diff --git a/tests/components/geo_location/test_geo_json_events.py b/tests/components/geo_location/test_geo_json_events.py
new file mode 100644
index 00000000000..5ce508289dd
--- /dev/null
+++ b/tests/components/geo_location/test_geo_json_events.py
@@ -0,0 +1,136 @@
+"""The tests for the geojson platform."""
+import unittest
+from unittest import mock
+from unittest.mock import patch, MagicMock
+
+from homeassistant.components import geo_location
+from homeassistant.components.geo_location.geo_json_events import \
+    SCAN_INTERVAL, ATTR_EXTERNAL_ID
+from homeassistant.const import CONF_URL, EVENT_HOMEASSISTANT_START, \
+    CONF_RADIUS, ATTR_LATITUDE, ATTR_LONGITUDE, ATTR_FRIENDLY_NAME, \
+    ATTR_UNIT_OF_MEASUREMENT
+from homeassistant.setup import setup_component
+from tests.common import get_test_home_assistant, assert_setup_component, \
+    fire_time_changed
+import homeassistant.util.dt as dt_util
+
+URL = 'http://geo.json.local/geo_json_events.json'
+CONFIG = {
+    geo_location.DOMAIN: [
+        {
+            'platform': 'geo_json_events',
+            CONF_URL: URL,
+            CONF_RADIUS: 200
+        }
+    ]
+}
+
+
+class TestGeoJsonPlatform(unittest.TestCase):
+    """Test the geojson platform."""
+
+    def setUp(self):
+        """Initialize values for this testcase class."""
+        self.hass = get_test_home_assistant()
+
+    def tearDown(self):
+        """Stop everything that was started."""
+        self.hass.stop()
+
+    @staticmethod
+    def _generate_mock_feed_entry(external_id, title, distance_to_home,
+                                  coordinates):
+        """Construct a mock feed entry for testing purposes."""
+        feed_entry = MagicMock()
+        feed_entry.external_id = external_id
+        feed_entry.title = title
+        feed_entry.distance_to_home = distance_to_home
+        feed_entry.coordinates = coordinates
+        return feed_entry
+
+    @mock.patch('geojson_client.generic_feed.GenericFeed')
+    def test_setup(self, mock_feed):
+        """Test the general setup of the platform."""
+        # Set up some mock feed entries for this test.
+        mock_entry_1 = self._generate_mock_feed_entry('1234', 'Title 1', 15.5,
+                                                      (-31.0, 150.0))
+        mock_entry_2 = self._generate_mock_feed_entry('2345', 'Title 2', 20.5,
+                                                      (-31.1, 150.1))
+        mock_entry_3 = self._generate_mock_feed_entry('3456', 'Title 3', 25.5,
+                                                      (-31.2, 150.2))
+        mock_entry_4 = self._generate_mock_feed_entry('4567', 'Title 4', 12.5,
+                                                      (-31.3, 150.3))
+        mock_feed.return_value.update.return_value = 'OK', [mock_entry_1,
+                                                            mock_entry_2,
+                                                            mock_entry_3]
+
+        utcnow = dt_util.utcnow()
+        # Patching 'utcnow' to gain more control over the timed update.
+        with patch('homeassistant.util.dt.utcnow', return_value=utcnow):
+            with assert_setup_component(1, geo_location.DOMAIN):
+                self.assertTrue(setup_component(self.hass, geo_location.DOMAIN,
+                                                CONFIG))
+                # Artificially trigger update.
+                self.hass.bus.fire(EVENT_HOMEASSISTANT_START)
+                # Collect events.
+                self.hass.block_till_done()
+
+                all_states = self.hass.states.all()
+                assert len(all_states) == 3
+
+                state = self.hass.states.get("geo_location.title_1")
+                self.assertIsNotNone(state)
+                assert state.name == "Title 1"
+                assert state.attributes == {
+                    ATTR_EXTERNAL_ID: "1234", ATTR_LATITUDE: -31.0,
+                    ATTR_LONGITUDE: 150.0, ATTR_FRIENDLY_NAME: "Title 1",
+                    ATTR_UNIT_OF_MEASUREMENT: "km"}
+                self.assertAlmostEqual(float(state.state), 15.5)
+
+                state = self.hass.states.get("geo_location.title_2")
+                self.assertIsNotNone(state)
+                assert state.name == "Title 2"
+                assert state.attributes == {
+                    ATTR_EXTERNAL_ID: "2345", ATTR_LATITUDE: -31.1,
+                    ATTR_LONGITUDE: 150.1, ATTR_FRIENDLY_NAME: "Title 2",
+                    ATTR_UNIT_OF_MEASUREMENT: "km"}
+                self.assertAlmostEqual(float(state.state), 20.5)
+
+                state = self.hass.states.get("geo_location.title_3")
+                self.assertIsNotNone(state)
+                assert state.name == "Title 3"
+                assert state.attributes == {
+                    ATTR_EXTERNAL_ID: "3456", ATTR_LATITUDE: -31.2,
+                    ATTR_LONGITUDE: 150.2, ATTR_FRIENDLY_NAME: "Title 3",
+                    ATTR_UNIT_OF_MEASUREMENT: "km"}
+                self.assertAlmostEqual(float(state.state), 25.5)
+
+                # Simulate an update - one existing, one new entry,
+                # one outdated entry
+                mock_feed.return_value.update.return_value = 'OK', [
+                    mock_entry_1, mock_entry_4, mock_entry_3]
+                fire_time_changed(self.hass, utcnow + SCAN_INTERVAL)
+                self.hass.block_till_done()
+
+                all_states = self.hass.states.all()
+                assert len(all_states) == 3
+
+                # Simulate an update - empty data, but successful update,
+                # so no changes to entities.
+                mock_feed.return_value.update.return_value = 'OK_NO_DATA', None
+                # mock_restdata.return_value.data = None
+                fire_time_changed(self.hass, utcnow +
+                                  2 * SCAN_INTERVAL)
+                self.hass.block_till_done()
+
+                all_states = self.hass.states.all()
+                assert len(all_states) == 3
+
+                # Simulate an update - empty data, removes all entities
+                mock_feed.return_value.update.return_value = 'ERROR', None
+                fire_time_changed(self.hass, utcnow +
+                                  2 * SCAN_INTERVAL)
+                self.hass.block_till_done()
+
+                all_states = self.hass.states.all()
+                assert len(all_states) == 0

From ee3f17d5c7bc7f573a2ad9d3f969768133d81414 Mon Sep 17 00:00:00 2001
From: edif30 <edif30@gmail.com>
Date: Fri, 21 Sep 2018 15:22:27 -0400
Subject: [PATCH 237/357] Bump gtts-token to 1.1.2 (#16775)

* bump gtts-token to 1.1.2

* bump gtts-token to 1.1.2

* bump gtts-token to 1.1.2
---
 homeassistant/components/tts/google.py | 2 +-
 requirements_all.txt                   | 2 +-
 requirements_test_all.txt              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/tts/google.py b/homeassistant/components/tts/google.py
index cb05795c445..35a07ed8d22 100644
--- a/homeassistant/components/tts/google.py
+++ b/homeassistant/components/tts/google.py
@@ -17,7 +17,7 @@ import yarl
 from homeassistant.components.tts import CONF_LANG, PLATFORM_SCHEMA, Provider
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-REQUIREMENTS = ['gTTS-token==1.1.1']
+REQUIREMENTS = ['gTTS-token==1.1.2']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/requirements_all.txt b/requirements_all.txt
index 2caa1b0b14e..75103ba0893 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -382,7 +382,7 @@ freesms==0.1.2
 fritzhome==1.0.4
 
 # homeassistant.components.tts.google
-gTTS-token==1.1.1
+gTTS-token==1.1.2
 
 # homeassistant.components.sensor.gearbest
 gearbest_parser==1.0.7
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 3262e1849c1..a360b7ecbef 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -63,7 +63,7 @@ feedparser==5.2.1
 foobot_async==0.3.1
 
 # homeassistant.components.tts.google
-gTTS-token==1.1.1
+gTTS-token==1.1.2
 
 # homeassistant.components.geo_location.geo_json_events
 geojson_client==0.1

From 41bb4760f7f975e1998d54c35b4d0605c3ba055c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 21 Sep 2018 23:21:00 +0200
Subject: [PATCH 238/357] Upgrade restrictedpython to 4.0b5 (#16779)

---
 homeassistant/components/python_script.py | 2 +-
 requirements_all.txt                      | 2 +-
 requirements_test_all.txt                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/python_script.py b/homeassistant/components/python_script.py
index bbc6e07f2b0..5c56caf6470 100644
--- a/homeassistant/components/python_script.py
+++ b/homeassistant/components/python_script.py
@@ -18,7 +18,7 @@ from homeassistant.loader import bind_hass
 from homeassistant.util import sanitize_filename
 import homeassistant.util.dt as dt_util
 
-REQUIREMENTS = ['restrictedpython==4.0b4']
+REQUIREMENTS = ['restrictedpython==4.0b5']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/requirements_all.txt b/requirements_all.txt
index 75103ba0893..f356e0a24eb 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1260,7 +1260,7 @@ raincloudy==0.0.5
 regenmaschine==1.0.2
 
 # homeassistant.components.python_script
-restrictedpython==4.0b4
+restrictedpython==4.0b5
 
 # homeassistant.components.rflink
 rflink==0.0.37
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index a360b7ecbef..dc263fd4e9c 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -193,7 +193,7 @@ pyupnp-async==0.1.1.1
 pywebpush==1.6.0
 
 # homeassistant.components.python_script
-restrictedpython==4.0b4
+restrictedpython==4.0b5
 
 # homeassistant.components.rflink
 rflink==0.0.37

From e9c7fe184da1718466d9d662529db95cf2744436 Mon Sep 17 00:00:00 2001
From: Gerard <gerard33@users.noreply.github.com>
Date: Sat, 22 Sep 2018 08:52:57 +0200
Subject: [PATCH 239/357] Upgrade bimmer_connected to 0.5.2 (#16780)

---
 homeassistant/components/bmw_connected_drive/__init__.py | 2 +-
 requirements_all.txt                                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/bmw_connected_drive/__init__.py b/homeassistant/components/bmw_connected_drive/__init__.py
index b0ad1a867a8..12363627003 100644
--- a/homeassistant/components/bmw_connected_drive/__init__.py
+++ b/homeassistant/components/bmw_connected_drive/__init__.py
@@ -14,7 +14,7 @@ from homeassistant.helpers import discovery
 from homeassistant.helpers.event import track_utc_time_change
 import homeassistant.helpers.config_validation as cv
 
-REQUIREMENTS = ['bimmer_connected==0.5.1']
+REQUIREMENTS = ['bimmer_connected==0.5.2']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/requirements_all.txt b/requirements_all.txt
index f356e0a24eb..2f3eea9148b 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -172,7 +172,7 @@ beautifulsoup4==4.6.3
 bellows==0.7.0
 
 # homeassistant.components.bmw_connected_drive
-bimmer_connected==0.5.1
+bimmer_connected==0.5.2
 
 # homeassistant.components.blink
 blinkpy==0.6.0

From 56138164763439a8aa8926be1dfd28ca42c54655 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Sat, 22 Sep 2018 09:54:37 +0200
Subject: [PATCH 240/357] Fix Windows loop (#16737)

* Fix Windows loop

* Fix windows Ctrl+C

* Move windows restart handler out of setup_and_run_hass
---
 homeassistant/__main__.py       | 42 +++++++++++++++++++--------------
 homeassistant/core.py           |  5 +---
 homeassistant/helpers/signal.py | 25 ++++++++++++++++++++
 3 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/homeassistant/__main__.py b/homeassistant/__main__.py
index af89564f102..91b7a7f8466 100644
--- a/homeassistant/__main__.py
+++ b/homeassistant/__main__.py
@@ -19,15 +19,19 @@ from homeassistant.const import (
 )
 
 
-def attempt_use_uvloop() -> None:
+def set_loop() -> None:
     """Attempt to use uvloop."""
     import asyncio
-    try:
-        import uvloop
-    except ImportError:
-        pass
+
+    if sys.platform == 'win32':
+        asyncio.set_event_loop(asyncio.ProactorEventLoop())
     else:
-        asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
+        try:
+            import uvloop
+        except ImportError:
+            pass
+        else:
+            asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
 
 
 def validate_python() -> None:
@@ -244,17 +248,6 @@ async def setup_and_run_hass(config_dir: str,
     """Set up HASS and run."""
     from homeassistant import bootstrap, core
 
-    # Run a simple daemon runner process on Windows to handle restarts
-    if os.name == 'nt' and '--runner' not in sys.argv:
-        nt_args = cmdline() + ['--runner']
-        while True:
-            try:
-                subprocess.check_call(nt_args)
-                sys.exit(0)
-            except subprocess.CalledProcessError as exc:
-                if exc.returncode != RESTART_EXIT_CODE:
-                    sys.exit(exc.returncode)
-
     hass = core.HomeAssistant()
 
     if args.demo_mode:
@@ -345,7 +338,20 @@ def main() -> int:
             monkey_patch.disable_c_asyncio()
         monkey_patch.patch_weakref_tasks()
 
-    attempt_use_uvloop()
+    set_loop()
+
+    # Run a simple daemon runner process on Windows to handle restarts
+    if os.name == 'nt' and '--runner' not in sys.argv:
+        nt_args = cmdline() + ['--runner']
+        while True:
+            try:
+                subprocess.check_call(nt_args)
+                sys.exit(0)
+            except KeyboardInterrupt:
+                sys.exit(0)
+            except subprocess.CalledProcessError as exc:
+                if exc.returncode != RESTART_EXIT_CODE:
+                    sys.exit(exc.returncode)
 
     args = get_arguments()
 
diff --git a/homeassistant/core.py b/homeassistant/core.py
index 653f95ccece..d1f811502e0 100644
--- a/homeassistant/core.py
+++ b/homeassistant/core.py
@@ -129,10 +129,7 @@ class HomeAssistant:
             self,
             loop: Optional[asyncio.events.AbstractEventLoop] = None) -> None:
         """Initialize new Home Assistant object."""
-        if sys.platform == 'win32':
-            self.loop = loop or asyncio.ProactorEventLoop()
-        else:
-            self.loop = loop or asyncio.get_event_loop()
+        self.loop = loop or asyncio.get_event_loop()
 
         executor_opts = {'max_workers': None}  # type: Dict[str, Any]
         if sys.version_info[:2] >= (3, 6):
diff --git a/homeassistant/helpers/signal.py b/homeassistant/helpers/signal.py
index 6068cad33af..7496388fb52 100644
--- a/homeassistant/helpers/signal.py
+++ b/homeassistant/helpers/signal.py
@@ -43,3 +43,28 @@ def async_register_signal_handling(hass: HomeAssistant) -> None:
                 signal.SIGHUP, async_signal_handle, RESTART_EXIT_CODE)
         except ValueError:
             _LOGGER.warning("Could not bind to SIGHUP")
+
+    else:
+        old_sigterm = None
+        old_sigint = None
+
+        @callback
+        def async_signal_handle(exit_code, frame):
+            """Wrap signal handling.
+
+            * queue call to shutdown task
+            * re-instate default handler
+            """
+            signal.signal(signal.SIGTERM, old_sigterm)
+            signal.signal(signal.SIGINT, old_sigint)
+            hass.async_create_task(hass.async_stop(exit_code))
+
+        try:
+            old_sigterm = signal.signal(signal.SIGTERM, async_signal_handle)
+        except ValueError:
+            _LOGGER.warning("Could not bind to SIGTERM")
+
+        try:
+            old_sigint = signal.signal(signal.SIGINT, async_signal_handle)
+        except ValueError:
+            _LOGGER.warning("Could not bind to SIGINT")

From eec6722cf4c13c178f89032fcac0a4895641f5f1 Mon Sep 17 00:00:00 2001
From: Daniel Shokouhi <dshokouhi@gmail.com>
Date: Sat, 22 Sep 2018 02:34:46 -0700
Subject: [PATCH 241/357] Fix return to base logic for neato (#16776)

---
 homeassistant/components/vacuum/neato.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/homeassistant/components/vacuum/neato.py b/homeassistant/components/vacuum/neato.py
index dd27b2a33d2..2b601f9fb05 100644
--- a/homeassistant/components/vacuum/neato.py
+++ b/homeassistant/components/vacuum/neato.py
@@ -188,6 +188,8 @@ class NeatoConnectedVacuum(StateVacuumDevice):
 
     def return_to_base(self, **kwargs):
         """Set the vacuum cleaner to return to the dock."""
+        if self._clean_state == STATE_CLEANING:
+            self.robot.pause_cleaning()
         self._clean_state = STATE_RETURNING
         self.robot.send_to_base()
 

From cfd1aec741a3e1700d576f3f475357196b8acfc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=B8yer=20Iversen?= <mail@dahoiv.net>
Date: Sat, 22 Sep 2018 18:25:17 +0200
Subject: [PATCH 242/357] Update Tibber lib (#16795)

---
 homeassistant/components/sensor/tibber.py | 2 +-
 requirements_all.txt                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/sensor/tibber.py b/homeassistant/components/sensor/tibber.py
index 2dee84982da..dbea54ff353 100644
--- a/homeassistant/components/sensor/tibber.py
+++ b/homeassistant/components/sensor/tibber.py
@@ -21,7 +21,7 @@ from homeassistant.helpers.entity import Entity
 from homeassistant.util import dt as dt_util
 from homeassistant.util import Throttle
 
-REQUIREMENTS = ['pyTibber==0.5.0']
+REQUIREMENTS = ['pyTibber==0.5.1']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/requirements_all.txt b/requirements_all.txt
index 2f3eea9148b..bb41c1a9d29 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -764,7 +764,7 @@ pyRFXtrx==0.23
 pySwitchmate==0.4.1
 
 # homeassistant.components.sensor.tibber
-pyTibber==0.5.0
+pyTibber==0.5.1
 
 # homeassistant.components.switch.dlink
 pyW215==0.6.0

From 94d38a1c6bf24962abdc5cb3fad87191de3c3e2c Mon Sep 17 00:00:00 2001
From: Daniel Shokouhi <dshokouhi@gmail.com>
Date: Sun, 23 Sep 2018 00:41:45 -0700
Subject: [PATCH 243/357] Bump pybotvac to 0.0.10 (#16799)

---
 homeassistant/components/neato.py | 2 +-
 requirements_all.txt              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/neato.py b/homeassistant/components/neato.py
index 25da38e7f75..38af84e3176 100644
--- a/homeassistant/components/neato.py
+++ b/homeassistant/components/neato.py
@@ -17,7 +17,7 @@ from homeassistant.util import Throttle
 
 _LOGGER = logging.getLogger(__name__)
 
-REQUIREMENTS = ['pybotvac==0.0.9']
+REQUIREMENTS = ['pybotvac==0.0.10']
 
 DOMAIN = 'neato'
 NEATO_ROBOTS = 'neato_robots'
diff --git a/requirements_all.txt b/requirements_all.txt
index bb41c1a9d29..c382b7aad2d 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -810,7 +810,7 @@ pyblackbird==0.5
 # pybluez==0.22
 
 # homeassistant.components.neato
-pybotvac==0.0.9
+pybotvac==0.0.10
 
 # homeassistant.components.cloudflare
 pycfdns==0.0.1

From 0d681b0ba651f450d795d40a667dc7229c20ef18 Mon Sep 17 00:00:00 2001
From: Rohan Kapoor <rohan@rohankapoor.com>
Date: Sun, 23 Sep 2018 00:42:11 -0700
Subject: [PATCH 244/357] Bump zm-py up to 0.0.2 (#16800)

---
 homeassistant/components/zoneminder.py | 2 +-
 requirements_all.txt                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/zoneminder.py b/homeassistant/components/zoneminder.py
index 0778d9d7ef7..5cfd324448b 100644
--- a/homeassistant/components/zoneminder.py
+++ b/homeassistant/components/zoneminder.py
@@ -15,7 +15,7 @@ import homeassistant.helpers.config_validation as cv
 
 _LOGGER = logging.getLogger(__name__)
 
-REQUIREMENTS = ['zm-py==0.0.1']
+REQUIREMENTS = ['zm-py==0.0.2']
 
 CONF_PATH_ZMS = 'path_zms'
 
diff --git a/requirements_all.txt b/requirements_all.txt
index c382b7aad2d..9033b531e64 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1561,4 +1561,4 @@ zigpy-xbee==0.1.1
 zigpy==0.2.0
 
 # homeassistant.components.zoneminder
-zm-py==0.0.1
+zm-py==0.0.2

From eca1f050cdcb0cffb588bfd997a832287b546d7d Mon Sep 17 00:00:00 2001
From: Greg Laabs <OverloadUT@gmail.com>
Date: Sun, 23 Sep 2018 00:43:01 -0700
Subject: [PATCH 245/357] Bump sucks (Ecovacs) lib to 0.9.3 (#16803)

* Bump sucks (Ecovacs) lib to 0.9.3

Changed code that was in place as a workaround pre-0.9.2. This version bump fixes a few issues.

* Update requirements_all
---
 homeassistant/components/ecovacs.py        | 2 +-
 homeassistant/components/vacuum/ecovacs.py | 6 +-----
 requirements_all.txt                       | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/homeassistant/components/ecovacs.py b/homeassistant/components/ecovacs.py
index 53761a1013f..8cbe95ee685 100644
--- a/homeassistant/components/ecovacs.py
+++ b/homeassistant/components/ecovacs.py
@@ -15,7 +15,7 @@ from homeassistant.helpers import discovery
 from homeassistant.const import CONF_USERNAME, CONF_PASSWORD, \
     EVENT_HOMEASSISTANT_STOP
 
-REQUIREMENTS = ['sucks==0.9.1']
+REQUIREMENTS = ['sucks==0.9.3']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/vacuum/ecovacs.py b/homeassistant/components/vacuum/ecovacs.py
index 927362ac9db..7f05554c496 100644
--- a/homeassistant/components/vacuum/ecovacs.py
+++ b/homeassistant/components/vacuum/ecovacs.py
@@ -189,10 +189,6 @@ class EcovacsVacuum(VacuumDevice):
 
         for key, val in self.device.components.items():
             attr_name = ATTR_COMPONENT_PREFIX + key
-            data[attr_name] = int(val * 100 / 0.2777778)
-            # The above calculation includes a fix for a bug in sucks 0.9.1
-            # When sucks 0.9.2+ is released, it should be changed to the
-            # following:
-            # data[attr_name] = int(val * 100)
+            data[attr_name] = int(val * 100)
 
         return data
diff --git a/requirements_all.txt b/requirements_all.txt
index 9033b531e64..a2313275680 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1385,7 +1385,7 @@ statsd==3.2.1
 steamodd==4.21
 
 # homeassistant.components.ecovacs
-sucks==0.9.1
+sucks==0.9.3
 
 # homeassistant.components.camera.onvif
 suds-passworddigest-homeassistant==0.1.2a0.dev0

From 127395ae8d8977ba53a2728a2c769871209586b0 Mon Sep 17 00:00:00 2001
From: tadly <git@tadly.de>
Date: Sun, 23 Sep 2018 09:50:59 +0200
Subject: [PATCH 246/357] Upgrade zeroconf to 0.21.3 (#16789)

---
 homeassistant/components/zeroconf.py | 2 +-
 requirements_all.txt                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/zeroconf.py b/homeassistant/components/zeroconf.py
index f3917078f34..5d6161da904 100644
--- a/homeassistant/components/zeroconf.py
+++ b/homeassistant/components/zeroconf.py
@@ -12,7 +12,7 @@ import voluptuous as vol
 from homeassistant import util
 from homeassistant.const import (EVENT_HOMEASSISTANT_STOP, __version__)
 
-REQUIREMENTS = ['zeroconf==0.21.2']
+REQUIREMENTS = ['zeroconf==0.21.3']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/requirements_all.txt b/requirements_all.txt
index a2313275680..152440d52f3 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1546,7 +1546,7 @@ youtube_dl==2018.09.18
 zengge==0.2
 
 # homeassistant.components.zeroconf
-zeroconf==0.21.2
+zeroconf==0.21.3
 
 # homeassistant.components.climate.zhong_hong
 zhong_hong_hvac==1.0.9

From 539b86e079a2436a03888d992c033196c2cf37b3 Mon Sep 17 00:00:00 2001
From: huangyupeng <huangyupeng1111@163.com>
Date: Sun, 23 Sep 2018 16:36:33 +0800
Subject: [PATCH 247/357] Add Tuya cover state (#16709)

* add cover open and close state

* add tuya cover state

* fix pylint

* fix pylint problem
---
 homeassistant/components/cover/tuya.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/homeassistant/components/cover/tuya.py b/homeassistant/components/cover/tuya.py
index 6ab8581602f..a3a3db972e9 100644
--- a/homeassistant/components/cover/tuya.py
+++ b/homeassistant/components/cover/tuya.py
@@ -45,6 +45,11 @@ class TuyaCover(TuyaDevice, CoverDevice):
     @property
     def is_closed(self):
         """Return if the cover is closed or not."""
+        state = self.tuya.state()
+        if state == 1:
+            return False
+        if state == 2:
+            return True
         return None
 
     def open_cover(self, **kwargs):

From eaee55175b18a9a6d834162ea23fc19664a94ec5 Mon Sep 17 00:00:00 2001
From: Paul Biester <p.biester@isonet.fr>
Date: Sun, 23 Sep 2018 10:37:53 +0200
Subject: [PATCH 248/357] Add configurable host for bbox routers (#16778)

* Add configurable host for bbox routers

Add configurable host for bbox router running on non-default IP addresses.

* Fix unused import

Fix unused import which also resolves "line too long"

* Fix wrong import order

* Update validation
---
 .../components/device_tracker/bbox.py         | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/homeassistant/components/device_tracker/bbox.py b/homeassistant/components/device_tracker/bbox.py
index 6d870364dcb..297e98e548a 100644
--- a/homeassistant/components/device_tracker/bbox.py
+++ b/homeassistant/components/device_tracker/bbox.py
@@ -5,19 +5,30 @@ For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/device_tracker.bbox/
 """
 from collections import namedtuple
-import logging
 from datetime import timedelta
+import logging
 
-import homeassistant.util.dt as dt_util
-from homeassistant.components.device_tracker import DOMAIN, DeviceScanner
+import voluptuous as vol
+
+from homeassistant.components.device_tracker import (
+    DOMAIN, PLATFORM_SCHEMA, DeviceScanner)
+from homeassistant.const import CONF_HOST
+import homeassistant.helpers.config_validation as cv
 from homeassistant.util import Throttle
+import homeassistant.util.dt as dt_util
 
 REQUIREMENTS = ['pybbox==0.0.5-alpha']
 
 _LOGGER = logging.getLogger(__name__)
 
+DEFAULT_HOST = '192.168.1.254'
+
 MIN_TIME_BETWEEN_SCANS = timedelta(seconds=60)
 
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
+})
+
 
 def get_scanner(hass, config):
     """Validate the configuration and return a Bbox scanner."""
@@ -33,6 +44,9 @@ class BboxDeviceScanner(DeviceScanner):
     """This class scans for devices connected to the bbox."""
 
     def __init__(self, config):
+        """Get host from config."""
+        self.host = config[CONF_HOST]
+
         """Initialize the scanner."""
         self.last_results = []  # type: List[Device]
 
@@ -64,7 +78,7 @@ class BboxDeviceScanner(DeviceScanner):
 
         import pybbox
 
-        box = pybbox.Bbox()
+        box = pybbox.Bbox(ip=self.host)
         result = box.get_all_connected_devices()
 
         now = dt_util.now()

From e90abf1007d1be08d4875d2a23c5c1408a4388a9 Mon Sep 17 00:00:00 2001
From: Daniel Shokouhi <dshokouhi@gmail.com>
Date: Sun, 23 Sep 2018 03:35:18 -0700
Subject: [PATCH 249/357] Set botvac state when offline (#16805)

---
 homeassistant/components/vacuum/neato.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/homeassistant/components/vacuum/neato.py b/homeassistant/components/vacuum/neato.py
index 2b601f9fb05..29db94de762 100644
--- a/homeassistant/components/vacuum/neato.py
+++ b/homeassistant/components/vacuum/neato.py
@@ -75,6 +75,8 @@ class NeatoConnectedVacuum(StateVacuumDevice):
                 requests.exceptions.HTTPError) as ex:
             _LOGGER.warning("Neato connection error: %s", ex)
             self._state = None
+            self._clean_state = STATE_ERROR
+            self._status_state = 'Robot Offline'
             return
         _LOGGER.debug('self._state=%s', self._state)
         if self._state['state'] == 1:

From 2258c56d34ae905f33171b285d53894c0e5d30c2 Mon Sep 17 00:00:00 2001
From: Anders Melchiorsen <amelchio@nogoto.net>
Date: Sun, 23 Sep 2018 18:58:09 +0200
Subject: [PATCH 250/357] Handle netgear_lte connection errors (#16806)

---
 homeassistant/components/netgear_lte.py       | 39 ++++++++++++++-----
 .../components/notify/netgear_lte.py          | 26 +++++++++----
 .../components/sensor/netgear_lte.py          |  7 ++++
 requirements_all.txt                          |  2 +-
 4 files changed, 56 insertions(+), 18 deletions(-)

diff --git a/homeassistant/components/netgear_lte.py b/homeassistant/components/netgear_lte.py
index 7f54e6fd6f9..e5e9a0fc2e9 100644
--- a/homeassistant/components/netgear_lte.py
+++ b/homeassistant/components/netgear_lte.py
@@ -6,6 +6,7 @@ https://home-assistant.io/components/netgear_lte/
 """
 import asyncio
 from datetime import timedelta
+import logging
 
 import voluptuous as vol
 import attr
@@ -17,7 +18,9 @@ from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_create_clientsession
 from homeassistant.util import Throttle
 
-REQUIREMENTS = ['eternalegypt==0.0.3']
+REQUIREMENTS = ['eternalegypt==0.0.5']
+
+_LOGGER = logging.getLogger(__name__)
 
 MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=10)
 
@@ -37,17 +40,23 @@ class ModemData:
     """Class for modem state."""
 
     modem = attr.ib()
-    serial_number = attr.ib(init=False)
-    unread_count = attr.ib(init=False)
-    usage = attr.ib(init=False)
+
+    serial_number = attr.ib(init=False, default=None)
+    unread_count = attr.ib(init=False, default=None)
+    usage = attr.ib(init=False, default=None)
 
     @Throttle(MIN_TIME_BETWEEN_UPDATES)
     async def async_update(self):
         """Call the API to update the data."""
-        information = await self.modem.information()
-        self.serial_number = information.serial_number
-        self.unread_count = sum(1 for x in information.sms if x.unread)
-        self.usage = information.usage
+        import eternalegypt
+        try:
+            information = await self.modem.information()
+            self.serial_number = information.serial_number
+            self.unread_count = sum(1 for x in information.sms if x.unread)
+            self.usage = information.usage
+        except eternalegypt.Error:
+            self.unread_count = None
+            self.usage = None
 
 
 @attr.s
@@ -81,17 +90,27 @@ async def async_setup(hass, config):
     return True
 
 
-async def _setup_lte(hass, lte_config):
+async def _setup_lte(hass, lte_config, delay=0):
     """Set up a Netgear LTE modem."""
     import eternalegypt
 
+    if delay:
+        await asyncio.sleep(delay)
+
     host = lte_config[CONF_HOST]
     password = lte_config[CONF_PASSWORD]
 
     websession = hass.data[DATA_KEY].websession
 
     modem = eternalegypt.Modem(hostname=host, websession=websession)
-    await modem.login(password=password)
+
+    try:
+        await modem.login(password=password)
+    except eternalegypt.Error:
+        delay = max(15, min(2*delay, 300))
+        _LOGGER.warning("Retrying %s in %d seconds", host, delay)
+        hass.loop.create_task(_setup_lte(hass, lte_config, delay))
+        return
 
     modem_data = ModemData(modem)
     await modem_data.async_update()
diff --git a/homeassistant/components/notify/netgear_lte.py b/homeassistant/components/notify/netgear_lte.py
index 97dfe504a51..9ba804e193d 100644
--- a/homeassistant/components/notify/netgear_lte.py
+++ b/homeassistant/components/notify/netgear_lte.py
@@ -4,6 +4,8 @@ For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/notify.netgear_lte/
 """
 
+import logging
+
 import voluptuous as vol
 import attr
 
@@ -17,6 +19,8 @@ from ..netgear_lte import DATA_KEY
 
 DEPENDENCIES = ['netgear_lte']
 
+_LOGGER = logging.getLogger(__name__)
+
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_HOST): cv.string,
     vol.Required(ATTR_TARGET): vol.All(cv.ensure_list, [cv.string]),
@@ -25,21 +29,29 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 async def async_get_service(hass, config, discovery_info=None):
     """Get the notification service."""
-    modem_data = hass.data[DATA_KEY].get_modem_data(config)
-    phone = config.get(ATTR_TARGET)
-    return NetgearNotifyService(modem_data, phone)
+    return NetgearNotifyService(hass, config)
 
 
 @attr.s
 class NetgearNotifyService(BaseNotificationService):
     """Implementation of a notification service."""
 
-    modem_data = attr.ib()
-    phone = attr.ib()
+    hass = attr.ib()
+    config = attr.ib()
 
     async def async_send_message(self, message="", **kwargs):
         """Send a message to a user."""
-        targets = kwargs.get(ATTR_TARGET, self.phone)
+        modem_data = self.hass.data[DATA_KEY].get_modem_data(self.config)
+        if not modem_data:
+            _LOGGER.error("No modem available")
+            return
+
+        phone = self.config.get(ATTR_TARGET)
+        targets = kwargs.get(ATTR_TARGET, phone)
         if targets and message:
             for target in targets:
-                await self.modem_data.modem.sms(target, message)
+                import eternalegypt
+                try:
+                    await modem_data.modem.sms(target, message)
+                except eternalegypt.Error:
+                    _LOGGER.error("Unable to send to %s", target)
diff --git a/homeassistant/components/sensor/netgear_lte.py b/homeassistant/components/sensor/netgear_lte.py
index b13a8e39132..3c17750d6ad 100644
--- a/homeassistant/components/sensor/netgear_lte.py
+++ b/homeassistant/components/sensor/netgear_lte.py
@@ -9,6 +9,7 @@ import attr
 
 from homeassistant.const import CONF_HOST, CONF_SENSORS
 from homeassistant.components.sensor import PLATFORM_SCHEMA
+from homeassistant.exceptions import PlatformNotReady
 from homeassistant.helpers.entity import Entity
 import homeassistant.helpers.config_validation as cv
 
@@ -31,6 +32,9 @@ async def async_setup_platform(
     """Set up Netgear LTE sensor devices."""
     modem_data = hass.data[DATA_KEY].get_modem_data(config)
 
+    if not modem_data:
+        raise PlatformNotReady
+
     sensors = []
     for sensor_type in config[CONF_SENSORS]:
         if sensor_type == SENSOR_SMS:
@@ -88,4 +92,7 @@ class UsageSensor(LTESensor):
     @property
     def state(self):
         """Return the state of the sensor."""
+        if self.modem_data.usage is None:
+            return None
+
         return round(self.modem_data.usage / 1024**2, 1)
diff --git a/requirements_all.txt b/requirements_all.txt
index 152440d52f3..8e29b7eb74b 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -333,7 +333,7 @@ ephem==3.7.6.0
 epson-projector==0.1.3
 
 # homeassistant.components.netgear_lte
-eternalegypt==0.0.3
+eternalegypt==0.0.5
 
 # homeassistant.components.keyboard_remote
 # evdev==0.6.1

From 329d9dfc061ce423bc6c515387fee8919eb1586c Mon Sep 17 00:00:00 2001
From: mvn23 <schopdiedwaas@gmail.com>
Date: Sun, 23 Sep 2018 22:16:24 +0200
Subject: [PATCH 251/357] Improve opentherm_gw state detection (#16809)

Only show the platform in STATE_HEAT when the boiler is actually heating.
---
 homeassistant/components/climate/opentherm_gw.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/climate/opentherm_gw.py b/homeassistant/components/climate/opentherm_gw.py
index c1f7afa61b0..00049d26b7f 100644
--- a/homeassistant/components/climate/opentherm_gw.py
+++ b/homeassistant/components/climate/opentherm_gw.py
@@ -72,8 +72,9 @@ class OpenThermGateway(ClimateDevice):
         """Receive and handle a new report from the Gateway."""
         _LOGGER.debug("Received report: %s", status)
         ch_active = status.get(self.pyotgw.DATA_SLAVE_CH_ACTIVE)
+        flame_on = status.get(self.pyotgw.DATA_SLAVE_FLAME_ON)
         cooling_active = status.get(self.pyotgw.DATA_SLAVE_COOLING_ACTIVE)
-        if ch_active:
+        if ch_active and flame_on:
             self._current_operation = STATE_HEAT
         elif cooling_active:
             self._current_operation = STATE_COOL

From 564ad7e22a04273a6c9bee6d096b72b6ef2bc11a Mon Sep 17 00:00:00 2001
From: Jason Hu <awarecan@users.noreply.github.com>
Date: Sun, 23 Sep 2018 14:35:07 -0700
Subject: [PATCH 252/357] Rework chromecast fix (#16804)

* Revert changes of #16471, and fix the platform setup issue

* Fix unit test

* Fix

* Fix comment

* Fix test

* Address review comment

* Address review comment
---
 homeassistant/components/media_player/cast.py | 20 ++++++++++---------
 tests/common.py                               | 10 ++++++----
 tests/components/media_player/test_cast.py    | 20 +++++++++++++++++++
 3 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/homeassistant/components/media_player/cast.py b/homeassistant/components/media_player/cast.py
index a05653cd115..67d8ea0b419 100644
--- a/homeassistant/components/media_player/cast.py
+++ b/homeassistant/components/media_player/cast.py
@@ -61,10 +61,6 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
         vol.All(cv.ensure_list, [cv.string]),
 })
 
-CONNECTION_RETRY = 3
-CONNECTION_RETRY_WAIT = 2
-CONNECTION_TIMEOUT = 10
-
 
 @attr.s(slots=True, frozen=True)
 class ChromecastInfo:
@@ -216,9 +212,12 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     if not isinstance(config, list):
         config = [config]
 
-    await asyncio.wait([
+    # no pending task
+    done, _ = await asyncio.wait([
         _async_setup_platform(hass, cfg, async_add_entities, None)
         for cfg in config])
+    if any([task.exception() for task in done]):
+        raise PlatformNotReady
 
 
 async def _async_setup_platform(hass: HomeAssistantType, config: ConfigType,
@@ -250,8 +249,8 @@ async def _async_setup_platform(hass: HomeAssistantType, config: ConfigType,
         if cast_device is not None:
             async_add_entities([cast_device])
 
-    async_dispatcher_connect(hass, SIGNAL_CAST_DISCOVERED,
-                             async_cast_discovered)
+    remove_handler = async_dispatcher_connect(
+        hass, SIGNAL_CAST_DISCOVERED, async_cast_discovered)
     # Re-play the callback for all past chromecasts, store the objects in
     # a list to avoid concurrent modification resulting in exception.
     for chromecast in list(hass.data[KNOWN_CHROMECAST_INFO_KEY]):
@@ -265,8 +264,11 @@ async def _async_setup_platform(hass: HomeAssistantType, config: ConfigType,
         info = await hass.async_add_job(_fill_out_missing_chromecast_info,
                                         info)
         if info.friendly_name is None:
-            # HTTP dial failed, so we won't be able to connect.
+            _LOGGER.debug("Cannot retrieve detail information for chromecast"
+                          " %s, the device may not be online", info)
+            remove_handler()
             raise PlatformNotReady
+
         hass.async_add_job(_discover_chromecast, hass, info)
 
 
@@ -379,7 +381,7 @@ class CastDevice(MediaPlayerDevice):
             pychromecast._get_chromecast_from_host, (
                 cast_info.host, cast_info.port, cast_info.uuid,
                 cast_info.model_name, cast_info.friendly_name
-            ), CONNECTION_RETRY, CONNECTION_RETRY_WAIT, CONNECTION_TIMEOUT)
+            ))
         self._chromecast = chromecast
         self._status_listener = CastStatusListener(self, chromecast)
         # Initialise connection status as connected because we can only
diff --git a/tests/common.py b/tests/common.py
index 287f1e24ee5..0cb15d683b5 100644
--- a/tests/common.py
+++ b/tests/common.py
@@ -609,16 +609,18 @@ def patch_yaml_files(files_dict, endswith=True):
     return patch.object(yaml, 'open', mock_open_f, create=True)
 
 
-def mock_coro(return_value=None):
-    """Return a coro that returns a value."""
-    return mock_coro_func(return_value)()
+def mock_coro(return_value=None, exception=None):
+    """Return a coro that returns a value or raise an exception."""
+    return mock_coro_func(return_value, exception)()
 
 
-def mock_coro_func(return_value=None):
+def mock_coro_func(return_value=None, exception=None):
     """Return a method to create a coro function that returns a value."""
     @asyncio.coroutine
     def coro(*args, **kwargs):
         """Fake coroutine."""
+        if exception:
+            raise exception
         return return_value
 
     return coro
diff --git a/tests/components/media_player/test_cast.py b/tests/components/media_player/test_cast.py
index 7345fd0c158..8fd1ae18841 100644
--- a/tests/components/media_player/test_cast.py
+++ b/tests/components/media_player/test_cast.py
@@ -415,3 +415,23 @@ async def test_entry_setup_list_config(hass: HomeAssistantType):
     assert len(mock_setup.mock_calls) == 2
     assert mock_setup.mock_calls[0][1][1] == {'host': 'bla'}
     assert mock_setup.mock_calls[1][1][1] == {'host': 'blu'}
+
+
+async def test_entry_setup_platform_not_ready(hass: HomeAssistantType):
+    """Test failed setting up entry will raise PlatformNotReady."""
+    await async_setup_component(hass, 'cast', {
+        'cast': {
+            'media_player': {
+                'host': 'bla'
+            }
+        }
+    })
+
+    with patch(
+        'homeassistant.components.media_player.cast._async_setup_platform',
+            return_value=mock_coro(exception=Exception)) as mock_setup:
+        with pytest.raises(PlatformNotReady):
+            await cast.async_setup_entry(hass, MockConfigEntry(), None)
+
+    assert len(mock_setup.mock_calls) == 1
+    assert mock_setup.mock_calls[0][1][1] == {'host': 'bla'}

From 4fd2f773ad0f8fb8eca22cd1f8ccf3bf3d8a6cf0 Mon Sep 17 00:00:00 2001
From: Baptiste Lecocq <baptiste.lecocq@gmail.com>
Date: Mon, 24 Sep 2018 08:09:34 +0200
Subject: [PATCH 253/357] Add linky sensor (#16468)

* Add linky component

* Update requirements_all.txt

* Add timeout to pylinky requests

* Make linky platform fail fast
---
 .coveragerc                              |  1 +
 homeassistant/components/sensor/linky.py | 91 ++++++++++++++++++++++++
 requirements_all.txt                     |  3 +
 3 files changed, 95 insertions(+)
 create mode 100644 homeassistant/components/sensor/linky.py

diff --git a/.coveragerc b/.coveragerc
index 79afac5709f..a8d7d89544d 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -695,6 +695,7 @@ omit =
     homeassistant/components/sensor/kwb.py
     homeassistant/components/sensor/lacrosse.py
     homeassistant/components/sensor/lastfm.py
+    homeassistant/components/sensor/linky.py
     homeassistant/components/sensor/linux_battery.py
     homeassistant/components/sensor/loopenergy.py
     homeassistant/components/sensor/luftdaten.py
diff --git a/homeassistant/components/sensor/linky.py b/homeassistant/components/sensor/linky.py
new file mode 100644
index 00000000000..83a6d793085
--- /dev/null
+++ b/homeassistant/components/sensor/linky.py
@@ -0,0 +1,91 @@
+"""
+Support for Linky.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/sensor.linky/
+"""
+import logging
+import json
+from datetime import timedelta
+
+import voluptuous as vol
+
+from homeassistant.const import CONF_USERNAME, CONF_PASSWORD, CONF_TIMEOUT
+from homeassistant.components.sensor import PLATFORM_SCHEMA
+from homeassistant.helpers.entity import Entity
+from homeassistant.util import Throttle
+import homeassistant.helpers.config_validation as cv
+
+REQUIREMENTS = ['pylinky==0.1.6']
+_LOGGER = logging.getLogger(__name__)
+
+SCAN_INTERVAL = timedelta(minutes=10)
+DEFAULT_TIMEOUT = 10
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_USERNAME): cv.string,
+    vol.Required(CONF_PASSWORD): cv.string,
+    vol.Optional(CONF_TIMEOUT, default=DEFAULT_TIMEOUT): cv.positive_int,
+})
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Configure the platform and add the Linky sensor."""
+    username = config[CONF_USERNAME]
+    password = config[CONF_PASSWORD]
+    timeout = config[CONF_TIMEOUT]
+
+    from pylinky.client import LinkyClient, PyLinkyError
+    client = LinkyClient(username, password, None, timeout)
+
+    try:
+        client.fetch_data()
+    except PyLinkyError as exp:
+        _LOGGER.error(exp)
+        return
+
+    devices = [LinkySensor('Linky', client)]
+    add_entities(devices, True)
+
+
+class LinkySensor(Entity):
+    """Representation of a sensor entity for Linky."""
+
+    def __init__(self, name, client):
+        """Initialize the sensor."""
+        self._name = name
+        self._client = client
+        self._state = None
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return self._name
+
+    @property
+    def state(self):
+        """Return the state of the sensor."""
+        return self._state
+
+    @property
+    def unit_of_measurement(self):
+        """Return the unit of measurement."""
+        return 'kWh'
+
+    @Throttle(SCAN_INTERVAL)
+    def update(self):
+        """Fetch new state data for the sensor."""
+        from pylinky.client import PyLinkyError
+        try:
+            self._client.fetch_data()
+        except PyLinkyError as exp:
+            _LOGGER.error(exp)
+            return
+
+        _LOGGER.debug(json.dumps(self._client.get_data(), indent=2))
+
+        if self._client.get_data():
+            # get the last past day data
+            self._state = self._client.get_data()['daily'][-2]['conso']
+        else:
+            self._state = None
diff --git a/requirements_all.txt b/requirements_all.txt
index 8e29b7eb74b..d901a787493 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -950,6 +950,9 @@ pylgnetcast-homeassistant==0.2.0.dev0
 # homeassistant.components.notify.webostv
 pylgtv==0.1.7
 
+# homeassistant.components.sensor.linky
+pylinky==0.1.6
+
 # homeassistant.components.litejet
 pylitejet==0.1
 

From a5cb4e6c2b13afd1b86f47952f0a7132c7ab9a13 Mon Sep 17 00:00:00 2001
From: Martin Berg <2682426+mbrrg@users.noreply.github.com>
Date: Mon, 24 Sep 2018 10:10:10 +0200
Subject: [PATCH 254/357] Use pyspcwebgw for SPC component (#16214)

* Use pyspcwebgw library.

* Support alarm triggering.

* Update requirements.

* Add pyspcwebgw to test reqs.

* Also update script.

* Use dispatcher.

* Address review feedback.
---
 .../components/alarm_control_panel/spc.py     | 102 +++----
 homeassistant/components/binary_sensor/spc.py |  83 ++---
 homeassistant/components/spc.py               | 283 +++---------------
 requirements_all.txt                          |   4 +-
 requirements_test_all.txt                     |   3 +
 script/gen_requirements_all.py                |   1 +
 .../alarm_control_panel/test_spc.py           |  38 +--
 tests/components/binary_sensor/test_spc.py    |  34 +--
 tests/components/test_spc.py                  | 211 ++++---------
 9 files changed, 210 insertions(+), 549 deletions(-)

diff --git a/homeassistant/components/alarm_control_panel/spc.py b/homeassistant/components/alarm_control_panel/spc.py
index 2aa157a5cad..9150518022f 100644
--- a/homeassistant/components/alarm_control_panel/spc.py
+++ b/homeassistant/components/alarm_control_panel/spc.py
@@ -4,71 +4,65 @@ Support for Vanderbilt (formerly Siemens) SPC alarm systems.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/alarm_control_panel.spc/
 """
-import asyncio
 import logging
 
 import homeassistant.components.alarm_control_panel as alarm
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
+from homeassistant.core import callback
 from homeassistant.components.spc import (
-    ATTR_DISCOVER_AREAS, DATA_API, DATA_REGISTRY, SpcWebGateway)
+    ATTR_DISCOVER_AREAS, DATA_API, SIGNAL_UPDATE_ALARM)
 from homeassistant.const import (
-    STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED,
-    STATE_UNKNOWN)
+    STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_DISARMED, STATE_ALARM_TRIGGERED)
 
 _LOGGER = logging.getLogger(__name__)
 
-SPC_AREA_MODE_TO_STATE = {
-    '0': STATE_ALARM_DISARMED,
-    '1': STATE_ALARM_ARMED_HOME,
-    '3': STATE_ALARM_ARMED_AWAY,
-}
 
-
-def _get_alarm_state(spc_mode):
+def _get_alarm_state(area):
     """Get the alarm state."""
-    return SPC_AREA_MODE_TO_STATE.get(spc_mode, STATE_UNKNOWN)
+    from pyspcwebgw.const import AreaMode
+
+    if area.verified_alarm:
+        return STATE_ALARM_TRIGGERED
+
+    mode_to_state = {
+        AreaMode.UNSET: STATE_ALARM_DISARMED,
+        AreaMode.PART_SET_A: STATE_ALARM_ARMED_HOME,
+        AreaMode.PART_SET_B: STATE_ALARM_ARMED_NIGHT,
+        AreaMode.FULL_SET: STATE_ALARM_ARMED_AWAY,
+    }
+    return mode_to_state.get(area.mode)
 
 
-@asyncio.coroutine
-def async_setup_platform(hass, config, async_add_entities,
-                         discovery_info=None):
+async def async_setup_platform(hass, config, async_add_entities,
+                               discovery_info=None):
     """Set up the SPC alarm control panel platform."""
     if (discovery_info is None or
             discovery_info[ATTR_DISCOVER_AREAS] is None):
         return
 
-    api = hass.data[DATA_API]
-    devices = [SpcAlarm(api, area)
-               for area in discovery_info[ATTR_DISCOVER_AREAS]]
-
-    async_add_entities(devices)
+    async_add_entities([SpcAlarm(area=area, api=hass.data[DATA_API])
+                        for area in discovery_info[ATTR_DISCOVER_AREAS]])
 
 
 class SpcAlarm(alarm.AlarmControlPanel):
     """Representation of the SPC alarm panel."""
 
-    def __init__(self, api, area):
+    def __init__(self, area, api):
         """Initialize the SPC alarm panel."""
-        self._area_id = area['id']
-        self._name = area['name']
-        self._state = _get_alarm_state(area['mode'])
-        if self._state == STATE_ALARM_DISARMED:
-            self._changed_by = area.get('last_unset_user_name', 'unknown')
-        else:
-            self._changed_by = area.get('last_set_user_name', 'unknown')
+        self._area = area
         self._api = api
 
-    @asyncio.coroutine
-    def async_added_to_hass(self):
+    async def async_added_to_hass(self):
         """Call for adding new entities."""
-        self.hass.data[DATA_REGISTRY].register_alarm_device(
-            self._area_id, self)
+        async_dispatcher_connect(self.hass,
+                                 SIGNAL_UPDATE_ALARM.format(self._area.id),
+                                 self._update_callback)
 
-    @asyncio.coroutine
-    def async_update_from_spc(self, state, extra):
-        """Update the alarm panel with a new state."""
-        self._state = state
-        self._changed_by = extra.get('changed_by', 'unknown')
-        self.async_schedule_update_ha_state()
+    @callback
+    def _update_callback(self):
+        """Call update method."""
+        self.async_schedule_update_ha_state(True)
 
     @property
     def should_poll(self):
@@ -78,32 +72,34 @@ class SpcAlarm(alarm.AlarmControlPanel):
     @property
     def name(self):
         """Return the name of the device."""
-        return self._name
+        return self._area.name
 
     @property
     def changed_by(self):
         """Return the user the last change was triggered by."""
-        return self._changed_by
+        return self._area.last_changed_by
 
     @property
     def state(self):
         """Return the state of the device."""
-        return self._state
+        return _get_alarm_state(self._area)
 
-    @asyncio.coroutine
-    def async_alarm_disarm(self, code=None):
+    async def async_alarm_disarm(self, code=None):
         """Send disarm command."""
-        yield from self._api.send_area_command(
-            self._area_id, SpcWebGateway.AREA_COMMAND_UNSET)
+        from pyspcwebgw.const import AreaMode
+        self._api.change_mode(area=self._area, new_mode=AreaMode.UNSET)
 
-    @asyncio.coroutine
-    def async_alarm_arm_home(self, code=None):
+    async def async_alarm_arm_home(self, code=None):
         """Send arm home command."""
-        yield from self._api.send_area_command(
-            self._area_id, SpcWebGateway.AREA_COMMAND_PART_SET)
+        from pyspcwebgw.const import AreaMode
+        self._api.change_mode(area=self._area, new_mode=AreaMode.PART_SET_A)
 
-    @asyncio.coroutine
-    def async_alarm_arm_away(self, code=None):
+    async def async_alarm_arm_night(self, code=None):
+        """Send arm home command."""
+        from pyspcwebgw.const import AreaMode
+        self._api.change_mode(area=self._area, new_mode=AreaMode.PART_SET_B)
+
+    async def async_alarm_arm_away(self, code=None):
         """Send arm away command."""
-        yield from self._api.send_area_command(
-            self._area_id, SpcWebGateway.AREA_COMMAND_SET)
+        from pyspcwebgw.const import AreaMode
+        self._api.change_mode(area=self._area, new_mode=AreaMode.FULL_SET)
diff --git a/homeassistant/components/binary_sensor/spc.py b/homeassistant/components/binary_sensor/spc.py
index 9afd4fe4015..c1be72db374 100644
--- a/homeassistant/components/binary_sensor/spc.py
+++ b/homeassistant/components/binary_sensor/spc.py
@@ -4,87 +4,66 @@ Support for Vanderbilt (formerly Siemens) SPC alarm systems.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/binary_sensor.spc/
 """
-import asyncio
 import logging
 
 from homeassistant.components.binary_sensor import BinarySensorDevice
-from homeassistant.components.spc import ATTR_DISCOVER_DEVICES, DATA_REGISTRY
-from homeassistant.const import STATE_OFF, STATE_ON, STATE_UNAVAILABLE
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
+from homeassistant.core import callback
+from homeassistant.components.spc import (
+    ATTR_DISCOVER_DEVICES, SIGNAL_UPDATE_SENSOR)
 
 _LOGGER = logging.getLogger(__name__)
 
-SPC_TYPE_TO_DEVICE_CLASS = {
-    '0': 'motion',
-    '1': 'opening',
-    '3': 'smoke',
-}
 
-SPC_INPUT_TO_SENSOR_STATE = {
-    '0': STATE_OFF,
-    '1': STATE_ON,
-}
+def _get_device_class(zone_type):
+    from pyspcwebgw.const import ZoneType
+    return {
+        ZoneType.ALARM: 'motion',
+        ZoneType.ENTRY_EXIT: 'opening',
+        ZoneType.FIRE: 'smoke',
+    }.get(zone_type)
 
 
-def _get_device_class(spc_type):
-    """Get the device class."""
-    return SPC_TYPE_TO_DEVICE_CLASS.get(spc_type, None)
-
-
-def _get_sensor_state(spc_input):
-    """Get the sensor state."""
-    return SPC_INPUT_TO_SENSOR_STATE.get(spc_input, STATE_UNAVAILABLE)
-
-
-def _create_sensor(hass, zone):
-    """Create a SPC sensor."""
-    return SpcBinarySensor(
-        zone_id=zone['id'], name=zone['zone_name'],
-        state=_get_sensor_state(zone['input']),
-        device_class=_get_device_class(zone['type']),
-        spc_registry=hass.data[DATA_REGISTRY])
-
-
-@asyncio.coroutine
-def async_setup_platform(hass, config, async_add_entities,
-                         discovery_info=None):
+async def async_setup_platform(hass, config, async_add_entities,
+                               discovery_info=None):
     """Set up the SPC binary sensor."""
     if (discovery_info is None or
             discovery_info[ATTR_DISCOVER_DEVICES] is None):
         return
 
-    async_add_entities(
-        _create_sensor(hass, zone)
-        for zone in discovery_info[ATTR_DISCOVER_DEVICES]
-        if _get_device_class(zone['type']))
+    async_add_entities(SpcBinarySensor(zone)
+                       for zone in discovery_info[ATTR_DISCOVER_DEVICES]
+                       if _get_device_class(zone.type))
 
 
 class SpcBinarySensor(BinarySensorDevice):
     """Representation of a sensor based on a SPC zone."""
 
-    def __init__(self, zone_id, name, state, device_class, spc_registry):
+    def __init__(self, zone):
         """Initialize the sensor device."""
-        self._zone_id = zone_id
-        self._name = name
-        self._state = state
-        self._device_class = device_class
+        self._zone = zone
 
-        spc_registry.register_sensor_device(zone_id, self)
+    async def async_added_to_hass(self):
+        """Call for adding new entities."""
+        async_dispatcher_connect(self.hass,
+                                 SIGNAL_UPDATE_SENSOR.format(self._zone.id),
+                                 self._update_callback)
 
-    @asyncio.coroutine
-    def async_update_from_spc(self, state, extra):
-        """Update the state of the device."""
-        self._state = state
-        yield from self.async_update_ha_state()
+    @callback
+    def _update_callback(self):
+        """Call update method."""
+        self.async_schedule_update_ha_state(True)
 
     @property
     def name(self):
         """Return the name of the device."""
-        return self._name
+        return self._zone.name
 
     @property
     def is_on(self):
         """Whether the device is switched on."""
-        return self._state == STATE_ON
+        from pyspcwebgw.const import ZoneInput
+        return self._zone.input == ZoneInput.OPEN
 
     @property
     def hidden(self) -> bool:
@@ -100,4 +79,4 @@ class SpcBinarySensor(BinarySensorDevice):
     @property
     def device_class(self):
         """Return the device class."""
-        return self._device_class
+        return _get_device_class(self._zone.type)
diff --git a/homeassistant/components/spc.py b/homeassistant/components/spc.py
index 5b357efcabd..b00a4aeed2c 100644
--- a/homeassistant/components/spc.py
+++ b/homeassistant/components/spc.py
@@ -4,23 +4,15 @@ Support for Vanderbilt (formerly Siemens) SPC alarm systems.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/spc/
 """
-import asyncio
-import json
 import logging
-from urllib.parse import urljoin
 
-import aiohttp
-import async_timeout
 import voluptuous as vol
 
-from homeassistant.const import (
-    STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED,
-    STATE_ALARM_TRIGGERED, STATE_OFF, STATE_ON, STATE_UNAVAILABLE,
-    STATE_UNKNOWN)
-from homeassistant.helpers import discovery
+from homeassistant.helpers import discovery, aiohttp_client
+from homeassistant.helpers.dispatcher import async_dispatcher_send
 import homeassistant.helpers.config_validation as cv
 
-REQUIREMENTS = ['websockets==6.0']
+REQUIREMENTS = ['pyspcwebgw==0.4.0']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -30,9 +22,11 @@ ATTR_DISCOVER_AREAS = 'areas'
 CONF_WS_URL = 'ws_url'
 CONF_API_URL = 'api_url'
 
-DATA_REGISTRY = 'spc_registry'
-DATA_API = 'spc_api'
 DOMAIN = 'spc'
+DATA_API = 'spc_api'
+
+SIGNAL_UPDATE_ALARM = 'spc_update_alarm_{}'
+SIGNAL_UPDATE_SENSOR = 'spc_update_sensor_{}'
 
 CONFIG_SCHEMA = vol.Schema({
     DOMAIN: vol.Schema({
@@ -42,244 +36,45 @@ CONFIG_SCHEMA = vol.Schema({
 }, extra=vol.ALLOW_EXTRA)
 
 
-@asyncio.coroutine
-def async_setup(hass, config):
-    """Set up the SPC platform."""
-    hass.data[DATA_REGISTRY] = SpcRegistry()
+async def async_setup(hass, config):
+    """Set up the SPC component."""
+    from pyspcwebgw import SpcWebGateway
 
-    api = SpcWebGateway(hass,
-                        config[DOMAIN].get(CONF_API_URL),
-                        config[DOMAIN].get(CONF_WS_URL))
+    async def async_upate_callback(spc_object):
+        from pyspcwebgw.area import Area
+        from pyspcwebgw.zone import Zone
 
-    hass.data[DATA_API] = api
+        if isinstance(spc_object, Area):
+            async_dispatcher_send(hass,
+                                  SIGNAL_UPDATE_ALARM.format(spc_object.id))
+        elif isinstance(spc_object, Zone):
+            async_dispatcher_send(hass,
+                                  SIGNAL_UPDATE_SENSOR.format(spc_object.id))
+
+    session = aiohttp_client.async_get_clientsession(hass)
+
+    spc = SpcWebGateway(loop=hass.loop, session=session,
+                        api_url=config[DOMAIN].get(CONF_API_URL),
+                        ws_url=config[DOMAIN].get(CONF_WS_URL),
+                        async_callback=async_upate_callback)
+
+    hass.data[DATA_API] = spc
+
+    if not await spc.async_load_parameters():
+        _LOGGER.error('Failed to load area/zone information from SPC.')
+        return False
 
     # add sensor devices for each zone (typically motion/fire/door sensors)
-    zones = yield from api.get_zones()
-    if zones:
-        hass.async_create_task(discovery.async_load_platform(
-            hass, 'binary_sensor', DOMAIN,
-            {ATTR_DISCOVER_DEVICES: zones}, config))
+    hass.async_create_task(discovery.async_load_platform(
+        hass, 'binary_sensor', DOMAIN,
+        {ATTR_DISCOVER_DEVICES: spc.zones.values()}, config))
 
     # create a separate alarm panel for each area
-    areas = yield from api.get_areas()
-    if areas:
-        hass.async_create_task(discovery.async_load_platform(
-            hass, 'alarm_control_panel', DOMAIN,
-            {ATTR_DISCOVER_AREAS: areas}, config))
+    hass.async_create_task(discovery.async_load_platform(
+        hass, 'alarm_control_panel', DOMAIN,
+        {ATTR_DISCOVER_AREAS: spc.areas.values()}, config))
 
     # start listening for incoming events over websocket
-    api.start_listener(_async_process_message, hass.data[DATA_REGISTRY])
+    spc.start()
 
     return True
-
-
-@asyncio.coroutine
-def _async_process_message(sia_message, spc_registry):
-    spc_id = sia_message['sia_address']
-    sia_code = sia_message['sia_code']
-
-    # BA - Burglary Alarm
-    # CG - Close Area
-    # NL - Perimeter Armed
-    # OG - Open Area
-    # ZO - Zone Open
-    # ZC - Zone Close
-    # ZX - Zone Short
-    # ZD - Zone Disconnected
-
-    extra = {}
-
-    if sia_code in ('BA', 'CG', 'NL', 'OG'):
-        # change in area status, notify alarm panel device
-        device = spc_registry.get_alarm_device(spc_id)
-        data = sia_message['description'].split('¦')
-        if len(data) == 3:
-            extra['changed_by'] = data[1]
-    else:
-        # Change in zone status, notify sensor device
-        device = spc_registry.get_sensor_device(spc_id)
-
-    sia_code_to_state_map = {
-        'BA': STATE_ALARM_TRIGGERED,
-        'CG': STATE_ALARM_ARMED_AWAY,
-        'NL': STATE_ALARM_ARMED_HOME,
-        'OG': STATE_ALARM_DISARMED,
-        'ZO': STATE_ON,
-        'ZC': STATE_OFF,
-        'ZX': STATE_UNKNOWN,
-        'ZD': STATE_UNAVAILABLE,
-    }
-
-    new_state = sia_code_to_state_map.get(sia_code, None)
-
-    if new_state and not device:
-        _LOGGER.warning(
-            "No device mapping found for SPC area/zone id %s", spc_id)
-    elif new_state:
-        yield from device.async_update_from_spc(new_state, extra)
-
-
-class SpcRegistry:
-    """Maintain mappings between SPC zones/areas and HA entities."""
-
-    def __init__(self):
-        """Initialize the registry."""
-        self._zone_id_to_sensor_map = {}
-        self._area_id_to_alarm_map = {}
-
-    def register_sensor_device(self, zone_id, device):
-        """Add a sensor device to the registry."""
-        self._zone_id_to_sensor_map[zone_id] = device
-
-    def get_sensor_device(self, zone_id):
-        """Retrieve a sensor device for a specific zone."""
-        return self._zone_id_to_sensor_map.get(zone_id, None)
-
-    def register_alarm_device(self, area_id, device):
-        """Add an alarm device to the registry."""
-        self._area_id_to_alarm_map[area_id] = device
-
-    def get_alarm_device(self, area_id):
-        """Retrieve an alarm device for a specific area."""
-        return self._area_id_to_alarm_map.get(area_id, None)
-
-
-@asyncio.coroutine
-def _ws_process_message(message, async_callback, *args):
-    if message.get('status', '') != 'success':
-        _LOGGER.warning(
-            "Unsuccessful websocket message delivered, ignoring: %s", message)
-    try:
-        yield from async_callback(message['data']['sia'], *args)
-    except:  # noqa: E722 pylint: disable=bare-except
-        _LOGGER.exception("Exception in callback, ignoring")
-
-
-class SpcWebGateway:
-    """Simple binding for the Lundix SPC Web Gateway REST API."""
-
-    AREA_COMMAND_SET = 'set'
-    AREA_COMMAND_PART_SET = 'set_a'
-    AREA_COMMAND_UNSET = 'unset'
-
-    def __init__(self, hass, api_url, ws_url):
-        """Initialize the web gateway client."""
-        self._hass = hass
-        self._api_url = api_url
-        self._ws_url = ws_url
-        self._ws = None
-
-    @asyncio.coroutine
-    def get_zones(self):
-        """Retrieve all available zones."""
-        return (yield from self._get_data('zone'))
-
-    @asyncio.coroutine
-    def get_areas(self):
-        """Retrieve all available areas."""
-        return (yield from self._get_data('area'))
-
-    @asyncio.coroutine
-    def send_area_command(self, area_id, command):
-        """Send an area command."""
-        _LOGGER.debug(
-            "Sending SPC area command '%s' to area %s", command, area_id)
-        resource = "area/{}/{}".format(area_id, command)
-        return (yield from self._call_web_gateway(resource, use_get=False))
-
-    def start_listener(self, async_callback, *args):
-        """Start the websocket listener."""
-        asyncio.ensure_future(self._ws_listen(async_callback, *args))
-
-    def _build_url(self, resource):
-        return urljoin(self._api_url, "spc/{}".format(resource))
-
-    @asyncio.coroutine
-    def _get_data(self, resource):
-        """Get the data from the resource."""
-        data = yield from self._call_web_gateway(resource)
-        if not data:
-            return False
-        if data['status'] != 'success':
-            _LOGGER.error(
-                "SPC Web Gateway call unsuccessful for resource: %s", resource)
-            return False
-        return [item for item in data['data'][resource]]
-
-    @asyncio.coroutine
-    def _call_web_gateway(self, resource, use_get=True):
-        """Call web gateway for data."""
-        response = None
-        session = None
-        url = self._build_url(resource)
-        try:
-            _LOGGER.debug("Attempting to retrieve SPC data from %s", url)
-            session = \
-                self._hass.helpers.aiohttp_client.async_get_clientsession()
-            with async_timeout.timeout(10, loop=self._hass.loop):
-                action = session.get if use_get else session.put
-                response = yield from action(url)
-            if response.status != 200:
-                _LOGGER.error(
-                    "SPC Web Gateway returned http status %d, response %s",
-                    response.status, (yield from response.text()))
-                return False
-            result = yield from response.json()
-        except asyncio.TimeoutError:
-            _LOGGER.error("Timeout getting SPC data from %s", url)
-            return False
-        except aiohttp.ClientError:
-            _LOGGER.exception("Error getting SPC data from %s", url)
-            return False
-        finally:
-            if session:
-                yield from session.close()
-            if response:
-                yield from response.release()
-        _LOGGER.debug("Data from SPC: %s", result)
-        return result
-
-    @asyncio.coroutine
-    def _ws_read(self):
-        """Read from websocket."""
-        import websockets as wslib
-
-        try:
-            if not self._ws:
-                self._ws = yield from wslib.connect(self._ws_url)
-                _LOGGER.info("Connected to websocket at %s", self._ws_url)
-        except Exception as ws_exc:    # pylint: disable=broad-except
-            _LOGGER.error("Failed to connect to websocket: %s", ws_exc)
-            return
-
-        result = None
-
-        try:
-            result = yield from self._ws.recv()
-            _LOGGER.debug("Data from websocket: %s", result)
-        except Exception as ws_exc:    # pylint: disable=broad-except
-            _LOGGER.error("Failed to read from websocket: %s", ws_exc)
-            try:
-                yield from self._ws.close()
-            finally:
-                self._ws = None
-
-        return result
-
-    @asyncio.coroutine
-    def _ws_listen(self, async_callback, *args):
-        """Listen on websocket."""
-        try:
-            while True:
-                result = yield from self._ws_read()
-
-                if result:
-                    yield from _ws_process_message(
-                        json.loads(result), async_callback, *args)
-                else:
-                    _LOGGER.info("Trying again in 30 seconds")
-                    yield from asyncio.sleep(30)
-
-        finally:
-            if self._ws:
-                yield from self._ws.close()
diff --git a/requirements_all.txt b/requirements_all.txt
index d901a787493..ba353af0d48 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1069,6 +1069,9 @@ pysnmp==4.4.5
 # homeassistant.components.sonos
 pysonos==0.0.2
 
+# homeassistant.components.spc
+pyspcwebgw==0.4.0
+
 # homeassistant.components.notify.stride
 pystride==0.1.7
 
@@ -1502,7 +1505,6 @@ waterfurnace==0.7.0
 # homeassistant.components.media_player.gpmdp
 websocket-client==0.37.0
 
-# homeassistant.components.spc
 # homeassistant.components.media_player.webostv
 websockets==6.0
 
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index dc263fd4e9c..171650b867d 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -170,6 +170,9 @@ pyqwikswitch==0.8
 # homeassistant.components.sonos
 pysonos==0.0.2
 
+# homeassistant.components.spc
+pyspcwebgw==0.4.0
+
 # homeassistant.components.sensor.darksky
 # homeassistant.components.weather.darksky
 python-forecastio==1.4.0
diff --git a/script/gen_requirements_all.py b/script/gen_requirements_all.py
index 90036c5bf33..7493e523273 100755
--- a/script/gen_requirements_all.py
+++ b/script/gen_requirements_all.py
@@ -83,6 +83,7 @@ TEST_REQUIREMENTS = (
     'pysonos',
     'pyqwikswitch',
     'PyRMVtransport',
+    'pyspcwebgw',
     'python-forecastio',
     'python-nest',
     'pytradfri\[async\]',
diff --git a/tests/components/alarm_control_panel/test_spc.py b/tests/components/alarm_control_panel/test_spc.py
index a0793943c2f..b1078e1b14f 100644
--- a/tests/components/alarm_control_panel/test_spc.py
+++ b/tests/components/alarm_control_panel/test_spc.py
@@ -1,27 +1,11 @@
 """Tests for Vanderbilt SPC alarm control panel platform."""
-import asyncio
-
-import pytest
-
-from homeassistant.components.spc import SpcRegistry
 from homeassistant.components.alarm_control_panel import spc
-from tests.common import async_test_home_assistant
 from homeassistant.const import (
     STATE_ALARM_ARMED_AWAY, STATE_ALARM_DISARMED)
+from homeassistant.components.spc import (DATA_API)
 
 
-@pytest.fixture
-def hass(loop):
-    """Home Assistant fixture with device mapping registry."""
-    hass = loop.run_until_complete(async_test_home_assistant(loop))
-    hass.data['spc_registry'] = SpcRegistry()
-    hass.data['spc_api'] = None
-    yield hass
-    loop.run_until_complete(hass.async_stop(force=True))
-
-
-@asyncio.coroutine
-def test_setup_platform(hass):
+async def test_setup_platform(hass):
     """Test adding areas as separate alarm control panel devices."""
     added_entities = []
 
@@ -29,7 +13,7 @@ def test_setup_platform(hass):
         nonlocal added_entities
         added_entities = list(entities)
 
-    areas = {'areas': [{
+    area_defs = [{
         'id': '1',
         'name': 'House',
         'mode': '3',
@@ -50,12 +34,18 @@ def test_setup_platform(hass):
         'last_unset_time': '1483705808',
         'last_unset_user_id': '9998',
         'last_unset_user_name': 'Lisa'
-    }]}
+    }]
 
-    yield from spc.async_setup_platform(hass=hass,
-                                        config={},
-                                        async_add_entities=add_entities,
-                                        discovery_info=areas)
+    from pyspcwebgw import Area
+
+    areas = [Area(gateway=None, spc_area=a) for a in area_defs]
+
+    hass.data[DATA_API] = None
+
+    await spc.async_setup_platform(hass=hass,
+                                   config={},
+                                   async_add_entities=add_entities,
+                                   discovery_info={'areas': areas})
 
     assert len(added_entities) == 2
 
diff --git a/tests/components/binary_sensor/test_spc.py b/tests/components/binary_sensor/test_spc.py
index 966f73682e8..ec0886aeed8 100644
--- a/tests/components/binary_sensor/test_spc.py
+++ b/tests/components/binary_sensor/test_spc.py
@@ -1,28 +1,12 @@
 """Tests for Vanderbilt SPC binary sensor platform."""
-import asyncio
-
-import pytest
-
-from homeassistant.components.spc import SpcRegistry
 from homeassistant.components.binary_sensor import spc
-from tests.common import async_test_home_assistant
 
 
-@pytest.fixture
-def hass(loop):
-    """Home Assistant fixture with device mapping registry."""
-    hass = loop.run_until_complete(async_test_home_assistant(loop))
-    hass.data['spc_registry'] = SpcRegistry()
-    yield hass
-    loop.run_until_complete(hass.async_stop(force=True))
-
-
-@asyncio.coroutine
-def test_setup_platform(hass):
+async def test_setup_platform(hass):
     """Test autodiscovery of supported device types."""
     added_entities = []
 
-    zones = {'devices': [{
+    zone_defs = [{
         'id': '1',
         'type': '3',
         'zone_name': 'Kitchen smoke',
@@ -46,16 +30,20 @@ def test_setup_platform(hass):
         'area_name': 'House',
         'input': '1',
         'status': '0',
-    }]}
+    }]
 
     def add_entities(entities):
         nonlocal added_entities
         added_entities = list(entities)
 
-    yield from spc.async_setup_platform(hass=hass,
-                                        config={},
-                                        async_add_entities=add_entities,
-                                        discovery_info=zones)
+    from pyspcwebgw import Zone
+
+    zones = [Zone(area=None, spc_zone=z) for z in zone_defs]
+
+    await spc.async_setup_platform(hass=hass,
+                                   config={},
+                                   async_add_entities=add_entities,
+                                   discovery_info={'devices': zones})
 
     assert len(added_entities) == 3
     assert added_entities[0].device_class == 'smoke'
diff --git a/tests/components/test_spc.py b/tests/components/test_spc.py
index 7837abd8007..d4bedda4e96 100644
--- a/tests/components/test_spc.py
+++ b/tests/components/test_spc.py
@@ -1,167 +1,74 @@
 """Tests for Vanderbilt SPC component."""
-import asyncio
+from unittest.mock import patch, PropertyMock, Mock
 
-import pytest
-
-from homeassistant.components import spc
 from homeassistant.bootstrap import async_setup_component
-from tests.common import async_test_home_assistant
-from tests.test_util.aiohttp import mock_aiohttp_client
-from homeassistant.const import (
-    STATE_ON, STATE_OFF, STATE_ALARM_ARMED_AWAY,
-    STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED)
+from homeassistant.components.spc import DATA_API
+from homeassistant.const import (STATE_ALARM_ARMED_AWAY, STATE_ALARM_DISARMED)
+
+from tests.common import mock_coro
 
 
-@pytest.fixture
-def hass(loop):
-    """Home Assistant fixture with device mapping registry."""
-    hass = loop.run_until_complete(async_test_home_assistant(loop))
-    hass.data[spc.DATA_REGISTRY] = spc.SpcRegistry()
-    hass.data[spc.DATA_API] = None
-    yield hass
-    loop.run_until_complete(hass.async_stop())
-
-
-@pytest.fixture
-def spcwebgw(hass):
-    """Fixture for the SPC Web Gateway API configured for localhost."""
-    yield spc.SpcWebGateway(hass=hass,
-                            api_url='http://localhost/',
-                            ws_url='ws://localhost/')
-
-
-@pytest.fixture
-def aioclient_mock():
-    """HTTP client mock for areas and zones."""
-    areas = """{"status":"success","data":{"area":[{"id":"1","name":"House",
-    "mode":"0","last_set_time":"1485759851","last_set_user_id":"1",
-    "last_set_user_name":"Pelle","last_unset_time":"1485800564",
-    "last_unset_user_id":"1","last_unset_user_name":"Pelle","last_alarm":
-    "1478174896"},{"id":"3","name":"Garage","mode":"0","last_set_time":
-    "1483705803","last_set_user_id":"9998","last_set_user_name":"Lisa",
-    "last_unset_time":"1483705808","last_unset_user_id":"9998",
-    "last_unset_user_name":"Lisa"}]}}"""
-
-    zones = """{"status":"success","data":{"zone":[{"id":"1","type":"3",
-    "zone_name":"Kitchen smoke","area":"1","area_name":"House","input":"0",
-    "logic_input":"0","status":"0","proc_state":"0","inhibit_allowed":"1",
-    "isolate_allowed":"1"},{"id":"3","type":"0","zone_name":"Hallway PIR",
-    "area":"1","area_name":"House","input":"0","logic_input":"0","status":
-    "0","proc_state":"0","inhibit_allowed":"1","isolate_allowed":"1"},
-    {"id":"5","type":"1","zone_name":"Front door","area":"1","area_name":
-    "House","input":"1","logic_input":"0","status":"0","proc_state":"0",
-    "inhibit_allowed":"1","isolate_allowed":"1"}]}}"""
-
-    with mock_aiohttp_client() as mock_session:
-        mock_session.get('http://localhost/spc/area', text=areas)
-        mock_session.get('http://localhost/spc/zone', text=zones)
-        yield mock_session
-
-
-@asyncio.coroutine
-@pytest.mark.parametrize("sia_code,state", [
-    ('NL', STATE_ALARM_ARMED_HOME),
-    ('CG', STATE_ALARM_ARMED_AWAY),
-    ('OG', STATE_ALARM_DISARMED)
-])
-def test_update_alarm_device(hass, aioclient_mock, monkeypatch,
-                             sia_code, state):
-    """Test that alarm panel state changes on incoming websocket data."""
-    monkeypatch.setattr("homeassistant.components.spc.SpcWebGateway."
-                        "start_listener", lambda x, *args: None)
+async def test_valid_device_config(hass, monkeypatch):
+    """Test valid device config."""
     config = {
         'spc': {
             'api_url': 'http://localhost/',
             'ws_url': 'ws://localhost/'
         }
     }
-    yield from async_setup_component(hass, 'spc', config)
-    yield from hass.async_block_till_done()
 
+    with patch('pyspcwebgw.SpcWebGateway.async_load_parameters',
+               return_value=mock_coro(True)):
+        assert await async_setup_component(hass, 'spc', config) is True
+
+
+async def test_invalid_device_config(hass, monkeypatch):
+    """Test valid device config."""
+    config = {
+        'spc': {
+            'api_url': 'http://localhost/'
+        }
+    }
+
+    with patch('pyspcwebgw.SpcWebGateway.async_load_parameters',
+               return_value=mock_coro(True)):
+        assert await async_setup_component(hass, 'spc', config) is False
+
+
+async def test_update_alarm_device(hass):
+    """Test that alarm panel state changes on incoming websocket data."""
+    import pyspcwebgw
+    from pyspcwebgw.const import AreaMode
+
+    config = {
+        'spc': {
+            'api_url': 'http://localhost/',
+            'ws_url': 'ws://localhost/'
+        }
+    }
+
+    area_mock = Mock(spec=pyspcwebgw.area.Area, id='1',
+                     mode=AreaMode.FULL_SET, last_changed_by='Sven')
+    area_mock.name = 'House'
+    area_mock.verified_alarm = False
+
+    with patch('pyspcwebgw.SpcWebGateway.areas',
+               new_callable=PropertyMock) as mock_areas:
+        mock_areas.return_value = {'1': area_mock}
+        with patch('pyspcwebgw.SpcWebGateway.async_load_parameters',
+                   return_value=mock_coro(True)):
+            assert await async_setup_component(hass, 'spc', config) is True
+
+    await hass.async_block_till_done()
     entity_id = 'alarm_control_panel.house'
 
+    assert hass.states.get(entity_id).state == STATE_ALARM_ARMED_AWAY
+    assert hass.states.get(entity_id).attributes['changed_by'] == 'Sven'
+
+    area_mock.mode = AreaMode.UNSET
+    area_mock.last_changed_by = 'Anna'
+    await hass.data[DATA_API]._async_callback(area_mock)
+    await hass.async_block_till_done()
+
     assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
-
-    msg = {"sia_code": sia_code, "sia_address": "1",
-           "description": "House¦Sam¦1"}
-    yield from spc._async_process_message(msg, hass.data[spc.DATA_REGISTRY])
-    yield from hass.async_block_till_done()
-
-    state_obj = hass.states.get(entity_id)
-    assert state_obj.state == state
-    assert state_obj.attributes['changed_by'] == 'Sam'
-
-
-@asyncio.coroutine
-@pytest.mark.parametrize("sia_code,state", [
-    ('ZO', STATE_ON),
-    ('ZC', STATE_OFF)
-])
-def test_update_sensor_device(hass, aioclient_mock, monkeypatch,
-                              sia_code, state):
-    """
-    Test that sensors change state on incoming websocket data.
-
-    Note that we don't test for the ZD (disconnected) and ZX (problem/short)
-    codes since the binary sensor component is hardcoded to only
-    let on/off states through.
-    """
-    monkeypatch.setattr("homeassistant.components.spc.SpcWebGateway."
-                        "start_listener", lambda x, *args: None)
-    config = {
-        'spc': {
-            'api_url': 'http://localhost/',
-            'ws_url': 'ws://localhost/'
-        }
-    }
-    yield from async_setup_component(hass, 'spc', config)
-    yield from hass.async_block_till_done()
-
-    assert hass.states.get('binary_sensor.hallway_pir').state == STATE_OFF
-
-    msg = {"sia_code": sia_code, "sia_address": "3",
-           "description": "Hallway PIR"}
-    yield from spc._async_process_message(msg, hass.data[spc.DATA_REGISTRY])
-    yield from hass.async_block_till_done()
-    assert hass.states.get('binary_sensor.hallway_pir').state == state
-
-
-class TestSpcRegistry:
-    """Test the device mapping registry."""
-
-    def test_sensor_device(self):
-        """Test retrieving device based on ID."""
-        r = spc.SpcRegistry()
-        r.register_sensor_device('1', 'dummy')
-        assert r.get_sensor_device('1') == 'dummy'
-
-    def test_alarm_device(self):
-        """Test retrieving device based on zone name."""
-        r = spc.SpcRegistry()
-        r.register_alarm_device('Area 51', 'dummy')
-        assert r.get_alarm_device('Area 51') == 'dummy'
-
-
-class TestSpcWebGateway:
-    """Test the SPC Web Gateway API wrapper."""
-
-    @asyncio.coroutine
-    def test_get_areas(self, spcwebgw, aioclient_mock):
-        """Test area retrieval."""
-        result = yield from spcwebgw.get_areas()
-        assert aioclient_mock.call_count == 1
-        assert len(list(result)) == 2
-
-    @asyncio.coroutine
-    @pytest.mark.parametrize("url_command,command", [
-        ('set', spc.SpcWebGateway.AREA_COMMAND_SET),
-        ('unset', spc.SpcWebGateway.AREA_COMMAND_UNSET),
-        ('set_a', spc.SpcWebGateway.AREA_COMMAND_PART_SET)
-    ])
-    def test_area_commands(self, spcwebgw, url_command, command):
-        """Test alarm arming/disarming."""
-        with mock_aiohttp_client() as aioclient_mock:
-            url = "http://localhost/spc/area/1/{}".format(url_command)
-            aioclient_mock.put(url, text='{}')
-            yield from spcwebgw.send_area_command('1', command)
-            assert aioclient_mock.call_count == 1
+    assert hass.states.get(entity_id).attributes['changed_by'] == 'Anna'

From 5ee4718e24bf0a0e44ab4cd5f930fdb8aa400c53 Mon Sep 17 00:00:00 2001
From: emontnemery <erik@montnemery.com>
Date: Mon, 24 Sep 2018 10:11:49 +0200
Subject: [PATCH 255/357] Remove discovered MQTT Switch device when discovery
 topic is cleared (#16605)

* Remove discovered device when discovery topic is cleared

* Move entity removal away from mqtt discovery

* Move discovery update to mixin class

* Add testcase

* Review comments
---
 homeassistant/components/mqtt/__init__.py  | 34 +++++++++++
 homeassistant/components/mqtt/discovery.py | 68 ++++++++++++----------
 homeassistant/components/switch/mqtt.py    | 31 ++++++----
 tests/components/mqtt/test_discovery.py    | 28 +++++++++
 4 files changed, 121 insertions(+), 40 deletions(-)

diff --git a/homeassistant/components/mqtt/__init__.py b/homeassistant/components/mqtt/__init__.py
index bcb0d60902b..abc240a65cb 100644
--- a/homeassistant/components/mqtt/__init__.py
+++ b/homeassistant/components/mqtt/__init__.py
@@ -92,6 +92,7 @@ ATTR_PAYLOAD = 'payload'
 ATTR_PAYLOAD_TEMPLATE = 'payload_template'
 ATTR_QOS = CONF_QOS
 ATTR_RETAIN = CONF_RETAIN
+ATTR_DISCOVERY_HASH = 'discovery_hash'
 
 MAX_RECONNECT_WAIT = 300  # seconds
 
@@ -833,3 +834,36 @@ class MqttAvailability(Entity):
     def available(self) -> bool:
         """Return if the device is available."""
         return self._available
+
+
+class MqttDiscoveryUpdate(Entity):
+    """Mixin used to handle updated discovery message."""
+
+    def __init__(self, discovery_hash) -> None:
+        """Initialize the discovery update mixin."""
+        self._discovery_hash = discovery_hash
+        self._remove_signal = None
+
+    async def async_added_to_hass(self) -> None:
+        """Subscribe to discovery updates."""
+        from homeassistant.helpers.dispatcher import async_dispatcher_connect
+        from homeassistant.components.mqtt.discovery import (
+            ALREADY_DISCOVERED, MQTT_DISCOVERY_UPDATED)
+
+        @callback
+        def discovery_callback(payload):
+            """Handle discovery update."""
+            _LOGGER.info("Got update for entity with hash: %s '%s'",
+                         self._discovery_hash, payload)
+            if not payload:
+                # Empty payload: Remove component
+                _LOGGER.info("Removing component: %s", self.entity_id)
+                self.hass.async_create_task(self.async_remove())
+                del self.hass.data[ALREADY_DISCOVERED][self._discovery_hash]
+                self._remove_signal()
+
+        if self._discovery_hash:
+            self._remove_signal = async_dispatcher_connect(
+                self.hass,
+                MQTT_DISCOVERY_UPDATED.format(self._discovery_hash),
+                discovery_callback)
diff --git a/homeassistant/components/mqtt/discovery.py b/homeassistant/components/mqtt/discovery.py
index 689515f64c8..f42c1ed58e9 100644
--- a/homeassistant/components/mqtt/discovery.py
+++ b/homeassistant/components/mqtt/discovery.py
@@ -9,9 +9,10 @@ import logging
 import re
 
 from homeassistant.components import mqtt
-from homeassistant.components.mqtt import CONF_STATE_TOPIC
+from homeassistant.components.mqtt import CONF_STATE_TOPIC, ATTR_DISCOVERY_HASH
 from homeassistant.const import CONF_PLATFORM
 from homeassistant.helpers.discovery import async_load_platform
+from homeassistant.helpers.dispatcher import async_dispatcher_send
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -38,6 +39,7 @@ ALLOWED_PLATFORMS = {
 }
 
 ALREADY_DISCOVERED = 'mqtt_discovered_components'
+MQTT_DISCOVERY_UPDATED = 'mqtt_discovery_updated_{}'
 
 
 async def async_start(hass, discovery_topic, hass_config):
@@ -51,47 +53,53 @@ async def async_start(hass, discovery_topic, hass_config):
 
         _prefix_topic, component, node_id, object_id = match.groups()
 
-        try:
-            payload = json.loads(payload)
-        except ValueError:
-            _LOGGER.warning("Unable to parse JSON %s: %s", object_id, payload)
-            return
-
         if component not in SUPPORTED_COMPONENTS:
             _LOGGER.warning("Component %s is not supported", component)
             return
 
-        payload = dict(payload)
-        platform = payload.get(CONF_PLATFORM, 'mqtt')
-        if platform not in ALLOWED_PLATFORMS.get(component, []):
-            _LOGGER.warning("Platform %s (component %s) is not allowed",
-                            platform, component)
-            return
-
-        payload[CONF_PLATFORM] = platform
-        if CONF_STATE_TOPIC not in payload:
-            payload[CONF_STATE_TOPIC] = '{}/{}/{}{}/state'.format(
-                discovery_topic, component, '%s/' % node_id if node_id else '',
-                object_id)
-
-        if ALREADY_DISCOVERED not in hass.data:
-            hass.data[ALREADY_DISCOVERED] = set()
-
         # If present, the node_id will be included in the discovered object id
         discovery_id = '_'.join((node_id, object_id)) if node_id else object_id
 
+        if ALREADY_DISCOVERED not in hass.data:
+            hass.data[ALREADY_DISCOVERED] = {}
+
         discovery_hash = (component, discovery_id)
+
         if discovery_hash in hass.data[ALREADY_DISCOVERED]:
-            _LOGGER.info("Component has already been discovered: %s %s",
-                         component, discovery_id)
-            return
+            _LOGGER.info(
+                "Component has already been discovered: %s %s, sending update",
+                component, discovery_id)
+            async_dispatcher_send(
+                hass, MQTT_DISCOVERY_UPDATED.format(discovery_hash), payload)
+        elif payload:
+            # Add component
+            try:
+                payload = json.loads(payload)
+            except ValueError:
+                _LOGGER.warning("Unable to parse JSON %s: '%s'",
+                                object_id, payload)
+                return
 
-        hass.data[ALREADY_DISCOVERED].add(discovery_hash)
+            payload = dict(payload)
+            platform = payload.get(CONF_PLATFORM, 'mqtt')
+            if platform not in ALLOWED_PLATFORMS.get(component, []):
+                _LOGGER.warning("Platform %s (component %s) is not allowed",
+                                platform, component)
+                return
 
-        _LOGGER.info("Found new component: %s %s", component, discovery_id)
+            payload[CONF_PLATFORM] = platform
+            if CONF_STATE_TOPIC not in payload:
+                payload[CONF_STATE_TOPIC] = '{}/{}/{}{}/state'.format(
+                    discovery_topic, component,
+                    '%s/' % node_id if node_id else '', object_id)
 
-        await async_load_platform(
-            hass, component, platform, payload, hass_config)
+            hass.data[ALREADY_DISCOVERED][discovery_hash] = None
+            payload[ATTR_DISCOVERY_HASH] = discovery_hash
+
+            _LOGGER.info("Found new component: %s %s", component, discovery_id)
+
+            await async_load_platform(
+                hass, component, platform, payload, hass_config)
 
     await mqtt.async_subscribe(
         hass, discovery_topic + '/#', async_device_message_received, 0)
diff --git a/homeassistant/components/switch/mqtt.py b/homeassistant/components/switch/mqtt.py
index f6075d5e49f..b79f8f12b87 100644
--- a/homeassistant/components/switch/mqtt.py
+++ b/homeassistant/components/switch/mqtt.py
@@ -11,9 +11,10 @@ import voluptuous as vol
 
 from homeassistant.core import callback
 from homeassistant.components.mqtt import (
-    CONF_STATE_TOPIC, CONF_COMMAND_TOPIC, CONF_AVAILABILITY_TOPIC,
-    CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE, CONF_QOS, CONF_RETAIN,
-    MqttAvailability)
+    ATTR_DISCOVERY_HASH, CONF_STATE_TOPIC, CONF_COMMAND_TOPIC,
+    CONF_AVAILABILITY_TOPIC, CONF_PAYLOAD_AVAILABLE,
+    CONF_PAYLOAD_NOT_AVAILABLE, CONF_QOS, CONF_RETAIN, MqttAvailability,
+    MqttDiscoveryUpdate)
 from homeassistant.components.switch import SwitchDevice
 from homeassistant.const import (
     CONF_NAME, CONF_OPTIMISTIC, CONF_VALUE_TEMPLATE, CONF_PAYLOAD_OFF,
@@ -56,7 +57,11 @@ async def async_setup_platform(hass, config, async_add_entities,
     if value_template is not None:
         value_template.hass = hass
 
-    async_add_entities([MqttSwitch(
+    discovery_hash = None
+    if discovery_info is not None and ATTR_DISCOVERY_HASH in discovery_info:
+        discovery_hash = discovery_info[ATTR_DISCOVERY_HASH]
+
+    newswitch = MqttSwitch(
         config.get(CONF_NAME),
         config.get(CONF_ICON),
         config.get(CONF_STATE_TOPIC),
@@ -73,10 +78,13 @@ async def async_setup_platform(hass, config, async_add_entities,
         config.get(CONF_PAYLOAD_NOT_AVAILABLE),
         config.get(CONF_UNIQUE_ID),
         value_template,
-    )])
+        discovery_hash,
+    )
+
+    async_add_entities([newswitch])
 
 
-class MqttSwitch(MqttAvailability, SwitchDevice):
+class MqttSwitch(MqttAvailability, MqttDiscoveryUpdate, SwitchDevice):
     """Representation of a switch that can be toggled using MQTT."""
 
     def __init__(self, name, icon,
@@ -84,10 +92,11 @@ class MqttSwitch(MqttAvailability, SwitchDevice):
                  qos, retain, payload_on, payload_off, state_on,
                  state_off, optimistic, payload_available,
                  payload_not_available, unique_id: Optional[str],
-                 value_template):
+                 value_template, discovery_hash):
         """Initialize the MQTT switch."""
-        super().__init__(availability_topic, qos, payload_available,
-                         payload_not_available)
+        MqttAvailability.__init__(self, availability_topic, qos,
+                                  payload_available, payload_not_available)
+        MqttDiscoveryUpdate.__init__(self, discovery_hash)
         self._state = False
         self._name = name
         self._icon = icon
@@ -102,10 +111,12 @@ class MqttSwitch(MqttAvailability, SwitchDevice):
         self._optimistic = optimistic
         self._template = value_template
         self._unique_id = unique_id
+        self._discovery_hash = discovery_hash
 
     async def async_added_to_hass(self):
         """Subscribe to MQTT events."""
-        await super().async_added_to_hass()
+        await MqttAvailability.async_added_to_hass(self)
+        await MqttDiscoveryUpdate.async_added_to_hass(self)
 
         @callback
         def state_message_received(topic, payload, qos):
diff --git a/tests/components/mqtt/test_discovery.py b/tests/components/mqtt/test_discovery.py
index 9e0ef14a3fa..6de277eb48d 100644
--- a/tests/components/mqtt/test_discovery.py
+++ b/tests/components/mqtt/test_discovery.py
@@ -181,3 +181,31 @@ def test_non_duplicate_discovery(hass, mqtt_mock, caplog):
     assert state_duplicate is None
     assert 'Component has already been discovered: ' \
            'binary_sensor bla' in caplog.text
+
+
+@asyncio.coroutine
+def test_discovery_removal(hass, mqtt_mock, caplog):
+    """Test expansion of abbreviated discovery payload."""
+    yield from async_start(hass, 'homeassistant', {})
+
+    data = (
+        '{ "name": "Beer",'
+        '  "status_topic": "test_topic",'
+        '  "command_topic": "test_topic" }'
+    )
+
+    async_fire_mqtt_message(hass, 'homeassistant/switch/bla/config',
+                            data)
+    yield from hass.async_block_till_done()
+
+    state = hass.states.get('switch.beer')
+    assert state is not None
+    assert state.name == 'Beer'
+
+    async_fire_mqtt_message(hass, 'homeassistant/switch/bla/config',
+                            '')
+    yield from hass.async_block_till_done()
+    yield from hass.async_block_till_done()
+
+    state = hass.states.get('switch.beer')
+    assert state is None

From ad47ece5c6959d3af65a22b7316dc6c597b932b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Lov=C3=A9n?= <thomasloven@gmail.com>
Date: Mon, 24 Sep 2018 10:17:24 +0200
Subject: [PATCH 256/357] Allow split component definitions in packages
 (#16177)

* Allow split component definitions in packages

Two different configuration styles are described in
https://www.home-assistant.io/docs/configuration/devices/#style-2-list-each-device-separately

But only one is allowed in packages according to
https://www.home-assistant.io/docs/configuration/packages/

This change allows "Style 2" configuration in packages.

* Added test for split component definition in packages
---
 homeassistant/config.py |  7 +++++--
 tests/test_config.py    | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/homeassistant/config.py b/homeassistant/config.py
index 5474b283494..abcf027c49f 100644
--- a/homeassistant/config.py
+++ b/homeassistant/config.py
@@ -171,7 +171,7 @@ def _no_duplicate_auth_mfa_module(configs: Sequence[Dict[str, Any]]) \
 
 PACKAGES_CONFIG_SCHEMA = vol.Schema({
     cv.slug: vol.Schema(  # Package names are slugs
-        {cv.slug: vol.Any(dict, list, None)})  # Only slugs for component names
+        {cv.string: vol.Any(dict, list, None)})  # Component configuration
 })
 
 CUSTOMIZE_DICT_SCHEMA = vol.Schema({
@@ -662,7 +662,10 @@ def merge_packages_config(hass: HomeAssistant, config: Dict, packages: Dict,
         for comp_name, comp_conf in pack_conf.items():
             if comp_name == CONF_CORE:
                 continue
-            component = get_component(hass, comp_name)
+            # If component name is given with a trailing description, remove it
+            # when looking for component
+            domain = comp_name.split(' ')[0]
+            component = get_component(hass, domain)
 
             if component is None:
                 _log_pkg_error(pack_name, comp_name, config, "does not exist")
diff --git a/tests/test_config.py b/tests/test_config.py
index e4a6798093f..0e53bc0cdfb 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -965,3 +965,21 @@ async def test_disallowed_duplicated_auth_mfa_module_config(hass):
     }
     with pytest.raises(Invalid):
         await config_util.async_process_ha_core_config(hass, core_config)
+
+
+def test_merge_split_component_definition(hass):
+    """Test components with trailing description in packages are merged."""
+    packages = {
+        'pack_1': {'light one': {'l1': None}},
+        'pack_2': {'light two': {'l2': None},
+                   'light three': {'l3': None}},
+    }
+    config = {
+        config_util.CONF_CORE: {config_util.CONF_PACKAGES: packages},
+    }
+    config_util.merge_packages_config(hass, config, packages)
+
+    assert len(config) == 4
+    assert len(config['light one']) == 1
+    assert len(config['light two']) == 1
+    assert len(config['light three']) == 1

From 7a77951bb4ebb46cc4e5e628e42ddd06d00d7ba3 Mon Sep 17 00:00:00 2001
From: Jason Hu <awarecan@users.noreply.github.com>
Date: Mon, 24 Sep 2018 02:06:50 -0700
Subject: [PATCH 257/357] Add Notify MFA module (#16314)

* Add Notify MFA

* Fix unit test

* Address review comment, change storage implementation

* Add retry limit to mfa module

* Fix loading

* Fix invalaid login log processing

* Typing

* Change default message template

* Change one-time password to 8 digit

* Refactoring to not save secret

* Bug fixing

* Change async_initialize method name to aysnc_initialize_login_mfa_step

* Address some simple fix code review comment
---
 homeassistant/auth/const.py                   |   1 +
 homeassistant/auth/mfa_modules/__init__.py    |   6 +-
 .../auth/mfa_modules/insecure_example.py      |   2 +-
 homeassistant/auth/mfa_modules/notify.py      | 325 ++++++++++++++
 homeassistant/auth/mfa_modules/totp.py        |   3 +-
 homeassistant/auth/providers/__init__.py      |  24 +-
 .../components/auth/.translations/en.json     |  19 +
 homeassistant/components/auth/login_flow.py   |   5 +-
 homeassistant/components/auth/strings.json    |  19 +
 homeassistant/config.py                       |   2 +-
 requirements_all.txt                          |   1 +
 requirements_test_all.txt                     |   1 +
 .../auth/mfa_modules/test_insecure_example.py |   8 +-
 tests/auth/mfa_modules/test_notify.py         | 397 ++++++++++++++++++
 tests/auth/mfa_modules/test_totp.py           |   6 +-
 tests/auth/test_init.py                       |   4 +-
 16 files changed, 799 insertions(+), 24 deletions(-)
 create mode 100644 homeassistant/auth/mfa_modules/notify.py
 create mode 100644 tests/auth/mfa_modules/test_notify.py

diff --git a/homeassistant/auth/const.py b/homeassistant/auth/const.py
index 082d8966275..2e57986958c 100644
--- a/homeassistant/auth/const.py
+++ b/homeassistant/auth/const.py
@@ -2,3 +2,4 @@
 from datetime import timedelta
 
 ACCESS_TOKEN_EXPIRATION = timedelta(minutes=30)
+MFA_SESSION_EXPIRATION = timedelta(minutes=5)
diff --git a/homeassistant/auth/mfa_modules/__init__.py b/homeassistant/auth/mfa_modules/__init__.py
index 603ca6ff3b1..1746ef38f95 100644
--- a/homeassistant/auth/mfa_modules/__init__.py
+++ b/homeassistant/auth/mfa_modules/__init__.py
@@ -1,5 +1,4 @@
 """Plugable auth modules for Home Assistant."""
-from datetime import timedelta
 import importlib
 import logging
 import types
@@ -23,8 +22,6 @@ MULTI_FACTOR_AUTH_MODULE_SCHEMA = vol.Schema({
     vol.Optional(CONF_ID): str,
 }, extra=vol.ALLOW_EXTRA)
 
-SESSION_EXPIRATION = timedelta(minutes=5)
-
 DATA_REQS = 'mfa_auth_module_reqs_processed'
 
 _LOGGER = logging.getLogger(__name__)
@@ -34,6 +31,7 @@ class MultiFactorAuthModule:
     """Multi-factor Auth Module of validation function."""
 
     DEFAULT_TITLE = 'Unnamed auth module'
+    MAX_RETRY_TIME = 3
 
     def __init__(self, hass: HomeAssistant, config: Dict[str, Any]) -> None:
         """Initialize an auth module."""
@@ -84,7 +82,7 @@ class MultiFactorAuthModule:
         """Return whether user is setup."""
         raise NotImplementedError
 
-    async def async_validation(
+    async def async_validate(
             self, user_id: str, user_input: Dict[str, Any]) -> bool:
         """Return True if validation passed."""
         raise NotImplementedError
diff --git a/homeassistant/auth/mfa_modules/insecure_example.py b/homeassistant/auth/mfa_modules/insecure_example.py
index 9c72111ef96..9804cbcf635 100644
--- a/homeassistant/auth/mfa_modules/insecure_example.py
+++ b/homeassistant/auth/mfa_modules/insecure_example.py
@@ -77,7 +77,7 @@ class InsecureExampleModule(MultiFactorAuthModule):
                 return True
         return False
 
-    async def async_validation(
+    async def async_validate(
             self, user_id: str, user_input: Dict[str, Any]) -> bool:
         """Return True if validation passed."""
         for data in self._data:
diff --git a/homeassistant/auth/mfa_modules/notify.py b/homeassistant/auth/mfa_modules/notify.py
new file mode 100644
index 00000000000..84f9de614c1
--- /dev/null
+++ b/homeassistant/auth/mfa_modules/notify.py
@@ -0,0 +1,325 @@
+"""HMAC-based One-time Password auth module.
+
+Sending HOTP through notify service
+"""
+import logging
+from collections import OrderedDict
+from typing import Any, Dict, Optional, Tuple, List  # noqa: F401
+
+import attr
+import voluptuous as vol
+
+from homeassistant.const import CONF_EXCLUDE, CONF_INCLUDE
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import config_validation as cv
+
+from . import MultiFactorAuthModule, MULTI_FACTOR_AUTH_MODULES, \
+    MULTI_FACTOR_AUTH_MODULE_SCHEMA, SetupFlow
+
+REQUIREMENTS = ['pyotp==2.2.6']
+
+CONF_MESSAGE = 'message'
+
+CONFIG_SCHEMA = MULTI_FACTOR_AUTH_MODULE_SCHEMA.extend({
+    vol.Optional(CONF_INCLUDE): vol.All(cv.ensure_list, [cv.string]),
+    vol.Optional(CONF_EXCLUDE): vol.All(cv.ensure_list, [cv.string]),
+    vol.Optional(CONF_MESSAGE,
+                 default='{} is your Home Assistant login code'): str
+}, extra=vol.PREVENT_EXTRA)
+
+STORAGE_VERSION = 1
+STORAGE_KEY = 'auth_module.notify'
+STORAGE_USERS = 'users'
+STORAGE_USER_ID = 'user_id'
+
+INPUT_FIELD_CODE = 'code'
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def _generate_secret() -> str:
+    """Generate a secret."""
+    import pyotp
+    return str(pyotp.random_base32())
+
+
+def _generate_random() -> int:
+    """Generate a 8 digit number."""
+    import pyotp
+    return int(pyotp.random_base32(length=8, chars=list('1234567890')))
+
+
+def _generate_otp(secret: str, count: int) -> str:
+    """Generate one time password."""
+    import pyotp
+    return str(pyotp.HOTP(secret).at(count))
+
+
+def _verify_otp(secret: str, otp: str, count: int) -> bool:
+    """Verify one time password."""
+    import pyotp
+    return bool(pyotp.HOTP(secret).verify(otp, count))
+
+
+@attr.s(slots=True)
+class NotifySetting:
+    """Store notify setting for one user."""
+
+    secret = attr.ib(type=str, factory=_generate_secret)   # not persistent
+    counter = attr.ib(type=int, factory=_generate_random)  # not persistent
+    notify_service = attr.ib(type=Optional[str], default=None)
+    target = attr.ib(type=Optional[str], default=None)
+
+
+_UsersDict = Dict[str, NotifySetting]
+
+
+@MULTI_FACTOR_AUTH_MODULES.register('notify')
+class NotifyAuthModule(MultiFactorAuthModule):
+    """Auth module send hmac-based one time password by notify service."""
+
+    DEFAULT_TITLE = 'Notify One-Time Password'
+
+    def __init__(self, hass: HomeAssistant, config: Dict[str, Any]) -> None:
+        """Initialize the user data store."""
+        super().__init__(hass, config)
+        self._user_settings = None  # type: Optional[_UsersDict]
+        self._user_store = hass.helpers.storage.Store(
+            STORAGE_VERSION, STORAGE_KEY)
+        self._include = config.get(CONF_INCLUDE, [])
+        self._exclude = config.get(CONF_EXCLUDE, [])
+        self._message_template = config[CONF_MESSAGE]
+
+    @property
+    def input_schema(self) -> vol.Schema:
+        """Validate login flow input data."""
+        return vol.Schema({INPUT_FIELD_CODE: str})
+
+    async def _async_load(self) -> None:
+        """Load stored data."""
+        data = await self._user_store.async_load()
+
+        if data is None:
+            data = {STORAGE_USERS: {}}
+
+        self._user_settings = {
+            user_id: NotifySetting(**setting)
+            for user_id, setting in data.get(STORAGE_USERS, {}).items()
+        }
+
+    async def _async_save(self) -> None:
+        """Save data."""
+        if self._user_settings is None:
+            return
+
+        await self._user_store.async_save({STORAGE_USERS: {
+            user_id: attr.asdict(
+                notify_setting, filter=attr.filters.exclude(
+                    attr.fields(NotifySetting).secret,
+                    attr.fields(NotifySetting).counter,
+                ))
+            for user_id, notify_setting
+            in self._user_settings.items()
+        }})
+
+    @callback
+    def aync_get_available_notify_services(self) -> List[str]:
+        """Return list of notify services."""
+        unordered_services = set()
+
+        for service in self.hass.services.async_services().get('notify', {}):
+            if service not in self._exclude:
+                unordered_services.add(service)
+
+        if self._include:
+            unordered_services &= set(self._include)
+
+        return sorted(unordered_services)
+
+    async def async_setup_flow(self, user_id: str) -> SetupFlow:
+        """Return a data entry flow handler for setup module.
+
+        Mfa module should extend SetupFlow
+        """
+        return NotifySetupFlow(
+            self, self.input_schema, user_id,
+            self.aync_get_available_notify_services())
+
+    async def async_setup_user(self, user_id: str, setup_data: Any) -> Any:
+        """Set up auth module for user."""
+        if self._user_settings is None:
+            await self._async_load()
+            assert self._user_settings is not None
+
+        self._user_settings[user_id] = NotifySetting(
+            notify_service=setup_data.get('notify_service'),
+            target=setup_data.get('target'),
+        )
+
+        await self._async_save()
+
+    async def async_depose_user(self, user_id: str) -> None:
+        """Depose auth module for user."""
+        if self._user_settings is None:
+            await self._async_load()
+            assert self._user_settings is not None
+
+        if self._user_settings.pop(user_id, None):
+            await self._async_save()
+
+    async def async_is_user_setup(self, user_id: str) -> bool:
+        """Return whether user is setup."""
+        if self._user_settings is None:
+            await self._async_load()
+            assert self._user_settings is not None
+
+        return user_id in self._user_settings
+
+    async def async_validate(
+            self, user_id: str, user_input: Dict[str, Any]) -> bool:
+        """Return True if validation passed."""
+        if self._user_settings is None:
+            await self._async_load()
+            assert self._user_settings is not None
+
+        notify_setting = self._user_settings.get(user_id, None)
+        if notify_setting is None:
+            return False
+
+        # user_input has been validate in caller
+        return await self.hass.async_add_executor_job(
+            _verify_otp, notify_setting.secret,
+            user_input.get(INPUT_FIELD_CODE, ''),
+            notify_setting.counter)
+
+    async def async_initialize_login_mfa_step(self, user_id: str) -> None:
+        """Generate code and notify user."""
+        if self._user_settings is None:
+            await self._async_load()
+            assert self._user_settings is not None
+
+        notify_setting = self._user_settings.get(user_id, None)
+        if notify_setting is None:
+            raise ValueError('Cannot find user_id')
+
+        def generate_secret_and_one_time_password() -> str:
+            """Generate and send one time password."""
+            assert notify_setting
+            # secret and counter are not persistent
+            notify_setting.secret = _generate_secret()
+            notify_setting.counter = _generate_random()
+            return _generate_otp(
+                notify_setting.secret, notify_setting.counter)
+
+        code = await self.hass.async_add_executor_job(
+            generate_secret_and_one_time_password)
+
+        await self.async_notify_user(user_id, code)
+
+    async def async_notify_user(self, user_id: str, code: str) -> None:
+        """Send code by user's notify service."""
+        if self._user_settings is None:
+            await self._async_load()
+            assert self._user_settings is not None
+
+        notify_setting = self._user_settings.get(user_id, None)
+        if notify_setting is None:
+            _LOGGER.error('Cannot find user %s', user_id)
+            return
+
+        await self.async_notify(   # type: ignore
+            code, notify_setting.notify_service, notify_setting.target)
+
+    async def async_notify(self, code: str, notify_service: str,
+                           target: Optional[str] = None) -> None:
+        """Send code by notify service."""
+        data = {'message': self._message_template.format(code)}
+        if target:
+            data['target'] = [target]
+
+        await self.hass.services.async_call('notify', notify_service, data)
+
+
+class NotifySetupFlow(SetupFlow):
+    """Handler for the setup flow."""
+
+    def __init__(self, auth_module: NotifyAuthModule,
+                 setup_schema: vol.Schema,
+                 user_id: str,
+                 available_notify_services: List[str]) -> None:
+        """Initialize the setup flow."""
+        super().__init__(auth_module, setup_schema, user_id)
+        # to fix typing complaint
+        self._auth_module = auth_module  # type: NotifyAuthModule
+        self._available_notify_services = available_notify_services
+        self._secret = None  # type: Optional[str]
+        self._count = None   # type: Optional[int]
+        self._notify_service = None  # type: Optional[str]
+        self._target = None  # type: Optional[str]
+
+    async def async_step_init(
+            self, user_input: Optional[Dict[str, str]] = None) \
+            -> Dict[str, Any]:
+        """Let user select available notify services."""
+        errors = {}  # type: Dict[str, str]
+
+        hass = self._auth_module.hass
+        if user_input:
+            self._notify_service = user_input['notify_service']
+            self._target = user_input.get('target')
+            self._secret = await hass.async_add_executor_job(_generate_secret)
+            self._count = await hass.async_add_executor_job(_generate_random)
+
+            return await self.async_step_setup()
+
+        if not self._available_notify_services:
+            return self.async_abort(reason='no_available_service')
+
+        schema = OrderedDict()  # type: Dict[str, Any]
+        schema['notify_service'] = vol.In(self._available_notify_services)
+        schema['target'] = vol.Optional(str)
+
+        return self.async_show_form(
+            step_id='init',
+            data_schema=vol.Schema(schema),
+            errors=errors
+        )
+
+    async def async_step_setup(
+            self, user_input: Optional[Dict[str, str]] = None) \
+            -> Dict[str, Any]:
+        """Verify user can recevie one-time password."""
+        errors = {}  # type: Dict[str, str]
+
+        hass = self._auth_module.hass
+        if user_input:
+            verified = await hass.async_add_executor_job(
+                _verify_otp, self._secret, user_input['code'], self._count)
+            if verified:
+                await self._auth_module.async_setup_user(
+                    self._user_id, {
+                        'notify_service': self._notify_service,
+                        'target': self._target,
+                    })
+                return self.async_create_entry(
+                    title=self._auth_module.name,
+                    data={}
+                )
+
+            errors['base'] = 'invalid_code'
+
+        # generate code every time, no retry logic
+        assert self._secret and self._count
+        code = await hass.async_add_executor_job(
+            _generate_otp, self._secret, self._count)
+
+        assert self._notify_service
+        await self._auth_module.async_notify(
+            code, self._notify_service, self._target)
+
+        return self.async_show_form(
+            step_id='setup',
+            data_schema=self._setup_schema,
+            description_placeholders={'notify_service': self._notify_service},
+            errors=errors,
+        )
diff --git a/homeassistant/auth/mfa_modules/totp.py b/homeassistant/auth/mfa_modules/totp.py
index 50cd9d33466..625cc0302e1 100644
--- a/homeassistant/auth/mfa_modules/totp.py
+++ b/homeassistant/auth/mfa_modules/totp.py
@@ -60,6 +60,7 @@ class TotpAuthModule(MultiFactorAuthModule):
     """Auth module validate time-based one time password."""
 
     DEFAULT_TITLE = 'Time-based One Time Password'
+    MAX_RETRY_TIME = 5
 
     def __init__(self, hass: HomeAssistant, config: Dict[str, Any]) -> None:
         """Initialize the user data store."""
@@ -130,7 +131,7 @@ class TotpAuthModule(MultiFactorAuthModule):
 
         return user_id in self._users   # type: ignore
 
-    async def async_validation(
+    async def async_validate(
             self, user_id: str, user_input: Dict[str, Any]) -> bool:
         """Return True if validation passed."""
         if self._users is None:
diff --git a/homeassistant/auth/providers/__init__.py b/homeassistant/auth/providers/__init__.py
index 3cb1c6b121e..e96f6d7ebba 100644
--- a/homeassistant/auth/providers/__init__.py
+++ b/homeassistant/auth/providers/__init__.py
@@ -15,8 +15,8 @@ from homeassistant.util import dt as dt_util
 from homeassistant.util.decorator import Registry
 
 from ..auth_store import AuthStore
+from ..const import MFA_SESSION_EXPIRATION
 from ..models import Credentials, User, UserMeta  # noqa: F401
-from ..mfa_modules import SESSION_EXPIRATION
 
 _LOGGER = logging.getLogger(__name__)
 DATA_REQS = 'auth_prov_reqs_processed'
@@ -171,6 +171,7 @@ class LoginFlow(data_entry_flow.FlowHandler):
         self._auth_manager = auth_provider.hass.auth  # type: ignore
         self.available_mfa_modules = {}  # type: Dict[str, str]
         self.created_at = dt_util.utcnow()
+        self.invalid_mfa_times = 0
         self.user = None  # type: Optional[User]
 
     async def async_step_init(
@@ -212,6 +213,8 @@ class LoginFlow(data_entry_flow.FlowHandler):
             self, user_input: Optional[Dict[str, str]] = None) \
             -> Dict[str, Any]:
         """Handle the step of mfa validation."""
+        assert self.user
+
         errors = {}
 
         auth_module = self._auth_manager.get_auth_mfa_module(
@@ -221,25 +224,34 @@ class LoginFlow(data_entry_flow.FlowHandler):
             # will show invalid_auth_module error
             return await self.async_step_select_mfa_module(user_input={})
 
+        if user_input is None and hasattr(auth_module,
+                                          'async_initialize_login_mfa_step'):
+            await auth_module.async_initialize_login_mfa_step(self.user.id)
+
         if user_input is not None:
-            expires = self.created_at + SESSION_EXPIRATION
+            expires = self.created_at + MFA_SESSION_EXPIRATION
             if dt_util.utcnow() > expires:
                 return self.async_abort(
                     reason='login_expired'
                 )
 
-            result = await auth_module.async_validation(
-                self.user.id, user_input)  # type: ignore
+            result = await auth_module.async_validate(
+                self.user.id, user_input)
             if not result:
                 errors['base'] = 'invalid_code'
+                self.invalid_mfa_times += 1
+                if self.invalid_mfa_times >= auth_module.MAX_RETRY_TIME > 0:
+                    return self.async_abort(
+                        reason='too_many_retry'
+                    )
 
             if not errors:
                 return await self.async_finish(self.user)
 
         description_placeholders = {
             'mfa_module_name': auth_module.name,
-            'mfa_module_id': auth_module.id
-        }  # type: Dict[str, str]
+            'mfa_module_id': auth_module.id,
+        }  # type: Dict[str, Optional[str]]
 
         return self.async_show_form(
             step_id='mfa',
diff --git a/homeassistant/components/auth/.translations/en.json b/homeassistant/components/auth/.translations/en.json
index a0fd20e9d08..21cb45e3050 100644
--- a/homeassistant/components/auth/.translations/en.json
+++ b/homeassistant/components/auth/.translations/en.json
@@ -1,5 +1,24 @@
 {
     "mfa_setup": {
+        "notify": {
+            "abort": {
+                "no_available_service": "No available notify services."
+            },
+            "error": {
+                "invalid_code": "Invalid code, please try again."
+            },
+            "step": {
+                "init": {
+                    "description": "Please select one of notify service:",
+                    "title": "Set up one-time password delivered by notify component"
+                },
+                "setup": {
+                    "description": "A one-time password have sent by **notify.{notify_service}**. Please input it in below:",
+                    "title": "Verify setup"
+                }
+            },
+            "title": "Notify One-Time Password"
+        },
         "totp": {
             "error": {
                 "invalid_code": "Invalid code, please try again. If you get this error consistently, please make sure the clock of your Home Assistant system is accurate."
diff --git a/homeassistant/components/auth/login_flow.py b/homeassistant/components/auth/login_flow.py
index 73a739c2960..3a51cf8066f 100644
--- a/homeassistant/components/auth/login_flow.py
+++ b/homeassistant/components/auth/login_flow.py
@@ -226,8 +226,9 @@ class LoginFlowResourceView(HomeAssistantView):
         if result['type'] != data_entry_flow.RESULT_TYPE_CREATE_ENTRY:
             # @log_invalid_auth does not work here since it returns HTTP 200
             # need manually log failed login attempts
-            if result['errors'] is not None and \
-                    result['errors'].get('base') == 'invalid_auth':
+            if (result.get('errors') is not None and
+                    result['errors'].get('base') in ['invalid_auth',
+                                                     'invalid_code']):
                 await process_wrong_login(request)
             return self.json(_prepare_result_json(result))
 
diff --git a/homeassistant/components/auth/strings.json b/homeassistant/components/auth/strings.json
index b0083ab577b..2b1fc0c94f6 100644
--- a/homeassistant/components/auth/strings.json
+++ b/homeassistant/components/auth/strings.json
@@ -11,6 +11,25 @@
       "error": {
         "invalid_code": "Invalid code, please try again. If you get this error consistently, please make sure the clock of your Home Assistant system is accurate."
       }
+    },
+    "notify": {
+      "title": "Notify One-Time Password",
+      "step": {
+        "init": {
+          "title": "Set up one-time password delivered by notify component",
+          "description": "Please select one of notify service:"
+        },
+        "setup": {
+          "title": "Verify setup",
+          "description": "A one-time password have sent by **notify.{notify_service}**. Please input it in below:"
+        }
+      },
+      "abort": {
+        "no_available_service": "No available notify services."
+      },
+      "error": {
+        "invalid_code": "Invalid code, please try again."
+      }
     }
   }
 }
diff --git a/homeassistant/config.py b/homeassistant/config.py
index abcf027c49f..98857d8a83d 100644
--- a/homeassistant/config.py
+++ b/homeassistant/config.py
@@ -475,7 +475,7 @@ async def async_process_ha_core_config(
                 auth_conf.append({'type': 'trusted_networks'})
 
         mfa_conf = config.get(CONF_AUTH_MFA_MODULES, [
-            {'type': 'totp', 'id': 'totp', 'name': 'Authenticator app'}
+            {'type': 'totp', 'id': 'totp', 'name': 'Authenticator app'},
         ])
 
         setattr(hass, 'auth', await auth.auth_manager_from_config(
diff --git a/requirements_all.txt b/requirements_all.txt
index ba353af0d48..70c05090fb0 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1020,6 +1020,7 @@ pyota==2.0.5
 # homeassistant.components.climate.opentherm_gw
 pyotgw==0.1b0
 
+# homeassistant.auth.mfa_modules.notify
 # homeassistant.auth.mfa_modules.totp
 # homeassistant.components.sensor.otp
 pyotp==2.2.6
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 171650b867d..133b97c2687 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -160,6 +160,7 @@ pynx584==0.4
 # homeassistant.components.openuv
 pyopenuv==1.0.4
 
+# homeassistant.auth.mfa_modules.notify
 # homeassistant.auth.mfa_modules.totp
 # homeassistant.components.sensor.otp
 pyotp==2.2.6
diff --git a/tests/auth/mfa_modules/test_insecure_example.py b/tests/auth/mfa_modules/test_insecure_example.py
index 80109627140..d9330d5f6e8 100644
--- a/tests/auth/mfa_modules/test_insecure_example.py
+++ b/tests/auth/mfa_modules/test_insecure_example.py
@@ -12,15 +12,15 @@ async def test_validate(hass):
         'data': [{'user_id': 'test-user', 'pin': '123456'}]
     })
 
-    result = await auth_module.async_validation(
+    result = await auth_module.async_validate(
             'test-user', {'pin': '123456'})
     assert result is True
 
-    result = await auth_module.async_validation(
+    result = await auth_module.async_validate(
             'test-user', {'pin': 'invalid'})
     assert result is False
 
-    result = await auth_module.async_validation(
+    result = await auth_module.async_validate(
             'invalid-user', {'pin': '123456'})
     assert result is False
 
@@ -36,7 +36,7 @@ async def test_setup_user(hass):
         'test-user', {'pin': '123456'})
     assert len(auth_module._data) == 1
 
-    result = await auth_module.async_validation(
+    result = await auth_module.async_validate(
             'test-user', {'pin': '123456'})
     assert result is True
 
diff --git a/tests/auth/mfa_modules/test_notify.py b/tests/auth/mfa_modules/test_notify.py
new file mode 100644
index 00000000000..ffe0b103fc9
--- /dev/null
+++ b/tests/auth/mfa_modules/test_notify.py
@@ -0,0 +1,397 @@
+"""Test the HMAC-based One Time Password (MFA) auth module."""
+from unittest.mock import patch
+
+from homeassistant import data_entry_flow
+from homeassistant.auth import models as auth_models, auth_manager_from_config
+from homeassistant.auth.mfa_modules import auth_mfa_module_from_config
+from homeassistant.components.notify import NOTIFY_SERVICE_SCHEMA
+from tests.common import MockUser, async_mock_service
+
+MOCK_CODE = '123456'
+MOCK_CODE_2 = '654321'
+
+
+async def test_validating_mfa(hass):
+    """Test validating mfa code."""
+    notify_auth_module = await auth_mfa_module_from_config(hass, {
+        'type': 'notify'
+    })
+    await notify_auth_module.async_setup_user('test-user', {
+        'notify_service': 'dummy'
+    })
+
+    with patch('pyotp.HOTP.verify', return_value=True):
+        assert await notify_auth_module.async_validate(
+            'test-user', {'code': MOCK_CODE})
+
+
+async def test_validating_mfa_invalid_code(hass):
+    """Test validating an invalid mfa code."""
+    notify_auth_module = await auth_mfa_module_from_config(hass, {
+        'type': 'notify'
+    })
+    await notify_auth_module.async_setup_user('test-user', {
+        'notify_service': 'dummy'
+    })
+
+    with patch('pyotp.HOTP.verify', return_value=False):
+        assert await notify_auth_module.async_validate(
+            'test-user', {'code': MOCK_CODE}) is False
+
+
+async def test_validating_mfa_invalid_user(hass):
+    """Test validating an mfa code with invalid user."""
+    notify_auth_module = await auth_mfa_module_from_config(hass, {
+        'type': 'notify'
+    })
+    await notify_auth_module.async_setup_user('test-user', {
+        'notify_service': 'dummy'
+    })
+
+    assert await notify_auth_module.async_validate(
+        'invalid-user', {'code': MOCK_CODE}) is False
+
+
+async def test_validating_mfa_counter(hass):
+    """Test counter will move only after generate code."""
+    notify_auth_module = await auth_mfa_module_from_config(hass, {
+        'type': 'notify'
+    })
+    await notify_auth_module.async_setup_user('test-user', {
+        'counter': 0,
+        'notify_service': 'dummy',
+    })
+
+    assert notify_auth_module._user_settings
+    notify_setting = list(notify_auth_module._user_settings.values())[0]
+    init_count = notify_setting.counter
+    assert init_count is not None
+
+    with patch('pyotp.HOTP.at', return_value=MOCK_CODE):
+        await notify_auth_module.async_initialize_login_mfa_step('test-user')
+
+    notify_setting = list(notify_auth_module._user_settings.values())[0]
+    after_generate_count = notify_setting.counter
+    assert after_generate_count != init_count
+
+    with patch('pyotp.HOTP.verify', return_value=True):
+        assert await notify_auth_module.async_validate(
+            'test-user', {'code': MOCK_CODE})
+
+    notify_setting = list(notify_auth_module._user_settings.values())[0]
+    assert after_generate_count == notify_setting.counter
+
+    with patch('pyotp.HOTP.verify', return_value=False):
+        assert await notify_auth_module.async_validate(
+            'test-user', {'code': MOCK_CODE}) is False
+
+    notify_setting = list(notify_auth_module._user_settings.values())[0]
+    assert after_generate_count == notify_setting.counter
+
+
+async def test_setup_depose_user(hass):
+    """Test set up and despose user."""
+    notify_auth_module = await auth_mfa_module_from_config(hass, {
+        'type': 'notify'
+    })
+    await notify_auth_module.async_setup_user('test-user', {})
+    assert len(notify_auth_module._user_settings) == 1
+    await notify_auth_module.async_setup_user('test-user', {})
+    assert len(notify_auth_module._user_settings) == 1
+
+    await notify_auth_module.async_depose_user('test-user')
+    assert len(notify_auth_module._user_settings) == 0
+
+    await notify_auth_module.async_setup_user(
+        'test-user2', {'secret': 'secret-code'})
+    assert len(notify_auth_module._user_settings) == 1
+
+
+async def test_login_flow_validates_mfa(hass):
+    """Test login flow with mfa enabled."""
+    hass.auth = await auth_manager_from_config(hass, [{
+        'type': 'insecure_example',
+        'users': [{'username': 'test-user', 'password': 'test-pass'}],
+    }], [{
+        'type': 'notify',
+    }])
+    user = MockUser(
+        id='mock-user',
+        is_owner=False,
+        is_active=False,
+        name='Paulus',
+    ).add_to_auth_manager(hass.auth)
+    await hass.auth.async_link_user(user, auth_models.Credentials(
+        id='mock-id',
+        auth_provider_type='insecure_example',
+        auth_provider_id=None,
+        data={'username': 'test-user'},
+        is_new=False,
+    ))
+
+    notify_calls = async_mock_service(hass, 'notify', 'test-notify',
+                                      NOTIFY_SERVICE_SCHEMA)
+
+    await hass.auth.async_enable_user_mfa(user, 'notify', {
+        'notify_service': 'test-notify',
+    })
+
+    provider = hass.auth.auth_providers[0]
+
+    result = await hass.auth.login_flow.async_init(
+        (provider.type, provider.id))
+    assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
+
+    result = await hass.auth.login_flow.async_configure(result['flow_id'], {
+        'username': 'incorrect-user',
+        'password': 'test-pass',
+    })
+    assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
+    assert result['errors']['base'] == 'invalid_auth'
+
+    result = await hass.auth.login_flow.async_configure(result['flow_id'], {
+        'username': 'test-user',
+        'password': 'incorrect-pass',
+    })
+    assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
+    assert result['errors']['base'] == 'invalid_auth'
+
+    with patch('pyotp.HOTP.at', return_value=MOCK_CODE):
+        result = await hass.auth.login_flow.async_configure(
+            result['flow_id'],
+            {
+                'username': 'test-user',
+                'password': 'test-pass',
+            })
+        assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
+        assert result['step_id'] == 'mfa'
+        assert result['data_schema'].schema.get('code') == str
+
+    # wait service call finished
+    await hass.async_block_till_done()
+
+    assert len(notify_calls) == 1
+    notify_call = notify_calls[0]
+    assert notify_call.domain == 'notify'
+    assert notify_call.service == 'test-notify'
+    message = notify_call.data['message']
+    message.hass = hass
+    assert MOCK_CODE in message.async_render()
+
+    with patch('pyotp.HOTP.verify', return_value=False):
+        result = await hass.auth.login_flow.async_configure(
+            result['flow_id'], {'code': 'invalid-code'})
+        assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
+        assert result['step_id'] == 'mfa'
+        assert result['errors']['base'] == 'invalid_code'
+
+    # wait service call finished
+    await hass.async_block_till_done()
+
+    # would not send new code, allow user retry
+    assert len(notify_calls) == 1
+
+    # retry twice
+    with patch('pyotp.HOTP.verify', return_value=False), \
+            patch('pyotp.HOTP.at', return_value=MOCK_CODE_2):
+        result = await hass.auth.login_flow.async_configure(
+            result['flow_id'], {'code': 'invalid-code'})
+        assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
+        assert result['step_id'] == 'mfa'
+        assert result['errors']['base'] == 'invalid_code'
+
+        # after the 3rd failure, flow abort
+        result = await hass.auth.login_flow.async_configure(
+            result['flow_id'], {'code': 'invalid-code'})
+        assert result['type'] == data_entry_flow.RESULT_TYPE_ABORT
+        assert result['reason'] == 'too_many_retry'
+
+    # wait service call finished
+    await hass.async_block_till_done()
+
+    # restart login
+    result = await hass.auth.login_flow.async_init(
+        (provider.type, provider.id))
+    assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
+
+    with patch('pyotp.HOTP.at', return_value=MOCK_CODE):
+        result = await hass.auth.login_flow.async_configure(
+            result['flow_id'],
+            {
+                'username': 'test-user',
+                'password': 'test-pass',
+            })
+        assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
+        assert result['step_id'] == 'mfa'
+        assert result['data_schema'].schema.get('code') == str
+
+    # wait service call finished
+    await hass.async_block_till_done()
+
+    assert len(notify_calls) == 2
+    notify_call = notify_calls[1]
+    assert notify_call.domain == 'notify'
+    assert notify_call.service == 'test-notify'
+    message = notify_call.data['message']
+    message.hass = hass
+    assert MOCK_CODE in message.async_render()
+
+    with patch('pyotp.HOTP.verify', return_value=True):
+        result = await hass.auth.login_flow.async_configure(
+            result['flow_id'], {'code': MOCK_CODE})
+        assert result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+        assert result['data'].id == 'mock-user'
+
+
+async def test_setup_user_notify_service(hass):
+    """Test allow select notify service during mfa setup."""
+    notify_calls = async_mock_service(
+        hass, 'notify', 'test1', NOTIFY_SERVICE_SCHEMA)
+    async_mock_service(hass, 'notify', 'test2', NOTIFY_SERVICE_SCHEMA)
+    notify_auth_module = await auth_mfa_module_from_config(hass, {
+        'type': 'notify',
+    })
+
+    services = notify_auth_module.aync_get_available_notify_services()
+    assert services == ['test1', 'test2']
+
+    flow = await notify_auth_module.async_setup_flow('test-user')
+    step = await flow.async_step_init()
+    assert step['type'] == data_entry_flow.RESULT_TYPE_FORM
+    assert step['step_id'] == 'init'
+    schema = step['data_schema']
+    schema({'notify_service': 'test2'})
+
+    with patch('pyotp.HOTP.at', return_value=MOCK_CODE):
+        step = await flow.async_step_init({'notify_service': 'test1'})
+        assert step['type'] == data_entry_flow.RESULT_TYPE_FORM
+        assert step['step_id'] == 'setup'
+
+    # wait service call finished
+    await hass.async_block_till_done()
+
+    assert len(notify_calls) == 1
+    notify_call = notify_calls[0]
+    assert notify_call.domain == 'notify'
+    assert notify_call.service == 'test1'
+    message = notify_call.data['message']
+    message.hass = hass
+    assert MOCK_CODE in message.async_render()
+
+    with patch('pyotp.HOTP.at', return_value=MOCK_CODE_2):
+        step = await flow.async_step_setup({'code': 'invalid'})
+        assert step['type'] == data_entry_flow.RESULT_TYPE_FORM
+        assert step['step_id'] == 'setup'
+        assert step['errors']['base'] == 'invalid_code'
+
+    # wait service call finished
+    await hass.async_block_till_done()
+
+    assert len(notify_calls) == 2
+    notify_call = notify_calls[1]
+    assert notify_call.domain == 'notify'
+    assert notify_call.service == 'test1'
+    message = notify_call.data['message']
+    message.hass = hass
+    assert MOCK_CODE_2 in message.async_render()
+
+    with patch('pyotp.HOTP.verify', return_value=True):
+        step = await flow.async_step_setup({'code': MOCK_CODE_2})
+        assert step['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+
+
+async def test_include_exclude_config(hass):
+    """Test allow include exclude config."""
+    async_mock_service(hass, 'notify', 'include1', NOTIFY_SERVICE_SCHEMA)
+    async_mock_service(hass, 'notify', 'include2', NOTIFY_SERVICE_SCHEMA)
+    async_mock_service(hass, 'notify', 'exclude1', NOTIFY_SERVICE_SCHEMA)
+    async_mock_service(hass, 'notify', 'exclude2', NOTIFY_SERVICE_SCHEMA)
+    async_mock_service(hass, 'other', 'include3', NOTIFY_SERVICE_SCHEMA)
+    async_mock_service(hass, 'other', 'exclude3', NOTIFY_SERVICE_SCHEMA)
+
+    notify_auth_module = await auth_mfa_module_from_config(hass, {
+        'type': 'notify',
+        'exclude': ['exclude1', 'exclude2', 'exclude3'],
+    })
+    services = notify_auth_module.aync_get_available_notify_services()
+    assert services == ['include1', 'include2']
+
+    notify_auth_module = await auth_mfa_module_from_config(hass, {
+        'type': 'notify',
+        'include': ['include1', 'include2', 'include3'],
+    })
+    services = notify_auth_module.aync_get_available_notify_services()
+    assert services == ['include1', 'include2']
+
+    # exclude has high priority than include
+    notify_auth_module = await auth_mfa_module_from_config(hass, {
+        'type': 'notify',
+        'include': ['include1', 'include2', 'include3'],
+        'exclude': ['exclude1', 'exclude2', 'include2'],
+    })
+    services = notify_auth_module.aync_get_available_notify_services()
+    assert services == ['include1']
+
+
+async def test_setup_user_no_notify_service(hass):
+    """Test setup flow abort if there is no avilable notify service."""
+    async_mock_service(hass, 'notify', 'test1', NOTIFY_SERVICE_SCHEMA)
+    notify_auth_module = await auth_mfa_module_from_config(hass, {
+        'type': 'notify',
+        'exclude': 'test1',
+    })
+
+    services = notify_auth_module.aync_get_available_notify_services()
+    assert services == []
+
+    flow = await notify_auth_module.async_setup_flow('test-user')
+    step = await flow.async_step_init()
+    assert step['type'] == data_entry_flow.RESULT_TYPE_ABORT
+    assert step['reason'] == 'no_available_service'
+
+
+async def test_not_raise_exception_when_service_not_exist(hass):
+    """Test login flow will not raise exception when notify service error."""
+    hass.auth = await auth_manager_from_config(hass, [{
+        'type': 'insecure_example',
+        'users': [{'username': 'test-user', 'password': 'test-pass'}],
+    }], [{
+        'type': 'notify',
+    }])
+    user = MockUser(
+        id='mock-user',
+        is_owner=False,
+        is_active=False,
+        name='Paulus',
+    ).add_to_auth_manager(hass.auth)
+    await hass.auth.async_link_user(user, auth_models.Credentials(
+        id='mock-id',
+        auth_provider_type='insecure_example',
+        auth_provider_id=None,
+        data={'username': 'test-user'},
+        is_new=False,
+    ))
+
+    await hass.auth.async_enable_user_mfa(user, 'notify', {
+        'notify_service': 'invalid-notify',
+    })
+
+    provider = hass.auth.auth_providers[0]
+
+    result = await hass.auth.login_flow.async_init(
+        (provider.type, provider.id))
+    assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
+
+    with patch('pyotp.HOTP.at', return_value=MOCK_CODE):
+        result = await hass.auth.login_flow.async_configure(
+            result['flow_id'],
+            {
+                'username': 'test-user',
+                'password': 'test-pass',
+            })
+        assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
+        assert result['step_id'] == 'mfa'
+        assert result['data_schema'].schema.get('code') == str
+
+    # wait service call finished
+    await hass.async_block_till_done()
diff --git a/tests/auth/mfa_modules/test_totp.py b/tests/auth/mfa_modules/test_totp.py
index 6e3558ec549..d400fe80672 100644
--- a/tests/auth/mfa_modules/test_totp.py
+++ b/tests/auth/mfa_modules/test_totp.py
@@ -17,7 +17,7 @@ async def test_validating_mfa(hass):
     await totp_auth_module.async_setup_user('test-user', {})
 
     with patch('pyotp.TOTP.verify', return_value=True):
-        assert await totp_auth_module.async_validation(
+        assert await totp_auth_module.async_validate(
             'test-user', {'code': MOCK_CODE})
 
 
@@ -29,7 +29,7 @@ async def test_validating_mfa_invalid_code(hass):
     await totp_auth_module.async_setup_user('test-user', {})
 
     with patch('pyotp.TOTP.verify', return_value=False):
-        assert await totp_auth_module.async_validation(
+        assert await totp_auth_module.async_validate(
             'test-user', {'code': MOCK_CODE}) is False
 
 
@@ -40,7 +40,7 @@ async def test_validating_mfa_invalid_user(hass):
     })
     await totp_auth_module.async_setup_user('test-user', {})
 
-    assert await totp_auth_module.async_validation(
+    assert await totp_auth_module.async_validate(
         'invalid-user', {'code': MOCK_CODE}) is False
 
 
diff --git a/tests/auth/test_init.py b/tests/auth/test_init.py
index 8325bd2551a..8fd9b8930e4 100644
--- a/tests/auth/test_init.py
+++ b/tests/auth/test_init.py
@@ -9,7 +9,7 @@ import voluptuous as vol
 from homeassistant import auth, data_entry_flow
 from homeassistant.auth import (
     models as auth_models, auth_store, const as auth_const)
-from homeassistant.auth.mfa_modules import SESSION_EXPIRATION
+from homeassistant.auth.const import MFA_SESSION_EXPIRATION
 from homeassistant.util import dt as dt_util
 from tests.common import (
     MockUser, ensure_auth_manager_loaded, flush_store, CLIENT_ID)
@@ -720,7 +720,7 @@ async def test_auth_module_expired_session(mock_hass):
     assert step['step_id'] == 'mfa'
 
     with patch('homeassistant.util.dt.utcnow',
-               return_value=dt_util.utcnow() + SESSION_EXPIRATION):
+               return_value=dt_util.utcnow() + MFA_SESSION_EXPIRATION):
         step = await manager.login_flow.async_configure(step['flow_id'], {
             'pin': 'test-pin',
         })

From 1f74adae2a87aac84dc2499af625e26252eda043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=B8yer=20Iversen?= <mail@dahoiv.net>
Date: Mon, 24 Sep 2018 11:10:33 +0200
Subject: [PATCH 258/357] Broadlink service name (#16345)

* Broadlink. slugify service name

* style
---
 homeassistant/components/switch/broadlink.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/switch/broadlink.py b/homeassistant/components/switch/broadlink.py
index 3dd8eafcf1f..e6115872390 100644
--- a/homeassistant/components/switch/broadlink.py
+++ b/homeassistant/components/switch/broadlink.py
@@ -142,9 +142,11 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     if switch_type in RM_TYPES:
         broadlink_device = broadlink.rm((ip_addr, 80), mac_addr, None)
         hass.services.register(DOMAIN, SERVICE_LEARN + '_' +
-                               ip_addr.replace('.', '_'), _learn_command)
+                               slugify(ip_addr.replace('.', '_')),
+                               _learn_command)
         hass.services.register(DOMAIN, SERVICE_SEND + '_' +
-                               ip_addr.replace('.', '_'), _send_packet,
+                               slugify(ip_addr.replace('.', '_')),
+                               _send_packet,
                                vol.Schema({'packet': cv.ensure_list}))
         switches = []
         for object_id, device_config in devices.items():

From 33d6c99f19fdd22b6ec7fca5bc4ba94da95b410a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 24 Sep 2018 12:11:24 +0300
Subject: [PATCH 259/357] Add Python 3.7 classifier (#16645)

---
 setup.cfg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.cfg b/setup.cfg
index b2bbb4081f0..936840acfaa 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -13,6 +13,7 @@ classifier =
     Operating System :: OS Independent
     Programming Language :: Python :: 3.5
     Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
     Topic :: Home Automation
 
 [tool:pytest]

From 589554ad16887ef0cd01a732201449fa370cbc1c Mon Sep 17 00:00:00 2001
From: Robin Clarke <robin@robinclarke.net>
Date: Mon, 24 Sep 2018 11:16:28 +0200
Subject: [PATCH 260/357] Allow soundtouch to play https content too (#16713)

---
 homeassistant/components/media_player/soundtouch.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/components/media_player/soundtouch.py b/homeassistant/components/media_player/soundtouch.py
index a16658501cb..b8ade374a46 100644
--- a/homeassistant/components/media_player/soundtouch.py
+++ b/homeassistant/components/media_player/soundtouch.py
@@ -297,7 +297,7 @@ class SoundTouchDevice(MediaPlayerDevice):
     def play_media(self, media_type, media_id, **kwargs):
         """Play a piece of media."""
         _LOGGER.debug("Starting media with media_id: %s", media_id)
-        if re.match(r'http://', str(media_id)):
+        if re.match(r'https?://', str(media_id)):
             # URL
             _LOGGER.debug("Playing URL %s", str(media_id))
             self._device.play_url(str(media_id))

From dc1534c6d148d9a387f4b882980b864a81b4ffc7 Mon Sep 17 00:00:00 2001
From: Greg Laabs <OverloadUT@gmail.com>
Date: Mon, 24 Sep 2018 02:43:00 -0700
Subject: [PATCH 261/357] Fix some unhandled exceptions due to missing null
 checks (#16812)

Fixed a couple cases that would produce errors when the ISY node status was None or `-inf`.
---
 homeassistant/components/cover/isy994.py | 2 ++
 homeassistant/components/light/isy994.py | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/cover/isy994.py b/homeassistant/components/cover/isy994.py
index 428c1f326e4..4ead61e6b7a 100644
--- a/homeassistant/components/cover/isy994.py
+++ b/homeassistant/components/cover/isy994.py
@@ -44,6 +44,8 @@ class ISYCoverDevice(ISYDevice, CoverDevice):
     @property
     def current_cover_position(self) -> int:
         """Return the current cover position."""
+        if self.is_unknown() or self.value is None:
+            return None
         return sorted((0, self.value, 100))[1]
 
     @property
diff --git a/homeassistant/components/light/isy994.py b/homeassistant/components/light/isy994.py
index 06507eaeca6..4349bfa1467 100644
--- a/homeassistant/components/light/isy994.py
+++ b/homeassistant/components/light/isy994.py
@@ -31,7 +31,7 @@ class ISYLightDevice(ISYDevice, Light):
     @property
     def is_on(self) -> bool:
         """Get whether the ISY994 light is on."""
-        return self.value > 0
+        return self.value != 0
 
     @property
     def brightness(self) -> float:

From b2a9e203f2c38b2f783b2ae3cecc53249cf3db2c Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 24 Sep 2018 11:57:56 +0200
Subject: [PATCH 262/357] Update frontend to 20180924.0

---
 homeassistant/components/frontend/__init__.py | 2 +-
 requirements_all.txt                          | 2 +-
 requirements_test_all.txt                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/frontend/__init__.py b/homeassistant/components/frontend/__init__.py
index 73282830bbc..d3d25255508 100644
--- a/homeassistant/components/frontend/__init__.py
+++ b/homeassistant/components/frontend/__init__.py
@@ -26,7 +26,7 @@ from homeassistant.helpers.translation import async_get_translations
 from homeassistant.loader import bind_hass
 from homeassistant.util.yaml import load_yaml
 
-REQUIREMENTS = ['home-assistant-frontend==20180920.0']
+REQUIREMENTS = ['home-assistant-frontend==20180924.0']
 
 DOMAIN = 'frontend'
 DEPENDENCIES = ['api', 'websocket_api', 'http', 'system_log',
diff --git a/requirements_all.txt b/requirements_all.txt
index 70c05090fb0..b9550d032ab 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -454,7 +454,7 @@ hole==0.3.0
 holidays==0.9.7
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180920.0
+home-assistant-frontend==20180924.0
 
 # homeassistant.components.homekit_controller
 # homekit==0.10
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 133b97c2687..44baabc7f5d 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -87,7 +87,7 @@ hdate==0.6.3
 holidays==0.9.7
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180920.0
+home-assistant-frontend==20180924.0
 
 # homeassistant.components.homematicip_cloud
 homematicip==0.9.8

From d4b239d1d46df6bcdd6fb8bb729eb3a0cfb6e087 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 24 Sep 2018 12:01:01 +0200
Subject: [PATCH 263/357] Update translations

---
 .../components/auth/.translations/id.json     | 16 +++++++++
 .../components/auth/.translations/nn.json     | 16 +++++++++
 .../components/auth/.translations/pt-BR.json  | 15 +++++++++
 .../components/cast/.translations/id.json     | 15 +++++++++
 .../components/cast/.translations/nn.json     | 15 +++++++++
 .../components/deconz/.translations/ca.json   |  2 +-
 .../components/deconz/.translations/id.json   | 33 +++++++++++++++++++
 .../components/deconz/.translations/ko.json   |  2 +-
 .../components/deconz/.translations/nn.json   | 33 +++++++++++++++++++
 .../components/hangouts/.translations/id.json | 31 +++++++++++++++++
 .../components/hangouts/.translations/nn.json | 29 ++++++++++++++++
 .../hangouts/.translations/pt-BR.json         |  9 +++--
 .../components/hangouts/strings.json          |  2 --
 .../homematicip_cloud/.translations/en.json   |  1 -
 .../homematicip_cloud/.translations/id.json   | 31 +++++++++++++++++
 .../homematicip_cloud/.translations/ko.json   |  2 +-
 .../homematicip_cloud/.translations/nn.json   | 31 +++++++++++++++++
 .../components/hue/.translations/id.json      | 29 ++++++++++++++++
 .../components/hue/.translations/nn.json      | 29 ++++++++++++++++
 .../components/ios/.translations/de.json      | 12 +++++++
 .../components/ios/.translations/id.json      | 14 ++++++++
 .../components/ios/.translations/ko.json      |  4 +--
 .../components/ios/.translations/lb.json      | 14 ++++++++
 .../components/ios/.translations/nn.json      | 14 ++++++++
 .../components/ios/.translations/no.json      | 14 ++++++++
 .../components/ios/.translations/pt-BR.json   | 14 ++++++++
 .../components/ios/.translations/pt.json      | 14 ++++++++
 .../components/mqtt/.translations/de.json     | 15 +++++++++
 .../components/mqtt/.translations/id.json     | 23 +++++++++++++
 .../components/mqtt/.translations/ko.json     |  4 +--
 .../components/mqtt/.translations/lb.json     | 23 +++++++++++++
 .../components/mqtt/.translations/nl.json     | 17 ++++++++++
 .../components/mqtt/.translations/nn.json     | 23 +++++++++++++
 .../components/mqtt/.translations/no.json     | 23 +++++++++++++
 .../components/mqtt/.translations/pt-BR.json  | 19 +++++++++++
 .../components/mqtt/.translations/pt.json     | 23 +++++++++++++
 .../components/nest/.translations/ca.json     |  2 +-
 .../components/nest/.translations/id.json     | 33 +++++++++++++++++++
 .../components/nest/.translations/nn.json     | 33 +++++++++++++++++++
 .../components/openuv/.translations/id.json   | 20 +++++++++++
 .../components/openuv/.translations/lb.json   | 20 +++++++++++
 .../components/openuv/.translations/nn.json   | 20 +++++++++++
 .../openuv/.translations/pt-BR.json           | 20 +++++++++++
 .../components/openuv/.translations/pt.json   | 20 +++++++++++
 .../sensor/.translations/moon.id.json         | 12 +++++++
 .../sensor/.translations/moon.nn.json         | 12 +++++++
 .../sensor/.translations/season.id.json       |  8 +++++
 .../sensor/.translations/season.nn.json       |  8 +++++
 .../components/sonos/.translations/id.json    | 15 +++++++++
 .../components/sonos/.translations/nn.json    | 15 +++++++++
 .../components/tradfri/.translations/ca.json  | 23 +++++++++++++
 .../components/tradfri/.translations/fr.json  | 23 +++++++++++++
 .../components/tradfri/.translations/hu.json  | 13 ++++++++
 .../components/tradfri/.translations/id.json  | 23 +++++++++++++
 .../components/tradfri/.translations/ko.json  | 23 +++++++++++++
 .../components/tradfri/.translations/lb.json  | 23 +++++++++++++
 .../components/tradfri/.translations/nl.json  | 23 +++++++++++++
 .../components/tradfri/.translations/nn.json  | 23 +++++++++++++
 .../components/tradfri/.translations/no.json  | 23 +++++++++++++
 .../tradfri/.translations/pt-BR.json          | 21 ++++++++++++
 .../components/tradfri/.translations/pt.json  | 23 +++++++++++++
 .../components/tradfri/.translations/ru.json  | 23 +++++++++++++
 .../tradfri/.translations/zh-Hans.json        | 12 +++++++
 .../tradfri/.translations/zh-Hant.json        | 23 +++++++++++++
 .../components/zone/.translations/id.json     | 21 ++++++++++++
 .../components/zone/.translations/nn.json     | 21 ++++++++++++
 66 files changed, 1177 insertions(+), 13 deletions(-)
 create mode 100644 homeassistant/components/auth/.translations/id.json
 create mode 100644 homeassistant/components/auth/.translations/nn.json
 create mode 100644 homeassistant/components/auth/.translations/pt-BR.json
 create mode 100644 homeassistant/components/cast/.translations/id.json
 create mode 100644 homeassistant/components/cast/.translations/nn.json
 create mode 100644 homeassistant/components/deconz/.translations/id.json
 create mode 100644 homeassistant/components/deconz/.translations/nn.json
 create mode 100644 homeassistant/components/hangouts/.translations/id.json
 create mode 100644 homeassistant/components/hangouts/.translations/nn.json
 create mode 100644 homeassistant/components/homematicip_cloud/.translations/id.json
 create mode 100644 homeassistant/components/homematicip_cloud/.translations/nn.json
 create mode 100644 homeassistant/components/hue/.translations/id.json
 create mode 100644 homeassistant/components/hue/.translations/nn.json
 create mode 100644 homeassistant/components/ios/.translations/de.json
 create mode 100644 homeassistant/components/ios/.translations/id.json
 create mode 100644 homeassistant/components/ios/.translations/lb.json
 create mode 100644 homeassistant/components/ios/.translations/nn.json
 create mode 100644 homeassistant/components/ios/.translations/no.json
 create mode 100644 homeassistant/components/ios/.translations/pt-BR.json
 create mode 100644 homeassistant/components/ios/.translations/pt.json
 create mode 100644 homeassistant/components/mqtt/.translations/de.json
 create mode 100644 homeassistant/components/mqtt/.translations/id.json
 create mode 100644 homeassistant/components/mqtt/.translations/lb.json
 create mode 100644 homeassistant/components/mqtt/.translations/nl.json
 create mode 100644 homeassistant/components/mqtt/.translations/nn.json
 create mode 100644 homeassistant/components/mqtt/.translations/no.json
 create mode 100644 homeassistant/components/mqtt/.translations/pt-BR.json
 create mode 100644 homeassistant/components/mqtt/.translations/pt.json
 create mode 100644 homeassistant/components/nest/.translations/id.json
 create mode 100644 homeassistant/components/nest/.translations/nn.json
 create mode 100644 homeassistant/components/openuv/.translations/id.json
 create mode 100644 homeassistant/components/openuv/.translations/lb.json
 create mode 100644 homeassistant/components/openuv/.translations/nn.json
 create mode 100644 homeassistant/components/openuv/.translations/pt-BR.json
 create mode 100644 homeassistant/components/openuv/.translations/pt.json
 create mode 100644 homeassistant/components/sensor/.translations/moon.id.json
 create mode 100644 homeassistant/components/sensor/.translations/moon.nn.json
 create mode 100644 homeassistant/components/sensor/.translations/season.id.json
 create mode 100644 homeassistant/components/sensor/.translations/season.nn.json
 create mode 100644 homeassistant/components/sonos/.translations/id.json
 create mode 100644 homeassistant/components/sonos/.translations/nn.json
 create mode 100644 homeassistant/components/tradfri/.translations/ca.json
 create mode 100644 homeassistant/components/tradfri/.translations/fr.json
 create mode 100644 homeassistant/components/tradfri/.translations/hu.json
 create mode 100644 homeassistant/components/tradfri/.translations/id.json
 create mode 100644 homeassistant/components/tradfri/.translations/ko.json
 create mode 100644 homeassistant/components/tradfri/.translations/lb.json
 create mode 100644 homeassistant/components/tradfri/.translations/nl.json
 create mode 100644 homeassistant/components/tradfri/.translations/nn.json
 create mode 100644 homeassistant/components/tradfri/.translations/no.json
 create mode 100644 homeassistant/components/tradfri/.translations/pt-BR.json
 create mode 100644 homeassistant/components/tradfri/.translations/pt.json
 create mode 100644 homeassistant/components/tradfri/.translations/ru.json
 create mode 100644 homeassistant/components/tradfri/.translations/zh-Hans.json
 create mode 100644 homeassistant/components/tradfri/.translations/zh-Hant.json
 create mode 100644 homeassistant/components/zone/.translations/id.json
 create mode 100644 homeassistant/components/zone/.translations/nn.json

diff --git a/homeassistant/components/auth/.translations/id.json b/homeassistant/components/auth/.translations/id.json
new file mode 100644
index 00000000000..f6a22386f99
--- /dev/null
+++ b/homeassistant/components/auth/.translations/id.json
@@ -0,0 +1,16 @@
+{
+    "mfa_setup": {
+        "totp": {
+            "error": {
+                "invalid_code": "Kode salah, coba lagi. Jika Anda mendapatkan kesalahan ini secara konsisten, pastikan jam pada sistem Home Assistant anda akurat."
+            },
+            "step": {
+                "init": {
+                    "description": "Untuk mengaktifkan otentikasi dua faktor menggunakan password satu kali berbasis waktu, pindai kode QR dengan aplikasi otentikasi Anda. Jika Anda tidak memilikinya, kami menyarankan [Google Authenticator] (https://support.google.com/accounts/answer/1066447) atau [Authy] (https://authy.com/). \n\n {qr_code} \n \n Setelah memindai kode, masukkan kode enam digit dari aplikasi Anda untuk memverifikasi pengaturan. Jika Anda mengalami masalah saat memindai kode QR, lakukan pengaturan manual dengan kode ** ` {code} ` **.",
+                    "title": "Siapkan otentikasi dua faktor menggunakan TOTP"
+                }
+            },
+            "title": "TOTP"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/auth/.translations/nn.json b/homeassistant/components/auth/.translations/nn.json
new file mode 100644
index 00000000000..24d756f938b
--- /dev/null
+++ b/homeassistant/components/auth/.translations/nn.json
@@ -0,0 +1,16 @@
+{
+    "mfa_setup": {
+        "totp": {
+            "error": {
+                "invalid_code": "Ugyldig kode, pr\u00f8v igjen. Dersom du heile tida f\u00e5r denne feilen, m\u00e5 du s\u00f8rge for at klokka p\u00e5 Home Assistant-systemet ditt er n\u00f8yaktig."
+            },
+            "step": {
+                "init": {
+                    "description": "For \u00e5 aktivere tofaktorautentisering ved hjelp av tidsbaserte eingangspassord, skann QR-koden med autentiseringsappen din. Dersom du ikkje har ein, vil vi r\u00e5de deg til \u00e5 bruke anten [Google Authenticator] (https://support.google.com/accounts/answer/1066447) eller [Authy] (https://authy.com/). \n\n {qr_code} \n \nN\u00e5r du har skanna koda, skriv du inn den sekssifra koda fr\u00e5 appen din for \u00e5 stadfeste oppsettet. Dersom du har problemer med \u00e5 skanne QR-koda, gjer du eit manuelt oppsett med kode ** ` {code} ` **.",
+                    "title": "Konfigurer to-faktor-autentisering ved hjelp av TOTP"
+                }
+            },
+            "title": "TOTP"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/auth/.translations/pt-BR.json b/homeassistant/components/auth/.translations/pt-BR.json
new file mode 100644
index 00000000000..58c785a5b95
--- /dev/null
+++ b/homeassistant/components/auth/.translations/pt-BR.json
@@ -0,0 +1,15 @@
+{
+    "mfa_setup": {
+        "totp": {
+            "error": {
+                "invalid_code": "C\u00f3digo inv\u00e1lido, por favor tente novamente. Se voc\u00ea obtiver este erro de forma consistente, certifique-se de que o rel\u00f3gio do sistema Home Assistant esteja correto."
+            },
+            "step": {
+                "init": {
+                    "title": "Configure a autentica\u00e7\u00e3o de dois fatores usando o TOTP"
+                }
+            },
+            "title": "TOTP"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/cast/.translations/id.json b/homeassistant/components/cast/.translations/id.json
new file mode 100644
index 00000000000..86fb32c0844
--- /dev/null
+++ b/homeassistant/components/cast/.translations/id.json
@@ -0,0 +1,15 @@
+{
+    "config": {
+        "abort": {
+            "no_devices_found": "Tidak ada perangkat Google Cast yang ditemukan pada jaringan.",
+            "single_instance_allowed": "Hanya satu konfigurasi Google Cast yang diperlukan."
+        },
+        "step": {
+            "confirm": {
+                "description": "Apakah Anda ingin menyiapkan Google Cast?",
+                "title": "Google Cast"
+            }
+        },
+        "title": "Google Cast"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/cast/.translations/nn.json b/homeassistant/components/cast/.translations/nn.json
new file mode 100644
index 00000000000..7f550155658
--- /dev/null
+++ b/homeassistant/components/cast/.translations/nn.json
@@ -0,0 +1,15 @@
+{
+    "config": {
+        "abort": {
+            "no_devices_found": "Klar",
+            "single_instance_allowed": "Du treng berre \u00e5 sette opp \u00e9in Google Cast-konfigurasjon."
+        },
+        "step": {
+            "confirm": {
+                "description": "Vil du sette opp Google Cast?",
+                "title": "Google Cast"
+            }
+        },
+        "title": "Google Cast"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/deconz/.translations/ca.json b/homeassistant/components/deconz/.translations/ca.json
index 0a9e6fdee3f..10eb9f5bc73 100644
--- a/homeassistant/components/deconz/.translations/ca.json
+++ b/homeassistant/components/deconz/.translations/ca.json
@@ -28,6 +28,6 @@
                 "title": "Opcions de configuraci\u00f3 addicionals per deCONZ"
             }
         },
-        "title": "deCONZ"
+        "title": "Passarel\u00b7la d'enlla\u00e7 deCONZ Zigbee"
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/deconz/.translations/id.json b/homeassistant/components/deconz/.translations/id.json
new file mode 100644
index 00000000000..7d0b3163a40
--- /dev/null
+++ b/homeassistant/components/deconz/.translations/id.json
@@ -0,0 +1,33 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Bridge sudah dikonfigurasi",
+            "no_bridges": "deCONZ bridges tidak ditemukan",
+            "one_instance_only": "Komponen hanya mendukung satu instance deCONZ"
+        },
+        "error": {
+            "no_key": "Tidak bisa mendapatkan kunci API"
+        },
+        "step": {
+            "init": {
+                "data": {
+                    "host": "Host",
+                    "port": "Port (nilai default: '80')"
+                },
+                "title": "Tentukan deCONZ gateway"
+            },
+            "link": {
+                "description": "Buka gerbang deCONZ Anda untuk mendaftar dengan Home Assistant. \n\n 1. Pergi ke pengaturan sistem deCONZ \n 2. Tekan tombol \"Buka Kunci Gateway\"",
+                "title": "Tautan dengan deCONZ"
+            },
+            "options": {
+                "data": {
+                    "allow_clip_sensor": "Izinkan mengimpor sensor virtual",
+                    "allow_deconz_groups": "Izinkan mengimpor grup deCONZ"
+                },
+                "title": "Opsi konfigurasi tambahan untuk deCONZ"
+            }
+        },
+        "title": "deCONZ Zigbee gateway"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/deconz/.translations/ko.json b/homeassistant/components/deconz/.translations/ko.json
index a584a1db9b5..a501951540b 100644
--- a/homeassistant/components/deconz/.translations/ko.json
+++ b/homeassistant/components/deconz/.translations/ko.json
@@ -3,7 +3,7 @@
         "abort": {
             "already_configured": "\ube0c\ub9bf\uc9c0\uac00 \uc774\ubbf8 \uad6c\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4",
             "no_bridges": "\ubc1c\uacac\ub41c deCONZ \ube0c\ub9bf\uc9c0\uac00 \uc5c6\uc2b5\ub2c8\ub2e4",
-            "one_instance_only": "\uad6c\uc131\uc694\uc18c\ub294 \ud558\ub098\uc758 deCONZ \uc778\uc2a4\ud134\uc2a4 \ub9cc \uc9c0\uc6d0\ud569\ub2c8\ub2e4"
+            "one_instance_only": "\uad6c\uc131\uc694\uc18c\ub294 \ud558\ub098\uc758 deCONZ \uc778\uc2a4\ud134\uc2a4\ub9cc \uc9c0\uc6d0\ud569\ub2c8\ub2e4"
         },
         "error": {
             "no_key": "API \ud0a4\ub97c \uac00\uc838\uc62c \uc218 \uc5c6\uc2b5\ub2c8\ub2e4"
diff --git a/homeassistant/components/deconz/.translations/nn.json b/homeassistant/components/deconz/.translations/nn.json
new file mode 100644
index 00000000000..4bdc4b4c1be
--- /dev/null
+++ b/homeassistant/components/deconz/.translations/nn.json
@@ -0,0 +1,33 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Brua er allereie konfigurert",
+            "no_bridges": "Oppdaga ingen deCONZ-bruer",
+            "one_instance_only": "Komponenten st\u00f8ttar berre \u00e9in deCONZ-instans"
+        },
+        "error": {
+            "no_key": "Kunne ikkje f\u00e5 ein API-n\u00f8kkel"
+        },
+        "step": {
+            "init": {
+                "data": {
+                    "host": "Vert",
+                    "port": "Port (standardverdi: '80')"
+                },
+                "title": "Definer deCONZ-gateway"
+            },
+            "link": {
+                "description": "L\u00e5s opp deCONZ-gatewayen din for \u00e5 registrere den med Home Assistant.\n\n1. G\u00e5 til systeminnstillingane til deCONZ\n2. Trykk p\u00e5 \"L\u00e5s opp gateway\"-knappen",
+                "title": "Link med deCONZ"
+            },
+            "options": {
+                "data": {
+                    "allow_clip_sensor": "Tillat importering av virtuelle sensorar",
+                    "allow_deconz_groups": "Tillat importering av deCONZ-grupper"
+                },
+                "title": "Ekstra konfigurasjonsalternativ for deCONZ"
+            }
+        },
+        "title": "deCONZ Zigbee gateway"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/hangouts/.translations/id.json b/homeassistant/components/hangouts/.translations/id.json
new file mode 100644
index 00000000000..46a574bdf8a
--- /dev/null
+++ b/homeassistant/components/hangouts/.translations/id.json
@@ -0,0 +1,31 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Google Hangouts sudah dikonfigurasikan",
+            "unknown": "Kesalahan tidak dikenal terjadi."
+        },
+        "error": {
+            "invalid_2fa": "Autentikasi 2 Faktor Tidak Valid, silakan coba lagi.",
+            "invalid_2fa_method": "Metode 2FA Tidak Sah (Verifikasi di Ponsel).",
+            "invalid_login": "Login tidak valid, silahkan coba lagi."
+        },
+        "step": {
+            "2fa": {
+                "data": {
+                    "2fa": "Pin 2FA"
+                },
+                "description": "Kosong",
+                "title": "2-Faktor-Otentikasi"
+            },
+            "user": {
+                "data": {
+                    "email": "Alamat email",
+                    "password": "Kata sandi"
+                },
+                "description": "Kosong",
+                "title": "Google Hangouts Login"
+            }
+        },
+        "title": "Google Hangouts"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/hangouts/.translations/nn.json b/homeassistant/components/hangouts/.translations/nn.json
new file mode 100644
index 00000000000..58e5f4f45fd
--- /dev/null
+++ b/homeassistant/components/hangouts/.translations/nn.json
@@ -0,0 +1,29 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Google Hangouts er allereie konfigurert",
+            "unknown": "Det hende ein ukjent feil"
+        },
+        "error": {
+            "invalid_2fa": "Ugyldig to-faktor-autentisering. Ver vennleg og pr\u00f8v igjen.",
+            "invalid_2fa_method": "Ugyldig 2FA-metode (godkjenn p\u00e5 telefonen).",
+            "invalid_login": "Ugyldig innlogging. Pr\u00f8v igjen."
+        },
+        "step": {
+            "2fa": {
+                "data": {
+                    "2fa": "2FA PIN"
+                },
+                "title": "To-faktor-autentiserin"
+            },
+            "user": {
+                "data": {
+                    "email": "Epostadresse",
+                    "password": "Passord"
+                },
+                "title": "Google Hangouts Login"
+            }
+        },
+        "title": "Google Hangouts"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/hangouts/.translations/pt-BR.json b/homeassistant/components/hangouts/.translations/pt-BR.json
index 516229c3871..00c533311fc 100644
--- a/homeassistant/components/hangouts/.translations/pt-BR.json
+++ b/homeassistant/components/hangouts/.translations/pt-BR.json
@@ -5,16 +5,21 @@
             "unknown": "Ocorreu um erro desconhecido."
         },
         "error": {
-            "invalid_2fa": "Autentica\u00e7\u00e3o de 2 fatores inv\u00e1lida, por favor, tente novamente."
+            "invalid_2fa": "Autentica\u00e7\u00e3o de 2 fatores inv\u00e1lida, por favor, tente novamente.",
+            "invalid_2fa_method": "M\u00e9todo 2FA inv\u00e1lido (verificar no telefone).",
+            "invalid_login": "Login inv\u00e1lido, por favor, tente novamente."
         },
         "step": {
             "2fa": {
-                "title": ""
+                "description": "Vazio",
+                "title": "Autentica\u00e7\u00e3o de 2 Fatores"
             },
             "user": {
                 "data": {
+                    "email": "Endere\u00e7o de e-mail",
                     "password": "Senha"
                 },
+                "description": "Vazio",
                 "title": "Login do Hangouts do Google"
             }
         },
diff --git a/homeassistant/components/hangouts/strings.json b/homeassistant/components/hangouts/strings.json
index dd421fee57a..c83a0ae0876 100644
--- a/homeassistant/components/hangouts/strings.json
+++ b/homeassistant/components/hangouts/strings.json
@@ -15,14 +15,12 @@
                     "email": "E-Mail Address",
                     "password": "Password"
                 },
-                "description": "",
                 "title": "Google Hangouts Login"
             },
             "2fa": {
                 "data": {
                   "2fa": "2FA Pin"
                 },
-                "description": "",
                 "title": "2-Factor-Authentication"
             }
         },
diff --git a/homeassistant/components/homematicip_cloud/.translations/en.json b/homeassistant/components/homematicip_cloud/.translations/en.json
index 6fcfcddd75d..605bb0d250b 100644
--- a/homeassistant/components/homematicip_cloud/.translations/en.json
+++ b/homeassistant/components/homematicip_cloud/.translations/en.json
@@ -2,7 +2,6 @@
     "config": {
         "abort": {
             "already_configured": "Access point is already configured",
-            "conection_aborted": "Could not connect to HMIP server",
             "connection_aborted": "Could not connect to HMIP server",
             "unknown": "Unknown error occurred."
         },
diff --git a/homeassistant/components/homematicip_cloud/.translations/id.json b/homeassistant/components/homematicip_cloud/.translations/id.json
new file mode 100644
index 00000000000..6598af2f044
--- /dev/null
+++ b/homeassistant/components/homematicip_cloud/.translations/id.json
@@ -0,0 +1,31 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Jalur akses sudah dikonfigurasi",
+            "conection_aborted": "Tidak dapat terhubung ke server HMIP",
+            "connection_aborted": "Tidak dapat terhubung ke server HMIP",
+            "unknown": "Kesalahan tidak dikenal terjadi."
+        },
+        "error": {
+            "invalid_pin": "PIN tidak valid, silakan coba lagi.",
+            "press_the_button": "Silakan tekan tombol biru.",
+            "register_failed": "Gagal mendaftar, silakan coba lagi.",
+            "timeout_button": "Batas waktu tekan tombol biru berakhir, silakan coba lagi."
+        },
+        "step": {
+            "init": {
+                "data": {
+                    "hapid": "Titik akses ID (SGTIN)",
+                    "name": "Nama (opsional, digunakan sebagai awalan nama untuk semua perangkat)",
+                    "pin": "Kode Pin (opsional)"
+                },
+                "title": "Pilih HomematicIP Access point"
+            },
+            "link": {
+                "description": "Tekan tombol biru pada access point dan tombol submit untuk mendaftarkan HomematicIP dengan rumah asisten.\n\n! [Lokasi tombol di bridge] (/ static/images/config_flows/config_homematicip_cloud.png)",
+                "title": "Tautkan jalur akses"
+            }
+        },
+        "title": "HomematicIP Cloud"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/homematicip_cloud/.translations/ko.json b/homeassistant/components/homematicip_cloud/.translations/ko.json
index 617b65ff623..6f5ed1ac923 100644
--- a/homeassistant/components/homematicip_cloud/.translations/ko.json
+++ b/homeassistant/components/homematicip_cloud/.translations/ko.json
@@ -22,7 +22,7 @@
                 "title": "HomematicIP \uc561\uc138\uc2a4 \ud3ec\uc778\ud2b8 \uc120\ud0dd"
             },
             "link": {
-                "description": "Home Assistant\uc5d0 HomematicIP\ub97c \ub4f1\ub85d\ud558\ub824\uba74 \uc561\uc138\uc2a4 \ud3ec\uc778\ud2b8\uc758 \ud30c\ub780\uc0c9 \ubc84\ud2bc\uacfc \uc11c\ubc0b \ubc84\ud2bc\uc744 \ub20c\ub7ec\uc8fc\uc138\uc694.\n\n![\ube0c\ub9bf\uc9c0\uc758 \ubc84\ud2bc \uc704\uce58 \ubcf4\uae30](/static/images/config_flows/config_homematicip_cloud.png)",
+                "description": "Home Assistant \uc5d0 HomematicIP \ub97c \ub4f1\ub85d\ud558\ub824\uba74 \uc561\uc138\uc2a4 \ud3ec\uc778\ud2b8\uc758 \ud30c\ub780\uc0c9 \ubc84\ud2bc\uacfc \uc11c\ubc0b \ubc84\ud2bc\uc744 \ub20c\ub7ec\uc8fc\uc138\uc694.\n\n![\ube0c\ub9bf\uc9c0\uc758 \ubc84\ud2bc \uc704\uce58 \ubcf4\uae30](/static/images/config_flows/config_homematicip_cloud.png)",
                 "title": "\uc561\uc138\uc2a4 \ud3ec\uc778\ud2b8\uc5d0 \uc5f0\uacb0"
             }
         },
diff --git a/homeassistant/components/homematicip_cloud/.translations/nn.json b/homeassistant/components/homematicip_cloud/.translations/nn.json
new file mode 100644
index 00000000000..3275a3b09d4
--- /dev/null
+++ b/homeassistant/components/homematicip_cloud/.translations/nn.json
@@ -0,0 +1,31 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Tilgangspunktet er allereie konfigurert",
+            "conection_aborted": "Kunne ikkje kople til HMIP-serveren",
+            "connection_aborted": "Kunne ikkje kople til HMIP-serveren",
+            "unknown": "Det hende ein ukjent feil."
+        },
+        "error": {
+            "invalid_pin": "Ugyldig PIN. Pr\u00f8v igjen.",
+            "press_the_button": "Ver vennleg og trykk p\u00e5 den bl\u00e5 knappen.",
+            "register_failed": "Kunne ikkje registrere. Pr\u00f8v igjen.",
+            "timeout_button": "TIda gjekk ut for \u00e5 trykke p\u00e5 den bl\u00e5 knappen. Ver vennleg og pr\u00f8v igjen."
+        },
+        "step": {
+            "init": {
+                "data": {
+                    "hapid": "TilgangspunktID (SGTIN)",
+                    "name": "Namn (valfrii. Brukt som namnprefiks for alle einingar)",
+                    "pin": "Pinkode (valfritt)"
+                },
+                "title": "Vel HomematicIP tilgangspunkt"
+            },
+            "link": {
+                "description": "Trykk p\u00e5 den bl\u00e5 knappen p\u00e5 tilgangspunktet og sendknappen for \u00e5 registrere HomematicIP med Home Assitant.\n\n ! [Plassering av knapp p\u00e5 bro] (/ static / images / config_flows / config_homematicip_cloud.png)",
+                "title": "Link tilgangspunk"
+            }
+        },
+        "title": "HomematicIP Cloud"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/hue/.translations/id.json b/homeassistant/components/hue/.translations/id.json
new file mode 100644
index 00000000000..bf5557436ce
--- /dev/null
+++ b/homeassistant/components/hue/.translations/id.json
@@ -0,0 +1,29 @@
+{
+    "config": {
+        "abort": {
+            "all_configured": "Semua Philips Hue bridges sudah dikonfigurasi",
+            "already_configured": "Bridge sudah dikonfigurasi",
+            "cannot_connect": "Tidak dapat terhubung ke bridge",
+            "discover_timeout": "Tidak dapat menemukan Hue Bridges.",
+            "no_bridges": "Bridge Philips Hue tidak ditemukan",
+            "unknown": "Kesalahan tidak dikenal terjadi."
+        },
+        "error": {
+            "linking": "Terjadi kesalahan tautan tidak dikenal.",
+            "register_failed": "Gagal mendaftar, silakan coba lagi."
+        },
+        "step": {
+            "init": {
+                "data": {
+                    "host": "Host"
+                },
+                "title": "Pilih Hue bridge"
+            },
+            "link": {
+                "description": "Tekan tombol di bridge untuk mendaftar Philips Hue dengan Home Assistant.\n\n![Lokasi tombol di bridge] (/static/images/config_philips_hue.jpg)",
+                "title": "Tautan Hub"
+            }
+        },
+        "title": "Philips Hue"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/hue/.translations/nn.json b/homeassistant/components/hue/.translations/nn.json
new file mode 100644
index 00000000000..45d6bc89d72
--- /dev/null
+++ b/homeassistant/components/hue/.translations/nn.json
@@ -0,0 +1,29 @@
+{
+    "config": {
+        "abort": {
+            "all_configured": "Alle Philips Hue-bruer er allereie konfiguert",
+            "already_configured": "Brua er allereie konfiguert",
+            "cannot_connect": "Klarte ikkje \u00e5 kople til brua",
+            "discover_timeout": "Klarte ikkje \u00e5 oppdage Hue-bruer",
+            "no_bridges": "Oppdaga ingen Philips Hue-bruer",
+            "unknown": "Ukjent feil oppstod"
+        },
+        "error": {
+            "linking": "Ukjent linkefeil oppstod.",
+            "register_failed": "Kunne ikkje registrere, pr\u00f8v igjen"
+        },
+        "step": {
+            "init": {
+                "data": {
+                    "host": "Vert"
+                },
+                "title": "Vel Hue bru"
+            },
+            "link": {
+                "description": "Trykk p\u00e5 knappen p\u00e5 brua, for \u00e5 registrere Philips Hue med Home Assistant.\n\n![Lokasjon til knappen p\u00e5 brua]\n(/statisk/bilete/konfiguer_philips_hue.jpg)",
+                "title": "Link Hub"
+            }
+        },
+        "title": "Philips Hue"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ios/.translations/de.json b/homeassistant/components/ios/.translations/de.json
new file mode 100644
index 00000000000..e9e592d18c2
--- /dev/null
+++ b/homeassistant/components/ios/.translations/de.json
@@ -0,0 +1,12 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Es wird nur eine Konfiguration von Home Assistant iOS ben\u00f6tigt"
+        },
+        "step": {
+            "confirm": {
+                "description": "M\u00f6chtest du die Home Assistant iOS-Komponente einrichten?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ios/.translations/id.json b/homeassistant/components/ios/.translations/id.json
new file mode 100644
index 00000000000..5813d9488f0
--- /dev/null
+++ b/homeassistant/components/ios/.translations/id.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Hanya satu konfigurasi Home Assistant iOS yang diperlukan."
+        },
+        "step": {
+            "confirm": {
+                "description": "Apakah Anda ingin mengatur komponen iOS Home Assistant?",
+                "title": "Home Asisten iOS"
+            }
+        },
+        "title": "Home Asisten iOS"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ios/.translations/ko.json b/homeassistant/components/ios/.translations/ko.json
index 6d69ea3126c..1496dab0555 100644
--- a/homeassistant/components/ios/.translations/ko.json
+++ b/homeassistant/components/ios/.translations/ko.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "\ud558\ub098\uc758 Home Assistant iOS \uad6c\uc131\ub9cc \ud544\uc694\ud569\ub2c8\ub2e4."
+            "single_instance_allowed": "\ud558\ub098\uc758 Home Assistant iOS \ub9cc \uad6c\uc131 \ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4."
         },
         "step": {
             "confirm": {
-                "description": "Home Assistant iOS \ucef4\ud3ec\ub10c\ud2b8\uc758 \uc124\uc815\uc744 \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?",
+                "description": "Home Assistant iOS \ucef4\ud3ec\ub10c\ud2b8\ub97c \uc124\uc815 \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?",
                 "title": "Home Assistant iOS"
             }
         },
diff --git a/homeassistant/components/ios/.translations/lb.json b/homeassistant/components/ios/.translations/lb.json
new file mode 100644
index 00000000000..731371cada9
--- /dev/null
+++ b/homeassistant/components/ios/.translations/lb.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "N\u00ebmmen eng eenzeg Konfiguratioun vun Home Assistant iOS ass n\u00e9ideg."
+        },
+        "step": {
+            "confirm": {
+                "description": "W\u00ebllt dir d'Home Assistant iOS Komponent ariichten?",
+                "title": "Home Assistant iOS"
+            }
+        },
+        "title": "Home Assistant iOS"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ios/.translations/nn.json b/homeassistant/components/ios/.translations/nn.json
new file mode 100644
index 00000000000..9d2cf692006
--- /dev/null
+++ b/homeassistant/components/ios/.translations/nn.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Du treng berre \u00e9in Home Assistant iOS-konfigurasjon."
+        },
+        "step": {
+            "confirm": {
+                "description": "Vil du sette opp Home Assistant iOS-komponenten?",
+                "title": "Home Assistant Ios"
+            }
+        },
+        "title": "Home Assistant iOS"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ios/.translations/no.json b/homeassistant/components/ios/.translations/no.json
new file mode 100644
index 00000000000..a125b96a070
--- /dev/null
+++ b/homeassistant/components/ios/.translations/no.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Kun en enkelt konfigurasjon av Home Assistant iOS er n\u00f8dvendig."
+        },
+        "step": {
+            "confirm": {
+                "description": "\u00d8nsker du \u00e5 konfigurere Home Assistant iOS-komponenten?",
+                "title": "Home Assistant iOS"
+            }
+        },
+        "title": "Home Assistant iOS"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ios/.translations/pt-BR.json b/homeassistant/components/ios/.translations/pt-BR.json
new file mode 100644
index 00000000000..77efc04b817
--- /dev/null
+++ b/homeassistant/components/ios/.translations/pt-BR.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Apenas uma configura\u00e7\u00e3o do Home Assistant iOS \u00e9 necess\u00e1ria."
+        },
+        "step": {
+            "confirm": {
+                "description": "Deseja configurar o componente iOS do Home Assistant?",
+                "title": "Home Assistant iOS"
+            }
+        },
+        "title": "Home Assistant iOS"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ios/.translations/pt.json b/homeassistant/components/ios/.translations/pt.json
new file mode 100644
index 00000000000..6752606d9f5
--- /dev/null
+++ b/homeassistant/components/ios/.translations/pt.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Apenas uma \u00fanica configura\u00e7\u00e3o do componente iOS do Home Assistante \u00e9 necess\u00e1ria."
+        },
+        "step": {
+            "confirm": {
+                "description": "Deseja configurar o componente iOS do Home Assistant?",
+                "title": ""
+            }
+        },
+        "title": ""
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/mqtt/.translations/de.json b/homeassistant/components/mqtt/.translations/de.json
new file mode 100644
index 00000000000..15b6b3b9731
--- /dev/null
+++ b/homeassistant/components/mqtt/.translations/de.json
@@ -0,0 +1,15 @@
+{
+    "config": {
+        "step": {
+            "broker": {
+                "data": {
+                    "password": "Passwort",
+                    "username": "Benutzername"
+                },
+                "description": "Bitte gib die Verbindungsinformationen deines MQTT-Brokers ein.",
+                "title": "MQTT"
+            }
+        },
+        "title": "MQTT"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/mqtt/.translations/id.json b/homeassistant/components/mqtt/.translations/id.json
new file mode 100644
index 00000000000..7a9bf8639e2
--- /dev/null
+++ b/homeassistant/components/mqtt/.translations/id.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Hanya satu konfigurasi MQTT yang diizinkan."
+        },
+        "error": {
+            "cannot_connect": "Tidak dapat terhubung ke broker."
+        },
+        "step": {
+            "broker": {
+                "data": {
+                    "broker": "Broker",
+                    "password": "Kata sandi",
+                    "port": "Port",
+                    "username": "Nama pengguna"
+                },
+                "description": "Harap masukkan informasi koneksi dari broker MQTT Anda.",
+                "title": "MQTT"
+            }
+        },
+        "title": "MQTT"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/mqtt/.translations/ko.json b/homeassistant/components/mqtt/.translations/ko.json
index a1e130c59cf..3775c8328d1 100644
--- a/homeassistant/components/mqtt/.translations/ko.json
+++ b/homeassistant/components/mqtt/.translations/ko.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "\ud558\ub098\uc758 MQTT \ube0c\ub85c\ucee4\ub9cc \uad6c\uc131\uc774 \uac00\ub2a5\ud569\ub2c8\ub2e4."
+            "single_instance_allowed": "\ud558\ub098\uc758 MQTT \ube0c\ub85c\ucee4\ub9cc \uad6c\uc131 \ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4."
         },
         "error": {
             "cannot_connect": "MQTT \ube0c\ub85c\ucee4\uc5d0 \uc5f0\uacb0\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4."
@@ -14,7 +14,7 @@
                     "port": "\ud3ec\ud2b8",
                     "username": "\uc0ac\uc6a9\uc790 \uc774\ub984"
                 },
-                "description": "MQTT \ube0c\ub85c\ucee4\uc640\uc758 \uc5f0\uacb0 \uc815\ubcf4\ub97c \uc785\ub825\ud558\uc138\uc694.",
+                "description": "MQTT \ube0c\ub85c\ucee4\uc640\uc758 \uc5f0\uacb0 \uc815\ubcf4\ub97c \uc785\ub825\ud574\uc8fc\uc138\uc694.",
                 "title": "MQTT"
             }
         },
diff --git a/homeassistant/components/mqtt/.translations/lb.json b/homeassistant/components/mqtt/.translations/lb.json
new file mode 100644
index 00000000000..82a10194667
--- /dev/null
+++ b/homeassistant/components/mqtt/.translations/lb.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "N\u00ebmmen eng eenzeg Konfiguratioun vum MQTT ass erlaabt"
+        },
+        "error": {
+            "cannot_connect": "Kann sech net mam Broker verbannen."
+        },
+        "step": {
+            "broker": {
+                "data": {
+                    "broker": "Broker",
+                    "password": "Passwuert",
+                    "port": "Port",
+                    "username": "Benotzernumm"
+                },
+                "description": "Gitt Verbindungs Informatioune vun \u00e4rem MQTT Broker an.",
+                "title": "MQTT"
+            }
+        },
+        "title": "MQTT"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/mqtt/.translations/nl.json b/homeassistant/components/mqtt/.translations/nl.json
new file mode 100644
index 00000000000..b375f353810
--- /dev/null
+++ b/homeassistant/components/mqtt/.translations/nl.json
@@ -0,0 +1,17 @@
+{
+    "config": {
+        "step": {
+            "broker": {
+                "data": {
+                    "broker": "Broker",
+                    "password": "Wachtwoord",
+                    "port": "Poort",
+                    "username": "Gebruikersnaam"
+                },
+                "description": "MQTT",
+                "title": "MQTT"
+            }
+        },
+        "title": "MQTT"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/mqtt/.translations/nn.json b/homeassistant/components/mqtt/.translations/nn.json
new file mode 100644
index 00000000000..fb650bc7676
--- /dev/null
+++ b/homeassistant/components/mqtt/.translations/nn.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Det er berre lov \u00e5 ha \u00e9in MQTT-konfigurasjon"
+        },
+        "error": {
+            "cannot_connect": "Klarte ikkje \u00e5 kople til meglaren."
+        },
+        "step": {
+            "broker": {
+                "data": {
+                    "broker": "Meglar",
+                    "password": "Passord",
+                    "port": "Port",
+                    "username": "Brukarnamn"
+                },
+                "description": "Ver vennleg \u00e5 skriv inn tilkoplingsinformasjonen for MQTT-meglaren din",
+                "title": "MQTT"
+            }
+        },
+        "title": "MQTT"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/mqtt/.translations/no.json b/homeassistant/components/mqtt/.translations/no.json
new file mode 100644
index 00000000000..a9c60fb0c7f
--- /dev/null
+++ b/homeassistant/components/mqtt/.translations/no.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Kun en enkelt konfigurasjon av MQTT er tillatt."
+        },
+        "error": {
+            "cannot_connect": "Kan ikke koble til megleren."
+        },
+        "step": {
+            "broker": {
+                "data": {
+                    "broker": "Megler",
+                    "password": "Passord",
+                    "port": "Port",
+                    "username": "Brukernavn"
+                },
+                "description": "Vennligst oppgi tilkoblingsinformasjonen for din MQTT megler.",
+                "title": "MQTT"
+            }
+        },
+        "title": "MQTT"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/mqtt/.translations/pt-BR.json b/homeassistant/components/mqtt/.translations/pt-BR.json
new file mode 100644
index 00000000000..e73e8b155ec
--- /dev/null
+++ b/homeassistant/components/mqtt/.translations/pt-BR.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Apenas uma configura\u00e7\u00e3o do MQTT \u00e9 permitida."
+        },
+        "step": {
+            "broker": {
+                "data": {
+                    "password": "Senha",
+                    "port": "Porta",
+                    "username": "Nome de usu\u00e1rio"
+                },
+                "description": "Por favor, insira as informa\u00e7\u00f5es de conex\u00e3o do seu agente MQTT.",
+                "title": "MQTT"
+            }
+        },
+        "title": "MQTT"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/mqtt/.translations/pt.json b/homeassistant/components/mqtt/.translations/pt.json
new file mode 100644
index 00000000000..42f7c7f5ad2
--- /dev/null
+++ b/homeassistant/components/mqtt/.translations/pt.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Apenas uma configura\u00e7\u00e3o do MQTT \u00e9 permitida."
+        },
+        "error": {
+            "cannot_connect": "N\u00e3o \u00e9 poss\u00edvel ligar ao broker."
+        },
+        "step": {
+            "broker": {
+                "data": {
+                    "broker": "",
+                    "password": "Palavra-passe",
+                    "port": "Porto",
+                    "username": "Utilizador"
+                },
+                "description": "Por favor, insira os detalhes de liga\u00e7\u00e3o ao seu broker MQTT.",
+                "title": ""
+            }
+        },
+        "title": ""
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/nest/.translations/ca.json b/homeassistant/components/nest/.translations/ca.json
index 2fb17916aee..e15d0106da8 100644
--- a/homeassistant/components/nest/.translations/ca.json
+++ b/homeassistant/components/nest/.translations/ca.json
@@ -9,7 +9,7 @@
         "error": {
             "internal_error": "Error intern al validar el codi",
             "invalid_code": "Codi inv\u00e0lid",
-            "timeout": "Temps d'espera de validaci\u00f3 del codi esgotat",
+            "timeout": "S'ha acabat el temps d'espera durant la validaci\u00f3 del codi.",
             "unknown": "Error desconegut al validar el codi"
         },
         "step": {
diff --git a/homeassistant/components/nest/.translations/id.json b/homeassistant/components/nest/.translations/id.json
new file mode 100644
index 00000000000..58f86f5474e
--- /dev/null
+++ b/homeassistant/components/nest/.translations/id.json
@@ -0,0 +1,33 @@
+{
+    "config": {
+        "abort": {
+            "already_setup": "Anda hanya dapat mengonfigurasi satu akun Nest.",
+            "authorize_url_fail": "Kesalahan tidak dikenal terjadi ketika menghasilkan URL otorisasi.",
+            "authorize_url_timeout": "Waktu tunggu menghasilkan otorisasi url telah habis.",
+            "no_flows": "Anda harus mengonfigurasi Nest sebelum dapat mengautentikasi dengan Nest. [Silakan baca instruksi] (https://www.home-assistant.io/components/nest/)."
+        },
+        "error": {
+            "internal_error": "Kesalahan Internal memvalidasi kode",
+            "invalid_code": "Kode salah",
+            "timeout": "Waktu tunggu memvalidasi kode telah habis.",
+            "unknown": "Error tidak diketahui saat memvalidasi kode"
+        },
+        "step": {
+            "init": {
+                "data": {
+                    "flow_impl": "Penyedia"
+                },
+                "description": "Pilih melalui penyedia autentikasi mana yang ingin Anda autentikasi dengan Nest.",
+                "title": "Penyedia Otentikasi"
+            },
+            "link": {
+                "data": {
+                    "code": "Kode PIN"
+                },
+                "description": "Untuk menautkan akun Nest Anda, [beri kuasa akun Anda] ( {url} ). \n\n Setelah otorisasi, salin-tempel kode pin yang disediakan di bawah ini.",
+                "title": "Hubungkan Akun Nest"
+            }
+        },
+        "title": "Nest"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/nest/.translations/nn.json b/homeassistant/components/nest/.translations/nn.json
new file mode 100644
index 00000000000..be3915c464f
--- /dev/null
+++ b/homeassistant/components/nest/.translations/nn.json
@@ -0,0 +1,33 @@
+{
+    "config": {
+        "abort": {
+            "already_setup": "Du kan berre konfiguere \u00e9in Nest-brukar.",
+            "authorize_url_fail": "Ukjent feil ved generering av autentiserings-URL",
+            "authorize_url_timeout": "Tida gjekk ut for generert autentikasjons-URL",
+            "no_flows": "Du m\u00e5 konfiguere Nest f\u00f8r du kan autentisere den. (Les instruksjonane) (https://www.home-assistant.io/components/nest/)"
+        },
+        "error": {
+            "internal_error": "Intern feil ved validering av kode",
+            "invalid_code": "Ugyldig kode",
+            "timeout": "Tida gjekk ut for validering av kode",
+            "unknown": "Det hende ein ukjent feil ved validering av kode."
+        },
+        "step": {
+            "init": {
+                "data": {
+                    "flow_impl": "Leverand\u00f8r"
+                },
+                "description": "Vel kva for ein autentiseringsleverand\u00f8r du vil godkjenne med Nest.",
+                "title": "Autentiseringsleverand\u00f8r"
+            },
+            "link": {
+                "data": {
+                    "code": "Pinkode"
+                },
+                "description": "For \u00e5 linke Nestkontoen din, [autoriser kontoen din]{url}.\nEtter autentiseringa, kopier-lim inn koda du fekk under her.",
+                "title": "Link Nestkonto"
+            }
+        },
+        "title": "Nest"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/openuv/.translations/id.json b/homeassistant/components/openuv/.translations/id.json
new file mode 100644
index 00000000000..beb7c839eb9
--- /dev/null
+++ b/homeassistant/components/openuv/.translations/id.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "error": {
+            "identifier_exists": "Koordinat sudah terdaftar",
+            "invalid_api_key": "Kunci API tidak valid"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "Kunci API OpenUV",
+                    "elevation": "Ketinggian",
+                    "latitude": "Lintang",
+                    "longitude": "Garis bujur"
+                },
+                "title": "Isi informasi Anda"
+            }
+        },
+        "title": "OpenUV"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/openuv/.translations/lb.json b/homeassistant/components/openuv/.translations/lb.json
new file mode 100644
index 00000000000..86e558cc807
--- /dev/null
+++ b/homeassistant/components/openuv/.translations/lb.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "error": {
+            "identifier_exists": "Koordinate si scho\u00a0registr\u00e9iert",
+            "invalid_api_key": "Ong\u00ebltegen API Schl\u00ebssel"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "OpenUV API Schl\u00ebssel",
+                    "elevation": "H\u00e9icht",
+                    "latitude": "Breedegrad",
+                    "longitude": "L\u00e4ngegrad"
+                },
+                "title": "F\u00ebllt \u00e4r Informatiounen aus"
+            }
+        },
+        "title": "OpenUV"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/openuv/.translations/nn.json b/homeassistant/components/openuv/.translations/nn.json
new file mode 100644
index 00000000000..135e26cede3
--- /dev/null
+++ b/homeassistant/components/openuv/.translations/nn.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "error": {
+            "identifier_exists": "Koordinata er allereie registrerte",
+            "invalid_api_key": "Ugyldig API-n\u00f8kkel"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "OpenUV API-n\u00f8kkel",
+                    "elevation": "H\u00f8gde",
+                    "latitude": "Breiddegrad",
+                    "longitude": "Lengdegrad"
+                },
+                "title": "Fyll ut informasjonen din"
+            }
+        },
+        "title": "OpenUV"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/openuv/.translations/pt-BR.json b/homeassistant/components/openuv/.translations/pt-BR.json
new file mode 100644
index 00000000000..905fdbacab8
--- /dev/null
+++ b/homeassistant/components/openuv/.translations/pt-BR.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "error": {
+            "identifier_exists": "Coordenadas j\u00e1 cadastradas",
+            "invalid_api_key": "Chave de API inv\u00e1lida"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "Chave de API do OpenUV",
+                    "elevation": "Eleva\u00e7\u00e3o",
+                    "latitude": "Latitude",
+                    "longitude": "Longitude"
+                },
+                "title": "Preencha suas informa\u00e7\u00f5es"
+            }
+        },
+        "title": "OpenUV"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/openuv/.translations/pt.json b/homeassistant/components/openuv/.translations/pt.json
new file mode 100644
index 00000000000..36f875efc00
--- /dev/null
+++ b/homeassistant/components/openuv/.translations/pt.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "error": {
+            "identifier_exists": "Coordenadas j\u00e1 registadas",
+            "invalid_api_key": "Chave de API inv\u00e1lida"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "Chave de API do OpenUV",
+                    "elevation": "Eleva\u00e7\u00e3o",
+                    "latitude": "Latitude",
+                    "longitude": "Longitude"
+                },
+                "title": "Preencha com as suas informa\u00e7\u00f5es"
+            }
+        },
+        "title": ""
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/sensor/.translations/moon.id.json b/homeassistant/components/sensor/.translations/moon.id.json
new file mode 100644
index 00000000000..3ce14204fb5
--- /dev/null
+++ b/homeassistant/components/sensor/.translations/moon.id.json
@@ -0,0 +1,12 @@
+{
+    "state": {
+        "first_quarter": "Babak pertama",
+        "full_moon": "Bulan purnama",
+        "last_quarter": "Kuartal terakhir",
+        "new_moon": "Bulan baru",
+        "waning_crescent": "Waning crescent",
+        "waning_gibbous": "Waning gibbous",
+        "waxing_crescent": "Waxing crescent",
+        "waxing_gibbous": "Waxing gibbous"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/sensor/.translations/moon.nn.json b/homeassistant/components/sensor/.translations/moon.nn.json
new file mode 100644
index 00000000000..7c516bcce50
--- /dev/null
+++ b/homeassistant/components/sensor/.translations/moon.nn.json
@@ -0,0 +1,12 @@
+{
+    "state": {
+        "first_quarter": "Fyrste kvartal",
+        "full_moon": "Fullm\u00e5ne",
+        "last_quarter": "Siste kvartal",
+        "new_moon": "Nym\u00e5ne",
+        "waning_crescent": "Minkande halvm\u00e5ne",
+        "waning_gibbous": "Minkande m\u00e5ne",
+        "waxing_crescent": "Veksande halvm\u00e5ne",
+        "waxing_gibbous": "Veksande m\u00e5ne"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/sensor/.translations/season.id.json b/homeassistant/components/sensor/.translations/season.id.json
new file mode 100644
index 00000000000..ed0666aee36
--- /dev/null
+++ b/homeassistant/components/sensor/.translations/season.id.json
@@ -0,0 +1,8 @@
+{
+    "state": {
+        "autumn": "Musim gugur",
+        "spring": "Musim semi",
+        "summer": "Musim panas",
+        "winter": "Musim dingin"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/sensor/.translations/season.nn.json b/homeassistant/components/sensor/.translations/season.nn.json
new file mode 100644
index 00000000000..dbcff7ef819
--- /dev/null
+++ b/homeassistant/components/sensor/.translations/season.nn.json
@@ -0,0 +1,8 @@
+{
+    "state": {
+        "autumn": "Haust",
+        "spring": "V\u00e5r",
+        "summer": "Sommar",
+        "winter": "Vinter"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/sonos/.translations/id.json b/homeassistant/components/sonos/.translations/id.json
new file mode 100644
index 00000000000..dc810d9773c
--- /dev/null
+++ b/homeassistant/components/sonos/.translations/id.json
@@ -0,0 +1,15 @@
+{
+    "config": {
+        "abort": {
+            "no_devices_found": "Tidak ada perangkat Sonos yang ditemukan pada jaringan.",
+            "single_instance_allowed": "Hanya satu konfigurasi Sonos yang diperlukan."
+        },
+        "step": {
+            "confirm": {
+                "description": "Apakah Anda ingin mengatur Sonos?",
+                "title": "Sonos"
+            }
+        },
+        "title": "Sonos"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/sonos/.translations/nn.json b/homeassistant/components/sonos/.translations/nn.json
new file mode 100644
index 00000000000..f2451efaff4
--- /dev/null
+++ b/homeassistant/components/sonos/.translations/nn.json
@@ -0,0 +1,15 @@
+{
+    "config": {
+        "abort": {
+            "no_devices_found": "Det vart ikkje funne noko Sonoseiningar p\u00e5 nettverket.",
+            "single_instance_allowed": "Du treng berre \u00e5 sette opp \u00e9in Sonos-konfigurasjon."
+        },
+        "step": {
+            "confirm": {
+                "description": "Vil du sette opp Sonos?",
+                "title": "Sonos"
+            }
+        },
+        "title": "Sonos"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tradfri/.translations/ca.json b/homeassistant/components/tradfri/.translations/ca.json
new file mode 100644
index 00000000000..acbbb275fc3
--- /dev/null
+++ b/homeassistant/components/tradfri/.translations/ca.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "L'enlla\u00e7 ja est\u00e0 configurat"
+        },
+        "error": {
+            "cannot_connect": "No es pot connectar amb la passarel\u00b7la d'enlla\u00e7",
+            "invalid_key": "Ha fallat el registre amb la clau proporcionada. Si aix\u00f2 continua passant, intenteu reiniciar la passarel\u00b7la d'enlla\u00e7.",
+            "timeout": "S'ha acabat el temps d'espera durant la validaci\u00f3 del codi."
+        },
+        "step": {
+            "auth": {
+                "data": {
+                    "host": "Amfitri\u00f3",
+                    "security_code": "Codi de seguretat"
+                },
+                "description": "Podeu trobar el codi de seguretat a la part posterior de la vostra passarel\u00b7la d'enlla\u00e7.",
+                "title": "Introdu\u00efu el codi de seguretat"
+            }
+        },
+        "title": "IKEA TR\u00c5DFRI"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tradfri/.translations/fr.json b/homeassistant/components/tradfri/.translations/fr.json
new file mode 100644
index 00000000000..3c22885fe81
--- /dev/null
+++ b/homeassistant/components/tradfri/.translations/fr.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Le pont est d\u00e9j\u00e0 configur\u00e9"
+        },
+        "error": {
+            "cannot_connect": "Impossible de se connecter \u00e0 la passerelle.",
+            "invalid_key": "\u00c9chec de l'enregistrement avec la cl\u00e9 fournie. Si cela se reproduit, essayez de red\u00e9marrer la passerelle.",
+            "timeout": "D\u00e9lai d'attente de la validation du code expir\u00e9"
+        },
+        "step": {
+            "auth": {
+                "data": {
+                    "host": "H\u00f4te",
+                    "security_code": "Code de s\u00e9curit\u00e9"
+                },
+                "description": "Vous pouvez trouver le code de s\u00e9curit\u00e9 au dos de votre passerelle.",
+                "title": "Entrer le code de s\u00e9curit\u00e9"
+            }
+        },
+        "title": "IKEA TR\u00c5DFRI"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tradfri/.translations/hu.json b/homeassistant/components/tradfri/.translations/hu.json
new file mode 100644
index 00000000000..0844e6d7095
--- /dev/null
+++ b/homeassistant/components/tradfri/.translations/hu.json
@@ -0,0 +1,13 @@
+{
+    "config": {
+        "step": {
+            "auth": {
+                "data": {
+                    "host": "Hoszt",
+                    "security_code": "Biztons\u00e1gi K\u00f3d"
+                }
+            }
+        },
+        "title": "IKEA TR\u00c5DFRI"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tradfri/.translations/id.json b/homeassistant/components/tradfri/.translations/id.json
new file mode 100644
index 00000000000..5e1439c8d7d
--- /dev/null
+++ b/homeassistant/components/tradfri/.translations/id.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Bridge sudah dikonfigurasi"
+        },
+        "error": {
+            "cannot_connect": "Tidak dapat terhubung ke gateway.",
+            "invalid_key": "Gagal mendaftar dengan kunci yang disediakan. Jika ini terus terjadi, coba mulai ulang gateway.",
+            "timeout": "Waktu tunggu memvalidasi kode telah habis."
+        },
+        "step": {
+            "auth": {
+                "data": {
+                    "host": "Host",
+                    "security_code": "Kode keamanan"
+                },
+                "description": "Anda dapat menemukan kode keamanan di belakang gateway Anda.",
+                "title": "Masukkan kode keamanan"
+            }
+        },
+        "title": "IKEA TR\u00c5DFRI"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tradfri/.translations/ko.json b/homeassistant/components/tradfri/.translations/ko.json
new file mode 100644
index 00000000000..b901a1fd508
--- /dev/null
+++ b/homeassistant/components/tradfri/.translations/ko.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "\ube0c\ub9bf\uc9c0\uac00 \uc774\ubbf8 \uad6c\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4"
+        },
+        "error": {
+            "cannot_connect": "\uac8c\uc774\ud2b8\uc6e8\uc774\uc5d0 \uc5f0\uacb0\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.",
+            "invalid_key": "\uc81c\uacf5\ub41c \ud0a4\ub85c \ub4f1\ub85d\ud558\uc9c0 \ubabb\ud588\uc2b5\ub2c8\ub2e4. \uc774 \ubb38\uc81c\uac00 \uacc4\uc18d \ubc1c\uc0dd\ud558\uba74 \uac8c\uc774\ud2b8\uc6e8\uc774\ub97c \ub2e4\uc2dc \uc2dc\uc791\ud574\ubcf4\uc138\uc694.",
+            "timeout": "\ucf54\ub4dc \uc720\ud6a8\uc131 \uac80\uc0ac \uc2dc\uac04\uc774 \ucd08\uacfc\ub418\uc5c8\uc2b5\ub2c8\ub2e4."
+        },
+        "step": {
+            "auth": {
+                "data": {
+                    "host": "\ud638\uc2a4\ud2b8",
+                    "security_code": "\ubcf4\uc548 \ucf54\ub4dc"
+                },
+                "description": "\uac8c\uc774\ud2b8\uc6e8\uc774 \ub4b7\uba74\uc5d0\uc11c \ubcf4\uc548 \ucf54\ub4dc\ub97c \ucc3e\uc744 \uc218 \uc788\uc2b5\ub2c8\ub2e4.",
+                "title": "\ubcf4\uc548 \ucf54\ub4dc \uc785\ub825"
+            }
+        },
+        "title": "IKEA TR\u00c5DFRI"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tradfri/.translations/lb.json b/homeassistant/components/tradfri/.translations/lb.json
new file mode 100644
index 00000000000..8a623929d23
--- /dev/null
+++ b/homeassistant/components/tradfri/.translations/lb.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Bridge ass schon konfigur\u00e9iert"
+        },
+        "error": {
+            "cannot_connect": "Keng Verbindung mat der Gateway m\u00e9iglech.",
+            "invalid_key": "Konnt sech net mam ugebuedenem Schl\u00ebssel registr\u00e9ieren. Falls d\u00ebst widderhuelt optr\u00ebtt, prob\u00e9iert de Gateway fr\u00ebsch ze starten.",
+            "timeout": "Z\u00e4it Iwwerschreidung\u00a0beim valid\u00e9ieren vum Code"
+        },
+        "step": {
+            "auth": {
+                "data": {
+                    "host": "Apparat",
+                    "security_code": "S\u00e9cherheets Code"
+                },
+                "description": "Dir fannt de S\u00e9cherheets Code op der R\u00e9cks\u00e4it vun \u00e4rem Gateway.",
+                "title": "Gitt de S\u00e9cherheets Code an"
+            }
+        },
+        "title": "IKEA TR\u00c5DFRI"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tradfri/.translations/nl.json b/homeassistant/components/tradfri/.translations/nl.json
new file mode 100644
index 00000000000..1a681933b0b
--- /dev/null
+++ b/homeassistant/components/tradfri/.translations/nl.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Bridge is al geconfigureerd"
+        },
+        "error": {
+            "cannot_connect": "Kan geen verbinding maken met bridge",
+            "invalid_key": "Mislukt om te registreren met de meegeleverde sleutel. Als dit blijft gebeuren, probeer dan de gateway opnieuw op te starten.",
+            "timeout": "Time-out bij validatie van code"
+        },
+        "step": {
+            "auth": {
+                "data": {
+                    "host": "Host",
+                    "security_code": "Beveiligingscode"
+                },
+                "description": "U vindt de beveiligingscode op de achterkant van uw gateway.",
+                "title": "Voer beveiligingscode in"
+            }
+        },
+        "title": "IKEA TR\u00c5DFRI"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tradfri/.translations/nn.json b/homeassistant/components/tradfri/.translations/nn.json
new file mode 100644
index 00000000000..b9c68668dac
--- /dev/null
+++ b/homeassistant/components/tradfri/.translations/nn.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Brua er allereie konfigurert"
+        },
+        "error": {
+            "cannot_connect": "Klarte ikkje \u00e5 kople til gatewayen.",
+            "invalid_key": "Kunne ikkje registrere med den brukte n\u00f8kkelen. Dersom dette held fram, pr\u00f8v \u00e5 starte gatewayen p\u00e5 nytt. ",
+            "timeout": "Tida gjekk ut for validering av kode"
+        },
+        "step": {
+            "auth": {
+                "data": {
+                    "host": "Vert",
+                    "security_code": "Sikkerheitskode"
+                },
+                "description": "Du finn sikkerheitskoda p\u00e5 baksida av gatewayen din.",
+                "title": "Skriv inn sikkerheitskode"
+            }
+        },
+        "title": "IKEA TR\u00c5DFRI"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tradfri/.translations/no.json b/homeassistant/components/tradfri/.translations/no.json
new file mode 100644
index 00000000000..7244648b4e7
--- /dev/null
+++ b/homeassistant/components/tradfri/.translations/no.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Bridge er allerede konfigurert"
+        },
+        "error": {
+            "cannot_connect": "Kan ikke koble til gatewayen.",
+            "invalid_key": "Kunne ikke registrere med gitt n\u00f8kkel. Hvis dette fortsetter, pr\u00f8v \u00e5 starte gatewayen p\u00e5 nytt.",
+            "timeout": "Tidsavbrudd ved validering av kode."
+        },
+        "step": {
+            "auth": {
+                "data": {
+                    "host": "Vert",
+                    "security_code": "Sikkerhetskode"
+                },
+                "description": "Du finner sikkerhetskoden p\u00e5 baksiden av gatewayen din.",
+                "title": "Skriv inn sikkerhetskode"
+            }
+        },
+        "title": "Ikea Tr\u00e5dfri"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tradfri/.translations/pt-BR.json b/homeassistant/components/tradfri/.translations/pt-BR.json
new file mode 100644
index 00000000000..d5ad6b96670
--- /dev/null
+++ b/homeassistant/components/tradfri/.translations/pt-BR.json
@@ -0,0 +1,21 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Bridge j\u00e1 est\u00e1 configurado"
+        },
+        "error": {
+            "cannot_connect": "N\u00e3o \u00e9 poss\u00edvel conectar-se ao gateway.",
+            "timeout": "Excedido tempo limite para validar c\u00f3digo"
+        },
+        "step": {
+            "auth": {
+                "data": {
+                    "host": "Hospedeiro",
+                    "security_code": "C\u00f3digo de seguran\u00e7a"
+                },
+                "description": "Voc\u00ea pode encontrar o c\u00f3digo de seguran\u00e7a na parte de tr\u00e1s do seu gateway.",
+                "title": "Digite o c\u00f3digo de seguran\u00e7a"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tradfri/.translations/pt.json b/homeassistant/components/tradfri/.translations/pt.json
new file mode 100644
index 00000000000..05d3cbb57fe
--- /dev/null
+++ b/homeassistant/components/tradfri/.translations/pt.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Bridge j\u00e1 est\u00e1 configurada"
+        },
+        "error": {
+            "cannot_connect": "N\u00e3o \u00e9 poss\u00edvel ligar ao gateway.",
+            "invalid_key": "Falha ao registrar-se com a chave fornecida. Se o problema persistir, tente reiniciar o gateway.",
+            "timeout": "Tempo excedido a validar o c\u00f3digo."
+        },
+        "step": {
+            "auth": {
+                "data": {
+                    "host": "Servidor",
+                    "security_code": "C\u00f3digo de Seguran\u00e7a"
+                },
+                "description": "Encontra o c\u00f3digo de seguran\u00e7a na base da gateway.",
+                "title": "Introduzir c\u00f3digo de seguran\u00e7a"
+            }
+        },
+        "title": ""
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tradfri/.translations/ru.json b/homeassistant/components/tradfri/.translations/ru.json
new file mode 100644
index 00000000000..c7fcfd50b56
--- /dev/null
+++ b/homeassistant/components/tradfri/.translations/ru.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "\u0428\u043b\u044e\u0437 \u0443\u0436\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043d"
+        },
+        "error": {
+            "cannot_connect": "\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0448\u043b\u044e\u0437\u0443",
+            "invalid_key": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0441\u044f \u0441 \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u044b\u043c \u043a\u043b\u044e\u0447\u043e\u043c. \u0415\u0441\u043b\u0438 \u044d\u0442\u043e \u043f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u0441\u044f, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u043f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u0448\u043b\u044e\u0437.",
+            "timeout": "\u0418\u0441\u0442\u0435\u043a\u043b\u043e \u0432\u0440\u0435\u043c\u044f \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0438 \u043a\u043e\u0434\u0430."
+        },
+        "step": {
+            "auth": {
+                "data": {
+                    "host": "\u0425\u043e\u0441\u0442",
+                    "security_code": "\u041a\u043e\u0434 \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438"
+                },
+                "description": "\u041a\u043e\u0434 \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438 \u043c\u043e\u0436\u043d\u043e \u043d\u0430\u0439\u0442\u0438 \u043d\u0430 \u0437\u0430\u0434\u043d\u0435\u0439 \u043f\u0430\u043d\u0435\u043b\u0438 \u0448\u043b\u044e\u0437\u0430.",
+                "title": "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043a\u043e\u0434 \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438 "
+            }
+        },
+        "title": "IKEA TR\u00c5DFRI"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tradfri/.translations/zh-Hans.json b/homeassistant/components/tradfri/.translations/zh-Hans.json
new file mode 100644
index 00000000000..28a9c676f2e
--- /dev/null
+++ b/homeassistant/components/tradfri/.translations/zh-Hans.json
@@ -0,0 +1,12 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "\u6865\u63a5\u5668\u5df2\u914d\u7f6e\u5b8c\u6210"
+        },
+        "error": {
+            "cannot_connect": "\u65e0\u6cd5\u8fde\u63a5\u5230\u7f51\u5173\u3002",
+            "invalid_key": "\u65e0\u6cd5\u7528\u63d0\u4f9b\u7684\u5bc6\u94a5\u6ce8\u518c\u3002\u5982\u679c\u9519\u8bef\u6301\u7eed\u53d1\u751f\uff0c\u8bf7\u5c1d\u8bd5\u91cd\u65b0\u542f\u52a8\u7f51\u5173\u3002",
+            "timeout": "\u4ee3\u7801\u9a8c\u8bc1\u8d85\u65f6"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tradfri/.translations/zh-Hant.json b/homeassistant/components/tradfri/.translations/zh-Hant.json
new file mode 100644
index 00000000000..b295bba0564
--- /dev/null
+++ b/homeassistant/components/tradfri/.translations/zh-Hant.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Bridge \u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
+        },
+        "error": {
+            "cannot_connect": "\u7121\u6cd5\u9023\u7dda\u81f3\u9598\u9053\u5668\u3002",
+            "invalid_key": "\u63d0\u4f9b\u4e4b\u5b89\u5168\u78bc\u8a3b\u518a\u5931\u6557\u3002\u5047\u5982\u6b64\u60c5\u6cc1\u6301\u7e8c\u767c\u751f\uff0c\u8acb\u5617\u8a66\u91cd\u555f\u9598\u9053\u5668\u3002",
+            "timeout": "\u8a8d\u8b49\u78bc\u903e\u6642\u3002"
+        },
+        "step": {
+            "auth": {
+                "data": {
+                    "host": "\u4e3b\u6a5f\u7aef",
+                    "security_code": "\u5b89\u5168\u78bc"
+                },
+                "description": "\u60a8\u53ef\u4ee5\u65bc\u9598\u9053\u5668\u80cc\u9762\u627e\u5230\u5b89\u5168\u78bc\u3002",
+                "title": "\u8f38\u5165\u5b89\u5168\u78bc"
+            }
+        },
+        "title": "IKEA TR\u00c5DFRI"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/zone/.translations/id.json b/homeassistant/components/zone/.translations/id.json
new file mode 100644
index 00000000000..b84710dc408
--- /dev/null
+++ b/homeassistant/components/zone/.translations/id.json
@@ -0,0 +1,21 @@
+{
+    "config": {
+        "error": {
+            "name_exists": "Nama sudah ada"
+        },
+        "step": {
+            "init": {
+                "data": {
+                    "icon": "Ikon",
+                    "latitude": "Lintang",
+                    "longitude": "Garis bujur",
+                    "name": "Nama",
+                    "passive": "Pasif",
+                    "radius": "Radius"
+                },
+                "title": "Tentukan parameter zona"
+            }
+        },
+        "title": "Zona"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/zone/.translations/nn.json b/homeassistant/components/zone/.translations/nn.json
new file mode 100644
index 00000000000..39161f98c82
--- /dev/null
+++ b/homeassistant/components/zone/.translations/nn.json
@@ -0,0 +1,21 @@
+{
+    "config": {
+        "error": {
+            "name_exists": "Namnet eksisterar allereie"
+        },
+        "step": {
+            "init": {
+                "data": {
+                    "icon": "Ikon",
+                    "latitude": "Breiddegrad",
+                    "longitude": "Lengdegrad",
+                    "name": "Namn",
+                    "passive": "Passiv",
+                    "radius": "Radius"
+                },
+                "title": "Definer soneparameterar"
+            }
+        },
+        "title": "Sone"
+    }
+}
\ No newline at end of file

From 3e2a9afff0d54e96ed4acfbe34968f19eba1b868 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 24 Sep 2018 12:01:34 +0200
Subject: [PATCH 264/357] Another update translations

---
 homeassistant/components/homematicip_cloud/.translations/en.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/homeassistant/components/homematicip_cloud/.translations/en.json b/homeassistant/components/homematicip_cloud/.translations/en.json
index 605bb0d250b..6fcfcddd75d 100644
--- a/homeassistant/components/homematicip_cloud/.translations/en.json
+++ b/homeassistant/components/homematicip_cloud/.translations/en.json
@@ -2,6 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "Access point is already configured",
+            "conection_aborted": "Could not connect to HMIP server",
             "connection_aborted": "Could not connect to HMIP server",
             "unknown": "Unknown error occurred."
         },

From 0bd94d8b566a61220ba8640f1881efecf3a87c70 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 24 Sep 2018 12:02:26 +0200
Subject: [PATCH 265/357] Remove unused translation key

---
 homeassistant/components/homematicip_cloud/.translations/ca.json | 1 -
 homeassistant/components/homematicip_cloud/.translations/cs.json | 1 -
 homeassistant/components/homematicip_cloud/.translations/de.json | 1 -
 homeassistant/components/homematicip_cloud/.translations/en.json | 1 -
 .../components/homematicip_cloud/.translations/es-419.json       | 1 -
 homeassistant/components/homematicip_cloud/.translations/fr.json | 1 -
 homeassistant/components/homematicip_cloud/.translations/he.json | 1 -
 homeassistant/components/homematicip_cloud/.translations/id.json | 1 -
 homeassistant/components/homematicip_cloud/.translations/ja.json | 1 -
 homeassistant/components/homematicip_cloud/.translations/ko.json | 1 -
 homeassistant/components/homematicip_cloud/.translations/lb.json | 1 -
 homeassistant/components/homematicip_cloud/.translations/nl.json | 1 -
 homeassistant/components/homematicip_cloud/.translations/nn.json | 1 -
 homeassistant/components/homematicip_cloud/.translations/no.json | 1 -
 homeassistant/components/homematicip_cloud/.translations/pl.json | 1 -
 .../components/homematicip_cloud/.translations/pt-BR.json        | 1 -
 homeassistant/components/homematicip_cloud/.translations/pt.json | 1 -
 homeassistant/components/homematicip_cloud/.translations/ru.json | 1 -
 homeassistant/components/homematicip_cloud/.translations/sl.json | 1 -
 homeassistant/components/homematicip_cloud/.translations/sv.json | 1 -
 .../components/homematicip_cloud/.translations/zh-Hans.json      | 1 -
 .../components/homematicip_cloud/.translations/zh-Hant.json      | 1 -
 22 files changed, 22 deletions(-)

diff --git a/homeassistant/components/homematicip_cloud/.translations/ca.json b/homeassistant/components/homematicip_cloud/.translations/ca.json
index aab974ba137..7cc5943b830 100644
--- a/homeassistant/components/homematicip_cloud/.translations/ca.json
+++ b/homeassistant/components/homematicip_cloud/.translations/ca.json
@@ -2,7 +2,6 @@
     "config": {
         "abort": {
             "already_configured": "El punt d'acc\u00e9s ja est\u00e0 configurat",
-            "conection_aborted": "No s'ha pogut connectar al servidor HMIP",
             "connection_aborted": "No s'ha pogut connectar al servidor HMIP",
             "unknown": "S'ha produ\u00eft un error desconegut."
         },
diff --git a/homeassistant/components/homematicip_cloud/.translations/cs.json b/homeassistant/components/homematicip_cloud/.translations/cs.json
index 4030450e51c..fa98029f6b0 100644
--- a/homeassistant/components/homematicip_cloud/.translations/cs.json
+++ b/homeassistant/components/homematicip_cloud/.translations/cs.json
@@ -2,7 +2,6 @@
     "config": {
         "abort": {
             "already_configured": "P\u0159\u00edstupov\u00fd bod je ji\u017e nakonfigurov\u00e1n",
-            "conection_aborted": "Nelze se p\u0159ipojit k serveru HMIP",
             "connection_aborted": "Nelze se p\u0159ipojit k HMIP serveru",
             "unknown": "Do\u0161lo k nezn\u00e1m\u00e9 chyb\u011b"
         },
diff --git a/homeassistant/components/homematicip_cloud/.translations/de.json b/homeassistant/components/homematicip_cloud/.translations/de.json
index fdccac0d229..6b3b9b09480 100644
--- a/homeassistant/components/homematicip_cloud/.translations/de.json
+++ b/homeassistant/components/homematicip_cloud/.translations/de.json
@@ -2,7 +2,6 @@
     "config": {
         "abort": {
             "already_configured": "Der Accesspoint ist bereits konfiguriert",
-            "conection_aborted": "Keine Verbindung zum HMIP-Server m\u00f6glich",
             "connection_aborted": "Konnte nicht mit HMIP Server verbinden",
             "unknown": "Ein unbekannter Fehler ist aufgetreten."
         },
diff --git a/homeassistant/components/homematicip_cloud/.translations/en.json b/homeassistant/components/homematicip_cloud/.translations/en.json
index 6fcfcddd75d..605bb0d250b 100644
--- a/homeassistant/components/homematicip_cloud/.translations/en.json
+++ b/homeassistant/components/homematicip_cloud/.translations/en.json
@@ -2,7 +2,6 @@
     "config": {
         "abort": {
             "already_configured": "Access point is already configured",
-            "conection_aborted": "Could not connect to HMIP server",
             "connection_aborted": "Could not connect to HMIP server",
             "unknown": "Unknown error occurred."
         },
diff --git a/homeassistant/components/homematicip_cloud/.translations/es-419.json b/homeassistant/components/homematicip_cloud/.translations/es-419.json
index e15d0dbae64..8675d6e12b1 100644
--- a/homeassistant/components/homematicip_cloud/.translations/es-419.json
+++ b/homeassistant/components/homematicip_cloud/.translations/es-419.json
@@ -2,7 +2,6 @@
     "config": {
         "abort": {
             "already_configured": "Accesspoint ya est\u00e1 configurado",
-            "conection_aborted": "No se pudo conectar al servidor HMIP",
             "connection_aborted": "No se pudo conectar al servidor HMIP",
             "unknown": "Se produjo un error desconocido."
         },
diff --git a/homeassistant/components/homematicip_cloud/.translations/fr.json b/homeassistant/components/homematicip_cloud/.translations/fr.json
index 6cab0993c01..0e724d62bbe 100644
--- a/homeassistant/components/homematicip_cloud/.translations/fr.json
+++ b/homeassistant/components/homematicip_cloud/.translations/fr.json
@@ -2,7 +2,6 @@
     "config": {
         "abort": {
             "already_configured": "Le point d'acc\u00e8s est d\u00e9j\u00e0 configur\u00e9",
-            "conection_aborted": "Impossible de se connecter au serveur HMIP",
             "connection_aborted": "Impossible de se connecter au serveur HMIP",
             "unknown": "Une erreur inconnue s'est produite."
         },
diff --git a/homeassistant/components/homematicip_cloud/.translations/he.json b/homeassistant/components/homematicip_cloud/.translations/he.json
index bdf1e436bad..50d5c61b576 100644
--- a/homeassistant/components/homematicip_cloud/.translations/he.json
+++ b/homeassistant/components/homematicip_cloud/.translations/he.json
@@ -2,7 +2,6 @@
     "config": {
         "abort": {
             "already_configured": "\u05e0\u05e7\u05d5\u05d3\u05ea \u05d4\u05d2\u05d9\u05e9\u05d4 \u05db\u05d1\u05e8 \u05de\u05d5\u05d2\u05d3\u05e8\u05ea",
-            "conection_aborted": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d4\u05ea\u05d7\u05d1\u05e8 \u05dc\u05e9\u05e8\u05ea HMIP",
             "unknown": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05dc\u05d0 \u05d9\u05d3\u05d5\u05e2\u05d4."
         },
         "error": {
diff --git a/homeassistant/components/homematicip_cloud/.translations/id.json b/homeassistant/components/homematicip_cloud/.translations/id.json
index 6598af2f044..0487434274c 100644
--- a/homeassistant/components/homematicip_cloud/.translations/id.json
+++ b/homeassistant/components/homematicip_cloud/.translations/id.json
@@ -2,7 +2,6 @@
     "config": {
         "abort": {
             "already_configured": "Jalur akses sudah dikonfigurasi",
-            "conection_aborted": "Tidak dapat terhubung ke server HMIP",
             "connection_aborted": "Tidak dapat terhubung ke server HMIP",
             "unknown": "Kesalahan tidak dikenal terjadi."
         },
diff --git a/homeassistant/components/homematicip_cloud/.translations/ja.json b/homeassistant/components/homematicip_cloud/.translations/ja.json
index 105a7415789..6a03f3ec76b 100644
--- a/homeassistant/components/homematicip_cloud/.translations/ja.json
+++ b/homeassistant/components/homematicip_cloud/.translations/ja.json
@@ -2,7 +2,6 @@
     "config": {
         "abort": {
             "already_configured": "\u30a2\u30af\u30bb\u30b9\u30dd\u30a4\u30f3\u30c8\u306f\u65e2\u306b\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059",
-            "conection_aborted": "HMIP\u30b5\u30fc\u30d0\u30fc\u306b\u63a5\u7d9a\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f",
             "unknown": "\u4e0d\u660e\u306a\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002"
         },
         "error": {
diff --git a/homeassistant/components/homematicip_cloud/.translations/ko.json b/homeassistant/components/homematicip_cloud/.translations/ko.json
index 6f5ed1ac923..7b8dc8b5087 100644
--- a/homeassistant/components/homematicip_cloud/.translations/ko.json
+++ b/homeassistant/components/homematicip_cloud/.translations/ko.json
@@ -2,7 +2,6 @@
     "config": {
         "abort": {
             "already_configured": "\uc561\uc138\uc2a4 \ud3ec\uc778\ud2b8\uac00 \uc774\ubbf8 \uad6c\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4",
-            "conection_aborted": "HMIP \uc11c\ubc84\uc5d0 \uc5f0\uacb0\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4",
             "connection_aborted": "HMIP \uc11c\ubc84\uc5d0 \uc5f0\uacb0\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4",
             "unknown": "\uc54c \uc218\uc5c6\ub294 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4"
         },
diff --git a/homeassistant/components/homematicip_cloud/.translations/lb.json b/homeassistant/components/homematicip_cloud/.translations/lb.json
index a21767fc7d9..2cad909a7ee 100644
--- a/homeassistant/components/homematicip_cloud/.translations/lb.json
+++ b/homeassistant/components/homematicip_cloud/.translations/lb.json
@@ -2,7 +2,6 @@
     "config": {
         "abort": {
             "already_configured": "Acesspoint ass schon konfigur\u00e9iert",
-            "conection_aborted": "Konnt sech net mam HMIP Server verbannen",
             "connection_aborted": "Konnt sech net mam HMIP Server verbannen",
             "unknown": "Onbekannten Feeler opgetrueden"
         },
diff --git a/homeassistant/components/homematicip_cloud/.translations/nl.json b/homeassistant/components/homematicip_cloud/.translations/nl.json
index 40d1ced5007..ff3e2dea2cd 100644
--- a/homeassistant/components/homematicip_cloud/.translations/nl.json
+++ b/homeassistant/components/homematicip_cloud/.translations/nl.json
@@ -2,7 +2,6 @@
     "config": {
         "abort": {
             "already_configured": "Accesspoint is al geconfigureerd",
-            "conection_aborted": "Kon geen verbinding maken met de HMIP-server",
             "connection_aborted": "Kon geen verbinding maken met de HMIP-server",
             "unknown": "Er is een onbekende fout opgetreden."
         },
diff --git a/homeassistant/components/homematicip_cloud/.translations/nn.json b/homeassistant/components/homematicip_cloud/.translations/nn.json
index 3275a3b09d4..966c827c89d 100644
--- a/homeassistant/components/homematicip_cloud/.translations/nn.json
+++ b/homeassistant/components/homematicip_cloud/.translations/nn.json
@@ -2,7 +2,6 @@
     "config": {
         "abort": {
             "already_configured": "Tilgangspunktet er allereie konfigurert",
-            "conection_aborted": "Kunne ikkje kople til HMIP-serveren",
             "connection_aborted": "Kunne ikkje kople til HMIP-serveren",
             "unknown": "Det hende ein ukjent feil."
         },
diff --git a/homeassistant/components/homematicip_cloud/.translations/no.json b/homeassistant/components/homematicip_cloud/.translations/no.json
index 730f00ae625..d9e6636c972 100644
--- a/homeassistant/components/homematicip_cloud/.translations/no.json
+++ b/homeassistant/components/homematicip_cloud/.translations/no.json
@@ -2,7 +2,6 @@
     "config": {
         "abort": {
             "already_configured": "Tilgangspunktet er allerede konfigurert",
-            "conection_aborted": "Kunne ikke koble til HMIP serveren",
             "connection_aborted": "Kunne ikke koble til HMIP serveren",
             "unknown": "Ukjent feil oppstod."
         },
diff --git a/homeassistant/components/homematicip_cloud/.translations/pl.json b/homeassistant/components/homematicip_cloud/.translations/pl.json
index 3fcbe7e69d1..7c8714c2c11 100644
--- a/homeassistant/components/homematicip_cloud/.translations/pl.json
+++ b/homeassistant/components/homematicip_cloud/.translations/pl.json
@@ -2,7 +2,6 @@
     "config": {
         "abort": {
             "already_configured": "Punkt dost\u0119pu jest ju\u017c skonfigurowany",
-            "conection_aborted": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z serwerem HMIP",
             "connection_aborted": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z serwerem HMIP",
             "unknown": "Wyst\u0105pi\u0142 nieznany b\u0142\u0105d"
         },
diff --git a/homeassistant/components/homematicip_cloud/.translations/pt-BR.json b/homeassistant/components/homematicip_cloud/.translations/pt-BR.json
index d4ecbe50107..82166a1aaaf 100644
--- a/homeassistant/components/homematicip_cloud/.translations/pt-BR.json
+++ b/homeassistant/components/homematicip_cloud/.translations/pt-BR.json
@@ -2,7 +2,6 @@
     "config": {
         "abort": {
             "already_configured": "O Accesspoint j\u00e1 est\u00e1 configurado",
-            "conection_aborted": "N\u00e3o foi poss\u00edvel conectar ao servidor HMIP",
             "connection_aborted": "N\u00e3o foi poss\u00edvel conectar ao servidor HMIP",
             "unknown": "Ocorreu um erro desconhecido."
         },
diff --git a/homeassistant/components/homematicip_cloud/.translations/pt.json b/homeassistant/components/homematicip_cloud/.translations/pt.json
index 87ee494a875..18377490a5f 100644
--- a/homeassistant/components/homematicip_cloud/.translations/pt.json
+++ b/homeassistant/components/homematicip_cloud/.translations/pt.json
@@ -2,7 +2,6 @@
     "config": {
         "abort": {
             "already_configured": "O ponto de acesso j\u00e1 se encontra configurado",
-            "conection_aborted": "N\u00e3o foi poss\u00edvel ligar ao servidor HMIP",
             "connection_aborted": "N\u00e3o foi poss\u00edvel ligar ao servidor HMIP",
             "unknown": "Ocorreu um erro desconhecido."
         },
diff --git a/homeassistant/components/homematicip_cloud/.translations/ru.json b/homeassistant/components/homematicip_cloud/.translations/ru.json
index ed42daf19cd..ef2b3be4a64 100644
--- a/homeassistant/components/homematicip_cloud/.translations/ru.json
+++ b/homeassistant/components/homematicip_cloud/.translations/ru.json
@@ -2,7 +2,6 @@
     "config": {
         "abort": {
             "already_configured": "\u0422\u043e\u0447\u043a\u0430 \u0434\u043e\u0441\u0442\u0443\u043f\u0430 \u0443\u0436\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043d\u0430",
-            "conection_aborted": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0441\u0435\u0440\u0432\u0435\u0440\u0443 HMIP",
             "connection_aborted": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0441\u0435\u0440\u0432\u0435\u0440\u0443 HMIP",
             "unknown": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430"
         },
diff --git a/homeassistant/components/homematicip_cloud/.translations/sl.json b/homeassistant/components/homematicip_cloud/.translations/sl.json
index 4c4a00e31e0..eabb31ac833 100644
--- a/homeassistant/components/homematicip_cloud/.translations/sl.json
+++ b/homeassistant/components/homematicip_cloud/.translations/sl.json
@@ -2,7 +2,6 @@
     "config": {
         "abort": {
             "already_configured": "Dostopna to\u010dka je \u017ee konfigurirana",
-            "conection_aborted": "Povezave s stre\u017enikom HMIP ni bila mogo\u010da",
             "connection_aborted": "Povezava s stre\u017enikom HMIP ni bila mogo\u010da",
             "unknown": "Pri\u0161lo je do neznane napake"
         },
diff --git a/homeassistant/components/homematicip_cloud/.translations/sv.json b/homeassistant/components/homematicip_cloud/.translations/sv.json
index 4e8aac999de..da6bde77ae3 100644
--- a/homeassistant/components/homematicip_cloud/.translations/sv.json
+++ b/homeassistant/components/homematicip_cloud/.translations/sv.json
@@ -2,7 +2,6 @@
     "config": {
         "abort": {
             "already_configured": "Accesspunkten \u00e4r redan konfigurerad",
-            "conection_aborted": "Kunde inte ansluta till HMIP server",
             "connection_aborted": "Det gick inte att ansluta till HMIP-servern",
             "unknown": "Ett ok\u00e4nt fel har intr\u00e4ffat"
         },
diff --git a/homeassistant/components/homematicip_cloud/.translations/zh-Hans.json b/homeassistant/components/homematicip_cloud/.translations/zh-Hans.json
index 930b649bceb..629ee4347fe 100644
--- a/homeassistant/components/homematicip_cloud/.translations/zh-Hans.json
+++ b/homeassistant/components/homematicip_cloud/.translations/zh-Hans.json
@@ -2,7 +2,6 @@
     "config": {
         "abort": {
             "already_configured": "\u63a5\u5165\u70b9\u5df2\u7ecf\u914d\u7f6e\u5b8c\u6210",
-            "conection_aborted": "\u65e0\u6cd5\u8fde\u63a5\u5230 HMIP \u670d\u52a1\u5668",
             "connection_aborted": "\u65e0\u6cd5\u8fde\u63a5\u5230 HMIP \u670d\u52a1\u5668",
             "unknown": "\u53d1\u751f\u672a\u77e5\u9519\u8bef\u3002"
         },
diff --git a/homeassistant/components/homematicip_cloud/.translations/zh-Hant.json b/homeassistant/components/homematicip_cloud/.translations/zh-Hant.json
index 9340070d9a3..d2d33455191 100644
--- a/homeassistant/components/homematicip_cloud/.translations/zh-Hant.json
+++ b/homeassistant/components/homematicip_cloud/.translations/zh-Hant.json
@@ -2,7 +2,6 @@
     "config": {
         "abort": {
             "already_configured": "Accesspoint \u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
-            "conection_aborted": "\u7121\u6cd5\u9023\u7dda\u81f3 HMIP \u4f3a\u670d\u5668",
             "connection_aborted": "\u7121\u6cd5\u9023\u7dda\u81f3 HMIP \u4f3a\u670d\u5668",
             "unknown": "\u767c\u751f\u672a\u77e5\u932f\u8aa4\u3002"
         },

From c352b6fa5996298d78fa50e900683631a6e05070 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 24 Sep 2018 12:13:52 +0200
Subject: [PATCH 266/357] Version bump to 0.79.0b0

---
 homeassistant/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/const.py b/homeassistant/const.py
index b9b71734241..307cbf9fe66 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -2,7 +2,7 @@
 """Constants used by Home Assistant components."""
 MAJOR_VERSION = 0
 MINOR_VERSION = 79
-PATCH_VERSION = '0.dev0'
+PATCH_VERSION = '0b0'
 __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
 __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
 REQUIRED_PYTHON_VER = (3, 5, 3)

From dc75db637661ec99051436654ecb4d7f3d353aa5 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 24 Sep 2018 12:15:47 +0200
Subject: [PATCH 267/357] Bumped version to 0.80.0.dev0

---
 homeassistant/const.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/const.py b/homeassistant/const.py
index 307cbf9fe66..0bcfcd9d4ad 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -1,8 +1,8 @@
 # coding: utf-8
 """Constants used by Home Assistant components."""
 MAJOR_VERSION = 0
-MINOR_VERSION = 79
-PATCH_VERSION = '0b0'
+MINOR_VERSION = 80
+PATCH_VERSION = '0.dev0'
 __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
 __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
 REQUIRED_PYTHON_VER = (3, 5, 3)

From b52e8525acc1c5f17c9a833c3b6b075dca6f961c Mon Sep 17 00:00:00 2001
From: randellhodges <rhodges@taxfodder.com>
Date: Mon, 24 Sep 2018 12:09:15 -0400
Subject: [PATCH 268/357] Add mode (daily/hourly) to darksky (#16719)

* added daily mode to darksky and wind_bearing, ozone, and visibility

* Removed dew point and pressure until the standard is updated
---
 homeassistant/components/weather/__init__.py  |  2 +
 homeassistant/components/weather/darksky.py   | 77 ++++++++++++++++---
 .../components/weather/openweathermap.py      |  7 +-
 3 files changed, 71 insertions(+), 15 deletions(-)

diff --git a/homeassistant/components/weather/__init__.py b/homeassistant/components/weather/__init__.py
index a43999f2276..c2a9f4f79d1 100644
--- a/homeassistant/components/weather/__init__.py
+++ b/homeassistant/components/weather/__init__.py
@@ -27,6 +27,8 @@ ATTR_FORECAST_PRECIPITATION = 'precipitation'
 ATTR_FORECAST_TEMP = 'temperature'
 ATTR_FORECAST_TEMP_LOW = 'templow'
 ATTR_FORECAST_TIME = 'datetime'
+ATTR_FORECAST_WIND_SPEED = 'wind_speed'
+ATTR_FORECAST_WIND_BEARING = 'wind_bearing'
 ATTR_WEATHER_ATTRIBUTION = 'attribution'
 ATTR_WEATHER_HUMIDITY = 'humidity'
 ATTR_WEATHER_OZONE = 'ozone'
diff --git a/homeassistant/components/weather/darksky.py b/homeassistant/components/weather/darksky.py
index 34a6fd3d6f6..c753c0249ca 100644
--- a/homeassistant/components/weather/darksky.py
+++ b/homeassistant/components/weather/darksky.py
@@ -13,10 +13,12 @@ import voluptuous as vol
 
 from homeassistant.components.weather import (
     ATTR_FORECAST_TEMP, ATTR_FORECAST_TIME, ATTR_FORECAST_CONDITION,
+    ATTR_FORECAST_WIND_SPEED, ATTR_FORECAST_WIND_BEARING,
+    ATTR_FORECAST_TEMP_LOW, ATTR_FORECAST_PRECIPITATION,
     PLATFORM_SCHEMA, WeatherEntity)
 from homeassistant.const import (
     CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME, TEMP_CELSIUS,
-    TEMP_FAHRENHEIT)
+    CONF_MODE, TEMP_FAHRENHEIT)
 import homeassistant.helpers.config_validation as cv
 from homeassistant.util import Throttle
 
@@ -26,6 +28,8 @@ _LOGGER = logging.getLogger(__name__)
 
 ATTRIBUTION = "Powered by Dark Sky"
 
+FORECAST_MODE = ['hourly', 'daily']
+
 MAP_CONDITION = {
     'clear-day': 'sunny',
     'clear-night': 'clear-night',
@@ -50,6 +54,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Required(CONF_API_KEY): cv.string,
     vol.Optional(CONF_LATITUDE): cv.latitude,
     vol.Optional(CONF_LONGITUDE): cv.longitude,
+    vol.Optional(CONF_MODE, default='hourly'): vol.In(FORECAST_MODE),
     vol.Optional(CONF_UNITS): vol.In(['auto', 'si', 'us', 'ca', 'uk', 'uk2']),
     vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
 })
@@ -62,6 +67,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     latitude = config.get(CONF_LATITUDE, hass.config.latitude)
     longitude = config.get(CONF_LONGITUDE, hass.config.longitude)
     name = config.get(CONF_NAME)
+    mode = config.get(CONF_MODE)
 
     units = config.get(CONF_UNITS)
     if not units:
@@ -70,16 +76,17 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     dark_sky = DarkSkyData(
         config.get(CONF_API_KEY), latitude, longitude, units)
 
-    add_entities([DarkSkyWeather(name, dark_sky)], True)
+    add_entities([DarkSkyWeather(name, dark_sky, mode)], True)
 
 
 class DarkSkyWeather(WeatherEntity):
     """Representation of a weather condition."""
 
-    def __init__(self, name, dark_sky):
+    def __init__(self, name, dark_sky, mode):
         """Initialize Dark Sky weather."""
         self._name = name
         self._dark_sky = dark_sky
+        self._mode = mode
 
         self._ds_data = None
         self._ds_currently = None
@@ -117,11 +124,26 @@ class DarkSkyWeather(WeatherEntity):
         """Return the wind speed."""
         return self._ds_currently.get('windSpeed')
 
+    @property
+    def wind_bearing(self):
+        """Return the wind bearing."""
+        return self._ds_currently.get('windBearing')
+
+    @property
+    def ozone(self):
+        """Return the ozone level."""
+        return self._ds_currently.get('ozone')
+
     @property
     def pressure(self):
         """Return the pressure."""
         return self._ds_currently.get('pressure')
 
+    @property
+    def visibility(self):
+        """Return the visibility."""
+        return self._ds_currently.get('visibility')
+
     @property
     def condition(self):
         """Return the weather condition."""
@@ -130,14 +152,47 @@ class DarkSkyWeather(WeatherEntity):
     @property
     def forecast(self):
         """Return the forecast array."""
-        return [{
-            ATTR_FORECAST_TIME:
-                datetime.fromtimestamp(entry.d.get('time')).isoformat(),
-            ATTR_FORECAST_TEMP:
-                entry.d.get('temperature'),
-            ATTR_FORECAST_CONDITION:
-                MAP_CONDITION.get(entry.d.get('icon'))
-        } for entry in self._ds_hourly.data]
+        # Per conversation with Joshua Reyes of Dark Sky, to get the total
+        # forecasted precipitation, you have to multiple the intensity by
+        # the hours for the forecast interval
+        def calc_precipitation(intensity, hours):
+            amount = None
+            if intensity is not None:
+                amount = round((intensity * hours), 1)
+            return amount if amount > 0 else None
+
+        data = None
+
+        if self._mode == 'daily':
+            data = [{
+                ATTR_FORECAST_TIME:
+                    datetime.fromtimestamp(entry.d.get('time')).isoformat(),
+                ATTR_FORECAST_TEMP:
+                    entry.d.get('temperatureHigh'),
+                ATTR_FORECAST_TEMP_LOW:
+                    entry.d.get('temperatureLow'),
+                ATTR_FORECAST_PRECIPITATION:
+                    calc_precipitation(entry.d.get('precipIntensity'), 24),
+                ATTR_FORECAST_WIND_SPEED:
+                    entry.d.get('windSpeed'),
+                ATTR_FORECAST_WIND_BEARING:
+                    entry.d.get('windBearing'),
+                ATTR_FORECAST_CONDITION:
+                    MAP_CONDITION.get(entry.d.get('icon'))
+            } for entry in self._ds_daily.data]
+        else:
+            data = [{
+                ATTR_FORECAST_TIME:
+                    datetime.fromtimestamp(entry.d.get('time')).isoformat(),
+                ATTR_FORECAST_TEMP:
+                    entry.d.get('temperature'),
+                ATTR_FORECAST_PRECIPITATION:
+                    calc_precipitation(entry.d.get('precipIntensity'), 1),
+                ATTR_FORECAST_CONDITION:
+                    MAP_CONDITION.get(entry.d.get('icon'))
+            } for entry in self._ds_hourly.data]
+
+        return data
 
     def update(self):
         """Get the latest data from Dark Sky."""
diff --git a/homeassistant/components/weather/openweathermap.py b/homeassistant/components/weather/openweathermap.py
index b300fcbcbec..87d2bc6683f 100644
--- a/homeassistant/components/weather/openweathermap.py
+++ b/homeassistant/components/weather/openweathermap.py
@@ -11,7 +11,9 @@ import voluptuous as vol
 
 from homeassistant.components.weather import (
     ATTR_FORECAST_CONDITION, ATTR_FORECAST_PRECIPITATION, ATTR_FORECAST_TEMP,
-    ATTR_FORECAST_TEMP_LOW, ATTR_FORECAST_TIME, PLATFORM_SCHEMA, WeatherEntity)
+    ATTR_FORECAST_TEMP_LOW, ATTR_FORECAST_TIME, ATTR_FORECAST_WIND_SPEED,
+    ATTR_FORECAST_WIND_BEARING,
+    PLATFORM_SCHEMA, WeatherEntity)
 from homeassistant.const import (
     CONF_API_KEY, TEMP_CELSIUS, CONF_LATITUDE, CONF_LONGITUDE, CONF_MODE,
     CONF_NAME, STATE_UNKNOWN)
@@ -22,9 +24,6 @@ REQUIREMENTS = ['pyowm==2.9.0']
 
 _LOGGER = logging.getLogger(__name__)
 
-ATTR_FORECAST_WIND_SPEED = 'wind_speed'
-ATTR_FORECAST_WIND_BEARING = 'wind_bearing'
-
 ATTRIBUTION = 'Data provided by OpenWeatherMap'
 
 FORECAST_MODE = ['hourly', 'daily']

From 579b77ba4cb57e1193aacc65e6fc0a5c45bc3ca1 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Tue, 25 Sep 2018 07:52:10 +0200
Subject: [PATCH 269/357] Don't warn but info when on dev mode (#16831)

---
 homeassistant/components/updater.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/components/updater.py b/homeassistant/components/updater.py
index 0cb22bd98dc..4e64e3be2e6 100644
--- a/homeassistant/components/updater.py
+++ b/homeassistant/components/updater.py
@@ -76,7 +76,7 @@ async def async_setup(hass, config):
     """Set up the updater component."""
     if 'dev' in current_version:
         # This component only makes sense in release versions
-        _LOGGER.warning("Running on 'dev', only analytics will be submitted")
+        _LOGGER.info("Running on 'dev', only analytics will be submitted")
 
     config = config.get(DOMAIN, {})
     if config.get(CONF_REPORTING):

From 354c8f34092073ddb7dd8719f25fde16b5a94b28 Mon Sep 17 00:00:00 2001
From: Rohan Kapoor <rohan@rohankapoor.com>
Date: Mon, 24 Sep 2018 22:53:35 -0700
Subject: [PATCH 270/357] Bump zm-py to 0.0.3 (#16835)

---
 homeassistant/components/zoneminder.py | 2 +-
 requirements_all.txt                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/zoneminder.py b/homeassistant/components/zoneminder.py
index 5cfd324448b..53d6d8b2536 100644
--- a/homeassistant/components/zoneminder.py
+++ b/homeassistant/components/zoneminder.py
@@ -15,7 +15,7 @@ import homeassistant.helpers.config_validation as cv
 
 _LOGGER = logging.getLogger(__name__)
 
-REQUIREMENTS = ['zm-py==0.0.2']
+REQUIREMENTS = ['zm-py==0.0.3']
 
 CONF_PATH_ZMS = 'path_zms'
 
diff --git a/requirements_all.txt b/requirements_all.txt
index b9550d032ab..e009f2e21a0 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1567,4 +1567,4 @@ zigpy-xbee==0.1.1
 zigpy==0.2.0
 
 # homeassistant.components.zoneminder
-zm-py==0.0.2
+zm-py==0.0.3

From e78f4d1b65fb4b3a448d4808543f7153091b0487 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Tue, 25 Sep 2018 08:39:35 +0200
Subject: [PATCH 271/357] Extract lovelace to it's own component (#16816)

* Extract lovelace to it's own component

* Lint

* Update comment

* Lint

* Lint
---
 homeassistant/components/frontend/__init__.py |  36 +-----
 homeassistant/components/lovelace/__init__.py |  51 ++++++++
 tests/components/frontend/test_init.py        |  58 ---------
 tests/components/lovelace/__init__.py         |   1 +
 tests/components/lovelace/test_init.py        | 120 ++++++++++++++++++
 5 files changed, 173 insertions(+), 93 deletions(-)
 create mode 100644 homeassistant/components/lovelace/__init__.py
 create mode 100644 tests/components/lovelace/__init__.py
 create mode 100644 tests/components/lovelace/test_init.py

diff --git a/homeassistant/components/frontend/__init__.py b/homeassistant/components/frontend/__init__.py
index d3d25255508..362c54fabbd 100644
--- a/homeassistant/components/frontend/__init__.py
+++ b/homeassistant/components/frontend/__init__.py
@@ -21,16 +21,14 @@ from homeassistant.components import websocket_api
 from homeassistant.config import find_config_file, load_yaml_config_file
 from homeassistant.const import CONF_NAME, EVENT_THEMES_UPDATED
 from homeassistant.core import callback
-from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.translation import async_get_translations
 from homeassistant.loader import bind_hass
-from homeassistant.util.yaml import load_yaml
 
 REQUIREMENTS = ['home-assistant-frontend==20180924.0']
 
 DOMAIN = 'frontend'
 DEPENDENCIES = ['api', 'websocket_api', 'http', 'system_log',
-                'auth', 'onboarding']
+                'auth', 'onboarding', 'lovelace']
 
 CONF_THEMES = 'themes'
 CONF_EXTRA_HTML_URL = 'extra_html_url'
@@ -108,10 +106,6 @@ SCHEMA_GET_TRANSLATIONS = websocket_api.BASE_COMMAND_MESSAGE_SCHEMA.extend({
     vol.Required('type'): WS_TYPE_GET_TRANSLATIONS,
     vol.Required('language'): str,
 })
-WS_TYPE_GET_LOVELACE_UI = 'frontend/lovelace_config'
-SCHEMA_GET_LOVELACE_UI = websocket_api.BASE_COMMAND_MESSAGE_SCHEMA.extend({
-    vol.Required('type'): WS_TYPE_GET_LOVELACE_UI,
-})
 
 
 class Panel:
@@ -208,9 +202,6 @@ async def async_setup(hass, config):
     hass.components.websocket_api.async_register_command(
         WS_TYPE_GET_TRANSLATIONS, websocket_get_translations,
         SCHEMA_GET_TRANSLATIONS)
-    hass.components.websocket_api.async_register_command(
-        WS_TYPE_GET_LOVELACE_UI, websocket_lovelace_config,
-        SCHEMA_GET_LOVELACE_UI)
     hass.http.register_view(ManifestJSONView)
 
     conf = config.get(DOMAIN, {})
@@ -530,28 +521,3 @@ def websocket_get_translations(hass, connection, msg):
         ))
 
     hass.async_add_job(send_translations())
-
-
-def websocket_lovelace_config(hass, connection, msg):
-    """Send lovelace UI config over websocket config."""
-    async def send_exp_config():
-        """Send lovelace frontend config."""
-        error = None
-        try:
-            config = await hass.async_add_job(
-                load_yaml, hass.config.path('ui-lovelace.yaml'))
-            message = websocket_api.result_message(
-                msg['id'], config
-            )
-        except FileNotFoundError:
-            error = ('file_not_found',
-                     'Could not find ui-lovelace.yaml in your config dir.')
-        except HomeAssistantError as err:
-            error = 'load_error', str(err)
-
-        if error is not None:
-            message = websocket_api.error_message(msg['id'], *error)
-
-        connection.send_message_outside(message)
-
-    hass.async_add_job(send_exp_config())
diff --git a/homeassistant/components/lovelace/__init__.py b/homeassistant/components/lovelace/__init__.py
new file mode 100644
index 00000000000..4336f50def4
--- /dev/null
+++ b/homeassistant/components/lovelace/__init__.py
@@ -0,0 +1,51 @@
+"""Lovelace UI."""
+import voluptuous as vol
+
+from homeassistant.components import websocket_api
+from homeassistant.util.yaml import load_yaml
+from homeassistant.exceptions import HomeAssistantError
+
+DOMAIN = 'lovelace'
+
+OLD_WS_TYPE_GET_LOVELACE_UI = 'frontend/lovelace_config'
+WS_TYPE_GET_LOVELACE_UI = 'lovelace/config'
+SCHEMA_GET_LOVELACE_UI = websocket_api.BASE_COMMAND_MESSAGE_SCHEMA.extend({
+    vol.Required('type'): vol.Any(WS_TYPE_GET_LOVELACE_UI,
+                                  OLD_WS_TYPE_GET_LOVELACE_UI),
+})
+
+
+async def async_setup(hass, config):
+    """Set up the Lovelace commands."""
+    # Backwards compat. Added in 0.80. Remove after 0.85
+    hass.components.websocket_api.async_register_command(
+        OLD_WS_TYPE_GET_LOVELACE_UI, websocket_lovelace_config,
+        SCHEMA_GET_LOVELACE_UI)
+
+    hass.components.websocket_api.async_register_command(
+        WS_TYPE_GET_LOVELACE_UI, websocket_lovelace_config,
+        SCHEMA_GET_LOVELACE_UI)
+
+    return True
+
+
+@websocket_api.async_response
+async def websocket_lovelace_config(hass, connection, msg):
+    """Send lovelace UI config over websocket config."""
+    error = None
+    try:
+        config = await hass.async_add_job(
+            load_yaml, hass.config.path('ui-lovelace.yaml'))
+        message = websocket_api.result_message(
+            msg['id'], config
+        )
+    except FileNotFoundError:
+        error = ('file_not_found',
+                 'Could not find ui-lovelace.yaml in your config dir.')
+    except HomeAssistantError as err:
+        error = 'load_error', str(err)
+
+    if error is not None:
+        message = websocket_api.error_message(msg['id'], *error)
+
+    connection.send_message_outside(message)
diff --git a/tests/components/frontend/test_init.py b/tests/components/frontend/test_init.py
index 17bf3d953ef..e4daf686bfe 100644
--- a/tests/components/frontend/test_init.py
+++ b/tests/components/frontend/test_init.py
@@ -5,7 +5,6 @@ from unittest.mock import patch
 
 import pytest
 
-from homeassistant.exceptions import HomeAssistantError
 from homeassistant.setup import async_setup_component
 from homeassistant.components.frontend import (
     DOMAIN, CONF_JS_VERSION, CONF_THEMES, CONF_EXTRA_HTML_URL,
@@ -281,63 +280,6 @@ async def test_get_translations(hass, hass_ws_client):
     assert msg['result'] == {'resources': {'lang': 'nl'}}
 
 
-async def test_lovelace_ui(hass, hass_ws_client):
-    """Test lovelace_ui command."""
-    await async_setup_component(hass, 'frontend')
-    client = await hass_ws_client(hass)
-
-    with patch('homeassistant.components.frontend.load_yaml',
-               return_value={'hello': 'world'}):
-        await client.send_json({
-            'id': 5,
-            'type': 'frontend/lovelace_config',
-        })
-        msg = await client.receive_json()
-
-    assert msg['id'] == 5
-    assert msg['type'] == wapi.TYPE_RESULT
-    assert msg['success']
-    assert msg['result'] == {'hello': 'world'}
-
-
-async def test_lovelace_ui_not_found(hass, hass_ws_client):
-    """Test lovelace_ui command cannot find file."""
-    await async_setup_component(hass, 'frontend')
-    client = await hass_ws_client(hass)
-
-    with patch('homeassistant.components.frontend.load_yaml',
-               side_effect=FileNotFoundError):
-        await client.send_json({
-            'id': 5,
-            'type': 'frontend/lovelace_config',
-        })
-        msg = await client.receive_json()
-
-    assert msg['id'] == 5
-    assert msg['type'] == wapi.TYPE_RESULT
-    assert msg['success'] is False
-    assert msg['error']['code'] == 'file_not_found'
-
-
-async def test_lovelace_ui_load_err(hass, hass_ws_client):
-    """Test lovelace_ui command cannot find file."""
-    await async_setup_component(hass, 'frontend')
-    client = await hass_ws_client(hass)
-
-    with patch('homeassistant.components.frontend.load_yaml',
-               side_effect=HomeAssistantError):
-        await client.send_json({
-            'id': 5,
-            'type': 'frontend/lovelace_config',
-        })
-        msg = await client.receive_json()
-
-    assert msg['id'] == 5
-    assert msg['type'] == wapi.TYPE_RESULT
-    assert msg['success'] is False
-    assert msg['error']['code'] == 'load_error'
-
-
 async def test_auth_load(mock_http_client):
     """Test auth component loaded by default."""
     resp = await mock_http_client.get('/auth/providers')
diff --git a/tests/components/lovelace/__init__.py b/tests/components/lovelace/__init__.py
new file mode 100644
index 00000000000..fea220146ca
--- /dev/null
+++ b/tests/components/lovelace/__init__.py
@@ -0,0 +1 @@
+"""Tests for Lovelace."""
diff --git a/tests/components/lovelace/test_init.py b/tests/components/lovelace/test_init.py
new file mode 100644
index 00000000000..3bb7c0675ea
--- /dev/null
+++ b/tests/components/lovelace/test_init.py
@@ -0,0 +1,120 @@
+"""Test the Lovelace initialization."""
+from unittest.mock import patch
+
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.setup import async_setup_component
+from homeassistant.components import websocket_api as wapi
+
+
+async def test_deprecated_lovelace_ui(hass, hass_ws_client):
+    """Test lovelace_ui command."""
+    await async_setup_component(hass, 'lovelace')
+    client = await hass_ws_client(hass)
+
+    with patch('homeassistant.components.lovelace.load_yaml',
+               return_value={'hello': 'world'}):
+        await client.send_json({
+            'id': 5,
+            'type': 'frontend/lovelace_config',
+        })
+        msg = await client.receive_json()
+
+    assert msg['id'] == 5
+    assert msg['type'] == wapi.TYPE_RESULT
+    assert msg['success']
+    assert msg['result'] == {'hello': 'world'}
+
+
+async def test_deprecated_lovelace_ui_not_found(hass, hass_ws_client):
+    """Test lovelace_ui command cannot find file."""
+    await async_setup_component(hass, 'lovelace')
+    client = await hass_ws_client(hass)
+
+    with patch('homeassistant.components.lovelace.load_yaml',
+               side_effect=FileNotFoundError):
+        await client.send_json({
+            'id': 5,
+            'type': 'frontend/lovelace_config',
+        })
+        msg = await client.receive_json()
+
+    assert msg['id'] == 5
+    assert msg['type'] == wapi.TYPE_RESULT
+    assert msg['success'] is False
+    assert msg['error']['code'] == 'file_not_found'
+
+
+async def test_deprecated_lovelace_ui_load_err(hass, hass_ws_client):
+    """Test lovelace_ui command cannot find file."""
+    await async_setup_component(hass, 'lovelace')
+    client = await hass_ws_client(hass)
+
+    with patch('homeassistant.components.lovelace.load_yaml',
+               side_effect=HomeAssistantError):
+        await client.send_json({
+            'id': 5,
+            'type': 'frontend/lovelace_config',
+        })
+        msg = await client.receive_json()
+
+    assert msg['id'] == 5
+    assert msg['type'] == wapi.TYPE_RESULT
+    assert msg['success'] is False
+    assert msg['error']['code'] == 'load_error'
+
+
+async def test_lovelace_ui(hass, hass_ws_client):
+    """Test lovelace_ui command."""
+    await async_setup_component(hass, 'lovelace')
+    client = await hass_ws_client(hass)
+
+    with patch('homeassistant.components.lovelace.load_yaml',
+               return_value={'hello': 'world'}):
+        await client.send_json({
+            'id': 5,
+            'type': 'lovelace/config',
+        })
+        msg = await client.receive_json()
+
+    assert msg['id'] == 5
+    assert msg['type'] == wapi.TYPE_RESULT
+    assert msg['success']
+    assert msg['result'] == {'hello': 'world'}
+
+
+async def test_lovelace_ui_not_found(hass, hass_ws_client):
+    """Test lovelace_ui command cannot find file."""
+    await async_setup_component(hass, 'lovelace')
+    client = await hass_ws_client(hass)
+
+    with patch('homeassistant.components.lovelace.load_yaml',
+               side_effect=FileNotFoundError):
+        await client.send_json({
+            'id': 5,
+            'type': 'lovelace/config',
+        })
+        msg = await client.receive_json()
+
+    assert msg['id'] == 5
+    assert msg['type'] == wapi.TYPE_RESULT
+    assert msg['success'] is False
+    assert msg['error']['code'] == 'file_not_found'
+
+
+async def test_lovelace_ui_load_err(hass, hass_ws_client):
+    """Test lovelace_ui command cannot find file."""
+    await async_setup_component(hass, 'lovelace')
+    client = await hass_ws_client(hass)
+
+    with patch('homeassistant.components.lovelace.load_yaml',
+               side_effect=HomeAssistantError):
+        await client.send_json({
+            'id': 5,
+            'type': 'lovelace/config',
+        })
+        msg = await client.receive_json()
+
+    assert msg['id'] == 5
+    assert msg['type'] == wapi.TYPE_RESULT
+    assert msg['success'] is False
+    assert msg['error']['code'] == 'load_error'

From 42790d3e970ebe82c4a5a4358ed0ae7136f88a48 Mon Sep 17 00:00:00 2001
From: emontnemery <erik@montnemery.com>
Date: Tue, 25 Sep 2018 08:44:14 +0200
Subject: [PATCH 272/357] Remove discovered MQTT alarm_control_panel device
 when discovery topic is cleared (#16825)

---
 .../components/alarm_control_panel/mqtt.py    | 28 +++++++++++++------
 tests/components/mqtt/test_discovery.py       | 25 +++++++++++++++++
 2 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/homeassistant/components/alarm_control_panel/mqtt.py b/homeassistant/components/alarm_control_panel/mqtt.py
index e5ad54c4147..e36765b2460 100644
--- a/homeassistant/components/alarm_control_panel/mqtt.py
+++ b/homeassistant/components/alarm_control_panel/mqtt.py
@@ -18,9 +18,9 @@ from homeassistant.const import (
     STATE_ALARM_PENDING, STATE_ALARM_TRIGGERED, STATE_UNKNOWN,
     CONF_NAME, CONF_CODE)
 from homeassistant.components.mqtt import (
-    CONF_AVAILABILITY_TOPIC, CONF_STATE_TOPIC, CONF_COMMAND_TOPIC,
-    CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE, CONF_QOS,
-    CONF_RETAIN, MqttAvailability)
+    ATTR_DISCOVERY_HASH, CONF_AVAILABILITY_TOPIC, CONF_STATE_TOPIC,
+    CONF_COMMAND_TOPIC, CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE,
+    CONF_QOS, CONF_RETAIN, MqttAvailability, MqttDiscoveryUpdate)
 import homeassistant.helpers.config_validation as cv
 
 _LOGGER = logging.getLogger(__name__)
@@ -53,6 +53,10 @@ def async_setup_platform(hass, config, async_add_entities,
     if discovery_info is not None:
         config = PLATFORM_SCHEMA(discovery_info)
 
+    discovery_hash = None
+    if discovery_info is not None and ATTR_DISCOVERY_HASH in discovery_info:
+        discovery_hash = discovery_info[ATTR_DISCOVERY_HASH]
+
     async_add_entities([MqttAlarm(
         config.get(CONF_NAME),
         config.get(CONF_STATE_TOPIC),
@@ -65,18 +69,22 @@ def async_setup_platform(hass, config, async_add_entities,
         config.get(CONF_CODE),
         config.get(CONF_AVAILABILITY_TOPIC),
         config.get(CONF_PAYLOAD_AVAILABLE),
-        config.get(CONF_PAYLOAD_NOT_AVAILABLE))])
+        config.get(CONF_PAYLOAD_NOT_AVAILABLE),
+        discovery_hash,)])
 
 
-class MqttAlarm(MqttAvailability, alarm.AlarmControlPanel):
+class MqttAlarm(MqttAvailability, MqttDiscoveryUpdate,
+                alarm.AlarmControlPanel):
     """Representation of a MQTT alarm status."""
 
     def __init__(self, name, state_topic, command_topic, qos, retain,
                  payload_disarm, payload_arm_home, payload_arm_away, code,
-                 availability_topic, payload_available, payload_not_available):
+                 availability_topic, payload_available, payload_not_available,
+                 discovery_hash):
         """Init the MQTT Alarm Control Panel."""
-        super().__init__(availability_topic, qos, payload_available,
-                         payload_not_available)
+        MqttAvailability.__init__(self, availability_topic, qos,
+                                  payload_available, payload_not_available)
+        MqttDiscoveryUpdate.__init__(self, discovery_hash)
         self._state = STATE_UNKNOWN
         self._name = name
         self._state_topic = state_topic
@@ -87,11 +95,13 @@ class MqttAlarm(MqttAvailability, alarm.AlarmControlPanel):
         self._payload_arm_home = payload_arm_home
         self._payload_arm_away = payload_arm_away
         self._code = code
+        self._discovery_hash = discovery_hash
 
     @asyncio.coroutine
     def async_added_to_hass(self):
         """Subscribe mqtt events."""
-        yield from super().async_added_to_hass()
+        yield from MqttAvailability.async_added_to_hass(self)
+        yield from MqttDiscoveryUpdate.async_added_to_hass(self)
 
         @callback
         def message_received(topic, payload, qos):
diff --git a/tests/components/mqtt/test_discovery.py b/tests/components/mqtt/test_discovery.py
index 6de277eb48d..ee3460d46b5 100644
--- a/tests/components/mqtt/test_discovery.py
+++ b/tests/components/mqtt/test_discovery.py
@@ -209,3 +209,28 @@ def test_discovery_removal(hass, mqtt_mock, caplog):
 
     state = hass.states.get('switch.beer')
     assert state is None
+
+
+@asyncio.coroutine
+def test_discovery_removal_alarm(hass, mqtt_mock, caplog):
+    """Test removal of discovered alarm_control_panel."""
+    yield from async_start(hass, 'homeassistant', {})
+    data = (
+        '{ "name": "Beer",'
+        '  "status_topic": "test_topic",'
+        '  "command_topic": "test_topic" }'
+    )
+    async_fire_mqtt_message(hass,
+                            'homeassistant/alarm_control_panel/bla/config',
+                            data)
+    yield from hass.async_block_till_done()
+    state = hass.states.get('alarm_control_panel.beer')
+    assert state is not None
+    assert state.name == 'Beer'
+    async_fire_mqtt_message(hass,
+                            'homeassistant/alarm_control_panel/bla/config',
+                            '')
+    yield from hass.async_block_till_done()
+    yield from hass.async_block_till_done()
+    state = hass.states.get('alarm_control_panel.beer')
+    assert state is None

From 90197b6ec983bd5be5311d0410379bc5d17b1631 Mon Sep 17 00:00:00 2001
From: emontnemery <erik@montnemery.com>
Date: Tue, 25 Sep 2018 09:19:04 +0200
Subject: [PATCH 273/357] Remove discovered MQTT light device when discovery
 topic is cleared (#16824)

---
 homeassistant/components/light/mqtt.py  | 24 ++++++++++------
 tests/components/mqtt/test_discovery.py | 37 +++++++++++++++++++++++--
 2 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/homeassistant/components/light/mqtt.py b/homeassistant/components/light/mqtt.py
index 64331411f7f..10227bdc3b6 100644
--- a/homeassistant/components/light/mqtt.py
+++ b/homeassistant/components/light/mqtt.py
@@ -19,9 +19,9 @@ from homeassistant.const import (
     CONF_OPTIMISTIC, CONF_PAYLOAD_OFF, CONF_PAYLOAD_ON, STATE_ON,
     CONF_RGB, CONF_STATE, CONF_VALUE_TEMPLATE, CONF_WHITE_VALUE, CONF_XY)
 from homeassistant.components.mqtt import (
-    CONF_AVAILABILITY_TOPIC, CONF_COMMAND_TOPIC, CONF_PAYLOAD_AVAILABLE,
-    CONF_PAYLOAD_NOT_AVAILABLE, CONF_QOS, CONF_RETAIN, CONF_STATE_TOPIC,
-    MqttAvailability)
+    ATTR_DISCOVERY_HASH, CONF_AVAILABILITY_TOPIC, CONF_COMMAND_TOPIC,
+    CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE, CONF_QOS, CONF_RETAIN,
+    CONF_STATE_TOPIC, MqttAvailability, MqttDiscoveryUpdate)
 from homeassistant.helpers.restore_state import async_get_last_state
 import homeassistant.helpers.config_validation as cv
 import homeassistant.util.color as color_util
@@ -111,6 +111,10 @@ async def async_setup_platform(hass, config, async_add_entities,
     config.setdefault(
         CONF_STATE_VALUE_TEMPLATE, config.get(CONF_VALUE_TEMPLATE))
 
+    discovery_hash = None
+    if discovery_info is not None and ATTR_DISCOVERY_HASH in discovery_info:
+        discovery_hash = discovery_info[ATTR_DISCOVERY_HASH]
+
     async_add_entities([MqttLight(
         config.get(CONF_NAME),
         config.get(CONF_UNIQUE_ID),
@@ -156,19 +160,21 @@ async def async_setup_platform(hass, config, async_add_entities,
         config.get(CONF_AVAILABILITY_TOPIC),
         config.get(CONF_PAYLOAD_AVAILABLE),
         config.get(CONF_PAYLOAD_NOT_AVAILABLE),
+        discovery_hash,
     )])
 
 
-class MqttLight(MqttAvailability, Light):
+class MqttLight(MqttAvailability, MqttDiscoveryUpdate, Light):
     """Representation of a MQTT light."""
 
     def __init__(self, name, unique_id, effect_list, topic, templates,
                  qos, retain, payload, optimistic, brightness_scale,
                  white_value_scale, on_command_type, availability_topic,
-                 payload_available, payload_not_available):
+                 payload_available, payload_not_available, discovery_hash):
         """Initialize MQTT light."""
-        super().__init__(availability_topic, qos, payload_available,
-                         payload_not_available)
+        MqttAvailability.__init__(self, availability_topic, qos,
+                                  payload_available, payload_not_available)
+        MqttDiscoveryUpdate.__init__(self, discovery_hash)
         self._name = name
         self._unique_id = unique_id
         self._effect_list = effect_list
@@ -216,10 +222,12 @@ class MqttLight(MqttAvailability, Light):
             SUPPORT_WHITE_VALUE)
         self._supported_features |= (
             topic[CONF_XY_COMMAND_TOPIC] is not None and SUPPORT_COLOR)
+        self._discovery_hash = discovery_hash
 
     async def async_added_to_hass(self):
         """Subscribe to MQTT events."""
-        await super().async_added_to_hass()
+        await MqttAvailability.async_added_to_hass(self)
+        await MqttDiscoveryUpdate.async_added_to_hass(self)
 
         templates = {}
         for key, tpl in list(self._templates.items()):
diff --git a/tests/components/mqtt/test_discovery.py b/tests/components/mqtt/test_discovery.py
index ee3460d46b5..9e334719a36 100644
--- a/tests/components/mqtt/test_discovery.py
+++ b/tests/components/mqtt/test_discovery.py
@@ -212,25 +212,58 @@ def test_discovery_removal(hass, mqtt_mock, caplog):
 
 
 @asyncio.coroutine
-def test_discovery_removal_alarm(hass, mqtt_mock, caplog):
-    """Test removal of discovered alarm_control_panel."""
+def test_discovery_removal_light(hass, mqtt_mock, caplog):
+    """Test removal of discovered light."""
     yield from async_start(hass, 'homeassistant', {})
+
     data = (
         '{ "name": "Beer",'
         '  "status_topic": "test_topic",'
         '  "command_topic": "test_topic" }'
     )
+
+    async_fire_mqtt_message(hass, 'homeassistant/light/bla/config',
+                            data)
+    yield from hass.async_block_till_done()
+
+    state = hass.states.get('light.beer')
+    assert state is not None
+    assert state.name == 'Beer'
+
+    async_fire_mqtt_message(hass, 'homeassistant/light/bla/config',
+                            '')
+    yield from hass.async_block_till_done()
+    yield from hass.async_block_till_done()
+
+    state = hass.states.get('light.beer')
+    assert state is None
+
+
+@asyncio.coroutine
+def test_discovery_removal_alarm(hass, mqtt_mock, caplog):
+    """Test removal of discovered alarm_control_panel."""
+    yield from async_start(hass, 'homeassistant', {})
+
+    data = (
+        '{ "name": "Beer",'
+        '  "status_topic": "test_topic",'
+        '  "command_topic": "test_topic" }'
+    )
+
     async_fire_mqtt_message(hass,
                             'homeassistant/alarm_control_panel/bla/config',
                             data)
     yield from hass.async_block_till_done()
+
     state = hass.states.get('alarm_control_panel.beer')
     assert state is not None
     assert state.name == 'Beer'
+
     async_fire_mqtt_message(hass,
                             'homeassistant/alarm_control_panel/bla/config',
                             '')
     yield from hass.async_block_till_done()
     yield from hass.async_block_till_done()
+
     state = hass.states.get('alarm_control_panel.beer')
     assert state is None

From 069b819679c21226f9bf873eb5be9fdc8e3a97f4 Mon Sep 17 00:00:00 2001
From: sander76 <s.teunissen@gmail.com>
Date: Tue, 25 Sep 2018 10:15:03 +0200
Subject: [PATCH 274/357] Add unique_id to homematic_cloud (#16828)

* add unique_id

* add docstring and trigger travis
---
 homeassistant/components/homematicip_cloud/device.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/homeassistant/components/homematicip_cloud/device.py b/homeassistant/components/homematicip_cloud/device.py
index 9c335befda4..6a4f958387e 100644
--- a/homeassistant/components/homematicip_cloud/device.py
+++ b/homeassistant/components/homematicip_cloud/device.py
@@ -61,6 +61,11 @@ class HomematicipGenericDevice(Entity):
         """Device available."""
         return not self._device.unreach
 
+    @property
+    def unique_id(self):
+        """Return a unique ID."""
+        return "{}_{}".format(self.__class__.__name__, self._device.id)
+
     @property
     def icon(self):
         """Return the icon."""

From 4f9fc9b39fb08c5bc02d3025be875b02db75e60f Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Tue, 25 Sep 2018 10:16:30 +0200
Subject: [PATCH 275/357] Don't create entity registry in tests (#16838)

---
 tests/components/zwave/test_init.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/components/zwave/test_init.py b/tests/components/zwave/test_init.py
index 1857d14ad84..bc96c90d50a 100644
--- a/tests/components/zwave/test_init.py
+++ b/tests/components/zwave/test_init.py
@@ -749,9 +749,11 @@ class TestZWaveDeviceEntityValues(unittest.TestCase):
         self.device_config = {'mock_component.registry_id': {
             zwave.CONF_IGNORED: True
         }}
-        self.registry.async_get_or_create(
-            'mock_component', zwave.DOMAIN, '567-1000',
-            suggested_object_id='registry_id')
+        with patch.object(self.registry, 'async_schedule_save'):
+            self.registry.async_get_or_create(
+                'mock_component', zwave.DOMAIN, '567-1000',
+                suggested_object_id='registry_id')
+
         zwave.ZWaveDeviceEntityValues(
             hass=self.hass,
             schema=self.mock_schema,

From 03bce84c32e4d1962e07c39f0afab2c78971efda Mon Sep 17 00:00:00 2001
From: GP8x <GP8x@users.noreply.github.com>
Date: Tue, 25 Sep 2018 10:14:42 +0100
Subject: [PATCH 276/357] Add additional Netatmo public data sensors (#16671)

Update deps
---
 homeassistant/components/netatmo.py           |   2 +-
 .../components/sensor/netatmo_public.py       | 112 ++++++++++++------
 requirements_all.txt                          |   2 +-
 3 files changed, 80 insertions(+), 36 deletions(-)

diff --git a/homeassistant/components/netatmo.py b/homeassistant/components/netatmo.py
index 59b0a64f6e9..d8924c6c301 100644
--- a/homeassistant/components/netatmo.py
+++ b/homeassistant/components/netatmo.py
@@ -16,7 +16,7 @@ from homeassistant.helpers import discovery
 import homeassistant.helpers.config_validation as cv
 from homeassistant.util import Throttle
 
-REQUIREMENTS = ['pyatmo==1.1.1']
+REQUIREMENTS = ['pyatmo==1.2']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/sensor/netatmo_public.py b/homeassistant/components/sensor/netatmo_public.py
index d1c6e03d1b0..59b0b317ed1 100644
--- a/homeassistant/components/sensor/netatmo_public.py
+++ b/homeassistant/components/sensor/netatmo_public.py
@@ -10,7 +10,9 @@ import logging
 import voluptuous as vol
 
 from homeassistant.components.sensor import PLATFORM_SCHEMA
-from homeassistant.const import (CONF_NAME, CONF_TYPE)
+from homeassistant.const import (
+    CONF_NAME, CONF_MODE, CONF_MONITORED_CONDITIONS, TEMP_CELSIUS,
+    DEVICE_CLASS_TEMPERATURE, DEVICE_CLASS_HUMIDITY, STATE_UNKNOWN)
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity import Entity
 from homeassistant.util import Throttle
@@ -26,13 +28,22 @@ CONF_LAT_SW = 'lat_sw'
 CONF_LON_SW = 'lon_sw'
 
 DEFAULT_NAME = 'Netatmo Public Data'
-DEFAULT_TYPE = 'max'
-SENSOR_TYPES = {'max', 'avg'}
+DEFAULT_MODE = 'avg'
+MODE_TYPES = {'max', 'avg'}
+
+SENSOR_TYPES = {
+    'temperature': ['Temperature', TEMP_CELSIUS, 'mdi:thermometer',
+                    DEVICE_CLASS_TEMPERATURE],
+    'pressure': ['Pressure', 'mbar', 'mdi:gauge', None],
+    'humidity': ['Humidity', '%', 'mdi:water-percent', DEVICE_CLASS_HUMIDITY],
+    'rain': ['Rain', 'mm', 'mdi:weather-rainy', None],
+    'windstrength': ['Wind Strength', 'km/h', 'mdi:weather-windy', None],
+    'guststrength': ['Gust Strength', 'km/h', 'mdi:weather-windy', None],
+}
 
 # NetAtmo Data is uploaded to server every 10 minutes
 MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=600)
 
-
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Required(CONF_AREAS): vol.All(cv.ensure_list, [
         {
@@ -40,9 +51,9 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
             vol.Required(CONF_LAT_SW): cv.latitude,
             vol.Required(CONF_LON_NE): cv.longitude,
             vol.Required(CONF_LON_SW): cv.longitude,
-            vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-            vol.Optional(CONF_TYPE, default=DEFAULT_TYPE):
-                vol.In(SENSOR_TYPES)
+            vol.Required(CONF_MONITORED_CONDITIONS): [vol.In(SENSOR_TYPES)],
+            vol.Optional(CONF_MODE, default=DEFAULT_MODE): vol.In(MODE_TYPES),
+            vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string
         }
     ]),
 })
@@ -59,20 +70,29 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
                                  lat_ne=area_conf.get(CONF_LAT_NE),
                                  lon_ne=area_conf.get(CONF_LON_NE),
                                  lat_sw=area_conf.get(CONF_LAT_SW),
-                                 lon_sw=area_conf.get(CONF_LON_SW),
-                                 calculation=area_conf.get(CONF_TYPE))
-        sensors.append(NetatmoPublicSensor(area_conf.get(CONF_NAME), data))
-    add_entities(sensors)
+                                 lon_sw=area_conf.get(CONF_LON_SW))
+        for sensor_type in area_conf.get(CONF_MONITORED_CONDITIONS):
+            sensors.append(NetatmoPublicSensor(area_conf.get(CONF_NAME),
+                                               data, sensor_type,
+                                               area_conf.get(CONF_MODE)))
+    add_entities(sensors, True)
 
 
 class NetatmoPublicSensor(Entity):
     """Represent a single sensor in a Netatmo."""
 
-    def __init__(self, name, data):
+    def __init__(self, area_name, data, sensor_type, mode):
         """Initialize the sensor."""
         self.netatmo_data = data
-        self._name = name
+        self.type = sensor_type
+        self._mode = mode
+        self._name = '{} {}'.format(area_name,
+                                    SENSOR_TYPES[self.type][0])
+        self._area_name = area_name
         self._state = None
+        self._device_class = SENSOR_TYPES[self.type][3]
+        self._icon = SENSOR_TYPES[self.type][2]
+        self._unit_of_measurement = SENSOR_TYPES[self.type][1]
 
     @property
     def name(self):
@@ -82,33 +102,63 @@ class NetatmoPublicSensor(Entity):
     @property
     def icon(self):
         """Icon to use in the frontend."""
-        return 'mdi:weather-rainy'
+        return self._icon
 
     @property
     def device_class(self):
         """Return the device class of the sensor."""
-        return None
+        return self._device_class
 
     @property
     def state(self):
-        """Return true if binary sensor is on."""
+        """Return the state of the device."""
         return self._state
 
     @property
     def unit_of_measurement(self):
         """Return the unit of measurement of this entity."""
-        return 'mm'
+        return self._unit_of_measurement
 
     def update(self):
         """Get the latest data from NetAtmo API and updates the states."""
         self.netatmo_data.update()
-        self._state = self.netatmo_data.data
+
+        if self.netatmo_data.data is None:
+            _LOGGER.warning("No data found for %s", self._name)
+            self._state = STATE_UNKNOWN
+            return
+
+        data = None
+
+        if self.type == 'temperature':
+            data = self.netatmo_data.data.getLatestTemperatures()
+        elif self.type == 'pressure':
+            data = self.netatmo_data.data.getLatestPressures()
+        elif self.type == 'humidity':
+            data = self.netatmo_data.data.getLatestHumidities()
+        elif self.type == 'rain':
+            data = self.netatmo_data.data.getLatestRain()
+        elif self.type == 'windstrength':
+            data = self.netatmo_data.data.getLatestWindStrengths()
+        elif self.type == 'guststrength':
+            data = self.netatmo_data.data.getLatestGustStrengths()
+
+        if not data:
+            _LOGGER.warning("No station provides %s data in the area %s",
+                            self.type, self._area_name)
+            self._state = STATE_UNKNOWN
+            return
+
+        if self._mode == 'avg':
+            self._state = round(sum(data.values()) / len(data), 1)
+        elif self._mode == 'max':
+            self._state = max(data.values())
 
 
 class NetatmoPublicData:
     """Get the latest data from NetAtmo."""
 
-    def __init__(self, auth, lat_ne, lon_ne, lat_sw, lon_sw, calculation):
+    def __init__(self, auth, lat_ne, lon_ne, lat_sw, lon_sw):
         """Initialize the data object."""
         self.auth = auth
         self.data = None
@@ -116,26 +166,20 @@ class NetatmoPublicData:
         self.lon_ne = lon_ne
         self.lat_sw = lat_sw
         self.lon_sw = lon_sw
-        self.calculation = calculation
 
     @Throttle(MIN_TIME_BETWEEN_UPDATES)
     def update(self):
         """Request an update from the Netatmo API."""
         import pyatmo
-        raindata = pyatmo.PublicData(self.auth,
-                                     LAT_NE=self.lat_ne,
-                                     LON_NE=self.lon_ne,
-                                     LAT_SW=self.lat_sw,
-                                     LON_SW=self.lon_sw,
-                                     required_data_type="rain")
+        data = pyatmo.PublicData(self.auth,
+                                 LAT_NE=self.lat_ne,
+                                 LON_NE=self.lon_ne,
+                                 LAT_SW=self.lat_sw,
+                                 LON_SW=self.lon_sw,
+                                 filtering=True)
 
-        if raindata.CountStationInArea() == 0:
-            _LOGGER.warning('No Rain Station available in this area.')
+        if data.CountStationInArea() == 0:
+            _LOGGER.warning('No Stations available in this area.')
             return
 
-        raindata_live = raindata.getLive()
-
-        if self.calculation == 'avg':
-            self.data = sum(raindata_live.values()) / len(raindata_live)
-        else:
-            self.data = max(raindata_live.values())
+        self.data = data
diff --git a/requirements_all.txt b/requirements_all.txt
index e009f2e21a0..cfb17e64a7a 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -794,7 +794,7 @@ pyasn1-modules==0.1.5
 pyasn1==0.3.7
 
 # homeassistant.components.netatmo
-pyatmo==1.1.1
+pyatmo==1.2
 
 # homeassistant.components.apple_tv
 pyatv==0.3.10

From 4a4c07ac1b209471ebb3467c7a884c29e2f5edd6 Mon Sep 17 00:00:00 2001
From: Daniel Winks <daniel.winks@gmail.com>
Date: Tue, 25 Sep 2018 05:18:23 -0400
Subject: [PATCH 277/357] GitLab-CI sensor integration addition. (#16561)

* Updates to GitLab Sensor

* Updates to GitLab_CI sensor.

* Added GitLab_CI sensor.

* Updated interval to a more appropriate 300 seconds.

* Added GitLab_CI.py to ommitted files.

* Initial refactor to use python-gitlab PyPI module.

* Fixes to dict parsing.

* Updated required packages for GitLab_CI requirements.

* Updates and refactoring to more closely align with Home-Assistant standards.

* Moved import to init, removed unreachable requests exception.

* Removed references to STATE_UNKNOWN and replaced with None

* Removed extra whitespace

* Changed PLATFORM_SCHEMA and renamed add_devices.

Changed PLATFORM_SCHEMA to use SCAN_INTERVAL and add_devices to add_entities

* Added configurable name, changed logger and removed cruft.

* Removed _status to use _state instead, as both held same value.

* Fixed ATTR_BUILD_BRANCH, removed more extraneous cruft.

* Changed required config keys to dict[key] format.

* Removed extraneous CONF_SCAN_INTERVAL as it's already defined.
---
 .coveragerc                                  |   1 +
 homeassistant/components/sensor/gitlab_ci.py | 174 +++++++++++++++++++
 requirements_all.txt                         |   3 +
 3 files changed, 178 insertions(+)
 create mode 100644 homeassistant/components/sensor/gitlab_ci.py

diff --git a/.coveragerc b/.coveragerc
index a8d7d89544d..defbc0022bd 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -679,6 +679,7 @@ omit =
     homeassistant/components/sensor/fritzbox_netmonitor.py
     homeassistant/components/sensor/gearbest.py
     homeassistant/components/sensor/geizhals.py
+    homeassistant/components/sensor/gitlab_ci.py
     homeassistant/components/sensor/gitter.py
     homeassistant/components/sensor/glances.py
     homeassistant/components/sensor/google_travel_time.py
diff --git a/homeassistant/components/sensor/gitlab_ci.py b/homeassistant/components/sensor/gitlab_ci.py
new file mode 100644
index 00000000000..ceb5f75cace
--- /dev/null
+++ b/homeassistant/components/sensor/gitlab_ci.py
@@ -0,0 +1,174 @@
+"""Module for retrieving latest GitLab CI job information."""
+from datetime import timedelta
+import logging
+
+import voluptuous as vol
+
+from homeassistant.components.sensor import PLATFORM_SCHEMA
+from homeassistant.const import (
+    ATTR_ATTRIBUTION, CONF_NAME, CONF_SCAN_INTERVAL, CONF_TOKEN, CONF_URL)
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.entity import Entity
+from homeassistant.util import Throttle
+
+CONF_GITLAB_ID = 'gitlab_id'
+CONF_ATTRIBUTION = "Information provided by https://gitlab.com/"
+
+ICON_HAPPY = 'mdi:emoticon-happy'
+ICON_SAD = 'mdi:emoticon-happy'
+ICON_OTHER = 'mdi:git'
+
+ATTR_BUILD_ID = 'build id'
+ATTR_BUILD_STATUS = 'build_status'
+ATTR_BUILD_STARTED = 'build_started'
+ATTR_BUILD_FINISHED = 'build_finished'
+ATTR_BUILD_DURATION = 'build_duration'
+ATTR_BUILD_COMMIT_ID = 'commit id'
+ATTR_BUILD_COMMIT_DATE = 'commit date'
+ATTR_BUILD_BRANCH = 'build branch'
+
+SCAN_INTERVAL = timedelta(seconds=300)
+
+_LOGGER = logging.getLogger(__name__)
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_TOKEN): cv.string,
+    vol.Required(CONF_GITLAB_ID): cv.string,
+    vol.Optional(CONF_NAME, default='GitLab CI Status'): cv.string,
+    vol.Optional(CONF_URL, default='https://gitlab.com'): cv.string
+})
+
+REQUIREMENTS = ['python-gitlab==1.6.0']
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Sensor platform setup."""
+    _name = config.get(CONF_NAME)
+    _interval = config.get(CONF_SCAN_INTERVAL, SCAN_INTERVAL)
+    _url = config.get(CONF_URL)
+
+    _gitlab_data = GitLabData(
+        priv_token=config[CONF_TOKEN],
+        gitlab_id=config[CONF_GITLAB_ID],
+        interval=_interval,
+        url=_url
+    )
+
+    add_entities([GitLabSensor(_gitlab_data, _name)], True)
+
+
+class GitLabSensor(Entity):
+    """Representation of a Sensor."""
+
+    def __init__(self, gitlab_data, name):
+        """Initialize the sensor."""
+        self._available = False
+        self._state = None
+        self._started_at = None
+        self._finished_at = None
+        self._duration = None
+        self._commit_id = None
+        self._commit_date = None
+        self._build_id = None
+        self._branch = None
+        self._gitlab_data = gitlab_data
+        self._name = name
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return self._name
+
+    @property
+    def state(self):
+        """Return the state of the sensor."""
+        return self._state
+
+    @property
+    def available(self):
+        """Return True if entity is available."""
+        return self._available
+
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes."""
+        return {
+            ATTR_ATTRIBUTION: CONF_ATTRIBUTION,
+            ATTR_BUILD_STATUS: self._state,
+            ATTR_BUILD_STARTED: self._started_at,
+            ATTR_BUILD_FINISHED: self._finished_at,
+            ATTR_BUILD_DURATION: self._duration,
+            ATTR_BUILD_COMMIT_ID: self._commit_id,
+            ATTR_BUILD_COMMIT_DATE: self._commit_date,
+            ATTR_BUILD_ID: self._build_id,
+            ATTR_BUILD_BRANCH: self._branch
+        }
+
+    @property
+    def icon(self):
+        """Return the icon to use in the frontend."""
+        if self._state == 'success':
+            return ICON_HAPPY
+        if self._state == 'failed':
+            return ICON_SAD
+        return ICON_OTHER
+
+    def update(self):
+        """Collect updated data from GitLab API."""
+        self._gitlab_data.update()
+
+        self._state = self._gitlab_data.status
+        self._started_at = self._gitlab_data.started_at
+        self._finished_at = self._gitlab_data.finished_at
+        self._duration = self._gitlab_data.duration
+        self._commit_id = self._gitlab_data.commit_id
+        self._commit_date = self._gitlab_data.commit_date
+        self._build_id = self._gitlab_data.build_id
+        self._branch = self._gitlab_data.branch
+        self._available = self._gitlab_data.available
+
+
+class GitLabData():
+    """GitLab Data object."""
+
+    def __init__(self, gitlab_id, priv_token, interval, url):
+        """Fetch data from GitLab API for most recent CI job."""
+        import gitlab
+        self._gitlab_id = gitlab_id
+        self._gitlab = gitlab.Gitlab(
+            url, private_token=priv_token, per_page=1)
+        self._gitlab.auth()
+        self._gitlab_exceptions = gitlab.exceptions
+        self.update = Throttle(interval)(self._update)
+
+        self.available = False
+        self.status = None
+        self.started_at = None
+        self.finished_at = None
+        self.duration = None
+        self.commit_id = None
+        self.commit_date = None
+        self.build_id = None
+        self.branch = None
+
+    def _update(self):
+        try:
+            _projects = self._gitlab.projects.get(self._gitlab_id)
+            _last_pipeline = _projects.pipelines.list(page=1)[0]
+            _last_job = _last_pipeline.jobs.list(page=1)[0]
+            self.status = _last_pipeline.attributes.get('status')
+            self.started_at = _last_job.attributes.get('started_at')
+            self.finished_at = _last_job.attributes.get('finished_at')
+            self.duration = _last_job.attributes.get('duration')
+            _commit = _last_job.attributes.get('commit')
+            self.commit_id = _commit.get('id')
+            self.commit_date = _commit.get('committed_date')
+            self.build_id = _last_job.attributes.get('id')
+            self.branch = _last_job.attributes.get('ref')
+            self.available = True
+        except self._gitlab_exceptions.GitlabAuthenticationError as erra:
+            _LOGGER.error("Authentication Error: %s", erra)
+            self.available = False
+        except self._gitlab_exceptions.GitlabGetError as errg:
+            _LOGGER.error("Project Not Found: %s", errg)
+            self.available = False
diff --git a/requirements_all.txt b/requirements_all.txt
index cfb17e64a7a..40d4442dee2 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1114,6 +1114,9 @@ python-forecastio==1.4.0
 # homeassistant.components.gc100
 python-gc100==1.0.3a
 
+# homeassistant.components.sensor.gitlab_ci
+python-gitlab==1.6.0
+
 # homeassistant.components.sensor.hp_ilo
 python-hpilo==3.9
 

From 2b2502c91c8fbd1f35c0f1654e5fb7776c8cc5b7 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Tue, 25 Sep 2018 11:57:32 +0200
Subject: [PATCH 278/357] Support old tradfri config format (#16841)

---
 .../components/tradfri/config_flow.py         |  4 ++-
 tests/components/tradfri/test_config_flow.py  | 31 +++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/tradfri/config_flow.py b/homeassistant/components/tradfri/config_flow.py
index 4de43c79e0c..8d8f9af79e6 100644
--- a/homeassistant/components/tradfri/config_flow.py
+++ b/homeassistant/components/tradfri/config_flow.py
@@ -95,7 +95,9 @@ class FlowHandler(config_entries.ConfigFlow):
 
         try:
             data = await get_gateway_info(
-                self.hass, user_input['host'], user_input['identity'],
+                self.hass, user_input['host'],
+                # Old config format had a fixed identity
+                user_input.get('identity', 'homeassistant'),
                 user_input['key'])
 
             data[CONF_IMPORT_GROUPS] = user_input[CONF_IMPORT_GROUPS]
diff --git a/tests/components/tradfri/test_config_flow.py b/tests/components/tradfri/test_config_flow.py
index 4650fb5d9bc..580e9580d76 100644
--- a/tests/components/tradfri/test_config_flow.py
+++ b/tests/components/tradfri/test_config_flow.py
@@ -154,3 +154,34 @@ async def test_import_connection(hass, mock_gateway_info, mock_entry_setup):
 
     assert len(mock_gateway_info.mock_calls) == 1
     assert len(mock_entry_setup.mock_calls) == 1
+
+
+async def test_import_connection_legacy(hass, mock_gateway_info,
+                                        mock_entry_setup):
+    """Test a connection via import."""
+    mock_gateway_info.side_effect = \
+        lambda hass, host, identity, key: mock_coro({
+            'host': host,
+            'identity': identity,
+            'key': key,
+            'gateway_id': 'mock-gateway'
+        })
+
+    result = await hass.config_entries.flow.async_init(
+        'tradfri', context={'source': 'import'}, data={
+            'host': '123.123.123.123',
+            'key': 'mock-key',
+            'import_groups': True
+        })
+
+    assert result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result['result'].data == {
+        'host': '123.123.123.123',
+        'gateway_id': 'mock-gateway',
+        'identity': 'homeassistant',
+        'key': 'mock-key',
+        'import_groups': True
+    }
+
+    assert len(mock_gateway_info.mock_calls) == 1
+    assert len(mock_entry_setup.mock_calls) == 1

From f4974f58fee79d5093bccacc118d19a35f9cbba9 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Tue, 25 Sep 2018 12:21:11 +0200
Subject: [PATCH 279/357] Config entry update data (#16843)

* WIP

* Allow updating data of a config entry
---
 homeassistant/config_entries.py |  6 ++++++
 tests/test_config_entries.py    | 17 +++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/homeassistant/config_entries.py b/homeassistant/config_entries.py
index 7763594e0e1..a2a9ce78989 100644
--- a/homeassistant/config_entries.py
+++ b/homeassistant/config_entries.py
@@ -379,6 +379,12 @@ class ConfigEntries:
                                            CONN_CLASS_UNKNOWN))
             for entry in config['entries']]
 
+    @callback
+    def async_update_entry(self, entry, *, data):
+        """Update a config entry."""
+        entry.data = data
+        self._async_schedule_save()
+
     async def async_forward_entry_setup(self, entry, component):
         """Forward the setup of an entry to a different component.
 
diff --git a/tests/test_config_entries.py b/tests/test_config_entries.py
index 57d63eb8271..afb13d71c2e 100644
--- a/tests/test_config_entries.py
+++ b/tests/test_config_entries.py
@@ -315,3 +315,20 @@ async def test_loading_default_config(hass):
         await manager.async_load()
 
     assert len(manager.async_entries()) == 0
+
+
+async def test_updating_entry_data(manager):
+    """Test that we can update an entry data."""
+    entry = MockConfigEntry(
+        domain='test',
+        data={'first': True},
+    )
+    entry.add_to_manager(manager)
+
+    manager.async_update_entry(entry, data={
+        'second': True
+    })
+
+    assert entry.data == {
+        'second': True
+    }

From e4898bb05c88b94d1a11008e5a323486055898ad Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Tue, 25 Sep 2018 12:22:14 +0200
Subject: [PATCH 280/357] Allow MQTT discovery (#16842)

---
 .../components/mqtt/.translations/en.json     |  1 +
 homeassistant/components/mqtt/__init__.py     | 35 ++++++++++---------
 homeassistant/components/mqtt/config_flow.py  |  3 +-
 homeassistant/components/mqtt/const.py        |  2 ++
 homeassistant/components/mqtt/strings.json    |  3 +-
 tests/components/mqtt/test_config_flow.py     |  5 +++
 6 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/homeassistant/components/mqtt/.translations/en.json b/homeassistant/components/mqtt/.translations/en.json
index 1f0ed341bb6..c0b83a1323f 100644
--- a/homeassistant/components/mqtt/.translations/en.json
+++ b/homeassistant/components/mqtt/.translations/en.json
@@ -10,6 +10,7 @@
             "broker": {
                 "data": {
                     "broker": "Broker",
+                    "discovery": "Enable discovery",
                     "password": "Password",
                     "port": "Port",
                     "username": "Username"
diff --git a/homeassistant/components/mqtt/__init__.py b/homeassistant/components/mqtt/__init__.py
index abc240a65cb..856d5d01894 100644
--- a/homeassistant/components/mqtt/__init__.py
+++ b/homeassistant/components/mqtt/__init__.py
@@ -36,7 +36,7 @@ from homeassistant.util.async_ import (
 
 # Loading the config flow file will register the flow
 from . import config_flow  # noqa  # pylint: disable=unused-import
-from .const import CONF_BROKER
+from .const import CONF_BROKER, CONF_DISCOVERY, DEFAULT_DISCOVERY
 from .server import HBMQTT_CONFIG_SCHEMA
 
 REQUIREMENTS = ['paho-mqtt==1.4.0']
@@ -47,13 +47,13 @@ DOMAIN = 'mqtt'
 
 DATA_MQTT = 'mqtt'
 DATA_MQTT_CONFIG = 'mqtt_config'
+DATA_MQTT_HASS_CONFIG = 'mqtt_hass_config'
 
 SERVICE_PUBLISH = 'publish'
 
 CONF_EMBEDDED = 'embedded'
 
 CONF_CLIENT_ID = 'client_id'
-CONF_DISCOVERY = 'discovery'
 CONF_DISCOVERY_PREFIX = 'discovery_prefix'
 CONF_KEEPALIVE = 'keepalive'
 CONF_CERTIFICATE = 'certificate'
@@ -81,7 +81,6 @@ DEFAULT_KEEPALIVE = 60
 DEFAULT_QOS = 0
 DEFAULT_RETAIN = False
 DEFAULT_PROTOCOL = PROTOCOL_311
-DEFAULT_DISCOVERY = False
 DEFAULT_DISCOVERY_PREFIX = 'homeassistant'
 DEFAULT_TLS_PROTOCOL = 'auto'
 DEFAULT_PAYLOAD_AVAILABLE = 'online'
@@ -321,23 +320,21 @@ async def _async_setup_server(hass: HomeAssistantType, config: ConfigType):
     return broker_config
 
 
-async def _async_setup_discovery(hass: HomeAssistantType,
-                                 config: ConfigType) -> bool:
+async def _async_setup_discovery(hass: HomeAssistantType, conf: ConfigType,
+                                 hass_config: ConfigType) -> bool:
     """Try to start the discovery of MQTT devices.
 
     This method is a coroutine.
     """
-    conf = config.get(DOMAIN, {})  # type: ConfigType
-
     discovery = await async_prepare_setup_platform(
-        hass, config, DOMAIN, 'discovery')
+        hass, hass_config, DOMAIN, 'discovery')
 
     if discovery is None:
         _LOGGER.error("Unable to load MQTT discovery")
         return False
 
     success = await discovery.async_start(
-        hass, conf[CONF_DISCOVERY_PREFIX], config)  # type: bool
+        hass, conf[CONF_DISCOVERY_PREFIX], hass_config)  # type: bool
 
     return success
 
@@ -346,6 +343,11 @@ async def async_setup(hass: HomeAssistantType, config: ConfigType) -> bool:
     """Start the MQTT protocol service."""
     conf = config.get(DOMAIN)  # type: Optional[ConfigType]
 
+    # We need this because discovery can cause components to be set up and
+    # otherwise it will not load the users config.
+    # This needs a better solution.
+    hass.data[DATA_MQTT_HASS_CONFIG] = config
+
     if conf is None:
         # If we have a config entry, setup is done by that config entry.
         # If there is no config entry, this should fail.
@@ -390,13 +392,6 @@ async def async_setup(hass: HomeAssistantType, config: ConfigType) -> bool:
             data={}
         ))
 
-    if conf.get(CONF_DISCOVERY):
-        async def async_setup_discovery(event):
-            await _async_setup_discovery(hass, config)
-
-        hass.bus.async_listen_once(
-            EVENT_HOMEASSISTANT_START, async_setup_discovery)
-
     return True
 
 
@@ -528,6 +523,14 @@ async def async_setup_entry(hass, entry):
         DOMAIN, SERVICE_PUBLISH, async_publish_service,
         schema=MQTT_PUBLISH_SCHEMA)
 
+    if conf.get(CONF_DISCOVERY):
+        async def async_setup_discovery(event):
+            await _async_setup_discovery(
+                hass, conf, hass.data[DATA_MQTT_HASS_CONFIG])
+
+        hass.bus.async_listen_once(
+            EVENT_HOMEASSISTANT_START, async_setup_discovery)
+
     return True
 
 
diff --git a/homeassistant/components/mqtt/config_flow.py b/homeassistant/components/mqtt/config_flow.py
index a8987a19742..22072857b03 100644
--- a/homeassistant/components/mqtt/config_flow.py
+++ b/homeassistant/components/mqtt/config_flow.py
@@ -7,7 +7,7 @@ import voluptuous as vol
 from homeassistant import config_entries
 from homeassistant.const import CONF_PASSWORD, CONF_PORT, CONF_USERNAME
 
-from .const import CONF_BROKER
+from .const import CONF_BROKER, CONF_DISCOVERY, DEFAULT_DISCOVERY
 
 
 @config_entries.HANDLERS.register('mqtt')
@@ -44,6 +44,7 @@ class FlowHandler(config_entries.ConfigFlow):
         fields[vol.Required(CONF_PORT, default=1883)] = vol.Coerce(int)
         fields[vol.Optional(CONF_USERNAME)] = str
         fields[vol.Optional(CONF_PASSWORD)] = str
+        fields[vol.Optional(CONF_DISCOVERY, default=DEFAULT_DISCOVERY)] = bool
 
         return self.async_show_form(
             step_id='broker', data_schema=vol.Schema(fields), errors=errors)
diff --git a/homeassistant/components/mqtt/const.py b/homeassistant/components/mqtt/const.py
index 8f9d938cf88..3c22001f91c 100644
--- a/homeassistant/components/mqtt/const.py
+++ b/homeassistant/components/mqtt/const.py
@@ -1,2 +1,4 @@
 """Constants used by multiple MQTT modules."""
 CONF_BROKER = 'broker'
+CONF_DISCOVERY = 'discovery'
+DEFAULT_DISCOVERY = False
diff --git a/homeassistant/components/mqtt/strings.json b/homeassistant/components/mqtt/strings.json
index a38983125ae..0a2cb255cc4 100644
--- a/homeassistant/components/mqtt/strings.json
+++ b/homeassistant/components/mqtt/strings.json
@@ -9,7 +9,8 @@
           "broker": "Broker",
           "port": "Port",
           "username": "Username",
-          "password": "Password"
+          "password": "Password",
+          "discovery": "Enable discovery"
         }
       }
     },
diff --git a/tests/components/mqtt/test_config_flow.py b/tests/components/mqtt/test_config_flow.py
index 4a4d783940f..9f6be60c68b 100644
--- a/tests/components/mqtt/test_config_flow.py
+++ b/tests/components/mqtt/test_config_flow.py
@@ -41,6 +41,11 @@ async def test_user_connection_works(hass, mock_try_connection,
     )
 
     assert result['type'] == 'create_entry'
+    assert result['result'].data == {
+        'broker': '127.0.0.1',
+        'port': 1883,
+        'discovery': False,
+    }
     # Check we tried the connection
     assert len(mock_try_connection.mock_calls) == 1
     # Check config entry got setup

From 7840b1e387ce17512619317a52d9ab0b41737e73 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Tue, 25 Sep 2018 12:22:27 +0200
Subject: [PATCH 281/357] Fix MQTT leaving files behind (#16840)

---
 tests/components/binary_sensor/test_mqtt.py | 47 ++++++++++---------
 tests/components/switch/test_mqtt.py        | 50 +++++++++++----------
 2 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/tests/components/binary_sensor/test_mqtt.py b/tests/components/binary_sensor/test_mqtt.py
index 57050c2cbf5..0bc8c6c81fb 100644
--- a/tests/components/binary_sensor/test_mqtt.py
+++ b/tests/components/binary_sensor/test_mqtt.py
@@ -2,14 +2,15 @@
 import unittest
 
 import homeassistant.core as ha
-from homeassistant.setup import setup_component
+from homeassistant.setup import setup_component, async_setup_component
 import homeassistant.components.binary_sensor as binary_sensor
 
 from homeassistant.const import STATE_OFF, STATE_ON
 from homeassistant.const import EVENT_STATE_CHANGED, STATE_UNAVAILABLE
 
-from tests.common import get_test_home_assistant, fire_mqtt_message
-from tests.common import mock_component, mock_mqtt_component
+from tests.common import (
+    get_test_home_assistant, fire_mqtt_message, async_fire_mqtt_message,
+    mock_component, mock_mqtt_component, async_mock_mqtt_component)
 
 
 class TestSensorMQTT(unittest.TestCase):
@@ -77,25 +78,6 @@ class TestSensorMQTT(unittest.TestCase):
         state = self.hass.states.get('binary_sensor.test')
         self.assertIsNone(state)
 
-    def test_unique_id(self):
-        """Test unique id option only creates one sensor per unique_id."""
-        assert setup_component(self.hass, binary_sensor.DOMAIN, {
-            binary_sensor.DOMAIN: [{
-                'platform': 'mqtt',
-                'name': 'Test 1',
-                'state_topic': 'test-topic',
-                'unique_id': 'TOTALLY_UNIQUE'
-            }, {
-                'platform': 'mqtt',
-                'name': 'Test 2',
-                'state_topic': 'test-topic',
-                'unique_id': 'TOTALLY_UNIQUE'
-            }]
-        })
-        fire_mqtt_message(self.hass, 'test-topic', 'payload')
-        self.hass.block_till_done()
-        assert len(self.hass.states.all()) == 1
-
     def test_availability_without_topic(self):
         """Test availability without defined availability topic."""
         self.assertTrue(setup_component(self.hass, binary_sensor.DOMAIN, {
@@ -223,3 +205,24 @@ class TestSensorMQTT(unittest.TestCase):
         fire_mqtt_message(self.hass, 'test-topic', 'ON')
         self.hass.block_till_done()
         self.assertEqual(2, len(events))
+
+
+async def test_unique_id(hass):
+    """Test unique id option only creates one sensor per unique_id."""
+    await async_mock_mqtt_component(hass)
+    assert await async_setup_component(hass, binary_sensor.DOMAIN, {
+        binary_sensor.DOMAIN: [{
+            'platform': 'mqtt',
+            'name': 'Test 1',
+            'state_topic': 'test-topic',
+            'unique_id': 'TOTALLY_UNIQUE'
+        }, {
+            'platform': 'mqtt',
+            'name': 'Test 2',
+            'state_topic': 'test-topic',
+            'unique_id': 'TOTALLY_UNIQUE'
+        }]
+    })
+    async_fire_mqtt_message(hass, 'test-topic', 'payload')
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 1
diff --git a/tests/components/switch/test_mqtt.py b/tests/components/switch/test_mqtt.py
index c9bfd02156f..321db7ed118 100644
--- a/tests/components/switch/test_mqtt.py
+++ b/tests/components/switch/test_mqtt.py
@@ -2,13 +2,14 @@
 import unittest
 from unittest.mock import patch
 
-from homeassistant.setup import setup_component
+from homeassistant.setup import setup_component, async_setup_component
 from homeassistant.const import STATE_ON, STATE_OFF, STATE_UNAVAILABLE,\
     ATTR_ASSUMED_STATE
 import homeassistant.core as ha
 import homeassistant.components.switch as switch
 from tests.common import (
-    mock_mqtt_component, fire_mqtt_message, get_test_home_assistant, mock_coro)
+    mock_mqtt_component, fire_mqtt_message, get_test_home_assistant, mock_coro,
+    async_mock_mqtt_component, async_fire_mqtt_message)
 
 
 class TestSwitchMQTT(unittest.TestCase):
@@ -280,25 +281,28 @@ class TestSwitchMQTT(unittest.TestCase):
         state = self.hass.states.get('switch.test')
         self.assertEqual(STATE_OFF, state.state)
 
-    def test_unique_id(self):
-        """Test unique id option only creates one switch per unique_id."""
-        assert setup_component(self.hass, switch.DOMAIN, {
-            switch.DOMAIN: [{
-                'platform': 'mqtt',
-                'name': 'Test 1',
-                'state_topic': 'test-topic',
-                'command_topic': 'command-topic',
-                'unique_id': 'TOTALLY_UNIQUE'
-            }, {
-                'platform': 'mqtt',
-                'name': 'Test 2',
-                'state_topic': 'test-topic',
-                'command_topic': 'command-topic',
-                'unique_id': 'TOTALLY_UNIQUE'
-            }]
-        })
 
-        fire_mqtt_message(self.hass, 'test-topic', 'payload')
-        self.hass.block_till_done()
-        assert len(self.hass.states.async_entity_ids()) == 2
-        # all switches group is 1, unique id created is 1
+async def test_unique_id(hass):
+    """Test unique id option only creates one switch per unique_id."""
+    await async_mock_mqtt_component(hass)
+    assert await async_setup_component(hass, switch.DOMAIN, {
+        switch.DOMAIN: [{
+            'platform': 'mqtt',
+            'name': 'Test 1',
+            'state_topic': 'test-topic',
+            'command_topic': 'command-topic',
+            'unique_id': 'TOTALLY_UNIQUE'
+        }, {
+            'platform': 'mqtt',
+            'name': 'Test 2',
+            'state_topic': 'test-topic',
+            'command_topic': 'command-topic',
+            'unique_id': 'TOTALLY_UNIQUE'
+        }]
+    })
+
+    async_fire_mqtt_message(hass, 'test-topic', 'payload')
+    await hass.async_block_till_done()
+
+    assert len(hass.states.async_entity_ids()) == 2
+    # all switches group is 1, unique id created is 1

From 01925fdfffe68dbcc1ee04348c6408bf903122f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=B8yer=20Iversen?= <mail@dahoiv.net>
Date: Tue, 25 Sep 2018 13:41:29 +0200
Subject: [PATCH 282/357] change unknown to None in Netatmo public (#16845)

---
 homeassistant/components/sensor/netatmo_public.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/sensor/netatmo_public.py b/homeassistant/components/sensor/netatmo_public.py
index 59b0b317ed1..7a500b66183 100644
--- a/homeassistant/components/sensor/netatmo_public.py
+++ b/homeassistant/components/sensor/netatmo_public.py
@@ -12,7 +12,7 @@ import voluptuous as vol
 from homeassistant.components.sensor import PLATFORM_SCHEMA
 from homeassistant.const import (
     CONF_NAME, CONF_MODE, CONF_MONITORED_CONDITIONS, TEMP_CELSIUS,
-    DEVICE_CLASS_TEMPERATURE, DEVICE_CLASS_HUMIDITY, STATE_UNKNOWN)
+    DEVICE_CLASS_TEMPERATURE, DEVICE_CLASS_HUMIDITY)
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity import Entity
 from homeassistant.util import Throttle
@@ -125,7 +125,7 @@ class NetatmoPublicSensor(Entity):
 
         if self.netatmo_data.data is None:
             _LOGGER.warning("No data found for %s", self._name)
-            self._state = STATE_UNKNOWN
+            self._state = None
             return
 
         data = None
@@ -146,7 +146,7 @@ class NetatmoPublicSensor(Entity):
         if not data:
             _LOGGER.warning("No station provides %s data in the area %s",
                             self.type, self._area_name)
-            self._state = STATE_UNKNOWN
+            self._state = None
             return
 
         if self._mode == 'avg':

From 9ea5afd109a8fc0b4aed57e45dde67a4245cb905 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Tue, 25 Sep 2018 13:47:12 +0200
Subject: [PATCH 283/357] Add unique ID and device info to Nest camera (#16846)

* Add unique ID and device info to Nest camera

* Remove sw version
---
 homeassistant/components/camera/nest.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/homeassistant/components/camera/nest.py b/homeassistant/components/camera/nest.py
index e1d26371984..158123989c0 100644
--- a/homeassistant/components/camera/nest.py
+++ b/homeassistant/components/camera/nest.py
@@ -62,6 +62,23 @@ class NestCamera(Camera):
         """Return the name of the nest, if any."""
         return self._name
 
+    @property
+    def unique_id(self):
+        """Return the serial number."""
+        return self.device.device_id
+
+    @property
+    def device_info(self):
+        """Return information about the device."""
+        return {
+            'identifiers': {
+                (nest.DOMAIN, self.device.device_id)
+            },
+            'name': self.device.name_long,
+            'manufacturer': 'Nest Labs',
+            'model': "Camera",
+        }
+
     @property
     def should_poll(self):
         """Nest camera should poll periodically."""

From 093285f92ff6036034c5dc415f1b7b23329ac273 Mon Sep 17 00:00:00 2001
From: emontnemery <erik@montnemery.com>
Date: Tue, 25 Sep 2018 14:25:03 +0200
Subject: [PATCH 284/357] Remove discovered MQTT binary_sensor device when
 discovery topic is cleared (#16826)

---
 .../components/binary_sensor/mqtt.py          | 24 +++++++++++++------
 tests/components/mqtt/test_discovery.py       | 22 +++++++++++++++++
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/homeassistant/components/binary_sensor/mqtt.py b/homeassistant/components/binary_sensor/mqtt.py
index 37a26a27214..ca2ff2074c3 100644
--- a/homeassistant/components/binary_sensor/mqtt.py
+++ b/homeassistant/components/binary_sensor/mqtt.py
@@ -18,8 +18,9 @@ from homeassistant.const import (
     CONF_FORCE_UPDATE, CONF_NAME, CONF_VALUE_TEMPLATE, CONF_PAYLOAD_ON,
     CONF_PAYLOAD_OFF, CONF_DEVICE_CLASS)
 from homeassistant.components.mqtt import (
-    CONF_STATE_TOPIC, CONF_AVAILABILITY_TOPIC, CONF_PAYLOAD_AVAILABLE,
-    CONF_PAYLOAD_NOT_AVAILABLE, CONF_QOS, MqttAvailability)
+    ATTR_DISCOVERY_HASH, CONF_STATE_TOPIC, CONF_AVAILABILITY_TOPIC,
+    CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE, CONF_QOS,
+    MqttAvailability, MqttDiscoveryUpdate)
 import homeassistant.helpers.config_validation as cv
 
 _LOGGER = logging.getLogger(__name__)
@@ -55,6 +56,10 @@ def async_setup_platform(hass, config, async_add_entities,
     if value_template is not None:
         value_template.hass = hass
 
+    discovery_hash = None
+    if discovery_info is not None and ATTR_DISCOVERY_HASH in discovery_info:
+        discovery_hash = discovery_info[ATTR_DISCOVERY_HASH]
+
     async_add_entities([MqttBinarySensor(
         config.get(CONF_NAME),
         config.get(CONF_STATE_TOPIC),
@@ -68,19 +73,22 @@ def async_setup_platform(hass, config, async_add_entities,
         config.get(CONF_PAYLOAD_NOT_AVAILABLE),
         value_template,
         config.get(CONF_UNIQUE_ID),
+        discovery_hash,
     )])
 
 
-class MqttBinarySensor(MqttAvailability, BinarySensorDevice):
+class MqttBinarySensor(MqttAvailability, MqttDiscoveryUpdate,
+                       BinarySensorDevice):
     """Representation a binary sensor that is updated by MQTT."""
 
     def __init__(self, name, state_topic, availability_topic, device_class,
                  qos, force_update, payload_on, payload_off, payload_available,
                  payload_not_available, value_template,
-                 unique_id: Optional[str]):
+                 unique_id: Optional[str], discovery_hash):
         """Initialize the MQTT binary sensor."""
-        super().__init__(availability_topic, qos, payload_available,
-                         payload_not_available)
+        MqttAvailability.__init__(self, availability_topic, qos,
+                                  payload_available, payload_not_available)
+        MqttDiscoveryUpdate.__init__(self, discovery_hash)
         self._name = name
         self._state = None
         self._state_topic = state_topic
@@ -91,11 +99,13 @@ class MqttBinarySensor(MqttAvailability, BinarySensorDevice):
         self._force_update = force_update
         self._template = value_template
         self._unique_id = unique_id
+        self._discovery_hash = discovery_hash
 
     @asyncio.coroutine
     def async_added_to_hass(self):
         """Subscribe mqtt events."""
-        yield from super().async_added_to_hass()
+        yield from MqttAvailability.async_added_to_hass(self)
+        yield from MqttDiscoveryUpdate.async_added_to_hass(self)
 
         @callback
         def state_message_received(topic, payload, qos):
diff --git a/tests/components/mqtt/test_discovery.py b/tests/components/mqtt/test_discovery.py
index 9e334719a36..0656bbdc300 100644
--- a/tests/components/mqtt/test_discovery.py
+++ b/tests/components/mqtt/test_discovery.py
@@ -211,6 +211,28 @@ def test_discovery_removal(hass, mqtt_mock, caplog):
     assert state is None
 
 
+@asyncio.coroutine
+def test_discovery_removal_binary_sensor(hass, mqtt_mock, caplog):
+    """Test removal of discovered binary_sensor."""
+    yield from async_start(hass, 'homeassistant', {})
+    data = (
+        '{ "name": "Beer",'
+        '  "status_topic": "test_topic" }'
+    )
+    async_fire_mqtt_message(hass, 'homeassistant/binary_sensor/bla/config',
+                            data)
+    yield from hass.async_block_till_done()
+    state = hass.states.get('binary_sensor.beer')
+    assert state is not None
+    assert state.name == 'Beer'
+    async_fire_mqtt_message(hass, 'homeassistant/binary_sensor/bla/config',
+                            '')
+    yield from hass.async_block_till_done()
+    yield from hass.async_block_till_done()
+    state = hass.states.get('binary_sensor.beer')
+    assert state is None
+
+
 @asyncio.coroutine
 def test_discovery_removal_light(hass, mqtt_mock, caplog):
     """Test removal of discovered light."""

From a1c914dfeb7c1e45b00dd9c49a27e455eefca368 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Tue, 25 Sep 2018 14:29:13 +0200
Subject: [PATCH 285/357] On removal, only unload config entry if loaded
 (#16844)

* On removal, only unload config entry if loaded

* Fix test
---
 homeassistant/config_entries.py               |  5 ++-
 .../components/config/test_config_entries.py  |  2 +-
 tests/test_config_entries.py                  | 39 ++++++++++++++++++-
 3 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/homeassistant/config_entries.py b/homeassistant/config_entries.py
index a2a9ce78989..83bf9d22de3 100644
--- a/homeassistant/config_entries.py
+++ b/homeassistant/config_entries.py
@@ -340,7 +340,10 @@ class ConfigEntries:
         entry = self._entries.pop(found)
         self._async_schedule_save()
 
-        unloaded = await entry.async_unload(self.hass)
+        if entry.state == ENTRY_STATE_LOADED:
+            unloaded = await entry.async_unload(self.hass)
+        else:
+            unloaded = True
 
         device_registry = await \
             self.hass.helpers.device_registry.async_get_registry()
diff --git a/tests/components/config/test_config_entries.py b/tests/components/config/test_config_entries.py
index 66d29aac757..1e3b507727c 100644
--- a/tests/components/config/test_config_entries.py
+++ b/tests/components/config/test_config_entries.py
@@ -72,7 +72,7 @@ def test_get_entries(hass, client):
 @asyncio.coroutine
 def test_remove_entry(hass, client):
     """Test removing an entry via the API."""
-    entry = MockConfigEntry(domain='demo')
+    entry = MockConfigEntry(domain='demo', state=core_ce.ENTRY_STATE_LOADED)
     entry.add_to_hass(hass)
     resp = yield from client.delete(
         '/api/config/config_entries/entry/{}'.format(entry.entry_id))
diff --git a/tests/test_config_entries.py b/tests/test_config_entries.py
index afb13d71c2e..8f12407c6b7 100644
--- a/tests/test_config_entries.py
+++ b/tests/test_config_entries.py
@@ -49,7 +49,11 @@ def test_remove_entry(hass, manager):
         MockModule('comp', async_unload_entry=mock_unload_entry))
 
     MockConfigEntry(domain='test', entry_id='test1').add_to_manager(manager)
-    MockConfigEntry(domain='test', entry_id='test2').add_to_manager(manager)
+    MockConfigEntry(
+        domain='test',
+        entry_id='test2',
+        state=config_entries.ENTRY_STATE_LOADED
+    ).add_to_manager(manager)
     MockConfigEntry(domain='test', entry_id='test3').add_to_manager(manager)
 
     assert [item.entry_id for item in manager.async_entries()] == \
@@ -79,7 +83,11 @@ def test_remove_entry_raises(hass, manager):
         MockModule('comp', async_unload_entry=mock_unload_entry))
 
     MockConfigEntry(domain='test', entry_id='test1').add_to_manager(manager)
-    MockConfigEntry(domain='test', entry_id='test2').add_to_manager(manager)
+    MockConfigEntry(
+        domain='test',
+        entry_id='test2',
+        state=config_entries.ENTRY_STATE_LOADED
+    ).add_to_manager(manager)
     MockConfigEntry(domain='test', entry_id='test3').add_to_manager(manager)
 
     assert [item.entry_id for item in manager.async_entries()] == \
@@ -94,6 +102,33 @@ def test_remove_entry_raises(hass, manager):
         ['test1', 'test3']
 
 
+@asyncio.coroutine
+def test_remove_entry_if_not_loaded(hass, manager):
+    """Test that we can remove an entry."""
+    mock_unload_entry = MagicMock(return_value=mock_coro(True))
+
+    loader.set_component(
+        hass, 'test',
+        MockModule('comp', async_unload_entry=mock_unload_entry))
+
+    MockConfigEntry(domain='test', entry_id='test1').add_to_manager(manager)
+    MockConfigEntry(domain='test', entry_id='test2').add_to_manager(manager)
+    MockConfigEntry(domain='test', entry_id='test3').add_to_manager(manager)
+
+    assert [item.entry_id for item in manager.async_entries()] == \
+        ['test1', 'test2', 'test3']
+
+    result = yield from manager.async_remove('test2')
+
+    assert result == {
+        'require_restart': False
+    }
+    assert [item.entry_id for item in manager.async_entries()] == \
+        ['test1', 'test3']
+
+    assert len(mock_unload_entry.mock_calls) == 0
+
+
 @asyncio.coroutine
 def test_add_entry_calls_setup_entry(hass, manager):
     """Test we call setup_config_entry."""

From bc8d323bdd6a66fba254d20b0339603fe6bd63ec Mon Sep 17 00:00:00 2001
From: Tommy Jonsson <quazzie@users.noreply.github.com>
Date: Tue, 25 Sep 2018 15:04:43 +0200
Subject: [PATCH 286/357] Add image support to hangouts notifications (#16560)

* add image to services.yaml

* add image support

Add image support to hangouts notification.

* fix indents

* fix line length

* Add data schema

forgot schema

* fix linelength

* use is_allowed_path and better file error handling

* elif not else if

* fix logger error

* fixes

* fix travis errors/warnings

* remove trailing whitespace

* fix travis pylint naming

* new async style

* removed unused async_timeout

* change to image_file/url (#3)

* change to image_file/url

* removed whitespace

* forgot to remove unused urlparse import

* image_file/url in service help
---
 homeassistant/components/hangouts/const.py    | 10 +++-
 .../components/hangouts/hangouts_bot.py       | 55 +++++++++++++++++--
 .../components/hangouts/services.yaml         |  6 +-
 3 files changed, 62 insertions(+), 9 deletions(-)

diff --git a/homeassistant/components/hangouts/const.py b/homeassistant/components/hangouts/const.py
index caae0de169b..5a527fae260 100644
--- a/homeassistant/components/hangouts/const.py
+++ b/homeassistant/components/hangouts/const.py
@@ -3,7 +3,8 @@ import logging
 
 import voluptuous as vol
 
-from homeassistant.components.notify import ATTR_MESSAGE, ATTR_TARGET
+from homeassistant.components.notify \
+    import ATTR_MESSAGE, ATTR_TARGET, ATTR_DATA
 import homeassistant.helpers.config_validation as cv
 
 _LOGGER = logging.getLogger('homeassistant.components.hangouts')
@@ -56,10 +57,15 @@ MESSAGE_SEGMENT_SCHEMA = vol.Schema({
     vol.Optional('parse_str'): cv.boolean,
     vol.Optional('link_target'): cv.string
 })
+MESSAGE_DATA_SCHEMA = vol.Schema({
+    vol.Optional('image_file'): cv.string,
+    vol.Optional('image_url'): cv.string
+})
 
 MESSAGE_SCHEMA = vol.Schema({
     vol.Required(ATTR_TARGET): [TARGETS_SCHEMA],
-    vol.Required(ATTR_MESSAGE): [MESSAGE_SEGMENT_SCHEMA]
+    vol.Required(ATTR_MESSAGE): [MESSAGE_SEGMENT_SCHEMA],
+    vol.Optional(ATTR_DATA): MESSAGE_DATA_SCHEMA
 })
 
 INTENT_SCHEMA = vol.All(
diff --git a/homeassistant/components/hangouts/hangouts_bot.py b/homeassistant/components/hangouts/hangouts_bot.py
index 7edc8898c8c..8747bff9ba7 100644
--- a/homeassistant/components/hangouts/hangouts_bot.py
+++ b/homeassistant/components/hangouts/hangouts_bot.py
@@ -1,10 +1,13 @@
 """The Hangouts Bot."""
+import io
 import logging
-
+import asyncio
+import aiohttp
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers import dispatcher, intent
 
 from .const import (
-    ATTR_MESSAGE, ATTR_TARGET, CONF_CONVERSATIONS, DOMAIN,
+    ATTR_MESSAGE, ATTR_TARGET, ATTR_DATA, CONF_CONVERSATIONS, DOMAIN,
     EVENT_HANGOUTS_CONNECTED, EVENT_HANGOUTS_CONVERSATIONS_CHANGED,
     EVENT_HANGOUTS_DISCONNECTED, EVENT_HANGOUTS_MESSAGE_RECEIVED,
     CONF_MATCHERS, CONF_CONVERSATION_ID,
@@ -146,7 +149,8 @@ class HangoutsBot:
                     is_error and conv_id in self._error_suppressed_conv_ids):
                 await self._async_send_message(
                     [{'text': message, 'parse_str': True}],
-                    [{CONF_CONVERSATION_ID: conv_id}])
+                    [{CONF_CONVERSATION_ID: conv_id}],
+                    None)
 
     async def _async_process(self, intents, text, conv_id):
         """Detect a matching intent."""
@@ -203,7 +207,7 @@ class HangoutsBot:
         """Run once when Home Assistant stops."""
         await self.async_disconnect()
 
-    async def _async_send_message(self, message, targets):
+    async def _async_send_message(self, message, targets, data):
         conversations = []
         for target in targets:
             conversation = None
@@ -233,10 +237,48 @@ class HangoutsBot:
                     del segment['parse_str']
                 messages.append(ChatMessageSegment(**segment))
 
+        image_file = None
+        if data:
+            if data.get('image_url'):
+                uri = data.get('image_url')
+                try:
+                    websession = async_get_clientsession(self.hass)
+                    async with websession.get(uri, timeout=5) as response:
+                        if response.status != 200:
+                            _LOGGER.error(
+                                'Fetch image failed, %s, %s',
+                                response.status,
+                                response
+                            )
+                            image_file = None
+                        else:
+                            image_data = await response.read()
+                            image_file = io.BytesIO(image_data)
+                            image_file.name = "image.png"
+                except (asyncio.TimeoutError, aiohttp.ClientError) as error:
+                    _LOGGER.error(
+                        'Failed to fetch image, %s',
+                        type(error)
+                    )
+                    image_file = None
+            elif data.get('image_file'):
+                uri = data.get('image_file')
+                if self.hass.config.is_allowed_path(uri):
+                    try:
+                        image_file = open(uri, 'rb')
+                    except IOError as error:
+                        _LOGGER.error(
+                            'Image file I/O error(%s): %s',
+                            error.errno,
+                            error.strerror
+                        )
+                else:
+                    _LOGGER.error('Path "%s" not allowed', uri)
+
         if not messages:
             return False
         for conv in conversations:
-            await conv.send_message(messages)
+            await conv.send_message(messages, image_file)
 
     async def _async_list_conversations(self):
         import hangups
@@ -261,7 +303,8 @@ class HangoutsBot:
     async def async_handle_send_message(self, service):
         """Handle the send_message service."""
         await self._async_send_message(service.data[ATTR_MESSAGE],
-                                       service.data[ATTR_TARGET])
+                                       service.data[ATTR_TARGET],
+                                       service.data[ATTR_DATA])
 
     async def async_handle_update_users_and_conversations(self, _=None):
         """Handle the update_users_and_conversations service."""
diff --git a/homeassistant/components/hangouts/services.yaml b/homeassistant/components/hangouts/services.yaml
index 5d314bc2479..ded324d2de9 100644
--- a/homeassistant/components/hangouts/services.yaml
+++ b/homeassistant/components/hangouts/services.yaml
@@ -9,4 +9,8 @@ send_message:
       example: '[{"id": "UgxrXzVrARmjx_C6AZx4AaABAagBo-6UCw"}, {"name": "Test Conversation"}]'
     message:
       description: List of message segments, only the "text" field is required in every segment. [Required]
-      example: '[{"text":"test", "is_bold": false, "is_italic": false, "is_strikethrough": false, "is_underline": false, "parse_str": false, "link_target": "http://google.com"}, ...]'
\ No newline at end of file
+      example: '[{"text":"test", "is_bold": false, "is_italic": false, "is_strikethrough": false, "is_underline": false, "parse_str": false, "link_target": "http://google.com"}, ...]'
+    data:
+      description: Other options ['image_file' / 'image_url']
+      example: '{ "image_file": "file" }' or '{ "image_url": "url" }'
+      

From 0dbfd77402777f195fbc87364e185d7914dd3f4b Mon Sep 17 00:00:00 2001
From: emontnemery <erik@montnemery.com>
Date: Tue, 25 Sep 2018 17:15:39 +0200
Subject: [PATCH 287/357] Remove discovered MQTT climate device when discovery
 topic is cleared (#16856)

---
 homeassistant/components/climate/mqtt.py | 27 ++++++++++++++++--------
 tests/components/climate/test_mqtt.py    | 24 ++++++++++++++++++++-
 2 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/homeassistant/components/climate/mqtt.py b/homeassistant/components/climate/mqtt.py
index 9e227e002b5..66f76ac1aaa 100644
--- a/homeassistant/components/climate/mqtt.py
+++ b/homeassistant/components/climate/mqtt.py
@@ -21,8 +21,9 @@ from homeassistant.components.climate import (
 from homeassistant.const import (
     STATE_ON, STATE_OFF, ATTR_TEMPERATURE, CONF_NAME, CONF_VALUE_TEMPLATE)
 from homeassistant.components.mqtt import (
-    CONF_AVAILABILITY_TOPIC, CONF_QOS, CONF_RETAIN, CONF_PAYLOAD_AVAILABLE,
-    CONF_PAYLOAD_NOT_AVAILABLE, MQTT_BASE_PLATFORM_SCHEMA, MqttAvailability)
+    ATTR_DISCOVERY_HASH, CONF_AVAILABILITY_TOPIC, CONF_QOS, CONF_RETAIN,
+    CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE,
+    MQTT_BASE_PLATFORM_SCHEMA, MqttAvailability, MqttDiscoveryUpdate)
 import homeassistant.helpers.config_validation as cv
 from homeassistant.components.fan import (SPEED_LOW, SPEED_MEDIUM,
                                           SPEED_HIGH)
@@ -153,6 +154,10 @@ def async_setup_platform(hass, config, async_add_entities,
         value_templates[key] = config.get(key)
         value_templates[key].hass = hass
 
+    discovery_hash = None
+    if discovery_info is not None and ATTR_DISCOVERY_HASH in discovery_info:
+        discovery_hash = discovery_info[ATTR_DISCOVERY_HASH]
+
     async_add_entities([
         MqttClimate(
             hass,
@@ -194,11 +199,12 @@ def async_setup_platform(hass, config, async_add_entities,
             config.get(CONF_PAYLOAD_AVAILABLE),
             config.get(CONF_PAYLOAD_NOT_AVAILABLE),
             config.get(CONF_MIN_TEMP),
-            config.get(CONF_MAX_TEMP))
-    ])
+            config.get(CONF_MAX_TEMP),
+            discovery_hash,
+        )])
 
 
-class MqttClimate(MqttAvailability, ClimateDevice):
+class MqttClimate(MqttAvailability, MqttDiscoveryUpdate, ClimateDevice):
     """Representation of an MQTT climate device."""
 
     def __init__(self, hass, name, topic, value_templates, qos, retain,
@@ -207,10 +213,11 @@ class MqttClimate(MqttAvailability, ClimateDevice):
                  current_swing_mode, current_operation, aux, send_if_off,
                  payload_on, payload_off, availability_topic,
                  payload_available, payload_not_available,
-                 min_temp, max_temp):
+                 min_temp, max_temp, discovery_hash):
         """Initialize the climate device."""
-        super().__init__(availability_topic, qos, payload_available,
-                         payload_not_available)
+        MqttAvailability.__init__(self, availability_topic, qos,
+                                  payload_available, payload_not_available)
+        MqttDiscoveryUpdate.__init__(self, discovery_hash)
         self.hass = hass
         self._name = name
         self._topic = topic
@@ -235,11 +242,13 @@ class MqttClimate(MqttAvailability, ClimateDevice):
         self._payload_off = payload_off
         self._min_temp = min_temp
         self._max_temp = max_temp
+        self._discovery_hash = discovery_hash
 
     @asyncio.coroutine
     def async_added_to_hass(self):
         """Handle being added to home assistant."""
-        yield from super().async_added_to_hass()
+        yield from MqttAvailability.async_added_to_hass(self)
+        yield from MqttDiscoveryUpdate.async_added_to_hass(self)
 
         @callback
         def handle_current_temp_received(topic, payload, qos):
diff --git a/tests/components/climate/test_mqtt.py b/tests/components/climate/test_mqtt.py
index f46a23e4f97..6c43c4d9dbe 100644
--- a/tests/components/climate/test_mqtt.py
+++ b/tests/components/climate/test_mqtt.py
@@ -12,8 +12,10 @@ from homeassistant.components.climate import (
     SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE,
     SUPPORT_FAN_MODE, SUPPORT_SWING_MODE, SUPPORT_HOLD_MODE,
     SUPPORT_AWAY_MODE, SUPPORT_AUX_HEAT, DEFAULT_MIN_TEMP, DEFAULT_MAX_TEMP)
+from homeassistant.components.mqtt.discovery import async_start
 from tests.common import (get_test_home_assistant, mock_mqtt_component,
-                          fire_mqtt_message, mock_component)
+                          async_fire_mqtt_message, fire_mqtt_message,
+                          mock_component)
 
 ENTITY_CLIMATE = 'climate.test'
 
@@ -649,3 +651,23 @@ class TestMQTTClimate(unittest.TestCase):
 
         self.assertIsInstance(max_temp, float)
         self.assertEqual(60, max_temp)
+
+
+async def test_discovery_removal_climate(hass, mqtt_mock, caplog):
+    """Test removal of discovered climate."""
+    await async_start(hass, 'homeassistant', {})
+    data = (
+        '{ "name": "Beer" }'
+    )
+    async_fire_mqtt_message(hass, 'homeassistant/climate/bla/config',
+                            data)
+    await hass.async_block_till_done()
+    state = hass.states.get('climate.beer')
+    assert state is not None
+    assert state.name == 'Beer'
+    async_fire_mqtt_message(hass, 'homeassistant/climate/bla/config',
+                            '')
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+    state = hass.states.get('climate.beer')
+    assert state is None

From 399040de469450f4d0a07f4ded0c3ea96bbfb51c Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Tue, 25 Sep 2018 17:19:46 +0200
Subject: [PATCH 288/357] Fix files left behind (#16855)

* Light demo test to not write entity registry

* Fix Manual MQTT alarm control panel
---
 .../alarm_control_panel/test_manual_mqtt.py   |   3 +-
 tests/components/light/test_demo.py           | 134 +++++++++---------
 2 files changed, 67 insertions(+), 70 deletions(-)

diff --git a/tests/components/alarm_control_panel/test_manual_mqtt.py b/tests/components/alarm_control_panel/test_manual_mqtt.py
index 5b601f089dd..0158381b526 100644
--- a/tests/components/alarm_control_panel/test_manual_mqtt.py
+++ b/tests/components/alarm_control_panel/test_manual_mqtt.py
@@ -1,7 +1,7 @@
 """The tests for the manual_mqtt Alarm Control Panel component."""
 from datetime import timedelta
 import unittest
-from unittest.mock import patch
+from unittest.mock import patch, Mock
 
 from homeassistant.setup import setup_component
 from homeassistant.const import (
@@ -23,6 +23,7 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
     def setUp(self):  # pylint: disable=invalid-name
         """Set up things to be run when tests are started."""
         self.hass = get_test_home_assistant()
+        self.hass.config_entries._async_schedule_save = Mock()
         self.mock_publish = mock_mqtt_component(self.hass)
 
     def tearDown(self):  # pylint: disable=invalid-name
diff --git a/tests/components/light/test_demo.py b/tests/components/light/test_demo.py
index db575bba5ba..c61bd83cde2 100644
--- a/tests/components/light/test_demo.py
+++ b/tests/components/light/test_demo.py
@@ -1,81 +1,77 @@
 """The tests for the demo light component."""
-# pylint: disable=protected-access
-import unittest
+import pytest
 
-from homeassistant.setup import setup_component
-import homeassistant.components.light as light
-
-from tests.common import get_test_home_assistant
+from homeassistant.setup import async_setup_component
+from homeassistant.components import light
 
 ENTITY_LIGHT = 'light.bed_light'
 
 
-class TestDemoLight(unittest.TestCase):
-    """Test the demo light."""
-
-    # pylint: disable=invalid-name
-    def setUp(self):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        self.assertTrue(setup_component(self.hass, light.DOMAIN, {'light': {
+@pytest.fixture(autouse=True)
+def setup_comp(hass):
+    """Set up demo component."""
+    hass.loop.run_until_complete(async_setup_component(hass, light.DOMAIN, {
+        'light': {
             'platform': 'demo',
         }}))
 
-    # pylint: disable=invalid-name
-    def tearDown(self):
-        """Stop down everything that was started."""
-        self.hass.stop()
 
-    def test_state_attributes(self):
-        """Test light state attributes."""
-        light.turn_on(
-            self.hass, ENTITY_LIGHT, xy_color=(.4, .4), brightness=25)
-        self.hass.block_till_done()
-        state = self.hass.states.get(ENTITY_LIGHT)
-        self.assertTrue(light.is_on(self.hass, ENTITY_LIGHT))
-        self.assertEqual((0.4, 0.4), state.attributes.get(
-            light.ATTR_XY_COLOR))
-        self.assertEqual(25, state.attributes.get(light.ATTR_BRIGHTNESS))
-        self.assertEqual(
-            (255, 234, 164), state.attributes.get(light.ATTR_RGB_COLOR))
-        self.assertEqual('rainbow', state.attributes.get(light.ATTR_EFFECT))
-        light.turn_on(
-            self.hass, ENTITY_LIGHT, rgb_color=(251, 253, 255),
-            white_value=254)
-        self.hass.block_till_done()
-        state = self.hass.states.get(ENTITY_LIGHT)
-        self.assertEqual(254, state.attributes.get(light.ATTR_WHITE_VALUE))
-        self.assertEqual(
-            (250, 252, 255), state.attributes.get(light.ATTR_RGB_COLOR))
-        self.assertEqual(
-            (0.319, 0.326), state.attributes.get(light.ATTR_XY_COLOR))
-        light.turn_on(self.hass, ENTITY_LIGHT, color_temp=400, effect='none')
-        self.hass.block_till_done()
-        state = self.hass.states.get(ENTITY_LIGHT)
-        self.assertEqual(400, state.attributes.get(light.ATTR_COLOR_TEMP))
-        self.assertEqual(153, state.attributes.get(light.ATTR_MIN_MIREDS))
-        self.assertEqual(500, state.attributes.get(light.ATTR_MAX_MIREDS))
-        self.assertEqual('none', state.attributes.get(light.ATTR_EFFECT))
-        light.turn_on(self.hass, ENTITY_LIGHT, kelvin=3000, brightness_pct=50)
-        self.hass.block_till_done()
-        state = self.hass.states.get(ENTITY_LIGHT)
-        self.assertEqual(333, state.attributes.get(light.ATTR_COLOR_TEMP))
-        self.assertEqual(127, state.attributes.get(light.ATTR_BRIGHTNESS))
+async def test_state_attributes(hass):
+    """Test light state attributes."""
+    light.async_turn_on(
+        hass, ENTITY_LIGHT, xy_color=(.4, .4), brightness=25)
+    await hass.async_block_till_done()
+    state = hass.states.get(ENTITY_LIGHT)
+    assert light.is_on(hass, ENTITY_LIGHT)
+    assert (0.4, 0.4) == state.attributes.get(light.ATTR_XY_COLOR)
+    assert 25 == state.attributes.get(light.ATTR_BRIGHTNESS)
+    assert (255, 234, 164) == state.attributes.get(light.ATTR_RGB_COLOR)
+    assert 'rainbow' == state.attributes.get(light.ATTR_EFFECT)
+    light.async_turn_on(
+        hass, ENTITY_LIGHT, rgb_color=(251, 253, 255),
+        white_value=254)
+    await hass.async_block_till_done()
+    state = hass.states.get(ENTITY_LIGHT)
+    assert 254 == state.attributes.get(light.ATTR_WHITE_VALUE)
+    assert (250, 252, 255) == state.attributes.get(light.ATTR_RGB_COLOR)
+    assert (0.319, 0.326) == state.attributes.get(light.ATTR_XY_COLOR)
+    light.async_turn_on(hass, ENTITY_LIGHT, color_temp=400, effect='none')
+    await hass.async_block_till_done()
+    state = hass.states.get(ENTITY_LIGHT)
+    assert 400 == state.attributes.get(light.ATTR_COLOR_TEMP)
+    assert 153 == state.attributes.get(light.ATTR_MIN_MIREDS)
+    assert 500 == state.attributes.get(light.ATTR_MAX_MIREDS)
+    assert 'none' == state.attributes.get(light.ATTR_EFFECT)
+    light.async_turn_on(hass, ENTITY_LIGHT, kelvin=3000, brightness_pct=50)
+    await hass.async_block_till_done()
+    state = hass.states.get(ENTITY_LIGHT)
+    assert 333 == state.attributes.get(light.ATTR_COLOR_TEMP)
+    assert 127 == state.attributes.get(light.ATTR_BRIGHTNESS)
 
-    def test_turn_off(self):
-        """Test light turn off method."""
-        light.turn_on(self.hass, ENTITY_LIGHT)
-        self.hass.block_till_done()
-        self.assertTrue(light.is_on(self.hass, ENTITY_LIGHT))
-        light.turn_off(self.hass, ENTITY_LIGHT)
-        self.hass.block_till_done()
-        self.assertFalse(light.is_on(self.hass, ENTITY_LIGHT))
 
-    def test_turn_off_without_entity_id(self):
-        """Test light turn off all lights."""
-        light.turn_on(self.hass, ENTITY_LIGHT)
-        self.hass.block_till_done()
-        self.assertTrue(light.is_on(self.hass, ENTITY_LIGHT))
-        light.turn_off(self.hass)
-        self.hass.block_till_done()
-        self.assertFalse(light.is_on(self.hass, ENTITY_LIGHT))
+async def test_turn_off(hass):
+    """Test light turn off method."""
+    await hass.services.async_call('light', 'turn_on', {
+        'entity_id': ENTITY_LIGHT
+    }, blocking=True)
+
+    assert light.is_on(hass, ENTITY_LIGHT)
+
+    await hass.services.async_call('light', 'turn_off', {
+        'entity_id': ENTITY_LIGHT
+    }, blocking=True)
+
+    assert not light.is_on(hass, ENTITY_LIGHT)
+
+
+async def test_turn_off_without_entity_id(hass):
+    """Test light turn off all lights."""
+    await hass.services.async_call('light', 'turn_on', {
+    }, blocking=True)
+
+    assert light.is_on(hass, ENTITY_LIGHT)
+
+    await hass.services.async_call('light', 'turn_off', {
+    }, blocking=True)
+
+    assert not light.is_on(hass, ENTITY_LIGHT)

From eb59f2dd3cdb94d9bc3481827132ae6787d4b6da Mon Sep 17 00:00:00 2001
From: emontnemery <erik@montnemery.com>
Date: Tue, 25 Sep 2018 19:32:04 +0200
Subject: [PATCH 289/357] Move MQTT discovery removal tests to platform test
 files (#16861)

---
 .../alarm_control_panel/test_mqtt.py          |  34 +++++-
 tests/components/binary_sensor/test_mqtt.py   |  22 ++++
 tests/components/light/test_mqtt.py           |  30 ++++-
 tests/components/mqtt/test_discovery.py       | 108 ------------------
 tests/components/switch/test_mqtt.py          |  28 +++++
 5 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/tests/components/alarm_control_panel/test_mqtt.py b/tests/components/alarm_control_panel/test_mqtt.py
index ce152a3d7c9..3a68b3cee44 100644
--- a/tests/components/alarm_control_panel/test_mqtt.py
+++ b/tests/components/alarm_control_panel/test_mqtt.py
@@ -7,10 +7,11 @@ from homeassistant.const import (
     STATE_ALARM_PENDING, STATE_ALARM_TRIGGERED, STATE_UNAVAILABLE,
     STATE_UNKNOWN)
 from homeassistant.components import alarm_control_panel
+from homeassistant.components.mqtt.discovery import async_start
 
 from tests.common import (
-    mock_mqtt_component, fire_mqtt_message, get_test_home_assistant,
-    assert_setup_component)
+    mock_mqtt_component, async_fire_mqtt_message, fire_mqtt_message,
+    get_test_home_assistant, assert_setup_component)
 
 CODE = 'HELLO_CODE'
 
@@ -239,3 +240,32 @@ class TestAlarmControlPanelMQTT(unittest.TestCase):
         self.assertEqual(STATE_UNAVAILABLE, state.state)
 
         fire_mqtt_message(self.hass, 'availability-topic', 'good')
+
+
+async def test_discovery_removal_alarm(hass, mqtt_mock, caplog):
+    """Test removal of discovered alarm_control_panel."""
+    await async_start(hass, 'homeassistant', {})
+
+    data = (
+        '{ "name": "Beer",'
+        '  "status_topic": "test_topic",'
+        '  "command_topic": "test_topic" }'
+    )
+
+    async_fire_mqtt_message(hass,
+                            'homeassistant/alarm_control_panel/bla/config',
+                            data)
+    await hass.async_block_till_done()
+
+    state = hass.states.get('alarm_control_panel.beer')
+    assert state is not None
+    assert state.name == 'Beer'
+
+    async_fire_mqtt_message(hass,
+                            'homeassistant/alarm_control_panel/bla/config',
+                            '')
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+
+    state = hass.states.get('alarm_control_panel.beer')
+    assert state is None
diff --git a/tests/components/binary_sensor/test_mqtt.py b/tests/components/binary_sensor/test_mqtt.py
index 0bc8c6c81fb..dfa01898ba4 100644
--- a/tests/components/binary_sensor/test_mqtt.py
+++ b/tests/components/binary_sensor/test_mqtt.py
@@ -4,6 +4,7 @@ import unittest
 import homeassistant.core as ha
 from homeassistant.setup import setup_component, async_setup_component
 import homeassistant.components.binary_sensor as binary_sensor
+from homeassistant.components.mqtt.discovery import async_start
 
 from homeassistant.const import STATE_OFF, STATE_ON
 from homeassistant.const import EVENT_STATE_CHANGED, STATE_UNAVAILABLE
@@ -226,3 +227,24 @@ async def test_unique_id(hass):
     async_fire_mqtt_message(hass, 'test-topic', 'payload')
     await hass.async_block_till_done()
     assert len(hass.states.async_all()) == 1
+
+
+async def test_discovery_removal_binary_sensor(hass, mqtt_mock, caplog):
+    """Test removal of discovered binary_sensor."""
+    await async_start(hass, 'homeassistant', {})
+    data = (
+        '{ "name": "Beer",'
+        '  "status_topic": "test_topic" }'
+    )
+    async_fire_mqtt_message(hass, 'homeassistant/binary_sensor/bla/config',
+                            data)
+    await hass.async_block_till_done()
+    state = hass.states.get('binary_sensor.beer')
+    assert state is not None
+    assert state.name == 'Beer'
+    async_fire_mqtt_message(hass, 'homeassistant/binary_sensor/bla/config',
+                            '')
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+    state = hass.states.get('binary_sensor.beer')
+    assert state is None
diff --git a/tests/components/light/test_mqtt.py b/tests/components/light/test_mqtt.py
index 1245411dcc4..3640a6a0130 100644
--- a/tests/components/light/test_mqtt.py
+++ b/tests/components/light/test_mqtt.py
@@ -146,10 +146,11 @@ from homeassistant.setup import setup_component
 from homeassistant.const import (
     STATE_ON, STATE_OFF, STATE_UNAVAILABLE, ATTR_ASSUMED_STATE)
 import homeassistant.components.light as light
+from homeassistant.components.mqtt.discovery import async_start
 import homeassistant.core as ha
 from tests.common import (
     assert_setup_component, get_test_home_assistant, mock_mqtt_component,
-    fire_mqtt_message, mock_coro)
+    async_fire_mqtt_message, fire_mqtt_message, mock_coro)
 
 
 class TestLightMQTT(unittest.TestCase):
@@ -876,3 +877,30 @@ class TestLightMQTT(unittest.TestCase):
 
         state = self.hass.states.get('light.test')
         self.assertEqual(STATE_UNAVAILABLE, state.state)
+
+
+async def test_discovery_removal_light(hass, mqtt_mock, caplog):
+    """Test removal of discovered light."""
+    await async_start(hass, 'homeassistant', {})
+
+    data = (
+        '{ "name": "Beer",'
+        '  "status_topic": "test_topic",'
+        '  "command_topic": "test_topic" }'
+    )
+
+    async_fire_mqtt_message(hass, 'homeassistant/light/bla/config',
+                            data)
+    await hass.async_block_till_done()
+
+    state = hass.states.get('light.beer')
+    assert state is not None
+    assert state.name == 'Beer'
+
+    async_fire_mqtt_message(hass, 'homeassistant/light/bla/config',
+                            '')
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+
+    state = hass.states.get('light.beer')
+    assert state is None
diff --git a/tests/components/mqtt/test_discovery.py b/tests/components/mqtt/test_discovery.py
index 0656bbdc300..9e0ef14a3fa 100644
--- a/tests/components/mqtt/test_discovery.py
+++ b/tests/components/mqtt/test_discovery.py
@@ -181,111 +181,3 @@ def test_non_duplicate_discovery(hass, mqtt_mock, caplog):
     assert state_duplicate is None
     assert 'Component has already been discovered: ' \
            'binary_sensor bla' in caplog.text
-
-
-@asyncio.coroutine
-def test_discovery_removal(hass, mqtt_mock, caplog):
-    """Test expansion of abbreviated discovery payload."""
-    yield from async_start(hass, 'homeassistant', {})
-
-    data = (
-        '{ "name": "Beer",'
-        '  "status_topic": "test_topic",'
-        '  "command_topic": "test_topic" }'
-    )
-
-    async_fire_mqtt_message(hass, 'homeassistant/switch/bla/config',
-                            data)
-    yield from hass.async_block_till_done()
-
-    state = hass.states.get('switch.beer')
-    assert state is not None
-    assert state.name == 'Beer'
-
-    async_fire_mqtt_message(hass, 'homeassistant/switch/bla/config',
-                            '')
-    yield from hass.async_block_till_done()
-    yield from hass.async_block_till_done()
-
-    state = hass.states.get('switch.beer')
-    assert state is None
-
-
-@asyncio.coroutine
-def test_discovery_removal_binary_sensor(hass, mqtt_mock, caplog):
-    """Test removal of discovered binary_sensor."""
-    yield from async_start(hass, 'homeassistant', {})
-    data = (
-        '{ "name": "Beer",'
-        '  "status_topic": "test_topic" }'
-    )
-    async_fire_mqtt_message(hass, 'homeassistant/binary_sensor/bla/config',
-                            data)
-    yield from hass.async_block_till_done()
-    state = hass.states.get('binary_sensor.beer')
-    assert state is not None
-    assert state.name == 'Beer'
-    async_fire_mqtt_message(hass, 'homeassistant/binary_sensor/bla/config',
-                            '')
-    yield from hass.async_block_till_done()
-    yield from hass.async_block_till_done()
-    state = hass.states.get('binary_sensor.beer')
-    assert state is None
-
-
-@asyncio.coroutine
-def test_discovery_removal_light(hass, mqtt_mock, caplog):
-    """Test removal of discovered light."""
-    yield from async_start(hass, 'homeassistant', {})
-
-    data = (
-        '{ "name": "Beer",'
-        '  "status_topic": "test_topic",'
-        '  "command_topic": "test_topic" }'
-    )
-
-    async_fire_mqtt_message(hass, 'homeassistant/light/bla/config',
-                            data)
-    yield from hass.async_block_till_done()
-
-    state = hass.states.get('light.beer')
-    assert state is not None
-    assert state.name == 'Beer'
-
-    async_fire_mqtt_message(hass, 'homeassistant/light/bla/config',
-                            '')
-    yield from hass.async_block_till_done()
-    yield from hass.async_block_till_done()
-
-    state = hass.states.get('light.beer')
-    assert state is None
-
-
-@asyncio.coroutine
-def test_discovery_removal_alarm(hass, mqtt_mock, caplog):
-    """Test removal of discovered alarm_control_panel."""
-    yield from async_start(hass, 'homeassistant', {})
-
-    data = (
-        '{ "name": "Beer",'
-        '  "status_topic": "test_topic",'
-        '  "command_topic": "test_topic" }'
-    )
-
-    async_fire_mqtt_message(hass,
-                            'homeassistant/alarm_control_panel/bla/config',
-                            data)
-    yield from hass.async_block_till_done()
-
-    state = hass.states.get('alarm_control_panel.beer')
-    assert state is not None
-    assert state.name == 'Beer'
-
-    async_fire_mqtt_message(hass,
-                            'homeassistant/alarm_control_panel/bla/config',
-                            '')
-    yield from hass.async_block_till_done()
-    yield from hass.async_block_till_done()
-
-    state = hass.states.get('alarm_control_panel.beer')
-    assert state is None
diff --git a/tests/components/switch/test_mqtt.py b/tests/components/switch/test_mqtt.py
index 321db7ed118..cad93e3bfce 100644
--- a/tests/components/switch/test_mqtt.py
+++ b/tests/components/switch/test_mqtt.py
@@ -7,6 +7,7 @@ from homeassistant.const import STATE_ON, STATE_OFF, STATE_UNAVAILABLE,\
     ATTR_ASSUMED_STATE
 import homeassistant.core as ha
 import homeassistant.components.switch as switch
+from homeassistant.components.mqtt.discovery import async_start
 from tests.common import (
     mock_mqtt_component, fire_mqtt_message, get_test_home_assistant, mock_coro,
     async_mock_mqtt_component, async_fire_mqtt_message)
@@ -306,3 +307,30 @@ async def test_unique_id(hass):
 
     assert len(hass.states.async_entity_ids()) == 2
     # all switches group is 1, unique id created is 1
+
+
+async def test_discovery_removal_switch(hass, mqtt_mock, caplog):
+    """Test expansion of discovered switch."""
+    await async_start(hass, 'homeassistant', {})
+
+    data = (
+        '{ "name": "Beer",'
+        '  "status_topic": "test_topic",'
+        '  "command_topic": "test_topic" }'
+    )
+
+    async_fire_mqtt_message(hass, 'homeassistant/switch/bla/config',
+                            data)
+    await hass.async_block_till_done()
+
+    state = hass.states.get('switch.beer')
+    assert state is not None
+    assert state.name == 'Beer'
+
+    async_fire_mqtt_message(hass, 'homeassistant/switch/bla/config',
+                            '')
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+
+    state = hass.states.get('switch.beer')
+    assert state is None

From 422ccc1a284f1076434e3a858840b7e8d387874d Mon Sep 17 00:00:00 2001
From: emontnemery <erik@montnemery.com>
Date: Tue, 25 Sep 2018 19:32:16 +0200
Subject: [PATCH 290/357] Remove discovered MQTT sensor device when discovery
 topic is cleared (#16860)

---
 homeassistant/components/sensor/mqtt.py | 25 +++++++++++++++++--------
 tests/components/sensor/test_mqtt.py    | 22 ++++++++++++++++++++++
 2 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/homeassistant/components/sensor/mqtt.py b/homeassistant/components/sensor/mqtt.py
index 6cf2d55755d..56e4055ea87 100644
--- a/homeassistant/components/sensor/mqtt.py
+++ b/homeassistant/components/sensor/mqtt.py
@@ -13,8 +13,9 @@ import voluptuous as vol
 
 from homeassistant.core import callback
 from homeassistant.components.mqtt import (
-    CONF_AVAILABILITY_TOPIC, CONF_STATE_TOPIC, CONF_PAYLOAD_AVAILABLE,
-    CONF_PAYLOAD_NOT_AVAILABLE, CONF_QOS, MqttAvailability)
+    ATTR_DISCOVERY_HASH, CONF_AVAILABILITY_TOPIC, CONF_STATE_TOPIC,
+    CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE, CONF_QOS,
+    MqttAvailability, MqttDiscoveryUpdate)
 from homeassistant.components.sensor import DEVICE_CLASSES_SCHEMA
 from homeassistant.const import (
     CONF_FORCE_UPDATE, CONF_NAME, CONF_VALUE_TEMPLATE, STATE_UNKNOWN,
@@ -60,6 +61,10 @@ async def async_setup_platform(hass: HomeAssistantType, config: ConfigType,
     if value_template is not None:
         value_template.hass = hass
 
+    discovery_hash = None
+    if discovery_info is not None and ATTR_DISCOVERY_HASH in discovery_info:
+        discovery_hash = discovery_info[ATTR_DISCOVERY_HASH]
+
     async_add_entities([MqttSensor(
         config.get(CONF_NAME),
         config.get(CONF_STATE_TOPIC),
@@ -75,20 +80,22 @@ async def async_setup_platform(hass: HomeAssistantType, config: ConfigType,
         config.get(CONF_AVAILABILITY_TOPIC),
         config.get(CONF_PAYLOAD_AVAILABLE),
         config.get(CONF_PAYLOAD_NOT_AVAILABLE),
+        discovery_hash,
     )])
 
 
-class MqttSensor(MqttAvailability, Entity):
+class MqttSensor(MqttAvailability, MqttDiscoveryUpdate, Entity):
     """Representation of a sensor that can be updated using MQTT."""
 
     def __init__(self, name, state_topic, qos, unit_of_measurement,
                  force_update, expire_after, icon, device_class: Optional[str],
                  value_template, json_attributes, unique_id: Optional[str],
-                 availability_topic, payload_available,
-                 payload_not_available):
+                 availability_topic, payload_available, payload_not_available,
+                 discovery_hash):
         """Initialize the sensor."""
-        super().__init__(availability_topic, qos, payload_available,
-                         payload_not_available)
+        MqttAvailability.__init__(self, availability_topic, qos,
+                                  payload_available, payload_not_available)
+        MqttDiscoveryUpdate.__init__(self, discovery_hash)
         self._state = STATE_UNKNOWN
         self._name = name
         self._state_topic = state_topic
@@ -103,10 +110,12 @@ class MqttSensor(MqttAvailability, Entity):
         self._json_attributes = set(json_attributes)
         self._unique_id = unique_id
         self._attributes = None
+        self._discovery_hash = discovery_hash
 
     async def async_added_to_hass(self):
         """Subscribe to MQTT events."""
-        await super().async_added_to_hass()
+        await MqttAvailability.async_added_to_hass(self)
+        await MqttDiscoveryUpdate.async_added_to_hass(self)
 
         @callback
         def message_received(topic, payload, qos):
diff --git a/tests/components/sensor/test_mqtt.py b/tests/components/sensor/test_mqtt.py
index feef647b7b7..527c92997ec 100644
--- a/tests/components/sensor/test_mqtt.py
+++ b/tests/components/sensor/test_mqtt.py
@@ -6,6 +6,7 @@ from unittest.mock import patch
 
 import homeassistant.core as ha
 from homeassistant.setup import setup_component, async_setup_component
+from homeassistant.components.mqtt.discovery import async_start
 import homeassistant.components.sensor as sensor
 from homeassistant.const import EVENT_STATE_CHANGED, STATE_UNAVAILABLE
 import homeassistant.util.dt as dt_util
@@ -387,3 +388,24 @@ async def test_unique_id(hass):
     await hass.async_block_till_done()
 
     assert len(hass.states.async_all()) == 1
+
+
+async def test_discovery_removal_sensor(hass, mqtt_mock, caplog):
+    """Test removal of discovered sensor."""
+    await async_start(hass, 'homeassistant', {})
+    data = (
+        '{ "name": "Beer",'
+        '  "status_topic": "test_topic" }'
+    )
+    async_fire_mqtt_message(hass, 'homeassistant/sensor/bla/config',
+                            data)
+    await hass.async_block_till_done()
+    state = hass.states.get('sensor.beer')
+    assert state is not None
+    assert state.name == 'Beer'
+    async_fire_mqtt_message(hass, 'homeassistant/sensor/bla/config',
+                            '')
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+    state = hass.states.get('sensor.beer')
+    assert state is None

From c3f58b8c746ff0acf3e5ec5e395a99af4e6ce604 Mon Sep 17 00:00:00 2001
From: emontnemery <erik@montnemery.com>
Date: Tue, 25 Sep 2018 19:32:25 +0200
Subject: [PATCH 291/357] Remove discovered MQTT lock device when discovery
 topic is cleared (#16859)

---
 homeassistant/components/lock/mqtt.py | 27 ++++++++++++++++++---------
 tests/components/lock/test_mqtt.py    | 25 ++++++++++++++++++++++++-
 2 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/homeassistant/components/lock/mqtt.py b/homeassistant/components/lock/mqtt.py
index 103864a6bfd..b9b094b615b 100644
--- a/homeassistant/components/lock/mqtt.py
+++ b/homeassistant/components/lock/mqtt.py
@@ -12,9 +12,9 @@ import voluptuous as vol
 from homeassistant.core import callback
 from homeassistant.components.lock import LockDevice
 from homeassistant.components.mqtt import (
-    CONF_AVAILABILITY_TOPIC, CONF_STATE_TOPIC, CONF_COMMAND_TOPIC,
-    CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE, CONF_QOS, CONF_RETAIN,
-    MqttAvailability)
+    ATTR_DISCOVERY_HASH, CONF_AVAILABILITY_TOPIC, CONF_STATE_TOPIC,
+    CONF_COMMAND_TOPIC, CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE,
+    CONF_QOS, CONF_RETAIN, MqttAvailability, MqttDiscoveryUpdate)
 from homeassistant.const import (
     CONF_NAME, CONF_OPTIMISTIC, CONF_VALUE_TEMPLATE)
 from homeassistant.components import mqtt
@@ -52,6 +52,10 @@ def async_setup_platform(hass, config, async_add_entities,
     if value_template is not None:
         value_template.hass = hass
 
+    discovery_hash = None
+    if discovery_info is not None and ATTR_DISCOVERY_HASH in discovery_info:
+        discovery_hash = discovery_info[ATTR_DISCOVERY_HASH]
+
     async_add_entities([MqttLock(
         config.get(CONF_NAME),
         config.get(CONF_STATE_TOPIC),
@@ -64,19 +68,22 @@ def async_setup_platform(hass, config, async_add_entities,
         value_template,
         config.get(CONF_AVAILABILITY_TOPIC),
         config.get(CONF_PAYLOAD_AVAILABLE),
-        config.get(CONF_PAYLOAD_NOT_AVAILABLE)
+        config.get(CONF_PAYLOAD_NOT_AVAILABLE),
+        discovery_hash,
     )])
 
 
-class MqttLock(MqttAvailability, LockDevice):
+class MqttLock(MqttAvailability, MqttDiscoveryUpdate, LockDevice):
     """Representation of a lock that can be toggled using MQTT."""
 
     def __init__(self, name, state_topic, command_topic, qos, retain,
                  payload_lock, payload_unlock, optimistic, value_template,
-                 availability_topic, payload_available, payload_not_available):
+                 availability_topic, payload_available, payload_not_available,
+                 discovery_hash):
         """Initialize the lock."""
-        super().__init__(availability_topic, qos, payload_available,
-                         payload_not_available)
+        MqttAvailability.__init__(self, availability_topic, qos,
+                                  payload_available, payload_not_available)
+        MqttDiscoveryUpdate.__init__(self, discovery_hash)
         self._state = False
         self._name = name
         self._state_topic = state_topic
@@ -87,11 +94,13 @@ class MqttLock(MqttAvailability, LockDevice):
         self._payload_unlock = payload_unlock
         self._optimistic = optimistic
         self._template = value_template
+        self._discovery_hash = discovery_hash
 
     @asyncio.coroutine
     def async_added_to_hass(self):
         """Subscribe to MQTT events."""
-        yield from super().async_added_to_hass()
+        yield from MqttAvailability.async_added_to_hass(self)
+        yield from MqttDiscoveryUpdate.async_added_to_hass(self)
 
         @callback
         def message_received(topic, payload, qos):
diff --git a/tests/components/lock/test_mqtt.py b/tests/components/lock/test_mqtt.py
index 4ef8532f39e..f85c6a11774 100644
--- a/tests/components/lock/test_mqtt.py
+++ b/tests/components/lock/test_mqtt.py
@@ -5,8 +5,10 @@ from homeassistant.setup import setup_component
 from homeassistant.const import (
     STATE_LOCKED, STATE_UNLOCKED, STATE_UNAVAILABLE, ATTR_ASSUMED_STATE)
 import homeassistant.components.lock as lock
+from homeassistant.components.mqtt.discovery import async_start
 from tests.common import (
-    mock_mqtt_component, fire_mqtt_message, get_test_home_assistant)
+    mock_mqtt_component, async_fire_mqtt_message, fire_mqtt_message,
+    get_test_home_assistant)
 
 
 class TestLockMQTT(unittest.TestCase):
@@ -172,3 +174,24 @@ class TestLockMQTT(unittest.TestCase):
 
         state = self.hass.states.get('lock.test')
         self.assertEqual(STATE_UNAVAILABLE, state.state)
+
+
+async def test_discovery_removal_lock(hass, mqtt_mock, caplog):
+    """Test removal of discovered lock."""
+    await async_start(hass, 'homeassistant', {})
+    data = (
+        '{ "name": "Beer",'
+        '  "command_topic": "test_topic" }'
+    )
+    async_fire_mqtt_message(hass, 'homeassistant/lock/bla/config',
+                            data)
+    await hass.async_block_till_done()
+    state = hass.states.get('lock.beer')
+    assert state is not None
+    assert state.name == 'Beer'
+    async_fire_mqtt_message(hass, 'homeassistant/lock/bla/config',
+                            '')
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+    state = hass.states.get('lock.beer')
+    assert state is None

From 4a265f37e01682730905409754336adb9fc59b2e Mon Sep 17 00:00:00 2001
From: emontnemery <erik@montnemery.com>
Date: Tue, 25 Sep 2018 19:32:31 +0200
Subject: [PATCH 292/357] Remove discovered MQTT fan device when discovery
 topic is cleared (#16858)

---
 homeassistant/components/fan/mqtt.py | 24 ++++++++++++++++--------
 tests/components/fan/test_mqtt.py    | 25 ++++++++++++++++++++++++-
 2 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/homeassistant/components/fan/mqtt.py b/homeassistant/components/fan/mqtt.py
index db3cfab3608..4ff8e1ec757 100644
--- a/homeassistant/components/fan/mqtt.py
+++ b/homeassistant/components/fan/mqtt.py
@@ -14,9 +14,9 @@ from homeassistant.const import (
     CONF_NAME, CONF_OPTIMISTIC, CONF_STATE, STATE_ON, STATE_OFF,
     CONF_PAYLOAD_OFF, CONF_PAYLOAD_ON)
 from homeassistant.components.mqtt import (
-    CONF_AVAILABILITY_TOPIC, CONF_STATE_TOPIC, CONF_COMMAND_TOPIC,
-    CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE, CONF_QOS, CONF_RETAIN,
-    MqttAvailability)
+    ATTR_DISCOVERY_HASH, CONF_AVAILABILITY_TOPIC, CONF_STATE_TOPIC,
+    CONF_COMMAND_TOPIC, CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE,
+    CONF_QOS, CONF_RETAIN, MqttAvailability, MqttDiscoveryUpdate)
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.typing import HomeAssistantType, ConfigType
 from homeassistant.components.fan import (SPEED_LOW, SPEED_MEDIUM,
@@ -83,6 +83,10 @@ async def async_setup_platform(hass: HomeAssistantType, config: ConfigType,
     if discovery_info is not None:
         config = PLATFORM_SCHEMA(discovery_info)
 
+    discovery_hash = None
+    if discovery_info is not None and ATTR_DISCOVERY_HASH in discovery_info:
+        discovery_hash = discovery_info[ATTR_DISCOVERY_HASH]
+
     async_add_entities([MqttFan(
         config.get(CONF_NAME),
         {
@@ -116,18 +120,20 @@ async def async_setup_platform(hass: HomeAssistantType, config: ConfigType,
         config.get(CONF_AVAILABILITY_TOPIC),
         config.get(CONF_PAYLOAD_AVAILABLE),
         config.get(CONF_PAYLOAD_NOT_AVAILABLE),
+        discovery_hash,
     )])
 
 
-class MqttFan(MqttAvailability, FanEntity):
+class MqttFan(MqttAvailability, MqttDiscoveryUpdate, FanEntity):
     """A MQTT fan component."""
 
     def __init__(self, name, topic, templates, qos, retain, payload,
                  speed_list, optimistic, availability_topic, payload_available,
-                 payload_not_available):
+                 payload_not_available, discovery_hash):
         """Initialize the MQTT fan."""
-        super().__init__(availability_topic, qos, payload_available,
-                         payload_not_available)
+        MqttAvailability.__init__(self, availability_topic, qos,
+                                  payload_available, payload_not_available)
+        MqttDiscoveryUpdate.__init__(self, discovery_hash)
         self._name = name
         self._topic = topic
         self._qos = qos
@@ -148,10 +154,12 @@ class MqttFan(MqttAvailability, FanEntity):
                                      is not None and SUPPORT_OSCILLATE)
         self._supported_features |= (topic[CONF_SPEED_STATE_TOPIC]
                                      is not None and SUPPORT_SET_SPEED)
+        self._discovery_hash = discovery_hash
 
     async def async_added_to_hass(self):
         """Subscribe to MQTT events."""
-        await super().async_added_to_hass()
+        await MqttAvailability.async_added_to_hass(self)
+        await MqttDiscoveryUpdate.async_added_to_hass(self)
 
         templates = {}
         for key, tpl in list(self._templates.items()):
diff --git a/tests/components/fan/test_mqtt.py b/tests/components/fan/test_mqtt.py
index 7f69e56218b..5f59ebe4a76 100644
--- a/tests/components/fan/test_mqtt.py
+++ b/tests/components/fan/test_mqtt.py
@@ -3,10 +3,12 @@ import unittest
 
 from homeassistant.setup import setup_component
 from homeassistant.components import fan
+from homeassistant.components.mqtt.discovery import async_start
 from homeassistant.const import ATTR_ASSUMED_STATE, STATE_UNAVAILABLE
 
 from tests.common import (
-    mock_mqtt_component, fire_mqtt_message, get_test_home_assistant)
+    mock_mqtt_component, async_fire_mqtt_message, fire_mqtt_message,
+    get_test_home_assistant)
 
 
 class TestMqttFan(unittest.TestCase):
@@ -102,3 +104,24 @@ class TestMqttFan(unittest.TestCase):
 
         state = self.hass.states.get('fan.test')
         self.assertNotEqual(STATE_UNAVAILABLE, state.state)
+
+
+async def test_discovery_removal_fan(hass, mqtt_mock, caplog):
+    """Test removal of discovered fan."""
+    await async_start(hass, 'homeassistant', {})
+    data = (
+        '{ "name": "Beer",'
+        '  "command_topic": "test_topic" }'
+    )
+    async_fire_mqtt_message(hass, 'homeassistant/fan/bla/config',
+                            data)
+    await hass.async_block_till_done()
+    state = hass.states.get('fan.beer')
+    assert state is not None
+    assert state.name == 'Beer'
+    async_fire_mqtt_message(hass, 'homeassistant/fan/bla/config',
+                            '')
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+    state = hass.states.get('fan.beer')
+    assert state is None

From 4501bdb4a0dd7dccb1bde69e15c1878d2c4480a8 Mon Sep 17 00:00:00 2001
From: emontnemery <erik@montnemery.com>
Date: Tue, 25 Sep 2018 19:32:42 +0200
Subject: [PATCH 293/357] Remove discovered MQTT cover device when discovery
 topic is cleared (#16857)

---
 homeassistant/components/cover/mqtt.py | 26 +++++++++++-----
 tests/components/cover/test_mqtt.py    | 41 ++++++++++++++++++++------
 2 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/homeassistant/components/cover/mqtt.py b/homeassistant/components/cover/mqtt.py
index 977353cb318..ae1162f7120 100644
--- a/homeassistant/components/cover/mqtt.py
+++ b/homeassistant/components/cover/mqtt.py
@@ -20,9 +20,10 @@ from homeassistant.const import (
     CONF_NAME, CONF_VALUE_TEMPLATE, CONF_OPTIMISTIC, STATE_OPEN,
     STATE_CLOSED, STATE_UNKNOWN)
 from homeassistant.components.mqtt import (
-    CONF_AVAILABILITY_TOPIC, CONF_STATE_TOPIC, CONF_COMMAND_TOPIC,
-    CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE, CONF_QOS, CONF_RETAIN,
-    valid_publish_topic, valid_subscribe_topic, MqttAvailability)
+    ATTR_DISCOVERY_HASH, CONF_AVAILABILITY_TOPIC, CONF_STATE_TOPIC,
+    CONF_COMMAND_TOPIC, CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE,
+    CONF_QOS, CONF_RETAIN, valid_publish_topic, valid_subscribe_topic,
+    MqttAvailability, MqttDiscoveryUpdate)
 import homeassistant.helpers.config_validation as cv
 
 _LOGGER = logging.getLogger(__name__)
@@ -105,6 +106,10 @@ async def async_setup_platform(hass, config, async_add_entities,
     if set_position_template is not None:
         set_position_template.hass = hass
 
+    discovery_hash = None
+    if discovery_info is not None and ATTR_DISCOVERY_HASH in discovery_info:
+        discovery_hash = discovery_info[ATTR_DISCOVERY_HASH]
+
     async_add_entities([MqttCover(
         config.get(CONF_NAME),
         config.get(CONF_STATE_TOPIC),
@@ -131,10 +136,11 @@ async def async_setup_platform(hass, config, async_add_entities,
         config.get(CONF_TILT_INVERT_STATE),
         config.get(CONF_POSITION_TOPIC),
         set_position_template,
+        discovery_hash,
     )])
 
 
-class MqttCover(MqttAvailability, CoverDevice):
+class MqttCover(MqttAvailability, MqttDiscoveryUpdate, CoverDevice):
     """Representation of a cover that can be controlled using MQTT."""
 
     def __init__(self, name, state_topic, command_topic, availability_topic,
@@ -143,10 +149,12 @@ class MqttCover(MqttAvailability, CoverDevice):
                  payload_stop, payload_available, payload_not_available,
                  optimistic, value_template, tilt_open_position,
                  tilt_closed_position, tilt_min, tilt_max, tilt_optimistic,
-                 tilt_invert, position_topic, set_position_template):
+                 tilt_invert, position_topic, set_position_template,
+                 discovery_hash):
         """Initialize the cover."""
-        super().__init__(availability_topic, qos, payload_available,
-                         payload_not_available)
+        MqttAvailability.__init__(self, availability_topic, qos,
+                                  payload_available, payload_not_available)
+        MqttDiscoveryUpdate.__init__(self, discovery_hash)
         self._position = None
         self._state = None
         self._name = name
@@ -172,10 +180,12 @@ class MqttCover(MqttAvailability, CoverDevice):
         self._tilt_invert = tilt_invert
         self._position_topic = position_topic
         self._set_position_template = set_position_template
+        self._discovery_hash = discovery_hash
 
     async def async_added_to_hass(self):
         """Subscribe MQTT events."""
-        await super().async_added_to_hass()
+        await MqttAvailability.async_added_to_hass(self)
+        await MqttDiscoveryUpdate.async_added_to_hass(self)
 
         @callback
         def tilt_updated(topic, payload, qos):
diff --git a/tests/components/cover/test_mqtt.py b/tests/components/cover/test_mqtt.py
index ad68c2416ca..e75178bf3d7 100644
--- a/tests/components/cover/test_mqtt.py
+++ b/tests/components/cover/test_mqtt.py
@@ -6,9 +6,11 @@ from homeassistant.const import STATE_OPEN, STATE_CLOSED, STATE_UNKNOWN, \
     STATE_UNAVAILABLE, ATTR_ASSUMED_STATE
 import homeassistant.components.cover as cover
 from homeassistant.components.cover.mqtt import MqttCover
+from homeassistant.components.mqtt.discovery import async_start
 
 from tests.common import (
-    get_test_home_assistant, mock_mqtt_component, fire_mqtt_message)
+    get_test_home_assistant, mock_mqtt_component, async_fire_mqtt_message,
+    fire_mqtt_message)
 
 
 class TestCoverMQTT(unittest.TestCase):
@@ -579,7 +581,7 @@ class TestCoverMQTT(unittest.TestCase):
             'cover.test', 'state-topic', 'command-topic', None,
             'tilt-command-topic', 'tilt-status-topic', 0, False,
             'OPEN', 'CLOSE', 'OPEN', 'CLOSE', 'STOP', None, None,
-            False, None, 100, 0, 0, 100, False, False, None, None)
+            False, None, 100, 0, 0, 100, False, False, None, None, None)
 
         self.assertEqual(44, mqtt_cover.find_percentage_in_range(44))
 
@@ -589,7 +591,7 @@ class TestCoverMQTT(unittest.TestCase):
             'cover.test', 'state-topic', 'command-topic', None,
             'tilt-command-topic', 'tilt-status-topic', 0, False,
             'OPEN', 'CLOSE', 'OPEN', 'CLOSE', 'STOP', None, None,
-            False, None, 180, 80, 80, 180, False, False, None, None)
+            False, None, 180, 80, 80, 180, False, False, None, None, None)
 
         self.assertEqual(40, mqtt_cover.find_percentage_in_range(120))
 
@@ -599,7 +601,7 @@ class TestCoverMQTT(unittest.TestCase):
             'cover.test', 'state-topic', 'command-topic', None,
             'tilt-command-topic', 'tilt-status-topic', 0, False,
             'OPEN', 'CLOSE', 'OPEN', 'CLOSE', 'STOP', None, None,
-            False, None, 100, 0, 0, 100, False, True, None, None)
+            False, None, 100, 0, 0, 100, False, True, None, None, None)
 
         self.assertEqual(56, mqtt_cover.find_percentage_in_range(44))
 
@@ -609,7 +611,7 @@ class TestCoverMQTT(unittest.TestCase):
             'cover.test', 'state-topic', 'command-topic', None,
             'tilt-command-topic', 'tilt-status-topic', 0, False,
             'OPEN', 'CLOSE', 'OPEN', 'CLOSE', 'STOP', None, None,
-            False, None, 180, 80, 80, 180, False, True, None, None)
+            False, None, 180, 80, 80, 180, False, True, None, None, None)
 
         self.assertEqual(60, mqtt_cover.find_percentage_in_range(120))
 
@@ -619,7 +621,7 @@ class TestCoverMQTT(unittest.TestCase):
             'cover.test', 'state-topic', 'command-topic', None,
             'tilt-command-topic', 'tilt-status-topic', 0, False,
             'OPEN', 'CLOSE', 'OPEN', 'CLOSE', 'STOP', None, None,
-            False, None, 100, 0, 0, 100, False, False, None, None)
+            False, None, 100, 0, 0, 100, False, False, None, None, None)
 
         self.assertEqual(44, mqtt_cover.find_in_range_from_percent(44))
 
@@ -629,7 +631,7 @@ class TestCoverMQTT(unittest.TestCase):
             'cover.test', 'state-topic', 'command-topic', None,
             'tilt-command-topic', 'tilt-status-topic', 0, False,
             'OPEN', 'CLOSE', 'OPEN', 'CLOSE', 'STOP', None, None,
-            False, None, 180, 80, 80, 180, False, False, None, None)
+            False, None, 180, 80, 80, 180, False, False, None, None, None)
 
         self.assertEqual(120, mqtt_cover.find_in_range_from_percent(40))
 
@@ -639,7 +641,7 @@ class TestCoverMQTT(unittest.TestCase):
             'cover.test', 'state-topic', 'command-topic', None,
             'tilt-command-topic', 'tilt-status-topic', 0, False,
             'OPEN', 'CLOSE', 'OPEN', 'CLOSE', 'STOP', None, None,
-            False, None, 100, 0, 0, 100, False, True, None, None)
+            False, None, 100, 0, 0, 100, False, True, None, None, None)
 
         self.assertEqual(44, mqtt_cover.find_in_range_from_percent(56))
 
@@ -649,7 +651,7 @@ class TestCoverMQTT(unittest.TestCase):
             'cover.test', 'state-topic', 'command-topic', None,
             'tilt-command-topic', 'tilt-status-topic', 0, False,
             'OPEN', 'CLOSE', 'OPEN', 'CLOSE', 'STOP', None, None,
-            False, None, 180, 80, 80, 180, False, True, None, None)
+            False, None, 180, 80, 80, 180, False, True, None, None, None)
 
         self.assertEqual(120, mqtt_cover.find_in_range_from_percent(60))
 
@@ -722,3 +724,24 @@ class TestCoverMQTT(unittest.TestCase):
 
         state = self.hass.states.get('cover.test')
         self.assertEqual(STATE_UNAVAILABLE, state.state)
+
+
+async def test_discovery_removal_cover(hass, mqtt_mock, caplog):
+    """Test removal of discovered cover."""
+    await async_start(hass, 'homeassistant', {})
+    data = (
+        '{ "name": "Beer",'
+        '  "command_topic": "test_topic" }'
+    )
+    async_fire_mqtt_message(hass, 'homeassistant/cover/bla/config',
+                            data)
+    await hass.async_block_till_done()
+    state = hass.states.get('cover.beer')
+    assert state is not None
+    assert state.name == 'Beer'
+    async_fire_mqtt_message(hass, 'homeassistant/cover/bla/config',
+                            '')
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+    state = hass.states.get('cover.beer')
+    assert state is None

From 7de0e1e39a8eafd0f8458588488cb416908e22aa Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Tue, 25 Sep 2018 20:47:22 +0200
Subject: [PATCH 294/357] Add executor job (#16853)

---
 homeassistant/components/lovelace/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/components/lovelace/__init__.py b/homeassistant/components/lovelace/__init__.py
index 4336f50def4..eba69159048 100644
--- a/homeassistant/components/lovelace/__init__.py
+++ b/homeassistant/components/lovelace/__init__.py
@@ -34,7 +34,7 @@ async def websocket_lovelace_config(hass, connection, msg):
     """Send lovelace UI config over websocket config."""
     error = None
     try:
-        config = await hass.async_add_job(
+        config = await hass.async_add_executor_job(
             load_yaml, hass.config.path('ui-lovelace.yaml'))
         message = websocket_api.result_message(
             msg['id'], config

From 5a22e7d2115ea1ae25278df2e62bf98ee8b0e440 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Tue, 25 Sep 2018 20:47:51 +0200
Subject: [PATCH 295/357] Fail if dirty (#16839)

* Fail if dirty

* Update check_dirty

* Update text

* Fix comment

* Add -e

* Update dirty script
---
 script/check_dirty | 7 +++++++
 tox.ini            | 2 ++
 2 files changed, 9 insertions(+)
 create mode 100755 script/check_dirty

diff --git a/script/check_dirty b/script/check_dirty
new file mode 100755
index 00000000000..94db657a542
--- /dev/null
+++ b/script/check_dirty
@@ -0,0 +1,7 @@
+#!/bin/bash
+[[ -z $(git ls-files --others --exclude-standard) ]] && exit 0
+
+echo -e '\n***** ERROR\nTests are leaving files behind. Please update the tests to avoid writing any files:'
+git ls-files --others --exclude-standard
+echo
+exit 1
diff --git a/tox.ini b/tox.ini
index 60dacd5d8cb..dcfb209ef3a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,6 +13,7 @@ whitelist_externals = /usr/bin/env
 install_command = /usr/bin/env LANG=C.UTF-8 pip install {opts} {packages}
 commands =
      pytest --timeout=9 --duration=10 {posargs}
+     {toxinidir}/script/check_dirty
 deps =
      -r{toxinidir}/requirements_test_all.txt
      -c{toxinidir}/homeassistant/package_constraints.txt
@@ -29,6 +30,7 @@ whitelist_externals = /usr/bin/env
 install_command = /usr/bin/env LANG=C.UTF-8 pip install {opts} {packages}
 commands =
      pytest --timeout=9 --duration=10 --cov --cov-report= {posargs}
+     {toxinidir}/script/check_dirty
 deps =
      -r{toxinidir}/requirements_test_all.txt
      -c{toxinidir}/homeassistant/package_constraints.txt

From 8e311686d0cfeafa04345eeaa670f442ce43d2d1 Mon Sep 17 00:00:00 2001
From: Jedmeng <roy.urey@gmail.com>
Date: Wed, 26 Sep 2018 02:49:37 +0800
Subject: [PATCH 296/357] Add support for Opple light (#16765)

* Add support for Opple light

* Update docstring

* review fix

* review fix

* review fix
---
 .coveragerc                             |   1 +
 homeassistant/components/light/opple.py | 147 ++++++++++++++++++++++++
 requirements_all.txt                    |   3 +
 3 files changed, 151 insertions(+)
 create mode 100644 homeassistant/components/light/opple.py

diff --git a/.coveragerc b/.coveragerc
index defbc0022bd..a935564791a 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -510,6 +510,7 @@ omit =
     homeassistant/components/light/lw12wifi.py
     homeassistant/components/light/mystrom.py
     homeassistant/components/light/nanoleaf_aurora.py
+    homeassistant/components/light/opple.py
     homeassistant/components/light/osramlightify.py
     homeassistant/components/light/piglow.py
     homeassistant/components/light/rpi_gpio_pwm.py
diff --git a/homeassistant/components/light/opple.py b/homeassistant/components/light/opple.py
new file mode 100644
index 00000000000..66850d04406
--- /dev/null
+++ b/homeassistant/components/light/opple.py
@@ -0,0 +1,147 @@
+"""
+Support for the Opple light.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/light.opple/
+"""
+
+import logging
+
+import voluptuous as vol
+
+from homeassistant.components.light import (
+    ATTR_BRIGHTNESS, ATTR_COLOR_TEMP, PLATFORM_SCHEMA, SUPPORT_BRIGHTNESS,
+    SUPPORT_COLOR_TEMP, Light)
+from homeassistant.const import CONF_HOST, CONF_NAME
+import homeassistant.helpers.config_validation as cv
+from homeassistant.util.color import \
+    color_temperature_kelvin_to_mired as kelvin_to_mired
+from homeassistant.util.color import \
+    color_temperature_mired_to_kelvin as mired_to_kelvin
+
+REQUIREMENTS = ['pyoppleio==1.0.5']
+
+_LOGGER = logging.getLogger(__name__)
+
+DEFAULT_NAME = "opple light"
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_HOST): cv.string,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string
+})
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Set up Opple light platform."""
+    name = config[CONF_NAME]
+    host = config[CONF_HOST]
+    entity = OppleLight(name, host)
+    add_entities([entity])
+
+    _LOGGER.debug("Init light %s %s", host, entity.unique_id)
+
+
+class OppleLight(Light):
+    """Opple light device."""
+
+    def __init__(self, name, host):
+        """Initialize an Opple light."""
+        from pyoppleio.OppleLightDevice import OppleLightDevice
+        self._device = OppleLightDevice(host)
+
+        self._name = name
+        self._is_on = None
+        self._brightness = None
+        self._color_temp = None
+
+    @property
+    def available(self):
+        """Return True if light is available."""
+        return self._device.is_online
+
+    @property
+    def unique_id(self):
+        """Return unique ID for light."""
+        return self._device.mac
+
+    @property
+    def name(self):
+        """Return the display name of this light."""
+        return self._name
+
+    @property
+    def is_on(self):
+        """Return true if light is on."""
+        return self._is_on
+
+    @property
+    def brightness(self):
+        """Return the brightness of the light."""
+        return self._brightness
+
+    @property
+    def color_temp(self):
+        """Return the color temperature of this light."""
+        return kelvin_to_mired(self._color_temp)
+
+    @property
+    def min_mireds(self):
+        """Return minimum supported color temperature."""
+        return 175
+
+    @property
+    def max_mireds(self):
+        """Return maximum supported color temperature."""
+        return 333
+
+    @property
+    def supported_features(self):
+        """Flag supported features."""
+        return SUPPORT_BRIGHTNESS | SUPPORT_COLOR_TEMP
+
+    def turn_on(self, **kwargs):
+        """Instruct the light to turn on."""
+        _LOGGER.debug("Turn on light %s %s", self._device.ip, kwargs)
+        if not self.is_on:
+            self._device.power_on = True
+
+        if ATTR_BRIGHTNESS in kwargs and \
+                self.brightness != kwargs[ATTR_BRIGHTNESS]:
+            self._device.brightness = kwargs[ATTR_BRIGHTNESS]
+
+        if ATTR_COLOR_TEMP in kwargs and \
+                self.brightness != kwargs[ATTR_COLOR_TEMP]:
+            color_temp = mired_to_kelvin(kwargs[ATTR_COLOR_TEMP])
+            self._device.color_temperature = color_temp
+
+    def turn_off(self, **kwargs):
+        """Instruct the light to turn off."""
+        self._device.power_on = False
+        _LOGGER.debug("Turn off light %s", self._device.ip)
+
+    def update(self):
+        """Synchronize state with light."""
+        prev_available = self.available
+        self._device.update()
+
+        if prev_available == self.available and \
+                self._is_on == self._device.power_on and \
+                self._brightness == self._device.brightness and \
+                self._color_temp == self._device.color_temperature:
+            return
+
+        if not self.available:
+            _LOGGER.debug("Light %s is offline", self._device.ip)
+            return
+
+        self._is_on = self._device.power_on
+        self._brightness = self._device.brightness
+        self._color_temp = self._device.color_temperature
+
+        if not self.is_on:
+            _LOGGER.debug("Update light %s success: power off",
+                          self._device.ip)
+        else:
+            _LOGGER.debug("Update light %s success: power on brightness %s "
+                          "color temperature %s",
+                          self._device.ip, self._brightness, self._color_temp)
diff --git a/requirements_all.txt b/requirements_all.txt
index 40d4442dee2..b6f9dd4875e 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1014,6 +1014,9 @@ pynx584==0.4
 # homeassistant.components.openuv
 pyopenuv==1.0.4
 
+# homeassistant.components.light.opple
+pyoppleio==1.0.5
+
 # homeassistant.components.iota
 pyota==2.0.5
 

From 7eaf8640d09b792f70b830ca82fe2dbc5eb267e3 Mon Sep 17 00:00:00 2001
From: cdce8p <30130371+cdce8p@users.noreply.github.com>
Date: Tue, 25 Sep 2018 22:32:05 +0200
Subject: [PATCH 297/357] Update cover tests (#16832)

* Update test_group
* Update test_command_line
* Update test_demo
* Update test_mqtt
* Update test_template
* Remove cover service call helpers
---
 homeassistant/components/cover/__init__.py  |  58 ---
 tests/components/cover/test_command_line.py | 126 ++---
 tests/components/cover/test_demo.py         | 303 ++++++-----
 tests/components/cover/test_group.py        | 551 ++++++++++----------
 tests/components/cover/test_mqtt.py         |  65 ++-
 tests/components/cover/test_template.py     |  81 ++-
 6 files changed, 595 insertions(+), 589 deletions(-)

diff --git a/homeassistant/components/cover/__init__.py b/homeassistant/components/cover/__init__.py
index e9a33c27d34..ec11b139f6b 100644
--- a/homeassistant/components/cover/__init__.py
+++ b/homeassistant/components/cover/__init__.py
@@ -81,64 +81,6 @@ def is_closed(hass, entity_id=None):
     return hass.states.is_state(entity_id, STATE_CLOSED)
 
 
-@bind_hass
-def open_cover(hass, entity_id=None):
-    """Open all or specified cover."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
-    hass.services.call(DOMAIN, SERVICE_OPEN_COVER, data)
-
-
-@bind_hass
-def close_cover(hass, entity_id=None):
-    """Close all or specified cover."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
-    hass.services.call(DOMAIN, SERVICE_CLOSE_COVER, data)
-
-
-@bind_hass
-def set_cover_position(hass, position, entity_id=None):
-    """Move to specific position all or specified cover."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
-    data[ATTR_POSITION] = position
-    hass.services.call(DOMAIN, SERVICE_SET_COVER_POSITION, data)
-
-
-@bind_hass
-def stop_cover(hass, entity_id=None):
-    """Stop all or specified cover."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
-    hass.services.call(DOMAIN, SERVICE_STOP_COVER, data)
-
-
-@bind_hass
-def open_cover_tilt(hass, entity_id=None):
-    """Open all or specified cover tilt."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
-    hass.services.call(DOMAIN, SERVICE_OPEN_COVER_TILT, data)
-
-
-@bind_hass
-def close_cover_tilt(hass, entity_id=None):
-    """Close all or specified cover tilt."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
-    hass.services.call(DOMAIN, SERVICE_CLOSE_COVER_TILT, data)
-
-
-@bind_hass
-def set_cover_tilt_position(hass, tilt_position, entity_id=None):
-    """Move to specific tilt position all or specified cover."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
-    data[ATTR_TILT_POSITION] = tilt_position
-    hass.services.call(DOMAIN, SERVICE_SET_COVER_TILT_POSITION, data)
-
-
-@bind_hass
-def stop_cover_tilt(hass, entity_id=None):
-    """Stop all or specified cover tilt."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
-    hass.services.call(DOMAIN, SERVICE_STOP_COVER_TILT, data)
-
-
 async def async_setup(hass, config):
     """Track states and offer events for covers."""
     component = hass.data[DOMAIN] = EntityComponent(
diff --git a/tests/components/cover/test_command_line.py b/tests/components/cover/test_command_line.py
index 346c3f94683..0e03539d58c 100644
--- a/tests/components/cover/test_command_line.py
+++ b/tests/components/cover/test_command_line.py
@@ -1,87 +1,75 @@
 """The tests the cover command line platform."""
-
 import os
 import tempfile
-import unittest
 from unittest import mock
 
-from homeassistant.setup import setup_component
-import homeassistant.components.cover as cover
-from homeassistant.components.cover import (
-    command_line as cmd_rs)
+import pytest
 
-from tests.common import get_test_home_assistant
+from homeassistant.components.cover import DOMAIN
+import homeassistant.components.cover.command_line as cmd_rs
+from homeassistant.const import (
+    ATTR_ENTITY_ID, SERVICE_CLOSE_COVER, SERVICE_OPEN_COVER,
+    SERVICE_STOP_COVER)
+from homeassistant.setup import async_setup_component
 
 
-class TestCommandCover(unittest.TestCase):
-    """Test the cover command line platform."""
+@pytest.fixture
+def rs(hass):
+    """Return CommandCover instance."""
+    return cmd_rs.CommandCover(hass, 'foo', 'command_open', 'command_close',
+                               'command_stop', 'command_state', None)
 
-    def setup_method(self, method):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        self.rs = cmd_rs.CommandCover(self.hass, 'foo',
-                                      'command_open', 'command_close',
-                                      'command_stop', 'command_state',
-                                      None)
 
-    def teardown_method(self, method):
-        """Stop down everything that was started."""
-        self.hass.stop()
+def test_should_poll_new(rs):
+    """Test the setting of polling."""
+    assert rs.should_poll is True
+    rs._command_state = None
+    assert rs.should_poll is False
 
-    def test_should_poll(self):
-        """Test the setting of polling."""
-        self.assertTrue(self.rs.should_poll)
-        self.rs._command_state = None
-        self.assertFalse(self.rs.should_poll)
 
-    def test_query_state_value(self):
-        """Test with state value."""
-        with mock.patch('subprocess.check_output') as mock_run:
-            mock_run.return_value = b' foo bar '
-            result = self.rs._query_state_value('runme')
-            self.assertEqual('foo bar', result)
-            self.assertEqual(mock_run.call_count, 1)
-            self.assertEqual(
-                mock_run.call_args, mock.call('runme', shell=True)
-            )
+def test_query_state_value(rs):
+    """Test with state value."""
+    with mock.patch('subprocess.check_output') as mock_run:
+        mock_run.return_value = b' foo bar '
+        result = rs._query_state_value('runme')
+        assert 'foo bar' == result
+        assert mock_run.call_count == 1
+        assert mock_run.call_args == mock.call('runme', shell=True)
 
-    def test_state_value(self):
-        """Test with state value."""
-        with tempfile.TemporaryDirectory() as tempdirname:
-            path = os.path.join(tempdirname, 'cover_status')
-            test_cover = {
-                'command_state': 'cat {}'.format(path),
-                'command_open': 'echo 1 > {}'.format(path),
-                'command_close': 'echo 1 > {}'.format(path),
-                'command_stop': 'echo 0 > {}'.format(path),
-                'value_template': '{{ value }}'
-            }
-            self.assertTrue(setup_component(self.hass, cover.DOMAIN, {
-                'cover': {
-                    'platform': 'command_line',
-                    'covers': {
-                        'test': test_cover
-                    }
+
+async def test_state_value(hass):
+    """Test with state value."""
+    with tempfile.TemporaryDirectory() as tempdirname:
+        path = os.path.join(tempdirname, 'cover_status')
+        test_cover = {
+            'command_state': 'cat {}'.format(path),
+            'command_open': 'echo 1 > {}'.format(path),
+            'command_close': 'echo 1 > {}'.format(path),
+            'command_stop': 'echo 0 > {}'.format(path),
+            'value_template': '{{ value }}'
+        }
+        assert await async_setup_component(hass, DOMAIN, {
+            'cover': {
+                'platform': 'command_line',
+                'covers': {
+                    'test': test_cover
                 }
-            }))
+            }
+        }) is True
 
-            state = self.hass.states.get('cover.test')
-            self.assertEqual('unknown', state.state)
+        assert 'unknown' == hass.states.get('cover.test').state
 
-            cover.open_cover(self.hass, 'cover.test')
-            self.hass.block_till_done()
+        await hass.services.async_call(
+            DOMAIN, SERVICE_OPEN_COVER,
+            {ATTR_ENTITY_ID: 'cover.test'}, blocking=True)
+        assert 'open' == hass.states.get('cover.test').state
 
-            state = self.hass.states.get('cover.test')
-            self.assertEqual('open', state.state)
+        await hass.services.async_call(
+            DOMAIN, SERVICE_CLOSE_COVER,
+            {ATTR_ENTITY_ID: 'cover.test'}, blocking=True)
+        assert 'open' == hass.states.get('cover.test').state
 
-            cover.close_cover(self.hass, 'cover.test')
-            self.hass.block_till_done()
-
-            state = self.hass.states.get('cover.test')
-            self.assertEqual('open', state.state)
-
-            cover.stop_cover(self.hass, 'cover.test')
-            self.hass.block_till_done()
-
-            state = self.hass.states.get('cover.test')
-            self.assertEqual('closed', state.state)
+        await hass.services.async_call(
+            DOMAIN, SERVICE_STOP_COVER,
+            {ATTR_ENTITY_ID: 'cover.test'}, blocking=True)
+        assert 'closed' == hass.states.get('cover.test').state
diff --git a/tests/components/cover/test_demo.py b/tests/components/cover/test_demo.py
index 65aa9a9b9ef..011928f851a 100644
--- a/tests/components/cover/test_demo.py
+++ b/tests/components/cover/test_demo.py
@@ -1,158 +1,181 @@
 """The tests for the Demo cover platform."""
-import unittest
 from datetime import timedelta
+
+import pytest
+
+from homeassistant.components.cover import (
+    ATTR_POSITION, ATTR_TILT_POSITION, DOMAIN)
+from homeassistant.const import (
+    ATTR_ENTITY_ID, SERVICE_CLOSE_COVER, SERVICE_CLOSE_COVER_TILT,
+    SERVICE_OPEN_COVER, SERVICE_OPEN_COVER_TILT, SERVICE_SET_COVER_POSITION,
+    SERVICE_SET_COVER_TILT_POSITION, SERVICE_STOP_COVER,
+    SERVICE_STOP_COVER_TILT)
+from homeassistant.setup import async_setup_component
 import homeassistant.util.dt as dt_util
 
-from homeassistant.setup import setup_component
-from homeassistant.components import cover
-from tests.common import get_test_home_assistant, fire_time_changed
+from tests.common import assert_setup_component, async_fire_time_changed
 
+CONFIG = {'cover': {'platform': 'demo'}}
 ENTITY_COVER = 'cover.living_room_window'
 
 
-class TestCoverDemo(unittest.TestCase):
-    """Test the Demo cover."""
+@pytest.fixture
+async def setup_comp(hass):
+    """Set up demo cover component."""
+    with assert_setup_component(1, DOMAIN):
+        await async_setup_component(hass, DOMAIN, CONFIG)
 
-    def setUp(self):  # pylint: disable=invalid-name
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        self.assertTrue(setup_component(self.hass, cover.DOMAIN, {'cover': {
-            'platform': 'demo',
-        }}))
 
-    def tearDown(self):  # pylint: disable=invalid-name
-        """Stop down everything that was started."""
-        self.hass.stop()
+async def test_supported_features(hass, setup_comp):
+    """Test cover supported features."""
+    state = hass.states.get('cover.garage_door')
+    assert 3 == state.attributes.get('supported_features')
+    state = hass.states.get('cover.kitchen_window')
+    assert 11 == state.attributes.get('supported_features')
+    state = hass.states.get('cover.hall_window')
+    assert 15 == state.attributes.get('supported_features')
+    state = hass.states.get('cover.living_room_window')
+    assert 255 == state.attributes.get('supported_features')
 
-    def test_supported_features(self):
-        """Test cover supported features."""
-        state = self.hass.states.get('cover.garage_door')
-        self.assertEqual(3, state.attributes.get('supported_features'))
-        state = self.hass.states.get('cover.kitchen_window')
-        self.assertEqual(11, state.attributes.get('supported_features'))
-        state = self.hass.states.get('cover.hall_window')
-        self.assertEqual(15, state.attributes.get('supported_features'))
-        state = self.hass.states.get('cover.living_room_window')
-        self.assertEqual(255, state.attributes.get('supported_features'))
 
-    def test_close_cover(self):
-        """Test closing the cover."""
-        state = self.hass.states.get(ENTITY_COVER)
-        self.assertEqual(state.state, 'open')
-        self.assertEqual(70, state.attributes.get('current_position'))
-        cover.close_cover(self.hass, ENTITY_COVER)
-        self.hass.block_till_done()
-        state = self.hass.states.get(ENTITY_COVER)
-        self.assertEqual(state.state, 'closing')
-        for _ in range(7):
-            future = dt_util.utcnow() + timedelta(seconds=1)
-            fire_time_changed(self.hass, future)
-            self.hass.block_till_done()
+async def test_close_cover(hass, setup_comp):
+    """Test closing the cover."""
+    state = hass.states.get(ENTITY_COVER)
+    assert state.state == 'open'
+    assert 70 == state.attributes.get('current_position')
 
-        state = self.hass.states.get(ENTITY_COVER)
-        self.assertEqual(state.state, 'closed')
-        self.assertEqual(0, state.attributes.get('current_position'))
-
-    def test_open_cover(self):
-        """Test opening the cover."""
-        state = self.hass.states.get(ENTITY_COVER)
-        self.assertEqual(state.state, 'open')
-        self.assertEqual(70, state.attributes.get('current_position'))
-        cover.open_cover(self.hass, ENTITY_COVER)
-        self.hass.block_till_done()
-        state = self.hass.states.get(ENTITY_COVER)
-        self.assertEqual(state.state, 'opening')
-        for _ in range(7):
-            future = dt_util.utcnow() + timedelta(seconds=1)
-            fire_time_changed(self.hass, future)
-            self.hass.block_till_done()
-
-        state = self.hass.states.get(ENTITY_COVER)
-        self.assertEqual(state.state, 'open')
-        self.assertEqual(100, state.attributes.get('current_position'))
-
-    def test_set_cover_position(self):
-        """Test moving the cover to a specific position."""
-        state = self.hass.states.get(ENTITY_COVER)
-        self.assertEqual(70, state.attributes.get('current_position'))
-        cover.set_cover_position(self.hass, 10, ENTITY_COVER)
-        self.hass.block_till_done()
-        for _ in range(6):
-            future = dt_util.utcnow() + timedelta(seconds=1)
-            fire_time_changed(self.hass, future)
-            self.hass.block_till_done()
-
-        state = self.hass.states.get(ENTITY_COVER)
-        self.assertEqual(10, state.attributes.get('current_position'))
-
-    def test_stop_cover(self):
-        """Test stopping the cover."""
-        state = self.hass.states.get(ENTITY_COVER)
-        self.assertEqual(70, state.attributes.get('current_position'))
-        cover.open_cover(self.hass, ENTITY_COVER)
-        self.hass.block_till_done()
+    await hass.services.async_call(
+        DOMAIN, SERVICE_CLOSE_COVER,
+        {ATTR_ENTITY_ID: ENTITY_COVER}, blocking=True)
+    state = hass.states.get(ENTITY_COVER)
+    assert state.state == 'closing'
+    for _ in range(7):
         future = dt_util.utcnow() + timedelta(seconds=1)
-        fire_time_changed(self.hass, future)
-        self.hass.block_till_done()
-        cover.stop_cover(self.hass, ENTITY_COVER)
-        self.hass.block_till_done()
-        fire_time_changed(self.hass, future)
-        state = self.hass.states.get(ENTITY_COVER)
-        self.assertEqual(80, state.attributes.get('current_position'))
+        async_fire_time_changed(hass, future)
+        await hass.async_block_till_done()
 
-    def test_close_cover_tilt(self):
-        """Test closing the cover tilt."""
-        state = self.hass.states.get(ENTITY_COVER)
-        self.assertEqual(50, state.attributes.get('current_tilt_position'))
-        cover.close_cover_tilt(self.hass, ENTITY_COVER)
-        self.hass.block_till_done()
-        for _ in range(7):
-            future = dt_util.utcnow() + timedelta(seconds=1)
-            fire_time_changed(self.hass, future)
-            self.hass.block_till_done()
+    state = hass.states.get(ENTITY_COVER)
+    assert state.state == 'closed'
+    assert 0 == state.attributes.get('current_position')
 
-        state = self.hass.states.get(ENTITY_COVER)
-        self.assertEqual(0, state.attributes.get('current_tilt_position'))
 
-    def test_open_cover_tilt(self):
-        """Test opening the cover tilt."""
-        state = self.hass.states.get(ENTITY_COVER)
-        self.assertEqual(50, state.attributes.get('current_tilt_position'))
-        cover.open_cover_tilt(self.hass, ENTITY_COVER)
-        self.hass.block_till_done()
-        for _ in range(7):
-            future = dt_util.utcnow() + timedelta(seconds=1)
-            fire_time_changed(self.hass, future)
-            self.hass.block_till_done()
-
-        state = self.hass.states.get(ENTITY_COVER)
-        self.assertEqual(100, state.attributes.get('current_tilt_position'))
-
-    def test_set_cover_tilt_position(self):
-        """Test moving the cover til to a specific position."""
-        state = self.hass.states.get(ENTITY_COVER)
-        self.assertEqual(50, state.attributes.get('current_tilt_position'))
-        cover.set_cover_tilt_position(self.hass, 90, ENTITY_COVER)
-        self.hass.block_till_done()
-        for _ in range(7):
-            future = dt_util.utcnow() + timedelta(seconds=1)
-            fire_time_changed(self.hass, future)
-            self.hass.block_till_done()
-
-        state = self.hass.states.get(ENTITY_COVER)
-        self.assertEqual(90, state.attributes.get('current_tilt_position'))
-
-    def test_stop_cover_tilt(self):
-        """Test stopping the cover tilt."""
-        state = self.hass.states.get(ENTITY_COVER)
-        self.assertEqual(50, state.attributes.get('current_tilt_position'))
-        cover.close_cover_tilt(self.hass, ENTITY_COVER)
-        self.hass.block_till_done()
+async def test_open_cover(hass, setup_comp):
+    """Test opening the cover."""
+    state = hass.states.get(ENTITY_COVER)
+    assert state.state == 'open'
+    assert 70 == state.attributes.get('current_position')
+    await hass.services.async_call(
+        DOMAIN, SERVICE_OPEN_COVER,
+        {ATTR_ENTITY_ID: ENTITY_COVER}, blocking=True)
+    state = hass.states.get(ENTITY_COVER)
+    assert state.state == 'opening'
+    for _ in range(7):
         future = dt_util.utcnow() + timedelta(seconds=1)
-        fire_time_changed(self.hass, future)
-        self.hass.block_till_done()
-        cover.stop_cover_tilt(self.hass, ENTITY_COVER)
-        self.hass.block_till_done()
-        fire_time_changed(self.hass, future)
-        state = self.hass.states.get(ENTITY_COVER)
-        self.assertEqual(40, state.attributes.get('current_tilt_position'))
+        async_fire_time_changed(hass, future)
+        await hass.async_block_till_done()
+
+    state = hass.states.get(ENTITY_COVER)
+    assert state.state == 'open'
+    assert 100 == state.attributes.get('current_position')
+
+
+async def test_set_cover_position(hass, setup_comp):
+    """Test moving the cover to a specific position."""
+    state = hass.states.get(ENTITY_COVER)
+    assert 70 == state.attributes.get('current_position')
+    await hass.services.async_call(
+        DOMAIN, SERVICE_SET_COVER_POSITION,
+        {ATTR_ENTITY_ID: ENTITY_COVER, ATTR_POSITION: 10}, blocking=True)
+    for _ in range(6):
+        future = dt_util.utcnow() + timedelta(seconds=1)
+        async_fire_time_changed(hass, future)
+        await hass.async_block_till_done()
+
+    state = hass.states.get(ENTITY_COVER)
+    assert 10 == state.attributes.get('current_position')
+
+
+async def test_stop_cover(hass, setup_comp):
+    """Test stopping the cover."""
+    state = hass.states.get(ENTITY_COVER)
+    assert 70 == state.attributes.get('current_position')
+    await hass.services.async_call(
+        DOMAIN, SERVICE_OPEN_COVER,
+        {ATTR_ENTITY_ID: ENTITY_COVER}, blocking=True)
+    future = dt_util.utcnow() + timedelta(seconds=1)
+    async_fire_time_changed(hass, future)
+    await hass.async_block_till_done()
+    await hass.services.async_call(
+        DOMAIN, SERVICE_STOP_COVER,
+        {ATTR_ENTITY_ID: ENTITY_COVER}, blocking=True)
+    async_fire_time_changed(hass, future)
+    await hass.async_block_till_done()
+    state = hass.states.get(ENTITY_COVER)
+    assert 80 == state.attributes.get('current_position')
+
+
+async def test_close_cover_tilt(hass, setup_comp):
+    """Test closing the cover tilt."""
+    state = hass.states.get(ENTITY_COVER)
+    assert 50 == state.attributes.get('current_tilt_position')
+    await hass.services.async_call(
+        DOMAIN, SERVICE_CLOSE_COVER_TILT,
+        {ATTR_ENTITY_ID: ENTITY_COVER}, blocking=True)
+    for _ in range(7):
+        future = dt_util.utcnow() + timedelta(seconds=1)
+        async_fire_time_changed(hass, future)
+        await hass.async_block_till_done()
+
+    state = hass.states.get(ENTITY_COVER)
+    assert 0 == state.attributes.get('current_tilt_position')
+
+
+async def test_open_cover_tilt(hass, setup_comp):
+    """Test opening the cover tilt."""
+    state = hass.states.get(ENTITY_COVER)
+    assert 50 == state.attributes.get('current_tilt_position')
+    await hass.services.async_call(
+        DOMAIN, SERVICE_OPEN_COVER_TILT,
+        {ATTR_ENTITY_ID: ENTITY_COVER}, blocking=True)
+    for _ in range(7):
+        future = dt_util.utcnow() + timedelta(seconds=1)
+        async_fire_time_changed(hass, future)
+        await hass.async_block_till_done()
+
+    state = hass.states.get(ENTITY_COVER)
+    assert 100 == state.attributes.get('current_tilt_position')
+
+
+async def test_set_cover_tilt_position(hass, setup_comp):
+    """Test moving the cover til to a specific position."""
+    state = hass.states.get(ENTITY_COVER)
+    assert 50 == state.attributes.get('current_tilt_position')
+    await hass.services.async_call(
+        DOMAIN, SERVICE_SET_COVER_TILT_POSITION,
+        {ATTR_ENTITY_ID: ENTITY_COVER, ATTR_TILT_POSITION: 90}, blocking=True)
+    for _ in range(7):
+        future = dt_util.utcnow() + timedelta(seconds=1)
+        async_fire_time_changed(hass, future)
+        await hass.async_block_till_done()
+
+    state = hass.states.get(ENTITY_COVER)
+    assert 90 == state.attributes.get('current_tilt_position')
+
+
+async def test_stop_cover_tilt(hass, setup_comp):
+    """Test stopping the cover tilt."""
+    state = hass.states.get(ENTITY_COVER)
+    assert 50 == state.attributes.get('current_tilt_position')
+    await hass.services.async_call(
+        DOMAIN, SERVICE_CLOSE_COVER_TILT,
+        {ATTR_ENTITY_ID: ENTITY_COVER}, blocking=True)
+    future = dt_util.utcnow() + timedelta(seconds=1)
+    async_fire_time_changed(hass, future)
+    await hass.async_block_till_done()
+    await hass.services.async_call(
+        DOMAIN, SERVICE_STOP_COVER_TILT,
+        {ATTR_ENTITY_ID: ENTITY_COVER}, blocking=True)
+    async_fire_time_changed(hass, future)
+    await hass.async_block_till_done()
+    state = hass.states.get(ENTITY_COVER)
+    assert 40 == state.attributes.get('current_tilt_position')
diff --git a/tests/components/cover/test_group.py b/tests/components/cover/test_group.py
index 028845983a0..2211c8c77bc 100644
--- a/tests/components/cover/test_group.py
+++ b/tests/components/cover/test_group.py
@@ -1,19 +1,23 @@
 """The tests for the group cover platform."""
-
-import unittest
 from datetime import timedelta
-import homeassistant.util.dt as dt_util
 
-from homeassistant import setup
-from homeassistant.components import cover
+import pytest
+
 from homeassistant.components.cover import (
-    ATTR_CURRENT_POSITION, ATTR_CURRENT_TILT_POSITION, DOMAIN)
+    ATTR_CURRENT_POSITION, ATTR_CURRENT_TILT_POSITION, ATTR_POSITION,
+    ATTR_TILT_POSITION, DOMAIN)
 from homeassistant.components.cover.group import DEFAULT_NAME
 from homeassistant.const import (
-    ATTR_ASSUMED_STATE, ATTR_FRIENDLY_NAME, ATTR_SUPPORTED_FEATURES,
-    CONF_ENTITIES, STATE_OPEN, STATE_CLOSED)
-from tests.common import (
-    assert_setup_component, get_test_home_assistant, fire_time_changed)
+    ATTR_ASSUMED_STATE, ATTR_ENTITY_ID, ATTR_FRIENDLY_NAME,
+    ATTR_SUPPORTED_FEATURES, CONF_ENTITIES,
+    SERVICE_CLOSE_COVER, SERVICE_CLOSE_COVER_TILT,
+    SERVICE_OPEN_COVER, SERVICE_OPEN_COVER_TILT, SERVICE_SET_COVER_POSITION,
+    SERVICE_SET_COVER_TILT_POSITION, SERVICE_STOP_COVER,
+    SERVICE_STOP_COVER_TILT, STATE_OPEN, STATE_CLOSED)
+from homeassistant.setup import async_setup_component
+import homeassistant.util.dt as dt_util
+
+from tests.common import assert_setup_component, async_fire_time_changed
 
 COVER_GROUP = 'cover.cover_group'
 DEMO_COVER = 'cover.kitchen_window'
@@ -31,320 +35,301 @@ CONFIG = {
 }
 
 
-class TestMultiCover(unittest.TestCase):
-    """Test the group cover platform."""
+@pytest.fixture
+async def setup_comp(hass):
+    """Set up group cover component."""
+    with assert_setup_component(2, DOMAIN):
+        await async_setup_component(hass, DOMAIN, CONFIG)
 
-    def setUp(self):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
 
-    def tearDown(self):
-        """Stop down everything that was started."""
-        self.hass.stop()
+async def test_attributes(hass):
+    """Test handling of state attributes."""
+    config = {DOMAIN: {'platform': 'group', CONF_ENTITIES: [
+        DEMO_COVER, DEMO_COVER_POS, DEMO_COVER_TILT, DEMO_TILT]}}
 
-    def test_attributes(self):
-        """Test handling of state attributes."""
-        config = {DOMAIN: {'platform': 'group', CONF_ENTITIES: [
-            DEMO_COVER, DEMO_COVER_POS, DEMO_COVER_TILT, DEMO_TILT]}}
+    with assert_setup_component(1, DOMAIN):
+        await async_setup_component(hass, DOMAIN, config)
 
-        with assert_setup_component(1, DOMAIN):
-            assert setup.setup_component(self.hass, DOMAIN, config)
+    state = hass.states.get(COVER_GROUP)
+    assert state.state == STATE_CLOSED
+    assert state.attributes.get(ATTR_FRIENDLY_NAME) == DEFAULT_NAME
+    assert state.attributes.get(ATTR_ASSUMED_STATE) is None
+    assert state.attributes.get(ATTR_SUPPORTED_FEATURES) == 0
+    assert state.attributes.get(ATTR_CURRENT_POSITION) is None
+    assert state.attributes.get(ATTR_CURRENT_TILT_POSITION) is None
 
-        state = self.hass.states.get(COVER_GROUP)
-        attr = state.attributes
-        self.assertEqual(state.state, STATE_CLOSED)
-        self.assertEqual(attr.get(ATTR_FRIENDLY_NAME), DEFAULT_NAME)
-        self.assertEqual(attr.get(ATTR_ASSUMED_STATE), None)
-        self.assertEqual(attr.get(ATTR_SUPPORTED_FEATURES), 0)
-        self.assertEqual(attr.get(ATTR_CURRENT_POSITION), None)
-        self.assertEqual(attr.get(ATTR_CURRENT_TILT_POSITION), None)
+    # Add Entity that supports open / close / stop
+    hass.states.async_set(
+        DEMO_COVER, STATE_OPEN, {ATTR_SUPPORTED_FEATURES: 11})
+    await hass.async_block_till_done()
 
-        # Add Entity that supports open / close / stop
-        self.hass.states.set(
-            DEMO_COVER, STATE_OPEN, {ATTR_SUPPORTED_FEATURES: 11})
-        self.hass.block_till_done()
+    state = hass.states.get(COVER_GROUP)
+    assert state.state == STATE_OPEN
+    assert state.attributes.get(ATTR_ASSUMED_STATE) is None
+    assert state.attributes.get(ATTR_SUPPORTED_FEATURES) == 11
+    assert state.attributes.get(ATTR_CURRENT_POSITION) is None
+    assert state.attributes.get(ATTR_CURRENT_TILT_POSITION) is None
 
-        state = self.hass.states.get(COVER_GROUP)
-        attr = state.attributes
-        self.assertEqual(state.state, STATE_OPEN)
-        self.assertEqual(attr.get(ATTR_ASSUMED_STATE), None)
-        self.assertEqual(attr.get(ATTR_SUPPORTED_FEATURES), 11)
-        self.assertEqual(attr.get(ATTR_CURRENT_POSITION), None)
-        self.assertEqual(attr.get(ATTR_CURRENT_TILT_POSITION), None)
+    # Add Entity that supports set_cover_position
+    hass.states.async_set(
+        DEMO_COVER_POS, STATE_OPEN,
+        {ATTR_SUPPORTED_FEATURES: 4, ATTR_CURRENT_POSITION: 70})
+    await hass.async_block_till_done()
 
-        # Add Entity that supports set_cover_position
-        self.hass.states.set(
-            DEMO_COVER_POS, STATE_OPEN,
-            {ATTR_SUPPORTED_FEATURES: 4, ATTR_CURRENT_POSITION: 70})
-        self.hass.block_till_done()
+    state = hass.states.get(COVER_GROUP)
+    assert state.state == STATE_OPEN
+    assert state.attributes.get(ATTR_ASSUMED_STATE) is None
+    assert state.attributes.get(ATTR_SUPPORTED_FEATURES) == 15
+    assert state.attributes.get(ATTR_CURRENT_POSITION) == 70
+    assert state.attributes.get(ATTR_CURRENT_TILT_POSITION) is None
 
-        state = self.hass.states.get(COVER_GROUP)
-        attr = state.attributes
-        self.assertEqual(state.state, STATE_OPEN)
-        self.assertEqual(attr.get(ATTR_ASSUMED_STATE), None)
-        self.assertEqual(attr.get(ATTR_SUPPORTED_FEATURES), 15)
-        self.assertEqual(attr.get(ATTR_CURRENT_POSITION), 70)
-        self.assertEqual(attr.get(ATTR_CURRENT_TILT_POSITION), None)
+    # Add Entity that supports open tilt / close tilt / stop tilt
+    hass.states.async_set(
+        DEMO_TILT, STATE_OPEN, {ATTR_SUPPORTED_FEATURES: 112})
+    await hass.async_block_till_done()
 
-        # Add Entity that supports open tilt / close tilt / stop tilt
-        self.hass.states.set(
-            DEMO_TILT, STATE_OPEN, {ATTR_SUPPORTED_FEATURES: 112})
-        self.hass.block_till_done()
+    state = hass.states.get(COVER_GROUP)
+    assert state.state == STATE_OPEN
+    assert state.attributes.get(ATTR_ASSUMED_STATE) is None
+    assert state.attributes.get(ATTR_SUPPORTED_FEATURES) == 127
+    assert state.attributes.get(ATTR_CURRENT_POSITION) == 70
+    assert state.attributes.get(ATTR_CURRENT_TILT_POSITION) is None
 
-        state = self.hass.states.get(COVER_GROUP)
-        attr = state.attributes
-        self.assertEqual(state.state, STATE_OPEN)
-        self.assertEqual(attr.get(ATTR_ASSUMED_STATE), None)
-        self.assertEqual(attr.get(ATTR_SUPPORTED_FEATURES), 127)
-        self.assertEqual(attr.get(ATTR_CURRENT_POSITION), 70)
-        self.assertEqual(attr.get(ATTR_CURRENT_TILT_POSITION), None)
+    # Add Entity that supports set_tilt_position
+    hass.states.async_set(
+        DEMO_COVER_TILT, STATE_OPEN,
+        {ATTR_SUPPORTED_FEATURES: 128, ATTR_CURRENT_TILT_POSITION: 60})
+    await hass.async_block_till_done()
 
-        # Add Entity that supports set_tilt_position
-        self.hass.states.set(
-            DEMO_COVER_TILT, STATE_OPEN,
-            {ATTR_SUPPORTED_FEATURES: 128, ATTR_CURRENT_TILT_POSITION: 60})
-        self.hass.block_till_done()
+    state = hass.states.get(COVER_GROUP)
+    assert state.state == STATE_OPEN
+    assert state.attributes.get(ATTR_ASSUMED_STATE) is None
+    assert state.attributes.get(ATTR_SUPPORTED_FEATURES) == 255
+    assert state.attributes.get(ATTR_CURRENT_POSITION) == 70
+    assert state.attributes.get(ATTR_CURRENT_TILT_POSITION) == 60
 
-        state = self.hass.states.get(COVER_GROUP)
-        attr = state.attributes
-        self.assertEqual(state.state, STATE_OPEN)
-        self.assertEqual(attr.get(ATTR_ASSUMED_STATE), None)
-        self.assertEqual(attr.get(ATTR_SUPPORTED_FEATURES), 255)
-        self.assertEqual(attr.get(ATTR_CURRENT_POSITION), 70)
-        self.assertEqual(attr.get(ATTR_CURRENT_TILT_POSITION), 60)
+    # ### Test assumed state ###
+    # ##########################
 
-        # ### Test assumed state ###
-        # ##########################
+    # For covers
+    hass.states.async_set(
+        DEMO_COVER, STATE_OPEN,
+        {ATTR_SUPPORTED_FEATURES: 4, ATTR_CURRENT_POSITION: 100})
+    await hass.async_block_till_done()
 
-        # For covers
-        self.hass.states.set(
-            DEMO_COVER, STATE_OPEN,
-            {ATTR_SUPPORTED_FEATURES: 4, ATTR_CURRENT_POSITION: 100})
-        self.hass.block_till_done()
+    state = hass.states.get(COVER_GROUP)
+    assert state.state == STATE_OPEN
+    assert state.attributes.get(ATTR_ASSUMED_STATE) is True
+    assert state.attributes.get(ATTR_SUPPORTED_FEATURES) == 244
+    assert state.attributes.get(ATTR_CURRENT_POSITION) == 100
+    assert state.attributes.get(ATTR_CURRENT_TILT_POSITION) == 60
 
-        state = self.hass.states.get(COVER_GROUP)
-        attr = state.attributes
-        self.assertEqual(state.state, STATE_OPEN)
-        self.assertEqual(attr.get(ATTR_ASSUMED_STATE), True)
-        self.assertEqual(attr.get(ATTR_SUPPORTED_FEATURES), 244)
-        self.assertEqual(attr.get(ATTR_CURRENT_POSITION), 100)
-        self.assertEqual(attr.get(ATTR_CURRENT_TILT_POSITION), 60)
+    hass.states.async_remove(DEMO_COVER)
+    hass.states.async_remove(DEMO_COVER_POS)
+    await hass.async_block_till_done()
 
-        self.hass.states.remove(DEMO_COVER)
-        self.hass.block_till_done()
-        self.hass.states.remove(DEMO_COVER_POS)
-        self.hass.block_till_done()
+    state = hass.states.get(COVER_GROUP)
+    assert state.state == STATE_OPEN
+    assert state.attributes.get(ATTR_ASSUMED_STATE) is None
+    assert state.attributes.get(ATTR_SUPPORTED_FEATURES) == 240
+    assert state.attributes.get(ATTR_CURRENT_POSITION) is None
+    assert state.attributes.get(ATTR_CURRENT_TILT_POSITION) == 60
 
-        state = self.hass.states.get(COVER_GROUP)
-        attr = state.attributes
-        self.assertEqual(state.state, STATE_OPEN)
-        self.assertEqual(attr.get(ATTR_ASSUMED_STATE), None)
-        self.assertEqual(attr.get(ATTR_SUPPORTED_FEATURES), 240)
-        self.assertEqual(attr.get(ATTR_CURRENT_POSITION), None)
-        self.assertEqual(attr.get(ATTR_CURRENT_TILT_POSITION), 60)
+    # For tilts
+    hass.states.async_set(
+        DEMO_TILT, STATE_OPEN,
+        {ATTR_SUPPORTED_FEATURES: 128, ATTR_CURRENT_TILT_POSITION: 100})
+    await hass.async_block_till_done()
 
-        # For tilts
-        self.hass.states.set(
-            DEMO_TILT, STATE_OPEN,
-            {ATTR_SUPPORTED_FEATURES: 128, ATTR_CURRENT_TILT_POSITION: 100})
-        self.hass.block_till_done()
+    state = hass.states.get(COVER_GROUP)
+    assert state.state == STATE_OPEN
+    assert state.attributes.get(ATTR_ASSUMED_STATE) is True
+    assert state.attributes.get(ATTR_SUPPORTED_FEATURES) == 128
+    assert state.attributes.get(ATTR_CURRENT_POSITION) is None
+    assert state.attributes.get(ATTR_CURRENT_TILT_POSITION) == 100
 
-        state = self.hass.states.get(COVER_GROUP)
-        attr = state.attributes
-        self.assertEqual(state.state, STATE_OPEN)
-        self.assertEqual(attr.get(ATTR_ASSUMED_STATE), True)
-        self.assertEqual(attr.get(ATTR_SUPPORTED_FEATURES), 128)
-        self.assertEqual(attr.get(ATTR_CURRENT_POSITION), None)
-        self.assertEqual(attr.get(ATTR_CURRENT_TILT_POSITION), 100)
+    hass.states.async_remove(DEMO_COVER_TILT)
+    hass.states.async_set(DEMO_TILT, STATE_CLOSED)
+    await hass.async_block_till_done()
 
-        self.hass.states.remove(DEMO_COVER_TILT)
-        self.hass.states.set(DEMO_TILT, STATE_CLOSED)
-        self.hass.block_till_done()
+    state = hass.states.get(COVER_GROUP)
+    assert state.state == STATE_CLOSED
+    assert state.attributes.get(ATTR_ASSUMED_STATE) is None
+    assert state.attributes.get(ATTR_SUPPORTED_FEATURES) == 0
+    assert state.attributes.get(ATTR_CURRENT_POSITION) is None
+    assert state.attributes.get(ATTR_CURRENT_TILT_POSITION) is None
 
-        state = self.hass.states.get(COVER_GROUP)
-        attr = state.attributes
-        self.assertEqual(state.state, STATE_CLOSED)
-        self.assertEqual(attr.get(ATTR_ASSUMED_STATE), None)
-        self.assertEqual(attr.get(ATTR_SUPPORTED_FEATURES), 0)
-        self.assertEqual(attr.get(ATTR_CURRENT_POSITION), None)
-        self.assertEqual(attr.get(ATTR_CURRENT_TILT_POSITION), None)
+    hass.states.async_set(
+        DEMO_TILT, STATE_CLOSED, {ATTR_ASSUMED_STATE: True})
+    await hass.async_block_till_done()
 
-        self.hass.states.set(
-            DEMO_TILT, STATE_CLOSED, {ATTR_ASSUMED_STATE: True})
-        self.hass.block_till_done()
+    state = hass.states.get(COVER_GROUP)
+    assert state.attributes.get(ATTR_ASSUMED_STATE) is True
 
-        state = self.hass.states.get(COVER_GROUP)
-        attr = state.attributes
-        self.assertEqual(attr.get(ATTR_ASSUMED_STATE), True)
 
-    def test_open_covers(self):
-        """Test open cover function."""
-        with assert_setup_component(2, DOMAIN):
-            assert setup.setup_component(self.hass, DOMAIN, CONFIG)
-
-        cover.open_cover(self.hass, COVER_GROUP)
-        self.hass.block_till_done()
-        for _ in range(10):
-            future = dt_util.utcnow() + timedelta(seconds=1)
-            fire_time_changed(self.hass, future)
-            self.hass.block_till_done()
-
-        state = self.hass.states.get(COVER_GROUP)
-        self.assertEqual(state.state, STATE_OPEN)
-        self.assertEqual(state.attributes.get(ATTR_CURRENT_POSITION), 100)
-
-        self.assertEqual(self.hass.states.get(DEMO_COVER).state, STATE_OPEN)
-        self.assertEqual(self.hass.states.get(DEMO_COVER_POS)
-                         .attributes.get(ATTR_CURRENT_POSITION), 100)
-        self.assertEqual(self.hass.states.get(DEMO_COVER_TILT)
-                         .attributes.get(ATTR_CURRENT_POSITION), 100)
-
-    def test_close_covers(self):
-        """Test close cover function."""
-        with assert_setup_component(2, DOMAIN):
-            assert setup.setup_component(self.hass, DOMAIN, CONFIG)
-
-        cover.close_cover(self.hass, COVER_GROUP)
-        self.hass.block_till_done()
-        for _ in range(10):
-            future = dt_util.utcnow() + timedelta(seconds=1)
-            fire_time_changed(self.hass, future)
-            self.hass.block_till_done()
-
-        state = self.hass.states.get(COVER_GROUP)
-        self.assertEqual(state.state, STATE_CLOSED)
-        self.assertEqual(state.attributes.get(ATTR_CURRENT_POSITION), 0)
-
-        self.assertEqual(self.hass.states.get(DEMO_COVER).state, STATE_CLOSED)
-        self.assertEqual(self.hass.states.get(DEMO_COVER_POS)
-                         .attributes.get(ATTR_CURRENT_POSITION), 0)
-        self.assertEqual(self.hass.states.get(DEMO_COVER_TILT)
-                         .attributes.get(ATTR_CURRENT_POSITION), 0)
-
-    def test_stop_covers(self):
-        """Test stop cover function."""
-        with assert_setup_component(2, DOMAIN):
-            assert setup.setup_component(self.hass, DOMAIN, CONFIG)
-
-        cover.open_cover(self.hass, COVER_GROUP)
-        self.hass.block_till_done()
+async def test_open_covers(hass, setup_comp):
+    """Test open cover function."""
+    await hass.services.async_call(
+        DOMAIN, SERVICE_OPEN_COVER,
+        {ATTR_ENTITY_ID: COVER_GROUP}, blocking=True)
+    for _ in range(10):
         future = dt_util.utcnow() + timedelta(seconds=1)
-        fire_time_changed(self.hass, future)
-        self.hass.block_till_done()
-        cover.stop_cover(self.hass, COVER_GROUP)
-        self.hass.block_till_done()
+        async_fire_time_changed(hass, future)
+        await hass.async_block_till_done()
+
+    state = hass.states.get(COVER_GROUP)
+    assert state.state == STATE_OPEN
+    assert state.attributes.get(ATTR_CURRENT_POSITION) == 100
+
+    assert hass.states.get(DEMO_COVER).state == STATE_OPEN
+    assert hass.states.get(DEMO_COVER_POS) \
+               .attributes.get(ATTR_CURRENT_POSITION) == 100
+    assert hass.states.get(DEMO_COVER_TILT) \
+               .attributes.get(ATTR_CURRENT_POSITION) == 100
+
+
+async def test_close_covers(hass, setup_comp):
+    """Test close cover function."""
+    await hass.services.async_call(
+        DOMAIN, SERVICE_CLOSE_COVER,
+        {ATTR_ENTITY_ID: COVER_GROUP}, blocking=True)
+    for _ in range(10):
         future = dt_util.utcnow() + timedelta(seconds=1)
-        fire_time_changed(self.hass, future)
-        self.hass.block_till_done()
+        async_fire_time_changed(hass, future)
+        await hass.async_block_till_done()
 
-        state = self.hass.states.get(COVER_GROUP)
-        self.assertEqual(state.state, STATE_OPEN)
-        self.assertEqual(state.attributes.get(ATTR_CURRENT_POSITION), 100)
+    state = hass.states.get(COVER_GROUP)
+    assert state.state == STATE_CLOSED
+    assert state.attributes.get(ATTR_CURRENT_POSITION) == 0
 
-        self.assertEqual(self.hass.states.get(DEMO_COVER).state, STATE_OPEN)
-        self.assertEqual(self.hass.states.get(DEMO_COVER_POS)
-                         .attributes.get(ATTR_CURRENT_POSITION), 20)
-        self.assertEqual(self.hass.states.get(DEMO_COVER_TILT)
-                         .attributes.get(ATTR_CURRENT_POSITION), 80)
+    assert hass.states.get(DEMO_COVER).state == STATE_CLOSED
+    assert hass.states.get(DEMO_COVER_POS) \
+               .attributes.get(ATTR_CURRENT_POSITION) == 0
+    assert hass.states.get(DEMO_COVER_TILT) \
+               .attributes.get(ATTR_CURRENT_POSITION) == 0
 
-    def test_set_cover_position(self):
-        """Test set cover position function."""
-        with assert_setup_component(2, DOMAIN):
-            assert setup.setup_component(self.hass, DOMAIN, CONFIG)
 
-        cover.set_cover_position(self.hass, 50, COVER_GROUP)
-        self.hass.block_till_done()
-        for _ in range(4):
-            future = dt_util.utcnow() + timedelta(seconds=1)
-            fire_time_changed(self.hass, future)
-            self.hass.block_till_done()
+async def test_stop_covers(hass, setup_comp):
+    """Test stop cover function."""
+    await hass.services.async_call(
+        DOMAIN, SERVICE_OPEN_COVER,
+        {ATTR_ENTITY_ID: COVER_GROUP}, blocking=True)
+    future = dt_util.utcnow() + timedelta(seconds=1)
+    async_fire_time_changed(hass, future)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get(COVER_GROUP)
-        self.assertEqual(state.state, STATE_OPEN)
-        self.assertEqual(state.attributes.get(ATTR_CURRENT_POSITION), 50)
+    await hass.services.async_call(
+        DOMAIN, SERVICE_STOP_COVER,
+        {ATTR_ENTITY_ID: COVER_GROUP}, blocking=True)
+    future = dt_util.utcnow() + timedelta(seconds=1)
+    async_fire_time_changed(hass, future)
+    await hass.async_block_till_done()
 
-        self.assertEqual(self.hass.states.get(DEMO_COVER).state, STATE_CLOSED)
-        self.assertEqual(self.hass.states.get(DEMO_COVER_POS)
-                         .attributes.get(ATTR_CURRENT_POSITION), 50)
-        self.assertEqual(self.hass.states.get(DEMO_COVER_TILT)
-                         .attributes.get(ATTR_CURRENT_POSITION), 50)
+    state = hass.states.get(COVER_GROUP)
+    assert state.state == STATE_OPEN
+    assert state.attributes.get(ATTR_CURRENT_POSITION) == 100
 
-    def test_open_tilts(self):
-        """Test open tilt function."""
-        with assert_setup_component(2, DOMAIN):
-            assert setup.setup_component(self.hass, DOMAIN, CONFIG)
+    assert hass.states.get(DEMO_COVER).state == STATE_OPEN
+    assert hass.states.get(DEMO_COVER_POS) \
+        .attributes.get(ATTR_CURRENT_POSITION) == 20
+    assert hass.states.get(DEMO_COVER_TILT) \
+        .attributes.get(ATTR_CURRENT_POSITION) == 80
 
-        cover.open_cover_tilt(self.hass, COVER_GROUP)
-        self.hass.block_till_done()
-        for _ in range(5):
-            future = dt_util.utcnow() + timedelta(seconds=1)
-            fire_time_changed(self.hass, future)
-            self.hass.block_till_done()
 
-        state = self.hass.states.get(COVER_GROUP)
-        self.assertEqual(state.state, STATE_OPEN)
-        self.assertEqual(state.attributes.get(ATTR_CURRENT_TILT_POSITION), 100)
-
-        self.assertEqual(self.hass.states.get(DEMO_COVER_TILT)
-                         .attributes.get(ATTR_CURRENT_TILT_POSITION), 100)
-
-    def test_close_tilts(self):
-        """Test close tilt function."""
-        with assert_setup_component(2, DOMAIN):
-            assert setup.setup_component(self.hass, DOMAIN, CONFIG)
-
-        cover.close_cover_tilt(self.hass, COVER_GROUP)
-        self.hass.block_till_done()
-        for _ in range(5):
-            future = dt_util.utcnow() + timedelta(seconds=1)
-            fire_time_changed(self.hass, future)
-            self.hass.block_till_done()
-
-        state = self.hass.states.get(COVER_GROUP)
-        self.assertEqual(state.state, STATE_OPEN)
-        self.assertEqual(state.attributes.get(ATTR_CURRENT_TILT_POSITION), 0)
-
-        self.assertEqual(self.hass.states.get(DEMO_COVER_TILT)
-                         .attributes.get(ATTR_CURRENT_TILT_POSITION), 0)
-
-    def test_stop_tilts(self):
-        """Test stop tilts function."""
-        with assert_setup_component(2, DOMAIN):
-            assert setup.setup_component(self.hass, DOMAIN, CONFIG)
-
-        cover.open_cover_tilt(self.hass, COVER_GROUP)
-        self.hass.block_till_done()
+async def test_set_cover_position(hass, setup_comp):
+    """Test set cover position function."""
+    await hass.services.async_call(
+        DOMAIN, SERVICE_SET_COVER_POSITION,
+        {ATTR_ENTITY_ID: COVER_GROUP, ATTR_POSITION: 50}, blocking=True)
+    for _ in range(4):
         future = dt_util.utcnow() + timedelta(seconds=1)
-        fire_time_changed(self.hass, future)
-        self.hass.block_till_done()
-        cover.stop_cover_tilt(self.hass, COVER_GROUP)
-        self.hass.block_till_done()
+        async_fire_time_changed(hass, future)
+        await hass.async_block_till_done()
+
+    state = hass.states.get(COVER_GROUP)
+    assert state.state == STATE_OPEN
+    assert state.attributes.get(ATTR_CURRENT_POSITION) == 50
+
+    assert hass.states.get(DEMO_COVER).state == STATE_CLOSED
+    assert hass.states.get(DEMO_COVER_POS) \
+        .attributes.get(ATTR_CURRENT_POSITION) == 50
+    assert hass.states.get(DEMO_COVER_TILT) \
+        .attributes.get(ATTR_CURRENT_POSITION) == 50
+
+
+async def test_open_tilts(hass, setup_comp):
+    """Test open tilt function."""
+    await hass.services.async_call(
+        DOMAIN, SERVICE_OPEN_COVER_TILT,
+        {ATTR_ENTITY_ID: COVER_GROUP}, blocking=True)
+    for _ in range(5):
         future = dt_util.utcnow() + timedelta(seconds=1)
-        fire_time_changed(self.hass, future)
-        self.hass.block_till_done()
+        async_fire_time_changed(hass, future)
+        await hass.async_block_till_done()
 
-        state = self.hass.states.get(COVER_GROUP)
-        self.assertEqual(state.state, STATE_OPEN)
-        self.assertEqual(state.attributes.get(ATTR_CURRENT_TILT_POSITION), 60)
+    state = hass.states.get(COVER_GROUP)
+    assert state.state == STATE_OPEN
+    assert state.attributes.get(ATTR_CURRENT_TILT_POSITION) == 100
 
-        self.assertEqual(self.hass.states.get(DEMO_COVER_TILT)
-                         .attributes.get(ATTR_CURRENT_TILT_POSITION), 60)
+    assert hass.states.get(DEMO_COVER_TILT) \
+        .attributes.get(ATTR_CURRENT_TILT_POSITION) == 100
 
-    def test_set_tilt_positions(self):
-        """Test set tilt position function."""
-        with assert_setup_component(2, DOMAIN):
-            assert setup.setup_component(self.hass, DOMAIN, CONFIG)
 
-        cover.set_cover_tilt_position(self.hass, 80, COVER_GROUP)
-        self.hass.block_till_done()
-        for _ in range(3):
-            future = dt_util.utcnow() + timedelta(seconds=1)
-            fire_time_changed(self.hass, future)
-            self.hass.block_till_done()
+async def test_close_tilts(hass, setup_comp):
+    """Test close tilt function."""
+    await hass.services.async_call(
+        DOMAIN, SERVICE_CLOSE_COVER_TILT,
+        {ATTR_ENTITY_ID: COVER_GROUP}, blocking=True)
+    for _ in range(5):
+        future = dt_util.utcnow() + timedelta(seconds=1)
+        async_fire_time_changed(hass, future)
+        await hass.async_block_till_done()
 
-        state = self.hass.states.get(COVER_GROUP)
-        self.assertEqual(state.state, STATE_OPEN)
-        self.assertEqual(state.attributes.get(ATTR_CURRENT_TILT_POSITION), 80)
+    state = hass.states.get(COVER_GROUP)
+    assert state.state == STATE_OPEN
+    assert state.attributes.get(ATTR_CURRENT_TILT_POSITION) == 0
 
-        self.assertEqual(self.hass.states.get(DEMO_COVER_TILT)
-                         .attributes.get(ATTR_CURRENT_TILT_POSITION), 80)
+    assert hass.states.get(DEMO_COVER_TILT) \
+        .attributes.get(ATTR_CURRENT_TILT_POSITION) == 0
+
+
+async def test_stop_tilts(hass, setup_comp):
+    """Test stop tilts function."""
+    await hass.services.async_call(
+        DOMAIN, SERVICE_OPEN_COVER_TILT,
+        {ATTR_ENTITY_ID: COVER_GROUP}, blocking=True)
+    future = dt_util.utcnow() + timedelta(seconds=1)
+    async_fire_time_changed(hass, future)
+    await hass.async_block_till_done()
+
+    await hass.services.async_call(
+        DOMAIN, SERVICE_STOP_COVER_TILT,
+        {ATTR_ENTITY_ID: COVER_GROUP}, blocking=True)
+    future = dt_util.utcnow() + timedelta(seconds=1)
+    async_fire_time_changed(hass, future)
+    await hass.async_block_till_done()
+
+    state = hass.states.get(COVER_GROUP)
+    assert state.state == STATE_OPEN
+    assert state.attributes.get(ATTR_CURRENT_TILT_POSITION) == 60
+
+    assert hass.states.get(DEMO_COVER_TILT) \
+        .attributes.get(ATTR_CURRENT_TILT_POSITION) == 60
+
+
+async def test_set_tilt_positions(hass, setup_comp):
+    """Test set tilt position function."""
+    await hass.services.async_call(
+        DOMAIN, SERVICE_SET_COVER_TILT_POSITION,
+        {ATTR_ENTITY_ID: COVER_GROUP, ATTR_TILT_POSITION: 80}, blocking=True)
+    for _ in range(3):
+        future = dt_util.utcnow() + timedelta(seconds=1)
+        async_fire_time_changed(hass, future)
+        await hass.async_block_till_done()
+
+    state = hass.states.get(COVER_GROUP)
+    assert state.state == STATE_OPEN
+    assert state.attributes.get(ATTR_CURRENT_TILT_POSITION) == 80
+
+    assert hass.states.get(DEMO_COVER_TILT) \
+        .attributes.get(ATTR_CURRENT_TILT_POSITION) == 80
diff --git a/tests/components/cover/test_mqtt.py b/tests/components/cover/test_mqtt.py
index e75178bf3d7..f1d3da9be84 100644
--- a/tests/components/cover/test_mqtt.py
+++ b/tests/components/cover/test_mqtt.py
@@ -1,12 +1,17 @@
 """The tests for the MQTT cover platform."""
 import unittest
 
-from homeassistant.setup import setup_component
-from homeassistant.const import STATE_OPEN, STATE_CLOSED, STATE_UNKNOWN, \
-    STATE_UNAVAILABLE, ATTR_ASSUMED_STATE
 import homeassistant.components.cover as cover
+from homeassistant.components.cover import (ATTR_POSITION, ATTR_TILT_POSITION)
 from homeassistant.components.cover.mqtt import MqttCover
 from homeassistant.components.mqtt.discovery import async_start
+from homeassistant.const import (
+    ATTR_ASSUMED_STATE, ATTR_ENTITY_ID,
+    SERVICE_CLOSE_COVER, SERVICE_CLOSE_COVER_TILT, SERVICE_OPEN_COVER,
+    SERVICE_OPEN_COVER_TILT, SERVICE_SET_COVER_POSITION,
+    SERVICE_SET_COVER_TILT_POSITION, SERVICE_STOP_COVER,
+    STATE_CLOSED, STATE_OPEN, STATE_UNAVAILABLE, STATE_UNKNOWN)
+from homeassistant.setup import setup_component
 
 from tests.common import (
     get_test_home_assistant, mock_mqtt_component, async_fire_mqtt_message,
@@ -117,7 +122,9 @@ class TestCoverMQTT(unittest.TestCase):
         self.assertEqual(STATE_UNKNOWN, state.state)
         self.assertTrue(state.attributes.get(ATTR_ASSUMED_STATE))
 
-        cover.open_cover(self.hass, 'cover.test')
+        self.hass.services.call(
+            cover.DOMAIN, SERVICE_OPEN_COVER,
+            {ATTR_ENTITY_ID: 'cover.test'}, blocking=True)
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_called_once_with(
@@ -126,7 +133,9 @@ class TestCoverMQTT(unittest.TestCase):
         state = self.hass.states.get('cover.test')
         self.assertEqual(STATE_OPEN, state.state)
 
-        cover.close_cover(self.hass, 'cover.test')
+        self.hass.services.call(
+            cover.DOMAIN, SERVICE_CLOSE_COVER,
+            {ATTR_ENTITY_ID: 'cover.test'}, blocking=True)
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_called_once_with(
@@ -149,7 +158,9 @@ class TestCoverMQTT(unittest.TestCase):
         state = self.hass.states.get('cover.test')
         self.assertEqual(STATE_UNKNOWN, state.state)
 
-        cover.open_cover(self.hass, 'cover.test')
+        self.hass.services.call(
+            cover.DOMAIN, SERVICE_OPEN_COVER,
+            {ATTR_ENTITY_ID: 'cover.test'}, blocking=True)
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_called_once_with(
@@ -172,7 +183,9 @@ class TestCoverMQTT(unittest.TestCase):
         state = self.hass.states.get('cover.test')
         self.assertEqual(STATE_UNKNOWN, state.state)
 
-        cover.close_cover(self.hass, 'cover.test')
+        self.hass.services.call(
+            cover.DOMAIN, SERVICE_CLOSE_COVER,
+            {ATTR_ENTITY_ID: 'cover.test'}, blocking=True)
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_called_once_with(
@@ -195,7 +208,9 @@ class TestCoverMQTT(unittest.TestCase):
         state = self.hass.states.get('cover.test')
         self.assertEqual(STATE_UNKNOWN, state.state)
 
-        cover.stop_cover(self.hass, 'cover.test')
+        self.hass.services.call(
+            cover.DOMAIN, SERVICE_STOP_COVER,
+            {ATTR_ENTITY_ID: 'cover.test'}, blocking=True)
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_called_once_with(
@@ -297,7 +312,9 @@ class TestCoverMQTT(unittest.TestCase):
             }
         }))
 
-        cover.set_cover_position(self.hass, 100, 'cover.test')
+        self.hass.services.call(
+            cover.DOMAIN, SERVICE_SET_COVER_POSITION,
+            {ATTR_ENTITY_ID: 'cover.test', ATTR_POSITION: 100}, blocking=True)
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_called_once_with(
@@ -318,7 +335,9 @@ class TestCoverMQTT(unittest.TestCase):
             }
         }))
 
-        cover.set_cover_position(self.hass, 62, 'cover.test')
+        self.hass.services.call(
+            cover.DOMAIN, SERVICE_SET_COVER_POSITION,
+            {ATTR_ENTITY_ID: 'cover.test', ATTR_POSITION: 62}, blocking=True)
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_called_once_with(
@@ -403,14 +422,18 @@ class TestCoverMQTT(unittest.TestCase):
             }
         }))
 
-        cover.open_cover_tilt(self.hass, 'cover.test')
+        self.hass.services.call(
+            cover.DOMAIN, SERVICE_OPEN_COVER_TILT,
+            {ATTR_ENTITY_ID: 'cover.test'}, blocking=True)
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_called_once_with(
             'tilt-command-topic', 100, 0, False)
         self.mock_publish.async_publish.reset_mock()
 
-        cover.close_cover_tilt(self.hass, 'cover.test')
+        self.hass.services.call(
+            cover.DOMAIN, SERVICE_CLOSE_COVER_TILT,
+            {ATTR_ENTITY_ID: 'cover.test'}, blocking=True)
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_called_once_with(
@@ -435,14 +458,18 @@ class TestCoverMQTT(unittest.TestCase):
             }
         }))
 
-        cover.open_cover_tilt(self.hass, 'cover.test')
+        self.hass.services.call(
+            cover.DOMAIN, SERVICE_OPEN_COVER_TILT,
+            {ATTR_ENTITY_ID: 'cover.test'}, blocking=True)
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_called_once_with(
             'tilt-command-topic', 400, 0, False)
         self.mock_publish.async_publish.reset_mock()
 
-        cover.close_cover_tilt(self.hass, 'cover.test')
+        self.hass.services.call(
+            cover.DOMAIN, SERVICE_CLOSE_COVER_TILT,
+            {ATTR_ENTITY_ID: 'cover.test'}, blocking=True)
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_called_once_with(
@@ -542,7 +569,10 @@ class TestCoverMQTT(unittest.TestCase):
             }
         }))
 
-        cover.set_cover_tilt_position(self.hass, 50, 'cover.test')
+        self.hass.services.call(
+            cover.DOMAIN, SERVICE_SET_COVER_TILT_POSITION,
+            {ATTR_ENTITY_ID: 'cover.test', ATTR_TILT_POSITION: 50},
+            blocking=True)
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_called_once_with(
@@ -569,7 +599,10 @@ class TestCoverMQTT(unittest.TestCase):
             }
         }))
 
-        cover.set_cover_tilt_position(self.hass, 50, 'cover.test')
+        self.hass.services.call(
+            cover.DOMAIN, SERVICE_SET_COVER_TILT_POSITION,
+            {ATTR_ENTITY_ID: 'cover.test', ATTR_TILT_POSITION: 50},
+            blocking=True)
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_called_once_with(
diff --git a/tests/components/cover/test_template.py b/tests/components/cover/test_template.py
index b786b463dad..3c820f1a0ac 100644
--- a/tests/components/cover/test_template.py
+++ b/tests/components/cover/test_template.py
@@ -1,17 +1,24 @@
 """The tests the cover command line platform."""
-
 import logging
 import unittest
 
-from homeassistant.core import callback
 from homeassistant import setup
-import homeassistant.components.cover as cover
-from homeassistant.const import STATE_OPEN, STATE_CLOSED
+from homeassistant.core import callback
+from homeassistant.components.cover import (
+    ATTR_POSITION, ATTR_TILT_POSITION, DOMAIN)
+from homeassistant.const import (
+    ATTR_ENTITY_ID, SERVICE_CLOSE_COVER, SERVICE_CLOSE_COVER_TILT,
+    SERVICE_OPEN_COVER, SERVICE_OPEN_COVER_TILT, SERVICE_SET_COVER_POSITION,
+    SERVICE_SET_COVER_TILT_POSITION, SERVICE_STOP_COVER,
+    STATE_CLOSED, STATE_OPEN)
 
 from tests.common import (
     get_test_home_assistant, assert_setup_component)
+
 _LOGGER = logging.getLogger(__name__)
 
+ENTITY_COVER = 'cover.test_template_cover'
+
 
 class TestTemplateCover(unittest.TestCase):
     """Test the cover command line platform."""
@@ -362,7 +369,9 @@ class TestTemplateCover(unittest.TestCase):
         state = self.hass.states.get('cover.test_template_cover')
         assert state.state == STATE_CLOSED
 
-        cover.open_cover(self.hass, 'cover.test_template_cover')
+        self.hass.services.call(
+            DOMAIN, SERVICE_OPEN_COVER,
+            {ATTR_ENTITY_ID: ENTITY_COVER}, blocking=True)
         self.hass.block_till_done()
 
         assert len(self.calls) == 1
@@ -398,10 +407,14 @@ class TestTemplateCover(unittest.TestCase):
         state = self.hass.states.get('cover.test_template_cover')
         assert state.state == STATE_OPEN
 
-        cover.close_cover(self.hass, 'cover.test_template_cover')
+        self.hass.services.call(
+            DOMAIN, SERVICE_CLOSE_COVER,
+            {ATTR_ENTITY_ID: ENTITY_COVER}, blocking=True)
         self.hass.block_till_done()
 
-        cover.stop_cover(self.hass, 'cover.test_template_cover')
+        self.hass.services.call(
+            DOMAIN, SERVICE_STOP_COVER,
+            {ATTR_ENTITY_ID: ENTITY_COVER}, blocking=True)
         self.hass.block_till_done()
 
         assert len(self.calls) == 2
@@ -445,18 +458,23 @@ class TestTemplateCover(unittest.TestCase):
         state = self.hass.states.get('cover.test_template_cover')
         assert state.state == STATE_OPEN
 
-        cover.open_cover(self.hass, 'cover.test_template_cover')
+        self.hass.services.call(
+            DOMAIN, SERVICE_OPEN_COVER,
+            {ATTR_ENTITY_ID: ENTITY_COVER}, blocking=True)
         self.hass.block_till_done()
         state = self.hass.states.get('cover.test_template_cover')
         assert state.attributes.get('current_position') == 100.0
 
-        cover.close_cover(self.hass, 'cover.test_template_cover')
+        self.hass.services.call(
+            DOMAIN, SERVICE_CLOSE_COVER,
+            {ATTR_ENTITY_ID: ENTITY_COVER}, blocking=True)
         self.hass.block_till_done()
         state = self.hass.states.get('cover.test_template_cover')
         assert state.attributes.get('current_position') == 0.0
 
-        cover.set_cover_position(self.hass, 25,
-                                 'cover.test_template_cover')
+        self.hass.services.call(
+            DOMAIN, SERVICE_SET_COVER_POSITION,
+            {ATTR_ENTITY_ID: ENTITY_COVER, ATTR_POSITION: 25}, blocking=True)
         self.hass.block_till_done()
         state = self.hass.states.get('cover.test_template_cover')
         assert state.attributes.get('current_position') == 25.0
@@ -490,8 +508,10 @@ class TestTemplateCover(unittest.TestCase):
         self.hass.start()
         self.hass.block_till_done()
 
-        cover.set_cover_tilt_position(self.hass, 42,
-                                      'cover.test_template_cover')
+        self.hass.services.call(
+            DOMAIN, SERVICE_SET_COVER_TILT_POSITION,
+            {ATTR_ENTITY_ID: ENTITY_COVER, ATTR_TILT_POSITION: 42},
+            blocking=True)
         self.hass.block_till_done()
 
         assert len(self.calls) == 1
@@ -525,7 +545,9 @@ class TestTemplateCover(unittest.TestCase):
         self.hass.start()
         self.hass.block_till_done()
 
-        cover.open_cover_tilt(self.hass, 'cover.test_template_cover')
+        self.hass.services.call(
+            DOMAIN, SERVICE_OPEN_COVER_TILT,
+            {ATTR_ENTITY_ID: ENTITY_COVER}, blocking=True)
         self.hass.block_till_done()
 
         assert len(self.calls) == 1
@@ -559,7 +581,9 @@ class TestTemplateCover(unittest.TestCase):
         self.hass.start()
         self.hass.block_till_done()
 
-        cover.close_cover_tilt(self.hass, 'cover.test_template_cover')
+        self.hass.services.call(
+            DOMAIN, SERVICE_CLOSE_COVER_TILT,
+            {ATTR_ENTITY_ID: ENTITY_COVER}, blocking=True)
         self.hass.block_till_done()
 
         assert len(self.calls) == 1
@@ -585,18 +609,23 @@ class TestTemplateCover(unittest.TestCase):
         state = self.hass.states.get('cover.test_template_cover')
         assert state.attributes.get('current_position') is None
 
-        cover.set_cover_position(self.hass, 42,
-                                 'cover.test_template_cover')
+        self.hass.services.call(
+            DOMAIN, SERVICE_SET_COVER_POSITION,
+            {ATTR_ENTITY_ID: ENTITY_COVER, ATTR_POSITION: 42}, blocking=True)
         self.hass.block_till_done()
         state = self.hass.states.get('cover.test_template_cover')
         assert state.attributes.get('current_position') == 42.0
 
-        cover.close_cover(self.hass, 'cover.test_template_cover')
+        self.hass.services.call(
+            DOMAIN, SERVICE_CLOSE_COVER,
+            {ATTR_ENTITY_ID: ENTITY_COVER}, blocking=True)
         self.hass.block_till_done()
         state = self.hass.states.get('cover.test_template_cover')
         assert state.state == STATE_CLOSED
 
-        cover.open_cover(self.hass, 'cover.test_template_cover')
+        self.hass.services.call(
+            DOMAIN, SERVICE_OPEN_COVER,
+            {ATTR_ENTITY_ID: ENTITY_COVER}, blocking=True)
         self.hass.block_till_done()
         state = self.hass.states.get('cover.test_template_cover')
         assert state.state == STATE_OPEN
@@ -627,18 +656,24 @@ class TestTemplateCover(unittest.TestCase):
         state = self.hass.states.get('cover.test_template_cover')
         assert state.attributes.get('current_tilt_position') is None
 
-        cover.set_cover_tilt_position(self.hass, 42,
-                                      'cover.test_template_cover')
+        self.hass.services.call(
+            DOMAIN, SERVICE_SET_COVER_TILT_POSITION,
+            {ATTR_ENTITY_ID: ENTITY_COVER, ATTR_TILT_POSITION: 42},
+            blocking=True)
         self.hass.block_till_done()
         state = self.hass.states.get('cover.test_template_cover')
         assert state.attributes.get('current_tilt_position') == 42.0
 
-        cover.close_cover_tilt(self.hass, 'cover.test_template_cover')
+        self.hass.services.call(
+            DOMAIN, SERVICE_CLOSE_COVER_TILT,
+            {ATTR_ENTITY_ID: ENTITY_COVER}, blocking=True)
         self.hass.block_till_done()
         state = self.hass.states.get('cover.test_template_cover')
         assert state.attributes.get('current_tilt_position') == 0.0
 
-        cover.open_cover_tilt(self.hass, 'cover.test_template_cover')
+        self.hass.services.call(
+            DOMAIN, SERVICE_OPEN_COVER_TILT,
+            {ATTR_ENTITY_ID: ENTITY_COVER}, blocking=True)
         self.hass.block_till_done()
         state = self.hass.states.get('cover.test_template_cover')
         assert state.attributes.get('current_tilt_position') == 100.0

From b91a061cef55d38fa70a49b749c200eb793bf068 Mon Sep 17 00:00:00 2001
From: cdce8p <30130371+cdce8p@users.noreply.github.com>
Date: Tue, 25 Sep 2018 23:08:37 +0200
Subject: [PATCH 298/357] Add missing __init__ test files (#16871)

---
 tests/components/cover/__init__.py   | 1 +
 tests/components/homekit/__init__.py | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 tests/components/cover/__init__.py
 create mode 100644 tests/components/homekit/__init__.py

diff --git a/tests/components/cover/__init__.py b/tests/components/cover/__init__.py
new file mode 100644
index 00000000000..aaaf6b237cd
--- /dev/null
+++ b/tests/components/cover/__init__.py
@@ -0,0 +1 @@
+"""Tests for the cover component."""
diff --git a/tests/components/homekit/__init__.py b/tests/components/homekit/__init__.py
new file mode 100644
index 00000000000..1734367bcdb
--- /dev/null
+++ b/tests/components/homekit/__init__.py
@@ -0,0 +1 @@
+"""Tests for the HomeKit component."""

From dc102a96a9c6edfd253b61fe8b9da89d95fb981b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=B8yer=20Iversen?= <mail@dahoiv.net>
Date: Wed, 26 Sep 2018 07:49:09 +0200
Subject: [PATCH 299/357] Tibber realtime consumption, Tibber pulse (#16870)

* tibber real time data

* Tibber Pulse, realtime consumption

* update lib
---
 homeassistant/components/sensor/tibber.py | 85 +++++++++++++++++++++--
 requirements_all.txt                      |  2 +-
 2 files changed, 81 insertions(+), 6 deletions(-)

diff --git a/homeassistant/components/sensor/tibber.py b/homeassistant/components/sensor/tibber.py
index dbea54ff353..0f127d7dd64 100644
--- a/homeassistant/components/sensor/tibber.py
+++ b/homeassistant/components/sensor/tibber.py
@@ -14,14 +14,14 @@ import voluptuous as vol
 
 import homeassistant.helpers.config_validation as cv
 from homeassistant.components.sensor import PLATFORM_SCHEMA
-from homeassistant.const import CONF_ACCESS_TOKEN
+from homeassistant.const import EVENT_HOMEASSISTANT_STOP, CONF_ACCESS_TOKEN
 from homeassistant.exceptions import PlatformNotReady
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.entity import Entity
 from homeassistant.util import dt as dt_util
 from homeassistant.util import Throttle
 
-REQUIREMENTS = ['pyTibber==0.5.1']
+REQUIREMENTS = ['pyTibber==0.6.0']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -30,6 +30,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 ICON = 'mdi:currency-usd'
+ICON_RT = 'mdi:power-plug'
 SCAN_INTERVAL = timedelta(minutes=1)
 MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=5)
 
@@ -41,20 +42,26 @@ async def async_setup_platform(hass, config, async_add_entities,
     tibber_connection = tibber.Tibber(config[CONF_ACCESS_TOKEN],
                                       websession=async_get_clientsession(hass))
 
+    async def _close(*_):
+        await tibber_connection.rt_disconnect()
+    hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, _close)
+
     try:
         await tibber_connection.update_info()
         dev = []
         for home in tibber_connection.get_homes():
             await home.update_info()
-            dev.append(TibberSensor(home))
+            dev.append(TibberSensorElPrice(home))
+            if home.has_real_time_consumption:
+                dev.append(TibberSensorRT(home))
     except (asyncio.TimeoutError, aiohttp.ClientError):
         raise PlatformNotReady()
 
     async_add_entities(dev, True)
 
 
-class TibberSensor(Entity):
-    """Representation of an Tibber sensor."""
+class TibberSensorElPrice(Entity):
+    """Representation of an Tibber sensor for el price."""
 
     def __init__(self, tibber_home):
         """Initialize the sensor."""
@@ -155,3 +162,71 @@ class TibberSensor(Entity):
         self._device_state_attributes['max_price'] = max_price
         self._device_state_attributes['min_price'] = min_price
         return state is not None
+
+
+class TibberSensorRT(Entity):
+    """Representation of an Tibber sensor for real time consumption."""
+
+    def __init__(self, tibber_home):
+        """Initialize the sensor."""
+        self._tibber_home = tibber_home
+        self._state = None
+        self._device_state_attributes = {}
+        self._unit_of_measurement = 'W'
+        nickname = tibber_home.info['viewer']['home']['appNickname']
+        self._name = 'Real time consumption {}'.format(nickname)
+
+    async def async_added_to_hass(self):
+        """Start unavailability tracking."""
+        await self._tibber_home.rt_subscribe(self.hass.loop,
+                                             self._async_callback)
+
+    async def _async_callback(self, payload):
+        """Handle received data."""
+        data = payload.get('data', {})
+        live_measurement = data.get('liveMeasurement', {})
+        self._state = live_measurement.pop('power', None)
+        self._device_state_attributes = live_measurement
+        self.async_schedule_update_ha_state()
+
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes."""
+        return self._device_state_attributes
+
+    @property
+    def available(self):
+        """Return True if entity is available."""
+        return self._tibber_home.rt_subscription_running
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return self._name
+
+    @property
+    def should_poll(self):
+        """Return the polling state."""
+        return False
+
+    @property
+    def state(self):
+        """Return the state of the device."""
+        return self._state
+
+    @property
+    def icon(self):
+        """Return the icon to use in the frontend."""
+        return ICON_RT
+
+    @property
+    def unit_of_measurement(self):
+        """Return the unit of measurement of this entity."""
+        return self._unit_of_measurement
+
+    @property
+    def unique_id(self):
+        """Return a unique ID."""
+        home = self._tibber_home.info['viewer']['home']
+        _id = home['meteringPointData']['consumptionEan']
+        return'{}_rt_consumption'.format(_id)
diff --git a/requirements_all.txt b/requirements_all.txt
index b6f9dd4875e..6c8b86a03f6 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -764,7 +764,7 @@ pyRFXtrx==0.23
 pySwitchmate==0.4.1
 
 # homeassistant.components.sensor.tibber
-pyTibber==0.5.1
+pyTibber==0.6.0
 
 # homeassistant.components.switch.dlink
 pyW215==0.6.0

From 6490ec87f3bdd5955fa9cd60acc3dc0e70646052 Mon Sep 17 00:00:00 2001
From: Gerard <gerard33@users.noreply.github.com>
Date: Wed, 26 Sep 2018 08:24:59 +0200
Subject: [PATCH 300/357] Upgrade to bimmer_connected 0.5.3 (#16877)

---
 .../components/binary_sensor/bmw_connected_drive.py          | 5 ++++-
 homeassistant/components/bmw_connected_drive/__init__.py     | 2 +-
 requirements_all.txt                                         | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/binary_sensor/bmw_connected_drive.py b/homeassistant/components/binary_sensor/bmw_connected_drive.py
index 36229828d63..e3b1a941bd2 100644
--- a/homeassistant/components/binary_sensor/bmw_connected_drive.py
+++ b/homeassistant/components/binary_sensor/bmw_connected_drive.py
@@ -124,7 +124,10 @@ class BMWConnectedDriveSensor(BinarySensorDevice):
             if not check_control_messages:
                 result['check_control_messages'] = 'OK'
             else:
-                result['check_control_messages'] = check_control_messages
+                cbs_list = []
+                for message in check_control_messages:
+                    cbs_list.append(message['ccmDescriptionShort'])
+                result['check_control_messages'] = cbs_list
         elif self._attribute == 'charging_status':
             result['charging_status'] = vehicle_state.charging_status.value
             # pylint: disable=protected-access
diff --git a/homeassistant/components/bmw_connected_drive/__init__.py b/homeassistant/components/bmw_connected_drive/__init__.py
index 12363627003..dce5961d70d 100644
--- a/homeassistant/components/bmw_connected_drive/__init__.py
+++ b/homeassistant/components/bmw_connected_drive/__init__.py
@@ -14,7 +14,7 @@ from homeassistant.helpers import discovery
 from homeassistant.helpers.event import track_utc_time_change
 import homeassistant.helpers.config_validation as cv
 
-REQUIREMENTS = ['bimmer_connected==0.5.2']
+REQUIREMENTS = ['bimmer_connected==0.5.3']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/requirements_all.txt b/requirements_all.txt
index 6c8b86a03f6..9f20ccb2ece 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -172,7 +172,7 @@ beautifulsoup4==4.6.3
 bellows==0.7.0
 
 # homeassistant.components.bmw_connected_drive
-bimmer_connected==0.5.2
+bimmer_connected==0.5.3
 
 # homeassistant.components.blink
 blinkpy==0.6.0

From 672fc61bb2b8645a32419328b07948f13afa8fed Mon Sep 17 00:00:00 2001
From: Martin Mois <martin.mois@googlemail.com>
Date: Wed, 26 Sep 2018 08:43:09 +0200
Subject: [PATCH 301/357] aiohttp.ClientSession gets proxy information from
 HTTP_PROXY/HTTPS_PROXY (#16874)

---
 homeassistant/helpers/aiohttp_client.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/homeassistant/helpers/aiohttp_client.py b/homeassistant/helpers/aiohttp_client.py
index 53b246c700d..01cc074aa6a 100644
--- a/homeassistant/helpers/aiohttp_client.py
+++ b/homeassistant/helpers/aiohttp_client.py
@@ -56,6 +56,7 @@ def async_create_clientsession(hass, verify_ssl=True, auto_cleanup=True,
     clientsession = aiohttp.ClientSession(
         loop=hass.loop,
         connector=connector,
+        trust_env=True,
         headers={USER_AGENT: SERVER_SOFTWARE},
         **kwargs
     )

From e2a56721d3fe9f296286bc4338109bb25b6d1635 Mon Sep 17 00:00:00 2001
From: cdce8p <30130371+cdce8p@users.noreply.github.com>
Date: Wed, 26 Sep 2018 08:50:05 +0200
Subject: [PATCH 302/357] Remove service helper (3) (#16879)

* Update duckdns

* Update google_assistant

* Update group

* Update homematic

* Update image_processing

* Update input_boolean

* Update input_number

* Update input_select

* Update input_text
---
 homeassistant/components/duckdns.py           | 10 ---
 .../components/google_assistant/__init__.py   |  7 --
 homeassistant/components/group/__init__.py    |  7 --
 .../components/homematic/__init__.py          | 73 -------------------
 .../components/image_processing/__init__.py   | 15 ----
 homeassistant/components/input_boolean.py     | 18 -----
 homeassistant/components/input_number.py      | 26 -------
 homeassistant/components/input_select.py      | 35 ---------
 homeassistant/components/input_text.py        | 10 ---
 tests/components/group/common.py              | 16 ++++
 tests/components/group/test_init.py           |  5 +-
 tests/components/image_processing/common.py   | 23 ++++++
 .../components/image_processing/test_init.py  | 17 +++--
 .../test_microsoft_face_detect.py             |  3 +-
 .../test_microsoft_face_identify.py           |  3 +-
 .../image_processing/test_openalpr_cloud.py   |  7 +-
 .../image_processing/test_openalpr_local.py   |  3 +-
 tests/components/test_duckdns.py              | 18 ++++-
 tests/components/test_input_boolean.py        | 33 ++++++++-
 tests/components/test_input_number.py         | 41 ++++++++++-
 tests/components/test_input_select.py         | 61 ++++++++++++++--
 tests/components/test_input_text.py           | 17 ++++-
 22 files changed, 217 insertions(+), 231 deletions(-)
 create mode 100644 tests/components/group/common.py
 create mode 100644 tests/components/image_processing/common.py

diff --git a/homeassistant/components/duckdns.py b/homeassistant/components/duckdns.py
index 178e1579538..6ec2e6b1e03 100644
--- a/homeassistant/components/duckdns.py
+++ b/homeassistant/components/duckdns.py
@@ -11,7 +11,6 @@ import logging
 import voluptuous as vol
 
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_DOMAIN
-from homeassistant.loader import bind_hass
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.event import async_track_time_interval
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
@@ -40,15 +39,6 @@ SERVICE_TXT_SCHEMA = vol.Schema({
 })
 
 
-@bind_hass
-@asyncio.coroutine
-def async_set_txt(hass, txt):
-    """Set the txt record. Pass in None to remove it."""
-    yield from hass.services.async_call(DOMAIN, SERVICE_SET_TXT, {
-        ATTR_TXT: txt
-    }, blocking=True)
-
-
 @asyncio.coroutine
 def async_setup(hass, config):
     """Initialize the DuckDNS component."""
diff --git a/homeassistant/components/google_assistant/__init__.py b/homeassistant/components/google_assistant/__init__.py
index 22569af1f86..b0b580dc6ac 100644
--- a/homeassistant/components/google_assistant/__init__.py
+++ b/homeassistant/components/google_assistant/__init__.py
@@ -19,7 +19,6 @@ from homeassistant.core import HomeAssistant
 from homeassistant.const import CONF_NAME
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.loader import bind_hass
 
 from .const import (
     DOMAIN, CONF_PROJECT_ID, CONF_CLIENT_ID, CONF_ACCESS_TOKEN,
@@ -63,12 +62,6 @@ CONFIG_SCHEMA = vol.Schema(
     extra=vol.ALLOW_EXTRA)
 
 
-@bind_hass
-def request_sync(hass):
-    """Request sync."""
-    hass.services.call(DOMAIN, SERVICE_REQUEST_SYNC)
-
-
 async def async_setup(hass: HomeAssistant, yaml_config: Dict[str, Any]):
     """Activate Google Actions component."""
     config = yaml_config.get(DOMAIN, {})
diff --git a/homeassistant/components/group/__init__.py b/homeassistant/components/group/__init__.py
index eda65d1895d..7b5a75dc13f 100644
--- a/homeassistant/components/group/__init__.py
+++ b/homeassistant/components/group/__init__.py
@@ -133,13 +133,6 @@ def async_reload(hass):
     hass.async_add_job(hass.services.async_call(DOMAIN, SERVICE_RELOAD))
 
 
-@bind_hass
-def set_visibility(hass, entity_id=None, visible=True):
-    """Hide or shows a group."""
-    data = {ATTR_ENTITY_ID: entity_id, ATTR_VISIBLE: visible}
-    hass.services.call(DOMAIN, SERVICE_SET_VISIBILITY, data)
-
-
 @bind_hass
 def set_group(hass, object_id, name=None, entity_ids=None, visible=None,
               icon=None, view=None, control=None, add=None):
diff --git a/homeassistant/components/homematic/__init__.py b/homeassistant/components/homematic/__init__.py
index 4e6b3f04ee1..3d6eb69bb5e 100644
--- a/homeassistant/components/homematic/__init__.py
+++ b/homeassistant/components/homematic/__init__.py
@@ -18,7 +18,6 @@ from homeassistant.const import (
 from homeassistant.helpers import discovery
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
-from homeassistant.loader import bind_hass
 
 REQUIREMENTS = ['pyhomematic==0.1.49']
 
@@ -245,78 +244,6 @@ SCHEMA_SERVICE_PUT_PARAMSET = vol.Schema({
 })
 
 
-@bind_hass
-def virtualkey(hass, address, channel, param, interface=None):
-    """Send virtual keypress to homematic controller."""
-    data = {
-        ATTR_ADDRESS: address,
-        ATTR_CHANNEL: channel,
-        ATTR_PARAM: param,
-        ATTR_INTERFACE: interface,
-    }
-
-    hass.services.call(DOMAIN, SERVICE_VIRTUALKEY, data)
-
-
-@bind_hass
-def set_variable_value(hass, entity_id, value):
-    """Change value of a Homematic system variable."""
-    data = {
-        ATTR_ENTITY_ID: entity_id,
-        ATTR_VALUE: value,
-    }
-
-    hass.services.call(DOMAIN, SERVICE_SET_VARIABLE_VALUE, data)
-
-
-@bind_hass
-def set_device_value(hass, address, channel, param, value, interface=None):
-    """Call setValue XML-RPC method of supplied interface."""
-    data = {
-        ATTR_ADDRESS: address,
-        ATTR_CHANNEL: channel,
-        ATTR_PARAM: param,
-        ATTR_VALUE: value,
-        ATTR_INTERFACE: interface,
-    }
-
-    hass.services.call(DOMAIN, SERVICE_SET_DEVICE_VALUE, data)
-
-
-@bind_hass
-def put_paramset(hass, interface, address, paramset_key, paramset):
-    """Call putParamset XML-RPC method of supplied interface."""
-    data = {
-        ATTR_INTERFACE: interface,
-        ATTR_ADDRESS: address,
-        ATTR_PARAMSET_KEY: paramset_key,
-        ATTR_PARAMSET: paramset,
-    }
-
-    hass.services.call(DOMAIN, SERVICE_PUT_PARAMSET, data)
-
-
-@bind_hass
-def set_install_mode(hass, interface, mode=None, time=None, address=None):
-    """Call setInstallMode XML-RPC method of supplied interface."""
-    data = {
-        key: value for key, value in (
-            (ATTR_INTERFACE, interface),
-            (ATTR_MODE, mode),
-            (ATTR_TIME, time),
-            (ATTR_ADDRESS, address)
-        ) if value
-    }
-
-    hass.services.call(DOMAIN, SERVICE_SET_INSTALL_MODE, data)
-
-
-@bind_hass
-def reconnect(hass):
-    """Reconnect to CCU/Homegear."""
-    hass.services.call(DOMAIN, SERVICE_RECONNECT, {})
-
-
 def setup(hass, config):
     """Set up the Homematic component."""
     from pyhomematic import HMConnection
diff --git a/homeassistant/components/image_processing/__init__.py b/homeassistant/components/image_processing/__init__.py
index 480ec31da7d..84d92361541 100644
--- a/homeassistant/components/image_processing/__init__.py
+++ b/homeassistant/components/image_processing/__init__.py
@@ -17,7 +17,6 @@ from homeassistant.exceptions import HomeAssistantError
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_component import EntityComponent
-from homeassistant.loader import bind_hass
 from homeassistant.util.async_ import run_callback_threadsafe
 
 _LOGGER = logging.getLogger(__name__)
@@ -67,20 +66,6 @@ SERVICE_SCAN_SCHEMA = vol.Schema({
 })
 
 
-@bind_hass
-def scan(hass, entity_id=None):
-    """Force process of all cameras or given entity."""
-    hass.add_job(async_scan, hass, entity_id)
-
-
-@callback
-@bind_hass
-def async_scan(hass, entity_id=None):
-    """Force process of all cameras or given entity."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
-    hass.async_add_job(hass.services.async_call(DOMAIN, SERVICE_SCAN, data))
-
-
 async def async_setup(hass, config):
     """Set up the image processing."""
     component = EntityComponent(_LOGGER, DOMAIN, hass, SCAN_INTERVAL)
diff --git a/homeassistant/components/input_boolean.py b/homeassistant/components/input_boolean.py
index b9c4dcc685e..18c9808c6d2 100644
--- a/homeassistant/components/input_boolean.py
+++ b/homeassistant/components/input_boolean.py
@@ -46,24 +46,6 @@ def is_on(hass, entity_id):
     return hass.states.is_state(entity_id, STATE_ON)
 
 
-@bind_hass
-def turn_on(hass, entity_id):
-    """Set input_boolean to True."""
-    hass.services.call(DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: entity_id})
-
-
-@bind_hass
-def turn_off(hass, entity_id):
-    """Set input_boolean to False."""
-    hass.services.call(DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: entity_id})
-
-
-@bind_hass
-def toggle(hass, entity_id):
-    """Set input_boolean to False."""
-    hass.services.call(DOMAIN, SERVICE_TOGGLE, {ATTR_ENTITY_ID: entity_id})
-
-
 async def async_setup(hass, config):
     """Set up an input boolean."""
     component = EntityComponent(_LOGGER, DOMAIN, hass)
diff --git a/homeassistant/components/input_number.py b/homeassistant/components/input_number.py
index 2f25ca143b8..2eb811e1fb0 100644
--- a/homeassistant/components/input_number.py
+++ b/homeassistant/components/input_number.py
@@ -15,7 +15,6 @@ from homeassistant.const import (
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.restore_state import async_get_last_state
-from homeassistant.loader import bind_hass
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -82,31 +81,6 @@ CONFIG_SCHEMA = vol.Schema({
 }, required=True, extra=vol.ALLOW_EXTRA)
 
 
-@bind_hass
-def set_value(hass, entity_id, value):
-    """Set input_number to value."""
-    hass.services.call(DOMAIN, SERVICE_SET_VALUE, {
-        ATTR_ENTITY_ID: entity_id,
-        ATTR_VALUE: value,
-    })
-
-
-@bind_hass
-def increment(hass, entity_id):
-    """Increment value of entity."""
-    hass.services.call(DOMAIN, SERVICE_INCREMENT, {
-        ATTR_ENTITY_ID: entity_id
-    })
-
-
-@bind_hass
-def decrement(hass, entity_id):
-    """Decrement value of entity."""
-    hass.services.call(DOMAIN, SERVICE_DECREMENT, {
-        ATTR_ENTITY_ID: entity_id
-    })
-
-
 @asyncio.coroutine
 def async_setup(hass, config):
     """Set up an input slider."""
diff --git a/homeassistant/components/input_select.py b/homeassistant/components/input_select.py
index 04e9b04787c..51175efecbd 100644
--- a/homeassistant/components/input_select.py
+++ b/homeassistant/components/input_select.py
@@ -10,7 +10,6 @@ import logging
 import voluptuous as vol
 
 from homeassistant.const import ATTR_ENTITY_ID, CONF_ICON, CONF_NAME
-from homeassistant.loader import bind_hass
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_component import EntityComponent
@@ -78,40 +77,6 @@ CONFIG_SCHEMA = vol.Schema({
 }, required=True, extra=vol.ALLOW_EXTRA)
 
 
-@bind_hass
-def select_option(hass, entity_id, option):
-    """Set value of input_select."""
-    hass.services.call(DOMAIN, SERVICE_SELECT_OPTION, {
-        ATTR_ENTITY_ID: entity_id,
-        ATTR_OPTION: option,
-    })
-
-
-@bind_hass
-def select_next(hass, entity_id):
-    """Set next value of input_select."""
-    hass.services.call(DOMAIN, SERVICE_SELECT_NEXT, {
-        ATTR_ENTITY_ID: entity_id,
-    })
-
-
-@bind_hass
-def select_previous(hass, entity_id):
-    """Set previous value of input_select."""
-    hass.services.call(DOMAIN, SERVICE_SELECT_PREVIOUS, {
-        ATTR_ENTITY_ID: entity_id,
-    })
-
-
-@bind_hass
-def set_options(hass, entity_id, options):
-    """Set options of input_select."""
-    hass.services.call(DOMAIN, SERVICE_SET_OPTIONS, {
-        ATTR_ENTITY_ID: entity_id,
-        ATTR_OPTIONS: options,
-    })
-
-
 @asyncio.coroutine
 def async_setup(hass, config):
     """Set up an input select."""
diff --git a/homeassistant/components/input_text.py b/homeassistant/components/input_text.py
index 2cb4f58a130..fcc2352f523 100644
--- a/homeassistant/components/input_text.py
+++ b/homeassistant/components/input_text.py
@@ -12,7 +12,6 @@ import voluptuous as vol
 import homeassistant.helpers.config_validation as cv
 from homeassistant.const import (
     ATTR_ENTITY_ID, ATTR_UNIT_OF_MEASUREMENT, CONF_ICON, CONF_NAME, CONF_MODE)
-from homeassistant.loader import bind_hass
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.restore_state import async_get_last_state
@@ -74,15 +73,6 @@ CONFIG_SCHEMA = vol.Schema({
 }, required=True, extra=vol.ALLOW_EXTRA)
 
 
-@bind_hass
-def set_value(hass, entity_id, value):
-    """Set input_text to value."""
-    hass.services.call(DOMAIN, SERVICE_SET_VALUE, {
-        ATTR_ENTITY_ID: entity_id,
-        ATTR_VALUE: value,
-    })
-
-
 @asyncio.coroutine
 def async_setup(hass, config):
     """Set up an input text box."""
diff --git a/tests/components/group/common.py b/tests/components/group/common.py
new file mode 100644
index 00000000000..1a59eb265e0
--- /dev/null
+++ b/tests/components/group/common.py
@@ -0,0 +1,16 @@
+"""Collection of helper methods.
+
+All containing methods are legacy helpers that should not be used by new
+components. Instead call the service directly.
+"""
+from homeassistant.components.group import ATTR_VISIBLE, DOMAIN, \
+    SERVICE_SET_VISIBILITY
+from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.loader import bind_hass
+
+
+@bind_hass
+def set_visibility(hass, entity_id=None, visible=True):
+    """Hide or shows a group."""
+    data = {ATTR_ENTITY_ID: entity_id, ATTR_VISIBLE: visible}
+    hass.services.call(DOMAIN, SERVICE_SET_VISIBILITY, data)
diff --git a/tests/components/group/test_init.py b/tests/components/group/test_init.py
index 47101dd415a..619ce86583a 100644
--- a/tests/components/group/test_init.py
+++ b/tests/components/group/test_init.py
@@ -12,6 +12,7 @@ from homeassistant.const import (
 import homeassistant.components.group as group
 
 from tests.common import get_test_home_assistant, assert_setup_component
+from tests.components.group import common
 
 
 class TestComponentsGroup(unittest.TestCase):
@@ -385,13 +386,13 @@ class TestComponentsGroup(unittest.TestCase):
         group_entity_id = group.ENTITY_ID_FORMAT.format('test_group')
 
         # Hide the group
-        group.set_visibility(self.hass, group_entity_id, False)
+        common.set_visibility(self.hass, group_entity_id, False)
         self.hass.block_till_done()
         group_state = self.hass.states.get(group_entity_id)
         self.assertTrue(group_state.attributes.get(ATTR_HIDDEN))
 
         # Show it again
-        group.set_visibility(self.hass, group_entity_id, True)
+        common.set_visibility(self.hass, group_entity_id, True)
         self.hass.block_till_done()
         group_state = self.hass.states.get(group_entity_id)
         self.assertIsNone(group_state.attributes.get(ATTR_HIDDEN))
diff --git a/tests/components/image_processing/common.py b/tests/components/image_processing/common.py
new file mode 100644
index 00000000000..b767884503d
--- /dev/null
+++ b/tests/components/image_processing/common.py
@@ -0,0 +1,23 @@
+"""Collection of helper methods.
+
+All containing methods are legacy helpers that should not be used by new
+components. Instead call the service directly.
+"""
+from homeassistant.components.image_processing import DOMAIN, SERVICE_SCAN
+from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.core import callback
+from homeassistant.loader import bind_hass
+
+
+@bind_hass
+def scan(hass, entity_id=None):
+    """Force process of all cameras or given entity."""
+    hass.add_job(async_scan, hass, entity_id)
+
+
+@callback
+@bind_hass
+def async_scan(hass, entity_id=None):
+    """Force process of all cameras or given entity."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
+    hass.async_add_job(hass.services.async_call(DOMAIN, SERVICE_SCAN, data))
diff --git a/tests/components/image_processing/test_init.py b/tests/components/image_processing/test_init.py
index 4240e173b26..7a31b2ffadf 100644
--- a/tests/components/image_processing/test_init.py
+++ b/tests/components/image_processing/test_init.py
@@ -10,6 +10,7 @@ import homeassistant.components.image_processing as ip
 
 from tests.common import (
     get_test_home_assistant, get_test_instance_port, assert_setup_component)
+from tests.components.image_processing import common
 
 
 class TestSetupImageProcessing:
@@ -85,7 +86,7 @@ class TestImageProcessing:
         """Grab an image from camera entity."""
         self.hass.start()
 
-        ip.scan(self.hass, entity_id='image_processing.test')
+        common.scan(self.hass, entity_id='image_processing.test')
         self.hass.block_till_done()
 
         state = self.hass.states.get('image_processing.test')
@@ -100,7 +101,7 @@ class TestImageProcessing:
         """Try to get image without exists camera."""
         self.hass.states.remove('camera.demo_camera')
 
-        ip.scan(self.hass, entity_id='image_processing.test')
+        common.scan(self.hass, entity_id='image_processing.test')
         self.hass.block_till_done()
 
         state = self.hass.states.get('image_processing.test')
@@ -152,7 +153,7 @@ class TestImageProcessingAlpr:
         """Set up and scan a picture and test plates from event."""
         aioclient_mock.get(self.url, content=b'image')
 
-        ip.scan(self.hass, entity_id='image_processing.demo_alpr')
+        common.scan(self.hass, entity_id='image_processing.demo_alpr')
         self.hass.block_till_done()
 
         state = self.hass.states.get('image_processing.demo_alpr')
@@ -171,8 +172,8 @@ class TestImageProcessingAlpr:
         """Set up and scan a picture and test plates from event."""
         aioclient_mock.get(self.url, content=b'image')
 
-        ip.scan(self.hass, entity_id='image_processing.demo_alpr')
-        ip.scan(self.hass, entity_id='image_processing.demo_alpr')
+        common.scan(self.hass, entity_id='image_processing.demo_alpr')
+        common.scan(self.hass, entity_id='image_processing.demo_alpr')
         self.hass.block_till_done()
 
         state = self.hass.states.get('image_processing.demo_alpr')
@@ -195,7 +196,7 @@ class TestImageProcessingAlpr:
         """Set up and scan a picture and test plates from event."""
         aioclient_mock.get(self.url, content=b'image')
 
-        ip.scan(self.hass, entity_id='image_processing.demo_alpr')
+        common.scan(self.hass, entity_id='image_processing.demo_alpr')
         self.hass.block_till_done()
 
         state = self.hass.states.get('image_processing.demo_alpr')
@@ -254,7 +255,7 @@ class TestImageProcessingFace:
         """Set up and scan a picture and test faces from event."""
         aioclient_mock.get(self.url, content=b'image')
 
-        ip.scan(self.hass, entity_id='image_processing.demo_face')
+        common.scan(self.hass, entity_id='image_processing.demo_face')
         self.hass.block_till_done()
 
         state = self.hass.states.get('image_processing.demo_face')
@@ -279,7 +280,7 @@ class TestImageProcessingFace:
         """Set up and scan a picture and test faces from event."""
         aioclient_mock.get(self.url, content=b'image')
 
-        ip.scan(self.hass, entity_id='image_processing.demo_face')
+        common.scan(self.hass, entity_id='image_processing.demo_face')
         self.hass.block_till_done()
 
         state = self.hass.states.get('image_processing.demo_face')
diff --git a/tests/components/image_processing/test_microsoft_face_detect.py b/tests/components/image_processing/test_microsoft_face_detect.py
index 9047c5b8475..c7528c346ee 100644
--- a/tests/components/image_processing/test_microsoft_face_detect.py
+++ b/tests/components/image_processing/test_microsoft_face_detect.py
@@ -9,6 +9,7 @@ import homeassistant.components.microsoft_face as mf
 
 from tests.common import (
     get_test_home_assistant, assert_setup_component, load_fixture, mock_coro)
+from tests.components.image_processing import common
 
 
 class TestMicrosoftFaceDetectSetup:
@@ -146,7 +147,7 @@ class TestMicrosoftFaceDetect:
             params={'returnFaceAttributes': "age,gender"}
         )
 
-        ip.scan(self.hass, entity_id='image_processing.test_local')
+        common.scan(self.hass, entity_id='image_processing.test_local')
         self.hass.block_till_done()
 
         state = self.hass.states.get('image_processing.test_local')
diff --git a/tests/components/image_processing/test_microsoft_face_identify.py b/tests/components/image_processing/test_microsoft_face_identify.py
index 6d3eae38728..892326e5bff 100644
--- a/tests/components/image_processing/test_microsoft_face_identify.py
+++ b/tests/components/image_processing/test_microsoft_face_identify.py
@@ -9,6 +9,7 @@ import homeassistant.components.microsoft_face as mf
 
 from tests.common import (
     get_test_home_assistant, assert_setup_component, load_fixture, mock_coro)
+from tests.components.image_processing import common
 
 
 class TestMicrosoftFaceIdentifySetup:
@@ -150,7 +151,7 @@ class TestMicrosoftFaceIdentify:
             text=load_fixture('microsoft_face_identify.json')
         )
 
-        ip.scan(self.hass, entity_id='image_processing.test_local')
+        common.scan(self.hass, entity_id='image_processing.test_local')
         self.hass.block_till_done()
 
         state = self.hass.states.get('image_processing.test_local')
diff --git a/tests/components/image_processing/test_openalpr_cloud.py b/tests/components/image_processing/test_openalpr_cloud.py
index 2d6015e3fe7..8a71db7fb7b 100644
--- a/tests/components/image_processing/test_openalpr_cloud.py
+++ b/tests/components/image_processing/test_openalpr_cloud.py
@@ -10,6 +10,7 @@ from homeassistant.components.image_processing.openalpr_cloud import (
 
 from tests.common import (
     get_test_home_assistant, assert_setup_component, load_fixture, mock_coro)
+from tests.components.image_processing import common
 
 
 class TestOpenAlprCloudSetup:
@@ -160,7 +161,7 @@ class TestOpenAlprCloud:
         with patch('homeassistant.components.camera.async_get_image',
                    return_value=mock_coro(
                        camera.Image('image/jpeg', b'image'))):
-            ip.scan(self.hass, entity_id='image_processing.test_local')
+            common.scan(self.hass, entity_id='image_processing.test_local')
             self.hass.block_till_done()
 
         state = self.hass.states.get('image_processing.test_local')
@@ -188,7 +189,7 @@ class TestOpenAlprCloud:
         with patch('homeassistant.components.camera.async_get_image',
                    return_value=mock_coro(
                        camera.Image('image/jpeg', b'image'))):
-            ip.scan(self.hass, entity_id='image_processing.test_local')
+            common.scan(self.hass, entity_id='image_processing.test_local')
             self.hass.block_till_done()
 
         assert len(aioclient_mock.mock_calls) == 1
@@ -204,7 +205,7 @@ class TestOpenAlprCloud:
         with patch('homeassistant.components.camera.async_get_image',
                    return_value=mock_coro(
                        camera.Image('image/jpeg', b'image'))):
-            ip.scan(self.hass, entity_id='image_processing.test_local')
+            common.scan(self.hass, entity_id='image_processing.test_local')
             self.hass.block_till_done()
 
         assert len(aioclient_mock.mock_calls) == 1
diff --git a/tests/components/image_processing/test_openalpr_local.py b/tests/components/image_processing/test_openalpr_local.py
index 772d66670a0..6d860da3313 100644
--- a/tests/components/image_processing/test_openalpr_local.py
+++ b/tests/components/image_processing/test_openalpr_local.py
@@ -9,6 +9,7 @@ import homeassistant.components.image_processing as ip
 
 from tests.common import (
     get_test_home_assistant, assert_setup_component, load_fixture)
+from tests.components.image_processing import common
 
 
 @asyncio.coroutine
@@ -146,7 +147,7 @@ class TestOpenAlprLocal:
         """Set up and scan a picture and test plates from event."""
         aioclient_mock.get(self.url, content=b'image')
 
-        ip.scan(self.hass, entity_id='image_processing.test_local')
+        common.scan(self.hass, entity_id='image_processing.test_local')
         self.hass.block_till_done()
 
         state = self.hass.states.get('image_processing.test_local')
diff --git a/tests/components/test_duckdns.py b/tests/components/test_duckdns.py
index d64ffbca81f..c3ece8a70fd 100644
--- a/tests/components/test_duckdns.py
+++ b/tests/components/test_duckdns.py
@@ -4,6 +4,7 @@ from datetime import timedelta
 
 import pytest
 
+from homeassistant.loader import bind_hass
 from homeassistant.setup import async_setup_component
 from homeassistant.components import duckdns
 from homeassistant.util.dt import utcnow
@@ -14,6 +15,19 @@ DOMAIN = 'bla'
 TOKEN = 'abcdefgh'
 
 
+@bind_hass
+@asyncio.coroutine
+def async_set_txt(hass, txt):
+    """Set the txt record. Pass in None to remove it.
+
+    This is a legacy helper method. Do not use it for new tests.
+    """
+    yield from hass.services.async_call(
+        duckdns.DOMAIN, duckdns.SERVICE_SET_TXT, {
+            duckdns.ATTR_TXT: txt
+        }, blocking=True)
+
+
 @pytest.fixture
 def setup_duckdns(hass, aioclient_mock):
     """Fixture that sets up DuckDNS."""
@@ -84,7 +98,7 @@ def test_service_set_txt(hass, aioclient_mock, setup_duckdns):
     }, text='OK')
 
     assert aioclient_mock.call_count == 0
-    yield from hass.components.duckdns.async_set_txt('some-txt')
+    yield from async_set_txt(hass, 'some-txt')
     assert aioclient_mock.call_count == 1
 
 
@@ -102,5 +116,5 @@ def test_service_clear_txt(hass, aioclient_mock, setup_duckdns):
     }, text='OK')
 
     assert aioclient_mock.call_count == 0
-    yield from hass.components.duckdns.async_set_txt(None)
+    yield from async_set_txt(hass, None)
     assert aioclient_mock.call_count == 1
diff --git a/tests/components/test_input_boolean.py b/tests/components/test_input_boolean.py
index 999e7ac100f..b947155e6b2 100644
--- a/tests/components/test_input_boolean.py
+++ b/tests/components/test_input_boolean.py
@@ -7,9 +7,11 @@ import logging
 from homeassistant.core import CoreState, State, Context
 from homeassistant.setup import setup_component, async_setup_component
 from homeassistant.components.input_boolean import (
-    DOMAIN, is_on, toggle, turn_off, turn_on, CONF_INITIAL)
+    is_on, CONF_INITIAL, DOMAIN)
 from homeassistant.const import (
-    STATE_ON, STATE_OFF, ATTR_ICON, ATTR_FRIENDLY_NAME)
+    STATE_ON, STATE_OFF, ATTR_ENTITY_ID, ATTR_FRIENDLY_NAME, ATTR_ICON,
+    SERVICE_TOGGLE, SERVICE_TURN_OFF, SERVICE_TURN_ON)
+from homeassistant.loader import bind_hass
 
 from tests.common import (
     get_test_home_assistant, mock_component, mock_restore_cache)
@@ -17,6 +19,33 @@ from tests.common import (
 _LOGGER = logging.getLogger(__name__)
 
 
+@bind_hass
+def toggle(hass, entity_id):
+    """Set input_boolean to False.
+
+    This is a legacy helper method. Do not use it for new tests.
+    """
+    hass.services.call(DOMAIN, SERVICE_TOGGLE, {ATTR_ENTITY_ID: entity_id})
+
+
+@bind_hass
+def turn_on(hass, entity_id):
+    """Set input_boolean to True.
+
+    This is a legacy helper method. Do not use it for new tests.
+    """
+    hass.services.call(DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: entity_id})
+
+
+@bind_hass
+def turn_off(hass, entity_id):
+    """Set input_boolean to False.
+
+    This is a legacy helper method. Do not use it for new tests.
+    """
+    hass.services.call(DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: entity_id})
+
+
 class TestInputBoolean(unittest.TestCase):
     """Test the input boolean module."""
 
diff --git a/tests/components/test_input_number.py b/tests/components/test_input_number.py
index 659aaa524d9..a53704e1d10 100644
--- a/tests/components/test_input_number.py
+++ b/tests/components/test_input_number.py
@@ -4,13 +4,50 @@ import asyncio
 import unittest
 
 from homeassistant.core import CoreState, State, Context
-from homeassistant.setup import setup_component, async_setup_component
 from homeassistant.components.input_number import (
-    DOMAIN, set_value, increment, decrement)
+    ATTR_VALUE, DOMAIN, SERVICE_DECREMENT, SERVICE_INCREMENT,
+    SERVICE_SET_VALUE)
+from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.loader import bind_hass
+from homeassistant.setup import setup_component, async_setup_component
 
 from tests.common import get_test_home_assistant, mock_restore_cache
 
 
+@bind_hass
+def set_value(hass, entity_id, value):
+    """Set input_number to value.
+
+    This is a legacy helper method. Do not use it for new tests.
+    """
+    hass.services.call(DOMAIN, SERVICE_SET_VALUE, {
+        ATTR_ENTITY_ID: entity_id,
+        ATTR_VALUE: value,
+    })
+
+
+@bind_hass
+def increment(hass, entity_id):
+    """Increment value of entity.
+
+    This is a legacy helper method. Do not use it for new tests.
+    """
+    hass.services.call(DOMAIN, SERVICE_INCREMENT, {
+        ATTR_ENTITY_ID: entity_id
+    })
+
+
+@bind_hass
+def decrement(hass, entity_id):
+    """Decrement value of entity.
+
+    This is a legacy helper method. Do not use it for new tests.
+    """
+    hass.services.call(DOMAIN, SERVICE_DECREMENT, {
+        ATTR_ENTITY_ID: entity_id
+    })
+
+
 class TestInputNumber(unittest.TestCase):
     """Test the input number component."""
 
diff --git a/tests/components/test_input_select.py b/tests/components/test_input_select.py
index 1c73abfbb94..938c93fa099 100644
--- a/tests/components/test_input_select.py
+++ b/tests/components/test_input_select.py
@@ -3,15 +3,62 @@
 import asyncio
 import unittest
 
-from tests.common import get_test_home_assistant, mock_restore_cache
-
+from homeassistant.loader import bind_hass
+from homeassistant.components.input_select import (
+    ATTR_OPTION, ATTR_OPTIONS, DOMAIN, SERVICE_SET_OPTIONS,
+    SERVICE_SELECT_NEXT, SERVICE_SELECT_OPTION, SERVICE_SELECT_PREVIOUS)
+from homeassistant.const import (
+    ATTR_ENTITY_ID, ATTR_FRIENDLY_NAME, ATTR_ICON)
 from homeassistant.core import State, Context
 from homeassistant.setup import setup_component, async_setup_component
-from homeassistant.components.input_select import (
-    ATTR_OPTIONS, DOMAIN, SERVICE_SET_OPTIONS,
-    select_option, select_next, select_previous)
-from homeassistant.const import (
-    ATTR_ICON, ATTR_FRIENDLY_NAME)
+
+from tests.common import get_test_home_assistant, mock_restore_cache
+
+
+@bind_hass
+def select_option(hass, entity_id, option):
+    """Set value of input_select.
+
+    This is a legacy helper method. Do not use it for new tests.
+    """
+    hass.services.call(DOMAIN, SERVICE_SELECT_OPTION, {
+        ATTR_ENTITY_ID: entity_id,
+        ATTR_OPTION: option,
+    })
+
+
+@bind_hass
+def select_next(hass, entity_id):
+    """Set next value of input_select.
+
+    This is a legacy helper method. Do not use it for new tests.
+    """
+    hass.services.call(DOMAIN, SERVICE_SELECT_NEXT, {
+        ATTR_ENTITY_ID: entity_id,
+    })
+
+
+@bind_hass
+def select_previous(hass, entity_id):
+    """Set previous value of input_select.
+
+    This is a legacy helper method. Do not use it for new tests.
+    """
+    hass.services.call(DOMAIN, SERVICE_SELECT_PREVIOUS, {
+        ATTR_ENTITY_ID: entity_id,
+    })
+
+
+@bind_hass
+def set_options(hass, entity_id, options):
+    """Set options of input_select.
+
+    This is a legacy helper method. Do not use it for new tests.
+    """
+    hass.services.call(DOMAIN, SERVICE_SET_OPTIONS, {
+        ATTR_ENTITY_ID: entity_id,
+        ATTR_OPTIONS: options,
+    })
 
 
 class TestInputSelect(unittest.TestCase):
diff --git a/tests/components/test_input_text.py b/tests/components/test_input_text.py
index 7c8a0e65023..bea145390eb 100644
--- a/tests/components/test_input_text.py
+++ b/tests/components/test_input_text.py
@@ -3,13 +3,28 @@
 import asyncio
 import unittest
 
+from homeassistant.components.input_text import (
+    ATTR_VALUE, DOMAIN, SERVICE_SET_VALUE)
+from homeassistant.const import ATTR_ENTITY_ID
 from homeassistant.core import CoreState, State, Context
+from homeassistant.loader import bind_hass
 from homeassistant.setup import setup_component, async_setup_component
-from homeassistant.components.input_text import (DOMAIN, set_value)
 
 from tests.common import get_test_home_assistant, mock_restore_cache
 
 
+@bind_hass
+def set_value(hass, entity_id, value):
+    """Set input_text to value.
+
+    This is a legacy helper method. Do not use it for new tests.
+    """
+    hass.services.call(DOMAIN, SERVICE_SET_VALUE, {
+        ATTR_ENTITY_ID: entity_id,
+        ATTR_VALUE: value,
+    })
+
+
 class TestInputText(unittest.TestCase):
     """Test the input slider component."""
 

From ba2b8512c5e475d8536c4a64b2e67b09f1a89e62 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Wed, 26 Sep 2018 08:52:22 +0200
Subject: [PATCH 303/357] Make ring sync again (#16866)

---
 homeassistant/components/camera/ring.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/homeassistant/components/camera/ring.py b/homeassistant/components/camera/ring.py
index f629b501819..d0cb6443fc7 100644
--- a/homeassistant/components/camera/ring.py
+++ b/homeassistant/components/camera/ring.py
@@ -39,9 +39,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-@asyncio.coroutine
-def async_setup_platform(hass, config, async_add_entities,
-                         discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up a Ring Door Bell and StickUp Camera."""
     ring = hass.data[DATA_RING]
 
@@ -67,14 +65,14 @@ def async_setup_platform(hass, config, async_add_entities,
                   ''' following cameras: {}.'''.format(cameras)
 
         _LOGGER.error(err_msg)
-        hass.components.persistent_notification.async_create(
+        hass.components.persistent_notification.create(
             'Error: {}<br />'
             'You will need to restart hass after fixing.'
             ''.format(err_msg),
             title=NOTIFICATION_TITLE,
             notification_id=NOTIFICATION_ID)
 
-    async_add_entities(cams, True)
+    add_entities(cams, True)
     return True
 
 

From bfa1c55803507f6632fd8907de9336dd27062afd Mon Sep 17 00:00:00 2001
From: cdce8p <30130371+cdce8p@users.noreply.github.com>
Date: Wed, 26 Sep 2018 08:53:24 +0200
Subject: [PATCH 304/357] Fix fan_init test (#16865)

* Fix fan_init test

* Readd __init__.py
---
 tests/components/fan/__init__.py  | 38 -----------------------------
 tests/components/fan/test_init.py | 40 +++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 38 deletions(-)
 create mode 100644 tests/components/fan/test_init.py

diff --git a/tests/components/fan/__init__.py b/tests/components/fan/__init__.py
index 28ae7f4e249..e7cc83217ef 100644
--- a/tests/components/fan/__init__.py
+++ b/tests/components/fan/__init__.py
@@ -1,39 +1 @@
 """Tests for fan platforms."""
-
-import unittest
-
-from homeassistant.components.fan import FanEntity
-
-
-class BaseFan(FanEntity):
-    """Implementation of the abstract FanEntity."""
-
-    def __init__(self):
-        """Initialize the fan."""
-        pass
-
-
-class TestFanEntity(unittest.TestCase):
-    """Test coverage for base fan entity class."""
-
-    def setUp(self):
-        """Set up test data."""
-        self.fan = BaseFan()
-
-    def tearDown(self):
-        """Tear down unit test data."""
-        self.fan = None
-
-    def test_fanentity(self):
-        """Test fan entity methods."""
-        self.assertIsNone(self.fan.state)
-        self.assertEqual(0, len(self.fan.speed_list))
-        self.assertEqual(0, self.fan.supported_features)
-        self.assertEqual({}, self.fan.state_attributes)
-        # Test set_speed not required
-        self.fan.set_speed()
-        self.fan.oscillate()
-        with self.assertRaises(NotImplementedError):
-            self.fan.turn_on()
-        with self.assertRaises(NotImplementedError):
-            self.fan.turn_off()
diff --git a/tests/components/fan/test_init.py b/tests/components/fan/test_init.py
new file mode 100644
index 00000000000..15f9a79d2d2
--- /dev/null
+++ b/tests/components/fan/test_init.py
@@ -0,0 +1,40 @@
+"""Tests for fan platforms."""
+
+import unittest
+
+from homeassistant.components.fan import FanEntity
+
+
+class BaseFan(FanEntity):
+    """Implementation of the abstract FanEntity."""
+
+    def __init__(self):
+        """Initialize the fan."""
+        pass
+
+
+class TestFanEntity(unittest.TestCase):
+    """Test coverage for base fan entity class."""
+
+    def setUp(self):
+        """Set up test data."""
+        self.fan = BaseFan()
+
+    def tearDown(self):
+        """Tear down unit test data."""
+        self.fan = None
+
+    def test_fanentity(self):
+        """Test fan entity methods."""
+        self.assertEqual('on', self.fan.state)
+        self.assertEqual(0, len(self.fan.speed_list))
+        self.assertEqual(0, self.fan.supported_features)
+        self.assertEqual({'speed_list': []}, self.fan.state_attributes)
+        # Test set_speed not required
+        self.fan.oscillate(True)
+        with self.assertRaises(NotImplementedError):
+            self.fan.set_speed('slow')
+        with self.assertRaises(NotImplementedError):
+            self.fan.turn_on()
+        with self.assertRaises(NotImplementedError):
+            self.fan.turn_off()

From 3cba2e695cb7e23cc5afd70f2ba2d132a4ae68f9 Mon Sep 17 00:00:00 2001
From: Charles Garwood <cgarwood@newdealmultimedia.com>
Date: Wed, 26 Sep 2018 02:56:23 -0400
Subject: [PATCH 305/357] Device Registry Support for iOS Sensors (#16862)

* Add device_info property to iOS sensors for device registry

* Remove unused logger import

* Fix spacing

* lint

* Lint
---
 homeassistant/components/sensor/ios.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/homeassistant/components/sensor/ios.py b/homeassistant/components/sensor/ios.py
index a50d1161676..d206cd1df87 100644
--- a/homeassistant/components/sensor/ios.py
+++ b/homeassistant/components/sensor/ios.py
@@ -46,6 +46,21 @@ class IOSSensor(Entity):
         self._state = None
         self._unit_of_measurement = SENSOR_TYPES[sensor_type][1]
 
+    @property
+    def device_info(self):
+        """Return information about the device."""
+        return {
+            'identifiers': {
+                (ios.DOMAIN,
+                 self._device[ios.ATTR_DEVICE][ios.ATTR_DEVICE_PERMANENT_ID]),
+            },
+            'name': self._device[ios.ATTR_DEVICE][ios.ATTR_DEVICE_NAME],
+            'manufacturer': 'Apple',
+            'model': self._device[ios.ATTR_DEVICE][ios.ATTR_DEVICE_TYPE],
+            'sw_version':
+            self._device[ios.ATTR_DEVICE][ios.ATTR_DEVICE_SYSTEM_VERSION],
+        }
+
     @property
     def name(self):
         """Return the name of the iOS sensor."""

From 92a50689775eeb04af7dbcd91578d8718b9eb221 Mon Sep 17 00:00:00 2001
From: Jason Hu <awarecan@users.noreply.github.com>
Date: Tue, 25 Sep 2018 23:57:55 -0700
Subject: [PATCH 306/357] Use HA native OAuth2 flow for google assistant
 components (#16848)

* Use HA native OAuth2 flow for google assistant components

* Lint

* Force breaking changes

* Fix CONFIG_SCHEMA
---
 .../components/google_assistant/__init__.py   | 44 ++++------
 .../components/google_assistant/auth.py       | 83 -------------------
 .../components/google_assistant/const.py      |  3 -
 .../components/google_assistant/http.py       | 25 ++----
 .../google_assistant/test_google_assistant.py | 46 ++++------
 .../components/google_assistant/test_init.py  |  4 -
 6 files changed, 43 insertions(+), 162 deletions(-)
 delete mode 100644 homeassistant/components/google_assistant/auth.py

diff --git a/homeassistant/components/google_assistant/__init__.py b/homeassistant/components/google_assistant/__init__.py
index b0b580dc6ac..8d4ac9f01c9 100644
--- a/homeassistant/components/google_assistant/__init__.py
+++ b/homeassistant/components/google_assistant/__init__.py
@@ -14,20 +14,18 @@ import async_timeout
 import voluptuous as vol
 
 # Typing imports
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, ServiceCall
 
 from homeassistant.const import CONF_NAME
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import (
-    DOMAIN, CONF_PROJECT_ID, CONF_CLIENT_ID, CONF_ACCESS_TOKEN,
-    CONF_EXPOSE_BY_DEFAULT, DEFAULT_EXPOSE_BY_DEFAULT, CONF_EXPOSED_DOMAINS,
-    DEFAULT_EXPOSED_DOMAINS, CONF_AGENT_USER_ID, CONF_API_KEY,
+    DOMAIN, CONF_PROJECT_ID, CONF_EXPOSE_BY_DEFAULT, DEFAULT_EXPOSE_BY_DEFAULT,
+    CONF_EXPOSED_DOMAINS, DEFAULT_EXPOSED_DOMAINS, CONF_API_KEY,
     SERVICE_REQUEST_SYNC, REQUEST_SYNC_BASE_URL, CONF_ENTITY_CONFIG,
     CONF_EXPOSE, CONF_ALIASES, CONF_ROOM_HINT
 )
-from .auth import GoogleAssistantAuthView
 from .http import async_register_http
 
 _LOGGER = logging.getLogger(__name__)
@@ -43,34 +41,28 @@ ENTITY_SCHEMA = vol.Schema({
     vol.Optional(CONF_ROOM_HINT): cv.string
 })
 
-CONFIG_SCHEMA = vol.Schema(
-    {
-        DOMAIN: {
-            vol.Required(CONF_PROJECT_ID): cv.string,
-            vol.Required(CONF_CLIENT_ID): cv.string,
-            vol.Required(CONF_ACCESS_TOKEN): cv.string,
-            vol.Optional(CONF_EXPOSE_BY_DEFAULT,
-                         default=DEFAULT_EXPOSE_BY_DEFAULT): cv.boolean,
-            vol.Optional(CONF_EXPOSED_DOMAINS,
-                         default=DEFAULT_EXPOSED_DOMAINS): cv.ensure_list,
-            vol.Optional(CONF_AGENT_USER_ID,
-                         default=DEFAULT_AGENT_USER_ID): cv.string,
-            vol.Optional(CONF_API_KEY): cv.string,
-            vol.Optional(CONF_ENTITY_CONFIG): {cv.entity_id: ENTITY_SCHEMA}
-        }
-    },
-    extra=vol.ALLOW_EXTRA)
+GOOGLE_ASSISTANT_SCHEMA = vol.Schema({
+    vol.Required(CONF_PROJECT_ID): cv.string,
+    vol.Optional(CONF_EXPOSE_BY_DEFAULT,
+                 default=DEFAULT_EXPOSE_BY_DEFAULT): cv.boolean,
+    vol.Optional(CONF_EXPOSED_DOMAINS,
+                 default=DEFAULT_EXPOSED_DOMAINS): cv.ensure_list,
+    vol.Optional(CONF_API_KEY): cv.string,
+    vol.Optional(CONF_ENTITY_CONFIG): {cv.entity_id: ENTITY_SCHEMA}
+}, extra=vol.PREVENT_EXTRA)
+
+CONFIG_SCHEMA = vol.Schema({
+    DOMAIN: GOOGLE_ASSISTANT_SCHEMA
+}, extra=vol.ALLOW_EXTRA)
 
 
 async def async_setup(hass: HomeAssistant, yaml_config: Dict[str, Any]):
     """Activate Google Actions component."""
     config = yaml_config.get(DOMAIN, {})
-    agent_user_id = config.get(CONF_AGENT_USER_ID)
     api_key = config.get(CONF_API_KEY)
-    hass.http.register_view(GoogleAssistantAuthView(hass, config))
     async_register_http(hass, config)
 
-    async def request_sync_service_handler(call):
+    async def request_sync_service_handler(call: ServiceCall):
         """Handle request sync service calls."""
         websession = async_get_clientsession(hass)
         try:
@@ -78,7 +70,7 @@ async def async_setup(hass: HomeAssistant, yaml_config: Dict[str, Any]):
                 res = await websession.post(
                     REQUEST_SYNC_BASE_URL,
                     params={'key': api_key},
-                    json={'agent_user_id': agent_user_id})
+                    json={'agent_user_id': call.context.user_id})
                 _LOGGER.info("Submitted request_sync request to Google")
                 res.raise_for_status()
         except aiohttp.ClientResponseError:
diff --git a/homeassistant/components/google_assistant/auth.py b/homeassistant/components/google_assistant/auth.py
deleted file mode 100644
index 5b98e25014d..00000000000
--- a/homeassistant/components/google_assistant/auth.py
+++ /dev/null
@@ -1,83 +0,0 @@
-"""Google Assistant OAuth View."""
-
-import logging
-from typing import Dict, Any
-
-# Typing imports
-# if False:
-from aiohttp.web import Request, Response
-
-from homeassistant.core import HomeAssistant
-from homeassistant.components.http import HomeAssistantView
-from homeassistant.const import (
-    HTTP_BAD_REQUEST,
-    HTTP_UNAUTHORIZED,
-    HTTP_MOVED_PERMANENTLY,
-)
-
-from .const import (
-    GOOGLE_ASSISTANT_API_ENDPOINT,
-    CONF_PROJECT_ID, CONF_CLIENT_ID, CONF_ACCESS_TOKEN
-)
-
-BASE_OAUTH_URL = 'https://oauth-redirect.googleusercontent.com'
-REDIRECT_TEMPLATE_URL = \
-    '{}/r/{}#access_token={}&token_type=bearer&state={}'
-
-_LOGGER = logging.getLogger(__name__)
-
-
-class GoogleAssistantAuthView(HomeAssistantView):
-    """Handle Google Actions auth requests."""
-
-    url = GOOGLE_ASSISTANT_API_ENDPOINT + '/auth'
-    name = 'api:google_assistant:auth'
-    requires_auth = False
-
-    def __init__(self, hass: HomeAssistant, cfg: Dict[str, Any]) -> None:
-        """Initialize instance of the view."""
-        super().__init__()
-
-        self.project_id = cfg.get(CONF_PROJECT_ID)
-        self.client_id = cfg.get(CONF_CLIENT_ID)
-        self.access_token = cfg.get(CONF_ACCESS_TOKEN)
-
-    async def get(self, request: Request) -> Response:
-        """Handle oauth token request."""
-        query = request.query
-        redirect_uri = query.get('redirect_uri')
-        if not redirect_uri:
-            msg = 'missing redirect_uri field'
-            _LOGGER.warning(msg)
-            return self.json_message(msg, status_code=HTTP_BAD_REQUEST)
-
-        if self.project_id not in redirect_uri:
-            msg = 'missing project_id in redirect_uri'
-            _LOGGER.warning(msg)
-            return self.json_message(msg, status_code=HTTP_BAD_REQUEST)
-
-        state = query.get('state')
-        if not state:
-            msg = 'oauth request missing state'
-            _LOGGER.warning(msg)
-            return self.json_message(msg, status_code=HTTP_BAD_REQUEST)
-
-        client_id = query.get('client_id')
-        if self.client_id != client_id:
-            msg = 'invalid client id'
-            _LOGGER.warning(msg)
-            return self.json_message(msg, status_code=HTTP_UNAUTHORIZED)
-
-        generated_url = redirect_url(self.project_id, self.access_token, state)
-
-        _LOGGER.info('user login in from Google Assistant')
-        return self.json_message(
-            'redirect success',
-            status_code=HTTP_MOVED_PERMANENTLY,
-            headers={'Location': generated_url})
-
-
-def redirect_url(project_id: str, access_token: str, state: str) -> str:
-    """Generate the redirect format for the oauth request."""
-    return REDIRECT_TEMPLATE_URL.format(BASE_OAUTH_URL, project_id,
-                                        access_token, state)
diff --git a/homeassistant/components/google_assistant/const.py b/homeassistant/components/google_assistant/const.py
index 12888ea2cf6..485b98e8e22 100644
--- a/homeassistant/components/google_assistant/const.py
+++ b/homeassistant/components/google_assistant/const.py
@@ -8,10 +8,7 @@ CONF_ENTITY_CONFIG = 'entity_config'
 CONF_EXPOSE_BY_DEFAULT = 'expose_by_default'
 CONF_EXPOSED_DOMAINS = 'exposed_domains'
 CONF_PROJECT_ID = 'project_id'
-CONF_ACCESS_TOKEN = 'access_token'
-CONF_CLIENT_ID = 'client_id'
 CONF_ALIASES = 'aliases'
-CONF_AGENT_USER_ID = 'agent_user_id'
 CONF_API_KEY = 'api_key'
 CONF_ROOM_HINT = 'room'
 
diff --git a/homeassistant/components/google_assistant/http.py b/homeassistant/components/google_assistant/http.py
index 05bc3cbd01c..65af7b932b0 100644
--- a/homeassistant/components/google_assistant/http.py
+++ b/homeassistant/components/google_assistant/http.py
@@ -6,7 +6,6 @@ https://home-assistant.io/components/google_assistant/
 """
 import logging
 
-from aiohttp.hdrs import AUTHORIZATION
 from aiohttp.web import Request, Response
 
 # Typing imports
@@ -15,10 +14,8 @@ from homeassistant.core import callback
 
 from .const import (
     GOOGLE_ASSISTANT_API_ENDPOINT,
-    CONF_ACCESS_TOKEN,
     CONF_EXPOSE_BY_DEFAULT,
     CONF_EXPOSED_DOMAINS,
-    CONF_AGENT_USER_ID,
     CONF_ENTITY_CONFIG,
     CONF_EXPOSE,
     )
@@ -31,10 +28,8 @@ _LOGGER = logging.getLogger(__name__)
 @callback
 def async_register_http(hass, cfg):
     """Register HTTP views for Google Assistant."""
-    access_token = cfg.get(CONF_ACCESS_TOKEN)
     expose_by_default = cfg.get(CONF_EXPOSE_BY_DEFAULT)
     exposed_domains = cfg.get(CONF_EXPOSED_DOMAINS)
-    agent_user_id = cfg.get(CONF_AGENT_USER_ID)
     entity_config = cfg.get(CONF_ENTITY_CONFIG) or {}
 
     def is_exposed(entity) -> bool:
@@ -57,9 +52,8 @@ def async_register_http(hass, cfg):
 
         return is_default_exposed or explicit_expose
 
-    gass_config = Config(is_exposed, agent_user_id, entity_config)
     hass.http.register_view(
-        GoogleAssistantView(access_token, gass_config))
+        GoogleAssistantView(is_exposed, entity_config))
 
 
 class GoogleAssistantView(HomeAssistantView):
@@ -67,20 +61,19 @@ class GoogleAssistantView(HomeAssistantView):
 
     url = GOOGLE_ASSISTANT_API_ENDPOINT
     name = 'api:google_assistant'
-    requires_auth = False  # Uses access token from oauth flow
+    requires_auth = True
 
-    def __init__(self, access_token, gass_config):
+    def __init__(self, is_exposed, entity_config):
         """Initialize the Google Assistant request handler."""
-        self.access_token = access_token
-        self.gass_config = gass_config
+        self.is_exposed = is_exposed
+        self.entity_config = entity_config
 
     async def post(self, request: Request) -> Response:
         """Handle Google Assistant requests."""
-        auth = request.headers.get(AUTHORIZATION, None)
-        if 'Bearer {}'.format(self.access_token) != auth:
-            return self.json_message("missing authorization", status_code=401)
-
         message = await request.json()  # type: dict
+        config = Config(self.is_exposed,
+                        request['hass_user'].id,
+                        self.entity_config)
         result = await async_handle_message(
-            request.app['hass'], self.gass_config, message)
+            request.app['hass'], config, message)
         return self.json(result)
diff --git a/tests/components/google_assistant/test_google_assistant.py b/tests/components/google_assistant/test_google_assistant.py
index d9682940bdc..2ebfa5cc9ed 100644
--- a/tests/components/google_assistant/test_google_assistant.py
+++ b/tests/components/google_assistant/test_google_assistant.py
@@ -23,7 +23,12 @@ HA_HEADERS = {
 PROJECT_ID = 'hasstest-1234'
 CLIENT_ID = 'helloworld'
 ACCESS_TOKEN = 'superdoublesecret'
-AUTH_HEADER = {AUTHORIZATION: 'Bearer {}'.format(ACCESS_TOKEN)}
+
+
+@pytest.fixture
+def auth_header(hass_access_token):
+    """Generate an HTTP header with bearer token authorization."""
+    return {AUTHORIZATION: 'Bearer {}'.format(hass_access_token)}
 
 
 @pytest.fixture
@@ -33,8 +38,6 @@ def assistant_client(loop, hass, aiohttp_client):
         setup.async_setup_component(hass, 'google_assistant', {
             'google_assistant': {
                 'project_id': PROJECT_ID,
-                'client_id': CLIENT_ID,
-                'access_token': ACCESS_TOKEN,
                 'entity_config': {
                     'light.ceiling_lights': {
                         'aliases': ['top lights', 'ceiling lights'],
@@ -97,31 +100,14 @@ def hass_fixture(loop, hass):
 
 
 @asyncio.coroutine
-def test_auth(assistant_client):
-    """Test the auth process."""
-    result = yield from assistant_client.get(
-        ga.const.GOOGLE_ASSISTANT_API_ENDPOINT + '/auth',
-        params={
-            'redirect_uri':
-            'http://testurl/r/{}'.format(PROJECT_ID),
-            'client_id': CLIENT_ID,
-            'state': 'random1234',
-        },
-        allow_redirects=False)
-    assert result.status == 301
-    loc = result.headers.get('Location')
-    assert ACCESS_TOKEN in loc
-
-
-@asyncio.coroutine
-def test_sync_request(hass_fixture, assistant_client):
+def test_sync_request(hass_fixture, assistant_client, auth_header):
     """Test a sync request."""
     reqid = '5711642932632160983'
     data = {'requestId': reqid, 'inputs': [{'intent': 'action.devices.SYNC'}]}
     result = yield from assistant_client.post(
         ga.const.GOOGLE_ASSISTANT_API_ENDPOINT,
         data=json.dumps(data),
-        headers=AUTH_HEADER)
+        headers=auth_header)
     assert result.status == 200
     body = yield from result.json()
     assert body.get('requestId') == reqid
@@ -141,7 +127,7 @@ def test_sync_request(hass_fixture, assistant_client):
 
 
 @asyncio.coroutine
-def test_query_request(hass_fixture, assistant_client):
+def test_query_request(hass_fixture, assistant_client, auth_header):
     """Test a query request."""
     reqid = '5711642932632160984'
     data = {
@@ -165,7 +151,7 @@ def test_query_request(hass_fixture, assistant_client):
     result = yield from assistant_client.post(
         ga.const.GOOGLE_ASSISTANT_API_ENDPOINT,
         data=json.dumps(data),
-        headers=AUTH_HEADER)
+        headers=auth_header)
     assert result.status == 200
     body = yield from result.json()
     assert body.get('requestId') == reqid
@@ -180,7 +166,7 @@ def test_query_request(hass_fixture, assistant_client):
 
 
 @asyncio.coroutine
-def test_query_climate_request(hass_fixture, assistant_client):
+def test_query_climate_request(hass_fixture, assistant_client, auth_header):
     """Test a query request."""
     reqid = '5711642932632160984'
     data = {
@@ -200,7 +186,7 @@ def test_query_climate_request(hass_fixture, assistant_client):
     result = yield from assistant_client.post(
         ga.const.GOOGLE_ASSISTANT_API_ENDPOINT,
         data=json.dumps(data),
-        headers=AUTH_HEADER)
+        headers=auth_header)
     assert result.status == 200
     body = yield from result.json()
     assert body.get('requestId') == reqid
@@ -229,7 +215,7 @@ def test_query_climate_request(hass_fixture, assistant_client):
 
 
 @asyncio.coroutine
-def test_query_climate_request_f(hass_fixture, assistant_client):
+def test_query_climate_request_f(hass_fixture, assistant_client, auth_header):
     """Test a query request."""
     # Mock demo devices as fahrenheit to see if we convert to celsius
     hass_fixture.config.units.temperature_unit = const.TEMP_FAHRENHEIT
@@ -256,7 +242,7 @@ def test_query_climate_request_f(hass_fixture, assistant_client):
     result = yield from assistant_client.post(
         ga.const.GOOGLE_ASSISTANT_API_ENDPOINT,
         data=json.dumps(data),
-        headers=AUTH_HEADER)
+        headers=auth_header)
     assert result.status == 200
     body = yield from result.json()
     assert body.get('requestId') == reqid
@@ -286,7 +272,7 @@ def test_query_climate_request_f(hass_fixture, assistant_client):
 
 
 @asyncio.coroutine
-def test_execute_request(hass_fixture, assistant_client):
+def test_execute_request(hass_fixture, assistant_client, auth_header):
     """Test an execute request."""
     reqid = '5711642932632160985'
     data = {
@@ -358,7 +344,7 @@ def test_execute_request(hass_fixture, assistant_client):
     result = yield from assistant_client.post(
         ga.const.GOOGLE_ASSISTANT_API_ENDPOINT,
         data=json.dumps(data),
-        headers=AUTH_HEADER)
+        headers=auth_header)
     assert result.status == 200
     body = yield from result.json()
     assert body.get('requestId') == reqid
diff --git a/tests/components/google_assistant/test_init.py b/tests/components/google_assistant/test_init.py
index 9ced9fc329d..3f6a799b423 100644
--- a/tests/components/google_assistant/test_init.py
+++ b/tests/components/google_assistant/test_init.py
@@ -5,7 +5,6 @@ from homeassistant.setup import async_setup_component
 from homeassistant.components import google_assistant as ga
 
 GA_API_KEY = "Agdgjsj399sdfkosd932ksd"
-GA_AGENT_USER_ID = "testid"
 
 
 @asyncio.coroutine
@@ -17,9 +16,6 @@ def test_request_sync_service(aioclient_mock, hass):
     yield from async_setup_component(hass, 'google_assistant', {
         'google_assistant': {
             'project_id': 'test_project',
-            'client_id': 'r7328kwdsdfsdf03223409',
-            'access_token': '8wdsfjsf932492342349234',
-            'agent_user_id': GA_AGENT_USER_ID,
             'api_key': GA_API_KEY
         }})
 

From bab079f6493b1ffa8356e8d4bc5a6d2c4293d634 Mon Sep 17 00:00:00 2001
From: Charles Garwood <cgarwood@newdealmultimedia.com>
Date: Wed, 26 Sep 2018 03:19:47 -0400
Subject: [PATCH 307/357] Add unique_id to Nest Sensors (#16869)

* Add unique_id

* Add device_info

* Fix typo

* Update __init__.py
---
 homeassistant/components/nest/__init__.py | 31 +++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/homeassistant/components/nest/__init__.py b/homeassistant/components/nest/__init__.py
index 57111350396..f609c774b12 100644
--- a/homeassistant/components/nest/__init__.py
+++ b/homeassistant/components/nest/__init__.py
@@ -309,6 +309,37 @@ class NestSensorDevice(Entity):
         """Do not need poll thanks using Nest streaming API."""
         return False
 
+    @property
+    def unique_id(self):
+        """Return unique id based on device serial and variable."""
+        return "{}-{}".format(self.device.serial, self.variable)
+
+    @property
+    def device_info(self):
+        """Return information about the device."""
+        if not hasattr(self.device, 'name_long'):
+            name = self.structure.name
+            model = "Structure"
+        else:
+            name = self.device.name_long
+            if self.device.is_thermostat:
+                model = 'Thermostat'
+            elif self.device.is_camera:
+                model = 'Camera'
+            elif self.device.is_smoke_co_alarm:
+                model = 'Nest Protect'
+            else:
+                model = None
+
+        return {
+            'identifiers': {
+                (DOMAIN, self.device.serial)
+            },
+            'name': name,
+            'manufacturer': 'Nest Labs',
+            'model': model,
+        }
+
     def update(self):
         """Do not use NestSensorDevice directly."""
         raise NotImplementedError

From c899875abb543b37350492c7b0636dea572c21c5 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Wed, 26 Sep 2018 09:38:50 +0200
Subject: [PATCH 308/357] Fix MQTT discovery (#16864)

* Fix MQTT discovery

* Update __init__.py
---
 homeassistant/components/mqtt/__init__.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/homeassistant/components/mqtt/__init__.py b/homeassistant/components/mqtt/__init__.py
index 856d5d01894..70f20453633 100644
--- a/homeassistant/components/mqtt/__init__.py
+++ b/homeassistant/components/mqtt/__init__.py
@@ -21,7 +21,7 @@ import voluptuous as vol
 from homeassistant import config_entries
 from homeassistant.const import (
     CONF_PASSWORD, CONF_PAYLOAD, CONF_PORT, CONF_PROTOCOL, CONF_USERNAME,
-    CONF_VALUE_TEMPLATE, EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP)
+    CONF_VALUE_TEMPLATE, EVENT_HOMEASSISTANT_STOP)
 from homeassistant.core import Event, ServiceCall, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv
@@ -524,12 +524,8 @@ async def async_setup_entry(hass, entry):
         schema=MQTT_PUBLISH_SCHEMA)
 
     if conf.get(CONF_DISCOVERY):
-        async def async_setup_discovery(event):
-            await _async_setup_discovery(
-                hass, conf, hass.data[DATA_MQTT_HASS_CONFIG])
-
-        hass.bus.async_listen_once(
-            EVENT_HOMEASSISTANT_START, async_setup_discovery)
+        await _async_setup_discovery(
+            hass, conf, hass.data[DATA_MQTT_HASS_CONFIG])
 
     return True
 

From fa98a27df77849ddf0395a86f56ac736bc6c2e81 Mon Sep 17 00:00:00 2001
From: cdce8p <30130371+cdce8p@users.noreply.github.com>
Date: Wed, 26 Sep 2018 09:49:55 +0200
Subject: [PATCH 309/357] Remove service helper (2) (#16863)

* alarm_control_panel

* automation

* camera

* climate

* counter

* fan

* Add legacy notes

* Fix tests
---
 .../alarm_control_panel/__init__.py           |  73 -----------
 .../components/automation/__init__.py         |  28 -----
 homeassistant/components/camera/__init__.py   |  56 ---------
 homeassistant/components/climate/__init__.py  | 104 +---------------
 homeassistant/components/counter/__init__.py  |  44 -------
 homeassistant/components/fan/__init__.py      |  71 -----------
 .../components/alarm_control_panel/common.py  |  83 +++++++++++++
 .../alarm_control_panel/test_manual.py        | 105 ++++++++--------
 .../alarm_control_panel/test_manual_mqtt.py   | 103 ++++++++--------
 .../alarm_control_panel/test_mqtt.py          |  13 +-
 tests/components/automation/common.py         |  53 ++++++++
 tests/components/automation/test_event.py     |   5 +-
 tests/components/automation/test_init.py      |  19 +--
 tests/components/automation/test_litejet.py   |   3 +-
 tests/components/automation/test_mqtt.py      |   3 +-
 .../automation/test_numeric_state.py          |   5 +-
 tests/components/automation/test_state.py     |   5 +-
 tests/components/automation/test_sun.py       |   5 +-
 tests/components/automation/test_template.py  |   3 +-
 tests/components/automation/test_time.py      |   3 +-
 tests/components/automation/test_zone.py      |   3 +-
 tests/components/camera/common.py             |  68 +++++++++++
 tests/components/camera/test_demo.py          |  12 +-
 tests/components/camera/test_init.py          |   3 +-
 tests/components/climate/common.py            | 115 ++++++++++++++++++
 tests/components/climate/test_demo.py         |  51 ++++----
 .../climate/test_generic_thermostat.py        | 113 ++++++++---------
 tests/components/climate/test_mqtt.py         |  59 ++++-----
 tests/components/counter/common.py            |  52 ++++++++
 tests/components/counter/test_init.py         |   4 +-
 tests/components/fan/common.py                |  82 +++++++++++++
 tests/components/fan/test_demo.py             |  23 ++--
 tests/components/fan/test_template.py         |  63 +++++-----
 33 files changed, 766 insertions(+), 666 deletions(-)
 create mode 100644 tests/components/alarm_control_panel/common.py
 create mode 100644 tests/components/automation/common.py
 create mode 100644 tests/components/camera/common.py
 create mode 100644 tests/components/climate/common.py
 create mode 100644 tests/components/counter/common.py
 create mode 100644 tests/components/fan/common.py

diff --git a/homeassistant/components/alarm_control_panel/__init__.py b/homeassistant/components/alarm_control_panel/__init__.py
index 63977ed88c7..c5110a2ad5a 100644
--- a/homeassistant/components/alarm_control_panel/__init__.py
+++ b/homeassistant/components/alarm_control_panel/__init__.py
@@ -14,7 +14,6 @@ from homeassistant.const import (
     ATTR_CODE, ATTR_CODE_FORMAT, ATTR_ENTITY_ID, SERVICE_ALARM_TRIGGER,
     SERVICE_ALARM_DISARM, SERVICE_ALARM_ARM_HOME, SERVICE_ALARM_ARM_AWAY,
     SERVICE_ALARM_ARM_NIGHT, SERVICE_ALARM_ARM_CUSTOM_BYPASS)
-from homeassistant.loader import bind_hass
 from homeassistant.helpers.config_validation import PLATFORM_SCHEMA  # noqa
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
@@ -32,78 +31,6 @@ ALARM_SERVICE_SCHEMA = vol.Schema({
 })
 
 
-@bind_hass
-def alarm_disarm(hass, code=None, entity_id=None):
-    """Send the alarm the command for disarm."""
-    data = {}
-    if code:
-        data[ATTR_CODE] = code
-    if entity_id:
-        data[ATTR_ENTITY_ID] = entity_id
-
-    hass.services.call(DOMAIN, SERVICE_ALARM_DISARM, data)
-
-
-@bind_hass
-def alarm_arm_home(hass, code=None, entity_id=None):
-    """Send the alarm the command for arm home."""
-    data = {}
-    if code:
-        data[ATTR_CODE] = code
-    if entity_id:
-        data[ATTR_ENTITY_ID] = entity_id
-
-    hass.services.call(DOMAIN, SERVICE_ALARM_ARM_HOME, data)
-
-
-@bind_hass
-def alarm_arm_away(hass, code=None, entity_id=None):
-    """Send the alarm the command for arm away."""
-    data = {}
-    if code:
-        data[ATTR_CODE] = code
-    if entity_id:
-        data[ATTR_ENTITY_ID] = entity_id
-
-    hass.services.call(DOMAIN, SERVICE_ALARM_ARM_AWAY, data)
-
-
-@bind_hass
-def alarm_arm_night(hass, code=None, entity_id=None):
-    """Send the alarm the command for arm night."""
-    data = {}
-    if code:
-        data[ATTR_CODE] = code
-    if entity_id:
-        data[ATTR_ENTITY_ID] = entity_id
-
-    hass.services.call(DOMAIN, SERVICE_ALARM_ARM_NIGHT, data)
-
-
-@bind_hass
-def alarm_trigger(hass, code=None, entity_id=None):
-    """Send the alarm the command for trigger."""
-    data = {}
-    if code:
-        data[ATTR_CODE] = code
-    if entity_id:
-        data[ATTR_ENTITY_ID] = entity_id
-
-    hass.services.call(DOMAIN, SERVICE_ALARM_TRIGGER, data)
-
-
-@bind_hass
-def alarm_arm_custom_bypass(hass, code=None, entity_id=None):
-    """Send the alarm the command for arm custom bypass."""
-    data = {}
-    if code:
-        data[ATTR_CODE] = code
-    if entity_id:
-        data[ATTR_ENTITY_ID] = entity_id
-
-    hass.services.call(DOMAIN, SERVICE_ALARM_ARM_CUSTOM_BYPASS, data)
-
-
 @asyncio.coroutine
 def async_setup(hass, config):
     """Track states and offer events for sensors."""
diff --git a/homeassistant/components/automation/__init__.py b/homeassistant/components/automation/__init__.py
index 43fd4cedb88..e657409ea01 100644
--- a/homeassistant/components/automation/__init__.py
+++ b/homeassistant/components/automation/__init__.py
@@ -115,34 +115,6 @@ def is_on(hass, entity_id):
     return hass.states.is_state(entity_id, STATE_ON)
 
 
-@bind_hass
-def turn_on(hass, entity_id=None):
-    """Turn on specified automation or all."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
-    hass.services.call(DOMAIN, SERVICE_TURN_ON, data)
-
-
-@bind_hass
-def turn_off(hass, entity_id=None):
-    """Turn off specified automation or all."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
-    hass.services.call(DOMAIN, SERVICE_TURN_OFF, data)
-
-
-@bind_hass
-def toggle(hass, entity_id=None):
-    """Toggle specified automation or all."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
-    hass.services.call(DOMAIN, SERVICE_TOGGLE, data)
-
-
-@bind_hass
-def trigger(hass, entity_id=None):
-    """Trigger specified automation or all."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
-    hass.services.call(DOMAIN, SERVICE_TRIGGER, data)
-
-
 @bind_hass
 def reload(hass):
     """Reload the automation from config."""
diff --git a/homeassistant/components/camera/__init__.py b/homeassistant/components/camera/__init__.py
index a8a486013d4..b32236e499d 100644
--- a/homeassistant/components/camera/__init__.py
+++ b/homeassistant/components/camera/__init__.py
@@ -83,62 +83,6 @@ class Image:
     content = attr.ib(type=bytes)
 
 
-@bind_hass
-def turn_off(hass, entity_id=None):
-    """Turn off camera."""
-    hass.add_job(async_turn_off, hass, entity_id)
-
-
-@bind_hass
-async def async_turn_off(hass, entity_id=None):
-    """Turn off camera."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
-    await hass.services.async_call(DOMAIN, SERVICE_TURN_OFF, data)
-
-
-@bind_hass
-def turn_on(hass, entity_id=None):
-    """Turn on camera."""
-    hass.add_job(async_turn_on, hass, entity_id)
-
-
-@bind_hass
-async def async_turn_on(hass, entity_id=None):
-    """Turn on camera, and set operation mode."""
-    data = {}
-    if entity_id is not None:
-        data[ATTR_ENTITY_ID] = entity_id
-
-    await hass.services.async_call(DOMAIN, SERVICE_TURN_ON, data)
-
-
-@bind_hass
-def enable_motion_detection(hass, entity_id=None):
-    """Enable Motion Detection."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
-    hass.async_add_job(hass.services.async_call(
-        DOMAIN, SERVICE_ENABLE_MOTION, data))
-
-
-@bind_hass
-def disable_motion_detection(hass, entity_id=None):
-    """Disable Motion Detection."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
-    hass.async_add_job(hass.services.async_call(
-        DOMAIN, SERVICE_DISABLE_MOTION, data))
-
-
-@bind_hass
-@callback
-def async_snapshot(hass, filename, entity_id=None):
-    """Make a snapshot from a camera."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
-    data[ATTR_FILENAME] = filename
-
-    hass.async_add_job(hass.services.async_call(
-        DOMAIN, SERVICE_SNAPSHOT, data))
-
-
 @bind_hass
 async def async_get_image(hass, entity_id, timeout=10):
     """Fetch an image from a camera entity."""
diff --git a/homeassistant/components/climate/__init__.py b/homeassistant/components/climate/__init__.py
index a3273f67cc2..98483c454bc 100644
--- a/homeassistant/components/climate/__init__.py
+++ b/homeassistant/components/climate/__init__.py
@@ -10,7 +10,6 @@ import functools as ft
 
 import voluptuous as vol
 
-from homeassistant.loader import bind_hass
 from homeassistant.helpers.temperature import display_temp as show_temp
 from homeassistant.util.temperature import convert as convert_temperature
 from homeassistant.helpers.entity_component import EntityComponent
@@ -20,7 +19,7 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.const import (
     ATTR_ENTITY_ID, ATTR_TEMPERATURE, SERVICE_TURN_ON, SERVICE_TURN_OFF,
     STATE_ON, STATE_OFF, STATE_UNKNOWN, TEMP_CELSIUS, PRECISION_WHOLE,
-    PRECISION_TENTHS, )
+    PRECISION_TENTHS)
 
 DEFAULT_MIN_TEMP = 7
 DEFAULT_MAX_TEMP = 35
@@ -142,107 +141,6 @@ SET_SWING_MODE_SCHEMA = vol.Schema({
 })
 
 
-@bind_hass
-def set_away_mode(hass, away_mode, entity_id=None):
-    """Turn all or specified climate devices away mode on."""
-    data = {
-        ATTR_AWAY_MODE: away_mode
-    }
-
-    if entity_id:
-        data[ATTR_ENTITY_ID] = entity_id
-
-    hass.services.call(DOMAIN, SERVICE_SET_AWAY_MODE, data)
-
-
-@bind_hass
-def set_hold_mode(hass, hold_mode, entity_id=None):
-    """Set new hold mode."""
-    data = {
-        ATTR_HOLD_MODE: hold_mode
-    }
-
-    if entity_id:
-        data[ATTR_ENTITY_ID] = entity_id
-
-    hass.services.call(DOMAIN, SERVICE_SET_HOLD_MODE, data)
-
-
-@bind_hass
-def set_aux_heat(hass, aux_heat, entity_id=None):
-    """Turn all or specified climate devices auxiliary heater on."""
-    data = {
-        ATTR_AUX_HEAT: aux_heat
-    }
-
-    if entity_id:
-        data[ATTR_ENTITY_ID] = entity_id
-
-    hass.services.call(DOMAIN, SERVICE_SET_AUX_HEAT, data)
-
-
-@bind_hass
-def set_temperature(hass, temperature=None, entity_id=None,
-                    target_temp_high=None, target_temp_low=None,
-                    operation_mode=None):
-    """Set new target temperature."""
-    kwargs = {
-        key: value for key, value in [
-            (ATTR_TEMPERATURE, temperature),
-            (ATTR_TARGET_TEMP_HIGH, target_temp_high),
-            (ATTR_TARGET_TEMP_LOW, target_temp_low),
-            (ATTR_ENTITY_ID, entity_id),
-            (ATTR_OPERATION_MODE, operation_mode)
-        ] if value is not None
-    }
-    _LOGGER.debug("set_temperature start data=%s", kwargs)
-    hass.services.call(DOMAIN, SERVICE_SET_TEMPERATURE, kwargs)
-
-
-@bind_hass
-def set_humidity(hass, humidity, entity_id=None):
-    """Set new target humidity."""
-    data = {ATTR_HUMIDITY: humidity}
-
-    if entity_id is not None:
-        data[ATTR_ENTITY_ID] = entity_id
-
-    hass.services.call(DOMAIN, SERVICE_SET_HUMIDITY, data)
-
-
-@bind_hass
-def set_fan_mode(hass, fan, entity_id=None):
-    """Set all or specified climate devices fan mode on."""
-    data = {ATTR_FAN_MODE: fan}
-
-    if entity_id:
-        data[ATTR_ENTITY_ID] = entity_id
-
-    hass.services.call(DOMAIN, SERVICE_SET_FAN_MODE, data)
-
-
-@bind_hass
-def set_operation_mode(hass, operation_mode, entity_id=None):
-    """Set new target operation mode."""
-    data = {ATTR_OPERATION_MODE: operation_mode}
-
-    if entity_id is not None:
-        data[ATTR_ENTITY_ID] = entity_id
-
-    hass.services.call(DOMAIN, SERVICE_SET_OPERATION_MODE, data)
-
-
-@bind_hass
-def set_swing_mode(hass, swing_mode, entity_id=None):
-    """Set new target swing mode."""
-    data = {ATTR_SWING_MODE: swing_mode}
-
-    if entity_id is not None:
-        data[ATTR_ENTITY_ID] = entity_id
-
-    hass.services.call(DOMAIN, SERVICE_SET_SWING_MODE, data)
-
-
 async def async_setup(hass, config):
     """Set up climate devices."""
     component = hass.data[DOMAIN] = \
diff --git a/homeassistant/components/counter/__init__.py b/homeassistant/components/counter/__init__.py
index d720819a0ab..9ef4d4374ce 100644
--- a/homeassistant/components/counter/__init__.py
+++ b/homeassistant/components/counter/__init__.py
@@ -9,12 +9,10 @@ import logging
 import voluptuous as vol
 
 from homeassistant.const import ATTR_ENTITY_ID, CONF_ICON, CONF_NAME
-from homeassistant.core import callback
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.restore_state import async_get_last_state
-from homeassistant.loader import bind_hass
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -51,48 +49,6 @@ CONFIG_SCHEMA = vol.Schema({
 }, extra=vol.ALLOW_EXTRA)
 
 
-@bind_hass
-def increment(hass, entity_id):
-    """Increment a counter."""
-    hass.add_job(async_increment, hass, entity_id)
-
-
-@callback
-@bind_hass
-def async_increment(hass, entity_id):
-    """Increment a counter."""
-    hass.async_add_job(hass.services.async_call(
-        DOMAIN, SERVICE_INCREMENT, {ATTR_ENTITY_ID: entity_id}))
-
-
-@bind_hass
-def decrement(hass, entity_id):
-    """Decrement a counter."""
-    hass.add_job(async_decrement, hass, entity_id)
-
-
-@callback
-@bind_hass
-def async_decrement(hass, entity_id):
-    """Decrement a counter."""
-    hass.async_add_job(hass.services.async_call(
-        DOMAIN, SERVICE_DECREMENT, {ATTR_ENTITY_ID: entity_id}))
-
-
-@bind_hass
-def reset(hass, entity_id):
-    """Reset a counter."""
-    hass.add_job(async_reset, hass, entity_id)
-
-
-@callback
-@bind_hass
-def async_reset(hass, entity_id):
-    """Reset a counter."""
-    hass.async_add_job(hass.services.async_call(
-        DOMAIN, SERVICE_RESET, {ATTR_ENTITY_ID: entity_id}))
-
-
 async def async_setup(hass, config):
     """Set up the counters."""
     component = EntityComponent(_LOGGER, DOMAIN, hass)
diff --git a/homeassistant/components/fan/__init__.py b/homeassistant/components/fan/__init__.py
index f2704e84bc5..ec18637f065 100644
--- a/homeassistant/components/fan/__init__.py
+++ b/homeassistant/components/fan/__init__.py
@@ -98,77 +98,6 @@ def is_on(hass, entity_id: str = None) -> bool:
     return state.attributes[ATTR_SPEED] not in [SPEED_OFF, STATE_UNKNOWN]
 
 
-@bind_hass
-def turn_on(hass, entity_id: str = None, speed: str = None) -> None:
-    """Turn all or specified fan on."""
-    data = {
-        key: value for key, value in [
-            (ATTR_ENTITY_ID, entity_id),
-            (ATTR_SPEED, speed),
-        ] if value is not None
-    }
-
-    hass.services.call(DOMAIN, SERVICE_TURN_ON, data)
-
-
-@bind_hass
-def turn_off(hass, entity_id: str = None) -> None:
-    """Turn all or specified fan off."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
-
-    hass.services.call(DOMAIN, SERVICE_TURN_OFF, data)
-
-
-@bind_hass
-def toggle(hass, entity_id: str = None) -> None:
-    """Toggle all or specified fans."""
-    data = {
-        ATTR_ENTITY_ID: entity_id
-    }
-
-    hass.services.call(DOMAIN, SERVICE_TOGGLE, data)
-
-
-@bind_hass
-def oscillate(hass, entity_id: str = None,
-              should_oscillate: bool = True) -> None:
-    """Set oscillation on all or specified fan."""
-    data = {
-        key: value for key, value in [
-            (ATTR_ENTITY_ID, entity_id),
-            (ATTR_OSCILLATING, should_oscillate),
-        ] if value is not None
-    }
-
-    hass.services.call(DOMAIN, SERVICE_OSCILLATE, data)
-
-
-@bind_hass
-def set_speed(hass, entity_id: str = None, speed: str = None) -> None:
-    """Set speed for all or specified fan."""
-    data = {
-        key: value for key, value in [
-            (ATTR_ENTITY_ID, entity_id),
-            (ATTR_SPEED, speed),
-        ] if value is not None
-    }
-
-    hass.services.call(DOMAIN, SERVICE_SET_SPEED, data)
-
-
-@bind_hass
-def set_direction(hass, entity_id: str = None, direction: str = None) -> None:
-    """Set direction for all or specified fan."""
-    data = {
-        key: value for key, value in [
-            (ATTR_ENTITY_ID, entity_id),
-            (ATTR_DIRECTION, direction),
-        ] if value is not None
-    }
-
-    hass.services.call(DOMAIN, SERVICE_SET_DIRECTION, data)
-
-
 @asyncio.coroutine
 def async_setup(hass, config: dict):
     """Expose fan control via statemachine and services."""
diff --git a/tests/components/alarm_control_panel/common.py b/tests/components/alarm_control_panel/common.py
new file mode 100644
index 00000000000..cf2de857076
--- /dev/null
+++ b/tests/components/alarm_control_panel/common.py
@@ -0,0 +1,83 @@
+"""Collection of helper methods.
+
+All containing methods are legacy helpers that should not be used by new
+components. Instead call the service directly.
+"""
+from homeassistant.components.alarm_control_panel import DOMAIN
+from homeassistant.const import (
+    ATTR_CODE, ATTR_ENTITY_ID, SERVICE_ALARM_TRIGGER,
+    SERVICE_ALARM_DISARM, SERVICE_ALARM_ARM_HOME, SERVICE_ALARM_ARM_AWAY,
+    SERVICE_ALARM_ARM_NIGHT, SERVICE_ALARM_ARM_CUSTOM_BYPASS)
+from homeassistant.loader import bind_hass
+
+
+@bind_hass
+def alarm_disarm(hass, code=None, entity_id=None):
+    """Send the alarm the command for disarm."""
+    data = {}
+    if code:
+        data[ATTR_CODE] = code
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_ALARM_DISARM, data)
+
+
+@bind_hass
+def alarm_arm_home(hass, code=None, entity_id=None):
+    """Send the alarm the command for arm home."""
+    data = {}
+    if code:
+        data[ATTR_CODE] = code
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_ALARM_ARM_HOME, data)
+
+
+@bind_hass
+def alarm_arm_away(hass, code=None, entity_id=None):
+    """Send the alarm the command for arm away."""
+    data = {}
+    if code:
+        data[ATTR_CODE] = code
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_ALARM_ARM_AWAY, data)
+
+
+@bind_hass
+def alarm_arm_night(hass, code=None, entity_id=None):
+    """Send the alarm the command for arm night."""
+    data = {}
+    if code:
+        data[ATTR_CODE] = code
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_ALARM_ARM_NIGHT, data)
+
+
+@bind_hass
+def alarm_trigger(hass, code=None, entity_id=None):
+    """Send the alarm the command for trigger."""
+    data = {}
+    if code:
+        data[ATTR_CODE] = code
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_ALARM_TRIGGER, data)
+
+
+@bind_hass
+def alarm_arm_custom_bypass(hass, code=None, entity_id=None):
+    """Send the alarm the command for arm custom bypass."""
+    data = {}
+    if code:
+        data[ATTR_CODE] = code
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_ALARM_ARM_CUSTOM_BYPASS, data)
diff --git a/tests/components/alarm_control_panel/test_manual.py b/tests/components/alarm_control_panel/test_manual.py
index 29f630093d9..02085a44b47 100644
--- a/tests/components/alarm_control_panel/test_manual.py
+++ b/tests/components/alarm_control_panel/test_manual.py
@@ -14,6 +14,7 @@ from homeassistant.components import alarm_control_panel
 import homeassistant.util.dt as dt_util
 
 from tests.common import fire_time_changed, get_test_home_assistant
+from tests.components.alarm_control_panel import common
 
 CODE = 'HELLO_CODE'
 
@@ -53,7 +54,7 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_home(self.hass, CODE)
+        common.alarm_arm_home(self.hass, CODE)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_ARMED_HOME,
@@ -76,7 +77,7 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_home(self.hass, CODE, entity_id)
+        common.alarm_arm_home(self.hass, CODE, entity_id)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_PENDING,
@@ -111,7 +112,7 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_home(self.hass, CODE + '2')
+        common.alarm_arm_home(self.hass, CODE + '2')
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_DISARMED,
@@ -134,7 +135,7 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_away(self.hass, CODE, entity_id)
+        common.alarm_arm_away(self.hass, CODE, entity_id)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_ARMED_AWAY,
@@ -160,7 +161,7 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_home(self.hass, 'abc')
+        common.alarm_arm_home(self.hass, 'abc')
         self.hass.block_till_done()
 
         state = self.hass.states.get(entity_id)
@@ -183,7 +184,7 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_away(self.hass, CODE)
+        common.alarm_arm_away(self.hass, CODE)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_PENDING,
@@ -218,7 +219,7 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_away(self.hass, CODE + '2')
+        common.alarm_arm_away(self.hass, CODE + '2')
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_DISARMED,
@@ -241,7 +242,7 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_night(self.hass, CODE)
+        common.alarm_arm_night(self.hass, CODE)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_ARMED_NIGHT,
@@ -264,7 +265,7 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_night(self.hass, CODE, entity_id)
+        common.alarm_arm_night(self.hass, CODE, entity_id)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_PENDING,
@@ -284,7 +285,7 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         assert state.state == STATE_ALARM_ARMED_NIGHT
 
         # Do not go to the pending state when updating to the same state
-        alarm_control_panel.alarm_arm_night(self.hass, CODE, entity_id)
+        common.alarm_arm_night(self.hass, CODE, entity_id)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_ARMED_NIGHT,
@@ -307,7 +308,7 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_night(self.hass, CODE + '2')
+        common.alarm_arm_night(self.hass, CODE + '2')
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_DISARMED,
@@ -329,7 +330,7 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass, entity_id=entity_id)
+        common.alarm_trigger(self.hass, entity_id=entity_id)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_PENDING,
@@ -362,13 +363,13 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_away(self.hass, CODE)
+        common.alarm_arm_away(self.hass, CODE)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_ARMED_AWAY,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass, entity_id=entity_id)
+        common.alarm_trigger(self.hass, entity_id=entity_id)
         self.hass.block_till_done()
 
         state = self.hass.states.get(entity_id)
@@ -402,7 +403,7 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass)
+        common.alarm_trigger(self.hass)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_DISARMED,
@@ -425,7 +426,7 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass)
+        common.alarm_trigger(self.hass)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_DISARMED,
@@ -448,7 +449,7 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass)
+        common.alarm_trigger(self.hass)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_PENDING,
@@ -496,13 +497,13 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_away(self.hass, CODE)
+        common.alarm_arm_away(self.hass, CODE)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_ARMED_AWAY,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass, entity_id=entity_id)
+        common.alarm_trigger(self.hass, entity_id=entity_id)
         self.hass.block_till_done()
 
         state = self.hass.states.get(entity_id)
@@ -540,13 +541,13 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_away(self.hass, CODE)
+        common.alarm_arm_away(self.hass, CODE)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_ARMED_AWAY,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass, entity_id=entity_id)
+        common.alarm_trigger(self.hass, entity_id=entity_id)
         self.hass.block_till_done()
 
         state = self.hass.states.get(entity_id)
@@ -584,13 +585,13 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_away(self.hass, CODE)
+        common.alarm_arm_away(self.hass, CODE)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_ARMED_AWAY,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass, entity_id=entity_id)
+        common.alarm_trigger(self.hass, entity_id=entity_id)
         self.hass.block_till_done()
 
         state = self.hass.states.get(entity_id)
@@ -640,13 +641,13 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_away(self.hass, CODE)
+        common.alarm_arm_away(self.hass, CODE)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_ARMED_AWAY,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass, entity_id=entity_id)
+        common.alarm_trigger(self.hass, entity_id=entity_id)
         self.hass.block_till_done()
 
         state = self.hass.states.get(entity_id)
@@ -687,7 +688,7 @@ class TestAlarmControlPanelManual(unittest.TestCase):
 
         entity_id = 'alarm_control_panel.test'
 
-        alarm_control_panel.alarm_arm_home(self.hass)
+        common.alarm_arm_home(self.hass)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_PENDING,
@@ -717,7 +718,7 @@ class TestAlarmControlPanelManual(unittest.TestCase):
 
         entity_id = 'alarm_control_panel.test'
 
-        alarm_control_panel.alarm_arm_away(self.hass)
+        common.alarm_arm_away(self.hass)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_PENDING,
@@ -747,7 +748,7 @@ class TestAlarmControlPanelManual(unittest.TestCase):
 
         entity_id = 'alarm_control_panel.test'
 
-        alarm_control_panel.alarm_arm_night(self.hass)
+        common.alarm_arm_night(self.hass)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_PENDING,
@@ -779,7 +780,7 @@ class TestAlarmControlPanelManual(unittest.TestCase):
 
         entity_id = 'alarm_control_panel.test'
 
-        alarm_control_panel.alarm_trigger(self.hass)
+        common.alarm_trigger(self.hass)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_PENDING,
@@ -820,7 +821,7 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass, entity_id=entity_id)
+        common.alarm_trigger(self.hass, entity_id=entity_id)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_TRIGGERED,
@@ -855,7 +856,7 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass, entity_id=entity_id)
+        common.alarm_trigger(self.hass, entity_id=entity_id)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_DISARMED,
@@ -881,7 +882,7 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass, entity_id=entity_id)
+        common.alarm_trigger(self.hass, entity_id=entity_id)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_TRIGGERED,
@@ -915,7 +916,7 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass, entity_id=entity_id)
+        common.alarm_trigger(self.hass, entity_id=entity_id)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_TRIGGERED,
@@ -947,13 +948,13 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_away(self.hass, CODE, entity_id)
+        common.alarm_arm_away(self.hass, CODE, entity_id)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_ARMED_AWAY,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass, entity_id=entity_id)
+        common.alarm_trigger(self.hass, entity_id=entity_id)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_TRIGGERED,
@@ -985,13 +986,13 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_away(self.hass, CODE, entity_id)
+        common.alarm_arm_away(self.hass, CODE, entity_id)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_ARMED_AWAY,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass, entity_id=entity_id)
+        common.alarm_trigger(self.hass, entity_id=entity_id)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_TRIGGERED,
@@ -1006,7 +1007,7 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         self.assertEqual(STATE_ALARM_ARMED_AWAY,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass, entity_id=entity_id)
+        common.alarm_trigger(self.hass, entity_id=entity_id)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_TRIGGERED,
@@ -1037,13 +1038,13 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass)
+        common.alarm_trigger(self.hass)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_PENDING,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_disarm(self.hass, entity_id=entity_id)
+        common.alarm_disarm(self.hass, entity_id=entity_id)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_DISARMED,
@@ -1075,13 +1076,13 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass)
+        common.alarm_trigger(self.hass)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_PENDING,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_disarm(self.hass, entity_id=entity_id)
+        common.alarm_disarm(self.hass, entity_id=entity_id)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_PENDING,
@@ -1117,19 +1118,19 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_home(self.hass, 'def')
+        common.alarm_arm_home(self.hass, 'def')
         self.hass.block_till_done()
 
         state = self.hass.states.get(entity_id)
         self.assertEqual(STATE_ALARM_ARMED_HOME, state.state)
 
-        alarm_control_panel.alarm_disarm(self.hass, 'def')
+        common.alarm_disarm(self.hass, 'def')
         self.hass.block_till_done()
 
         state = self.hass.states.get(entity_id)
         self.assertEqual(STATE_ALARM_ARMED_HOME, state.state)
 
-        alarm_control_panel.alarm_disarm(self.hass, 'abc')
+        common.alarm_disarm(self.hass, 'abc')
         self.hass.block_till_done()
 
         state = self.hass.states.get(entity_id)
@@ -1152,7 +1153,7 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_custom_bypass(self.hass, CODE)
+        common.alarm_arm_custom_bypass(self.hass, CODE)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_ARMED_CUSTOM_BYPASS,
@@ -1175,7 +1176,7 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_custom_bypass(self.hass, CODE, entity_id)
+        common.alarm_arm_custom_bypass(self.hass, CODE, entity_id)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_PENDING,
@@ -1211,7 +1212,7 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_custom_bypass(self.hass, CODE + '2')
+        common.alarm_arm_custom_bypass(self.hass, CODE + '2')
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_DISARMED,
@@ -1232,7 +1233,7 @@ class TestAlarmControlPanelManual(unittest.TestCase):
 
         entity_id = 'alarm_control_panel.test'
 
-        alarm_control_panel.alarm_arm_custom_bypass(self.hass)
+        common.alarm_arm_custom_bypass(self.hass)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_PENDING,
@@ -1271,7 +1272,7 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_away(self.hass, CODE)
+        common.alarm_arm_away(self.hass, CODE)
         self.hass.block_till_done()
 
         state = self.hass.states.get(entity_id)
@@ -1281,7 +1282,7 @@ class TestAlarmControlPanelManual(unittest.TestCase):
         self.assertEqual(STATE_ALARM_ARMED_AWAY,
                          state.attributes['post_pending_state'])
 
-        alarm_control_panel.alarm_trigger(self.hass, entity_id=entity_id)
+        common.alarm_trigger(self.hass, entity_id=entity_id)
         self.hass.block_till_done()
 
         state = self.hass.states.get(entity_id)
@@ -1300,7 +1301,7 @@ class TestAlarmControlPanelManual(unittest.TestCase):
             state = self.hass.states.get(entity_id)
             self.assertEqual(STATE_ALARM_ARMED_AWAY, state.state)
 
-            alarm_control_panel.alarm_trigger(self.hass, entity_id=entity_id)
+            common.alarm_trigger(self.hass, entity_id=entity_id)
             self.hass.block_till_done()
 
             state = self.hass.states.get(entity_id)
diff --git a/tests/components/alarm_control_panel/test_manual_mqtt.py b/tests/components/alarm_control_panel/test_manual_mqtt.py
index 0158381b526..4e2ec6a9489 100644
--- a/tests/components/alarm_control_panel/test_manual_mqtt.py
+++ b/tests/components/alarm_control_panel/test_manual_mqtt.py
@@ -13,6 +13,7 @@ import homeassistant.util.dt as dt_util
 from tests.common import (
     fire_time_changed, get_test_home_assistant,
     mock_mqtt_component, fire_mqtt_message, assert_setup_component)
+from tests.components.alarm_control_panel import common
 
 CODE = 'HELLO_CODE'
 
@@ -70,7 +71,7 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_home(self.hass, CODE)
+        common.alarm_arm_home(self.hass, CODE)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_ARMED_HOME,
@@ -95,7 +96,7 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_home(self.hass, CODE, entity_id)
+        common.alarm_arm_home(self.hass, CODE, entity_id)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_PENDING,
@@ -132,7 +133,7 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_home(self.hass, CODE + '2')
+        common.alarm_arm_home(self.hass, CODE + '2')
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_DISARMED,
@@ -157,7 +158,7 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_away(self.hass, CODE, entity_id)
+        common.alarm_arm_away(self.hass, CODE, entity_id)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_ARMED_AWAY,
@@ -185,7 +186,7 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_home(self.hass, 'abc')
+        common.alarm_arm_home(self.hass, 'abc')
         self.hass.block_till_done()
 
         state = self.hass.states.get(entity_id)
@@ -210,7 +211,7 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_away(self.hass, CODE)
+        common.alarm_arm_away(self.hass, CODE)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_PENDING,
@@ -247,7 +248,7 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_away(self.hass, CODE + '2')
+        common.alarm_arm_away(self.hass, CODE + '2')
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_DISARMED,
@@ -272,7 +273,7 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_night(self.hass, CODE, entity_id)
+        common.alarm_arm_night(self.hass, CODE, entity_id)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_ARMED_NIGHT,
@@ -297,7 +298,7 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_night(self.hass, CODE)
+        common.alarm_arm_night(self.hass, CODE)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_PENDING,
@@ -317,7 +318,7 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
                          self.hass.states.get(entity_id).state)
 
         # Do not go to the pending state when updating to the same state
-        alarm_control_panel.alarm_arm_night(self.hass, CODE, entity_id)
+        common.alarm_arm_night(self.hass, CODE, entity_id)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_ARMED_NIGHT,
@@ -342,7 +343,7 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_night(self.hass, CODE + '2')
+        common.alarm_arm_night(self.hass, CODE + '2')
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_DISARMED,
@@ -366,7 +367,7 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass, entity_id=entity_id)
+        common.alarm_trigger(self.hass, entity_id=entity_id)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_PENDING,
@@ -401,13 +402,13 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_away(self.hass, CODE)
+        common.alarm_arm_away(self.hass, CODE)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_ARMED_AWAY,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass, entity_id=entity_id)
+        common.alarm_trigger(self.hass, entity_id=entity_id)
         self.hass.block_till_done()
 
         state = self.hass.states.get(entity_id)
@@ -443,7 +444,7 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass)
+        common.alarm_trigger(self.hass)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_DISARMED,
@@ -468,7 +469,7 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass)
+        common.alarm_trigger(self.hass)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_DISARMED,
@@ -493,7 +494,7 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass)
+        common.alarm_trigger(self.hass)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_PENDING,
@@ -539,7 +540,7 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass, entity_id=entity_id)
+        common.alarm_trigger(self.hass, entity_id=entity_id)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_TRIGGERED,
@@ -576,7 +577,7 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass, entity_id=entity_id)
+        common.alarm_trigger(self.hass, entity_id=entity_id)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_DISARMED,
@@ -604,7 +605,7 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass, entity_id=entity_id)
+        common.alarm_trigger(self.hass, entity_id=entity_id)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_TRIGGERED,
@@ -640,7 +641,7 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass, entity_id=entity_id)
+        common.alarm_trigger(self.hass, entity_id=entity_id)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_TRIGGERED,
@@ -674,13 +675,13 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_away(self.hass, CODE, entity_id)
+        common.alarm_arm_away(self.hass, CODE, entity_id)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_ARMED_AWAY,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass, entity_id=entity_id)
+        common.alarm_trigger(self.hass, entity_id=entity_id)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_TRIGGERED,
@@ -695,7 +696,7 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.assertEqual(STATE_ALARM_ARMED_AWAY,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass, entity_id=entity_id)
+        common.alarm_trigger(self.hass, entity_id=entity_id)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_TRIGGERED,
@@ -728,13 +729,13 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass)
+        common.alarm_trigger(self.hass)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_PENDING,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_disarm(self.hass, entity_id=entity_id)
+        common.alarm_disarm(self.hass, entity_id=entity_id)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_DISARMED,
@@ -768,13 +769,13 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass)
+        common.alarm_trigger(self.hass)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_PENDING,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_disarm(self.hass, entity_id=entity_id)
+        common.alarm_disarm(self.hass, entity_id=entity_id)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_PENDING,
@@ -812,13 +813,13 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_away(self.hass, CODE)
+        common.alarm_arm_away(self.hass, CODE)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_ARMED_AWAY,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass, entity_id=entity_id)
+        common.alarm_trigger(self.hass, entity_id=entity_id)
         self.hass.block_till_done()
 
         state = self.hass.states.get(entity_id)
@@ -858,13 +859,13 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_away(self.hass, CODE)
+        common.alarm_arm_away(self.hass, CODE)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_ARMED_AWAY,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass, entity_id=entity_id)
+        common.alarm_trigger(self.hass, entity_id=entity_id)
         self.hass.block_till_done()
 
         state = self.hass.states.get(entity_id)
@@ -904,13 +905,13 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_away(self.hass, CODE)
+        common.alarm_arm_away(self.hass, CODE)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_ARMED_AWAY,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass, entity_id=entity_id)
+        common.alarm_trigger(self.hass, entity_id=entity_id)
         self.hass.block_till_done()
 
         state = self.hass.states.get(entity_id)
@@ -962,13 +963,13 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_away(self.hass, CODE)
+        common.alarm_arm_away(self.hass, CODE)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_ARMED_AWAY,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass, entity_id=entity_id)
+        common.alarm_trigger(self.hass, entity_id=entity_id)
         self.hass.block_till_done()
 
         state = self.hass.states.get(entity_id)
@@ -1011,7 +1012,7 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
 
         entity_id = 'alarm_control_panel.test'
 
-        alarm_control_panel.alarm_arm_home(self.hass)
+        common.alarm_arm_home(self.hass)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_PENDING,
@@ -1043,7 +1044,7 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
 
         entity_id = 'alarm_control_panel.test'
 
-        alarm_control_panel.alarm_arm_away(self.hass)
+        common.alarm_arm_away(self.hass)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_PENDING,
@@ -1075,7 +1076,7 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
 
         entity_id = 'alarm_control_panel.test'
 
-        alarm_control_panel.alarm_arm_night(self.hass)
+        common.alarm_arm_night(self.hass)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_PENDING,
@@ -1109,7 +1110,7 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
 
         entity_id = 'alarm_control_panel.test'
 
-        alarm_control_panel.alarm_trigger(self.hass)
+        common.alarm_trigger(self.hass)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_PENDING,
@@ -1159,7 +1160,7 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_away(self.hass, CODE)
+        common.alarm_arm_away(self.hass, CODE)
         self.hass.block_till_done()
 
         state = self.hass.states.get(entity_id)
@@ -1169,7 +1170,7 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.assertEqual(STATE_ALARM_ARMED_AWAY,
                          state.attributes['post_pending_state'])
 
-        alarm_control_panel.alarm_trigger(self.hass, entity_id=entity_id)
+        common.alarm_trigger(self.hass, entity_id=entity_id)
         self.hass.block_till_done()
 
         state = self.hass.states.get(entity_id)
@@ -1188,7 +1189,7 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
             state = self.hass.states.get(entity_id)
             self.assertEqual(STATE_ALARM_ARMED_AWAY, state.state)
 
-            alarm_control_panel.alarm_trigger(self.hass, entity_id=entity_id)
+            common.alarm_trigger(self.hass, entity_id=entity_id)
             self.hass.block_till_done()
 
             state = self.hass.states.get(entity_id)
@@ -1230,19 +1231,19 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_arm_home(self.hass, 'def')
+        common.alarm_arm_home(self.hass, 'def')
         self.hass.block_till_done()
 
         state = self.hass.states.get(entity_id)
         self.assertEqual(STATE_ALARM_ARMED_HOME, state.state)
 
-        alarm_control_panel.alarm_disarm(self.hass, 'def')
+        common.alarm_disarm(self.hass, 'def')
         self.hass.block_till_done()
 
         state = self.hass.states.get(entity_id)
         self.assertEqual(STATE_ALARM_ARMED_HOME, state.state)
 
-        alarm_control_panel.alarm_disarm(self.hass, 'abc')
+        common.alarm_disarm(self.hass, 'abc')
         self.hass.block_till_done()
 
         state = self.hass.states.get(entity_id)
@@ -1368,7 +1369,7 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.assertEqual(STATE_ALARM_DISARMED,
                          self.hass.states.get(entity_id).state)
 
-        alarm_control_panel.alarm_trigger(self.hass)
+        common.alarm_trigger(self.hass)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ALARM_PENDING,
@@ -1401,7 +1402,7 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.mock_publish.async_publish.reset_mock()
 
         # Arm in home mode
-        alarm_control_panel.alarm_arm_home(self.hass)
+        common.alarm_arm_home(self.hass)
         self.hass.block_till_done()
         self.mock_publish.async_publish.assert_called_once_with(
             'alarm/state', STATE_ALARM_PENDING, 0, True)
@@ -1417,7 +1418,7 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.mock_publish.async_publish.reset_mock()
 
         # Arm in away mode
-        alarm_control_panel.alarm_arm_away(self.hass)
+        common.alarm_arm_away(self.hass)
         self.hass.block_till_done()
         self.mock_publish.async_publish.assert_called_once_with(
             'alarm/state', STATE_ALARM_PENDING, 0, True)
@@ -1433,7 +1434,7 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.mock_publish.async_publish.reset_mock()
 
         # Arm in night mode
-        alarm_control_panel.alarm_arm_night(self.hass)
+        common.alarm_arm_night(self.hass)
         self.hass.block_till_done()
         self.mock_publish.async_publish.assert_called_once_with(
             'alarm/state', STATE_ALARM_PENDING, 0, True)
@@ -1449,7 +1450,7 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
         self.mock_publish.async_publish.reset_mock()
 
         # Disarm
-        alarm_control_panel.alarm_disarm(self.hass)
+        common.alarm_disarm(self.hass)
         self.hass.block_till_done()
         self.mock_publish.async_publish.assert_called_once_with(
             'alarm/state', STATE_ALARM_DISARMED, 0, True)
diff --git a/tests/components/alarm_control_panel/test_mqtt.py b/tests/components/alarm_control_panel/test_mqtt.py
index 3a68b3cee44..b77767980a7 100644
--- a/tests/components/alarm_control_panel/test_mqtt.py
+++ b/tests/components/alarm_control_panel/test_mqtt.py
@@ -12,6 +12,7 @@ from homeassistant.components.mqtt.discovery import async_start
 from tests.common import (
     mock_mqtt_component, async_fire_mqtt_message, fire_mqtt_message,
     get_test_home_assistant, assert_setup_component)
+from tests.components.alarm_control_panel import common
 
 CODE = 'HELLO_CODE'
 
@@ -105,7 +106,7 @@ class TestAlarmControlPanelMQTT(unittest.TestCase):
             }
         })
 
-        alarm_control_panel.alarm_arm_home(self.hass)
+        common.alarm_arm_home(self.hass)
         self.hass.block_till_done()
         self.mock_publish.async_publish.assert_called_once_with(
             'alarm/command', 'ARM_HOME', 0, False)
@@ -123,7 +124,7 @@ class TestAlarmControlPanelMQTT(unittest.TestCase):
         })
 
         call_count = self.mock_publish.call_count
-        alarm_control_panel.alarm_arm_home(self.hass, 'abcd')
+        common.alarm_arm_home(self.hass, 'abcd')
         self.hass.block_till_done()
         self.assertEqual(call_count, self.mock_publish.call_count)
 
@@ -138,7 +139,7 @@ class TestAlarmControlPanelMQTT(unittest.TestCase):
             }
         })
 
-        alarm_control_panel.alarm_arm_away(self.hass)
+        common.alarm_arm_away(self.hass)
         self.hass.block_till_done()
         self.mock_publish.async_publish.assert_called_once_with(
             'alarm/command', 'ARM_AWAY', 0, False)
@@ -156,7 +157,7 @@ class TestAlarmControlPanelMQTT(unittest.TestCase):
         })
 
         call_count = self.mock_publish.call_count
-        alarm_control_panel.alarm_arm_away(self.hass, 'abcd')
+        common.alarm_arm_away(self.hass, 'abcd')
         self.hass.block_till_done()
         self.assertEqual(call_count, self.mock_publish.call_count)
 
@@ -171,7 +172,7 @@ class TestAlarmControlPanelMQTT(unittest.TestCase):
             }
         })
 
-        alarm_control_panel.alarm_disarm(self.hass)
+        common.alarm_disarm(self.hass)
         self.hass.block_till_done()
         self.mock_publish.async_publish.assert_called_once_with(
             'alarm/command', 'DISARM', 0, False)
@@ -189,7 +190,7 @@ class TestAlarmControlPanelMQTT(unittest.TestCase):
         })
 
         call_count = self.mock_publish.call_count
-        alarm_control_panel.alarm_disarm(self.hass, 'abcd')
+        common.alarm_disarm(self.hass, 'abcd')
         self.hass.block_till_done()
         self.assertEqual(call_count, self.mock_publish.call_count)
 
diff --git a/tests/components/automation/common.py b/tests/components/automation/common.py
new file mode 100644
index 00000000000..4c8f91849aa
--- /dev/null
+++ b/tests/components/automation/common.py
@@ -0,0 +1,53 @@
+"""Collection of helper methods.
+
+All containing methods are legacy helpers that should not be used by new
+components. Instead call the service directly.
+"""
+from homeassistant.components.automation import DOMAIN, SERVICE_TRIGGER
+from homeassistant.const import (
+    ATTR_ENTITY_ID, SERVICE_TURN_ON, SERVICE_TURN_OFF, SERVICE_TOGGLE,
+    SERVICE_RELOAD)
+from homeassistant.loader import bind_hass
+
+
+@bind_hass
+def turn_on(hass, entity_id=None):
+    """Turn on specified automation or all."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
+    hass.services.call(DOMAIN, SERVICE_TURN_ON, data)
+
+
+@bind_hass
+def turn_off(hass, entity_id=None):
+    """Turn off specified automation or all."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
+    hass.services.call(DOMAIN, SERVICE_TURN_OFF, data)
+
+
+@bind_hass
+def toggle(hass, entity_id=None):
+    """Toggle specified automation or all."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
+    hass.services.call(DOMAIN, SERVICE_TOGGLE, data)
+
+
+@bind_hass
+def trigger(hass, entity_id=None):
+    """Trigger specified automation or all."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
+    hass.services.call(DOMAIN, SERVICE_TRIGGER, data)
+
+
+@bind_hass
+def reload(hass):
+    """Reload the automation from config."""
+    hass.services.call(DOMAIN, SERVICE_RELOAD)
+
+
+@bind_hass
+def async_reload(hass):
+    """Reload the automation from config.
+
+    Returns a coroutine object.
+    """
+    return hass.services.async_call(DOMAIN, SERVICE_RELOAD)
diff --git a/tests/components/automation/test_event.py b/tests/components/automation/test_event.py
index 6e16c03f2dc..09d237013b0 100644
--- a/tests/components/automation/test_event.py
+++ b/tests/components/automation/test_event.py
@@ -6,6 +6,7 @@ from homeassistant.setup import setup_component
 import homeassistant.components.automation as automation
 
 from tests.common import get_test_home_assistant, mock_component
+from tests.components.automation import common
 
 
 # pylint: disable=invalid-name
@@ -50,7 +51,7 @@ class TestAutomationEvent(unittest.TestCase):
         self.assertEqual(1, len(self.calls))
         assert self.calls[0].context is context
 
-        automation.turn_off(self.hass)
+        common.turn_off(self.hass)
         self.hass.block_till_done()
 
         self.hass.bus.fire('test_event')
@@ -75,7 +76,7 @@ class TestAutomationEvent(unittest.TestCase):
         self.hass.block_till_done()
         self.assertEqual(1, len(self.calls))
 
-        automation.turn_off(self.hass)
+        common.turn_off(self.hass)
         self.hass.block_till_done()
 
         self.hass.bus.fire('test_event')
diff --git a/tests/components/automation/test_init.py b/tests/components/automation/test_init.py
index c3bd6c224af..3bcbc7da04f 100644
--- a/tests/components/automation/test_init.py
+++ b/tests/components/automation/test_init.py
@@ -15,6 +15,7 @@ import homeassistant.util.dt as dt_util
 from tests.common import (
     assert_setup_component, get_test_home_assistant, fire_time_changed,
     mock_service, async_mock_service, mock_restore_cache)
+from tests.components.automation import common
 
 
 # pylint: disable=invalid-name
@@ -363,7 +364,7 @@ class TestAutomation(unittest.TestCase):
         self.hass.block_till_done()
         assert len(self.calls) == 1
 
-        automation.turn_off(self.hass, entity_id)
+        common.turn_off(self.hass, entity_id)
         self.hass.block_till_done()
 
         assert not automation.is_on(self.hass, entity_id)
@@ -371,7 +372,7 @@ class TestAutomation(unittest.TestCase):
         self.hass.block_till_done()
         assert len(self.calls) == 1
 
-        automation.toggle(self.hass, entity_id)
+        common.toggle(self.hass, entity_id)
         self.hass.block_till_done()
 
         assert automation.is_on(self.hass, entity_id)
@@ -379,17 +380,17 @@ class TestAutomation(unittest.TestCase):
         self.hass.block_till_done()
         assert len(self.calls) == 2
 
-        automation.trigger(self.hass, entity_id)
+        common.trigger(self.hass, entity_id)
         self.hass.block_till_done()
         assert len(self.calls) == 3
 
-        automation.turn_off(self.hass, entity_id)
+        common.turn_off(self.hass, entity_id)
         self.hass.block_till_done()
-        automation.trigger(self.hass, entity_id)
+        common.trigger(self.hass, entity_id)
         self.hass.block_till_done()
         assert len(self.calls) == 4
 
-        automation.turn_on(self.hass, entity_id)
+        common.turn_on(self.hass, entity_id)
         self.hass.block_till_done()
         assert automation.is_on(self.hass, entity_id)
 
@@ -439,7 +440,7 @@ class TestAutomation(unittest.TestCase):
                     }}):
             with patch('homeassistant.config.find_config_file',
                        return_value=''):
-                automation.reload(self.hass)
+                common.reload(self.hass)
                 self.hass.block_till_done()
                 # De-flake ?!
                 self.hass.block_till_done()
@@ -489,7 +490,7 @@ class TestAutomation(unittest.TestCase):
                    return_value={automation.DOMAIN: 'not valid'}):
             with patch('homeassistant.config.find_config_file',
                        return_value=''):
-                automation.reload(self.hass)
+                common.reload(self.hass)
                 self.hass.block_till_done()
 
         assert self.hass.states.get('automation.hello') is None
@@ -527,7 +528,7 @@ class TestAutomation(unittest.TestCase):
                    side_effect=HomeAssistantError('bla')):
             with patch('homeassistant.config.find_config_file',
                        return_value=''):
-                automation.reload(self.hass)
+                common.reload(self.hass)
                 self.hass.block_till_done()
 
         assert self.hass.states.get('automation.hello') is not None
diff --git a/tests/components/automation/test_litejet.py b/tests/components/automation/test_litejet.py
index ca6f7796cfc..3d88174708b 100644
--- a/tests/components/automation/test_litejet.py
+++ b/tests/components/automation/test_litejet.py
@@ -7,9 +7,10 @@ from datetime import timedelta
 from homeassistant import setup
 import homeassistant.util.dt as dt_util
 from homeassistant.components import litejet
-from tests.common import (fire_time_changed, get_test_home_assistant)
 import homeassistant.components.automation as automation
 
+from tests.common import (fire_time_changed, get_test_home_assistant)
+
 _LOGGER = logging.getLogger(__name__)
 
 ENTITY_SWITCH = 'switch.mock_switch_1'
diff --git a/tests/components/automation/test_mqtt.py b/tests/components/automation/test_mqtt.py
index 8ec5351af94..29a53467c4f 100644
--- a/tests/components/automation/test_mqtt.py
+++ b/tests/components/automation/test_mqtt.py
@@ -7,6 +7,7 @@ import homeassistant.components.automation as automation
 from tests.common import (
     mock_mqtt_component, fire_mqtt_message, get_test_home_assistant,
     mock_component)
+from tests.components.automation import common
 
 
 # pylint: disable=invalid-name
@@ -56,7 +57,7 @@ class TestAutomationMQTT(unittest.TestCase):
         self.assertEqual('mqtt - test-topic - { "hello": "world" } - world',
                          self.calls[0].data['some'])
 
-        automation.turn_off(self.hass)
+        common.turn_off(self.hass)
         self.hass.block_till_done()
         fire_mqtt_message(self.hass, 'test-topic', 'test_payload')
         self.hass.block_till_done()
diff --git a/tests/components/automation/test_numeric_state.py b/tests/components/automation/test_numeric_state.py
index af95bc0ff02..183d1f4a5f9 100644
--- a/tests/components/automation/test_numeric_state.py
+++ b/tests/components/automation/test_numeric_state.py
@@ -11,6 +11,7 @@ import homeassistant.util.dt as dt_util
 from tests.common import (
     get_test_home_assistant, mock_component, fire_time_changed,
     assert_setup_component)
+from tests.components.automation import common
 
 
 # pylint: disable=invalid-name
@@ -57,7 +58,7 @@ class TestAutomationNumericState(unittest.TestCase):
 
         # Set above 12 so the automation will fire again
         self.hass.states.set('test.entity', 12)
-        automation.turn_off(self.hass)
+        common.turn_off(self.hass)
         self.hass.block_till_done()
         self.hass.states.set('test.entity', 9)
         self.hass.block_till_done()
@@ -775,7 +776,7 @@ class TestAutomationNumericState(unittest.TestCase):
         self.hass.states.set('test.entity_1', 9)
         self.hass.states.set('test.entity_2', 9)
         self.hass.block_till_done()
-        automation.turn_off(self.hass)
+        common.turn_off(self.hass)
         self.hass.block_till_done()
 
         fire_time_changed(self.hass, dt_util.utcnow() + timedelta(seconds=10))
diff --git a/tests/components/automation/test_state.py b/tests/components/automation/test_state.py
index 274980fabc0..15c6353b234 100644
--- a/tests/components/automation/test_state.py
+++ b/tests/components/automation/test_state.py
@@ -12,6 +12,7 @@ import homeassistant.components.automation as automation
 from tests.common import (
     fire_time_changed, get_test_home_assistant, assert_setup_component,
     mock_component)
+from tests.components.automation import common
 
 
 # pylint: disable=invalid-name
@@ -68,7 +69,7 @@ class TestAutomationState(unittest.TestCase):
             'state - test.entity - hello - world - None',
             self.calls[0].data['some'])
 
-        automation.turn_off(self.hass)
+        common.turn_off(self.hass)
         self.hass.block_till_done()
         self.hass.states.set('test.entity', 'planet')
         self.hass.block_till_done()
@@ -370,7 +371,7 @@ class TestAutomationState(unittest.TestCase):
         self.hass.states.set('test.entity_1', 'world')
         self.hass.states.set('test.entity_2', 'world')
         self.hass.block_till_done()
-        automation.turn_off(self.hass)
+        common.turn_off(self.hass)
         self.hass.block_till_done()
 
         fire_time_changed(self.hass, dt_util.utcnow() + timedelta(seconds=10))
diff --git a/tests/components/automation/test_sun.py b/tests/components/automation/test_sun.py
index 4556b7cbe45..ad8709fdf36 100644
--- a/tests/components/automation/test_sun.py
+++ b/tests/components/automation/test_sun.py
@@ -12,6 +12,7 @@ import homeassistant.util.dt as dt_util
 
 from tests.common import (
     fire_time_changed, get_test_home_assistant, mock_component)
+from tests.components.automation import common
 
 
 # pylint: disable=invalid-name
@@ -57,7 +58,7 @@ class TestAutomationSun(unittest.TestCase):
                 }
             })
 
-        automation.turn_off(self.hass)
+        common.turn_off(self.hass)
         self.hass.block_till_done()
 
         fire_time_changed(self.hass, trigger_time)
@@ -66,7 +67,7 @@ class TestAutomationSun(unittest.TestCase):
 
         with patch('homeassistant.util.dt.utcnow',
                    return_value=now):
-            automation.turn_on(self.hass)
+            common.turn_on(self.hass)
             self.hass.block_till_done()
 
         fire_time_changed(self.hass, trigger_time)
diff --git a/tests/components/automation/test_template.py b/tests/components/automation/test_template.py
index e9c763ccc73..4fec0e707a9 100644
--- a/tests/components/automation/test_template.py
+++ b/tests/components/automation/test_template.py
@@ -7,6 +7,7 @@ import homeassistant.components.automation as automation
 
 from tests.common import (
     get_test_home_assistant, assert_setup_component, mock_component)
+from tests.components.automation import common
 
 
 # pylint: disable=invalid-name
@@ -49,7 +50,7 @@ class TestAutomationTemplate(unittest.TestCase):
         self.hass.block_till_done()
         self.assertEqual(1, len(self.calls))
 
-        automation.turn_off(self.hass)
+        common.turn_off(self.hass)
         self.hass.block_till_done()
 
         self.hass.states.set('test.entity', 'planet')
diff --git a/tests/components/automation/test_time.py b/tests/components/automation/test_time.py
index 5f928cf92a0..dcb723d725e 100644
--- a/tests/components/automation/test_time.py
+++ b/tests/components/automation/test_time.py
@@ -11,6 +11,7 @@ import homeassistant.components.automation as automation
 from tests.common import (
     fire_time_changed, get_test_home_assistant, assert_setup_component,
     mock_component)
+from tests.components.automation import common
 
 
 # pylint: disable=invalid-name
@@ -52,7 +53,7 @@ class TestAutomationTime(unittest.TestCase):
         self.hass.block_till_done()
         self.assertEqual(1, len(self.calls))
 
-        automation.turn_off(self.hass)
+        common.turn_off(self.hass)
         self.hass.block_till_done()
 
         fire_time_changed(self.hass, dt_util.utcnow().replace(hour=0))
diff --git a/tests/components/automation/test_zone.py b/tests/components/automation/test_zone.py
index d146278a997..795f55a3e0b 100644
--- a/tests/components/automation/test_zone.py
+++ b/tests/components/automation/test_zone.py
@@ -6,6 +6,7 @@ from homeassistant.setup import setup_component
 from homeassistant.components import automation, zone
 
 from tests.common import get_test_home_assistant, mock_component
+from tests.components.automation import common
 
 
 # pylint: disable=invalid-name
@@ -87,7 +88,7 @@ class TestAutomationZone(unittest.TestCase):
         })
         self.hass.block_till_done()
 
-        automation.turn_off(self.hass)
+        common.turn_off(self.hass)
         self.hass.block_till_done()
 
         self.hass.states.set('test.entity', 'hello', {
diff --git a/tests/components/camera/common.py b/tests/components/camera/common.py
new file mode 100644
index 00000000000..71193f1a99d
--- /dev/null
+++ b/tests/components/camera/common.py
@@ -0,0 +1,68 @@
+"""Collection of helper methods.
+
+All containing methods are legacy helpers that should not be used by new
+components. Instead call the service directly.
+"""
+from homeassistant.components.camera import (
+    ATTR_FILENAME, DOMAIN, SERVICE_DISABLE_MOTION, SERVICE_ENABLE_MOTION,
+    SERVICE_SNAPSHOT)
+from homeassistant.const import ATTR_ENTITY_ID, SERVICE_TURN_OFF, \
+    SERVICE_TURN_ON
+from homeassistant.core import callback
+from homeassistant.loader import bind_hass
+
+
+@bind_hass
+def turn_off(hass, entity_id=None):
+    """Turn off camera."""
+    hass.add_job(async_turn_off, hass, entity_id)
+
+
+@bind_hass
+async def async_turn_off(hass, entity_id=None):
+    """Turn off camera."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
+    await hass.services.async_call(DOMAIN, SERVICE_TURN_OFF, data)
+
+
+@bind_hass
+def turn_on(hass, entity_id=None):
+    """Turn on camera."""
+    hass.add_job(async_turn_on, hass, entity_id)
+
+
+@bind_hass
+async def async_turn_on(hass, entity_id=None):
+    """Turn on camera, and set operation mode."""
+    data = {}
+    if entity_id is not None:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    await hass.services.async_call(DOMAIN, SERVICE_TURN_ON, data)
+
+
+@bind_hass
+def enable_motion_detection(hass, entity_id=None):
+    """Enable Motion Detection."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
+    hass.async_add_job(hass.services.async_call(
+        DOMAIN, SERVICE_ENABLE_MOTION, data))
+
+
+@bind_hass
+def disable_motion_detection(hass, entity_id=None):
+    """Disable Motion Detection."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
+    hass.async_add_job(hass.services.async_call(
+        DOMAIN, SERVICE_DISABLE_MOTION, data))
+
+
+@bind_hass
+@callback
+def async_snapshot(hass, filename, entity_id=None):
+    """Make a snapshot from a camera."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
+    data[ATTR_FILENAME] = filename
+
+    hass.async_add_job(hass.services.async_call(
+        DOMAIN, SERVICE_SNAPSHOT, data))
diff --git a/tests/components/camera/test_demo.py b/tests/components/camera/test_demo.py
index 63c70ddc6ca..f6e2513380c 100644
--- a/tests/components/camera/test_demo.py
+++ b/tests/components/camera/test_demo.py
@@ -8,6 +8,8 @@ from homeassistant.components.camera import STATE_STREAMING, STATE_IDLE
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.setup import async_setup_component
 
+from tests.components.camera import common
+
 
 @pytest.fixture
 def demo_camera(hass):
@@ -37,12 +39,12 @@ async def test_init_state_is_streaming(hass, demo_camera):
 async def test_turn_on_state_back_to_streaming(hass, demo_camera):
     """After turn on state back to streaming."""
     assert demo_camera.state == STATE_STREAMING
-    await camera.async_turn_off(hass, demo_camera.entity_id)
+    await common.async_turn_off(hass, demo_camera.entity_id)
     await hass.async_block_till_done()
 
     assert demo_camera.state == STATE_IDLE
 
-    await camera.async_turn_on(hass, demo_camera.entity_id)
+    await common.async_turn_on(hass, demo_camera.entity_id)
     await hass.async_block_till_done()
 
     assert demo_camera.state == STATE_STREAMING
@@ -50,7 +52,7 @@ async def test_turn_on_state_back_to_streaming(hass, demo_camera):
 
 async def test_turn_off_image(hass, demo_camera):
     """After turn off, Demo camera raise error."""
-    await camera.async_turn_off(hass, demo_camera.entity_id)
+    await common.async_turn_off(hass, demo_camera.entity_id)
     await hass.async_block_till_done()
 
     with pytest.raises(HomeAssistantError) as error:
@@ -61,7 +63,7 @@ async def test_turn_off_image(hass, demo_camera):
 async def test_turn_off_invalid_camera(hass, demo_camera):
     """Turn off non-exist camera should quietly fail."""
     assert demo_camera.state == STATE_STREAMING
-    await camera.async_turn_off(hass, 'camera.invalid_camera')
+    await common.async_turn_off(hass, 'camera.invalid_camera')
     await hass.async_block_till_done()
 
     assert demo_camera.state == STATE_STREAMING
@@ -81,7 +83,7 @@ async def test_motion_detection(hass):
     assert not state.attributes.get('motion_detection')
 
     # Call service to turn on motion detection
-    camera.enable_motion_detection(hass, 'camera.demo_camera')
+    common.enable_motion_detection(hass, 'camera.demo_camera')
     await hass.async_block_till_done()
 
     # Check if state has been updated.
diff --git a/tests/components/camera/test_init.py b/tests/components/camera/test_init.py
index 053fa6d29dc..2129e39a43c 100644
--- a/tests/components/camera/test_init.py
+++ b/tests/components/camera/test_init.py
@@ -14,6 +14,7 @@ from homeassistant.util.async_ import run_coroutine_threadsafe
 from tests.common import (
     get_test_home_assistant, get_test_instance_port, assert_setup_component,
     mock_coro)
+from tests.components.camera import common
 
 
 @pytest.fixture
@@ -126,7 +127,7 @@ def test_snapshot_service(hass, mock_camera):
     with patch('homeassistant.components.camera.open', mopen, create=True), \
             patch.object(hass.config, 'is_allowed_path',
                          return_value=True):
-        hass.components.camera.async_snapshot('/tmp/bla')
+        common.async_snapshot(hass, '/tmp/bla')
         yield from hass.async_block_till_done()
 
         mock_write = mopen().write
diff --git a/tests/components/climate/common.py b/tests/components/climate/common.py
new file mode 100644
index 00000000000..4ac6f553091
--- /dev/null
+++ b/tests/components/climate/common.py
@@ -0,0 +1,115 @@
+"""Collection of helper methods.
+
+All containing methods are legacy helpers that should not be used by new
+components. Instead call the service directly.
+"""
+from homeassistant.components.climate import (
+    _LOGGER, ATTR_AUX_HEAT, ATTR_AWAY_MODE, ATTR_FAN_MODE, ATTR_HOLD_MODE,
+    ATTR_HUMIDITY, ATTR_OPERATION_MODE, ATTR_SWING_MODE, ATTR_TARGET_TEMP_HIGH,
+    ATTR_TARGET_TEMP_LOW, DOMAIN, SERVICE_SET_AWAY_MODE, SERVICE_SET_HOLD_MODE,
+    SERVICE_SET_AUX_HEAT, SERVICE_SET_TEMPERATURE, SERVICE_SET_HUMIDITY,
+    SERVICE_SET_FAN_MODE, SERVICE_SET_OPERATION_MODE, SERVICE_SET_SWING_MODE)
+from homeassistant.const import (
+    ATTR_ENTITY_ID, ATTR_TEMPERATURE)
+from homeassistant.loader import bind_hass
+
+
+@bind_hass
+def set_away_mode(hass, away_mode, entity_id=None):
+    """Turn all or specified climate devices away mode on."""
+    data = {
+        ATTR_AWAY_MODE: away_mode
+    }
+
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_SET_AWAY_MODE, data)
+
+
+@bind_hass
+def set_hold_mode(hass, hold_mode, entity_id=None):
+    """Set new hold mode."""
+    data = {
+        ATTR_HOLD_MODE: hold_mode
+    }
+
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_SET_HOLD_MODE, data)
+
+
+@bind_hass
+def set_aux_heat(hass, aux_heat, entity_id=None):
+    """Turn all or specified climate devices auxiliary heater on."""
+    data = {
+        ATTR_AUX_HEAT: aux_heat
+    }
+
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_SET_AUX_HEAT, data)
+
+
+@bind_hass
+def set_temperature(hass, temperature=None, entity_id=None,
+                    target_temp_high=None, target_temp_low=None,
+                    operation_mode=None):
+    """Set new target temperature."""
+    kwargs = {
+        key: value for key, value in [
+            (ATTR_TEMPERATURE, temperature),
+            (ATTR_TARGET_TEMP_HIGH, target_temp_high),
+            (ATTR_TARGET_TEMP_LOW, target_temp_low),
+            (ATTR_ENTITY_ID, entity_id),
+            (ATTR_OPERATION_MODE, operation_mode)
+        ] if value is not None
+    }
+    _LOGGER.debug("set_temperature start data=%s", kwargs)
+    hass.services.call(DOMAIN, SERVICE_SET_TEMPERATURE, kwargs)
+
+
+@bind_hass
+def set_humidity(hass, humidity, entity_id=None):
+    """Set new target humidity."""
+    data = {ATTR_HUMIDITY: humidity}
+
+    if entity_id is not None:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_SET_HUMIDITY, data)
+
+
+@bind_hass
+def set_fan_mode(hass, fan, entity_id=None):
+    """Set all or specified climate devices fan mode on."""
+    data = {ATTR_FAN_MODE: fan}
+
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_SET_FAN_MODE, data)
+
+
+@bind_hass
+def set_operation_mode(hass, operation_mode, entity_id=None):
+    """Set new target operation mode."""
+    data = {ATTR_OPERATION_MODE: operation_mode}
+
+    if entity_id is not None:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_SET_OPERATION_MODE, data)
+
+
+@bind_hass
+def set_swing_mode(hass, swing_mode, entity_id=None):
+    """Set new target swing mode."""
+    data = {ATTR_SWING_MODE: swing_mode}
+
+    if entity_id is not None:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_SET_SWING_MODE, data)
diff --git a/tests/components/climate/test_demo.py b/tests/components/climate/test_demo.py
index 0cd6d288536..4990a8a6998 100644
--- a/tests/components/climate/test_demo.py
+++ b/tests/components/climate/test_demo.py
@@ -8,6 +8,7 @@ from homeassistant.setup import setup_component
 from homeassistant.components import climate
 
 from tests.common import get_test_home_assistant
+from tests.components.climate import common
 
 
 ENTITY_CLIMATE = 'climate.hvac'
@@ -56,7 +57,7 @@ class TestDemoClimate(unittest.TestCase):
         """Test setting the target temperature without required attribute."""
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual(21, state.attributes.get('temperature'))
-        climate.set_temperature(self.hass, None, ENTITY_CLIMATE)
+        common.set_temperature(self.hass, None, ENTITY_CLIMATE)
         self.hass.block_till_done()
         self.assertEqual(21, state.attributes.get('temperature'))
 
@@ -64,7 +65,7 @@ class TestDemoClimate(unittest.TestCase):
         """Test the setting of the target temperature."""
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual(21, state.attributes.get('temperature'))
-        climate.set_temperature(self.hass, 30, ENTITY_CLIMATE)
+        common.set_temperature(self.hass, 30, ENTITY_CLIMATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual(30.0, state.attributes.get('temperature'))
@@ -73,7 +74,7 @@ class TestDemoClimate(unittest.TestCase):
         """Test the setting of the target temperature."""
         state = self.hass.states.get(ENTITY_HEATPUMP)
         self.assertEqual(20, state.attributes.get('temperature'))
-        climate.set_temperature(self.hass, 21, ENTITY_HEATPUMP)
+        common.set_temperature(self.hass, 21, ENTITY_HEATPUMP)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_HEATPUMP)
         self.assertEqual(21.0, state.attributes.get('temperature'))
@@ -84,8 +85,8 @@ class TestDemoClimate(unittest.TestCase):
         self.assertEqual(None, state.attributes.get('temperature'))
         self.assertEqual(21.0, state.attributes.get('target_temp_low'))
         self.assertEqual(24.0, state.attributes.get('target_temp_high'))
-        climate.set_temperature(self.hass, target_temp_high=25,
-                                target_temp_low=20, entity_id=ENTITY_ECOBEE)
+        common.set_temperature(self.hass, target_temp_high=25,
+                               target_temp_low=20, entity_id=ENTITY_ECOBEE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_ECOBEE)
         self.assertEqual(None, state.attributes.get('temperature'))
@@ -98,9 +99,9 @@ class TestDemoClimate(unittest.TestCase):
         self.assertEqual(None, state.attributes.get('temperature'))
         self.assertEqual(21.0, state.attributes.get('target_temp_low'))
         self.assertEqual(24.0, state.attributes.get('target_temp_high'))
-        climate.set_temperature(self.hass, temperature=None,
-                                entity_id=ENTITY_ECOBEE, target_temp_low=None,
-                                target_temp_high=None)
+        common.set_temperature(self.hass, temperature=None,
+                               entity_id=ENTITY_ECOBEE, target_temp_low=None,
+                               target_temp_high=None)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_ECOBEE)
         self.assertEqual(None, state.attributes.get('temperature'))
@@ -111,7 +112,7 @@ class TestDemoClimate(unittest.TestCase):
         """Test setting the target humidity without required attribute."""
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual(67, state.attributes.get('humidity'))
-        climate.set_humidity(self.hass, None, ENTITY_CLIMATE)
+        common.set_humidity(self.hass, None, ENTITY_CLIMATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual(67, state.attributes.get('humidity'))
@@ -120,7 +121,7 @@ class TestDemoClimate(unittest.TestCase):
         """Test the setting of the target humidity."""
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual(67, state.attributes.get('humidity'))
-        climate.set_humidity(self.hass, 64, ENTITY_CLIMATE)
+        common.set_humidity(self.hass, 64, ENTITY_CLIMATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual(64.0, state.attributes.get('humidity'))
@@ -129,7 +130,7 @@ class TestDemoClimate(unittest.TestCase):
         """Test setting fan mode without required attribute."""
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual("On High", state.attributes.get('fan_mode'))
-        climate.set_fan_mode(self.hass, None, ENTITY_CLIMATE)
+        common.set_fan_mode(self.hass, None, ENTITY_CLIMATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual("On High", state.attributes.get('fan_mode'))
@@ -138,7 +139,7 @@ class TestDemoClimate(unittest.TestCase):
         """Test setting of new fan mode."""
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual("On High", state.attributes.get('fan_mode'))
-        climate.set_fan_mode(self.hass, "On Low", ENTITY_CLIMATE)
+        common.set_fan_mode(self.hass, "On Low", ENTITY_CLIMATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual("On Low", state.attributes.get('fan_mode'))
@@ -147,7 +148,7 @@ class TestDemoClimate(unittest.TestCase):
         """Test setting swing mode without required attribute."""
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual("Off", state.attributes.get('swing_mode'))
-        climate.set_swing_mode(self.hass, None, ENTITY_CLIMATE)
+        common.set_swing_mode(self.hass, None, ENTITY_CLIMATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual("Off", state.attributes.get('swing_mode'))
@@ -156,7 +157,7 @@ class TestDemoClimate(unittest.TestCase):
         """Test setting of new swing mode."""
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual("Off", state.attributes.get('swing_mode'))
-        climate.set_swing_mode(self.hass, "Auto", ENTITY_CLIMATE)
+        common.set_swing_mode(self.hass, "Auto", ENTITY_CLIMATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual("Auto", state.attributes.get('swing_mode'))
@@ -169,7 +170,7 @@ class TestDemoClimate(unittest.TestCase):
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual("cool", state.attributes.get('operation_mode'))
         self.assertEqual("cool", state.state)
-        climate.set_operation_mode(self.hass, None, ENTITY_CLIMATE)
+        common.set_operation_mode(self.hass, None, ENTITY_CLIMATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual("cool", state.attributes.get('operation_mode'))
@@ -180,7 +181,7 @@ class TestDemoClimate(unittest.TestCase):
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual("cool", state.attributes.get('operation_mode'))
         self.assertEqual("cool", state.state)
-        climate.set_operation_mode(self.hass, "heat", ENTITY_CLIMATE)
+        common.set_operation_mode(self.hass, "heat", ENTITY_CLIMATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual("heat", state.attributes.get('operation_mode'))
@@ -190,41 +191,41 @@ class TestDemoClimate(unittest.TestCase):
         """Test setting the away mode without required attribute."""
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual('on', state.attributes.get('away_mode'))
-        climate.set_away_mode(self.hass, None, ENTITY_CLIMATE)
+        common.set_away_mode(self.hass, None, ENTITY_CLIMATE)
         self.hass.block_till_done()
         self.assertEqual('on', state.attributes.get('away_mode'))
 
     def test_set_away_mode_on(self):
         """Test setting the away mode on/true."""
-        climate.set_away_mode(self.hass, True, ENTITY_CLIMATE)
+        common.set_away_mode(self.hass, True, ENTITY_CLIMATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual('on', state.attributes.get('away_mode'))
 
     def test_set_away_mode_off(self):
         """Test setting the away mode off/false."""
-        climate.set_away_mode(self.hass, False, ENTITY_CLIMATE)
+        common.set_away_mode(self.hass, False, ENTITY_CLIMATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual('off', state.attributes.get('away_mode'))
 
     def test_set_hold_mode_home(self):
         """Test setting the hold mode home."""
-        climate.set_hold_mode(self.hass, 'home', ENTITY_ECOBEE)
+        common.set_hold_mode(self.hass, 'home', ENTITY_ECOBEE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_ECOBEE)
         self.assertEqual('home', state.attributes.get('hold_mode'))
 
     def test_set_hold_mode_away(self):
         """Test setting the hold mode away."""
-        climate.set_hold_mode(self.hass, 'away', ENTITY_ECOBEE)
+        common.set_hold_mode(self.hass, 'away', ENTITY_ECOBEE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_ECOBEE)
         self.assertEqual('away', state.attributes.get('hold_mode'))
 
     def test_set_hold_mode_none(self):
         """Test setting the hold mode off/false."""
-        climate.set_hold_mode(self.hass, 'off', ENTITY_ECOBEE)
+        common.set_hold_mode(self.hass, 'off', ENTITY_ECOBEE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_ECOBEE)
         self.assertEqual('off', state.attributes.get('hold_mode'))
@@ -233,20 +234,20 @@ class TestDemoClimate(unittest.TestCase):
         """Test setting the auxiliary heater without required attribute."""
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual('off', state.attributes.get('aux_heat'))
-        climate.set_aux_heat(self.hass, None, ENTITY_CLIMATE)
+        common.set_aux_heat(self.hass, None, ENTITY_CLIMATE)
         self.hass.block_till_done()
         self.assertEqual('off', state.attributes.get('aux_heat'))
 
     def test_set_aux_heat_on(self):
         """Test setting the axillary heater on/true."""
-        climate.set_aux_heat(self.hass, True, ENTITY_CLIMATE)
+        common.set_aux_heat(self.hass, True, ENTITY_CLIMATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual('on', state.attributes.get('aux_heat'))
 
     def test_set_aux_heat_off(self):
         """Test setting the auxiliary heater off/false."""
-        climate.set_aux_heat(self.hass, False, ENTITY_CLIMATE)
+        common.set_aux_heat(self.hass, False, ENTITY_CLIMATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual('off', state.attributes.get('aux_heat'))
diff --git a/tests/components/climate/test_generic_thermostat.py b/tests/components/climate/test_generic_thermostat.py
index c4e07705230..47ec621aeb5 100644
--- a/tests/components/climate/test_generic_thermostat.py
+++ b/tests/components/climate/test_generic_thermostat.py
@@ -25,6 +25,7 @@ from homeassistant.components.climate import STATE_HEAT, STATE_COOL
 import homeassistant.components as comps
 from tests.common import (assert_setup_component, get_test_home_assistant,
                           mock_restore_cache)
+from tests.components.climate import common
 
 
 ENTITY = 'climate.test'
@@ -108,7 +109,7 @@ class TestGenericThermostatHeaterSwitching(unittest.TestCase):
 
         self._setup_sensor(18)
         self.hass.block_till_done()
-        climate.set_temperature(self.hass, 23)
+        common.set_temperature(self.hass, 23)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ON,
@@ -135,7 +136,7 @@ class TestGenericThermostatHeaterSwitching(unittest.TestCase):
 
         self._setup_sensor(18)
         self.hass.block_till_done()
-        climate.set_temperature(self.hass, 23)
+        common.set_temperature(self.hass, 23)
         self.hass.block_till_done()
 
         self.assertEqual(STATE_ON,
@@ -186,20 +187,20 @@ class TestClimateGenericThermostat(unittest.TestCase):
 
     def test_set_target_temp(self):
         """Test the setting of the target temperature."""
-        climate.set_temperature(self.hass, 30)
+        common.set_temperature(self.hass, 30)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY)
         self.assertEqual(30.0, state.attributes.get('temperature'))
-        climate.set_temperature(self.hass, None)
+        common.set_temperature(self.hass, None)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY)
         self.assertEqual(30.0, state.attributes.get('temperature'))
 
     def test_set_away_mode(self):
         """Test the setting away mode."""
-        climate.set_temperature(self.hass, 23)
+        common.set_temperature(self.hass, 23)
         self.hass.block_till_done()
-        climate.set_away_mode(self.hass, True)
+        common.set_away_mode(self.hass, True)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY)
         self.assertEqual(16, state.attributes.get('temperature'))
@@ -209,13 +210,13 @@ class TestClimateGenericThermostat(unittest.TestCase):
 
         Verify original temperature is restored.
         """
-        climate.set_temperature(self.hass, 23)
+        common.set_temperature(self.hass, 23)
         self.hass.block_till_done()
-        climate.set_away_mode(self.hass, True)
+        common.set_away_mode(self.hass, True)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY)
         self.assertEqual(16, state.attributes.get('temperature'))
-        climate.set_away_mode(self.hass, False)
+        common.set_away_mode(self.hass, False)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY)
         self.assertEqual(23, state.attributes.get('temperature'))
@@ -236,7 +237,7 @@ class TestClimateGenericThermostat(unittest.TestCase):
         self._setup_switch(False)
         self._setup_sensor(25)
         self.hass.block_till_done()
-        climate.set_temperature(self.hass, 30)
+        common.set_temperature(self.hass, 30)
         self.hass.block_till_done()
         self.assertEqual(1, len(self.calls))
         call = self.calls[0]
@@ -249,7 +250,7 @@ class TestClimateGenericThermostat(unittest.TestCase):
         self._setup_switch(True)
         self._setup_sensor(30)
         self.hass.block_till_done()
-        climate.set_temperature(self.hass, 25)
+        common.set_temperature(self.hass, 25)
         self.hass.block_till_done()
         self.assertEqual(2, len(self.calls))
         call = self.calls[0]
@@ -260,7 +261,7 @@ class TestClimateGenericThermostat(unittest.TestCase):
     def test_temp_change_heater_on_within_tolerance(self):
         """Test if temperature change doesn't turn on within tolerance."""
         self._setup_switch(False)
-        climate.set_temperature(self.hass, 30)
+        common.set_temperature(self.hass, 30)
         self.hass.block_till_done()
         self._setup_sensor(29)
         self.hass.block_till_done()
@@ -269,7 +270,7 @@ class TestClimateGenericThermostat(unittest.TestCase):
     def test_temp_change_heater_on_outside_tolerance(self):
         """Test if temperature change turn heater on outside cold tolerance."""
         self._setup_switch(False)
-        climate.set_temperature(self.hass, 30)
+        common.set_temperature(self.hass, 30)
         self.hass.block_till_done()
         self._setup_sensor(27)
         self.hass.block_till_done()
@@ -282,7 +283,7 @@ class TestClimateGenericThermostat(unittest.TestCase):
     def test_temp_change_heater_off_within_tolerance(self):
         """Test if temperature change doesn't turn off within tolerance."""
         self._setup_switch(True)
-        climate.set_temperature(self.hass, 30)
+        common.set_temperature(self.hass, 30)
         self.hass.block_till_done()
         self._setup_sensor(33)
         self.hass.block_till_done()
@@ -291,7 +292,7 @@ class TestClimateGenericThermostat(unittest.TestCase):
     def test_temp_change_heater_off_outside_tolerance(self):
         """Test if temperature change turn heater off outside hot tolerance."""
         self._setup_switch(True)
-        climate.set_temperature(self.hass, 30)
+        common.set_temperature(self.hass, 30)
         self.hass.block_till_done()
         self._setup_sensor(35)
         self.hass.block_till_done()
@@ -304,9 +305,9 @@ class TestClimateGenericThermostat(unittest.TestCase):
     def test_running_when_operating_mode_is_off(self):
         """Test that the switch turns off when enabled is set False."""
         self._setup_switch(True)
-        climate.set_temperature(self.hass, 30)
+        common.set_temperature(self.hass, 30)
         self.hass.block_till_done()
-        climate.set_operation_mode(self.hass, STATE_OFF)
+        common.set_operation_mode(self.hass, STATE_OFF)
         self.hass.block_till_done()
         self.assertEqual(1, len(self.calls))
         call = self.calls[0]
@@ -317,9 +318,9 @@ class TestClimateGenericThermostat(unittest.TestCase):
     def test_no_state_change_when_operation_mode_off(self):
         """Test that the switch doesn't turn on when enabled is False."""
         self._setup_switch(False)
-        climate.set_temperature(self.hass, 30)
+        common.set_temperature(self.hass, 30)
         self.hass.block_till_done()
-        climate.set_operation_mode(self.hass, STATE_OFF)
+        common.set_operation_mode(self.hass, STATE_OFF)
         self.hass.block_till_done()
         self._setup_sensor(25)
         self.hass.block_till_done()
@@ -328,7 +329,7 @@ class TestClimateGenericThermostat(unittest.TestCase):
     @mock.patch('logging.Logger.error')
     def test_invalid_operating_mode(self, log_mock):
         """Test error handling for invalid operation mode."""
-        climate.set_operation_mode(self.hass, 'invalid mode')
+        common.set_operation_mode(self.hass, 'invalid mode')
         self.hass.block_till_done()
         self.assertEqual(log_mock.call_count, 1)
 
@@ -337,12 +338,12 @@ class TestClimateGenericThermostat(unittest.TestCase):
 
         Switch turns on when temp below setpoint and mode changes.
         """
-        climate.set_operation_mode(self.hass, STATE_OFF)
-        climate.set_temperature(self.hass, 30)
+        common.set_operation_mode(self.hass, STATE_OFF)
+        common.set_temperature(self.hass, 30)
         self._setup_sensor(25)
         self.hass.block_till_done()
         self._setup_switch(False)
-        climate.set_operation_mode(self.hass, climate.STATE_HEAT)
+        common.set_operation_mode(self.hass, climate.STATE_HEAT)
         self.hass.block_till_done()
         self.assertEqual(1, len(self.calls))
         call = self.calls[0]
@@ -395,7 +396,7 @@ class TestClimateGenericThermostatACMode(unittest.TestCase):
         self._setup_switch(True)
         self._setup_sensor(25)
         self.hass.block_till_done()
-        climate.set_temperature(self.hass, 30)
+        common.set_temperature(self.hass, 30)
         self.hass.block_till_done()
         self.assertEqual(2, len(self.calls))
         call = self.calls[0]
@@ -407,9 +408,9 @@ class TestClimateGenericThermostatACMode(unittest.TestCase):
         """Test the setting away mode when cooling."""
         self._setup_sensor(25)
         self.hass.block_till_done()
-        climate.set_temperature(self.hass, 19)
+        common.set_temperature(self.hass, 19)
         self.hass.block_till_done()
-        climate.set_away_mode(self.hass, True)
+        common.set_away_mode(self.hass, True)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY)
         self.assertEqual(30, state.attributes.get('temperature'))
@@ -419,12 +420,12 @@ class TestClimateGenericThermostatACMode(unittest.TestCase):
 
         Switch turns on when temp below setpoint and mode changes.
         """
-        climate.set_operation_mode(self.hass, STATE_OFF)
-        climate.set_temperature(self.hass, 25)
+        common.set_operation_mode(self.hass, STATE_OFF)
+        common.set_temperature(self.hass, 25)
         self._setup_sensor(30)
         self.hass.block_till_done()
         self._setup_switch(False)
-        climate.set_operation_mode(self.hass, climate.STATE_COOL)
+        common.set_operation_mode(self.hass, climate.STATE_COOL)
         self.hass.block_till_done()
         self.assertEqual(1, len(self.calls))
         call = self.calls[0]
@@ -437,7 +438,7 @@ class TestClimateGenericThermostatACMode(unittest.TestCase):
         self._setup_switch(False)
         self._setup_sensor(30)
         self.hass.block_till_done()
-        climate.set_temperature(self.hass, 25)
+        common.set_temperature(self.hass, 25)
         self.hass.block_till_done()
         self.assertEqual(1, len(self.calls))
         call = self.calls[0]
@@ -448,7 +449,7 @@ class TestClimateGenericThermostatACMode(unittest.TestCase):
     def test_temp_change_ac_off_within_tolerance(self):
         """Test if temperature change doesn't turn ac off within tolerance."""
         self._setup_switch(True)
-        climate.set_temperature(self.hass, 30)
+        common.set_temperature(self.hass, 30)
         self.hass.block_till_done()
         self._setup_sensor(29.8)
         self.hass.block_till_done()
@@ -457,7 +458,7 @@ class TestClimateGenericThermostatACMode(unittest.TestCase):
     def test_set_temp_change_ac_off_outside_tolerance(self):
         """Test if temperature change turn ac off."""
         self._setup_switch(True)
-        climate.set_temperature(self.hass, 30)
+        common.set_temperature(self.hass, 30)
         self.hass.block_till_done()
         self._setup_sensor(27)
         self.hass.block_till_done()
@@ -470,7 +471,7 @@ class TestClimateGenericThermostatACMode(unittest.TestCase):
     def test_temp_change_ac_on_within_tolerance(self):
         """Test if temperature change doesn't turn ac on within tolerance."""
         self._setup_switch(False)
-        climate.set_temperature(self.hass, 25)
+        common.set_temperature(self.hass, 25)
         self.hass.block_till_done()
         self._setup_sensor(25.2)
         self.hass.block_till_done()
@@ -479,7 +480,7 @@ class TestClimateGenericThermostatACMode(unittest.TestCase):
     def test_temp_change_ac_on_outside_tolerance(self):
         """Test if temperature change turn ac on."""
         self._setup_switch(False)
-        climate.set_temperature(self.hass, 25)
+        common.set_temperature(self.hass, 25)
         self.hass.block_till_done()
         self._setup_sensor(30)
         self.hass.block_till_done()
@@ -492,9 +493,9 @@ class TestClimateGenericThermostatACMode(unittest.TestCase):
     def test_running_when_operating_mode_is_off(self):
         """Test that the switch turns off when enabled is set False."""
         self._setup_switch(True)
-        climate.set_temperature(self.hass, 30)
+        common.set_temperature(self.hass, 30)
         self.hass.block_till_done()
-        climate.set_operation_mode(self.hass, STATE_OFF)
+        common.set_operation_mode(self.hass, STATE_OFF)
         self.hass.block_till_done()
         self.assertEqual(1, len(self.calls))
         call = self.calls[0]
@@ -505,9 +506,9 @@ class TestClimateGenericThermostatACMode(unittest.TestCase):
     def test_no_state_change_when_operation_mode_off(self):
         """Test that the switch doesn't turn on when enabled is False."""
         self._setup_switch(False)
-        climate.set_temperature(self.hass, 30)
+        common.set_temperature(self.hass, 30)
         self.hass.block_till_done()
-        climate.set_operation_mode(self.hass, STATE_OFF)
+        common.set_operation_mode(self.hass, STATE_OFF)
         self.hass.block_till_done()
         self._setup_sensor(35)
         self.hass.block_till_done()
@@ -556,7 +557,7 @@ class TestClimateGenericThermostatACModeMinCycle(unittest.TestCase):
     def test_temp_change_ac_trigger_on_not_long_enough(self):
         """Test if temperature change turn ac on."""
         self._setup_switch(False)
-        climate.set_temperature(self.hass, 25)
+        common.set_temperature(self.hass, 25)
         self.hass.block_till_done()
         self._setup_sensor(30)
         self.hass.block_till_done()
@@ -569,7 +570,7 @@ class TestClimateGenericThermostatACModeMinCycle(unittest.TestCase):
         with mock.patch('homeassistant.helpers.condition.dt_util.utcnow',
                         return_value=fake_changed):
             self._setup_switch(False)
-        climate.set_temperature(self.hass, 25)
+        common.set_temperature(self.hass, 25)
         self.hass.block_till_done()
         self._setup_sensor(30)
         self.hass.block_till_done()
@@ -582,7 +583,7 @@ class TestClimateGenericThermostatACModeMinCycle(unittest.TestCase):
     def test_temp_change_ac_trigger_off_not_long_enough(self):
         """Test if temperature change turn ac on."""
         self._setup_switch(True)
-        climate.set_temperature(self.hass, 30)
+        common.set_temperature(self.hass, 30)
         self.hass.block_till_done()
         self._setup_sensor(25)
         self.hass.block_till_done()
@@ -595,7 +596,7 @@ class TestClimateGenericThermostatACModeMinCycle(unittest.TestCase):
         with mock.patch('homeassistant.helpers.condition.dt_util.utcnow',
                         return_value=fake_changed):
             self._setup_switch(True)
-        climate.set_temperature(self.hass, 30)
+        common.set_temperature(self.hass, 30)
         self.hass.block_till_done()
         self._setup_sensor(25)
         self.hass.block_till_done()
@@ -647,7 +648,7 @@ class TestClimateGenericThermostatMinCycle(unittest.TestCase):
     def test_temp_change_heater_trigger_off_not_long_enough(self):
         """Test if temp change doesn't turn heater off because of time."""
         self._setup_switch(True)
-        climate.set_temperature(self.hass, 25)
+        common.set_temperature(self.hass, 25)
         self.hass.block_till_done()
         self._setup_sensor(30)
         self.hass.block_till_done()
@@ -656,7 +657,7 @@ class TestClimateGenericThermostatMinCycle(unittest.TestCase):
     def test_temp_change_heater_trigger_on_not_long_enough(self):
         """Test if temp change doesn't turn heater on because of time."""
         self._setup_switch(False)
-        climate.set_temperature(self.hass, 30)
+        common.set_temperature(self.hass, 30)
         self.hass.block_till_done()
         self._setup_sensor(25)
         self.hass.block_till_done()
@@ -669,7 +670,7 @@ class TestClimateGenericThermostatMinCycle(unittest.TestCase):
         with mock.patch('homeassistant.helpers.condition.dt_util.utcnow',
                         return_value=fake_changed):
             self._setup_switch(False)
-        climate.set_temperature(self.hass, 30)
+        common.set_temperature(self.hass, 30)
         self.hass.block_till_done()
         self._setup_sensor(25)
         self.hass.block_till_done()
@@ -686,7 +687,7 @@ class TestClimateGenericThermostatMinCycle(unittest.TestCase):
         with mock.patch('homeassistant.helpers.condition.dt_util.utcnow',
                         return_value=fake_changed):
             self._setup_switch(True)
-        climate.set_temperature(self.hass, 25)
+        common.set_temperature(self.hass, 25)
         self.hass.block_till_done()
         self._setup_sensor(30)
         self.hass.block_till_done()
@@ -743,7 +744,7 @@ class TestClimateGenericThermostatACKeepAlive(unittest.TestCase):
         self.hass.block_till_done()
         self._setup_sensor(30)
         self.hass.block_till_done()
-        climate.set_temperature(self.hass, 25)
+        common.set_temperature(self.hass, 25)
         self.hass.block_till_done()
         test_time = datetime.datetime.now(pytz.UTC)
         self._send_time_changed(test_time)
@@ -766,7 +767,7 @@ class TestClimateGenericThermostatACKeepAlive(unittest.TestCase):
         self.hass.block_till_done()
         self._setup_sensor(20)
         self.hass.block_till_done()
-        climate.set_temperature(self.hass, 25)
+        common.set_temperature(self.hass, 25)
         self.hass.block_till_done()
         test_time = datetime.datetime.now(pytz.UTC)
         self._send_time_changed(test_time)
@@ -833,7 +834,7 @@ class TestClimateGenericThermostatKeepAlive(unittest.TestCase):
         self.hass.block_till_done()
         self._setup_sensor(20)
         self.hass.block_till_done()
-        climate.set_temperature(self.hass, 25)
+        common.set_temperature(self.hass, 25)
         self.hass.block_till_done()
         test_time = datetime.datetime.now(pytz.UTC)
         self._send_time_changed(test_time)
@@ -856,7 +857,7 @@ class TestClimateGenericThermostatKeepAlive(unittest.TestCase):
         self.hass.block_till_done()
         self._setup_sensor(30)
         self.hass.block_till_done()
-        climate.set_temperature(self.hass, 25)
+        common.set_temperature(self.hass, 25)
         self.hass.block_till_done()
         test_time = datetime.datetime.now(pytz.UTC)
         self._send_time_changed(test_time)
@@ -926,7 +927,7 @@ class TestClimateGenericThermostatTurnOnOff(unittest.TestCase):
 
     def test_turn_on_when_off(self):
         """Test if climate.turn_on turns on a turned off device."""
-        climate.set_operation_mode(self.hass, STATE_OFF)
+        common.set_operation_mode(self.hass, STATE_OFF)
         self.hass.block_till_done()
         self.hass.services.call('climate', SERVICE_TURN_ON)
         self.hass.block_till_done()
@@ -939,8 +940,8 @@ class TestClimateGenericThermostatTurnOnOff(unittest.TestCase):
 
     def test_turn_on_when_on(self):
         """Test if climate.turn_on does nothing to a turned on device."""
-        climate.set_operation_mode(self.hass, STATE_HEAT, self.HEAT_ENTITY)
-        climate.set_operation_mode(self.hass, STATE_COOL, self.COOL_ENTITY)
+        common.set_operation_mode(self.hass, STATE_HEAT, self.HEAT_ENTITY)
+        common.set_operation_mode(self.hass, STATE_COOL, self.COOL_ENTITY)
         self.hass.block_till_done()
         self.hass.services.call('climate', SERVICE_TURN_ON)
         self.hass.block_till_done()
@@ -953,8 +954,8 @@ class TestClimateGenericThermostatTurnOnOff(unittest.TestCase):
 
     def test_turn_off_when_on(self):
         """Test if climate.turn_off turns off a turned on device."""
-        climate.set_operation_mode(self.hass, STATE_HEAT, self.HEAT_ENTITY)
-        climate.set_operation_mode(self.hass, STATE_COOL, self.COOL_ENTITY)
+        common.set_operation_mode(self.hass, STATE_HEAT, self.HEAT_ENTITY)
+        common.set_operation_mode(self.hass, STATE_COOL, self.COOL_ENTITY)
         self.hass.block_till_done()
         self.hass.services.call('climate', SERVICE_TURN_OFF)
         self.hass.block_till_done()
@@ -967,7 +968,7 @@ class TestClimateGenericThermostatTurnOnOff(unittest.TestCase):
 
     def test_turn_off_when_off(self):
         """Test if climate.turn_off does nothing to a turned off device."""
-        climate.set_operation_mode(self.hass, STATE_OFF)
+        common.set_operation_mode(self.hass, STATE_OFF)
         self.hass.block_till_done()
         self.hass.services.call('climate', SERVICE_TURN_OFF)
         self.hass.block_till_done()
diff --git a/tests/components/climate/test_mqtt.py b/tests/components/climate/test_mqtt.py
index 6c43c4d9dbe..1fdf72e34ba 100644
--- a/tests/components/climate/test_mqtt.py
+++ b/tests/components/climate/test_mqtt.py
@@ -16,6 +16,7 @@ from homeassistant.components.mqtt.discovery import async_start
 from tests.common import (get_test_home_assistant, mock_mqtt_component,
                           async_fire_mqtt_message, fire_mqtt_message,
                           mock_component)
+from tests.components.climate import common
 
 ENTITY_CLIMATE = 'climate.test'
 
@@ -90,7 +91,7 @@ class TestMQTTClimate(unittest.TestCase):
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual("off", state.attributes.get('operation_mode'))
         self.assertEqual("off", state.state)
-        climate.set_operation_mode(self.hass, None, ENTITY_CLIMATE)
+        common.set_operation_mode(self.hass, None, ENTITY_CLIMATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual("off", state.attributes.get('operation_mode'))
@@ -103,7 +104,7 @@ class TestMQTTClimate(unittest.TestCase):
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual("off", state.attributes.get('operation_mode'))
         self.assertEqual("off", state.state)
-        climate.set_operation_mode(self.hass, "cool", ENTITY_CLIMATE)
+        common.set_operation_mode(self.hass, "cool", ENTITY_CLIMATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual("cool", state.attributes.get('operation_mode'))
@@ -121,7 +122,7 @@ class TestMQTTClimate(unittest.TestCase):
         self.assertEqual("off", state.attributes.get('operation_mode'))
         self.assertEqual("off", state.state)
 
-        climate.set_operation_mode(self.hass, "cool", ENTITY_CLIMATE)
+        common.set_operation_mode(self.hass, "cool", ENTITY_CLIMATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual("off", state.attributes.get('operation_mode'))
@@ -148,7 +149,7 @@ class TestMQTTClimate(unittest.TestCase):
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual("off", state.attributes.get('operation_mode'))
         self.assertEqual("off", state.state)
-        climate.set_operation_mode(self.hass, "on", ENTITY_CLIMATE)
+        common.set_operation_mode(self.hass, "on", ENTITY_CLIMATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual("on", state.attributes.get('operation_mode'))
@@ -159,7 +160,7 @@ class TestMQTTClimate(unittest.TestCase):
         ])
         self.mock_publish.async_publish.reset_mock()
 
-        climate.set_operation_mode(self.hass, "off", ENTITY_CLIMATE)
+        common.set_operation_mode(self.hass, "off", ENTITY_CLIMATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual("off", state.attributes.get('operation_mode'))
@@ -176,7 +177,7 @@ class TestMQTTClimate(unittest.TestCase):
 
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual("low", state.attributes.get('fan_mode'))
-        climate.set_fan_mode(self.hass, None, ENTITY_CLIMATE)
+        common.set_fan_mode(self.hass, None, ENTITY_CLIMATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual("low", state.attributes.get('fan_mode'))
@@ -190,7 +191,7 @@ class TestMQTTClimate(unittest.TestCase):
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual("low", state.attributes.get('fan_mode'))
 
-        climate.set_fan_mode(self.hass, 'high', ENTITY_CLIMATE)
+        common.set_fan_mode(self.hass, 'high', ENTITY_CLIMATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual("low", state.attributes.get('fan_mode'))
@@ -211,7 +212,7 @@ class TestMQTTClimate(unittest.TestCase):
 
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual("low", state.attributes.get('fan_mode'))
-        climate.set_fan_mode(self.hass, 'high', ENTITY_CLIMATE)
+        common.set_fan_mode(self.hass, 'high', ENTITY_CLIMATE)
         self.hass.block_till_done()
         self.mock_publish.async_publish.assert_called_once_with(
             'fan-mode-topic', 'high', 0, False)
@@ -224,7 +225,7 @@ class TestMQTTClimate(unittest.TestCase):
 
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual("off", state.attributes.get('swing_mode'))
-        climate.set_swing_mode(self.hass, None, ENTITY_CLIMATE)
+        common.set_swing_mode(self.hass, None, ENTITY_CLIMATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual("off", state.attributes.get('swing_mode'))
@@ -238,7 +239,7 @@ class TestMQTTClimate(unittest.TestCase):
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual("off", state.attributes.get('swing_mode'))
 
-        climate.set_swing_mode(self.hass, 'on', ENTITY_CLIMATE)
+        common.set_swing_mode(self.hass, 'on', ENTITY_CLIMATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual("off", state.attributes.get('swing_mode'))
@@ -259,7 +260,7 @@ class TestMQTTClimate(unittest.TestCase):
 
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual("off", state.attributes.get('swing_mode'))
-        climate.set_swing_mode(self.hass, 'on', ENTITY_CLIMATE)
+        common.set_swing_mode(self.hass, 'on', ENTITY_CLIMATE)
         self.hass.block_till_done()
         self.mock_publish.async_publish.assert_called_once_with(
             'swing-mode-topic', 'on', 0, False)
@@ -272,15 +273,15 @@ class TestMQTTClimate(unittest.TestCase):
 
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual(21, state.attributes.get('temperature'))
-        climate.set_operation_mode(self.hass, 'heat', ENTITY_CLIMATE)
+        common.set_operation_mode(self.hass, 'heat', ENTITY_CLIMATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual('heat', state.attributes.get('operation_mode'))
         self.mock_publish.async_publish.assert_called_once_with(
             'mode-topic', 'heat', 0, False)
         self.mock_publish.async_publish.reset_mock()
-        climate.set_temperature(self.hass, temperature=47,
-                                entity_id=ENTITY_CLIMATE)
+        common.set_temperature(self.hass, temperature=47,
+                               entity_id=ENTITY_CLIMATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual(47, state.attributes.get('temperature'))
@@ -289,9 +290,9 @@ class TestMQTTClimate(unittest.TestCase):
 
         # also test directly supplying the operation mode to set_temperature
         self.mock_publish.async_publish.reset_mock()
-        climate.set_temperature(self.hass, temperature=21,
-                                operation_mode="cool",
-                                entity_id=ENTITY_CLIMATE)
+        common.set_temperature(self.hass, temperature=21,
+                               operation_mode="cool",
+                               entity_id=ENTITY_CLIMATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual('cool', state.attributes.get('operation_mode'))
@@ -310,10 +311,10 @@ class TestMQTTClimate(unittest.TestCase):
 
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual(21, state.attributes.get('temperature'))
-        climate.set_operation_mode(self.hass, 'heat', ENTITY_CLIMATE)
+        common.set_operation_mode(self.hass, 'heat', ENTITY_CLIMATE)
         self.hass.block_till_done()
-        climate.set_temperature(self.hass, temperature=47,
-                                entity_id=ENTITY_CLIMATE)
+        common.set_temperature(self.hass, temperature=47,
+                               entity_id=ENTITY_CLIMATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual(21, state.attributes.get('temperature'))
@@ -349,7 +350,7 @@ class TestMQTTClimate(unittest.TestCase):
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual('off', state.attributes.get('away_mode'))
 
-        climate.set_away_mode(self.hass, True, ENTITY_CLIMATE)
+        common.set_away_mode(self.hass, True, ENTITY_CLIMATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual('off', state.attributes.get('away_mode'))
@@ -379,7 +380,7 @@ class TestMQTTClimate(unittest.TestCase):
 
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual('off', state.attributes.get('away_mode'))
-        climate.set_away_mode(self.hass, True, ENTITY_CLIMATE)
+        common.set_away_mode(self.hass, True, ENTITY_CLIMATE)
         self.hass.block_till_done()
         self.mock_publish.async_publish.assert_called_once_with(
             'away-mode-topic', 'AN', 0, False)
@@ -387,7 +388,7 @@ class TestMQTTClimate(unittest.TestCase):
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual('on', state.attributes.get('away_mode'))
 
-        climate.set_away_mode(self.hass, False, ENTITY_CLIMATE)
+        common.set_away_mode(self.hass, False, ENTITY_CLIMATE)
         self.hass.block_till_done()
         self.mock_publish.async_publish.assert_called_once_with(
             'away-mode-topic', 'AUS', 0, False)
@@ -403,7 +404,7 @@ class TestMQTTClimate(unittest.TestCase):
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual(None, state.attributes.get('hold_mode'))
 
-        climate.set_hold_mode(self.hass, 'on', ENTITY_CLIMATE)
+        common.set_hold_mode(self.hass, 'on', ENTITY_CLIMATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual(None, state.attributes.get('hold_mode'))
@@ -424,7 +425,7 @@ class TestMQTTClimate(unittest.TestCase):
 
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual(None, state.attributes.get('hold_mode'))
-        climate.set_hold_mode(self.hass, 'on', ENTITY_CLIMATE)
+        common.set_hold_mode(self.hass, 'on', ENTITY_CLIMATE)
         self.hass.block_till_done()
         self.mock_publish.async_publish.assert_called_once_with(
             'hold-topic', 'on', 0, False)
@@ -432,7 +433,7 @@ class TestMQTTClimate(unittest.TestCase):
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual('on', state.attributes.get('hold_mode'))
 
-        climate.set_hold_mode(self.hass, 'off', ENTITY_CLIMATE)
+        common.set_hold_mode(self.hass, 'off', ENTITY_CLIMATE)
         self.hass.block_till_done()
         self.mock_publish.async_publish.assert_called_once_with(
             'hold-topic', 'off', 0, False)
@@ -448,7 +449,7 @@ class TestMQTTClimate(unittest.TestCase):
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual('off', state.attributes.get('aux_heat'))
 
-        climate.set_aux_heat(self.hass, True, ENTITY_CLIMATE)
+        common.set_aux_heat(self.hass, True, ENTITY_CLIMATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual('off', state.attributes.get('aux_heat'))
@@ -474,7 +475,7 @@ class TestMQTTClimate(unittest.TestCase):
 
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual('off', state.attributes.get('aux_heat'))
-        climate.set_aux_heat(self.hass, True, ENTITY_CLIMATE)
+        common.set_aux_heat(self.hass, True, ENTITY_CLIMATE)
         self.hass.block_till_done()
         self.mock_publish.async_publish.assert_called_once_with(
             'aux-topic', 'ON', 0, False)
@@ -482,7 +483,7 @@ class TestMQTTClimate(unittest.TestCase):
         state = self.hass.states.get(ENTITY_CLIMATE)
         self.assertEqual('on', state.attributes.get('aux_heat'))
 
-        climate.set_aux_heat(self.hass, False, ENTITY_CLIMATE)
+        common.set_aux_heat(self.hass, False, ENTITY_CLIMATE)
         self.hass.block_till_done()
         self.mock_publish.async_publish.assert_called_once_with(
             'aux-topic', 'OFF', 0, False)
diff --git a/tests/components/counter/common.py b/tests/components/counter/common.py
new file mode 100644
index 00000000000..36d09979d0d
--- /dev/null
+++ b/tests/components/counter/common.py
@@ -0,0 +1,52 @@
+"""Collection of helper methods.
+
+All containing methods are legacy helpers that should not be used by new
+components. Instead call the service directly.
+"""
+from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.components.counter import (
+    DOMAIN, SERVICE_DECREMENT, SERVICE_INCREMENT, SERVICE_RESET)
+from homeassistant.core import callback
+from homeassistant.loader import bind_hass
+
+
+@bind_hass
+def increment(hass, entity_id):
+    """Increment a counter."""
+    hass.add_job(async_increment, hass, entity_id)
+
+
+@callback
+@bind_hass
+def async_increment(hass, entity_id):
+    """Increment a counter."""
+    hass.async_add_job(hass.services.async_call(
+        DOMAIN, SERVICE_INCREMENT, {ATTR_ENTITY_ID: entity_id}))
+
+
+@bind_hass
+def decrement(hass, entity_id):
+    """Decrement a counter."""
+    hass.add_job(async_decrement, hass, entity_id)
+
+
+@callback
+@bind_hass
+def async_decrement(hass, entity_id):
+    """Decrement a counter."""
+    hass.async_add_job(hass.services.async_call(
+        DOMAIN, SERVICE_DECREMENT, {ATTR_ENTITY_ID: entity_id}))
+
+
+@bind_hass
+def reset(hass, entity_id):
+    """Reset a counter."""
+    hass.add_job(async_reset, hass, entity_id)
+
+
+@callback
+@bind_hass
+def async_reset(hass, entity_id):
+    """Reset a counter."""
+    hass.async_add_job(hass.services.async_call(
+        DOMAIN, SERVICE_RESET, {ATTR_ENTITY_ID: entity_id}))
diff --git a/tests/components/counter/test_init.py b/tests/components/counter/test_init.py
index af36c1c8f95..e5e0ee594ac 100644
--- a/tests/components/counter/test_init.py
+++ b/tests/components/counter/test_init.py
@@ -7,11 +7,11 @@ import logging
 from homeassistant.core import CoreState, State, Context
 from homeassistant.setup import setup_component, async_setup_component
 from homeassistant.components.counter import (
-    DOMAIN, decrement, increment, reset, CONF_INITIAL, CONF_STEP, CONF_NAME,
-    CONF_ICON)
+    DOMAIN, CONF_INITIAL, CONF_STEP, CONF_NAME, CONF_ICON)
 from homeassistant.const import (ATTR_ICON, ATTR_FRIENDLY_NAME)
 
 from tests.common import (get_test_home_assistant, mock_restore_cache)
+from tests.components.counter.common import decrement, increment, reset
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/tests/components/fan/common.py b/tests/components/fan/common.py
new file mode 100644
index 00000000000..d4caf28be5b
--- /dev/null
+++ b/tests/components/fan/common.py
@@ -0,0 +1,82 @@
+"""Collection of helper methods.
+
+All containing methods are legacy helpers that should not be used by new
+components. Instead call the service directly.
+"""
+from homeassistant.components.fan import (
+    ATTR_DIRECTION, ATTR_SPEED, ATTR_OSCILLATING, DOMAIN,
+    SERVICE_OSCILLATE, SERVICE_SET_DIRECTION, SERVICE_SET_SPEED)
+from homeassistant.const import (
+    ATTR_ENTITY_ID, SERVICE_TURN_ON, SERVICE_TOGGLE, SERVICE_TURN_OFF)
+from homeassistant.loader import bind_hass
+
+
+@bind_hass
+def turn_on(hass, entity_id: str = None, speed: str = None) -> None:
+    """Turn all or specified fan on."""
+    data = {
+        key: value for key, value in [
+            (ATTR_ENTITY_ID, entity_id),
+            (ATTR_SPEED, speed),
+        ] if value is not None
+    }
+
+    hass.services.call(DOMAIN, SERVICE_TURN_ON, data)
+
+
+@bind_hass
+def turn_off(hass, entity_id: str = None) -> None:
+    """Turn all or specified fan off."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
+
+    hass.services.call(DOMAIN, SERVICE_TURN_OFF, data)
+
+
+@bind_hass
+def toggle(hass, entity_id: str = None) -> None:
+    """Toggle all or specified fans."""
+    data = {
+        ATTR_ENTITY_ID: entity_id
+    }
+
+    hass.services.call(DOMAIN, SERVICE_TOGGLE, data)
+
+
+@bind_hass
+def oscillate(hass, entity_id: str = None,
+              should_oscillate: bool = True) -> None:
+    """Set oscillation on all or specified fan."""
+    data = {
+        key: value for key, value in [
+            (ATTR_ENTITY_ID, entity_id),
+            (ATTR_OSCILLATING, should_oscillate),
+        ] if value is not None
+    }
+
+    hass.services.call(DOMAIN, SERVICE_OSCILLATE, data)
+
+
+@bind_hass
+def set_speed(hass, entity_id: str = None, speed: str = None) -> None:
+    """Set speed for all or specified fan."""
+    data = {
+        key: value for key, value in [
+            (ATTR_ENTITY_ID, entity_id),
+            (ATTR_SPEED, speed),
+        ] if value is not None
+    }
+
+    hass.services.call(DOMAIN, SERVICE_SET_SPEED, data)
+
+
+@bind_hass
+def set_direction(hass, entity_id: str = None, direction: str = None) -> None:
+    """Set direction for all or specified fan."""
+    data = {
+        key: value for key, value in [
+            (ATTR_ENTITY_ID, entity_id),
+            (ATTR_DIRECTION, direction),
+        ] if value is not None
+    }
+
+    hass.services.call(DOMAIN, SERVICE_SET_DIRECTION, data)
diff --git a/tests/components/fan/test_demo.py b/tests/components/fan/test_demo.py
index 69680fb1cfd..48704ca4464 100644
--- a/tests/components/fan/test_demo.py
+++ b/tests/components/fan/test_demo.py
@@ -7,6 +7,7 @@ from homeassistant.components import fan
 from homeassistant.const import STATE_OFF, STATE_ON
 
 from tests.common import get_test_home_assistant
+from tests.components.fan import common
 
 FAN_ENTITY_ID = 'fan.living_room_fan'
 
@@ -34,11 +35,11 @@ class TestDemoFan(unittest.TestCase):
         """Test turning on the device."""
         self.assertEqual(STATE_OFF, self.get_entity().state)
 
-        fan.turn_on(self.hass, FAN_ENTITY_ID)
+        common.turn_on(self.hass, FAN_ENTITY_ID)
         self.hass.block_till_done()
         self.assertNotEqual(STATE_OFF, self.get_entity().state)
 
-        fan.turn_on(self.hass, FAN_ENTITY_ID, fan.SPEED_HIGH)
+        common.turn_on(self.hass, FAN_ENTITY_ID, fan.SPEED_HIGH)
         self.hass.block_till_done()
         self.assertEqual(STATE_ON, self.get_entity().state)
         self.assertEqual(fan.SPEED_HIGH,
@@ -48,11 +49,11 @@ class TestDemoFan(unittest.TestCase):
         """Test turning off the device."""
         self.assertEqual(STATE_OFF, self.get_entity().state)
 
-        fan.turn_on(self.hass, FAN_ENTITY_ID)
+        common.turn_on(self.hass, FAN_ENTITY_ID)
         self.hass.block_till_done()
         self.assertNotEqual(STATE_OFF, self.get_entity().state)
 
-        fan.turn_off(self.hass, FAN_ENTITY_ID)
+        common.turn_off(self.hass, FAN_ENTITY_ID)
         self.hass.block_till_done()
         self.assertEqual(STATE_OFF, self.get_entity().state)
 
@@ -60,11 +61,11 @@ class TestDemoFan(unittest.TestCase):
         """Test turning off all fans."""
         self.assertEqual(STATE_OFF, self.get_entity().state)
 
-        fan.turn_on(self.hass, FAN_ENTITY_ID)
+        common.turn_on(self.hass, FAN_ENTITY_ID)
         self.hass.block_till_done()
         self.assertNotEqual(STATE_OFF, self.get_entity().state)
 
-        fan.turn_off(self.hass)
+        common.turn_off(self.hass)
         self.hass.block_till_done()
         self.assertEqual(STATE_OFF, self.get_entity().state)
 
@@ -72,7 +73,7 @@ class TestDemoFan(unittest.TestCase):
         """Test setting the direction of the device."""
         self.assertEqual(STATE_OFF, self.get_entity().state)
 
-        fan.set_direction(self.hass, FAN_ENTITY_ID, fan.DIRECTION_REVERSE)
+        common.set_direction(self.hass, FAN_ENTITY_ID, fan.DIRECTION_REVERSE)
         self.hass.block_till_done()
         self.assertEqual(fan.DIRECTION_REVERSE,
                          self.get_entity().attributes.get('direction'))
@@ -81,7 +82,7 @@ class TestDemoFan(unittest.TestCase):
         """Test setting the speed of the device."""
         self.assertEqual(STATE_OFF, self.get_entity().state)
 
-        fan.set_speed(self.hass, FAN_ENTITY_ID, fan.SPEED_LOW)
+        common.set_speed(self.hass, FAN_ENTITY_ID, fan.SPEED_LOW)
         self.hass.block_till_done()
         self.assertEqual(fan.SPEED_LOW,
                          self.get_entity().attributes.get('speed'))
@@ -90,11 +91,11 @@ class TestDemoFan(unittest.TestCase):
         """Test oscillating the fan."""
         self.assertFalse(self.get_entity().attributes.get('oscillating'))
 
-        fan.oscillate(self.hass, FAN_ENTITY_ID, True)
+        common.oscillate(self.hass, FAN_ENTITY_ID, True)
         self.hass.block_till_done()
         self.assertTrue(self.get_entity().attributes.get('oscillating'))
 
-        fan.oscillate(self.hass, FAN_ENTITY_ID, False)
+        common.oscillate(self.hass, FAN_ENTITY_ID, False)
         self.hass.block_till_done()
         self.assertFalse(self.get_entity().attributes.get('oscillating'))
 
@@ -102,6 +103,6 @@ class TestDemoFan(unittest.TestCase):
         """Test is on service call."""
         self.assertFalse(fan.is_on(self.hass, FAN_ENTITY_ID))
 
-        fan.turn_on(self.hass, FAN_ENTITY_ID)
+        common.turn_on(self.hass, FAN_ENTITY_ID)
         self.hass.block_till_done()
         self.assertTrue(fan.is_on(self.hass, FAN_ENTITY_ID))
diff --git a/tests/components/fan/test_template.py b/tests/components/fan/test_template.py
index e229083069d..09d3603e004 100644
--- a/tests/components/fan/test_template.py
+++ b/tests/components/fan/test_template.py
@@ -3,7 +3,6 @@ import logging
 
 from homeassistant.core import callback
 from homeassistant import setup
-import homeassistant.components as components
 from homeassistant.const import STATE_ON, STATE_OFF
 from homeassistant.components.fan import (
     ATTR_SPEED, ATTR_OSCILLATING, SPEED_LOW, SPEED_MEDIUM, SPEED_HIGH,
@@ -11,6 +10,8 @@ from homeassistant.components.fan import (
 
 from tests.common import (
     get_test_home_assistant, assert_setup_component)
+from tests.components.fan import common
+
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -288,7 +289,7 @@ class TestTemplateFan:
         self._register_components()
 
         # Turn on fan
-        components.fan.turn_on(self.hass, _TEST_FAN)
+        common.turn_on(self.hass, _TEST_FAN)
         self.hass.block_till_done()
 
         # verify
@@ -296,7 +297,7 @@ class TestTemplateFan:
         self._verify(STATE_ON, None, None, None)
 
         # Turn off fan
-        components.fan.turn_off(self.hass, _TEST_FAN)
+        common.turn_off(self.hass, _TEST_FAN)
         self.hass.block_till_done()
 
         # verify
@@ -308,7 +309,7 @@ class TestTemplateFan:
         self._register_components()
 
         # Turn on fan with high speed
-        components.fan.turn_on(self.hass, _TEST_FAN, SPEED_HIGH)
+        common.turn_on(self.hass, _TEST_FAN, SPEED_HIGH)
         self.hass.block_till_done()
 
         # verify
@@ -321,11 +322,11 @@ class TestTemplateFan:
         self._register_components()
 
         # Turn on fan
-        components.fan.turn_on(self.hass, _TEST_FAN)
+        common.turn_on(self.hass, _TEST_FAN)
         self.hass.block_till_done()
 
         # Set fan's speed to high
-        components.fan.set_speed(self.hass, _TEST_FAN, SPEED_HIGH)
+        common.set_speed(self.hass, _TEST_FAN, SPEED_HIGH)
         self.hass.block_till_done()
 
         # verify
@@ -333,7 +334,7 @@ class TestTemplateFan:
         self._verify(STATE_ON, SPEED_HIGH, None, None)
 
         # Set fan's speed to medium
-        components.fan.set_speed(self.hass, _TEST_FAN, SPEED_MEDIUM)
+        common.set_speed(self.hass, _TEST_FAN, SPEED_MEDIUM)
         self.hass.block_till_done()
 
         # verify
@@ -345,11 +346,11 @@ class TestTemplateFan:
         self._register_components()
 
         # Turn on fan
-        components.fan.turn_on(self.hass, _TEST_FAN)
+        common.turn_on(self.hass, _TEST_FAN)
         self.hass.block_till_done()
 
         # Set fan's speed to 'invalid'
-        components.fan.set_speed(self.hass, _TEST_FAN, 'invalid')
+        common.set_speed(self.hass, _TEST_FAN, 'invalid')
         self.hass.block_till_done()
 
         # verify speed is unchanged
@@ -361,11 +362,11 @@ class TestTemplateFan:
         self._register_components()
 
         # Turn on fan
-        components.fan.turn_on(self.hass, _TEST_FAN)
+        common.turn_on(self.hass, _TEST_FAN)
         self.hass.block_till_done()
 
         # Set fan's speed to high
-        components.fan.set_speed(self.hass, _TEST_FAN, SPEED_HIGH)
+        common.set_speed(self.hass, _TEST_FAN, SPEED_HIGH)
         self.hass.block_till_done()
 
         # verify
@@ -373,7 +374,7 @@ class TestTemplateFan:
         self._verify(STATE_ON, SPEED_HIGH, None, None)
 
         # Set fan's speed to 'invalid'
-        components.fan.set_speed(self.hass, _TEST_FAN, 'invalid')
+        common.set_speed(self.hass, _TEST_FAN, 'invalid')
         self.hass.block_till_done()
 
         # verify speed is unchanged
@@ -385,11 +386,11 @@ class TestTemplateFan:
         self._register_components(['1', '2', '3'])
 
         # Turn on fan
-        components.fan.turn_on(self.hass, _TEST_FAN)
+        common.turn_on(self.hass, _TEST_FAN)
         self.hass.block_till_done()
 
         # Set fan's speed to '1'
-        components.fan.set_speed(self.hass, _TEST_FAN, '1')
+        common.set_speed(self.hass, _TEST_FAN, '1')
         self.hass.block_till_done()
 
         # verify
@@ -397,7 +398,7 @@ class TestTemplateFan:
         self._verify(STATE_ON, '1', None, None)
 
         # Set fan's speed to 'medium' which is invalid
-        components.fan.set_speed(self.hass, _TEST_FAN, SPEED_MEDIUM)
+        common.set_speed(self.hass, _TEST_FAN, SPEED_MEDIUM)
         self.hass.block_till_done()
 
         # verify that speed is unchanged
@@ -409,11 +410,11 @@ class TestTemplateFan:
         self._register_components()
 
         # Turn on fan
-        components.fan.turn_on(self.hass, _TEST_FAN)
+        common.turn_on(self.hass, _TEST_FAN)
         self.hass.block_till_done()
 
         # Set fan's osc to True
-        components.fan.oscillate(self.hass, _TEST_FAN, True)
+        common.oscillate(self.hass, _TEST_FAN, True)
         self.hass.block_till_done()
 
         # verify
@@ -421,7 +422,7 @@ class TestTemplateFan:
         self._verify(STATE_ON, None, True, None)
 
         # Set fan's osc to False
-        components.fan.oscillate(self.hass, _TEST_FAN, False)
+        common.oscillate(self.hass, _TEST_FAN, False)
         self.hass.block_till_done()
 
         # verify
@@ -433,11 +434,11 @@ class TestTemplateFan:
         self._register_components()
 
         # Turn on fan
-        components.fan.turn_on(self.hass, _TEST_FAN)
+        common.turn_on(self.hass, _TEST_FAN)
         self.hass.block_till_done()
 
         # Set fan's osc to 'invalid'
-        components.fan.oscillate(self.hass, _TEST_FAN, 'invalid')
+        common.oscillate(self.hass, _TEST_FAN, 'invalid')
         self.hass.block_till_done()
 
         # verify
@@ -449,11 +450,11 @@ class TestTemplateFan:
         self._register_components()
 
         # Turn on fan
-        components.fan.turn_on(self.hass, _TEST_FAN)
+        common.turn_on(self.hass, _TEST_FAN)
         self.hass.block_till_done()
 
         # Set fan's osc to True
-        components.fan.oscillate(self.hass, _TEST_FAN, True)
+        common.oscillate(self.hass, _TEST_FAN, True)
         self.hass.block_till_done()
 
         # verify
@@ -461,7 +462,7 @@ class TestTemplateFan:
         self._verify(STATE_ON, None, True, None)
 
         # Set fan's osc to False
-        components.fan.oscillate(self.hass, _TEST_FAN, None)
+        common.oscillate(self.hass, _TEST_FAN, None)
         self.hass.block_till_done()
 
         # verify osc is unchanged
@@ -473,11 +474,11 @@ class TestTemplateFan:
         self._register_components()
 
         # Turn on fan
-        components.fan.turn_on(self.hass, _TEST_FAN)
+        common.turn_on(self.hass, _TEST_FAN)
         self.hass.block_till_done()
 
         # Set fan's direction to forward
-        components.fan.set_direction(self.hass, _TEST_FAN, DIRECTION_FORWARD)
+        common.set_direction(self.hass, _TEST_FAN, DIRECTION_FORWARD)
         self.hass.block_till_done()
 
         # verify
@@ -486,7 +487,7 @@ class TestTemplateFan:
         self._verify(STATE_ON, None, None, DIRECTION_FORWARD)
 
         # Set fan's direction to reverse
-        components.fan.set_direction(self.hass, _TEST_FAN, DIRECTION_REVERSE)
+        common.set_direction(self.hass, _TEST_FAN, DIRECTION_REVERSE)
         self.hass.block_till_done()
 
         # verify
@@ -499,11 +500,11 @@ class TestTemplateFan:
         self._register_components()
 
         # Turn on fan
-        components.fan.turn_on(self.hass, _TEST_FAN)
+        common.turn_on(self.hass, _TEST_FAN)
         self.hass.block_till_done()
 
         # Set fan's direction to 'invalid'
-        components.fan.set_direction(self.hass, _TEST_FAN, 'invalid')
+        common.set_direction(self.hass, _TEST_FAN, 'invalid')
         self.hass.block_till_done()
 
         # verify direction is unchanged
@@ -515,11 +516,11 @@ class TestTemplateFan:
         self._register_components()
 
         # Turn on fan
-        components.fan.turn_on(self.hass, _TEST_FAN)
+        common.turn_on(self.hass, _TEST_FAN)
         self.hass.block_till_done()
 
         # Set fan's direction to forward
-        components.fan.set_direction(self.hass, _TEST_FAN, DIRECTION_FORWARD)
+        common.set_direction(self.hass, _TEST_FAN, DIRECTION_FORWARD)
         self.hass.block_till_done()
 
         # verify
@@ -528,7 +529,7 @@ class TestTemplateFan:
         self._verify(STATE_ON, None, None, DIRECTION_FORWARD)
 
         # Set fan's direction to 'invalid'
-        components.fan.set_direction(self.hass, _TEST_FAN, 'invalid')
+        common.set_direction(self.hass, _TEST_FAN, 'invalid')
         self.hass.block_till_done()
 
         # verify direction is unchanged

From e2050926938707e05a48f7b07bb6436da66cf6cc Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Wed, 26 Sep 2018 10:15:49 +0200
Subject: [PATCH 310/357] Revert incorrect check (#16883)

---
 homeassistant/components/media_player/soundtouch.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/components/media_player/soundtouch.py b/homeassistant/components/media_player/soundtouch.py
index b8ade374a46..037a9b88fc6 100644
--- a/homeassistant/components/media_player/soundtouch.py
+++ b/homeassistant/components/media_player/soundtouch.py
@@ -297,7 +297,7 @@ class SoundTouchDevice(MediaPlayerDevice):
     def play_media(self, media_type, media_id, **kwargs):
         """Play a piece of media."""
         _LOGGER.debug("Starting media with media_id: %s", media_id)
-        if re.match(r'https?://', str(media_id)):
+        if re.match(r'http?://', str(media_id)):
             # URL
             _LOGGER.debug("Playing URL %s", str(media_id))
             self._device.play_url(str(media_id))

From e5861241c7ac6db4feb905be7e8f999d2840c02f Mon Sep 17 00:00:00 2001
From: Nicko van Someren <nicko@nicko.org>
Date: Wed, 26 Sep 2018 04:24:32 -0400
Subject: [PATCH 311/357] Added support for private storage. (#16878)

* Addded support for private storage.

Include 'private' flag parameters to the Store class and save_json function.
Updated various authentication and onboarding classes to use private stores.
Fixed unit test for emulated_hue which used a mock patch on save_json().

* Fixed Hound formatting issues not detected by local linting.
---
 homeassistant/auth/auth_store.py              |  3 +-
 homeassistant/auth/mfa_modules/notify.py      |  2 +-
 homeassistant/auth/mfa_modules/totp.py        |  2 +-
 homeassistant/auth/providers/homeassistant.py |  3 +-
 .../components/onboarding/__init__.py         |  3 +-
 homeassistant/helpers/storage.py              |  5 +-
 homeassistant/util/json.py                    |  8 +-
 tests/components/emulated_hue/test_init.py    | 91 ++++++++++---------
 8 files changed, 64 insertions(+), 53 deletions(-)

diff --git a/homeassistant/auth/auth_store.py b/homeassistant/auth/auth_store.py
index fb4700c806f..c170344746e 100644
--- a/homeassistant/auth/auth_store.py
+++ b/homeassistant/auth/auth_store.py
@@ -28,7 +28,8 @@ class AuthStore:
         """Initialize the auth store."""
         self.hass = hass
         self._users = None  # type: Optional[Dict[str, models.User]]
-        self._store = hass.helpers.storage.Store(STORAGE_VERSION, STORAGE_KEY)
+        self._store = hass.helpers.storage.Store(STORAGE_VERSION, STORAGE_KEY,
+                                                 private=True)
 
     async def async_get_users(self) -> List[models.User]:
         """Retrieve all users."""
diff --git a/homeassistant/auth/mfa_modules/notify.py b/homeassistant/auth/mfa_modules/notify.py
index 84f9de614c1..03be4c74d32 100644
--- a/homeassistant/auth/mfa_modules/notify.py
+++ b/homeassistant/auth/mfa_modules/notify.py
@@ -85,7 +85,7 @@ class NotifyAuthModule(MultiFactorAuthModule):
         super().__init__(hass, config)
         self._user_settings = None  # type: Optional[_UsersDict]
         self._user_store = hass.helpers.storage.Store(
-            STORAGE_VERSION, STORAGE_KEY)
+            STORAGE_VERSION, STORAGE_KEY, private=True)
         self._include = config.get(CONF_INCLUDE, [])
         self._exclude = config.get(CONF_EXCLUDE, [])
         self._message_template = config[CONF_MESSAGE]
diff --git a/homeassistant/auth/mfa_modules/totp.py b/homeassistant/auth/mfa_modules/totp.py
index 625cc0302e1..9b5896ef666 100644
--- a/homeassistant/auth/mfa_modules/totp.py
+++ b/homeassistant/auth/mfa_modules/totp.py
@@ -67,7 +67,7 @@ class TotpAuthModule(MultiFactorAuthModule):
         super().__init__(hass, config)
         self._users = None  # type: Optional[Dict[str, str]]
         self._user_store = hass.helpers.storage.Store(
-            STORAGE_VERSION, STORAGE_KEY)
+            STORAGE_VERSION, STORAGE_KEY, private=True)
 
     @property
     def input_schema(self) -> vol.Schema:
diff --git a/homeassistant/auth/providers/homeassistant.py b/homeassistant/auth/providers/homeassistant.py
index c743a5b7f65..8710e7c60bc 100644
--- a/homeassistant/auth/providers/homeassistant.py
+++ b/homeassistant/auth/providers/homeassistant.py
@@ -52,7 +52,8 @@ class Data:
     def __init__(self, hass: HomeAssistant) -> None:
         """Initialize the user data store."""
         self.hass = hass
-        self._store = hass.helpers.storage.Store(STORAGE_VERSION, STORAGE_KEY)
+        self._store = hass.helpers.storage.Store(STORAGE_VERSION, STORAGE_KEY,
+                                                 private=True)
         self._data = None  # type: Optional[Dict[str, Any]]
 
     async def async_load(self) -> None:
diff --git a/homeassistant/components/onboarding/__init__.py b/homeassistant/components/onboarding/__init__.py
index 52d18b9a870..376575e3440 100644
--- a/homeassistant/components/onboarding/__init__.py
+++ b/homeassistant/components/onboarding/__init__.py
@@ -23,7 +23,8 @@ def async_is_onboarded(hass):
 
 async def async_setup(hass, config):
     """Set up the onboarding component."""
-    store = hass.helpers.storage.Store(STORAGE_VERSION, STORAGE_KEY)
+    store = hass.helpers.storage.Store(STORAGE_VERSION, STORAGE_KEY,
+                                       private=True)
     data = await store.async_load()
 
     if data is None:
diff --git a/homeassistant/helpers/storage.py b/homeassistant/helpers/storage.py
index 95e6925b2a4..7d867b50ec2 100644
--- a/homeassistant/helpers/storage.py
+++ b/homeassistant/helpers/storage.py
@@ -46,11 +46,12 @@ async def async_migrator(hass, old_path, store, *,
 class Store:
     """Class to help storing data."""
 
-    def __init__(self, hass, version: int, key: str):
+    def __init__(self, hass, version: int, key: str, private: bool = False):
         """Initialize storage class."""
         self.version = version
         self.key = key
         self.hass = hass
+        self._private = private
         self._data = None
         self._unsub_delay_listener = None
         self._unsub_stop_listener = None
@@ -186,7 +187,7 @@ class Store:
             os.makedirs(os.path.dirname(path))
 
         _LOGGER.debug('Writing data for %s', self.key)
-        json.save_json(path, data)
+        json.save_json(path, data, self._private)
 
     async def _async_migrate_func(self, old_version, old_data):
         """Migrate to the new version."""
diff --git a/homeassistant/util/json.py b/homeassistant/util/json.py
index 8ecfebd5b33..40f25689148 100644
--- a/homeassistant/util/json.py
+++ b/homeassistant/util/json.py
@@ -3,6 +3,7 @@ import logging
 from typing import Union, List, Dict
 
 import json
+import os
 
 from homeassistant.exceptions import HomeAssistantError
 
@@ -38,14 +39,17 @@ def load_json(filename: str, default: Union[List, Dict, None] = None) \
     return {} if default is None else default
 
 
-def save_json(filename: str, data: Union[List, Dict]) -> None:
+def save_json(filename: str, data: Union[List, Dict],
+              private: bool = False) -> None:
     """Save JSON data to a file.
 
     Returns True on success.
     """
     try:
         json_data = json.dumps(data, sort_keys=True, indent=4)
-        with open(filename, 'w', encoding='utf-8') as fdesc:
+        mode = 0o600 if private else 0o644
+        with open(os.open(filename, os.O_WRONLY | os.O_CREAT, mode),
+                  'w', encoding='utf-8') as fdesc:
             fdesc.write(json_data)
     except TypeError as error:
         _LOGGER.exception('Failed to serialize to JSON: %s',
diff --git a/tests/components/emulated_hue/test_init.py b/tests/components/emulated_hue/test_init.py
index 2f443eb5d6e..d416dd08e05 100644
--- a/tests/components/emulated_hue/test_init.py
+++ b/tests/components/emulated_hue/test_init.py
@@ -16,24 +16,25 @@ def test_config_google_home_entity_id_to_number():
     handle = mop()
 
     with patch('homeassistant.util.json.open', mop, create=True):
-        number = conf.entity_id_to_number('light.test')
-        assert number == '2'
-        assert handle.write.call_count == 1
-        assert json.loads(handle.write.mock_calls[0][1][0]) == {
-            '1': 'light.test2',
-            '2': 'light.test',
-        }
+        with patch('homeassistant.util.json.os.open', return_value=0):
+            number = conf.entity_id_to_number('light.test')
+            assert number == '2'
+            assert handle.write.call_count == 1
+            assert json.loads(handle.write.mock_calls[0][1][0]) == {
+                '1': 'light.test2',
+                '2': 'light.test',
+            }
 
-        number = conf.entity_id_to_number('light.test')
-        assert number == '2'
-        assert handle.write.call_count == 1
+            number = conf.entity_id_to_number('light.test')
+            assert number == '2'
+            assert handle.write.call_count == 1
 
-        number = conf.entity_id_to_number('light.test2')
-        assert number == '1'
-        assert handle.write.call_count == 1
+            number = conf.entity_id_to_number('light.test2')
+            assert number == '1'
+            assert handle.write.call_count == 1
 
-        entity_id = conf.number_to_entity_id('1')
-        assert entity_id == 'light.test2'
+            entity_id = conf.number_to_entity_id('1')
+            assert entity_id == 'light.test2'
 
 
 def test_config_google_home_entity_id_to_number_altered():
@@ -46,24 +47,25 @@ def test_config_google_home_entity_id_to_number_altered():
     handle = mop()
 
     with patch('homeassistant.util.json.open', mop, create=True):
-        number = conf.entity_id_to_number('light.test')
-        assert number == '22'
-        assert handle.write.call_count == 1
-        assert json.loads(handle.write.mock_calls[0][1][0]) == {
-            '21': 'light.test2',
-            '22': 'light.test',
-        }
+        with patch('homeassistant.util.json.os.open', return_value=0):
+            number = conf.entity_id_to_number('light.test')
+            assert number == '22'
+            assert handle.write.call_count == 1
+            assert json.loads(handle.write.mock_calls[0][1][0]) == {
+                '21': 'light.test2',
+                '22': 'light.test',
+            }
 
-        number = conf.entity_id_to_number('light.test')
-        assert number == '22'
-        assert handle.write.call_count == 1
+            number = conf.entity_id_to_number('light.test')
+            assert number == '22'
+            assert handle.write.call_count == 1
 
-        number = conf.entity_id_to_number('light.test2')
-        assert number == '21'
-        assert handle.write.call_count == 1
+            number = conf.entity_id_to_number('light.test2')
+            assert number == '21'
+            assert handle.write.call_count == 1
 
-        entity_id = conf.number_to_entity_id('21')
-        assert entity_id == 'light.test2'
+            entity_id = conf.number_to_entity_id('21')
+            assert entity_id == 'light.test2'
 
 
 def test_config_google_home_entity_id_to_number_empty():
@@ -76,23 +78,24 @@ def test_config_google_home_entity_id_to_number_empty():
     handle = mop()
 
     with patch('homeassistant.util.json.open', mop, create=True):
-        number = conf.entity_id_to_number('light.test')
-        assert number == '1'
-        assert handle.write.call_count == 1
-        assert json.loads(handle.write.mock_calls[0][1][0]) == {
-            '1': 'light.test',
-        }
+        with patch('homeassistant.util.json.os.open', return_value=0):
+            number = conf.entity_id_to_number('light.test')
+            assert number == '1'
+            assert handle.write.call_count == 1
+            assert json.loads(handle.write.mock_calls[0][1][0]) == {
+                '1': 'light.test',
+            }
 
-        number = conf.entity_id_to_number('light.test')
-        assert number == '1'
-        assert handle.write.call_count == 1
+            number = conf.entity_id_to_number('light.test')
+            assert number == '1'
+            assert handle.write.call_count == 1
 
-        number = conf.entity_id_to_number('light.test2')
-        assert number == '2'
-        assert handle.write.call_count == 2
+            number = conf.entity_id_to_number('light.test2')
+            assert number == '2'
+            assert handle.write.call_count == 2
 
-        entity_id = conf.number_to_entity_id('2')
-        assert entity_id == 'light.test2'
+            entity_id = conf.number_to_entity_id('2')
+            assert entity_id == 'light.test2'
 
 
 def test_config_alexa_entity_id_to_number():

From 75c372021db70a3daf00719f2c5c1a5d64f07269 Mon Sep 17 00:00:00 2001
From: Jason Hu <awarecan@users.noreply.github.com>
Date: Wed, 26 Sep 2018 02:20:48 -0700
Subject: [PATCH 312/357] Fix example for long-lived access token WS API
 (#16882)

---
 homeassistant/components/auth/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/homeassistant/components/auth/__init__.py b/homeassistant/components/auth/__init__.py
index bee72d8e4fc..c0027fac820 100644
--- a/homeassistant/components/auth/__init__.py
+++ b/homeassistant/components/auth/__init__.py
@@ -105,7 +105,6 @@ Home Assistant. User need to record the token in secure place.
     "id": 11,
     "type": "auth/long_lived_access_token",
     "client_name": "GPS Logger",
-    "client_icon": null,
     "lifespan": 365
 }
 

From f13f723a045553fa05793eab054e04745d16d256 Mon Sep 17 00:00:00 2001
From: Blake Blackshear <blakeb@blakeshome.com>
Date: Wed, 26 Sep 2018 04:57:16 -0500
Subject: [PATCH 313/357] Add bitwise operations as template helpers (#16833)

---
 homeassistant/helpers/template.py | 12 ++++++++++++
 tests/helpers/test_template.py    | 30 ++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/homeassistant/helpers/template.py b/homeassistant/helpers/template.py
index d0d3fb457b1..c68aa311998 100644
--- a/homeassistant/helpers/template.py
+++ b/homeassistant/helpers/template.py
@@ -580,6 +580,16 @@ def regex_findall_index(value, find='', index=0, ignorecase=False):
     return re.findall(find, value, flags)[index]
 
 
+def bitwise_and(first_value, second_value):
+    """Perform a bitwise and operation."""
+    return first_value & second_value
+
+
+def bitwise_or(first_value, second_value):
+    """Perform a bitwise or operation."""
+    return first_value | second_value
+
+
 @contextfilter
 def random_every_time(context, values):
     """Choose a random value.
@@ -617,6 +627,8 @@ ENV.filters['regex_match'] = regex_match
 ENV.filters['regex_replace'] = regex_replace
 ENV.filters['regex_search'] = regex_search
 ENV.filters['regex_findall_index'] = regex_findall_index
+ENV.filters['bitwise_and'] = bitwise_and
+ENV.filters['bitwise_or'] = bitwise_or
 ENV.globals['log'] = logarithm
 ENV.globals['sin'] = sine
 ENV.globals['cos'] = cosine
diff --git a/tests/helpers/test_template.py b/tests/helpers/test_template.py
index 6f426c290c5..dc8106e0ed3 100644
--- a/tests/helpers/test_template.py
+++ b/tests/helpers/test_template.py
@@ -562,6 +562,36 @@ class TestHelpersTemplate(unittest.TestCase):
                 """, self.hass)
         self.assertEqual('LHR', tpl.render())
 
+    def test_bitwise_and(self):
+        """Test bitwise_and method."""
+        tpl = template.Template("""
+{{ 8 | bitwise_and(8) }}
+                """, self.hass)
+        self.assertEqual(str(8 & 8), tpl.render())
+        tpl = template.Template("""
+{{ 10 | bitwise_and(2) }}
+                """, self.hass)
+        self.assertEqual(str(10 & 2), tpl.render())
+        tpl = template.Template("""
+{{ 8 | bitwise_and(2) }}
+                """, self.hass)
+        self.assertEqual(str(8 & 2), tpl.render())
+
+    def test_bitwise_or(self):
+        """Test bitwise_or method."""
+        tpl = template.Template("""
+{{ 8 | bitwise_or(8) }}
+                """, self.hass)
+        self.assertEqual(str(8 | 8), tpl.render())
+        tpl = template.Template("""
+{{ 10 | bitwise_or(2) }}
+                """, self.hass)
+        self.assertEqual(str(10 | 2), tpl.render())
+        tpl = template.Template("""
+{{ 8 | bitwise_or(2) }}
+                """, self.hass)
+        self.assertEqual(str(8 | 2), tpl.render())
+
     def test_distance_function_with_1_state(self):
         """Test distance function with 1 state."""
         self.hass.states.set('test.object', 'happy', {

From 917df1af007ab45a46d686797c053ba537e69884 Mon Sep 17 00:00:00 2001
From: Nikolay Vasilchuk <Anonym.tsk@gmail.com>
Date: Wed, 26 Sep 2018 12:59:37 +0300
Subject: [PATCH 314/357] Telegram_bot polling support proxy_url and
 proxy_params (Fix #15746) (#16740)

* Telegram bot polling proxy support

* CI fix

* houndci-bot review fix

* houndci-bot review fix

* CI fix

* Review

* Update polling.py
---
 .../components/telegram_bot/__init__.py       |   5 +-
 .../components/telegram_bot/polling.py        | 121 ++++++++----------
 2 files changed, 54 insertions(+), 72 deletions(-)

diff --git a/homeassistant/components/telegram_bot/__init__.py b/homeassistant/components/telegram_bot/__init__.py
index 8e24716ab57..75d9b611591 100644
--- a/homeassistant/components/telegram_bot/__init__.py
+++ b/homeassistant/components/telegram_bot/__init__.py
@@ -311,10 +311,11 @@ def initialize_bot(p_config):
     proxy_url = p_config.get(CONF_PROXY_URL)
     proxy_params = p_config.get(CONF_PROXY_PARAMS)
 
-    request = None
     if proxy_url is not None:
-        request = Request(proxy_url=proxy_url,
+        request = Request(con_pool_size=4, proxy_url=proxy_url,
                           urllib3_proxy_kwargs=proxy_params)
+    else:
+        request = Request(con_pool_size=4)
     return Bot(token=api_key, request=request)
 
 
diff --git a/homeassistant/components/telegram_bot/polling.py b/homeassistant/components/telegram_bot/polling.py
index 6ee42b32504..0d4eddffd32 100644
--- a/homeassistant/components/telegram_bot/polling.py
+++ b/homeassistant/components/telegram_bot/polling.py
@@ -5,13 +5,8 @@ For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/telegram_bot.polling/
 """
 import asyncio
-from asyncio.futures import CancelledError
 import logging
 
-import async_timeout
-from aiohttp.client_exceptions import ClientError
-from aiohttp.hdrs import CONNECTION, KEEP_ALIVE
-
 from homeassistant.components.telegram_bot import (
     initialize_bot,
     CONF_ALLOWED_CHAT_IDS, BaseTelegramBotEntity,
@@ -19,18 +14,10 @@ from homeassistant.components.telegram_bot import (
 from homeassistant.const import (
     EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP)
 from homeassistant.core import callback
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 _LOGGER = logging.getLogger(__name__)
 
 PLATFORM_SCHEMA = TELEGRAM_PLATFORM_SCHEMA
-RETRY_SLEEP = 10
-
-
-class WrongHttpStatus(Exception):
-    """Thrown when a wrong http status is received."""
-
-    pass
 
 
 @asyncio.coroutine
@@ -55,73 +42,67 @@ def async_setup_platform(hass, config):
     return True
 
 
+def process_error(bot, update, error):
+    """Telegram bot error handler."""
+    from telegram.error import (
+        TelegramError, TimedOut, NetworkError, RetryAfter)
+
+    try:
+        raise error
+    except (TimedOut, NetworkError, RetryAfter):
+        # Long polling timeout or connection problem. Nothing serious.
+        pass
+    except TelegramError:
+        _LOGGER.error('Update "%s" caused error "%s"', update, error)
+
+
+def message_handler(handler):
+    """Create messages handler."""
+    from telegram import Update
+    from telegram.ext import Handler
+
+    class MessageHandler(Handler):
+        """Telegram bot message handler."""
+
+        def __init__(self):
+            """Initialize the messages handler instance."""
+            super().__init__(handler)
+
+        def check_update(self, update):
+            """Check is update valid."""
+            return isinstance(update, Update)
+
+        def handle_update(self, update, dispatcher):
+            """Handle update."""
+            optional_args = self.collect_optional_args(dispatcher, update)
+            return self.callback(dispatcher.bot, update, **optional_args)
+
+    return MessageHandler()
+
+
 class TelegramPoll(BaseTelegramBotEntity):
     """Asyncio telegram incoming message handler."""
 
     def __init__(self, bot, hass, allowed_chat_ids):
         """Initialize the polling instance."""
+        from telegram.ext import Updater
+
         BaseTelegramBotEntity.__init__(self, hass, allowed_chat_ids)
-        self.update_id = 0
-        self.websession = async_get_clientsession(hass)
-        self.update_url = '{0}/getUpdates'.format(bot.base_url)
-        self.polling_task = None  # The actual polling task.
-        self.timeout = 15  # async post timeout
-        # Polling timeout should always be less than async post timeout.
-        self.post_data = {'timeout': self.timeout - 5}
+
+        self.updater = Updater(bot=bot, workers=4)
+        self.dispatcher = self.updater.dispatcher
+
+        self.dispatcher.add_handler(message_handler(self.process_update))
+        self.dispatcher.add_error_handler(process_error)
 
     def start_polling(self):
         """Start the polling task."""
-        self.polling_task = self.hass.async_add_job(self.check_incoming())
+        self.updater.start_polling()
 
     def stop_polling(self):
         """Stop the polling task."""
-        self.polling_task.cancel()
+        self.updater.stop()
 
-    @asyncio.coroutine
-    def get_updates(self, offset):
-        """Bypass the default long polling method to enable asyncio."""
-        resp = None
-        if offset:
-            self.post_data['offset'] = offset
-        try:
-            with async_timeout.timeout(self.timeout, loop=self.hass.loop):
-                resp = yield from self.websession.post(
-                    self.update_url, data=self.post_data,
-                    headers={CONNECTION: KEEP_ALIVE}
-                )
-            if resp.status == 200:
-                _json = yield from resp.json()
-                return _json
-            raise WrongHttpStatus('wrong status {}'.format(resp.status))
-        finally:
-            if resp is not None:
-                yield from resp.release()
-
-    @asyncio.coroutine
-    def check_incoming(self):
-        """Continuously check for incoming telegram messages."""
-        try:
-            while True:
-                try:
-                    _updates = yield from self.get_updates(self.update_id)
-                except (WrongHttpStatus, ClientError) as err:
-                    # WrongHttpStatus: Non-200 status code.
-                    # Occurs at times (mainly 502) and recovers
-                    # automatically. Pause for a while before retrying.
-                    _LOGGER.error(err)
-                    yield from asyncio.sleep(RETRY_SLEEP)
-                except (asyncio.TimeoutError, ValueError):
-                    # Long polling timeout. Nothing serious.
-                    # Json error. Just retry for the next message.
-                    pass
-                else:
-                    # no exception raised. update received data.
-                    _updates = _updates.get('result')
-                    if _updates is None:
-                        _LOGGER.error("Incorrect result received.")
-                    else:
-                        for update in _updates:
-                            self.update_id = update['update_id'] + 1
-                            self.process_message(update)
-        except CancelledError:
-            _LOGGER.debug("Stopping Telegram polling bot")
+    def process_update(self, bot, update):
+        """Process incoming message."""
+        self.process_message(update.to_dict())

From 98a4b1e9ac3ebad6c16752a22aafb82d4813fc70 Mon Sep 17 00:00:00 2001
From: cgtobi <cgtobi@users.noreply.github.com>
Date: Wed, 26 Sep 2018 13:07:43 +0200
Subject: [PATCH 315/357] Update language strings (#16884)

---
 homeassistant/components/auth/strings.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/auth/strings.json b/homeassistant/components/auth/strings.json
index 2b1fc0c94f6..57f5ed659b0 100644
--- a/homeassistant/components/auth/strings.json
+++ b/homeassistant/components/auth/strings.json
@@ -17,15 +17,15 @@
       "step": {
         "init": {
           "title": "Set up one-time password delivered by notify component",
-          "description": "Please select one of notify service:"
+          "description": "Please select one of the notification services:"
         },
         "setup": {
           "title": "Verify setup",
-          "description": "A one-time password have sent by **notify.{notify_service}**. Please input it in below:"
+          "description": "A one-time password has been sent via **notify.{notify_service}**. Please enter it below:"
         }
       },
       "abort": {
-        "no_available_service": "No available notify services."
+        "no_available_service": "No notification services available."
       },
       "error": {
         "invalid_code": "Invalid code, please try again."

From d20e0f5c951faca5ce0af0433dba4926baef3ec0 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Wed, 26 Sep 2018 11:19:34 +0200
Subject: [PATCH 316/357] Update frontend to 20180926.0

---
 homeassistant/components/frontend/__init__.py | 2 +-
 requirements_all.txt                          | 2 +-
 requirements_test_all.txt                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/frontend/__init__.py b/homeassistant/components/frontend/__init__.py
index 362c54fabbd..23ae6d485a6 100644
--- a/homeassistant/components/frontend/__init__.py
+++ b/homeassistant/components/frontend/__init__.py
@@ -24,7 +24,7 @@ from homeassistant.core import callback
 from homeassistant.helpers.translation import async_get_translations
 from homeassistant.loader import bind_hass
 
-REQUIREMENTS = ['home-assistant-frontend==20180924.0']
+REQUIREMENTS = ['home-assistant-frontend==20180926.0']
 
 DOMAIN = 'frontend'
 DEPENDENCIES = ['api', 'websocket_api', 'http', 'system_log',
diff --git a/requirements_all.txt b/requirements_all.txt
index 9f20ccb2ece..4600af0c542 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -454,7 +454,7 @@ hole==0.3.0
 holidays==0.9.7
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180924.0
+home-assistant-frontend==20180926.0
 
 # homeassistant.components.homekit_controller
 # homekit==0.10
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 44baabc7f5d..691fc641607 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -87,7 +87,7 @@ hdate==0.6.3
 holidays==0.9.7
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180924.0
+home-assistant-frontend==20180926.0
 
 # homeassistant.components.homematicip_cloud
 homematicip==0.9.8

From 732009c6689ff645e7a16717e6804e5b5a4374b5 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Wed, 26 Sep 2018 11:19:50 +0200
Subject: [PATCH 317/357] Update translations

---
 .../components/auth/.translations/ca.json     | 21 ++++++++++-
 .../components/auth/.translations/de.json     | 19 +++++++++-
 .../components/auth/.translations/fr.json     |  7 ++++
 .../components/auth/.translations/he.json     | 35 +++++++++++++++++++
 .../components/auth/.translations/ko.json     | 19 ++++++++++
 .../components/auth/.translations/lb.json     | 19 ++++++++++
 .../components/auth/.translations/pl.json     | 18 ++++++++++
 .../components/auth/.translations/ru.json     | 19 ++++++++++
 .../components/auth/.translations/sl.json     | 19 ++++++++++
 .../components/auth/.translations/sv.json     | 14 ++++++++
 .../auth/.translations/zh-Hans.json           | 19 ++++++++++
 .../auth/.translations/zh-Hant.json           | 19 ++++++++++
 .../components/cast/.translations/de.json     |  2 +-
 .../components/deconz/.translations/he.json   |  3 +-
 .../components/hangouts/.translations/he.json | 29 +++++++++++++++
 .../components/hangouts/.translations/pl.json |  2 ++
 .../homematicip_cloud/.translations/de.json   | 10 +++---
 .../homematicip_cloud/.translations/he.json   |  1 +
 .../components/ios/.translations/he.json      | 14 ++++++++
 .../components/ios/.translations/sl.json      | 14 ++++++++
 .../components/ios/.translations/sv.json      | 11 ++++++
 .../components/mqtt/.translations/ca.json     |  1 +
 .../components/mqtt/.translations/de.json     |  6 ++++
 .../components/mqtt/.translations/fr.json     |  1 +
 .../components/mqtt/.translations/he.json     | 24 +++++++++++++
 .../components/mqtt/.translations/lb.json     |  1 +
 .../components/mqtt/.translations/pl.json     |  1 +
 .../components/mqtt/.translations/ru.json     |  1 +
 .../components/mqtt/.translations/sl.json     | 24 +++++++++++++
 .../components/mqtt/.translations/sv.json     | 13 +++++++
 .../mqtt/.translations/zh-Hans.json           |  1 +
 .../mqtt/.translations/zh-Hant.json           |  1 +
 .../components/nest/.translations/de.json     |  2 +-
 .../components/openuv/.translations/de.json   |  3 +-
 .../components/openuv/.translations/he.json   | 20 +++++++++++
 .../sensor/.translations/moon.he.json         |  6 +++-
 .../components/sonos/.translations/de.json    |  2 +-
 .../components/tradfri/.translations/de.json  | 22 ++++++++++++
 .../components/tradfri/.translations/he.json  | 23 ++++++++++++
 .../components/tradfri/.translations/pl.json  | 22 ++++++++++++
 .../components/tradfri/.translations/sl.json  | 23 ++++++++++++
 .../components/tradfri/.translations/sv.json  | 20 +++++++++++
 .../tradfri/.translations/zh-Hans.json        | 13 ++++++-
 43 files changed, 530 insertions(+), 14 deletions(-)
 create mode 100644 homeassistant/components/auth/.translations/he.json
 create mode 100644 homeassistant/components/hangouts/.translations/he.json
 create mode 100644 homeassistant/components/ios/.translations/he.json
 create mode 100644 homeassistant/components/ios/.translations/sl.json
 create mode 100644 homeassistant/components/ios/.translations/sv.json
 create mode 100644 homeassistant/components/mqtt/.translations/he.json
 create mode 100644 homeassistant/components/mqtt/.translations/sl.json
 create mode 100644 homeassistant/components/mqtt/.translations/sv.json
 create mode 100644 homeassistant/components/openuv/.translations/he.json
 create mode 100644 homeassistant/components/tradfri/.translations/de.json
 create mode 100644 homeassistant/components/tradfri/.translations/he.json
 create mode 100644 homeassistant/components/tradfri/.translations/pl.json
 create mode 100644 homeassistant/components/tradfri/.translations/sl.json
 create mode 100644 homeassistant/components/tradfri/.translations/sv.json

diff --git a/homeassistant/components/auth/.translations/ca.json b/homeassistant/components/auth/.translations/ca.json
index 1b3b25dbcff..f4318a0eb21 100644
--- a/homeassistant/components/auth/.translations/ca.json
+++ b/homeassistant/components/auth/.translations/ca.json
@@ -1,8 +1,27 @@
 {
     "mfa_setup": {
+        "notify": {
+            "abort": {
+                "no_available_service": "No hi ha serveis de notificaci\u00f3 disponibles."
+            },
+            "error": {
+                "invalid_code": "Codi inv\u00e0lid, si us plau torni a provar-ho."
+            },
+            "step": {
+                "init": {
+                    "description": "Seleccioneu un dels serveis de notificaci\u00f3:",
+                    "title": "Configureu una contrasenya d'un sol \u00fas a trav\u00e9s del component de notificacions"
+                },
+                "setup": {
+                    "description": "**notify.{notify_service}** ha enviat una contrasenya d'un sol \u00fas. Introdu\u00efu-la a continuaci\u00f3:",
+                    "title": "Verifiqueu la configuraci\u00f3"
+                }
+            },
+            "title": "Contrasenya d'un sol \u00fas del servei de notificacions"
+        },
         "totp": {
             "error": {
-                "invalid_code": "Codi no v\u00e0lid, si us plau torni a provar-ho. Si obteniu aquest error repetidament, assegureu-vos que la data i hora de Home Assistant sigui correcta i precisa."
+                "invalid_code": "Codi inv\u00e0lid, si us plau torni a provar-ho. Si obteniu aquest error repetidament, assegureu-vos que la data i hora de Home Assistant sigui correcta i precisa."
             },
             "step": {
                 "init": {
diff --git a/homeassistant/components/auth/.translations/de.json b/homeassistant/components/auth/.translations/de.json
index 67f948e8340..2abc64f5f5d 100644
--- a/homeassistant/components/auth/.translations/de.json
+++ b/homeassistant/components/auth/.translations/de.json
@@ -1,8 +1,25 @@
 {
     "mfa_setup": {
+        "notify": {
+            "abort": {
+                "no_available_service": "Keine Benachrichtigungsdienste verf\u00fcgbar."
+            },
+            "error": {
+                "invalid_code": "Ung\u00fcltiger Code, bitte versuche es erneut."
+            },
+            "step": {
+                "init": {
+                    "description": "Bitte w\u00e4hle einen der Benachrichtigungsdienste:"
+                },
+                "setup": {
+                    "description": "Ein Einmal-Passwort wurde per ** notify gesendet. {notify_service} **. Bitte gebe es unten ein:",
+                    "title": "\u00dcberpr\u00fcfe das Setup"
+                }
+            }
+        },
         "totp": {
             "error": {
-                "invalid_code": "Ung\u00fcltiger Code, bitte versuche es erneut. Wenn Sie diesen Fehler regelm\u00e4\u00dfig erhalten, stelle sicher, dass die Uhr deines Home Assistant-Systems korrekt ist."
+                "invalid_code": "Ung\u00fcltiger Code, bitte versuche es erneut. Wenn du diesen Fehler regelm\u00e4\u00dfig erhalten, stelle sicher, dass die Uhr deines Home Assistant-Systems korrekt ist."
             },
             "step": {
                 "init": {
diff --git a/homeassistant/components/auth/.translations/fr.json b/homeassistant/components/auth/.translations/fr.json
index b8d10dc89d0..85540314af0 100644
--- a/homeassistant/components/auth/.translations/fr.json
+++ b/homeassistant/components/auth/.translations/fr.json
@@ -1,5 +1,12 @@
 {
     "mfa_setup": {
+        "notify": {
+            "step": {
+                "setup": {
+                    "description": "Un mot de passe unique a \u00e9t\u00e9 envoy\u00e9 par **notify.{notify_service}**. Veuillez le saisir ci-dessous :"
+                }
+            }
+        },
         "totp": {
             "error": {
                 "invalid_code": "Code invalide. Veuillez essayez \u00e0 nouveau. Si cette erreur persiste, assurez-vous que l'horloge de votre syst\u00e8me Home Assistant est correcte."
diff --git a/homeassistant/components/auth/.translations/he.json b/homeassistant/components/auth/.translations/he.json
new file mode 100644
index 00000000000..bc1826d4d79
--- /dev/null
+++ b/homeassistant/components/auth/.translations/he.json
@@ -0,0 +1,35 @@
+{
+    "mfa_setup": {
+        "notify": {
+            "abort": {
+                "no_available_service": "\u05d0\u05d9\u05df \u05e9\u05d9\u05e8\u05d5\u05ea\u05d9 notify \u05d6\u05de\u05d9\u05e0\u05d9\u05dd."
+            },
+            "error": {
+                "invalid_code": "\u05e7\u05d5\u05d3 \u05dc\u05d0 \u05d7\u05d5\u05e7\u05d9, \u05d0\u05e0\u05d0 \u05e0\u05e1\u05d4 \u05e9\u05d5\u05d1."
+            },
+            "step": {
+                "init": {
+                    "description": "\u05d1\u05d7\u05e8 \u05d0\u05ea \u05d0\u05d7\u05d3 \u05de\u05e9\u05e8\u05d5\u05ea\u05d9 notify",
+                    "title": "\u05d4\u05d2\u05d3\u05e8 \u05e1\u05d9\u05e1\u05de\u05d4 \u05d7\u05d3 \u05e4\u05e2\u05de\u05d9\u05ea \u05d4\u05e0\u05e9\u05dc\u05d7\u05ea \u05e2\u05dc \u05d9\u05d3\u05d9 \u05e8\u05db\u05d9\u05d1 notify"
+                },
+                "setup": {
+                    "description": "\u05e1\u05d9\u05e1\u05de\u05d4 \u05d7\u05d3 \u05e4\u05e2\u05de\u05d9\u05ea \u05e0\u05e9\u05dc\u05d7\u05d4 \u05e2\u05dc \u05d9\u05d3\u05d9 **{notify_service}**. \u05d4\u05d6\u05df \u05d0\u05d5\u05ea\u05d4 \u05dc\u05de\u05d8\u05d4:",
+                    "title": "\u05d0\u05d9\u05de\u05d5\u05ea \u05d4\u05d4\u05ea\u05e7\u05e0\u05d4"
+                }
+            },
+            "title": "\u05dc\u05d4\u05d5\u05d3\u05d9\u05e2 \u200b\u200b\u05e2\u05dc \u05e1\u05d9\u05e1\u05de\u05d4 \u05d7\u05d3 \u05e4\u05e2\u05de\u05d9\u05ea"
+        },
+        "totp": {
+            "error": {
+                "invalid_code": "\u05e7\u05d5\u05d3 \u05dc\u05d0 \u05d7\u05d5\u05e7\u05d9, \u05d0\u05e0\u05d0 \u05e0\u05e1\u05d4 \u05e9\u05d5\u05d1. \u05d0\u05dd \u05d0\u05ea\u05d4 \u05de\u05e7\u05d1\u05dc \u05d0\u05ea \u05d4\u05e9\u05d2\u05d9\u05d0\u05d4 \u05d4\u05d6\u05d5 \u05d1\u05d0\u05d5\u05e4\u05df \u05e2\u05e7\u05d1\u05d9, \u05d5\u05d3\u05d0 \u05e9\u05d4\u05e9\u05e2\u05d5\u05df \u05e9\u05dc \u05de\u05e2\u05e8\u05db\u05ea \u05d4 - Home Assistant \u05e9\u05dc\u05da \u05de\u05d3\u05d5\u05d9\u05e7."
+            },
+            "step": {
+                "init": {
+                    "description": "\u05db\u05d3\u05d9 \u05dc\u05d4\u05e4\u05e2\u05d9\u05dc \u05d0\u05d9\u05de\u05d5\u05ea \u05d3\u05d5 \u05e9\u05dc\u05d1\u05d9 \u05d1\u05d0\u05de\u05e6\u05e2\u05d5\u05ea \u05e1\u05d9\u05e1\u05de\u05d0\u05d5\u05ea \u05d7\u05d3 \u05e4\u05e2\u05de\u05d9\u05d5\u05ea \u05de\u05d1\u05d5\u05e1\u05e1\u05d5\u05ea \u05d6\u05de\u05df, \u05e1\u05e8\u05d5\u05e7 \u05d0\u05ea \u05e7\u05d5\u05d3 QR \u05e2\u05dd \u05d9\u05d9\u05e9\u05d5\u05dd \u05d4\u05d0\u05d9\u05de\u05d5\u05ea \u05e9\u05dc\u05da. \u05d0\u05dd \u05d0\u05d9\u05df \u05dc\u05da \u05d7\u05e9\u05d1\u05d5\u05df \u05db\u05d6\u05d4, \u05d0\u05e0\u05d5 \u05de\u05de\u05dc\u05d9\u05e6\u05d9\u05dd \u05e2\u05dc [Google Authenticator] (https://support.google.com/accounts/answer/1066447) \u05d0\u05d5 [Authy] (https://authy.com/). \n\n {qr_code} \n \n \u05dc\u05d0\u05d7\u05e8 \u05e1\u05e8\u05d9\u05e7\u05ea \u05d4\u05e7\u05d5\u05d3, \u05d4\u05d6\u05df \u05d0\u05ea \u05d4\u05e7\u05d5\u05d3 \u05d1\u05df \u05e9\u05e9 \u05d4\u05e1\u05e4\u05e8\u05d5\u05ea \u05de\u05d4\u05d0\u05e4\u05dc\u05d9\u05e7\u05e6\u05d9\u05d4 \u05e9\u05dc\u05da \u05db\u05d3\u05d9 \u05dc\u05d0\u05de\u05ea \u05d0\u05ea \u05d4\u05d4\u05d2\u05d3\u05e8\u05d4. \u05d0\u05dd \u05d0\u05ea\u05d4 \u05e0\u05ea\u05e7\u05dc \u05d1\u05d1\u05e2\u05d9\u05d5\u05ea \u05d1\u05e1\u05e8\u05d9\u05e7\u05ea \u05e7\u05d5\u05d3 QR, \u05d1\u05e6\u05e2 \u05d4\u05d2\u05d3\u05e8\u05d4 \u05d9\u05d3\u05e0\u05d9\u05ea \u05e2\u05dd \u05e7\u05d5\u05d3 **`{code}`**.",
+                    "title": "\u05d4\u05d2\u05d3\u05e8 \u05d0\u05d9\u05de\u05d5\u05ea \u05d3\u05d5 \u05e9\u05dc\u05d1\u05d9 \u05d1\u05d0\u05de\u05e6\u05e2\u05d5\u05ea TOTP"
+                }
+            },
+            "title": "TOTP"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/auth/.translations/ko.json b/homeassistant/components/auth/.translations/ko.json
index 17fb5c56f57..e1f26e88bc7 100644
--- a/homeassistant/components/auth/.translations/ko.json
+++ b/homeassistant/components/auth/.translations/ko.json
@@ -1,5 +1,24 @@
 {
     "mfa_setup": {
+        "notify": {
+            "abort": {
+                "no_available_service": "\uc0ac\uc6a9 \uac00\ub2a5\ud55c \uc54c\ub9bc \uc11c\ube44\uc2a4\uac00 \uc5c6\uc2b5\ub2c8\ub2e4."
+            },
+            "error": {
+                "invalid_code": "\uc798\ubabb\ub41c \ucf54\ub4dc\uc785\ub2c8\ub2e4. \ub2e4\uc2dc \uc2dc\ub3c4\ud574\uc8fc\uc138\uc694."
+            },
+            "step": {
+                "init": {
+                    "description": "\uc54c\ub9bc \uc11c\ube44\uc2a4 \uc911 \ud558\ub098\ub97c \uc120\ud0dd\ud574\uc8fc\uc138\uc694:",
+                    "title": "\uc54c\ub9bc \uad6c\uc131\uc694\uc18c\uac00 \uc81c\uacf5\ud558\ub294 \uc77c\ud68c\uc6a9 \ube44\ubc00\ubc88\ud638 \uc124\uc815"
+                },
+                "setup": {
+                    "description": "**notify.{notify_service}** \uc5d0\uc11c \uc77c\ud68c\uc6a9 \ube44\ubc00\ubc88\ud638\ub97c \ubcf4\ub0c8\uc2b5\ub2c8\ub2e4. \uc544\ub798\uc758 \uacf5\ub780\uc5d0 \uc785\ub825\ud574 \uc8fc\uc138\uc694:",
+                    "title": "\uc124\uc815 \ud655\uc778"
+                }
+            },
+            "title": "\uc77c\ud68c\uc6a9 \ube44\ubc00\ubc88\ud638 \uc54c\ub9bc"
+        },
         "totp": {
             "error": {
                 "invalid_code": "\uc798\ubabb\ub41c \ucf54\ub4dc \uc785\ub2c8\ub2e4. \ub2e4\uc2dc \uc2dc\ub3c4\ud574\uc8fc\uc138\uc694. \uc774 \uc624\ub958\uac00 \uc9c0\uc18d\uc801\uc73c\ub85c \ubc1c\uc0dd\ud55c\ub2e4\uba74 Home Assistant \uc758 \uc2dc\uac04\uc124\uc815\uc774 \uc62c\ubc14\ub978\uc9c0 \ud655\uc778\ud574\ubcf4\uc138\uc694."
diff --git a/homeassistant/components/auth/.translations/lb.json b/homeassistant/components/auth/.translations/lb.json
index f55ae4b97ba..12ced930446 100644
--- a/homeassistant/components/auth/.translations/lb.json
+++ b/homeassistant/components/auth/.translations/lb.json
@@ -1,5 +1,24 @@
 {
     "mfa_setup": {
+        "notify": {
+            "abort": {
+                "no_available_service": "Keen Notifikatioun's D\u00e9ngscht disponibel."
+            },
+            "error": {
+                "invalid_code": "Ong\u00ebltege Code, prob\u00e9iert w.e.g. nach emol."
+            },
+            "step": {
+                "init": {
+                    "description": "Wielt w.e.g. een Notifikatioun's D\u00e9ngscht aus:",
+                    "title": "Eemolegt Passwuert ariichte wat vun engem Notifikatioun's Komponente versch\u00e9ckt g\u00ebtt"
+                },
+                "setup": {
+                    "description": "Een eemolegt Passwuert ass vun **notify.{notify_service}** gesch\u00e9ckt ginn. Gitt et w.e.g hei \u00ebnnen dr\u00ebnner an:",
+                    "title": "Astellungen iwwerpr\u00e9iwen"
+                }
+            },
+            "title": "Eemolegt Passwuert Notifikatioun"
+        },
         "totp": {
             "error": {
                 "invalid_code": "Ong\u00ebltege Login, prob\u00e9iert w.e.g. nach emol. Falls d\u00ebse Feeler Message \u00ebmmer er\u00ebm optr\u00ebtt dann iwwerpr\u00e9ift op d'Z\u00e4it vum Home Assistant System richteg ass."
diff --git a/homeassistant/components/auth/.translations/pl.json b/homeassistant/components/auth/.translations/pl.json
index 78999c34c22..3e320ba8d62 100644
--- a/homeassistant/components/auth/.translations/pl.json
+++ b/homeassistant/components/auth/.translations/pl.json
@@ -1,5 +1,23 @@
 {
     "mfa_setup": {
+        "notify": {
+            "abort": {
+                "no_available_service": "Brak dost\u0119pnych us\u0142ug powiadamiania."
+            },
+            "error": {
+                "invalid_code": "Nieprawid\u0142owy kod, spr\u00f3buj ponownie."
+            },
+            "step": {
+                "init": {
+                    "description": "Prosz\u0119 wybra\u0107 jedn\u0105 z us\u0142ugi powiadamiania:",
+                    "title": "Skonfiguruj has\u0142o jednorazowe dostarczone przez komponent powiadomie\u0144"
+                },
+                "setup": {
+                    "description": "Has\u0142o jednorazowe zosta\u0142o wys\u0142ane przez ** powiadom. {notify_service} **. Wpisz je poni\u017cej:",
+                    "title": "Sprawd\u017a konfiguracj\u0119"
+                }
+            }
+        },
         "totp": {
             "error": {
                 "invalid_code": "Nieprawid\u0142owy kod, spr\u00f3buj ponownie. Je\u015bli b\u0142\u0105d b\u0119dzie si\u0119 powtarza\u0142, upewnij si\u0119, \u017ce czas zegara systemu Home Assistant jest prawid\u0142owy."
diff --git a/homeassistant/components/auth/.translations/ru.json b/homeassistant/components/auth/.translations/ru.json
index a716425f345..edf136bd7f3 100644
--- a/homeassistant/components/auth/.translations/ru.json
+++ b/homeassistant/components/auth/.translations/ru.json
@@ -1,5 +1,24 @@
 {
     "mfa_setup": {
+        "notify": {
+            "abort": {
+                "no_available_service": "\u041d\u0435\u0442 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u0445 \u0441\u043b\u0443\u0436\u0431 \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0439."
+            },
+            "error": {
+                "invalid_code": "\u041d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u044b\u0439 \u043a\u043e\u0434, \u043f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u0435 \u043f\u043e\u043f\u044b\u0442\u043a\u0443."
+            },
+            "step": {
+                "init": {
+                    "description": "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043e\u0434\u043d\u0443 \u0438\u0437 \u0441\u043b\u0443\u0436\u0431 \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0439:",
+                    "title": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0434\u043e\u0441\u0442\u0430\u0432\u043a\u0438 \u043e\u0434\u043d\u043e\u0440\u0430\u0437\u043e\u0432\u044b\u0445 \u043f\u0430\u0440\u043e\u043b\u0435\u0439 \u0447\u0435\u0440\u0435\u0437 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442 \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0439"
+                },
+                "setup": {
+                    "description": "\u041e\u0434\u043d\u043e\u0440\u0430\u0437\u043e\u0432\u044b\u0439 \u043f\u0430\u0440\u043e\u043b\u044c \u043e\u0442\u043f\u0440\u0430\u0432\u043b\u0435\u043d \u0447\u0435\u0440\u0435\u0437 **notify.{notify_service}**. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0432\u0432\u0435\u0434\u0438\u0442\u0435 \u0435\u0433\u043e \u043d\u0438\u0436\u0435:",
+                    "title": "\u041f\u0440\u043e\u0432\u0435\u0440\u0438\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0443"
+                }
+            },
+            "title": "\u0414\u043e\u0441\u0442\u0430\u0432\u043a\u0430 \u043e\u0434\u043d\u043e\u0440\u0430\u0437\u043e\u0432\u044b\u0445 \u043f\u0430\u0440\u043e\u043b\u0435\u0439"
+        },
         "totp": {
             "error": {
                 "invalid_code": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u043a\u043e\u0434. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0441\u043d\u043e\u0432\u0430. \u0415\u0441\u043b\u0438 \u0432\u044b \u043f\u043e\u0441\u0442\u043e\u044f\u043d\u043d\u043e \u043f\u043e\u043b\u0443\u0447\u0430\u0435\u0442\u0435 \u044d\u0442\u0443 \u043e\u0448\u0438\u0431\u043a\u0443, \u043f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0443\u0431\u0435\u0434\u0438\u0442\u0435\u0441\u044c, \u0447\u0442\u043e \u0447\u0430\u0441\u044b \u0432 \u0432\u0430\u0448\u0435\u0439 \u0441\u0438\u0441\u0442\u0435\u043c\u0435 Home Assistant \u043f\u043e\u043a\u0430\u0437\u044b\u0432\u0430\u044e\u0442 \u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u043e\u0435 \u0432\u0440\u0435\u043c\u044f."
diff --git a/homeassistant/components/auth/.translations/sl.json b/homeassistant/components/auth/.translations/sl.json
index 45b57a772f9..2efc23f78f6 100644
--- a/homeassistant/components/auth/.translations/sl.json
+++ b/homeassistant/components/auth/.translations/sl.json
@@ -1,5 +1,24 @@
 {
     "mfa_setup": {
+        "notify": {
+            "abort": {
+                "no_available_service": "Ni na voljo storitev obve\u0161\u010danja."
+            },
+            "error": {
+                "invalid_code": "Neveljavna koda, poskusite znova."
+            },
+            "step": {
+                "init": {
+                    "description": "Prosimo, izberite eno od storitev obve\u0161\u010danja:",
+                    "title": "Nastavite enkratno geslo, ki ga dostavite z obvestilno komponento"
+                },
+                "setup": {
+                    "description": "Enkratno geslo je poslal **notify.{notify_service} **. Vnesite ga spodaj:",
+                    "title": "Preverite nastavitev"
+                }
+            },
+            "title": "Obvesti Enkratno Geslo"
+        },
         "totp": {
             "error": {
                 "invalid_code": "Neveljavna koda, prosimo, poskusite znova. \u010ce dobite to sporo\u010dilo ve\u010dkrat, prosimo poskrbite, da bo ura va\u0161ega Home Assistenta to\u010dna."
diff --git a/homeassistant/components/auth/.translations/sv.json b/homeassistant/components/auth/.translations/sv.json
index cf8227c09a3..604ae3c4fe5 100644
--- a/homeassistant/components/auth/.translations/sv.json
+++ b/homeassistant/components/auth/.translations/sv.json
@@ -1,5 +1,19 @@
 {
     "mfa_setup": {
+        "notify": {
+            "abort": {
+                "no_available_service": "Inga tillg\u00e4ngliga meddelande tj\u00e4nster."
+            },
+            "error": {
+                "invalid_code": "Ogiltig kod, var god f\u00f6rs\u00f6k igen."
+            },
+            "step": {
+                "setup": {
+                    "description": "Ett eng\u00e5ngsl\u00f6senord har skickats av **notify.{notify_service}**. V\u00e4nligen ange det nedan:",
+                    "title": "Verifiera installationen"
+                }
+            }
+        },
         "totp": {
             "error": {
                 "invalid_code": "Ogiltig kod, f\u00f6rs\u00f6k igen. Om du flera g\u00e5nger i rad f\u00e5r detta fel, se till att klockan i din Home Assistant \u00e4r korrekt inst\u00e4lld."
diff --git a/homeassistant/components/auth/.translations/zh-Hans.json b/homeassistant/components/auth/.translations/zh-Hans.json
index c5b397a8e12..d2a1b97b9b7 100644
--- a/homeassistant/components/auth/.translations/zh-Hans.json
+++ b/homeassistant/components/auth/.translations/zh-Hans.json
@@ -1,5 +1,24 @@
 {
     "mfa_setup": {
+        "notify": {
+            "abort": {
+                "no_available_service": "\u6ca1\u6709\u53ef\u7528\u7684\u901a\u77e5\u670d\u52a1\u3002"
+            },
+            "error": {
+                "invalid_code": "\u4ee3\u7801\u65e0\u6548\uff0c\u8bf7\u518d\u8bd5\u4e00\u6b21\u3002"
+            },
+            "step": {
+                "init": {
+                    "description": "\u8bf7\u9009\u62e9\u4ee5\u4e0b\u4e00\u4e2a\u901a\u77e5\u670d\u52a1\uff1a",
+                    "title": "\u8bbe\u7f6e\u7531\u901a\u77e5\u7ec4\u4ef6\u4f20\u9012\u7684\u4e00\u6b21\u6027\u5bc6\u7801"
+                },
+                "setup": {
+                    "description": "\u4e00\u6b21\u6027\u5bc6\u7801\u5df2\u7531 **notify.{notify_service}**\u53d1\u9001\u3002\u8bf7\u5728\u4e0b\u9762\u8f93\u5165:",
+                    "title": "\u9a8c\u8bc1\u8bbe\u7f6e"
+                }
+            },
+            "title": "\u4e00\u6b21\u6027\u5bc6\u7801\u901a\u77e5"
+        },
         "totp": {
             "error": {
                 "invalid_code": "\u53e3\u4ee4\u65e0\u6548\uff0c\u8bf7\u91cd\u65b0\u8f93\u5165\u3002\u5982\u679c\u9519\u8bef\u53cd\u590d\u51fa\u73b0\uff0c\u8bf7\u786e\u4fdd Home Assistant \u7cfb\u7edf\u7684\u65f6\u95f4\u51c6\u786e\u65e0\u8bef\u3002"
diff --git a/homeassistant/components/auth/.translations/zh-Hant.json b/homeassistant/components/auth/.translations/zh-Hant.json
index ef41ea87248..e791f20a738 100644
--- a/homeassistant/components/auth/.translations/zh-Hant.json
+++ b/homeassistant/components/auth/.translations/zh-Hant.json
@@ -1,5 +1,24 @@
 {
     "mfa_setup": {
+        "notify": {
+            "abort": {
+                "no_available_service": "\u6c92\u6709\u53ef\u7528\u7684\u901a\u77e5\u670d\u52d9\u3002"
+            },
+            "error": {
+                "invalid_code": "\u9a57\u8b49\u78bc\u7121\u6548\uff0c\u8acb\u518d\u8a66\u4e00\u6b21\u3002"
+            },
+            "step": {
+                "init": {
+                    "description": "\u8acb\u9078\u64c7\u4e00\u9805\u901a\u77e5\u670d\u52d9\uff1a",
+                    "title": "\u8a2d\u5b9a\u4e00\u6b21\u6027\u5bc6\u78bc\u50b3\u9001\u7d44\u4ef6"
+                },
+                "setup": {
+                    "description": "\u4e00\u6b21\u6027\u5bc6\u78bc\u5df2\u900f\u904e **notify.{notify_service}** \u50b3\u9001\u3002\u8acb\u65bc\u4e0b\u65b9\u8f38\u5165\uff1a",
+                    "title": "\u9a57\u8b49\u8a2d\u5b9a"
+                }
+            },
+            "title": "\u901a\u77e5\u4e00\u6b21\u6027\u5bc6\u78bc"
+        },
         "totp": {
             "error": {
                 "invalid_code": "\u9a57\u8b49\u78bc\u7121\u6548\uff0c\u8acb\u518d\u8a66\u4e00\u6b21\u3002\u5047\u5982\u932f\u8aa4\u6301\u7e8c\u767c\u751f\uff0c\u8acb\u5148\u78ba\u5b9a\u60a8\u7684 Home Assistant \u7cfb\u7d71\u4e0a\u7684\u6642\u9593\u8a2d\u5b9a\u6b63\u78ba\u5f8c\uff0c\u518d\u8a66\u4e00\u6b21\u3002"
diff --git a/homeassistant/components/cast/.translations/de.json b/homeassistant/components/cast/.translations/de.json
index a37dbd6f5b7..ac1ebbeb236 100644
--- a/homeassistant/components/cast/.translations/de.json
+++ b/homeassistant/components/cast/.translations/de.json
@@ -6,7 +6,7 @@
         },
         "step": {
             "confirm": {
-                "description": "M\u00f6chten Sie Google Cast einrichten?",
+                "description": "M\u00f6chtest du Google Cast einrichten?",
                 "title": "Google Cast"
             }
         },
diff --git a/homeassistant/components/deconz/.translations/he.json b/homeassistant/components/deconz/.translations/he.json
index b4b3d54e075..89a2d69950e 100644
--- a/homeassistant/components/deconz/.translations/he.json
+++ b/homeassistant/components/deconz/.translations/he.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "already_configured": "\u05d4\u05de\u05d2\u05e9\u05e8 \u05db\u05d1\u05e8 \u05de\u05d5\u05d2\u05d3\u05e8",
-            "no_bridges": "\u05dc\u05d0 \u05e0\u05de\u05e6\u05d0\u05d5 \u05de\u05d2\u05e9\u05e8\u05d9 deCONZ"
+            "no_bridges": "\u05dc\u05d0 \u05e0\u05de\u05e6\u05d0\u05d5 \u05de\u05d2\u05e9\u05e8\u05d9 deCONZ",
+            "one_instance_only": "\u05d4\u05e8\u05db\u05d9\u05d1 \u05ea\u05d5\u05de\u05da \u05e8\u05e7 \u05d0\u05d7\u05d3 deCONZ \u05dc\u05de\u05e9\u05dc"
         },
         "error": {
             "no_key": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05d4\u05d9\u05d4 \u05dc\u05e7\u05d1\u05dc \u05de\u05e4\u05ea\u05d7 API"
diff --git a/homeassistant/components/hangouts/.translations/he.json b/homeassistant/components/hangouts/.translations/he.json
new file mode 100644
index 00000000000..28326d97142
--- /dev/null
+++ b/homeassistant/components/hangouts/.translations/he.json
@@ -0,0 +1,29 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Google Hangouts \u05db\u05d1\u05e8 \u05de\u05d5\u05d2\u05d3\u05e8",
+            "unknown": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05dc\u05d0 \u05d9\u05d3\u05d5\u05e2\u05d4."
+        },
+        "error": {
+            "invalid_2fa": "\u05d0\u05d9\u05de\u05d5\u05ea \u05d3\u05d5 \u05e9\u05dc\u05d1\u05d9 \u05dc\u05d0 \u05d7\u05d5\u05e7\u05d9, \u05d1\u05d1\u05e7\u05e9\u05d4 \u05e0\u05e1\u05d4 \u05e9\u05d5\u05d1.",
+            "invalid_2fa_method": "\u05d3\u05e8\u05da \u05dc\u05d0\u05d9\u05de\u05d5\u05ea \u05d3\u05d5 \u05e9\u05dc\u05d1\u05d9 \u05dc\u05d0 \u05d7\u05d5\u05e7\u05d9\u05ea (\u05d0\u05de\u05ea \u05d1\u05d8\u05dc\u05e4\u05d5\u05df).",
+            "invalid_login": "\u05db\u05e0\u05d9\u05e1\u05d4 \u05dc\u05d0 \u05d7\u05d5\u05e7\u05d9\u05ea, \u05e0\u05e1\u05d4 \u05e9\u05d5\u05d1."
+        },
+        "step": {
+            "2fa": {
+                "data": {
+                    "2fa": "\u05e7\u05d5\u05d3 \u05d0\u05d9\u05de\u05d5\u05ea \u05d3\u05d5 \u05e9\u05dc\u05d1\u05d9"
+                },
+                "title": "\u05d0\u05d9\u05de\u05d5\u05ea \u05d3\u05d5 \u05e9\u05dc\u05d1\u05d9"
+            },
+            "user": {
+                "data": {
+                    "email": "\u05db\u05ea\u05d5\u05d1\u05ea \u05d3\u05d5\u05d0\"\u05dc",
+                    "password": "\u05e1\u05d9\u05e1\u05de\u05d4"
+                },
+                "title": "\u05d4\u05ea\u05d7\u05d1\u05e8\u05d5\u05ea \u05dc- Google Hangouts"
+            }
+        },
+        "title": "Google Hangouts"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/hangouts/.translations/pl.json b/homeassistant/components/hangouts/.translations/pl.json
index a8314761f8d..5e0ecfa2900 100644
--- a/homeassistant/components/hangouts/.translations/pl.json
+++ b/homeassistant/components/hangouts/.translations/pl.json
@@ -14,6 +14,7 @@
                 "data": {
                     "2fa": "PIN"
                 },
+                "description": "Pusty",
                 "title": "Uwierzytelnianie dwusk\u0142adnikowe"
             },
             "user": {
@@ -21,6 +22,7 @@
                     "email": "Adres e-mail",
                     "password": "Has\u0142o"
                 },
+                "description": "Pusty",
                 "title": "Logowanie do Google Hangouts"
             }
         },
diff --git a/homeassistant/components/homematicip_cloud/.translations/de.json b/homeassistant/components/homematicip_cloud/.translations/de.json
index 6b3b9b09480..bd600f7d2ef 100644
--- a/homeassistant/components/homematicip_cloud/.translations/de.json
+++ b/homeassistant/components/homematicip_cloud/.translations/de.json
@@ -6,10 +6,10 @@
             "unknown": "Ein unbekannter Fehler ist aufgetreten."
         },
         "error": {
-            "invalid_pin": "Ung\u00fcltige PIN, bitte versuchen Sie es erneut.",
-            "press_the_button": "Bitte dr\u00fccken Sie die blaue Taste.",
-            "register_failed": "Registrierung fehlgeschlagen, bitte versuchen Sie es erneut.",
-            "timeout_button": "Zeit\u00fcberschreitung beim Dr\u00fccken der blauen Taste. Bitte versuchen Sie es erneut."
+            "invalid_pin": "Ung\u00fcltige PIN, bitte versuche es erneut.",
+            "press_the_button": "Bitte dr\u00fccke die blaue Taste.",
+            "register_failed": "Registrierung fehlgeschlagen, bitte versuche es erneut.",
+            "timeout_button": "Zeit\u00fcberschreitung beim Dr\u00fccken der blauen Taste. Bitte versuche es erneut."
         },
         "step": {
             "init": {
@@ -21,7 +21,7 @@
                 "title": "HometicIP Accesspoint ausw\u00e4hlen"
             },
             "link": {
-                "description": "Dr\u00fccken Sie den blauen Taster auf dem Accesspoint, sowie den Senden Button um HomematicIP mit Home Assistant zu verbinden.\n\n![Position des Tasters auf dem AP](/static/images/config_flows/config_homematicip_cloud.png)",
+                "description": "Dr\u00fccke den blauen Taster auf dem Accesspoint, sowie den Senden Button um HomematicIP mit Home Assistant zu verbinden.\n\n![Position des Tasters auf dem AP](/static/images/config_flows/config_homematicip_cloud.png)",
                 "title": "Verkn\u00fcpfe den Accesspoint"
             }
         },
diff --git a/homeassistant/components/homematicip_cloud/.translations/he.json b/homeassistant/components/homematicip_cloud/.translations/he.json
index 50d5c61b576..c60294e21d5 100644
--- a/homeassistant/components/homematicip_cloud/.translations/he.json
+++ b/homeassistant/components/homematicip_cloud/.translations/he.json
@@ -2,6 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "\u05e0\u05e7\u05d5\u05d3\u05ea \u05d4\u05d2\u05d9\u05e9\u05d4 \u05db\u05d1\u05e8 \u05de\u05d5\u05d2\u05d3\u05e8\u05ea",
+            "connection_aborted": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d4\u05ea\u05d7\u05d1\u05e8 \u05dc\u05e9\u05e8\u05ea HMIP",
             "unknown": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05e9\u05d2\u05d9\u05d0\u05d4 \u05dc\u05d0 \u05d9\u05d3\u05d5\u05e2\u05d4."
         },
         "error": {
diff --git a/homeassistant/components/ios/.translations/he.json b/homeassistant/components/ios/.translations/he.json
new file mode 100644
index 00000000000..e786e5ae843
--- /dev/null
+++ b/homeassistant/components/ios/.translations/he.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\u05e8\u05e7 \u05d4\u05d2\u05d3\u05e8\u05d4 \u05d0\u05d7\u05ea \u05e9\u05dc Home Assistant iOS \u05e0\u05d7\u05d5\u05e6\u05d4."
+        },
+        "step": {
+            "confirm": {
+                "description": "\u05d4\u05d0\u05dd \u05d1\u05e8\u05e6\u05d5\u05e0\u05da \u05dc\u05d4\u05d2\u05d3\u05d9\u05e8 \u05d0\u05ea Home Assistant iOS?",
+                "title": "Home Assistant iOS"
+            }
+        },
+        "title": "Home Assistant iOS"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ios/.translations/sl.json b/homeassistant/components/ios/.translations/sl.json
new file mode 100644
index 00000000000..28e9102aafd
--- /dev/null
+++ b/homeassistant/components/ios/.translations/sl.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Potrebna je samo ena konfiguracija Home Assistant iOS."
+        },
+        "step": {
+            "confirm": {
+                "description": "Ali \u017eelite nastaviti komponento za Home Assistant iOS?",
+                "title": "Home Assistant iOS"
+            }
+        },
+        "title": "Home Assistant iOS"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ios/.translations/sv.json b/homeassistant/components/ios/.translations/sv.json
new file mode 100644
index 00000000000..6806f9bab90
--- /dev/null
+++ b/homeassistant/components/ios/.translations/sv.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "confirm": {
+                "description": "Vill du konfigurera Home Assistants iOS komponent?",
+                "title": "Home Assistant iOS"
+            }
+        },
+        "title": "Home Assistant iOS"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/mqtt/.translations/ca.json b/homeassistant/components/mqtt/.translations/ca.json
index 57e9a83d201..b6c73f35f26 100644
--- a/homeassistant/components/mqtt/.translations/ca.json
+++ b/homeassistant/components/mqtt/.translations/ca.json
@@ -10,6 +10,7 @@
             "broker": {
                 "data": {
                     "broker": "Broker",
+                    "discovery": "Activar descobreix automaticament",
                     "password": "Contrasenya",
                     "port": "Port",
                     "username": "Nom d'usuari"
diff --git a/homeassistant/components/mqtt/.translations/de.json b/homeassistant/components/mqtt/.translations/de.json
index 15b6b3b9731..eeff1ca3041 100644
--- a/homeassistant/components/mqtt/.translations/de.json
+++ b/homeassistant/components/mqtt/.translations/de.json
@@ -1,5 +1,11 @@
 {
     "config": {
+        "abort": {
+            "single_instance_allowed": "Nur eine einzige Konfiguration von MQTT ist zul\u00e4ssig."
+        },
+        "error": {
+            "cannot_connect": "Es konnte keine Verbindung zum Broker hergestellt werden."
+        },
         "step": {
             "broker": {
                 "data": {
diff --git a/homeassistant/components/mqtt/.translations/fr.json b/homeassistant/components/mqtt/.translations/fr.json
index 1870c598e3b..916b4fdaf39 100644
--- a/homeassistant/components/mqtt/.translations/fr.json
+++ b/homeassistant/components/mqtt/.translations/fr.json
@@ -10,6 +10,7 @@
             "broker": {
                 "data": {
                     "broker": "Broker",
+                    "discovery": "Activer la d\u00e9couverte automatique",
                     "password": "Mot de passe",
                     "port": "Port",
                     "username": "Nom d'utilisateur"
diff --git a/homeassistant/components/mqtt/.translations/he.json b/homeassistant/components/mqtt/.translations/he.json
new file mode 100644
index 00000000000..e1e2ed49748
--- /dev/null
+++ b/homeassistant/components/mqtt/.translations/he.json
@@ -0,0 +1,24 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\u05e8\u05e7 \u05d4\u05d2\u05d3\u05e8\u05d4 \u05d0\u05d7\u05ea \u05e9\u05dc MQTT \u05de\u05d5\u05ea\u05e8\u05ea."
+        },
+        "error": {
+            "cannot_connect": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d4\u05ea\u05d7\u05d1\u05e8 \u05dc\u05d1\u05e8\u05d5\u05e7\u05e8."
+        },
+        "step": {
+            "broker": {
+                "data": {
+                    "broker": "\u05d1\u05e8\u05d5\u05e7\u05e8",
+                    "discovery": "\u05d0\u05e4\u05e9\u05e8 \u05d2\u05d9\u05dc\u05d5\u05d9",
+                    "password": "\u05e1\u05d9\u05e1\u05de\u05d4",
+                    "port": "\u05e4\u05d5\u05e8\u05d8",
+                    "username": "\u05e9\u05dd \u05de\u05e9\u05ea\u05de\u05e9"
+                },
+                "description": "\u05e0\u05d0 \u05dc\u05d4\u05d6\u05d9\u05df \u05d0\u05ea \u05e4\u05e8\u05d8\u05d9 \u05d4\u05d7\u05d9\u05d1\u05d5\u05e8 \u05e9\u05dc \u05d4\u05d1\u05e8\u05d5\u05e7\u05e8 MQTT \u05e9\u05dc\u05da.",
+                "title": "MQTT"
+            }
+        },
+        "title": "MQTT"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/mqtt/.translations/lb.json b/homeassistant/components/mqtt/.translations/lb.json
index 82a10194667..166fce9fbfb 100644
--- a/homeassistant/components/mqtt/.translations/lb.json
+++ b/homeassistant/components/mqtt/.translations/lb.json
@@ -10,6 +10,7 @@
             "broker": {
                 "data": {
                     "broker": "Broker",
+                    "discovery": "Entdeckung aktiv\u00e9ieren",
                     "password": "Passwuert",
                     "port": "Port",
                     "username": "Benotzernumm"
diff --git a/homeassistant/components/mqtt/.translations/pl.json b/homeassistant/components/mqtt/.translations/pl.json
index f3ccaf8f37e..e87e550b98d 100644
--- a/homeassistant/components/mqtt/.translations/pl.json
+++ b/homeassistant/components/mqtt/.translations/pl.json
@@ -10,6 +10,7 @@
             "broker": {
                 "data": {
                     "broker": "Po\u015brednik",
+                    "discovery": "W\u0142\u0105cz wykrywanie",
                     "password": "Has\u0142o",
                     "port": "Port",
                     "username": "Nazwa u\u017cytkownika"
diff --git a/homeassistant/components/mqtt/.translations/ru.json b/homeassistant/components/mqtt/.translations/ru.json
index c9dc3c2fd60..f1ff498dd72 100644
--- a/homeassistant/components/mqtt/.translations/ru.json
+++ b/homeassistant/components/mqtt/.translations/ru.json
@@ -10,6 +10,7 @@
             "broker": {
                 "data": {
                     "broker": "\u0411\u0440\u043e\u043a\u0435\u0440",
+                    "discovery": "\u0420\u0430\u0437\u0440\u0435\u0448\u0438\u0442\u044c \u043e\u0431\u043d\u0430\u0440\u0443\u0436\u0435\u043d\u0438\u0435",
                     "password": "\u041f\u0430\u0440\u043e\u043b\u044c",
                     "port": "\u041f\u043e\u0440\u0442",
                     "username": "\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f"
diff --git a/homeassistant/components/mqtt/.translations/sl.json b/homeassistant/components/mqtt/.translations/sl.json
new file mode 100644
index 00000000000..a12498ac4c2
--- /dev/null
+++ b/homeassistant/components/mqtt/.translations/sl.json
@@ -0,0 +1,24 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Dovoljena je samo ena konfiguracija MQTT."
+        },
+        "error": {
+            "cannot_connect": "Ne morem se povezati na posrednik."
+        },
+        "step": {
+            "broker": {
+                "data": {
+                    "broker": "Posrednik",
+                    "discovery": "Omogo\u010di odkrivanje",
+                    "password": "Geslo",
+                    "port": "port",
+                    "username": "Uporabni\u0161ko ime"
+                },
+                "description": "Prosimo vnesite informacije o povezavi va\u0161ega MQTT posrednika.",
+                "title": "MQTT"
+            }
+        },
+        "title": "MQTT"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/mqtt/.translations/sv.json b/homeassistant/components/mqtt/.translations/sv.json
new file mode 100644
index 00000000000..7cf6d75b9c1
--- /dev/null
+++ b/homeassistant/components/mqtt/.translations/sv.json
@@ -0,0 +1,13 @@
+{
+    "config": {
+        "step": {
+            "broker": {
+                "data": {
+                    "password": "L\u00f6senord",
+                    "port": "Port",
+                    "username": "Anv\u00e4ndarnamn"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/mqtt/.translations/zh-Hans.json b/homeassistant/components/mqtt/.translations/zh-Hans.json
index f539bd2a630..98a7d9eb4be 100644
--- a/homeassistant/components/mqtt/.translations/zh-Hans.json
+++ b/homeassistant/components/mqtt/.translations/zh-Hans.json
@@ -10,6 +10,7 @@
             "broker": {
                 "data": {
                     "broker": "\u670d\u52a1\u5668",
+                    "discovery": "\u542f\u7528\u53d1\u73b0",
                     "password": "\u5bc6\u7801",
                     "port": "\u7aef\u53e3",
                     "username": "\u7528\u6237\u540d"
diff --git a/homeassistant/components/mqtt/.translations/zh-Hant.json b/homeassistant/components/mqtt/.translations/zh-Hant.json
index e6f27a439d5..cf87ceb8f98 100644
--- a/homeassistant/components/mqtt/.translations/zh-Hant.json
+++ b/homeassistant/components/mqtt/.translations/zh-Hant.json
@@ -10,6 +10,7 @@
             "broker": {
                 "data": {
                     "broker": "Broker",
+                    "discovery": "\u958b\u555f\u63a2\u7d22",
                     "password": "\u4f7f\u7528\u8005\u5bc6\u78bc",
                     "port": "\u901a\u8a0a\u57e0",
                     "username": "\u4f7f\u7528\u8005\u540d\u7a31"
diff --git a/homeassistant/components/nest/.translations/de.json b/homeassistant/components/nest/.translations/de.json
index 86b50ab3c10..975d15e4470 100644
--- a/homeassistant/components/nest/.translations/de.json
+++ b/homeassistant/components/nest/.translations/de.json
@@ -24,7 +24,7 @@
                 "data": {
                     "code": "PIN Code"
                 },
-                "description": "[Autorisieren Sie ihr Konto] ( {url} ), um ihren Nest-Account zu verkn\u00fcpfen.\n\n F\u00fcgen Sie anschlie\u00dfend den erhaltenen PIN Code hier ein.",
+                "description": "[Autorisiere dein Konto] ( {url} ), um deinen Nest-Account zu verkn\u00fcpfen.\n\n F\u00fcge anschlie\u00dfend den erhaltenen PIN Code hier ein.",
                 "title": "Nest-Konto verkn\u00fcpfen"
             }
         },
diff --git a/homeassistant/components/openuv/.translations/de.json b/homeassistant/components/openuv/.translations/de.json
index 1f81ac30f53..7f8121dd96b 100644
--- a/homeassistant/components/openuv/.translations/de.json
+++ b/homeassistant/components/openuv/.translations/de.json
@@ -11,7 +11,8 @@
                     "elevation": "H\u00f6he",
                     "latitude": "Breitengrad",
                     "longitude": "L\u00e4ngengrad"
-                }
+                },
+                "title": "Gebe deine Informationen ein"
             }
         },
         "title": "OpenUV"
diff --git a/homeassistant/components/openuv/.translations/he.json b/homeassistant/components/openuv/.translations/he.json
new file mode 100644
index 00000000000..262a3d732a2
--- /dev/null
+++ b/homeassistant/components/openuv/.translations/he.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "error": {
+            "identifier_exists": "\u05d4\u05e7\u05d5\u05d0\u05d5\u05e8\u05d3\u05d9\u05e0\u05d8\u05d5\u05ea \u05db\u05d1\u05e8 \u05e8\u05e9\u05d5\u05de\u05d5\u05ea",
+            "invalid_api_key": "\u05de\u05e4\u05ea\u05d7 API \u05dc\u05d0 \u05d7\u05d5\u05e7\u05d9"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "\u05de\u05e4\u05ea\u05d7 API \u05e9\u05dc OpenUV",
+                    "elevation": "\u05d2\u05d5\u05d1\u05d4 \u05de\u05e2\u05dc \u05e4\u05e0\u05d9 \u05d4\u05d9\u05dd",
+                    "latitude": "\u05e7\u05d5 \u05e8\u05d5\u05d7\u05d1",
+                    "longitude": "\u05e7\u05d5 \u05d0\u05d5\u05e8\u05da"
+                },
+                "title": "\u05de\u05dc\u05d0 \u05d0\u05ea \u05d4\u05e4\u05e8\u05d8\u05d9\u05dd \u05e9\u05dc\u05da"
+            }
+        },
+        "title": "OpenUV"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/sensor/.translations/moon.he.json b/homeassistant/components/sensor/.translations/moon.he.json
index 60999f83645..6531d3c8265 100644
--- a/homeassistant/components/sensor/.translations/moon.he.json
+++ b/homeassistant/components/sensor/.translations/moon.he.json
@@ -3,6 +3,10 @@
         "first_quarter": "\u05e8\u05d1\u05e2\u05d5\u05df \u05e8\u05d0\u05e9\u05d5\u05df",
         "full_moon": "\u05d9\u05e8\u05d7 \u05de\u05dc\u05d0",
         "last_quarter": "\u05e8\u05d1\u05e2\u05d5\u05df \u05d0\u05d7\u05e8\u05d5\u05df",
-        "new_moon": "\u05e8\u05d0\u05e9 \u05d7\u05d5\u05d3\u05e9"
+        "new_moon": "\u05e8\u05d0\u05e9 \u05d7\u05d5\u05d3\u05e9",
+        "waning_crescent": "Waning crescent",
+        "waning_gibbous": "Waning gibbous",
+        "waxing_crescent": "Waxing crescent",
+        "waxing_gibbous": "Waxing gibbous"
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/sonos/.translations/de.json b/homeassistant/components/sonos/.translations/de.json
index dd44fca5888..920d25a3bfa 100644
--- a/homeassistant/components/sonos/.translations/de.json
+++ b/homeassistant/components/sonos/.translations/de.json
@@ -6,7 +6,7 @@
         },
         "step": {
             "confirm": {
-                "description": "M\u00f6chten Sie Sonos einrichten?",
+                "description": "M\u00f6chtest du Sonos einrichten?",
                 "title": "Sonos"
             }
         },
diff --git a/homeassistant/components/tradfri/.translations/de.json b/homeassistant/components/tradfri/.translations/de.json
new file mode 100644
index 00000000000..5284ae18b6d
--- /dev/null
+++ b/homeassistant/components/tradfri/.translations/de.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Bridge ist bereits konfiguriert"
+        },
+        "error": {
+            "cannot_connect": "Verbindung zum Gateway nicht m\u00f6glich.",
+            "invalid_key": "Fehler beim Registrieren mit dem angegebenen Schl\u00fcssel. Wenn dies weiterhin geschieht, versuche, das Gateway neu zu starten.",
+            "timeout": "Timeout bei der \u00dcberpr\u00fcfung des Codes."
+        },
+        "step": {
+            "auth": {
+                "data": {
+                    "security_code": "Sicherheitscode"
+                },
+                "description": "Du findest den Sicherheitscode auf der R\u00fcckseite deines Gateways.",
+                "title": "Sicherheitscode eingeben"
+            }
+        },
+        "title": "IKEA TR\u00c5DFRI"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tradfri/.translations/he.json b/homeassistant/components/tradfri/.translations/he.json
new file mode 100644
index 00000000000..09af3d09bdc
--- /dev/null
+++ b/homeassistant/components/tradfri/.translations/he.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "\u05d4\u05de\u05d2\u05e9\u05e8 \u05db\u05d1\u05e8 \u05de\u05d5\u05d2\u05d3\u05e8"
+        },
+        "error": {
+            "cannot_connect": "\u05dc\u05d0 \u05e0\u05d9\u05ea\u05df \u05dc\u05d4\u05ea\u05d7\u05d1\u05e8 \u05dc\u05de\u05d2\u05e9\u05e8",
+            "invalid_key": "\u05d4\u05e8\u05d9\u05e9\u05d5\u05dd \u05e0\u05db\u05e9\u05dc \u05e2\u05dd \u05d4\u05de\u05e4\u05ea\u05d7 \u05e9\u05e1\u05d5\u05e4\u05e7. \u05d0\u05dd \u05d6\u05d4 \u05e7\u05d5\u05e8\u05d4 \u05e9\u05d5\u05d1, \u05e0\u05e1\u05d4 \u05dc\u05d4\u05e4\u05e2\u05d9\u05dc \u05de\u05d7\u05d3\u05e9 \u05d0\u05ea \u05d4\u05de\u05d2\u05e9\u05e8.",
+            "timeout": "\u05e2\u05d1\u05e8 \u05d4\u05d6\u05de\u05df \u05d4\u05e7\u05e6\u05d5\u05d1 \u05dc\u05d0\u05d9\u05de\u05d5\u05ea \u05d4\u05e7\u05d5\u05d3"
+        },
+        "step": {
+            "auth": {
+                "data": {
+                    "host": "\u05de\u05d0\u05e8\u05d7",
+                    "security_code": "\u05e7\u05d5\u05d3 \u05d0\u05d1\u05d8\u05d7\u05d4"
+                },
+                "description": "\u05ea\u05d5\u05db\u05dc \u05dc\u05de\u05e6\u05d5\u05d0 \u05d0\u05ea \u05e7\u05d5\u05d3 \u05d4\u05d0\u05d1\u05d8\u05d7\u05d4 \u05d1\u05d2\u05d1 \u05d4\u05de\u05d2\u05e9\u05e8 \u05e9\u05dc\u05da.",
+                "title": "\u05d4\u05d6\u05df \u05e7\u05d5\u05d3 \u05d0\u05d1\u05d8\u05d7\u05d4"
+            }
+        },
+        "title": "IKEA TR\u00c5DFRI"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tradfri/.translations/pl.json b/homeassistant/components/tradfri/.translations/pl.json
new file mode 100644
index 00000000000..ec253447ef4
--- /dev/null
+++ b/homeassistant/components/tradfri/.translations/pl.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Mostek jest ju\u017c skonfigurowany"
+        },
+        "error": {
+            "cannot_connect": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z bram\u0105.",
+            "invalid_key": "Rejestracja si\u0119 nie powiod\u0142a z podanym kluczem. Je\u015bli tak si\u0119 stanie, spr\u00f3buj ponownie uruchomi\u0107 bramk\u0119.",
+            "timeout": "Min\u0105\u0142 limit czasu sprawdzania poprawno\u015bci kodu"
+        },
+        "step": {
+            "auth": {
+                "data": {
+                    "host": "Host",
+                    "security_code": "Kod bezpiecze\u0144stwa"
+                },
+                "description": "Mo\u017cesz znale\u017a\u0107 kod bezpiecze\u0144stwa z ty\u0142u bramy.",
+                "title": "Wprowad\u017a kod bezpiecze\u0144stwa"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tradfri/.translations/sl.json b/homeassistant/components/tradfri/.translations/sl.json
new file mode 100644
index 00000000000..ee2bf7d3d2b
--- /dev/null
+++ b/homeassistant/components/tradfri/.translations/sl.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Most je \u017ee konfiguriran"
+        },
+        "error": {
+            "cannot_connect": "Povezava s prehodom ni mogo\u010de.",
+            "invalid_key": "Ni se bilo mogo\u010de registrirati s prilo\u017eenim klju\u010dem. \u010ce se to dogaja, poskusite znova zagnati prehod.",
+            "timeout": "\u010casovna omejitev za potrditev kode je potekla."
+        },
+        "step": {
+            "auth": {
+                "data": {
+                    "host": "Gostitelj",
+                    "security_code": "Varnostna koda"
+                },
+                "description": "Varnostno kodo najdete na hrbtni strani va\u0161ega prehoda.",
+                "title": "Vnesite varnostno kodo"
+            }
+        },
+        "title": "IKEA TR\u00c5DFRI"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tradfri/.translations/sv.json b/homeassistant/components/tradfri/.translations/sv.json
new file mode 100644
index 00000000000..ffe8bff22b4
--- /dev/null
+++ b/homeassistant/components/tradfri/.translations/sv.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Bryggan \u00e4r redan konfigurerad"
+        },
+        "error": {
+            "cannot_connect": "Det gick inte att ansluta till gatewayen."
+        },
+        "step": {
+            "auth": {
+                "data": {
+                    "security_code": "S\u00e4kerhetskod"
+                },
+                "description": "Du kan hitta s\u00e4kerhetskoden p\u00e5 baksidan av din gateway.",
+                "title": "Ange s\u00e4kerhetskod"
+            }
+        },
+        "title": "IKEA TR\u00c5DFRI"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tradfri/.translations/zh-Hans.json b/homeassistant/components/tradfri/.translations/zh-Hans.json
index 28a9c676f2e..4791e46062a 100644
--- a/homeassistant/components/tradfri/.translations/zh-Hans.json
+++ b/homeassistant/components/tradfri/.translations/zh-Hans.json
@@ -7,6 +7,17 @@
             "cannot_connect": "\u65e0\u6cd5\u8fde\u63a5\u5230\u7f51\u5173\u3002",
             "invalid_key": "\u65e0\u6cd5\u7528\u63d0\u4f9b\u7684\u5bc6\u94a5\u6ce8\u518c\u3002\u5982\u679c\u9519\u8bef\u6301\u7eed\u53d1\u751f\uff0c\u8bf7\u5c1d\u8bd5\u91cd\u65b0\u542f\u52a8\u7f51\u5173\u3002",
             "timeout": "\u4ee3\u7801\u9a8c\u8bc1\u8d85\u65f6"
-        }
+        },
+        "step": {
+            "auth": {
+                "data": {
+                    "host": "\u4e3b\u673a",
+                    "security_code": "\u5b89\u5168\u7801"
+                },
+                "description": "\u60a8\u53ef\u4ee5\u5728\u7f51\u5173\u80cc\u9762\u627e\u5230\u5b89\u5168\u7801\u3002",
+                "title": "\u8f93\u5165\u5b89\u5168\u7801"
+            }
+        },
+        "title": "IKEA TR\u00c5DFRI"
     }
 }
\ No newline at end of file

From 9ab8f78b192bc47eb099b9d560029d422dfb6ce5 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Wed, 26 Sep 2018 17:20:34 +0200
Subject: [PATCH 318/357] Don't pass use_env=True (#16896)

---
 homeassistant/helpers/aiohttp_client.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/homeassistant/helpers/aiohttp_client.py b/homeassistant/helpers/aiohttp_client.py
index 01cc074aa6a..53b246c700d 100644
--- a/homeassistant/helpers/aiohttp_client.py
+++ b/homeassistant/helpers/aiohttp_client.py
@@ -56,7 +56,6 @@ def async_create_clientsession(hass, verify_ssl=True, auto_cleanup=True,
     clientsession = aiohttp.ClientSession(
         loop=hass.loop,
         connector=connector,
-        trust_env=True,
         headers={USER_AGENT: SERVER_SOFTWARE},
         **kwargs
     )

From d0ddc28f96276edd80c9da425d57acbd0c98f276 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Wed, 26 Sep 2018 17:58:44 +0200
Subject: [PATCH 319/357] Revert file mode write_json (#16897)

---
 homeassistant/util/json.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/homeassistant/util/json.py b/homeassistant/util/json.py
index 40f25689148..d6f7e149040 100644
--- a/homeassistant/util/json.py
+++ b/homeassistant/util/json.py
@@ -47,9 +47,7 @@ def save_json(filename: str, data: Union[List, Dict],
     """
     try:
         json_data = json.dumps(data, sort_keys=True, indent=4)
-        mode = 0o600 if private else 0o644
-        with open(os.open(filename, os.O_WRONLY | os.O_CREAT, mode),
-                  'w', encoding='utf-8') as fdesc:
+        with open(filename, 'w', encoding='utf-8') as fdesc:
             fdesc.write(json_data)
     except TypeError as error:
         _LOGGER.exception('Failed to serialize to JSON: %s',

From dd45e99302d93973f04514d02be3ee5d14bb9ea1 Mon Sep 17 00:00:00 2001
From: cdce8p <30130371+cdce8p@users.noreply.github.com>
Date: Wed, 26 Sep 2018 18:02:05 +0200
Subject: [PATCH 320/357] Remove service helper (4) (#16892)

* Update media_player

* Update lock

* Update notify

* Update remote

* Update scene

* Update vacuum

* Remove timer helpers

* Removed unused legacy helpers
---
 homeassistant/components/lock/__init__.py     |  36 ----
 .../components/media_player/__init__.py       | 162 ------------------
 homeassistant/components/notify/__init__.py   |  17 --
 homeassistant/components/remote/__init__.py   |  57 ------
 homeassistant/components/scene/__init__.py    |  12 --
 homeassistant/components/timer/__init__.py    |  60 -------
 homeassistant/components/vacuum/__init__.py   |  88 ----------
 tests/components/lock/common.py               |  45 +++++
 tests/components/lock/test_demo.py            |   8 +-
 tests/components/lock/test_mqtt.py            |   6 +-
 tests/components/media_player/common.py       | 150 ++++++++++++++++
 tests/components/media_player/test_demo.py    |  51 +++---
 tests/components/notify/common.py             |  24 +++
 tests/components/notify/test_demo.py          |   8 +-
 tests/components/remote/common.py             |  55 ++++++
 tests/components/remote/test_demo.py          |  10 +-
 tests/components/remote/test_init.py          |   8 +-
 tests/components/scene/common.py              |  19 ++
 tests/components/scene/test_init.py           |   7 +-
 tests/components/scene/test_litejet.py        |   5 +-
 tests/components/vacuum/common.py             | 101 +++++++++++
 tests/components/vacuum/test_demo.py          |  70 ++++----
 tests/components/vacuum/test_mqtt.py          |  20 ++-
 23 files changed, 499 insertions(+), 520 deletions(-)
 create mode 100644 tests/components/lock/common.py
 create mode 100644 tests/components/media_player/common.py
 create mode 100644 tests/components/notify/common.py
 create mode 100644 tests/components/remote/common.py
 create mode 100644 tests/components/scene/common.py
 create mode 100644 tests/components/vacuum/common.py

diff --git a/homeassistant/components/lock/__init__.py b/homeassistant/components/lock/__init__.py
index 3c4ff7cdedd..5218ea49c80 100644
--- a/homeassistant/components/lock/__init__.py
+++ b/homeassistant/components/lock/__init__.py
@@ -57,42 +57,6 @@ def is_locked(hass, entity_id=None):
     return hass.states.is_state(entity_id, STATE_LOCKED)
 
 
-@bind_hass
-def lock(hass, entity_id=None, code=None):
-    """Lock all or specified locks."""
-    data = {}
-    if code:
-        data[ATTR_CODE] = code
-    if entity_id:
-        data[ATTR_ENTITY_ID] = entity_id
-
-    hass.services.call(DOMAIN, SERVICE_LOCK, data)
-
-
-@bind_hass
-def unlock(hass, entity_id=None, code=None):
-    """Unlock all or specified locks."""
-    data = {}
-    if code:
-        data[ATTR_CODE] = code
-    if entity_id:
-        data[ATTR_ENTITY_ID] = entity_id
-
-    hass.services.call(DOMAIN, SERVICE_UNLOCK, data)
-
-
-@bind_hass
-def open_lock(hass, entity_id=None, code=None):
-    """Open all or specified locks."""
-    data = {}
-    if code:
-        data[ATTR_CODE] = code
-    if entity_id:
-        data[ATTR_ENTITY_ID] = entity_id
-
-    hass.services.call(DOMAIN, SERVICE_OPEN, data)
-
-
 @asyncio.coroutine
 def async_setup(hass, config):
     """Track states and offer events for locks."""
diff --git a/homeassistant/components/media_player/__init__.py b/homeassistant/components/media_player/__init__.py
index 831009ed8bf..235ca8d5b2d 100644
--- a/homeassistant/components/media_player/__init__.py
+++ b/homeassistant/components/media_player/__init__.py
@@ -192,168 +192,6 @@ def is_on(hass, entity_id=None):
                for entity_id in entity_ids)
 
 
-@bind_hass
-def turn_on(hass, entity_id=None):
-    """Turn on specified media player or all."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
-    hass.services.call(DOMAIN, SERVICE_TURN_ON, data)
-
-
-@bind_hass
-def turn_off(hass, entity_id=None):
-    """Turn off specified media player or all."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
-    hass.services.call(DOMAIN, SERVICE_TURN_OFF, data)
-
-
-@bind_hass
-def toggle(hass, entity_id=None):
-    """Toggle specified media player or all."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
-    hass.services.call(DOMAIN, SERVICE_TOGGLE, data)
-
-
-@bind_hass
-def volume_up(hass, entity_id=None):
-    """Send the media player the command for volume up."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
-    hass.services.call(DOMAIN, SERVICE_VOLUME_UP, data)
-
-
-@bind_hass
-def volume_down(hass, entity_id=None):
-    """Send the media player the command for volume down."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
-    hass.services.call(DOMAIN, SERVICE_VOLUME_DOWN, data)
-
-
-@bind_hass
-def mute_volume(hass, mute, entity_id=None):
-    """Send the media player the command for muting the volume."""
-    data = {ATTR_MEDIA_VOLUME_MUTED: mute}
-
-    if entity_id:
-        data[ATTR_ENTITY_ID] = entity_id
-
-    hass.services.call(DOMAIN, SERVICE_VOLUME_MUTE, data)
-
-
-@bind_hass
-def set_volume_level(hass, volume, entity_id=None):
-    """Send the media player the command for setting the volume."""
-    data = {ATTR_MEDIA_VOLUME_LEVEL: volume}
-
-    if entity_id:
-        data[ATTR_ENTITY_ID] = entity_id
-
-    hass.services.call(DOMAIN, SERVICE_VOLUME_SET, data)
-
-
-@bind_hass
-def media_play_pause(hass, entity_id=None):
-    """Send the media player the command for play/pause."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
-    hass.services.call(DOMAIN, SERVICE_MEDIA_PLAY_PAUSE, data)
-
-
-@bind_hass
-def media_play(hass, entity_id=None):
-    """Send the media player the command for play/pause."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
-    hass.services.call(DOMAIN, SERVICE_MEDIA_PLAY, data)
-
-
-@bind_hass
-def media_pause(hass, entity_id=None):
-    """Send the media player the command for pause."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
-    hass.services.call(DOMAIN, SERVICE_MEDIA_PAUSE, data)
-
-
-@bind_hass
-def media_stop(hass, entity_id=None):
-    """Send the media player the stop command."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
-    hass.services.call(DOMAIN, SERVICE_MEDIA_STOP, data)
-
-
-@bind_hass
-def media_next_track(hass, entity_id=None):
-    """Send the media player the command for next track."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
-    hass.services.call(DOMAIN, SERVICE_MEDIA_NEXT_TRACK, data)
-
-
-@bind_hass
-def media_previous_track(hass, entity_id=None):
-    """Send the media player the command for prev track."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
-    hass.services.call(DOMAIN, SERVICE_MEDIA_PREVIOUS_TRACK, data)
-
-
-@bind_hass
-def media_seek(hass, position, entity_id=None):
-    """Send the media player the command to seek in current playing media."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
-    data[ATTR_MEDIA_SEEK_POSITION] = position
-    hass.services.call(DOMAIN, SERVICE_MEDIA_SEEK, data)
-
-
-@bind_hass
-def play_media(hass, media_type, media_id, entity_id=None, enqueue=None):
-    """Send the media player the command for playing media."""
-    data = {ATTR_MEDIA_CONTENT_TYPE: media_type,
-            ATTR_MEDIA_CONTENT_ID: media_id}
-
-    if entity_id:
-        data[ATTR_ENTITY_ID] = entity_id
-
-    if enqueue:
-        data[ATTR_MEDIA_ENQUEUE] = enqueue
-
-    hass.services.call(DOMAIN, SERVICE_PLAY_MEDIA, data)
-
-
-@bind_hass
-def select_source(hass, source, entity_id=None):
-    """Send the media player the command to select input source."""
-    data = {ATTR_INPUT_SOURCE: source}
-
-    if entity_id:
-        data[ATTR_ENTITY_ID] = entity_id
-
-    hass.services.call(DOMAIN, SERVICE_SELECT_SOURCE, data)
-
-
-@bind_hass
-def select_sound_mode(hass, sound_mode, entity_id=None):
-    """Send the media player the command to select sound mode."""
-    data = {ATTR_SOUND_MODE: sound_mode}
-
-    if entity_id:
-        data[ATTR_ENTITY_ID] = entity_id
-
-    hass.services.call(DOMAIN, SERVICE_SELECT_SOUND_MODE, data)
-
-
-@bind_hass
-def clear_playlist(hass, entity_id=None):
-    """Send the media player the command for clear playlist."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
-    hass.services.call(DOMAIN, SERVICE_CLEAR_PLAYLIST, data)
-
-
-@bind_hass
-def set_shuffle(hass, shuffle, entity_id=None):
-    """Send the media player the command to enable/disable shuffle mode."""
-    data = {ATTR_MEDIA_SHUFFLE: shuffle}
-
-    if entity_id:
-        data[ATTR_ENTITY_ID] = entity_id
-
-    hass.services.call(DOMAIN, SERVICE_SHUFFLE_SET, data)
-
-
 WS_TYPE_MEDIA_PLAYER_THUMBNAIL = 'media_player_thumbnail'
 SCHEMA_WEBSOCKET_GET_THUMBNAIL = \
     websocket_api.BASE_COMMAND_MESSAGE_SCHEMA.extend({
diff --git a/homeassistant/components/notify/__init__.py b/homeassistant/components/notify/__init__.py
index 4de35d3f850..0535d7caa6d 100644
--- a/homeassistant/components/notify/__init__.py
+++ b/homeassistant/components/notify/__init__.py
@@ -12,7 +12,6 @@ import voluptuous as vol
 
 from homeassistant.setup import async_prepare_setup_platform
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.loader import bind_hass
 import homeassistant.helpers.config_validation as cv
 from homeassistant.const import CONF_NAME, CONF_PLATFORM
 from homeassistant.helpers import config_per_platform, discovery
@@ -50,22 +49,6 @@ NOTIFY_SERVICE_SCHEMA = vol.Schema({
 })
 
 
-@bind_hass
-def send_message(hass, message, title=None, data=None):
-    """Send a notification message."""
-    info = {
-        ATTR_MESSAGE: message
-    }
-
-    if title is not None:
-        info[ATTR_TITLE] = title
-
-    if data is not None:
-        info[ATTR_DATA] = data
-
-    hass.services.call(DOMAIN, SERVICE_NOTIFY, info)
-
-
 @asyncio.coroutine
 def async_setup(hass, config):
     """Set up the notify services."""
diff --git a/homeassistant/components/remote/__init__.py b/homeassistant/components/remote/__init__.py
index 11ecb20f7aa..3fd2a5d4c44 100644
--- a/homeassistant/components/remote/__init__.py
+++ b/homeassistant/components/remote/__init__.py
@@ -70,63 +70,6 @@ def is_on(hass, entity_id=None):
     return hass.states.is_state(entity_id, STATE_ON)
 
 
-@bind_hass
-def turn_on(hass, activity=None, entity_id=None):
-    """Turn all or specified remote on."""
-    data = {
-        key: value for key, value in [
-            (ATTR_ACTIVITY, activity),
-            (ATTR_ENTITY_ID, entity_id),
-        ] if value is not None}
-    hass.services.call(DOMAIN, SERVICE_TURN_ON, data)
-
-
-@bind_hass
-def turn_off(hass, activity=None, entity_id=None):
-    """Turn all or specified remote off."""
-    data = {}
-    if activity:
-        data[ATTR_ACTIVITY] = activity
-
-    if entity_id:
-        data[ATTR_ENTITY_ID] = entity_id
-
-    hass.services.call(DOMAIN, SERVICE_TURN_OFF, data)
-
-
-@bind_hass
-def toggle(hass, activity=None, entity_id=None):
-    """Toggle all or specified remote."""
-    data = {}
-    if activity:
-        data[ATTR_ACTIVITY] = activity
-
-    if entity_id:
-        data[ATTR_ENTITY_ID] = entity_id
-
-    hass.services.call(DOMAIN, SERVICE_TOGGLE, data)
-
-
-@bind_hass
-def send_command(hass, command, entity_id=None, device=None,
-                 num_repeats=None, delay_secs=None):
-    """Send a command to a device."""
-    data = {ATTR_COMMAND: command}
-    if entity_id:
-        data[ATTR_ENTITY_ID] = entity_id
-
-    if device:
-        data[ATTR_DEVICE] = device
-
-    if num_repeats:
-        data[ATTR_NUM_REPEATS] = num_repeats
-
-    if delay_secs:
-        data[ATTR_DELAY_SECS] = delay_secs
-
-    hass.services.call(DOMAIN, SERVICE_SEND_COMMAND, data)
-
-
 @asyncio.coroutine
 def async_setup(hass, config):
     """Track states and offer events for remotes."""
diff --git a/homeassistant/components/scene/__init__.py b/homeassistant/components/scene/__init__.py
index 8771a84c1d6..2bcb1c8e16d 100644
--- a/homeassistant/components/scene/__init__.py
+++ b/homeassistant/components/scene/__init__.py
@@ -12,7 +12,6 @@ import voluptuous as vol
 
 from homeassistant.const import (
     ATTR_ENTITY_ID, CONF_PLATFORM, SERVICE_TURN_ON)
-from homeassistant.loader import bind_hass
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_component import EntityComponent
@@ -61,17 +60,6 @@ SCENE_SERVICE_SCHEMA = vol.Schema({
 })
 
 
-@bind_hass
-def activate(hass, entity_id=None):
-    """Activate a scene."""
-    data = {}
-
-    if entity_id:
-        data[ATTR_ENTITY_ID] = entity_id
-
-    hass.services.call(DOMAIN, SERVICE_TURN_ON, data)
-
-
 async def async_setup(hass, config):
     """Set up the scenes."""
     logger = logging.getLogger(__name__)
diff --git a/homeassistant/components/timer/__init__.py b/homeassistant/components/timer/__init__.py
index 8406b3ff5ec..c29df9db858 100644
--- a/homeassistant/components/timer/__init__.py
+++ b/homeassistant/components/timer/__init__.py
@@ -12,12 +12,10 @@ import voluptuous as vol
 import homeassistant.util.dt as dt_util
 import homeassistant.helpers.config_validation as cv
 from homeassistant.const import (ATTR_ENTITY_ID, CONF_ICON, CONF_NAME)
-from homeassistant.core import callback
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.event import async_track_point_in_utc_time
 
-from homeassistant.loader import bind_hass
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -63,64 +61,6 @@ CONFIG_SCHEMA = vol.Schema({
 }, extra=vol.ALLOW_EXTRA)
 
 
-@bind_hass
-def start(hass, entity_id, duration):
-    """Start a timer."""
-    hass.add_job(async_start, hass, entity_id, {ATTR_ENTITY_ID: entity_id,
-                                                ATTR_DURATION: duration})
-
-
-@callback
-@bind_hass
-def async_start(hass, entity_id, duration):
-    """Start a timer."""
-    hass.async_add_job(hass.services.async_call(
-        DOMAIN, SERVICE_START, {ATTR_ENTITY_ID: entity_id,
-                                ATTR_DURATION: duration}))
-
-
-@bind_hass
-def pause(hass, entity_id):
-    """Pause a timer."""
-    hass.add_job(async_pause, hass, entity_id)
-
-
-@callback
-@bind_hass
-def async_pause(hass, entity_id):
-    """Pause a timer."""
-    hass.async_add_job(hass.services.async_call(
-        DOMAIN, SERVICE_PAUSE, {ATTR_ENTITY_ID: entity_id}))
-
-
-@bind_hass
-def cancel(hass, entity_id):
-    """Cancel a timer."""
-    hass.add_job(async_cancel, hass, entity_id)
-
-
-@callback
-@bind_hass
-def async_cancel(hass, entity_id):
-    """Cancel a timer."""
-    hass.async_add_job(hass.services.async_call(
-        DOMAIN, SERVICE_CANCEL, {ATTR_ENTITY_ID: entity_id}))
-
-
-@bind_hass
-def finish(hass, entity_id):
-    """Finish a timer."""
-    hass.add_job(async_cancel, hass, entity_id)
-
-
-@callback
-@bind_hass
-def async_finish(hass, entity_id):
-    """Finish a timer."""
-    hass.async_add_job(hass.services.async_call(
-        DOMAIN, SERVICE_FINISH, {ATTR_ENTITY_ID: entity_id}))
-
-
 async def async_setup(hass, config):
     """Set up a timer."""
     component = EntityComponent(_LOGGER, DOMAIN, hass)
diff --git a/homeassistant/components/vacuum/__init__.py b/homeassistant/components/vacuum/__init__.py
index 1808737d281..7a1c3049152 100644
--- a/homeassistant/components/vacuum/__init__.py
+++ b/homeassistant/components/vacuum/__init__.py
@@ -94,94 +94,6 @@ def is_on(hass, entity_id=None):
     return hass.states.is_state(entity_id, STATE_ON)
 
 
-@bind_hass
-def turn_on(hass, entity_id=None):
-    """Turn all or specified vacuum on."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
-    hass.services.call(DOMAIN, SERVICE_TURN_ON, data)
-
-
-@bind_hass
-def turn_off(hass, entity_id=None):
-    """Turn all or specified vacuum off."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
-    hass.services.call(DOMAIN, SERVICE_TURN_OFF, data)
-
-
-@bind_hass
-def toggle(hass, entity_id=None):
-    """Toggle all or specified vacuum."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
-    hass.services.call(DOMAIN, SERVICE_TOGGLE, data)
-
-
-@bind_hass
-def locate(hass, entity_id=None):
-    """Locate all or specified vacuum."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
-    hass.services.call(DOMAIN, SERVICE_LOCATE, data)
-
-
-@bind_hass
-def clean_spot(hass, entity_id=None):
-    """Tell all or specified vacuum to perform a spot clean-up."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
-    hass.services.call(DOMAIN, SERVICE_CLEAN_SPOT, data)
-
-
-@bind_hass
-def return_to_base(hass, entity_id=None):
-    """Tell all or specified vacuum to return to base."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
-    hass.services.call(DOMAIN, SERVICE_RETURN_TO_BASE, data)
-
-
-@bind_hass
-def start_pause(hass, entity_id=None):
-    """Tell all or specified vacuum to start or pause the current task."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
-    hass.services.call(DOMAIN, SERVICE_START_PAUSE, data)
-
-
-@bind_hass
-def start(hass, entity_id=None):
-    """Tell all or specified vacuum to start or resume the current task."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
-    hass.services.call(DOMAIN, SERVICE_START, data)
-
-
-@bind_hass
-def pause(hass, entity_id=None):
-    """Tell all or the specified vacuum to pause the current task."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
-    hass.services.call(DOMAIN, SERVICE_PAUSE, data)
-
-
-@bind_hass
-def stop(hass, entity_id=None):
-    """Stop all or specified vacuum."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
-    hass.services.call(DOMAIN, SERVICE_STOP, data)
-
-
-@bind_hass
-def set_fan_speed(hass, fan_speed, entity_id=None):
-    """Set fan speed for all or specified vacuum."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
-    data[ATTR_FAN_SPEED] = fan_speed
-    hass.services.call(DOMAIN, SERVICE_SET_FAN_SPEED, data)
-
-
-@bind_hass
-def send_command(hass, command, params=None, entity_id=None):
-    """Send command to all or specified vacuum."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
-    data[ATTR_COMMAND] = command
-    if params is not None:
-        data[ATTR_PARAMS] = params
-    hass.services.call(DOMAIN, SERVICE_SEND_COMMAND, data)
-
-
 @asyncio.coroutine
 def async_setup(hass, config):
     """Set up the vacuum component."""
diff --git a/tests/components/lock/common.py b/tests/components/lock/common.py
new file mode 100644
index 00000000000..2150b3cb894
--- /dev/null
+++ b/tests/components/lock/common.py
@@ -0,0 +1,45 @@
+"""Collection of helper methods.
+
+All containing methods are legacy helpers that should not be used by new
+components. Instead call the service directly.
+"""
+from homeassistant.components.lock import DOMAIN
+from homeassistant.const import (
+    ATTR_CODE, ATTR_ENTITY_ID, SERVICE_LOCK, SERVICE_UNLOCK, SERVICE_OPEN)
+from homeassistant.loader import bind_hass
+
+
+@bind_hass
+def lock(hass, entity_id=None, code=None):
+    """Lock all or specified locks."""
+    data = {}
+    if code:
+        data[ATTR_CODE] = code
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_LOCK, data)
+
+
+@bind_hass
+def unlock(hass, entity_id=None, code=None):
+    """Unlock all or specified locks."""
+    data = {}
+    if code:
+        data[ATTR_CODE] = code
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_UNLOCK, data)
+
+
+@bind_hass
+def open_lock(hass, entity_id=None, code=None):
+    """Open all or specified locks."""
+    data = {}
+    if code:
+        data[ATTR_CODE] = code
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_OPEN, data)
diff --git a/tests/components/lock/test_demo.py b/tests/components/lock/test_demo.py
index 500cc7f9a6a..255e5307f7a 100644
--- a/tests/components/lock/test_demo.py
+++ b/tests/components/lock/test_demo.py
@@ -5,6 +5,8 @@ from homeassistant.setup import setup_component
 from homeassistant.components import lock
 
 from tests.common import get_test_home_assistant, mock_service
+from tests.components.lock import common
+
 FRONT = 'lock.front_door'
 KITCHEN = 'lock.kitchen_door'
 OPENABLE_LOCK = 'lock.openable_lock'
@@ -36,14 +38,14 @@ class TestLockDemo(unittest.TestCase):
 
     def test_locking(self):
         """Test the locking of a lock."""
-        lock.lock(self.hass, KITCHEN)
+        common.lock(self.hass, KITCHEN)
         self.hass.block_till_done()
 
         self.assertTrue(lock.is_locked(self.hass, KITCHEN))
 
     def test_unlocking(self):
         """Test the unlocking of a lock."""
-        lock.unlock(self.hass, FRONT)
+        common.unlock(self.hass, FRONT)
         self.hass.block_till_done()
 
         self.assertFalse(lock.is_locked(self.hass, FRONT))
@@ -51,6 +53,6 @@ class TestLockDemo(unittest.TestCase):
     def test_opening(self):
         """Test the opening of a lock."""
         calls = mock_service(self.hass, lock.DOMAIN, lock.SERVICE_OPEN)
-        lock.open_lock(self.hass, OPENABLE_LOCK)
+        common.open_lock(self.hass, OPENABLE_LOCK)
         self.hass.block_till_done()
         self.assertEqual(1, len(calls))
diff --git a/tests/components/lock/test_mqtt.py b/tests/components/lock/test_mqtt.py
index f85c6a11774..4d2378ff9fa 100644
--- a/tests/components/lock/test_mqtt.py
+++ b/tests/components/lock/test_mqtt.py
@@ -6,9 +6,11 @@ from homeassistant.const import (
     STATE_LOCKED, STATE_UNLOCKED, STATE_UNAVAILABLE, ATTR_ASSUMED_STATE)
 import homeassistant.components.lock as lock
 from homeassistant.components.mqtt.discovery import async_start
+
 from tests.common import (
     mock_mqtt_component, async_fire_mqtt_message, fire_mqtt_message,
     get_test_home_assistant)
+from tests.components.lock import common
 
 
 class TestLockMQTT(unittest.TestCase):
@@ -69,7 +71,7 @@ class TestLockMQTT(unittest.TestCase):
         self.assertEqual(STATE_UNLOCKED, state.state)
         self.assertTrue(state.attributes.get(ATTR_ASSUMED_STATE))
 
-        lock.lock(self.hass, 'lock.test')
+        common.lock(self.hass, 'lock.test')
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_called_once_with(
@@ -78,7 +80,7 @@ class TestLockMQTT(unittest.TestCase):
         state = self.hass.states.get('lock.test')
         self.assertEqual(STATE_LOCKED, state.state)
 
-        lock.unlock(self.hass, 'lock.test')
+        common.unlock(self.hass, 'lock.test')
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_called_once_with(
diff --git a/tests/components/media_player/common.py b/tests/components/media_player/common.py
new file mode 100644
index 00000000000..3f4d4cb9f24
--- /dev/null
+++ b/tests/components/media_player/common.py
@@ -0,0 +1,150 @@
+"""Collection of helper methods.
+
+All containing methods are legacy helpers that should not be used by new
+components. Instead call the service directly.
+"""
+from homeassistant.components.media_player import (
+    ATTR_INPUT_SOURCE, ATTR_MEDIA_CONTENT_ID, ATTR_MEDIA_CONTENT_TYPE,
+    ATTR_MEDIA_ENQUEUE, ATTR_MEDIA_SEEK_POSITION, ATTR_MEDIA_VOLUME_LEVEL,
+    ATTR_MEDIA_VOLUME_MUTED, DOMAIN, SERVICE_CLEAR_PLAYLIST,
+    SERVICE_PLAY_MEDIA, SERVICE_SELECT_SOURCE)
+from homeassistant.const import (
+    ATTR_ENTITY_ID, SERVICE_MEDIA_NEXT_TRACK, SERVICE_MEDIA_PAUSE,
+    SERVICE_MEDIA_PLAY, SERVICE_MEDIA_PLAY_PAUSE, SERVICE_MEDIA_PREVIOUS_TRACK,
+    SERVICE_MEDIA_SEEK, SERVICE_TOGGLE, SERVICE_TURN_OFF, SERVICE_TURN_ON,
+    SERVICE_VOLUME_DOWN, SERVICE_VOLUME_MUTE, SERVICE_VOLUME_SET,
+    SERVICE_VOLUME_UP)
+from homeassistant.loader import bind_hass
+
+
+@bind_hass
+def turn_on(hass, entity_id=None):
+    """Turn on specified media player or all."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
+    hass.services.call(DOMAIN, SERVICE_TURN_ON, data)
+
+
+@bind_hass
+def turn_off(hass, entity_id=None):
+    """Turn off specified media player or all."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
+    hass.services.call(DOMAIN, SERVICE_TURN_OFF, data)
+
+
+@bind_hass
+def toggle(hass, entity_id=None):
+    """Toggle specified media player or all."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
+    hass.services.call(DOMAIN, SERVICE_TOGGLE, data)
+
+
+@bind_hass
+def volume_up(hass, entity_id=None):
+    """Send the media player the command for volume up."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
+    hass.services.call(DOMAIN, SERVICE_VOLUME_UP, data)
+
+
+@bind_hass
+def volume_down(hass, entity_id=None):
+    """Send the media player the command for volume down."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
+    hass.services.call(DOMAIN, SERVICE_VOLUME_DOWN, data)
+
+
+@bind_hass
+def mute_volume(hass, mute, entity_id=None):
+    """Send the media player the command for muting the volume."""
+    data = {ATTR_MEDIA_VOLUME_MUTED: mute}
+
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_VOLUME_MUTE, data)
+
+
+@bind_hass
+def set_volume_level(hass, volume, entity_id=None):
+    """Send the media player the command for setting the volume."""
+    data = {ATTR_MEDIA_VOLUME_LEVEL: volume}
+
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_VOLUME_SET, data)
+
+
+@bind_hass
+def media_play_pause(hass, entity_id=None):
+    """Send the media player the command for play/pause."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
+    hass.services.call(DOMAIN, SERVICE_MEDIA_PLAY_PAUSE, data)
+
+
+@bind_hass
+def media_play(hass, entity_id=None):
+    """Send the media player the command for play/pause."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
+    hass.services.call(DOMAIN, SERVICE_MEDIA_PLAY, data)
+
+
+@bind_hass
+def media_pause(hass, entity_id=None):
+    """Send the media player the command for pause."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
+    hass.services.call(DOMAIN, SERVICE_MEDIA_PAUSE, data)
+
+
+@bind_hass
+def media_next_track(hass, entity_id=None):
+    """Send the media player the command for next track."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
+    hass.services.call(DOMAIN, SERVICE_MEDIA_NEXT_TRACK, data)
+
+
+@bind_hass
+def media_previous_track(hass, entity_id=None):
+    """Send the media player the command for prev track."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
+    hass.services.call(DOMAIN, SERVICE_MEDIA_PREVIOUS_TRACK, data)
+
+
+@bind_hass
+def media_seek(hass, position, entity_id=None):
+    """Send the media player the command to seek in current playing media."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
+    data[ATTR_MEDIA_SEEK_POSITION] = position
+    hass.services.call(DOMAIN, SERVICE_MEDIA_SEEK, data)
+
+
+@bind_hass
+def play_media(hass, media_type, media_id, entity_id=None, enqueue=None):
+    """Send the media player the command for playing media."""
+    data = {ATTR_MEDIA_CONTENT_TYPE: media_type,
+            ATTR_MEDIA_CONTENT_ID: media_id}
+
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    if enqueue:
+        data[ATTR_MEDIA_ENQUEUE] = enqueue
+
+    hass.services.call(DOMAIN, SERVICE_PLAY_MEDIA, data)
+
+
+@bind_hass
+def select_source(hass, source, entity_id=None):
+    """Send the media player the command to select input source."""
+    data = {ATTR_INPUT_SOURCE: source}
+
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_SELECT_SOURCE, data)
+
+
+@bind_hass
+def clear_playlist(hass, entity_id=None):
+    """Send the media player the command for clear playlist."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
+    hass.services.call(DOMAIN, SERVICE_CLEAR_PLAYLIST, data)
diff --git a/tests/components/media_player/test_demo.py b/tests/components/media_player/test_demo.py
index 121018e7541..e986ac02065 100644
--- a/tests/components/media_player/test_demo.py
+++ b/tests/components/media_player/test_demo.py
@@ -12,6 +12,7 @@ from homeassistant.helpers.aiohttp_client import DATA_CLIENTSESSION
 import requests
 
 from tests.common import get_test_home_assistant, get_test_instance_port
+from tests.components.media_player import common
 
 SERVER_PORT = get_test_instance_port()
 HTTP_BASE_URL = 'http://127.0.0.1:{}'.format(SERVER_PORT)
@@ -42,12 +43,12 @@ class TestDemoMediaPlayer(unittest.TestCase):
         state = self.hass.states.get(entity_id)
         assert 'dvd' == state.attributes.get('source')
 
-        mp.select_source(self.hass, None, entity_id)
+        common.select_source(self.hass, None, entity_id)
         self.hass.block_till_done()
         state = self.hass.states.get(entity_id)
         assert 'dvd' == state.attributes.get('source')
 
-        mp.select_source(self.hass, 'xbox', entity_id)
+        common.select_source(self.hass, 'xbox', entity_id)
         self.hass.block_till_done()
         state = self.hass.states.get(entity_id)
         assert 'xbox' == state.attributes.get('source')
@@ -59,7 +60,7 @@ class TestDemoMediaPlayer(unittest.TestCase):
             {'media_player': {'platform': 'demo'}})
         assert self.hass.states.is_state(entity_id, 'playing')
 
-        mp.clear_playlist(self.hass, entity_id)
+        common.clear_playlist(self.hass, entity_id)
         self.hass.block_till_done()
         assert self.hass.states.is_state(entity_id, 'off')
 
@@ -71,34 +72,34 @@ class TestDemoMediaPlayer(unittest.TestCase):
         state = self.hass.states.get(entity_id)
         assert 1.0 == state.attributes.get('volume_level')
 
-        mp.set_volume_level(self.hass, None, entity_id)
+        common.set_volume_level(self.hass, None, entity_id)
         self.hass.block_till_done()
         state = self.hass.states.get(entity_id)
         assert 1.0 == state.attributes.get('volume_level')
 
-        mp.set_volume_level(self.hass, 0.5, entity_id)
+        common.set_volume_level(self.hass, 0.5, entity_id)
         self.hass.block_till_done()
         state = self.hass.states.get(entity_id)
         assert 0.5 == state.attributes.get('volume_level')
 
-        mp.volume_down(self.hass, entity_id)
+        common.volume_down(self.hass, entity_id)
         self.hass.block_till_done()
         state = self.hass.states.get(entity_id)
         assert 0.4 == state.attributes.get('volume_level')
 
-        mp.volume_up(self.hass, entity_id)
+        common.volume_up(self.hass, entity_id)
         self.hass.block_till_done()
         state = self.hass.states.get(entity_id)
         assert 0.5 == state.attributes.get('volume_level')
 
         assert False is state.attributes.get('is_volume_muted')
 
-        mp.mute_volume(self.hass, None, entity_id)
+        common.mute_volume(self.hass, None, entity_id)
         self.hass.block_till_done()
         state = self.hass.states.get(entity_id)
         assert False is state.attributes.get('is_volume_muted')
 
-        mp.mute_volume(self.hass, True, entity_id)
+        common.mute_volume(self.hass, True, entity_id)
         self.hass.block_till_done()
         state = self.hass.states.get(entity_id)
         assert True is state.attributes.get('is_volume_muted')
@@ -110,16 +111,16 @@ class TestDemoMediaPlayer(unittest.TestCase):
             {'media_player': {'platform': 'demo'}})
         assert self.hass.states.is_state(entity_id, 'playing')
 
-        mp.turn_off(self.hass, entity_id)
+        common.turn_off(self.hass, entity_id)
         self.hass.block_till_done()
         assert self.hass.states.is_state(entity_id, 'off')
         assert not mp.is_on(self.hass, entity_id)
 
-        mp.turn_on(self.hass, entity_id)
+        common.turn_on(self.hass, entity_id)
         self.hass.block_till_done()
         assert self.hass.states.is_state(entity_id, 'playing')
 
-        mp.toggle(self.hass, entity_id)
+        common.toggle(self.hass, entity_id)
         self.hass.block_till_done()
         assert self.hass.states.is_state(entity_id, 'off')
         assert not mp.is_on(self.hass, entity_id)
@@ -131,19 +132,19 @@ class TestDemoMediaPlayer(unittest.TestCase):
             {'media_player': {'platform': 'demo'}})
         assert self.hass.states.is_state(entity_id, 'playing')
 
-        mp.media_pause(self.hass, entity_id)
+        common.media_pause(self.hass, entity_id)
         self.hass.block_till_done()
         assert self.hass.states.is_state(entity_id, 'paused')
 
-        mp.media_play_pause(self.hass, entity_id)
+        common.media_play_pause(self.hass, entity_id)
         self.hass.block_till_done()
         assert self.hass.states.is_state(entity_id, 'playing')
 
-        mp.media_play_pause(self.hass, entity_id)
+        common.media_play_pause(self.hass, entity_id)
         self.hass.block_till_done()
         assert self.hass.states.is_state(entity_id, 'paused')
 
-        mp.media_play(self.hass, entity_id)
+        common.media_play(self.hass, entity_id)
         self.hass.block_till_done()
         assert self.hass.states.is_state(entity_id, 'playing')
 
@@ -155,17 +156,17 @@ class TestDemoMediaPlayer(unittest.TestCase):
         state = self.hass.states.get(entity_id)
         assert 1 == state.attributes.get('media_track')
 
-        mp.media_next_track(self.hass, entity_id)
+        common.media_next_track(self.hass, entity_id)
         self.hass.block_till_done()
         state = self.hass.states.get(entity_id)
         assert 2 == state.attributes.get('media_track')
 
-        mp.media_next_track(self.hass, entity_id)
+        common.media_next_track(self.hass, entity_id)
         self.hass.block_till_done()
         state = self.hass.states.get(entity_id)
         assert 3 == state.attributes.get('media_track')
 
-        mp.media_previous_track(self.hass, entity_id)
+        common.media_previous_track(self.hass, entity_id)
         self.hass.block_till_done()
         state = self.hass.states.get(entity_id)
         assert 2 == state.attributes.get('media_track')
@@ -177,12 +178,12 @@ class TestDemoMediaPlayer(unittest.TestCase):
         state = self.hass.states.get(ent_id)
         assert 1 == state.attributes.get('media_episode')
 
-        mp.media_next_track(self.hass, ent_id)
+        common.media_next_track(self.hass, ent_id)
         self.hass.block_till_done()
         state = self.hass.states.get(ent_id)
         assert 2 == state.attributes.get('media_episode')
 
-        mp.media_previous_track(self.hass, ent_id)
+        common.media_previous_track(self.hass, ent_id)
         self.hass.block_till_done()
         state = self.hass.states.get(ent_id)
         assert 1 == state.attributes.get('media_episode')
@@ -200,14 +201,14 @@ class TestDemoMediaPlayer(unittest.TestCase):
                     state.attributes.get('supported_features'))
         assert state.attributes.get('media_content_id') is not None
 
-        mp.play_media(self.hass, None, 'some_id', ent_id)
+        common.play_media(self.hass, None, 'some_id', ent_id)
         self.hass.block_till_done()
         state = self.hass.states.get(ent_id)
         assert 0 < (mp.SUPPORT_PLAY_MEDIA &
                     state.attributes.get('supported_features'))
         assert not 'some_id' == state.attributes.get('media_content_id')
 
-        mp.play_media(self.hass, 'youtube', 'some_id', ent_id)
+        common.play_media(self.hass, 'youtube', 'some_id', ent_id)
         self.hass.block_till_done()
         state = self.hass.states.get(ent_id)
         assert 0 < (mp.SUPPORT_PLAY_MEDIA &
@@ -215,10 +216,10 @@ class TestDemoMediaPlayer(unittest.TestCase):
         assert 'some_id' == state.attributes.get('media_content_id')
 
         assert not mock_seek.called
-        mp.media_seek(self.hass, None, ent_id)
+        common.media_seek(self.hass, None, ent_id)
         self.hass.block_till_done()
         assert not mock_seek.called
-        mp.media_seek(self.hass, 100, ent_id)
+        common.media_seek(self.hass, 100, ent_id)
         self.hass.block_till_done()
         assert mock_seek.called
 
diff --git a/tests/components/notify/common.py b/tests/components/notify/common.py
new file mode 100644
index 00000000000..42b4b35b63f
--- /dev/null
+++ b/tests/components/notify/common.py
@@ -0,0 +1,24 @@
+"""Collection of helper methods.
+
+All containing methods are legacy helpers that should not be used by new
+components. Instead call the service directly.
+"""
+from homeassistant.components.notify import (
+    ATTR_DATA, ATTR_MESSAGE, ATTR_TITLE, DOMAIN, SERVICE_NOTIFY)
+from homeassistant.loader import bind_hass
+
+
+@bind_hass
+def send_message(hass, message, title=None, data=None):
+    """Send a notification message."""
+    info = {
+        ATTR_MESSAGE: message
+    }
+
+    if title is not None:
+        info[ATTR_TITLE] = title
+
+    if data is not None:
+        info[ATTR_DATA] = data
+
+    hass.services.call(DOMAIN, SERVICE_NOTIFY, info)
diff --git a/tests/components/notify/test_demo.py b/tests/components/notify/test_demo.py
index f9c107a447e..3be2ddcb86b 100644
--- a/tests/components/notify/test_demo.py
+++ b/tests/components/notify/test_demo.py
@@ -7,7 +7,9 @@ from homeassistant.setup import setup_component
 from homeassistant.components.notify import demo
 from homeassistant.core import callback
 from homeassistant.helpers import discovery, script
+
 from tests.common import assert_setup_component, get_test_home_assistant
+from tests.components.notify import common
 
 CONFIG = {
     notify.DOMAIN: {
@@ -79,7 +81,7 @@ class TestNotifyDemo(unittest.TestCase):
     def test_sending_none_message(self):
         """Test send with None as message."""
         self._setup_notify()
-        notify.send_message(self.hass, None)
+        common.send_message(self.hass, None)
         self.hass.block_till_done()
         self.assertTrue(len(self.events) == 0)
 
@@ -87,7 +89,7 @@ class TestNotifyDemo(unittest.TestCase):
         """Send a templated message."""
         self._setup_notify()
         self.hass.states.set('sensor.temperature', 10)
-        notify.send_message(self.hass, '{{ states.sensor.temperature.state }}',
+        common.send_message(self.hass, '{{ states.sensor.temperature.state }}',
                             '{{ states.sensor.temperature.name }}')
         self.hass.block_till_done()
         last_event = self.events[-1]
@@ -97,7 +99,7 @@ class TestNotifyDemo(unittest.TestCase):
     def test_method_forwards_correct_data(self):
         """Test that all data from the service gets forwarded to service."""
         self._setup_notify()
-        notify.send_message(self.hass, 'my message', 'my title',
+        common.send_message(self.hass, 'my message', 'my title',
                             {'hello': 'world'})
         self.hass.block_till_done()
         self.assertTrue(len(self.events) == 1)
diff --git a/tests/components/remote/common.py b/tests/components/remote/common.py
new file mode 100644
index 00000000000..d03cf5d6d16
--- /dev/null
+++ b/tests/components/remote/common.py
@@ -0,0 +1,55 @@
+"""Collection of helper methods.
+
+All containing methods are legacy helpers that should not be used by new
+components. Instead call the service directly.
+"""
+from homeassistant.components.remote import (
+    ATTR_ACTIVITY, ATTR_COMMAND, ATTR_DELAY_SECS, ATTR_DEVICE,
+    ATTR_NUM_REPEATS, DOMAIN, SERVICE_SEND_COMMAND)
+from homeassistant.const import (
+    ATTR_ENTITY_ID, SERVICE_TURN_OFF, SERVICE_TURN_ON)
+from homeassistant.loader import bind_hass
+
+
+@bind_hass
+def turn_on(hass, activity=None, entity_id=None):
+    """Turn all or specified remote on."""
+    data = {
+        key: value for key, value in [
+            (ATTR_ACTIVITY, activity),
+            (ATTR_ENTITY_ID, entity_id),
+        ] if value is not None}
+    hass.services.call(DOMAIN, SERVICE_TURN_ON, data)
+
+
+@bind_hass
+def turn_off(hass, activity=None, entity_id=None):
+    """Turn all or specified remote off."""
+    data = {}
+    if activity:
+        data[ATTR_ACTIVITY] = activity
+
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_TURN_OFF, data)
+
+
+@bind_hass
+def send_command(hass, command, entity_id=None, device=None,
+                 num_repeats=None, delay_secs=None):
+    """Send a command to a device."""
+    data = {ATTR_COMMAND: command}
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    if device:
+        data[ATTR_DEVICE] = device
+
+    if num_repeats:
+        data[ATTR_NUM_REPEATS] = num_repeats
+
+    if delay_secs:
+        data[ATTR_DELAY_SECS] = delay_secs
+
+    hass.services.call(DOMAIN, SERVICE_SEND_COMMAND, data)
diff --git a/tests/components/remote/test_demo.py b/tests/components/remote/test_demo.py
index a0290987ff2..fbf7230c237 100644
--- a/tests/components/remote/test_demo.py
+++ b/tests/components/remote/test_demo.py
@@ -5,7 +5,9 @@ import unittest
 from homeassistant.setup import setup_component
 import homeassistant.components.remote as remote
 from homeassistant.const import STATE_ON, STATE_OFF
+
 from tests.common import get_test_home_assistant
+from tests.components.remote import common
 
 ENTITY_ID = 'remote.remote_one'
 
@@ -28,22 +30,22 @@ class TestDemoRemote(unittest.TestCase):
 
     def test_methods(self):
         """Test if services call the entity methods as expected."""
-        remote.turn_on(self.hass, entity_id=ENTITY_ID)
+        common.turn_on(self.hass, entity_id=ENTITY_ID)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_ID)
         self.assertEqual(state.state, STATE_ON)
 
-        remote.turn_off(self.hass, entity_id=ENTITY_ID)
+        common.turn_off(self.hass, entity_id=ENTITY_ID)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_ID)
         self.assertEqual(state.state, STATE_OFF)
 
-        remote.turn_on(self.hass, entity_id=ENTITY_ID)
+        common.turn_on(self.hass, entity_id=ENTITY_ID)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_ID)
         self.assertEqual(state.state, STATE_ON)
 
-        remote.send_command(self.hass, 'test', entity_id=ENTITY_ID)
+        common.send_command(self.hass, 'test', entity_id=ENTITY_ID)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_ID)
         self.assertEqual(
diff --git a/tests/components/remote/test_init.py b/tests/components/remote/test_init.py
index d98ec941f8b..21a083e3b9a 100644
--- a/tests/components/remote/test_init.py
+++ b/tests/components/remote/test_init.py
@@ -10,6 +10,8 @@ from homeassistant.const import (
 import homeassistant.components.remote as remote
 
 from tests.common import mock_service, get_test_home_assistant
+from tests.components.remote import common
+
 TEST_PLATFORM = {remote.DOMAIN: {CONF_PLATFORM: 'test'}}
 SERVICE_SEND_COMMAND = 'send_command'
 
@@ -46,7 +48,7 @@ class TestRemote(unittest.TestCase):
         turn_on_calls = mock_service(
             self.hass, remote.DOMAIN, SERVICE_TURN_ON)
 
-        remote.turn_on(
+        common.turn_on(
             self.hass,
             entity_id='entity_id_val')
 
@@ -62,7 +64,7 @@ class TestRemote(unittest.TestCase):
         turn_off_calls = mock_service(
             self.hass, remote.DOMAIN, SERVICE_TURN_OFF)
 
-        remote.turn_off(
+        common.turn_off(
             self.hass, entity_id='entity_id_val')
 
         self.hass.block_till_done()
@@ -79,7 +81,7 @@ class TestRemote(unittest.TestCase):
         send_command_calls = mock_service(
             self.hass, remote.DOMAIN, SERVICE_SEND_COMMAND)
 
-        remote.send_command(
+        common.send_command(
             self.hass, entity_id='entity_id_val',
             device='test_device', command=['test_command'],
             num_repeats='4', delay_secs='0.6')
diff --git a/tests/components/scene/common.py b/tests/components/scene/common.py
new file mode 100644
index 00000000000..4f8123ca638
--- /dev/null
+++ b/tests/components/scene/common.py
@@ -0,0 +1,19 @@
+"""Collection of helper methods.
+
+All containing methods are legacy helpers that should not be used by new
+components. Instead call the service directly.
+"""
+from homeassistant.components.scene import DOMAIN
+from homeassistant.const import ATTR_ENTITY_ID, SERVICE_TURN_ON
+from homeassistant.loader import bind_hass
+
+
+@bind_hass
+def activate(hass, entity_id=None):
+    """Activate a scene."""
+    data = {}
+
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_TURN_ON, data)
diff --git a/tests/components/scene/test_init.py b/tests/components/scene/test_init.py
index 3298d7648d9..08d9af95275 100644
--- a/tests/components/scene/test_init.py
+++ b/tests/components/scene/test_init.py
@@ -8,6 +8,7 @@ from homeassistant.components import light, scene
 from homeassistant.util import yaml
 
 from tests.common import get_test_home_assistant
+from tests.components.scene import common
 
 
 class TestScene(unittest.TestCase):
@@ -68,7 +69,7 @@ class TestScene(unittest.TestCase):
             }]
         }))
 
-        scene.activate(self.hass, 'scene.test')
+        common.activate(self.hass, 'scene.test')
         self.hass.block_till_done()
 
         self.assertTrue(self.light_1.is_on)
@@ -94,7 +95,7 @@ class TestScene(unittest.TestCase):
             doc = yaml.yaml.safe_load(file)
 
         self.assertTrue(setup_component(self.hass, scene.DOMAIN, doc))
-        scene.activate(self.hass, 'scene.test')
+        common.activate(self.hass, 'scene.test')
         self.hass.block_till_done()
 
         self.assertTrue(self.light_1.is_on)
@@ -117,7 +118,7 @@ class TestScene(unittest.TestCase):
             }]
         }))
 
-        scene.activate(self.hass, 'scene.test')
+        common.activate(self.hass, 'scene.test')
         self.hass.block_till_done()
 
         self.assertTrue(self.light_1.is_on)
diff --git a/tests/components/scene/test_litejet.py b/tests/components/scene/test_litejet.py
index 864ffc41735..57d3c178dbd 100644
--- a/tests/components/scene/test_litejet.py
+++ b/tests/components/scene/test_litejet.py
@@ -5,8 +5,9 @@ from unittest import mock
 
 from homeassistant import setup
 from homeassistant.components import litejet
+
 from tests.common import get_test_home_assistant
-import homeassistant.components.scene as scene
+from tests.components.scene import common
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -59,7 +60,7 @@ class TestLiteJetScene(unittest.TestCase):
 
     def test_activate(self):
         """Test activating the scene."""
-        scene.activate(self.hass, ENTITY_SCENE)
+        common.activate(self.hass, ENTITY_SCENE)
         self.hass.block_till_done()
         self.mock_lj.activate_scene.assert_called_once_with(
             ENTITY_SCENE_NUMBER)
diff --git a/tests/components/vacuum/common.py b/tests/components/vacuum/common.py
new file mode 100644
index 00000000000..436f23f5546
--- /dev/null
+++ b/tests/components/vacuum/common.py
@@ -0,0 +1,101 @@
+"""Collection of helper methods.
+
+All containing methods are legacy helpers that should not be used by new
+components. Instead call the service directly.
+"""
+from homeassistant.components.vacuum import (
+    ATTR_FAN_SPEED, ATTR_PARAMS, DOMAIN, SERVICE_CLEAN_SPOT, SERVICE_LOCATE,
+    SERVICE_PAUSE, SERVICE_SEND_COMMAND, SERVICE_SET_FAN_SPEED, SERVICE_START,
+    SERVICE_START_PAUSE, SERVICE_STOP, SERVICE_RETURN_TO_BASE)
+from homeassistant.const import (
+    ATTR_COMMAND, ATTR_ENTITY_ID, SERVICE_TOGGLE,
+    SERVICE_TURN_OFF, SERVICE_TURN_ON)
+from homeassistant.loader import bind_hass
+
+
+@bind_hass
+def turn_on(hass, entity_id=None):
+    """Turn all or specified vacuum on."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
+    hass.services.call(DOMAIN, SERVICE_TURN_ON, data)
+
+
+@bind_hass
+def turn_off(hass, entity_id=None):
+    """Turn all or specified vacuum off."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
+    hass.services.call(DOMAIN, SERVICE_TURN_OFF, data)
+
+
+@bind_hass
+def toggle(hass, entity_id=None):
+    """Toggle all or specified vacuum."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
+    hass.services.call(DOMAIN, SERVICE_TOGGLE, data)
+
+
+@bind_hass
+def locate(hass, entity_id=None):
+    """Locate all or specified vacuum."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
+    hass.services.call(DOMAIN, SERVICE_LOCATE, data)
+
+
+@bind_hass
+def clean_spot(hass, entity_id=None):
+    """Tell all or specified vacuum to perform a spot clean-up."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
+    hass.services.call(DOMAIN, SERVICE_CLEAN_SPOT, data)
+
+
+@bind_hass
+def return_to_base(hass, entity_id=None):
+    """Tell all or specified vacuum to return to base."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
+    hass.services.call(DOMAIN, SERVICE_RETURN_TO_BASE, data)
+
+
+@bind_hass
+def start_pause(hass, entity_id=None):
+    """Tell all or specified vacuum to start or pause the current task."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
+    hass.services.call(DOMAIN, SERVICE_START_PAUSE, data)
+
+
+@bind_hass
+def start(hass, entity_id=None):
+    """Tell all or specified vacuum to start or resume the current task."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
+    hass.services.call(DOMAIN, SERVICE_START, data)
+
+
+@bind_hass
+def pause(hass, entity_id=None):
+    """Tell all or the specified vacuum to pause the current task."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
+    hass.services.call(DOMAIN, SERVICE_PAUSE, data)
+
+
+@bind_hass
+def stop(hass, entity_id=None):
+    """Stop all or specified vacuum."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
+    hass.services.call(DOMAIN, SERVICE_STOP, data)
+
+
+@bind_hass
+def set_fan_speed(hass, fan_speed, entity_id=None):
+    """Set fan speed for all or specified vacuum."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
+    data[ATTR_FAN_SPEED] = fan_speed
+    hass.services.call(DOMAIN, SERVICE_SET_FAN_SPEED, data)
+
+
+@bind_hass
+def send_command(hass, command, params=None, entity_id=None):
+    """Send command to all or specified vacuum."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
+    data[ATTR_COMMAND] = command
+    if params is not None:
+        data[ATTR_PARAMS] = params
+    hass.services.call(DOMAIN, SERVICE_SEND_COMMAND, data)
diff --git a/tests/components/vacuum/test_demo.py b/tests/components/vacuum/test_demo.py
index 1fc8f8cd5c1..f88908ecc41 100644
--- a/tests/components/vacuum/test_demo.py
+++ b/tests/components/vacuum/test_demo.py
@@ -15,7 +15,9 @@ from homeassistant.components.vacuum.demo import (
 from homeassistant.const import (
     ATTR_SUPPORTED_FEATURES, CONF_PLATFORM, STATE_OFF, STATE_ON)
 from homeassistant.setup import setup_component
+
 from tests.common import get_test_home_assistant, mock_service
+from tests.components.vacuum import common
 
 
 ENTITY_VACUUM_BASIC = '{}.{}'.format(DOMAIN, DEMO_VACUUM_BASIC).lower()
@@ -108,27 +110,27 @@ class TestVacuumDemo(unittest.TestCase):
         self.hass.block_till_done()
         self.assertFalse(vacuum.is_on(self.hass))
 
-        vacuum.turn_on(self.hass, ENTITY_VACUUM_COMPLETE)
+        common.turn_on(self.hass, ENTITY_VACUUM_COMPLETE)
         self.hass.block_till_done()
         self.assertTrue(vacuum.is_on(self.hass, ENTITY_VACUUM_COMPLETE))
 
-        vacuum.turn_off(self.hass, ENTITY_VACUUM_COMPLETE)
+        common.turn_off(self.hass, ENTITY_VACUUM_COMPLETE)
         self.hass.block_till_done()
         self.assertFalse(vacuum.is_on(self.hass, ENTITY_VACUUM_COMPLETE))
 
-        vacuum.toggle(self.hass, ENTITY_VACUUM_COMPLETE)
+        common.toggle(self.hass, ENTITY_VACUUM_COMPLETE)
         self.hass.block_till_done()
         self.assertTrue(vacuum.is_on(self.hass, ENTITY_VACUUM_COMPLETE))
 
-        vacuum.start_pause(self.hass, ENTITY_VACUUM_COMPLETE)
+        common.start_pause(self.hass, ENTITY_VACUUM_COMPLETE)
         self.hass.block_till_done()
         self.assertFalse(vacuum.is_on(self.hass, ENTITY_VACUUM_COMPLETE))
 
-        vacuum.start_pause(self.hass, ENTITY_VACUUM_COMPLETE)
+        common.start_pause(self.hass, ENTITY_VACUUM_COMPLETE)
         self.hass.block_till_done()
         self.assertTrue(vacuum.is_on(self.hass, ENTITY_VACUUM_COMPLETE))
 
-        vacuum.stop(self.hass, ENTITY_VACUUM_COMPLETE)
+        common.stop(self.hass, ENTITY_VACUUM_COMPLETE)
         self.hass.block_till_done()
         self.assertFalse(vacuum.is_on(self.hass, ENTITY_VACUUM_COMPLETE))
 
@@ -136,39 +138,39 @@ class TestVacuumDemo(unittest.TestCase):
         self.assertLess(state.attributes.get(ATTR_BATTERY_LEVEL), 100)
         self.assertNotEqual("Charging", state.attributes.get(ATTR_STATUS))
 
-        vacuum.locate(self.hass, ENTITY_VACUUM_COMPLETE)
+        common.locate(self.hass, ENTITY_VACUUM_COMPLETE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_VACUUM_COMPLETE)
         self.assertIn("I'm over here", state.attributes.get(ATTR_STATUS))
 
-        vacuum.return_to_base(self.hass, ENTITY_VACUUM_COMPLETE)
+        common.return_to_base(self.hass, ENTITY_VACUUM_COMPLETE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_VACUUM_COMPLETE)
         self.assertIn("Returning home", state.attributes.get(ATTR_STATUS))
 
-        vacuum.set_fan_speed(self.hass, FAN_SPEEDS[-1],
+        common.set_fan_speed(self.hass, FAN_SPEEDS[-1],
                              entity_id=ENTITY_VACUUM_COMPLETE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_VACUUM_COMPLETE)
         self.assertEqual(FAN_SPEEDS[-1], state.attributes.get(ATTR_FAN_SPEED))
 
-        vacuum.clean_spot(self.hass, entity_id=ENTITY_VACUUM_COMPLETE)
+        common.clean_spot(self.hass, entity_id=ENTITY_VACUUM_COMPLETE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_VACUUM_COMPLETE)
         self.assertIn("spot", state.attributes.get(ATTR_STATUS))
         self.assertEqual(STATE_ON, state.state)
 
-        vacuum.start(self.hass, ENTITY_VACUUM_STATE)
+        common.start(self.hass, ENTITY_VACUUM_STATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_VACUUM_STATE)
         self.assertEqual(STATE_CLEANING, state.state)
 
-        vacuum.pause(self.hass, ENTITY_VACUUM_STATE)
+        common.pause(self.hass, ENTITY_VACUUM_STATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_VACUUM_STATE)
         self.assertEqual(STATE_PAUSED, state.state)
 
-        vacuum.stop(self.hass, ENTITY_VACUUM_STATE)
+        common.stop(self.hass, ENTITY_VACUUM_STATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_VACUUM_STATE)
         self.assertEqual(STATE_IDLE, state.state)
@@ -177,18 +179,18 @@ class TestVacuumDemo(unittest.TestCase):
         self.assertLess(state.attributes.get(ATTR_BATTERY_LEVEL), 100)
         self.assertNotEqual(STATE_DOCKED, state.state)
 
-        vacuum.return_to_base(self.hass, ENTITY_VACUUM_STATE)
+        common.return_to_base(self.hass, ENTITY_VACUUM_STATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_VACUUM_STATE)
         self.assertEqual(STATE_RETURNING, state.state)
 
-        vacuum.set_fan_speed(self.hass, FAN_SPEEDS[-1],
+        common.set_fan_speed(self.hass, FAN_SPEEDS[-1],
                              entity_id=ENTITY_VACUUM_STATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_VACUUM_STATE)
         self.assertEqual(FAN_SPEEDS[-1], state.attributes.get(ATTR_FAN_SPEED))
 
-        vacuum.clean_spot(self.hass, entity_id=ENTITY_VACUUM_STATE)
+        common.clean_spot(self.hass, entity_id=ENTITY_VACUUM_STATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_VACUUM_STATE)
         self.assertEqual(STATE_CLEANING, state.state)
@@ -199,11 +201,11 @@ class TestVacuumDemo(unittest.TestCase):
         self.hass.block_till_done()
         self.assertTrue(vacuum.is_on(self.hass, ENTITY_VACUUM_NONE))
 
-        vacuum.turn_off(self.hass, ENTITY_VACUUM_NONE)
+        common.turn_off(self.hass, ENTITY_VACUUM_NONE)
         self.hass.block_till_done()
         self.assertTrue(vacuum.is_on(self.hass, ENTITY_VACUUM_NONE))
 
-        vacuum.stop(self.hass, ENTITY_VACUUM_NONE)
+        common.stop(self.hass, ENTITY_VACUUM_NONE)
         self.hass.block_till_done()
         self.assertTrue(vacuum.is_on(self.hass, ENTITY_VACUUM_NONE))
 
@@ -211,37 +213,37 @@ class TestVacuumDemo(unittest.TestCase):
         self.hass.block_till_done()
         self.assertFalse(vacuum.is_on(self.hass, ENTITY_VACUUM_NONE))
 
-        vacuum.turn_on(self.hass, ENTITY_VACUUM_NONE)
+        common.turn_on(self.hass, ENTITY_VACUUM_NONE)
         self.hass.block_till_done()
         self.assertFalse(vacuum.is_on(self.hass, ENTITY_VACUUM_NONE))
 
-        vacuum.toggle(self.hass, ENTITY_VACUUM_NONE)
+        common.toggle(self.hass, ENTITY_VACUUM_NONE)
         self.hass.block_till_done()
         self.assertFalse(vacuum.is_on(self.hass, ENTITY_VACUUM_NONE))
 
         # Non supported methods:
-        vacuum.start_pause(self.hass, ENTITY_VACUUM_NONE)
+        common.start_pause(self.hass, ENTITY_VACUUM_NONE)
         self.hass.block_till_done()
         self.assertFalse(vacuum.is_on(self.hass, ENTITY_VACUUM_NONE))
 
-        vacuum.locate(self.hass, ENTITY_VACUUM_NONE)
+        common.locate(self.hass, ENTITY_VACUUM_NONE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_VACUUM_NONE)
         self.assertIsNone(state.attributes.get(ATTR_STATUS))
 
-        vacuum.return_to_base(self.hass, ENTITY_VACUUM_NONE)
+        common.return_to_base(self.hass, ENTITY_VACUUM_NONE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_VACUUM_NONE)
         self.assertIsNone(state.attributes.get(ATTR_STATUS))
 
-        vacuum.set_fan_speed(self.hass, FAN_SPEEDS[-1],
+        common.set_fan_speed(self.hass, FAN_SPEEDS[-1],
                              entity_id=ENTITY_VACUUM_NONE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_VACUUM_NONE)
         self.assertNotEqual(FAN_SPEEDS[-1],
                             state.attributes.get(ATTR_FAN_SPEED))
 
-        vacuum.clean_spot(self.hass, entity_id=ENTITY_VACUUM_BASIC)
+        common.clean_spot(self.hass, entity_id=ENTITY_VACUUM_BASIC)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_VACUUM_BASIC)
         self.assertNotIn("spot", state.attributes.get(ATTR_STATUS))
@@ -252,7 +254,7 @@ class TestVacuumDemo(unittest.TestCase):
         self.hass.block_till_done()
         self.assertTrue(vacuum.is_on(self.hass, ENTITY_VACUUM_COMPLETE))
 
-        vacuum.pause(self.hass, ENTITY_VACUUM_COMPLETE)
+        common.pause(self.hass, ENTITY_VACUUM_COMPLETE)
         self.hass.block_till_done()
         self.assertTrue(vacuum.is_on(self.hass, ENTITY_VACUUM_COMPLETE))
 
@@ -260,22 +262,22 @@ class TestVacuumDemo(unittest.TestCase):
         self.hass.block_till_done()
         self.assertFalse(vacuum.is_on(self.hass, ENTITY_VACUUM_COMPLETE))
 
-        vacuum.start(self.hass, ENTITY_VACUUM_COMPLETE)
+        common.start(self.hass, ENTITY_VACUUM_COMPLETE)
         self.hass.block_till_done()
         self.assertFalse(vacuum.is_on(self.hass, ENTITY_VACUUM_COMPLETE))
 
         # StateVacuumDevice does not support on/off
-        vacuum.turn_on(self.hass, entity_id=ENTITY_VACUUM_STATE)
+        common.turn_on(self.hass, entity_id=ENTITY_VACUUM_STATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_VACUUM_STATE)
         self.assertNotEqual(STATE_CLEANING, state.state)
 
-        vacuum.turn_off(self.hass, entity_id=ENTITY_VACUUM_STATE)
+        common.turn_off(self.hass, entity_id=ENTITY_VACUUM_STATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_VACUUM_STATE)
         self.assertNotEqual(STATE_RETURNING, state.state)
 
-        vacuum.toggle(self.hass, entity_id=ENTITY_VACUUM_STATE)
+        common.toggle(self.hass, entity_id=ENTITY_VACUUM_STATE)
         self.hass.block_till_done()
         state = self.hass.states.get(ENTITY_VACUUM_STATE)
         self.assertNotEqual(STATE_CLEANING, state.state)
@@ -287,7 +289,7 @@ class TestVacuumDemo(unittest.TestCase):
             self.hass, DOMAIN, SERVICE_SEND_COMMAND)
 
         params = {"rotate": 150, "speed": 20}
-        vacuum.send_command(
+        common.send_command(
             self.hass, 'test_command', entity_id=ENTITY_VACUUM_BASIC,
             params=params)
 
@@ -305,7 +307,7 @@ class TestVacuumDemo(unittest.TestCase):
         set_fan_speed_calls = mock_service(
             self.hass, DOMAIN, SERVICE_SET_FAN_SPEED)
 
-        vacuum.set_fan_speed(
+        common.set_fan_speed(
             self.hass, FAN_SPEEDS[0], entity_id=ENTITY_VACUUM_COMPLETE)
 
         self.hass.block_till_done()
@@ -326,7 +328,7 @@ class TestVacuumDemo(unittest.TestCase):
         old_state_complete = self.hass.states.get(ENTITY_VACUUM_COMPLETE)
         old_state_state = self.hass.states.get(ENTITY_VACUUM_STATE)
 
-        vacuum.set_fan_speed(
+        common.set_fan_speed(
             self.hass, FAN_SPEEDS[0], entity_id=group_vacuums)
 
         self.hass.block_till_done()
@@ -356,7 +358,7 @@ class TestVacuumDemo(unittest.TestCase):
         old_state_basic = self.hass.states.get(ENTITY_VACUUM_BASIC)
         old_state_complete = self.hass.states.get(ENTITY_VACUUM_COMPLETE)
 
-        vacuum.send_command(
+        common.send_command(
             self.hass, 'test_command', params={"p1": 3},
             entity_id=group_vacuums)
 
diff --git a/tests/components/vacuum/test_mqtt.py b/tests/components/vacuum/test_mqtt.py
index ba2288e3fc6..ddd4289c24d 100644
--- a/tests/components/vacuum/test_mqtt.py
+++ b/tests/components/vacuum/test_mqtt.py
@@ -9,8 +9,10 @@ from homeassistant.components.mqtt import CONF_COMMAND_TOPIC
 from homeassistant.const import (
     CONF_PLATFORM, STATE_OFF, STATE_ON, STATE_UNAVAILABLE, CONF_NAME)
 from homeassistant.setup import setup_component
+
 from tests.common import (
     fire_mqtt_message, get_test_home_assistant, mock_mqtt_component)
+from tests.components.vacuum import common
 
 
 class TestVacuumMQTT(unittest.TestCase):
@@ -69,55 +71,55 @@ class TestVacuumMQTT(unittest.TestCase):
             vacuum.DOMAIN: self.default_config,
         }))
 
-        vacuum.turn_on(self.hass, 'vacuum.mqtttest')
+        common.turn_on(self.hass, 'vacuum.mqtttest')
         self.hass.block_till_done()
         self.mock_publish.async_publish.assert_called_once_with(
             'vacuum/command', 'turn_on', 0, False)
         self.mock_publish.async_publish.reset_mock()
 
-        vacuum.turn_off(self.hass, 'vacuum.mqtttest')
+        common.turn_off(self.hass, 'vacuum.mqtttest')
         self.hass.block_till_done()
         self.mock_publish.async_publish.assert_called_once_with(
             'vacuum/command', 'turn_off', 0, False)
         self.mock_publish.async_publish.reset_mock()
 
-        vacuum.stop(self.hass, 'vacuum.mqtttest')
+        common.stop(self.hass, 'vacuum.mqtttest')
         self.hass.block_till_done()
         self.mock_publish.async_publish.assert_called_once_with(
             'vacuum/command', 'stop', 0, False)
         self.mock_publish.async_publish.reset_mock()
 
-        vacuum.clean_spot(self.hass, 'vacuum.mqtttest')
+        common.clean_spot(self.hass, 'vacuum.mqtttest')
         self.hass.block_till_done()
         self.mock_publish.async_publish.assert_called_once_with(
             'vacuum/command', 'clean_spot', 0, False)
         self.mock_publish.async_publish.reset_mock()
 
-        vacuum.locate(self.hass, 'vacuum.mqtttest')
+        common.locate(self.hass, 'vacuum.mqtttest')
         self.hass.block_till_done()
         self.mock_publish.async_publish.assert_called_once_with(
             'vacuum/command', 'locate', 0, False)
         self.mock_publish.async_publish.reset_mock()
 
-        vacuum.start_pause(self.hass, 'vacuum.mqtttest')
+        common.start_pause(self.hass, 'vacuum.mqtttest')
         self.hass.block_till_done()
         self.mock_publish.async_publish.assert_called_once_with(
             'vacuum/command', 'start_pause', 0, False)
         self.mock_publish.async_publish.reset_mock()
 
-        vacuum.return_to_base(self.hass, 'vacuum.mqtttest')
+        common.return_to_base(self.hass, 'vacuum.mqtttest')
         self.hass.block_till_done()
         self.mock_publish.async_publish.assert_called_once_with(
             'vacuum/command', 'return_to_base', 0, False)
         self.mock_publish.async_publish.reset_mock()
 
-        vacuum.set_fan_speed(self.hass, 'high', 'vacuum.mqtttest')
+        common.set_fan_speed(self.hass, 'high', 'vacuum.mqtttest')
         self.hass.block_till_done()
         self.mock_publish.async_publish.assert_called_once_with(
             'vacuum/set_fan_speed', 'high', 0, False)
         self.mock_publish.async_publish.reset_mock()
 
-        vacuum.send_command(self.hass, '44 FE 93', entity_id='vacuum.mqtttest')
+        common.send_command(self.hass, '44 FE 93', entity_id='vacuum.mqtttest')
         self.hass.block_till_done()
         self.mock_publish.async_publish.assert_called_once_with(
             'vacuum/send_command', '44 FE 93', 0, False)

From 4b674b1d16de47980391338f051dd37e3517f5b8 Mon Sep 17 00:00:00 2001
From: cdce8p <30130371+cdce8p@users.noreply.github.com>
Date: Wed, 26 Sep 2018 18:03:13 +0200
Subject: [PATCH 321/357] Remove unused legacy test helper methods (#16893)

---
 tests/components/camera/common.py     | 23 +----------------------
 tests/components/fan/common.py        | 12 +-----------
 tests/components/test_input_select.py | 12 ------------
 3 files changed, 2 insertions(+), 45 deletions(-)

diff --git a/tests/components/camera/common.py b/tests/components/camera/common.py
index 71193f1a99d..21f7244bd29 100644
--- a/tests/components/camera/common.py
+++ b/tests/components/camera/common.py
@@ -4,20 +4,13 @@ All containing methods are legacy helpers that should not be used by new
 components. Instead call the service directly.
 """
 from homeassistant.components.camera import (
-    ATTR_FILENAME, DOMAIN, SERVICE_DISABLE_MOTION, SERVICE_ENABLE_MOTION,
-    SERVICE_SNAPSHOT)
+    ATTR_FILENAME, DOMAIN, SERVICE_ENABLE_MOTION, SERVICE_SNAPSHOT)
 from homeassistant.const import ATTR_ENTITY_ID, SERVICE_TURN_OFF, \
     SERVICE_TURN_ON
 from homeassistant.core import callback
 from homeassistant.loader import bind_hass
 
 
-@bind_hass
-def turn_off(hass, entity_id=None):
-    """Turn off camera."""
-    hass.add_job(async_turn_off, hass, entity_id)
-
-
 @bind_hass
 async def async_turn_off(hass, entity_id=None):
     """Turn off camera."""
@@ -25,12 +18,6 @@ async def async_turn_off(hass, entity_id=None):
     await hass.services.async_call(DOMAIN, SERVICE_TURN_OFF, data)
 
 
-@bind_hass
-def turn_on(hass, entity_id=None):
-    """Turn on camera."""
-    hass.add_job(async_turn_on, hass, entity_id)
-
-
 @bind_hass
 async def async_turn_on(hass, entity_id=None):
     """Turn on camera, and set operation mode."""
@@ -49,14 +36,6 @@ def enable_motion_detection(hass, entity_id=None):
         DOMAIN, SERVICE_ENABLE_MOTION, data))
 
 
-@bind_hass
-def disable_motion_detection(hass, entity_id=None):
-    """Disable Motion Detection."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
-    hass.async_add_job(hass.services.async_call(
-        DOMAIN, SERVICE_DISABLE_MOTION, data))
-
-
 @bind_hass
 @callback
 def async_snapshot(hass, filename, entity_id=None):
diff --git a/tests/components/fan/common.py b/tests/components/fan/common.py
index d4caf28be5b..60e1cab1ac0 100644
--- a/tests/components/fan/common.py
+++ b/tests/components/fan/common.py
@@ -7,7 +7,7 @@ from homeassistant.components.fan import (
     ATTR_DIRECTION, ATTR_SPEED, ATTR_OSCILLATING, DOMAIN,
     SERVICE_OSCILLATE, SERVICE_SET_DIRECTION, SERVICE_SET_SPEED)
 from homeassistant.const import (
-    ATTR_ENTITY_ID, SERVICE_TURN_ON, SERVICE_TOGGLE, SERVICE_TURN_OFF)
+    ATTR_ENTITY_ID, SERVICE_TURN_ON, SERVICE_TURN_OFF)
 from homeassistant.loader import bind_hass
 
 
@@ -32,16 +32,6 @@ def turn_off(hass, entity_id: str = None) -> None:
     hass.services.call(DOMAIN, SERVICE_TURN_OFF, data)
 
 
-@bind_hass
-def toggle(hass, entity_id: str = None) -> None:
-    """Toggle all or specified fans."""
-    data = {
-        ATTR_ENTITY_ID: entity_id
-    }
-
-    hass.services.call(DOMAIN, SERVICE_TOGGLE, data)
-
-
 @bind_hass
 def oscillate(hass, entity_id: str = None,
               should_oscillate: bool = True) -> None:
diff --git a/tests/components/test_input_select.py b/tests/components/test_input_select.py
index 938c93fa099..25f6d1c7673 100644
--- a/tests/components/test_input_select.py
+++ b/tests/components/test_input_select.py
@@ -49,18 +49,6 @@ def select_previous(hass, entity_id):
     })
 
 
-@bind_hass
-def set_options(hass, entity_id, options):
-    """Set options of input_select.
-
-    This is a legacy helper method. Do not use it for new tests.
-    """
-    hass.services.call(DOMAIN, SERVICE_SET_OPTIONS, {
-        ATTR_ENTITY_ID: entity_id,
-        ATTR_OPTIONS: options,
-    })
-
-
 class TestInputSelect(unittest.TestCase):
     """Test the input select component."""
 

From 273a7af3300302c4b842138ba813910248cf150e Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Wed, 26 Sep 2018 18:03:25 +0200
Subject: [PATCH 322/357] Prevent discovered Tradfri while already configured
 (#16891)

* Prevent discovered Tradfri while already configured

* Lint
---
 homeassistant/components/tradfri/__init__.py  | 12 +++-
 .../components/tradfri/config_flow.py         |  6 ++
 tests/components/tradfri/test_config_flow.py  | 34 ++++++++-
 tests/components/tradfri/test_init.py         | 72 +++++++++++++++++++
 4 files changed, 120 insertions(+), 4 deletions(-)
 create mode 100644 tests/components/tradfri/test_init.py

diff --git a/homeassistant/components/tradfri/__init__.py b/homeassistant/components/tradfri/__init__.py
index 079381f8b45..6e91ab338a3 100644
--- a/homeassistant/components/tradfri/__init__.py
+++ b/homeassistant/components/tradfri/__init__.py
@@ -44,10 +44,16 @@ async def async_setup(hass, config):
     if conf is None:
         return True
 
-    known_hosts = await hass.async_add_executor_job(
+    configured_hosts = [entry.data['host'] for entry in
+                        hass.config_entries.async_entries(DOMAIN)]
+
+    legacy_hosts = await hass.async_add_executor_job(
         load_json, hass.config.path(CONFIG_FILE))
 
-    for host, info in known_hosts.items():
+    for host, info in legacy_hosts.items():
+        if host in configured_hosts:
+            continue
+
         info[CONF_HOST] = host
         info[CONF_IMPORT_GROUPS] = conf[CONF_ALLOW_TRADFRI_GROUPS]
 
@@ -58,7 +64,7 @@ async def async_setup(hass, config):
 
     host = conf.get(CONF_HOST)
 
-    if host is None or host in known_hosts:
+    if host is None or host in configured_hosts or host in legacy_hosts:
         return True
 
     hass.async_create_task(hass.config_entries.flow.async_init(
diff --git a/homeassistant/components/tradfri/config_flow.py b/homeassistant/components/tradfri/config_flow.py
index 8d8f9af79e6..29aa768dbb5 100644
--- a/homeassistant/components/tradfri/config_flow.py
+++ b/homeassistant/components/tradfri/config_flow.py
@@ -77,6 +77,12 @@ class FlowHandler(config_entries.ConfigFlow):
 
     async def async_step_discovery(self, user_input):
         """Handle discovery."""
+        for entry in self._async_current_entries():
+            if entry.data[CONF_HOST] == user_input['host']:
+                return self.async_abort(
+                    reason='already_configured'
+                )
+
         self._host = user_input['host']
         return await self.async_step_auth()
 
diff --git a/tests/components/tradfri/test_config_flow.py b/tests/components/tradfri/test_config_flow.py
index 580e9580d76..99566356f61 100644
--- a/tests/components/tradfri/test_config_flow.py
+++ b/tests/components/tradfri/test_config_flow.py
@@ -6,7 +6,7 @@ import pytest
 from homeassistant import data_entry_flow
 from homeassistant.components.tradfri import config_flow
 
-from tests.common import mock_coro
+from tests.common import mock_coro, MockConfigEntry
 
 
 @pytest.fixture
@@ -185,3 +185,35 @@ async def test_import_connection_legacy(hass, mock_gateway_info,
 
     assert len(mock_gateway_info.mock_calls) == 1
     assert len(mock_entry_setup.mock_calls) == 1
+
+
+async def test_discovery_duplicate_aborted(hass):
+    """Test a duplicate discovery host is ignored."""
+    MockConfigEntry(
+        domain='tradfri',
+        data={'host': 'some-host'}
+    ).add_to_hass(hass)
+
+    flow = await hass.config_entries.flow.async_init(
+        'tradfri', context={'source': 'discovery'}, data={
+            'host': 'some-host'
+        })
+
+    assert flow['type'] == data_entry_flow.RESULT_TYPE_ABORT
+    assert flow['reason'] == 'already_configured'
+
+
+async def test_import_duplicate_aborted(hass):
+    """Test a duplicate discovery host is ignored."""
+    MockConfigEntry(
+        domain='tradfri',
+        data={'host': 'some-host'}
+    ).add_to_hass(hass)
+
+    flow = await hass.config_entries.flow.async_init(
+        'tradfri', context={'source': 'import'}, data={
+            'host': 'some-host'
+        })
+
+    assert flow['type'] == data_entry_flow.RESULT_TYPE_ABORT
+    assert flow['reason'] == 'already_configured'
diff --git a/tests/components/tradfri/test_init.py b/tests/components/tradfri/test_init.py
new file mode 100644
index 00000000000..4527e87f605
--- /dev/null
+++ b/tests/components/tradfri/test_init.py
@@ -0,0 +1,72 @@
+"""Tests for Tradfri setup."""
+from unittest.mock import patch
+
+from homeassistant.setup import async_setup_component
+
+from tests.common import MockConfigEntry
+
+
+async def test_config_yaml_host_not_imported(hass):
+    """Test that we don't import a configured host."""
+    MockConfigEntry(
+        domain='tradfri',
+        data={'host': 'mock-host'}
+    ).add_to_hass(hass)
+
+    with patch('homeassistant.components.tradfri.load_json',
+               return_value={}), \
+            patch.object(hass.config_entries.flow, 'async_init') as mock_init:
+        assert await async_setup_component(hass, 'tradfri', {
+            'tradfri': {
+                'host': 'mock-host'
+            }
+        })
+
+    assert len(mock_init.mock_calls) == 0
+
+
+async def test_config_yaml_host_imported(hass):
+    """Test that we import a configured host."""
+    with patch('homeassistant.components.tradfri.load_json',
+               return_value={}):
+        assert await async_setup_component(hass, 'tradfri', {
+            'tradfri': {
+                'host': 'mock-host'
+            }
+        })
+
+    progress = hass.config_entries.flow.async_progress()
+    assert len(progress) == 1
+    assert progress[0]['handler'] == 'tradfri'
+    assert progress[0]['context'] == {'source': 'import'}
+
+
+async def test_config_json_host_not_imported(hass):
+    """Test that we don't import a configured host."""
+    MockConfigEntry(
+        domain='tradfri',
+        data={'host': 'mock-host'}
+    ).add_to_hass(hass)
+
+    with patch('homeassistant.components.tradfri.load_json',
+               return_value={'mock-host': {'key': 'some-info'}}), \
+            patch.object(hass.config_entries.flow, 'async_init') as mock_init:
+        assert await async_setup_component(hass, 'tradfri', {
+            'tradfri': {}
+        })
+
+    assert len(mock_init.mock_calls) == 0
+
+
+async def test_config_json_host_imported(hass):
+    """Test that we import a configured host."""
+    with patch('homeassistant.components.tradfri.load_json',
+               return_value={'mock-host': {'key': 'some-info'}}):
+        assert await async_setup_component(hass, 'tradfri', {
+            'tradfri': {}
+        })
+
+    progress = hass.config_entries.flow.async_progress()
+    assert len(progress) == 1
+    assert progress[0]['handler'] == 'tradfri'
+    assert progress[0]['context'] == {'source': 'import'}

From 631ecf578e9f4b6ab1166b2a8a659b8602096572 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Wed, 26 Sep 2018 23:48:55 +0200
Subject: [PATCH 323/357] Lint

---
 homeassistant/util/json.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/homeassistant/util/json.py b/homeassistant/util/json.py
index d6f7e149040..40e26f80e91 100644
--- a/homeassistant/util/json.py
+++ b/homeassistant/util/json.py
@@ -3,7 +3,6 @@ import logging
 from typing import Union, List, Dict
 
 import json
-import os
 
 from homeassistant.exceptions import HomeAssistantError
 

From 726cf9b1c4417f44777268b46289243e55ebc8d9 Mon Sep 17 00:00:00 2001
From: Anders Melchiorsen <amelchio@nogoto.net>
Date: Thu, 27 Sep 2018 00:21:29 +0200
Subject: [PATCH 324/357] Remove unused import (#16909)

* Remove unused import

* Revert test usage
---
 tests/components/emulated_hue/test_init.py | 91 +++++++++++-----------
 1 file changed, 44 insertions(+), 47 deletions(-)

diff --git a/tests/components/emulated_hue/test_init.py b/tests/components/emulated_hue/test_init.py
index d416dd08e05..2f443eb5d6e 100644
--- a/tests/components/emulated_hue/test_init.py
+++ b/tests/components/emulated_hue/test_init.py
@@ -16,25 +16,24 @@ def test_config_google_home_entity_id_to_number():
     handle = mop()
 
     with patch('homeassistant.util.json.open', mop, create=True):
-        with patch('homeassistant.util.json.os.open', return_value=0):
-            number = conf.entity_id_to_number('light.test')
-            assert number == '2'
-            assert handle.write.call_count == 1
-            assert json.loads(handle.write.mock_calls[0][1][0]) == {
-                '1': 'light.test2',
-                '2': 'light.test',
-            }
+        number = conf.entity_id_to_number('light.test')
+        assert number == '2'
+        assert handle.write.call_count == 1
+        assert json.loads(handle.write.mock_calls[0][1][0]) == {
+            '1': 'light.test2',
+            '2': 'light.test',
+        }
 
-            number = conf.entity_id_to_number('light.test')
-            assert number == '2'
-            assert handle.write.call_count == 1
+        number = conf.entity_id_to_number('light.test')
+        assert number == '2'
+        assert handle.write.call_count == 1
 
-            number = conf.entity_id_to_number('light.test2')
-            assert number == '1'
-            assert handle.write.call_count == 1
+        number = conf.entity_id_to_number('light.test2')
+        assert number == '1'
+        assert handle.write.call_count == 1
 
-            entity_id = conf.number_to_entity_id('1')
-            assert entity_id == 'light.test2'
+        entity_id = conf.number_to_entity_id('1')
+        assert entity_id == 'light.test2'
 
 
 def test_config_google_home_entity_id_to_number_altered():
@@ -47,25 +46,24 @@ def test_config_google_home_entity_id_to_number_altered():
     handle = mop()
 
     with patch('homeassistant.util.json.open', mop, create=True):
-        with patch('homeassistant.util.json.os.open', return_value=0):
-            number = conf.entity_id_to_number('light.test')
-            assert number == '22'
-            assert handle.write.call_count == 1
-            assert json.loads(handle.write.mock_calls[0][1][0]) == {
-                '21': 'light.test2',
-                '22': 'light.test',
-            }
+        number = conf.entity_id_to_number('light.test')
+        assert number == '22'
+        assert handle.write.call_count == 1
+        assert json.loads(handle.write.mock_calls[0][1][0]) == {
+            '21': 'light.test2',
+            '22': 'light.test',
+        }
 
-            number = conf.entity_id_to_number('light.test')
-            assert number == '22'
-            assert handle.write.call_count == 1
+        number = conf.entity_id_to_number('light.test')
+        assert number == '22'
+        assert handle.write.call_count == 1
 
-            number = conf.entity_id_to_number('light.test2')
-            assert number == '21'
-            assert handle.write.call_count == 1
+        number = conf.entity_id_to_number('light.test2')
+        assert number == '21'
+        assert handle.write.call_count == 1
 
-            entity_id = conf.number_to_entity_id('21')
-            assert entity_id == 'light.test2'
+        entity_id = conf.number_to_entity_id('21')
+        assert entity_id == 'light.test2'
 
 
 def test_config_google_home_entity_id_to_number_empty():
@@ -78,24 +76,23 @@ def test_config_google_home_entity_id_to_number_empty():
     handle = mop()
 
     with patch('homeassistant.util.json.open', mop, create=True):
-        with patch('homeassistant.util.json.os.open', return_value=0):
-            number = conf.entity_id_to_number('light.test')
-            assert number == '1'
-            assert handle.write.call_count == 1
-            assert json.loads(handle.write.mock_calls[0][1][0]) == {
-                '1': 'light.test',
-            }
+        number = conf.entity_id_to_number('light.test')
+        assert number == '1'
+        assert handle.write.call_count == 1
+        assert json.loads(handle.write.mock_calls[0][1][0]) == {
+            '1': 'light.test',
+        }
 
-            number = conf.entity_id_to_number('light.test')
-            assert number == '1'
-            assert handle.write.call_count == 1
+        number = conf.entity_id_to_number('light.test')
+        assert number == '1'
+        assert handle.write.call_count == 1
 
-            number = conf.entity_id_to_number('light.test2')
-            assert number == '2'
-            assert handle.write.call_count == 2
+        number = conf.entity_id_to_number('light.test2')
+        assert number == '2'
+        assert handle.write.call_count == 2
 
-            entity_id = conf.number_to_entity_id('2')
-            assert entity_id == 'light.test2'
+        entity_id = conf.number_to_entity_id('2')
+        assert entity_id == 'light.test2'
 
 
 def test_config_alexa_entity_id_to_number():

From 96e5acda1a48cfc581f90c2293378afb2feca8b0 Mon Sep 17 00:00:00 2001
From: Jason Hu <awarecan@users.noreply.github.com>
Date: Wed, 26 Sep 2018 15:38:13 -0700
Subject: [PATCH 325/357] Optimize Ring Sensors platform setup (#16886)

---
 homeassistant/components/binary_sensor/ring.py |  7 ++++---
 homeassistant/components/sensor/ring.py        | 10 ++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/homeassistant/components/binary_sensor/ring.py b/homeassistant/components/binary_sensor/ring.py
index 102e22cbe2d..3945eb5c926 100644
--- a/homeassistant/components/binary_sensor/ring.py
+++ b/homeassistant/components/binary_sensor/ring.py
@@ -44,14 +44,15 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     ring = hass.data[DATA_RING]
 
     sensors = []
-    for sensor_type in config.get(CONF_MONITORED_CONDITIONS):
-        for device in ring.doorbells:
+    for device in ring.doorbells:  # ring.doorbells is doing I/O
+        for sensor_type in config[CONF_MONITORED_CONDITIONS]:
             if 'doorbell' in SENSOR_TYPES[sensor_type][1]:
                 sensors.append(RingBinarySensor(hass,
                                                 device,
                                                 sensor_type))
 
-        for device in ring.stickup_cams:
+    for device in ring.stickup_cams:  # ring.stickup_cams is doing I/O
+        for sensor_type in config[CONF_MONITORED_CONDITIONS]:
             if 'stickup_cams' in SENSOR_TYPES[sensor_type][1]:
                 sensors.append(RingBinarySensor(hass,
                                                 device,
diff --git a/homeassistant/components/sensor/ring.py b/homeassistant/components/sensor/ring.py
index 31c0360cc23..408971c60e1 100644
--- a/homeassistant/components/sensor/ring.py
+++ b/homeassistant/components/sensor/ring.py
@@ -66,16 +66,18 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     ring = hass.data[DATA_RING]
 
     sensors = []
-    for sensor_type in config.get(CONF_MONITORED_CONDITIONS):
-        for device in ring.chimes:
+    for device in ring.chimes:  # ring.chimes is doing I/O
+        for sensor_type in config[CONF_MONITORED_CONDITIONS]:
             if 'chime' in SENSOR_TYPES[sensor_type][1]:
                 sensors.append(RingSensor(hass, device, sensor_type))
 
-        for device in ring.doorbells:
+    for device in ring.doorbells:  # ring.doorbells is doing I/O
+        for sensor_type in config[CONF_MONITORED_CONDITIONS]:
             if 'doorbell' in SENSOR_TYPES[sensor_type][1]:
                 sensors.append(RingSensor(hass, device, sensor_type))
 
-        for device in ring.stickup_cams:
+    for device in ring.stickup_cams:  # ring.stickup_cams is doing I/O
+        for sensor_type in config[CONF_MONITORED_CONDITIONS]:
             if 'stickup_cams' in SENSOR_TYPES[sensor_type][1]:
                 sensors.append(RingSensor(hass, device, sensor_type))
 

From 81d4338b939b6f320af590d6ef37fe6ed549983f Mon Sep 17 00:00:00 2001
From: Anders Melchiorsen <amelchio@nogoto.net>
Date: Thu, 27 Sep 2018 01:08:20 +0200
Subject: [PATCH 326/357] Upgrade aiolifx_effects to 0.2.0 (#16900)

---
 homeassistant/components/light/lifx.py | 2 +-
 requirements_all.txt                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/light/lifx.py b/homeassistant/components/light/lifx.py
index bea39354e1b..21a501fa6ea 100644
--- a/homeassistant/components/light/lifx.py
+++ b/homeassistant/components/light/lifx.py
@@ -30,7 +30,7 @@ import homeassistant.util.color as color_util
 
 _LOGGER = logging.getLogger(__name__)
 
-REQUIREMENTS = ['aiolifx==0.6.3', 'aiolifx_effects==0.1.2']
+REQUIREMENTS = ['aiolifx==0.6.3', 'aiolifx_effects==0.2.0']
 
 UDP_BROADCAST_PORT = 56700
 
diff --git a/requirements_all.txt b/requirements_all.txt
index 4600af0c542..b84c0601c02 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -110,7 +110,7 @@ aioimaplib==0.7.13
 aiolifx==0.6.3
 
 # homeassistant.components.light.lifx
-aiolifx_effects==0.1.2
+aiolifx_effects==0.2.0
 
 # homeassistant.components.scene.hunterdouglas_powerview
 aiopvapi==1.5.4

From 24e9c62fe76ea4eaa98321411c3aebdd36d45f67 Mon Sep 17 00:00:00 2001
From: Anders Melchiorsen <amelchio@nogoto.net>
Date: Thu, 27 Sep 2018 01:09:30 +0200
Subject: [PATCH 327/357] Upgrade pysonos to 0.0.3 (#16901)

This version has downgraded/removed some logging that we then no
longer have to hide.
---
 homeassistant/components/media_player/sonos.py | 8 --------
 homeassistant/components/sonos/__init__.py     | 2 +-
 requirements_all.txt                           | 2 +-
 requirements_test_all.txt                      | 2 +-
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/homeassistant/components/media_player/sonos.py b/homeassistant/components/media_player/sonos.py
index fd735a5b830..1486d47e759 100644
--- a/homeassistant/components/media_player/sonos.py
+++ b/homeassistant/components/media_player/sonos.py
@@ -33,9 +33,7 @@ _LOGGER = logging.getLogger(__name__)
 
 # Quiet down pysonos logging to just actual problems.
 logging.getLogger('pysonos').setLevel(logging.WARNING)
-logging.getLogger('pysonos.events').setLevel(logging.ERROR)
 logging.getLogger('pysonos.data_structures_entry').setLevel(logging.ERROR)
-_SOCO_SERVICES_LOGGER = logging.getLogger('pysonos.services')
 
 SUPPORT_SONOS = SUPPORT_VOLUME_SET | SUPPORT_VOLUME_MUTE |\
     SUPPORT_PLAY | SUPPORT_PAUSE | SUPPORT_STOP | SUPPORT_SELECT_SOURCE |\
@@ -289,10 +287,6 @@ def soco_error(errorcodes=None):
             """Wrap for all soco UPnP exception."""
             from pysonos.exceptions import SoCoUPnPException, SoCoException
 
-            # Temporarily disable SoCo logging because it will log the
-            # UPnP exception otherwise
-            _SOCO_SERVICES_LOGGER.disabled = True
-
             try:
                 return funct(*args, **kwargs)
             except SoCoUPnPException as err:
@@ -302,8 +296,6 @@ def soco_error(errorcodes=None):
                     _LOGGER.error("Error on %s with %s", funct.__name__, err)
             except SoCoException as err:
                 _LOGGER.error("Error on %s with %s", funct.__name__, err)
-            finally:
-                _SOCO_SERVICES_LOGGER.disabled = False
 
         return wrapper
     return decorator
diff --git a/homeassistant/components/sonos/__init__.py b/homeassistant/components/sonos/__init__.py
index b4565794844..b794fe607e6 100644
--- a/homeassistant/components/sonos/__init__.py
+++ b/homeassistant/components/sonos/__init__.py
@@ -4,7 +4,7 @@ from homeassistant.helpers import config_entry_flow
 
 
 DOMAIN = 'sonos'
-REQUIREMENTS = ['pysonos==0.0.2']
+REQUIREMENTS = ['pysonos==0.0.3']
 
 
 async def async_setup(hass, config):
diff --git a/requirements_all.txt b/requirements_all.txt
index b84c0601c02..a954b2cf94f 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1071,7 +1071,7 @@ pysma==0.2
 pysnmp==4.4.5
 
 # homeassistant.components.sonos
-pysonos==0.0.2
+pysonos==0.0.3
 
 # homeassistant.components.spc
 pyspcwebgw==0.4.0
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 691fc641607..f33b37e01d1 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -169,7 +169,7 @@ pyotp==2.2.6
 pyqwikswitch==0.8
 
 # homeassistant.components.sonos
-pysonos==0.0.2
+pysonos==0.0.3
 
 # homeassistant.components.spc
 pyspcwebgw==0.4.0

From 29db43edb2306c4abe2a976acb2ecaf115389d89 Mon Sep 17 00:00:00 2001
From: Anders Melchiorsen <amelchio@nogoto.net>
Date: Thu, 27 Sep 2018 09:44:19 +0200
Subject: [PATCH 328/357] Ignore Xiaomi hub callbacks during setup (#16910)

---
 homeassistant/components/xiaomi_aqara.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/xiaomi_aqara.py b/homeassistant/components/xiaomi_aqara.py
index f2d51d2fc2e..9c2fb9f7fe7 100644
--- a/homeassistant/components/xiaomi_aqara.py
+++ b/homeassistant/components/xiaomi_aqara.py
@@ -218,7 +218,7 @@ class XiaomiDevice(Entity):
         self._get_from_hub = xiaomi_hub.get_from_hub
         self._device_state_attributes = {}
         self._remove_unavailability_tracker = None
-        xiaomi_hub.callbacks[self._sid].append(self._add_push_data_job)
+        self._xiaomi_hub = xiaomi_hub
         self.parse_data(device['data'], device['raw_data'])
         self.parse_voltage(device['data'])
 
@@ -236,6 +236,7 @@ class XiaomiDevice(Entity):
     @asyncio.coroutine
     def async_added_to_hass(self):
         """Start unavailability tracking."""
+        self._xiaomi_hub.callbacks[self._sid].append(self._add_push_data_job)
         self._async_track_unavailable()
 
     @property

From da3342f1aaa71fb24df40046eb3de8ef884db209 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Thu, 27 Sep 2018 11:26:58 +0200
Subject: [PATCH 329/357] Update new values coming in for dev registry (#16852)

* Update new values coming in for dev registry

* fix Lint+Test;2C
---
 homeassistant/helpers/device_registry.py      | 89 ++++++++++++-------
 .../components/config/test_device_registry.py |  1 -
 tests/helpers/test_device_registry.py         | 15 +++-
 3 files changed, 66 insertions(+), 39 deletions(-)

diff --git a/homeassistant/helpers/device_registry.py b/homeassistant/helpers/device_registry.py
index 8d4cd0a5bbf..478b29c75b2 100644
--- a/homeassistant/helpers/device_registry.py
+++ b/homeassistant/helpers/device_registry.py
@@ -26,11 +26,12 @@ CONNECTION_ZIGBEE = 'zigbee'
 class DeviceEntry:
     """Device Registry Entry."""
 
-    config_entries = attr.ib(type=set, converter=set)
-    connections = attr.ib(type=set, converter=set)
-    identifiers = attr.ib(type=set, converter=set)
-    manufacturer = attr.ib(type=str)
-    model = attr.ib(type=str)
+    config_entries = attr.ib(type=set, converter=set,
+                             default=attr.Factory(set))
+    connections = attr.ib(type=set, converter=set, default=attr.Factory(set))
+    identifiers = attr.ib(type=set, converter=set, default=attr.Factory(set))
+    manufacturer = attr.ib(type=str, default=None)
+    model = attr.ib(type=str, default=None)
     name = attr.ib(type=str, default=None)
     sw_version = attr.ib(type=str, default=None)
     hub_device_id = attr.ib(type=str, default=None)
@@ -56,46 +57,53 @@ class DeviceRegistry:
         return None
 
     @callback
-    def async_get_or_create(self, *, config_entry_id, connections, identifiers,
-                            manufacturer, model, name=None, sw_version=None,
+    def async_get_or_create(self, *, config_entry_id, connections=None,
+                            identifiers=None, manufacturer=_UNDEF,
+                            model=_UNDEF, name=_UNDEF, sw_version=_UNDEF,
                             via_hub=None):
         """Get device. Create if it doesn't exist."""
         if not identifiers and not connections:
             return None
 
+        if identifiers is None:
+            identifiers = set()
+
+        if connections is None:
+            connections = set()
+
         device = self.async_get_device(identifiers, connections)
 
+        if device is None:
+            device = DeviceEntry()
+            self.devices[device.id] = device
+
         if via_hub is not None:
             hub_device = self.async_get_device({via_hub}, set())
-            hub_device_id = hub_device.id if hub_device else None
+            hub_device_id = hub_device.id if hub_device else _UNDEF
         else:
-            hub_device_id = None
+            hub_device_id = _UNDEF
 
-        if device is not None:
-            return self._async_update_device(
-                device.id, config_entry_id=config_entry_id,
-                hub_device_id=hub_device_id
-            )
-
-        device = DeviceEntry(
-            config_entries={config_entry_id},
-            connections=connections,
-            identifiers=identifiers,
+        return self._async_update_device(
+            device.id,
+            add_config_entry_id=config_entry_id,
+            hub_device_id=hub_device_id,
+            merge_connections=connections,
+            merge_identifiers=identifiers,
             manufacturer=manufacturer,
             model=model,
             name=name,
             sw_version=sw_version,
-            hub_device_id=hub_device_id
         )
-        self.devices[device.id] = device
-
-        self.async_schedule_save()
-
-        return device
 
     @callback
-    def _async_update_device(self, device_id, *, config_entry_id=_UNDEF,
+    def _async_update_device(self, device_id, *, add_config_entry_id=_UNDEF,
                              remove_config_entry_id=_UNDEF,
+                             merge_connections=_UNDEF,
+                             merge_identifiers=_UNDEF,
+                             manufacturer=_UNDEF,
+                             model=_UNDEF,
+                             name=_UNDEF,
+                             sw_version=_UNDEF,
                              hub_device_id=_UNDEF):
         """Update device attributes."""
         old = self.devices[device_id]
@@ -104,21 +112,34 @@ class DeviceRegistry:
 
         config_entries = old.config_entries
 
-        if (config_entry_id is not _UNDEF and
-                config_entry_id not in old.config_entries):
-            config_entries = old.config_entries | {config_entry_id}
+        if (add_config_entry_id is not _UNDEF and
+                add_config_entry_id not in old.config_entries):
+            config_entries = old.config_entries | {add_config_entry_id}
 
         if (remove_config_entry_id is not _UNDEF and
                 remove_config_entry_id in config_entries):
-            config_entries = set(config_entries)
-            config_entries.remove(remove_config_entry_id)
+            config_entries = config_entries - {remove_config_entry_id}
 
         if config_entries is not old.config_entries:
             changes['config_entries'] = config_entries
 
-        if (hub_device_id is not _UNDEF and
-                hub_device_id != old.hub_device_id):
-            changes['hub_device_id'] = hub_device_id
+        for attr_name, value in (
+                ('connections', merge_connections),
+                ('identifiers', merge_identifiers),
+        ):
+            old_value = getattr(old, attr_name)
+            if value is not _UNDEF and value != old_value:
+                changes[attr_name] = old_value | value
+
+        for attr_name, value in (
+                ('manufacturer', manufacturer),
+                ('model', model),
+                ('name', name),
+                ('sw_version', sw_version),
+                ('hub_device_id', hub_device_id),
+        ):
+            if value is not _UNDEF and value != getattr(old, attr_name):
+                changes[attr_name] = value
 
         if not changes:
             return old
diff --git a/tests/components/config/test_device_registry.py b/tests/components/config/test_device_registry.py
index f8ea51cfdc8..87eb0fb2d6f 100644
--- a/tests/components/config/test_device_registry.py
+++ b/tests/components/config/test_device_registry.py
@@ -27,7 +27,6 @@ async def test_list_devices(hass, client, registry):
         manufacturer='manufacturer', model='model')
     registry.async_get_or_create(
         config_entry_id='1234',
-        connections={},
         identifiers={('bridgeid', '1234')},
         manufacturer='manufacturer', model='model',
         via_hub=('bridgeid', '0123'))
diff --git a/tests/helpers/test_device_registry.py b/tests/helpers/test_device_registry.py
index b251846c491..a87ad3d483a 100644
--- a/tests/helpers/test_device_registry.py
+++ b/tests/helpers/test_device_registry.py
@@ -17,7 +17,10 @@ async def test_get_or_create_returns_same_entry(registry):
         config_entry_id='1234',
         connections={('ethernet', '12:34:56:78:90:AB:CD:EF')},
         identifiers={('bridgeid', '0123')},
-        manufacturer='manufacturer', model='model')
+        sw_version='sw-version',
+        name='name',
+        manufacturer='manufacturer',
+        model='model')
     entry2 = registry.async_get_or_create(
         config_entry_id='1234',
         connections={('ethernet', '11:22:33:44:55:66:77:88')},
@@ -25,15 +28,19 @@ async def test_get_or_create_returns_same_entry(registry):
         manufacturer='manufacturer', model='model')
     entry3 = registry.async_get_or_create(
         config_entry_id='1234',
-        connections={('ethernet', '12:34:56:78:90:AB:CD:EF')},
-        identifiers={('bridgeid', '1234')},
-        manufacturer='manufacturer', model='model')
+        connections={('ethernet', '12:34:56:78:90:AB:CD:EF')}
+    )
 
     assert len(registry.devices) == 1
     assert entry.id == entry2.id
     assert entry.id == entry3.id
     assert entry.identifiers == {('bridgeid', '0123')}
 
+    assert entry3.manufacturer == 'manufacturer'
+    assert entry3.model == 'model'
+    assert entry3.name == 'name'
+    assert entry3.sw_version == 'sw-version'
+
 
 async def test_requirement_for_identifier_or_connection(registry):
     """Make sure we do require some descriptor of device."""

From ad79dc673d22fe7086e67fa393c36bd105bb7484 Mon Sep 17 00:00:00 2001
From: emontnemery <erik@montnemery.com>
Date: Thu, 27 Sep 2018 11:48:52 +0200
Subject: [PATCH 330/357] MQTT Light - Do not throw if property is missing from
 templated MQTT message (#16720)

* Do not throw if property is missing

* Render template once, add debug prints
---
 homeassistant/components/light/mqtt.py | 52 ++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 8 deletions(-)

diff --git a/homeassistant/components/light/mqtt.py b/homeassistant/components/light/mqtt.py
index 10227bdc3b6..8bd50700c53 100644
--- a/homeassistant/components/light/mqtt.py
+++ b/homeassistant/components/light/mqtt.py
@@ -243,6 +243,10 @@ class MqttLight(MqttAvailability, MqttDiscoveryUpdate, Light):
         def state_received(topic, payload, qos):
             """Handle new MQTT messages."""
             payload = templates[CONF_STATE](payload)
+            if not payload:
+                _LOGGER.debug("Ignoring empty state message from '%s'", topic)
+                return
+
             if payload == self._payload['on']:
                 self._state = True
             elif payload == self._payload['off']:
@@ -259,7 +263,13 @@ class MqttLight(MqttAvailability, MqttDiscoveryUpdate, Light):
         @callback
         def brightness_received(topic, payload, qos):
             """Handle new MQTT messages for the brightness."""
-            device_value = float(templates[CONF_BRIGHTNESS](payload))
+            payload = templates[CONF_BRIGHTNESS](payload)
+            if not payload:
+                _LOGGER.debug("Ignoring empty brightness message from '%s'",
+                              topic)
+                return
+
+            device_value = float(payload)
             percent_bright = device_value / self._brightness_scale
             self._brightness = int(percent_bright * 255)
             self.async_schedule_update_ha_state()
@@ -280,8 +290,12 @@ class MqttLight(MqttAvailability, MqttDiscoveryUpdate, Light):
         @callback
         def rgb_received(topic, payload, qos):
             """Handle new MQTT messages for RGB."""
-            rgb = [int(val) for val in
-                   templates[CONF_RGB](payload).split(',')]
+            payload = templates[CONF_RGB](payload)
+            if not payload:
+                _LOGGER.debug("Ignoring empty rgb message from '%s'", topic)
+                return
+
+            rgb = [int(val) for val in payload.split(',')]
             self._hs = color_util.color_RGB_to_hs(*rgb)
             self.async_schedule_update_ha_state()
 
@@ -299,7 +313,13 @@ class MqttLight(MqttAvailability, MqttDiscoveryUpdate, Light):
         @callback
         def color_temp_received(topic, payload, qos):
             """Handle new MQTT messages for color temperature."""
-            self._color_temp = int(templates[CONF_COLOR_TEMP](payload))
+            payload = templates[CONF_COLOR_TEMP](payload)
+            if not payload:
+                _LOGGER.debug("Ignoring empty color temp message from '%s'",
+                              topic)
+                return
+
+            self._color_temp = int(payload)
             self.async_schedule_update_ha_state()
 
         if self._topic[CONF_COLOR_TEMP_STATE_TOPIC] is not None:
@@ -318,7 +338,12 @@ class MqttLight(MqttAvailability, MqttDiscoveryUpdate, Light):
         @callback
         def effect_received(topic, payload, qos):
             """Handle new MQTT messages for effect."""
-            self._effect = templates[CONF_EFFECT](payload)
+            payload = templates[CONF_EFFECT](payload)
+            if not payload:
+                _LOGGER.debug("Ignoring empty effect message from '%s'", topic)
+                return
+
+            self._effect = payload
             self.async_schedule_update_ha_state()
 
         if self._topic[CONF_EFFECT_STATE_TOPIC] is not None:
@@ -337,7 +362,13 @@ class MqttLight(MqttAvailability, MqttDiscoveryUpdate, Light):
         @callback
         def white_value_received(topic, payload, qos):
             """Handle new MQTT messages for white value."""
-            device_value = float(templates[CONF_WHITE_VALUE](payload))
+            payload = templates[CONF_WHITE_VALUE](payload)
+            if not payload:
+                _LOGGER.debug("Ignoring empty white value message from '%s'",
+                              topic)
+                return
+
+            device_value = float(payload)
             percent_white = device_value / self._white_value_scale
             self._white_value = int(percent_white * 255)
             self.async_schedule_update_ha_state()
@@ -358,8 +389,13 @@ class MqttLight(MqttAvailability, MqttDiscoveryUpdate, Light):
         @callback
         def xy_received(topic, payload, qos):
             """Handle new MQTT messages for  color."""
-            xy_color = [float(val) for val in
-                        templates[CONF_XY](payload).split(',')]
+            payload = templates[CONF_XY](payload)
+            if not payload:
+                _LOGGER.debug("Ignoring empty xy-color message from '%s'",
+                              topic)
+                return
+
+            xy_color = [float(val) for val in payload.split(',')]
             self._hs = color_util.color_xy_to_hs(*xy_color)
             self.async_schedule_update_ha_state()
 

From 2cc626309285dba1ad21f0ffd65017ccc2dfa7d4 Mon Sep 17 00:00:00 2001
From: Blake Blackshear <blakeb@blakeshome.com>
Date: Thu, 27 Sep 2018 05:34:42 -0500
Subject: [PATCH 331/357] Add new services for set/refresh Z-Wave device values
 (#16638)

* Add services for getting and setting indicator values for Z-Wave

* Add service to manually refresh Z-Wave node value by value_id

* Remove refresh_indicator service

* Coerce to int

* Add generic set_node_value service

* Remove set_indicator service
---
 homeassistant/components/zwave/__init__.py    | 34 ++++++++++++++
 homeassistant/components/zwave/const.py       |  2 +
 .../components/zwave/discovery_schemas.py     |  3 +-
 homeassistant/components/zwave/services.yaml  | 18 +++++++
 tests/components/zwave/test_init.py           | 47 +++++++++++++++++++
 5 files changed, 103 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/zwave/__init__.py b/homeassistant/components/zwave/__init__.py
index 4cb2f6b0f7b..8de8c713f04 100644
--- a/homeassistant/components/zwave/__init__.py
+++ b/homeassistant/components/zwave/__init__.py
@@ -84,6 +84,17 @@ SET_CONFIG_PARAMETER_SCHEMA = vol.Schema({
     vol.Optional(const.ATTR_CONFIG_SIZE, default=2): vol.Coerce(int)
 })
 
+SET_NODE_VALUE_SCHEMA = vol.Schema({
+    vol.Required(const.ATTR_NODE_ID): vol.Coerce(int),
+    vol.Required(const.ATTR_VALUE_ID): vol.Coerce(int),
+    vol.Required(const.ATTR_CONFIG_VALUE): vol.Coerce(int)
+})
+
+REFRESH_NODE_VALUE_SCHEMA = vol.Schema({
+    vol.Required(const.ATTR_NODE_ID): vol.Coerce(int),
+    vol.Required(const.ATTR_VALUE_ID): vol.Coerce(int)
+})
+
 SET_POLL_INTENSITY_SCHEMA = vol.Schema({
     vol.Required(const.ATTR_NODE_ID): vol.Coerce(int),
     vol.Required(const.ATTR_VALUE_ID): vol.Coerce(int),
@@ -492,6 +503,23 @@ async def async_setup(hass, config):
                      "with selection %s", param, node_id,
                      selection)
 
+    def refresh_node_value(service):
+        """Refresh the specified value from a node."""
+        node_id = service.data.get(const.ATTR_NODE_ID)
+        value_id = service.data.get(const.ATTR_VALUE_ID)
+        node = network.nodes[node_id]
+        node.values[value_id].refresh()
+        _LOGGER.info("Node %s value %s refreshed", node_id, value_id)
+
+    def set_node_value(service):
+        """Set the specified value on a node."""
+        node_id = service.data.get(const.ATTR_NODE_ID)
+        value_id = service.data.get(const.ATTR_VALUE_ID)
+        value = service.data.get(const.ATTR_CONFIG_VALUE)
+        node = network.nodes[node_id]
+        node.values[value_id].data = value
+        _LOGGER.info("Node %s value %s set to %s", node_id, value_id, value)
+
     def print_config_parameter(service):
         """Print a config parameter from a node."""
         node_id = service.data.get(const.ATTR_NODE_ID)
@@ -662,6 +690,12 @@ async def async_setup(hass, config):
         hass.services.register(DOMAIN, const.SERVICE_SET_CONFIG_PARAMETER,
                                set_config_parameter,
                                schema=SET_CONFIG_PARAMETER_SCHEMA)
+        hass.services.register(DOMAIN, const.SERVICE_SET_NODE_VALUE,
+                               set_node_value,
+                               schema=SET_NODE_VALUE_SCHEMA)
+        hass.services.register(DOMAIN, const.SERVICE_REFRESH_NODE_VALUE,
+                               refresh_node_value,
+                               schema=REFRESH_NODE_VALUE_SCHEMA)
         hass.services.register(DOMAIN, const.SERVICE_PRINT_CONFIG_PARAMETER,
                                print_config_parameter,
                                schema=PRINT_CONFIG_PARAMETER_SCHEMA)
diff --git a/homeassistant/components/zwave/const.py b/homeassistant/components/zwave/const.py
index 0228e64cf6e..775da8fbc51 100644
--- a/homeassistant/components/zwave/const.py
+++ b/homeassistant/components/zwave/const.py
@@ -39,6 +39,8 @@ SERVICE_SOFT_RESET = "soft_reset"
 SERVICE_TEST_NODE = "test_node"
 SERVICE_TEST_NETWORK = "test_network"
 SERVICE_SET_CONFIG_PARAMETER = "set_config_parameter"
+SERVICE_SET_NODE_VALUE = "set_node_value"
+SERVICE_REFRESH_NODE_VALUE = "refresh_node_value"
 SERVICE_PRINT_CONFIG_PARAMETER = "print_config_parameter"
 SERVICE_PRINT_NODE = "print_node"
 SERVICE_REMOVE_FAILED_NODE = "remove_failed_node"
diff --git a/homeassistant/components/zwave/discovery_schemas.py b/homeassistant/components/zwave/discovery_schemas.py
index 2a4e42ab92c..56d63d658a9 100644
--- a/homeassistant/components/zwave/discovery_schemas.py
+++ b/homeassistant/components/zwave/discovery_schemas.py
@@ -211,7 +211,8 @@ DISCOVERY_SCHEMAS = [
                  const.COMMAND_CLASS_SENSOR_MULTILEVEL,
                  const.COMMAND_CLASS_METER,
                  const.COMMAND_CLASS_ALARM,
-                 const.COMMAND_CLASS_SENSOR_ALARM],
+                 const.COMMAND_CLASS_SENSOR_ALARM,
+                 const.COMMAND_CLASS_INDICATOR],
              const.DISC_GENRE: const.GENRE_USER,
          }})},
     {const.DISC_COMPONENT: 'switch',
diff --git a/homeassistant/components/zwave/services.yaml b/homeassistant/components/zwave/services.yaml
index 1762c33237d..583d76a1955 100644
--- a/homeassistant/components/zwave/services.yaml
+++ b/homeassistant/components/zwave/services.yaml
@@ -69,6 +69,24 @@ set_config_parameter:
     size:
       description: (Optional) Set the size of the parameter value. Only needed if no parameters are available.
 
+set_node_value:
+  description: Set the value for a given value_id on a Z-Wave device.
+  fields:
+    node_id:
+      description: Node id of the device to set the value on (integer).
+    value_id:
+      description: Value id of the value to set (integer).
+    value:
+      description: Value to set (integer).
+
+refresh_node_value:
+  description: Refresh the value for a given value_id on a Z-Wave device.
+  fields:
+    node_id:
+      description: Node id of the device to refresh value from (integer).
+    value_id:
+      description: Value id of the value to refresh.
+
 set_poll_intensity:
   description: Set the polling interval to a nodes value
   fields:
diff --git a/tests/components/zwave/test_init.py b/tests/components/zwave/test_init.py
index bc96c90d50a..2b3019b2f8d 100644
--- a/tests/components/zwave/test_init.py
+++ b/tests/components/zwave/test_init.py
@@ -1361,6 +1361,53 @@ class TestZWaveServices(unittest.TestCase):
         assert node.refresh_info.called
         assert len(node.refresh_info.mock_calls) == 1
 
+    def test_set_node_value(self):
+        """Test zwave set_node_value service."""
+        value = MockValue(
+            index=12,
+            command_class=const.COMMAND_CLASS_INDICATOR,
+            data=4
+        )
+        node = MockNode(node_id=14,
+                        command_classes=[const.COMMAND_CLASS_INDICATOR])
+        node.values = {12: value}
+        node.get_values.return_value = node.values
+        self.zwave_network.nodes = {14: node}
+
+        self.hass.services.call('zwave', 'set_node_value', {
+            const.ATTR_NODE_ID: 14,
+            const.ATTR_VALUE_ID: 12,
+            const.ATTR_CONFIG_VALUE: 2,
+        })
+        self.hass.block_till_done()
+
+        assert self.zwave_network.nodes[14].values[12].data == 2
+
+    def test_refresh_node_value(self):
+        """Test zwave refresh_node_value service."""
+        node = MockNode(node_id=14,
+                        command_classes=[const.COMMAND_CLASS_INDICATOR],
+                        network=self.zwave_network)
+        value = MockValue(
+            node=node,
+            index=12,
+            command_class=const.COMMAND_CLASS_INDICATOR,
+            data=2
+        )
+        value.refresh = MagicMock()
+
+        node.values = {12: value}
+        node.get_values.return_value = node.values
+        self.zwave_network.nodes = {14: node}
+
+        self.hass.services.call('zwave', 'refresh_node_value', {
+            const.ATTR_NODE_ID: 14,
+            const.ATTR_VALUE_ID: 12
+        })
+        self.hass.block_till_done()
+
+        assert value.refresh.called
+
     def test_heal_node(self):
         """Test zwave heal_node service."""
         node = MockNode(node_id=19)

From 8d65230a36aad62952d857c8ca93e7d5c0fdc02a Mon Sep 17 00:00:00 2001
From: zxdavb <david@bonnes.me>
Date: Thu, 27 Sep 2018 12:29:44 +0100
Subject: [PATCH 332/357] Add (EU-based) Honeywell evohome CH/DHW controller
 (#16427)

* Add support for Honeywell evohome CH/DHW systems

More flake8 corrections

Passes Flake8 tests

Almost passed flake8.pylint!

Passed all tox tests

Now it needs serious testing!

Almost ready to submit

BUGFIX: DHW state now functional

More improvements to available()

Solved the DHW temp units problem!

Last minute bug squash

to improve dicts merge

Trying to rebase

fixing more rbase errors

revert to creating HTTP_error_code internally for now

ready to submit PR

Added support for Honeywell evohome CH/DHW systems

* Updated requirements_test_all.txt

* Fix: D401 First line should be in imperative mood

* Remove _LOGGER.info (replace with _LOGGER.debug)

* raise PlatformNotReady when RequestException during setup()

* Revert some LOGGER.debug to LOGGER.warning

* Improved logging levels, and removed some unwanted comments

* Improvments to logging - additional self._status info

* BUGFIX: DHW wrongly showing available = False (and some other tweaks)

* Fix trailing whitespace

* Remove state_attributes override and API_VER code

* Removed heating zones, DHW and heuristics to reduce # lines of code

* Removed some more lines of code

* Removed unused configuration parameters

* Remove some more un-needed lines

* Removed more (uneeded) lines of code & fixed two minor typos

* Improvements to debug logging of available() = False

* Improvements to code, and code clean-up

* Corrected a minor typo

* A small tidy up

* reduces precision of emulated temps floats to 0.1

* Some code improvements as suggested by JeardM

* Rewrite of exception handler

* Removed another unwanted logging in properties

* Remove async_ version of various methods

* moved available heuristics to update()

* Cleanup of code, and re-work linter hints

* fixed a minor documentation typo

* scan_interval is now no longer a configurable option

* Change from Master/Slave to Parent/Child

* Removed the last of the slaves

* Removed the last of the masters

* Move -PARALLEL_UPDATES to .\climate\evohome.py'

* main code moved to climate/evohome.py

* merge EvoEntity into EvoController class

* remove should_poll (for now)

* woops! left a hint in

* removed icon

* only log a WARNING the first time available = False

* cleanup dodgy exception handling

* Tidy up exception handling

* Many changes as suggested by @MartinHjelmare, thanks

* remove hass from init, part 1

* use async_added_to_hass instead of dispatcher_connect

* remove hass from init, part 2 (done)

* add 1-2 arrays, and tidied up some comments

* from dispatcher to async_added_to_hass

* cleaned up some logging, and removed others

* Many changes as request by @MartinHjelmare

* Homage to the lint

* Changed to the HA of doing operating_mode

* Now using update_before_add=True

* reduced logging further still...

* fixed minor lint

* fix a small logic error

* Add device_state_attributes to track actual operating mode

* Clean up doc quotes caused by  previous changes

* Woops! removed some debug lines that shoudln't have stayed in

* Add a complete set of device_state_attributes

* Cleanup some constants

* Remove more legacy code

* domain_data to evo_data & this else should be a finally

* minor change for readability

* Minor change for readability #2

* removed unused code

* small tidy up - no code changes

* fix minor lint

* Correct URLs & descriptions in docstring

* whoops - fixed a typo in docstrings

* remove an unused line of cide & a small tidy-up
---
 .coveragerc                                   |   3 +
 homeassistant/components/climate/evohome.py   | 371 ++++++++++++++++++
 homeassistant/components/climate/honeywell.py |   2 +-
 homeassistant/components/evohome.py           | 145 +++++++
 homeassistant/const.py                        |   2 +
 requirements_all.txt                          |   3 +-
 requirements_test_all.txt                     |   3 +-
 7 files changed, 526 insertions(+), 3 deletions(-)
 create mode 100644 homeassistant/components/climate/evohome.py
 create mode 100644 homeassistant/components/evohome.py

diff --git a/.coveragerc b/.coveragerc
index a935564791a..5e522016096 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -105,6 +105,9 @@ omit =
     homeassistant/components/envisalink.py
     homeassistant/components/*/envisalink.py
 
+    homeassistant/components/evohome.py
+    homeassistant/components/*/evohome.py
+
     homeassistant/components/fritzbox.py
     homeassistant/components/switch/fritzbox.py
 
diff --git a/homeassistant/components/climate/evohome.py b/homeassistant/components/climate/evohome.py
new file mode 100644
index 00000000000..f0631228fd8
--- /dev/null
+++ b/homeassistant/components/climate/evohome.py
@@ -0,0 +1,371 @@
+"""Support for Honeywell evohome (EMEA/EU-based systems only).
+
+Support for a temperature control system (TCS, controller) with 0+ heating
+zones (e.g. TRVs, relays) and, optionally, a DHW controller.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/climate.evohome/
+"""
+
+from datetime import datetime, timedelta
+import logging
+
+from requests.exceptions import HTTPError
+
+from homeassistant.components.climate import (
+    ClimateDevice,
+    STATE_AUTO,
+    STATE_ECO,
+    STATE_OFF,
+    SUPPORT_OPERATION_MODE,
+    SUPPORT_AWAY_MODE,
+)
+from homeassistant.components.evohome import (
+    CONF_LOCATION_IDX,
+    DATA_EVOHOME,
+    MAX_TEMP,
+    MIN_TEMP,
+    SCAN_INTERVAL_MAX
+)
+from homeassistant.const import (
+    CONF_SCAN_INTERVAL,
+    PRECISION_TENTHS,
+    TEMP_CELSIUS,
+    HTTP_TOO_MANY_REQUESTS,
+)
+_LOGGER = logging.getLogger(__name__)
+
+# these are for the controller's opmode/state and the zone's state
+EVO_RESET = 'AutoWithReset'
+EVO_AUTO = 'Auto'
+EVO_AUTOECO = 'AutoWithEco'
+EVO_AWAY = 'Away'
+EVO_DAYOFF = 'DayOff'
+EVO_CUSTOM = 'Custom'
+EVO_HEATOFF = 'HeatingOff'
+
+EVO_STATE_TO_HA = {
+    EVO_RESET: STATE_AUTO,
+    EVO_AUTO: STATE_AUTO,
+    EVO_AUTOECO: STATE_ECO,
+    EVO_AWAY: STATE_AUTO,
+    EVO_DAYOFF: STATE_AUTO,
+    EVO_CUSTOM: STATE_AUTO,
+    EVO_HEATOFF: STATE_OFF
+}
+
+HA_STATE_TO_EVO = {
+    STATE_AUTO: EVO_AUTO,
+    STATE_ECO: EVO_AUTOECO,
+    STATE_OFF: EVO_HEATOFF
+}
+
+HA_OP_LIST = list(HA_STATE_TO_EVO)
+
+# these are used to help prevent E501 (line too long) violations
+GWS = 'gateways'
+TCS = 'temperatureControlSystems'
+
+# debug codes - these happen occasionally, but the cause is unknown
+EVO_DEBUG_NO_RECENT_UPDATES = '0x01'
+EVO_DEBUG_NO_STATUS = '0x02'
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Create a Honeywell (EMEA/EU) evohome CH/DHW system.
+
+    An evohome system consists of: a controller, with 0-12 heating zones (e.g.
+    TRVs, relays) and, optionally, a DHW controller (a HW boiler).
+
+    Here, we add the controller only.
+    """
+    evo_data = hass.data[DATA_EVOHOME]
+
+    client = evo_data['client']
+    loc_idx = evo_data['params'][CONF_LOCATION_IDX]
+
+    # evohomeclient has no defined way of accessing non-default location other
+    # than using a protected member, such as below
+    tcs_obj_ref = client.locations[loc_idx]._gateways[0]._control_systems[0]    # noqa E501; pylint: disable=protected-access
+
+    _LOGGER.debug(
+        "setup_platform(): Found Controller: id: %s [%s], type: %s",
+        tcs_obj_ref.systemId,
+        tcs_obj_ref.location.name,
+        tcs_obj_ref.modelType
+    )
+    parent = EvoController(evo_data, client, tcs_obj_ref)
+    add_entities([parent], update_before_add=True)
+
+
+class EvoController(ClimateDevice):
+    """Base for a Honeywell evohome hub/Controller device.
+
+    The Controller (aka TCS, temperature control system) is the parent of all
+    the child (CH/DHW) devices.
+    """
+
+    def __init__(self, evo_data, client, obj_ref):
+        """Initialize the evohome entity.
+
+        Most read-only properties are set here.  So are pseudo read-only,
+        for example name (which _could_ change between update()s).
+        """
+        self.client = client
+        self._obj = obj_ref
+
+        self._id = obj_ref.systemId
+        self._name = evo_data['config']['locationInfo']['name']
+
+        self._config = evo_data['config'][GWS][0][TCS][0]
+        self._params = evo_data['params']
+        self._timers = evo_data['timers']
+
+        self._timers['statusUpdated'] = datetime.min
+        self._status = {}
+
+        self._available = False  # should become True after first update()
+
+    def _handle_requests_exceptions(self, err):
+        # evohomeclient v2 api (>=0.2.7) exposes requests exceptions, incl.:
+        # - HTTP_BAD_REQUEST, is usually Bad user credentials
+        # - HTTP_TOO_MANY_REQUESTS, is api usuage limit exceeded
+        # - HTTP_SERVICE_UNAVAILABLE, is often Vendor's fault
+
+        if err.response.status_code == HTTP_TOO_MANY_REQUESTS:
+            # execute a back off: pause, and reduce rate
+            old_scan_interval = self._params[CONF_SCAN_INTERVAL]
+            new_scan_interval = min(old_scan_interval * 2, SCAN_INTERVAL_MAX)
+            self._params[CONF_SCAN_INTERVAL] = new_scan_interval
+
+            _LOGGER.warning(
+                "API rate limit has been exceeded: increasing '%s' from %s to "
+                "%s seconds, and suspending polling for %s seconds.",
+                CONF_SCAN_INTERVAL,
+                old_scan_interval,
+                new_scan_interval,
+                new_scan_interval * 3
+            )
+
+            self._timers['statusUpdated'] = datetime.now() + \
+                timedelta(seconds=new_scan_interval * 3)
+
+        else:
+            raise err
+
+    @property
+    def name(self):
+        """Return the name to use in the frontend UI."""
+        return self._name
+
+    @property
+    def available(self):
+        """Return True if the device is available.
+
+        All evohome entities are initially unavailable. Once HA has started,
+        state data is then retrieved by the Controller, and then the children
+        will get a state (e.g. operating_mode, current_temperature).
+
+        However, evohome entities can become unavailable for other reasons.
+        """
+        return self._available
+
+    @property
+    def supported_features(self):
+        """Get the list of supported features of the Controller."""
+        return SUPPORT_OPERATION_MODE | SUPPORT_AWAY_MODE
+
+    @property
+    def device_state_attributes(self):
+        """Return the device state attributes of the controller.
+
+        This is operating mode state data that is not available otherwise, due
+        to the restrictions placed upon ClimateDevice properties, etc by HA.
+        """
+        data = {}
+        data['systemMode'] = self._status['systemModeStatus']['mode']
+        data['isPermanent'] = self._status['systemModeStatus']['isPermanent']
+        if 'timeUntil' in self._status['systemModeStatus']:
+            data['timeUntil'] = self._status['systemModeStatus']['timeUntil']
+        data['activeFaults'] = self._status['activeFaults']
+        return data
+
+    @property
+    def operation_list(self):
+        """Return the list of available operations."""
+        return HA_OP_LIST
+
+    @property
+    def current_operation(self):
+        """Return the operation mode of the evohome entity."""
+        return EVO_STATE_TO_HA.get(self._status['systemModeStatus']['mode'])
+
+    @property
+    def target_temperature(self):
+        """Return the average target temperature of the Heating/DHW zones."""
+        temps = [zone['setpointStatus']['targetHeatTemperature']
+                 for zone in self._status['zones']]
+
+        avg_temp = round(sum(temps) / len(temps), 1) if temps else None
+        return avg_temp
+
+    @property
+    def current_temperature(self):
+        """Return the average current temperature of the Heating/DHW zones."""
+        tmp_list = [x for x in self._status['zones']
+                    if x['temperatureStatus']['isAvailable'] is True]
+        temps = [zone['temperatureStatus']['temperature'] for zone in tmp_list]
+
+        avg_temp = round(sum(temps) / len(temps), 1) if temps else None
+        return avg_temp
+
+    @property
+    def temperature_unit(self):
+        """Return the temperature unit to use in the frontend UI."""
+        return TEMP_CELSIUS
+
+    @property
+    def precision(self):
+        """Return the temperature precision to use in the frontend UI."""
+        return PRECISION_TENTHS
+
+    @property
+    def min_temp(self):
+        """Return the minimum target temp (setpoint) of a evohome entity."""
+        return MIN_TEMP
+
+    @property
+    def max_temp(self):
+        """Return the maximum target temp (setpoint) of a evohome entity."""
+        return MAX_TEMP
+
+    @property
+    def is_on(self):
+        """Return true as evohome controllers are always on.
+
+        Operating modes can include 'HeatingOff', but (for example) DHW would
+        remain on.
+        """
+        return True
+
+    @property
+    def is_away_mode_on(self):
+        """Return true if away mode is on."""
+        return self._status['systemModeStatus']['mode'] == EVO_AWAY
+
+    def turn_away_mode_on(self):
+        """Turn away mode on."""
+        self._set_operation_mode(EVO_AWAY)
+
+    def turn_away_mode_off(self):
+        """Turn away mode off."""
+        self._set_operation_mode(EVO_AUTO)
+
+    def _set_operation_mode(self, operation_mode):
+        # Set new target operation mode for the TCS.
+        _LOGGER.debug(
+            "_set_operation_mode(): API call [1 request(s)]: "
+            "tcs._set_status(%s)...",
+            operation_mode
+        )
+        try:
+            self._obj._set_status(operation_mode)                               # noqa: E501; pylint: disable=protected-access
+        except HTTPError as err:
+            self._handle_requests_exceptions(err)
+
+    def set_operation_mode(self, operation_mode):
+        """Set new target operation mode for the TCS.
+
+        Currently limited to 'Auto', 'AutoWithEco' & 'HeatingOff'. If 'Away'
+        mode is needed, it can be enabled via turn_away_mode_on method.
+        """
+        self._set_operation_mode(HA_STATE_TO_EVO.get(operation_mode))
+
+    def _update_state_data(self, evo_data):
+        client = evo_data['client']
+        loc_idx = evo_data['params'][CONF_LOCATION_IDX]
+
+        _LOGGER.debug(
+            "_update_state_data(): API call [1 request(s)]: "
+            "client.locations[loc_idx].status()..."
+        )
+
+        try:
+            evo_data['status'].update(
+                client.locations[loc_idx].status()[GWS][0][TCS][0])
+        except HTTPError as err:  # check if we've exceeded the api rate limit
+            self._handle_requests_exceptions(err)
+        else:
+            evo_data['timers']['statusUpdated'] = datetime.now()
+
+        _LOGGER.debug(
+            "_update_state_data(): evo_data['status'] = %s",
+            evo_data['status']
+        )
+
+    def update(self):
+        """Get the latest state data of the installation.
+
+        This includes state data for the Controller and its child devices, such
+        as the operating_mode of the Controller and the current_temperature
+        of its children.
+
+        This is not asyncio-friendly due to the underlying client api.
+        """
+        evo_data = self.hass.data[DATA_EVOHOME]
+
+        timeout = datetime.now() + timedelta(seconds=55)
+        expired = timeout > self._timers['statusUpdated'] + \
+            timedelta(seconds=evo_data['params'][CONF_SCAN_INTERVAL])
+
+        if not expired:
+            return
+
+        was_available = self._available or \
+            self._timers['statusUpdated'] == datetime.min
+
+        self._update_state_data(evo_data)
+        self._status = evo_data['status']
+
+        if _LOGGER.isEnabledFor(logging.DEBUG):
+            tmp_dict = dict(self._status)
+            if 'zones' in tmp_dict:
+                tmp_dict['zones'] = '...'
+            if 'dhw' in tmp_dict:
+                tmp_dict['dhw'] = '...'
+
+            _LOGGER.debug(
+                "update(%s), self._status = %s",
+                self._id + " [" + self._name + "]",
+                tmp_dict
+            )
+
+        no_recent_updates = self._timers['statusUpdated'] < datetime.now() - \
+            timedelta(seconds=self._params[CONF_SCAN_INTERVAL] * 3.1)
+
+        if no_recent_updates:
+            self._available = False
+            debug_code = EVO_DEBUG_NO_RECENT_UPDATES
+
+        elif not self._status:
+            # unavailable because no status (but how? other than at startup?)
+            self._available = False
+            debug_code = EVO_DEBUG_NO_STATUS
+
+        else:
+            self._available = True
+
+        if not self._available and was_available:
+            # only warn if available went from True to False
+            _LOGGER.warning(
+                "The entity, %s, has become unavailable, debug code is: %s",
+                self._id + " [" + self._name + "]",
+                debug_code
+            )
+
+        elif self._available and not was_available:
+            # this isn't the first re-available (e.g. _after_ STARTUP)
+            _LOGGER.debug(
+                "The entity, %s, has become available",
+                self._id + " [" + self._name + "]"
+            )
diff --git a/homeassistant/components/climate/honeywell.py b/homeassistant/components/climate/honeywell.py
index 6d54695fa7a..c445a495073 100644
--- a/homeassistant/components/climate/honeywell.py
+++ b/homeassistant/components/climate/honeywell.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
     CONF_PASSWORD, CONF_USERNAME, TEMP_CELSIUS, TEMP_FAHRENHEIT,
     ATTR_TEMPERATURE, CONF_REGION)
 
-REQUIREMENTS = ['evohomeclient==0.2.5', 'somecomfort==0.5.2']
+REQUIREMENTS = ['evohomeclient==0.2.7', 'somecomfort==0.5.2']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/evohome.py b/homeassistant/components/evohome.py
new file mode 100644
index 00000000000..ceeec407b05
--- /dev/null
+++ b/homeassistant/components/evohome.py
@@ -0,0 +1,145 @@
+"""Support for Honeywell evohome (EMEA/EU-based systems only).
+
+Support for a temperature control system (TCS, controller) with 0+ heating
+zones (e.g. TRVs, relays) and, optionally, a DHW controller.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/evohome/
+"""
+
+# Glossary:
+# TCS - temperature control system (a.k.a. Controller, Parent), which can
+# have up to 13 Children:
+#   0-12 Heating zones (a.k.a. Zone), and
+#   0-1 DHW controller, (a.k.a. Boiler)
+
+import logging
+
+from requests.exceptions import HTTPError
+import voluptuous as vol
+
+from homeassistant.const import (
+    CONF_USERNAME,
+    CONF_PASSWORD,
+    CONF_SCAN_INTERVAL,
+    HTTP_BAD_REQUEST
+)
+
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.discovery import load_platform
+
+REQUIREMENTS = ['evohomeclient==0.2.7']
+# If ever > 0.2.7, re-check the work-around wrapper is still required when
+# instantiating the client, below.
+
+_LOGGER = logging.getLogger(__name__)
+
+DOMAIN = 'evohome'
+DATA_EVOHOME = 'data_' + DOMAIN
+
+CONF_LOCATION_IDX = 'location_idx'
+MAX_TEMP = 28
+MIN_TEMP = 5
+SCAN_INTERVAL_DEFAULT = 180
+SCAN_INTERVAL_MAX = 300
+
+CONFIG_SCHEMA = vol.Schema({
+    DOMAIN: vol.Schema({
+        vol.Required(CONF_USERNAME): cv.string,
+        vol.Required(CONF_PASSWORD): cv.string,
+        vol.Optional(CONF_LOCATION_IDX, default=0): cv.positive_int,
+    }),
+}, extra=vol.ALLOW_EXTRA)
+
+# These are used to help prevent E501 (line too long) violations.
+GWS = 'gateways'
+TCS = 'temperatureControlSystems'
+
+
+def setup(hass, config):
+    """Create a Honeywell (EMEA/EU) evohome CH/DHW system.
+
+    One controller with 0+ heating zones (e.g. TRVs, relays) and, optionally, a
+    DHW controller.  Does not work for US-based systems.
+    """
+    evo_data = hass.data[DATA_EVOHOME] = {}
+    evo_data['timers'] = {}
+
+    evo_data['params'] = dict(config[DOMAIN])
+    evo_data['params'][CONF_SCAN_INTERVAL] = SCAN_INTERVAL_DEFAULT
+
+    from evohomeclient2 import EvohomeClient
+
+    _LOGGER.debug("setup(): API call [4 request(s)]: client.__init__()...")
+
+    try:
+        # There's a bug in evohomeclient2 v0.2.7: the client.__init__() sets
+        # the root loglevel when EvohomeClient(debug=?), so remember it now...
+        log_level = logging.getLogger().getEffectiveLevel()
+
+        client = EvohomeClient(
+            evo_data['params'][CONF_USERNAME],
+            evo_data['params'][CONF_PASSWORD],
+            debug=False
+        )
+        # ...then restore it to what it was before instantiating the client
+        logging.getLogger().setLevel(log_level)
+
+    except HTTPError as err:
+        if err.response.status_code == HTTP_BAD_REQUEST:
+            _LOGGER.error(
+                "Failed to establish a connection with evohome web servers, "
+                "Check your username (%s), and password are correct."
+                "Unable to continue. Resolve any errors and restart HA.",
+                evo_data['params'][CONF_USERNAME]
+            )
+            return False  # unable to continue
+
+        raise  # we dont handle any other HTTPErrors
+
+    finally:  # Redact username, password as no longer needed.
+        evo_data['params'][CONF_USERNAME] = 'REDACTED'
+        evo_data['params'][CONF_PASSWORD] = 'REDACTED'
+
+    evo_data['client'] = client
+
+    # Redact any installation data we'll never need.
+    if client.installation_info[0]['locationInfo']['locationId'] != 'REDACTED':
+        for loc in client.installation_info:
+            loc['locationInfo']['streetAddress'] = 'REDACTED'
+            loc['locationInfo']['city'] = 'REDACTED'
+            loc['locationInfo']['locationOwner'] = 'REDACTED'
+            loc[GWS][0]['gatewayInfo'] = 'REDACTED'
+
+    # Pull down the installation configuration.
+    loc_idx = evo_data['params'][CONF_LOCATION_IDX]
+
+    try:
+        evo_data['config'] = client.installation_info[loc_idx]
+
+    except IndexError:
+        _LOGGER.warning(
+            "setup(): Parameter '%s' = %s , is outside its range (0-%s)",
+            CONF_LOCATION_IDX,
+            loc_idx,
+            len(client.installation_info) - 1
+        )
+
+        return False  # unable to continue
+
+    evo_data['status'] = {}
+
+    if _LOGGER.isEnabledFor(logging.DEBUG):
+        tmp_loc = dict(evo_data['config'])
+        tmp_loc['locationInfo']['postcode'] = 'REDACTED'
+        tmp_tcs = tmp_loc[GWS][0][TCS][0]
+        if 'zones' in tmp_tcs:
+            tmp_tcs['zones'] = '...'
+        if 'dhw' in tmp_tcs:
+            tmp_tcs['dhw'] = '...'
+
+        _LOGGER.debug("setup(), location = %s", tmp_loc)
+
+    load_platform(hass, 'climate', DOMAIN)
+
+    return True
diff --git a/homeassistant/const.py b/homeassistant/const.py
index 0bcfcd9d4ad..1d3adf7ee45 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -410,7 +410,9 @@ HTTP_UNAUTHORIZED = 401
 HTTP_NOT_FOUND = 404
 HTTP_METHOD_NOT_ALLOWED = 405
 HTTP_UNPROCESSABLE_ENTITY = 422
+HTTP_TOO_MANY_REQUESTS = 429
 HTTP_INTERNAL_SERVER_ERROR = 500
+HTTP_SERVICE_UNAVAILABLE = 503
 
 HTTP_BASIC_AUTHENTICATION = 'basic'
 HTTP_DIGEST_AUTHENTICATION = 'digest'
diff --git a/requirements_all.txt b/requirements_all.txt
index a954b2cf94f..6efd9a21d7e 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -338,8 +338,9 @@ eternalegypt==0.0.5
 # homeassistant.components.keyboard_remote
 # evdev==0.6.1
 
+# homeassistant.components.evohome
 # homeassistant.components.climate.honeywell
-evohomeclient==0.2.5
+evohomeclient==0.2.7
 
 # homeassistant.components.image_processing.dlib_face_detect
 # homeassistant.components.image_processing.dlib_face_identify
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index f33b37e01d1..1f7d58ef6aa 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -52,8 +52,9 @@ dsmr_parser==0.11
 # homeassistant.components.sensor.season
 ephem==3.7.6.0
 
+# homeassistant.components.evohome
 # homeassistant.components.climate.honeywell
-evohomeclient==0.2.5
+evohomeclient==0.2.7
 
 # homeassistant.components.feedreader
 # homeassistant.components.sensor.geo_rss_events

From d1ad2cc22536df7ff65c578f054685a608077dc3 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Thu, 27 Sep 2018 16:07:56 +0200
Subject: [PATCH 333/357] Make MQTT platforms config entries (#16904)

* Make MQTT platforms config entries

* Fix tests

* Address Comment

* Rework tests

* Undo style auto-reformat style changes
---
 homeassistant/components/mqtt/discovery.py | 27 ++++++++++--
 homeassistant/components/sensor/mqtt.py    | 22 +++++++++-
 tests/components/mqtt/test_discovery.py    | 49 +++++++++++++++++-----
 tests/components/sensor/test_mqtt.py       |  6 ++-
 4 files changed, 87 insertions(+), 17 deletions(-)

diff --git a/homeassistant/components/mqtt/discovery.py b/homeassistant/components/mqtt/discovery.py
index f42c1ed58e9..d5ed5e25b47 100644
--- a/homeassistant/components/mqtt/discovery.py
+++ b/homeassistant/components/mqtt/discovery.py
@@ -13,6 +13,7 @@ from homeassistant.components.mqtt import CONF_STATE_TOPIC, ATTR_DISCOVERY_HASH
 from homeassistant.const import CONF_PLATFORM
 from homeassistant.helpers.discovery import async_load_platform
 from homeassistant.helpers.dispatcher import async_dispatcher_send
+from homeassistant.helpers.typing import HomeAssistantType
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -38,11 +39,18 @@ ALLOWED_PLATFORMS = {
     'alarm_control_panel': ['mqtt'],
 }
 
+CONFIG_ENTRY_PLATFORMS = {
+    'sensor': ['mqtt'],
+}
+
 ALREADY_DISCOVERED = 'mqtt_discovered_components'
+CONFIG_ENTRY_IS_SETUP = 'mqtt_config_entry_is_setup'
 MQTT_DISCOVERY_UPDATED = 'mqtt_discovery_updated_{}'
+MQTT_DISCOVERY_NEW = 'mqtt_discovery_new_{}_{}'
 
 
-async def async_start(hass, discovery_topic, hass_config):
+async def async_start(hass: HomeAssistantType, discovery_topic, hass_config,
+                      config_entry=None) -> bool:
     """Initialize of MQTT Discovery."""
     async def async_device_message_received(topic, payload, qos):
         """Process the received message."""
@@ -98,8 +106,21 @@ async def async_start(hass, discovery_topic, hass_config):
 
             _LOGGER.info("Found new component: %s %s", component, discovery_id)
 
-            await async_load_platform(
-                hass, component, platform, payload, hass_config)
+            if platform not in CONFIG_ENTRY_PLATFORMS.get(component, []):
+                await async_load_platform(
+                    hass, component, platform, payload, hass_config)
+                return
+
+            config_entries_key = '{}.{}'.format(component, platform)
+            if config_entries_key not in hass.data[CONFIG_ENTRY_IS_SETUP]:
+                await hass.config_entries.async_forward_entry_setup(
+                    config_entry, component)
+                hass.data[CONFIG_ENTRY_IS_SETUP].add(config_entries_key)
+
+            async_dispatcher_send(hass, MQTT_DISCOVERY_NEW.format(
+                component, platform), payload)
+
+    hass.data[CONFIG_ENTRY_IS_SETUP] = set()
 
     await mqtt.async_subscribe(
         hass, discovery_topic + '/#', async_device_message_received, 0)
diff --git a/homeassistant/components/sensor/mqtt.py b/homeassistant/components/sensor/mqtt.py
index 56e4055ea87..2d15fca755b 100644
--- a/homeassistant/components/sensor/mqtt.py
+++ b/homeassistant/components/sensor/mqtt.py
@@ -12,10 +12,12 @@ from typing import Optional
 import voluptuous as vol
 
 from homeassistant.core import callback
+from homeassistant.components import sensor
 from homeassistant.components.mqtt import (
     ATTR_DISCOVERY_HASH, CONF_AVAILABILITY_TOPIC, CONF_STATE_TOPIC,
     CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE, CONF_QOS,
     MqttAvailability, MqttDiscoveryUpdate)
+from homeassistant.components.mqtt.discovery import MQTT_DISCOVERY_NEW
 from homeassistant.components.sensor import DEVICE_CLASSES_SCHEMA
 from homeassistant.const import (
     CONF_FORCE_UPDATE, CONF_NAME, CONF_VALUE_TEMPLATE, STATE_UNKNOWN,
@@ -24,6 +26,7 @@ from homeassistant.helpers.entity import Entity
 from homeassistant.components import mqtt
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.typing import HomeAssistantType, ConfigType
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.event import async_track_point_in_utc_time
 from homeassistant.util import dt as dt_util
 
@@ -53,7 +56,24 @@ PLATFORM_SCHEMA = mqtt.MQTT_RO_PLATFORM_SCHEMA.extend({
 
 async def async_setup_platform(hass: HomeAssistantType, config: ConfigType,
                                async_add_entities, discovery_info=None):
-    """Set up MQTT Sensor."""
+    """Set up MQTT sensors through configuration.yaml."""
+    await _async_setup_platform(hass, config, async_add_entities,
+                                discovery_info)
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up MQTT sensors dynamically through MQTT discovery."""
+    async def async_discover_sensor(config):
+        """Discover and add a discovered MQTT sensor."""
+        await _async_setup_platform(hass, {}, async_add_entities, config)
+
+    async_dispatcher_connect(hass,
+                             MQTT_DISCOVERY_NEW.format(sensor.DOMAIN, 'mqtt'),
+                             async_discover_sensor)
+
+
+async def _async_setup_platform(hass: HomeAssistantType, config: ConfigType,
+                                async_add_entities, discovery_info=None):
     if discovery_info is not None:
         config = PLATFORM_SCHEMA(discovery_info)
 
diff --git a/tests/components/mqtt/test_discovery.py b/tests/components/mqtt/test_discovery.py
index 9e0ef14a3fa..36b022de7a6 100644
--- a/tests/components/mqtt/test_discovery.py
+++ b/tests/components/mqtt/test_discovery.py
@@ -2,18 +2,23 @@
 import asyncio
 from unittest.mock import patch
 
+from homeassistant.components import mqtt
 from homeassistant.components.mqtt.discovery import async_start, \
                                                     ALREADY_DISCOVERED
 
-from tests.common import async_fire_mqtt_message, mock_coro
+from tests.common import async_fire_mqtt_message, mock_coro, MockConfigEntry
 
 
 @asyncio.coroutine
 def test_subscribing_config_topic(hass, mqtt_mock):
     """Test setting up discovery."""
+    entry = MockConfigEntry(domain=mqtt.DOMAIN, data={
+        mqtt.CONF_BROKER: 'test-broker'
+    })
+
     hass_config = {}
     discovery_topic = 'homeassistant'
-    yield from async_start(hass, discovery_topic, hass_config)
+    yield from async_start(hass, discovery_topic, hass_config, entry)
 
     assert mqtt_mock.async_subscribe.called
     call_args = mqtt_mock.async_subscribe.mock_calls[0][1]
@@ -25,8 +30,12 @@ def test_subscribing_config_topic(hass, mqtt_mock):
 @asyncio.coroutine
 def test_invalid_topic(mock_load_platform, hass, mqtt_mock):
     """Test sending to invalid topic."""
+    entry = MockConfigEntry(domain=mqtt.DOMAIN, data={
+        mqtt.CONF_BROKER: 'test-broker'
+    })
+
     mock_load_platform.return_value = mock_coro()
-    yield from async_start(hass, 'homeassistant', {})
+    yield from async_start(hass, 'homeassistant', {}, entry)
 
     async_fire_mqtt_message(hass, 'homeassistant/binary_sensor/bla/not_config',
                             '{}')
@@ -38,8 +47,12 @@ def test_invalid_topic(mock_load_platform, hass, mqtt_mock):
 @asyncio.coroutine
 def test_invalid_json(mock_load_platform, hass, mqtt_mock, caplog):
     """Test sending in invalid JSON."""
+    entry = MockConfigEntry(domain=mqtt.DOMAIN, data={
+        mqtt.CONF_BROKER: 'test-broker'
+    })
+
     mock_load_platform.return_value = mock_coro()
-    yield from async_start(hass, 'homeassistant', {})
+    yield from async_start(hass, 'homeassistant', {}, entry)
 
     async_fire_mqtt_message(hass, 'homeassistant/binary_sensor/bla/config',
                             'not json')
@@ -52,10 +65,12 @@ def test_invalid_json(mock_load_platform, hass, mqtt_mock, caplog):
 @asyncio.coroutine
 def test_only_valid_components(mock_load_platform, hass, mqtt_mock, caplog):
     """Test for a valid component."""
+    entry = MockConfigEntry(domain=mqtt.DOMAIN)
+
     invalid_component = "timer"
 
     mock_load_platform.return_value = mock_coro()
-    yield from async_start(hass, 'homeassistant', {})
+    yield from async_start(hass, 'homeassistant', {}, entry)
 
     async_fire_mqtt_message(hass, 'homeassistant/{}/bla/config'.format(
         invalid_component
@@ -73,7 +88,9 @@ def test_only_valid_components(mock_load_platform, hass, mqtt_mock, caplog):
 @asyncio.coroutine
 def test_correct_config_discovery(hass, mqtt_mock, caplog):
     """Test sending in correct JSON."""
-    yield from async_start(hass, 'homeassistant', {})
+    entry = MockConfigEntry(domain=mqtt.DOMAIN)
+
+    yield from async_start(hass, 'homeassistant', {}, entry)
 
     async_fire_mqtt_message(hass, 'homeassistant/binary_sensor/bla/config',
                             '{ "name": "Beer" }')
@@ -89,7 +106,9 @@ def test_correct_config_discovery(hass, mqtt_mock, caplog):
 @asyncio.coroutine
 def test_discover_fan(hass, mqtt_mock, caplog):
     """Test discovering an MQTT fan."""
-    yield from async_start(hass, 'homeassistant', {})
+    entry = MockConfigEntry(domain=mqtt.DOMAIN)
+
+    yield from async_start(hass, 'homeassistant', {}, entry)
 
     async_fire_mqtt_message(hass, 'homeassistant/fan/bla/config',
                             ('{ "name": "Beer",'
@@ -106,7 +125,9 @@ def test_discover_fan(hass, mqtt_mock, caplog):
 @asyncio.coroutine
 def test_discover_climate(hass, mqtt_mock, caplog):
     """Test discovering an MQTT climate component."""
-    yield from async_start(hass, 'homeassistant', {})
+    entry = MockConfigEntry(domain=mqtt.DOMAIN)
+
+    yield from async_start(hass, 'homeassistant', {}, entry)
 
     data = (
         '{ "name": "ClimateTest",'
@@ -127,7 +148,9 @@ def test_discover_climate(hass, mqtt_mock, caplog):
 @asyncio.coroutine
 def test_discover_alarm_control_panel(hass, mqtt_mock, caplog):
     """Test discovering an MQTT alarm control panel component."""
-    yield from async_start(hass, 'homeassistant', {})
+    entry = MockConfigEntry(domain=mqtt.DOMAIN)
+
+    yield from async_start(hass, 'homeassistant', {}, entry)
 
     data = (
         '{ "name": "AlarmControlPanelTest",'
@@ -149,7 +172,9 @@ def test_discover_alarm_control_panel(hass, mqtt_mock, caplog):
 @asyncio.coroutine
 def test_discovery_incl_nodeid(hass, mqtt_mock, caplog):
     """Test sending in correct JSON with optional node_id included."""
-    yield from async_start(hass, 'homeassistant', {})
+    entry = MockConfigEntry(domain=mqtt.DOMAIN)
+
+    yield from async_start(hass, 'homeassistant', {}, entry)
 
     async_fire_mqtt_message(hass, 'homeassistant/binary_sensor/my_node_id/bla'
                             '/config', '{ "name": "Beer" }')
@@ -165,7 +190,9 @@ def test_discovery_incl_nodeid(hass, mqtt_mock, caplog):
 @asyncio.coroutine
 def test_non_duplicate_discovery(hass, mqtt_mock, caplog):
     """Test for a non duplicate component."""
-    yield from async_start(hass, 'homeassistant', {})
+    entry = MockConfigEntry(domain=mqtt.DOMAIN)
+
+    yield from async_start(hass, 'homeassistant', {}, entry)
 
     async_fire_mqtt_message(hass, 'homeassistant/binary_sensor/bla/config',
                             '{ "name": "Beer" }')
diff --git a/tests/components/sensor/test_mqtt.py b/tests/components/sensor/test_mqtt.py
index 527c92997ec..4f70c37e04f 100644
--- a/tests/components/sensor/test_mqtt.py
+++ b/tests/components/sensor/test_mqtt.py
@@ -6,6 +6,7 @@ from unittest.mock import patch
 
 import homeassistant.core as ha
 from homeassistant.setup import setup_component, async_setup_component
+from homeassistant.components import mqtt
 from homeassistant.components.mqtt.discovery import async_start
 import homeassistant.components.sensor as sensor
 from homeassistant.const import EVENT_STATE_CHANGED, STATE_UNAVAILABLE
@@ -13,7 +14,7 @@ import homeassistant.util.dt as dt_util
 
 from tests.common import mock_mqtt_component, fire_mqtt_message, \
     assert_setup_component, async_fire_mqtt_message, \
-    async_mock_mqtt_component
+    async_mock_mqtt_component, MockConfigEntry
 from tests.common import get_test_home_assistant, mock_component
 
 
@@ -392,7 +393,8 @@ async def test_unique_id(hass):
 
 async def test_discovery_removal_sensor(hass, mqtt_mock, caplog):
     """Test removal of discovered sensor."""
-    await async_start(hass, 'homeassistant', {})
+    entry = MockConfigEntry(domain=mqtt.DOMAIN)
+    await async_start(hass, 'homeassistant', {}, entry)
     data = (
         '{ "name": "Beer",'
         '  "status_topic": "test_topic" }'

From 81e21b90c9dd42dd6dfae71f6325cbe78f77a715 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Thu, 27 Sep 2018 18:02:50 +0200
Subject: [PATCH 334/357] Fix auth redirect (#16914)

* Fix auth redirect

* Remove old test
---
 homeassistant/components/frontend/__init__.py |  7 ++++---
 tests/components/frontend/test_init.py        | 20 +++++++++++++------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/homeassistant/components/frontend/__init__.py b/homeassistant/components/frontend/__init__.py
index 23ae6d485a6..c444ef2e3ca 100644
--- a/homeassistant/components/frontend/__init__.py
+++ b/homeassistant/components/frontend/__init__.py
@@ -344,11 +344,12 @@ class AuthorizeView(HomeAssistantView):
             _is_latest(self.js_option, request)
 
         if latest:
-            location = '/frontend_latest/authorize.html'
+            base = 'frontend_latest'
         else:
-            location = '/frontend_es5/authorize.html'
+            base = 'frontend_es5'
 
-        location += '?{}'.format(request.query_string)
+        location = "/{}/authorize.html{}".format(
+            base, str(request.url.relative())[15:])
 
         return web.Response(status=302, headers={
             'location': location
diff --git a/tests/components/frontend/test_init.py b/tests/components/frontend/test_init.py
index e4daf686bfe..b29c8cfb12f 100644
--- a/tests/components/frontend/test_init.py
+++ b/tests/components/frontend/test_init.py
@@ -294,10 +294,18 @@ async def test_onboarding_load(mock_http_client):
 
 async def test_auth_authorize(mock_http_client):
     """Test the authorize endpoint works."""
-    resp = await mock_http_client.get('/auth/authorize?hello=world')
-    assert resp.url.query_string == 'hello=world'
-    assert resp.url.path == '/frontend_es5/authorize.html'
+    resp = await mock_http_client.get(
+        '/auth/authorize?response_type=code&client_id=https://localhost/&'
+        'redirect_uri=https://localhost/&state=123%23456')
 
-    resp = await mock_http_client.get('/auth/authorize?latest&hello=world')
-    assert resp.url.query_string == 'latest&hello=world'
-    assert resp.url.path == '/frontend_latest/authorize.html'
+    assert str(resp.url.relative()) == (
+        '/frontend_es5/authorize.html?response_type=code&client_id='
+        'https://localhost/&redirect_uri=https://localhost/&state=123%23456')
+
+    resp = await mock_http_client.get(
+        '/auth/authorize?latest&response_type=code&client_id='
+        'https://localhost/&redirect_uri=https://localhost/&state=123%23456')
+
+    assert str(resp.url.relative()) == (
+        '/frontend_latest/authorize.html?latest&response_type=code&client_id='
+        'https://localhost/&redirect_uri=https://localhost/&state=123%23456')

From 2d104f95d77eb580ca9bd13966758742dbde099d Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Thu, 27 Sep 2018 22:56:04 +0200
Subject: [PATCH 335/357] Fix MQTT Config Entry Discovery (#16919)

---
 homeassistant/components/mqtt/__init__.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/mqtt/__init__.py b/homeassistant/components/mqtt/__init__.py
index 70f20453633..335b4d31acb 100644
--- a/homeassistant/components/mqtt/__init__.py
+++ b/homeassistant/components/mqtt/__init__.py
@@ -321,7 +321,8 @@ async def _async_setup_server(hass: HomeAssistantType, config: ConfigType):
 
 
 async def _async_setup_discovery(hass: HomeAssistantType, conf: ConfigType,
-                                 hass_config: ConfigType) -> bool:
+                                 hass_config: ConfigType,
+                                 config_entry) -> bool:
     """Try to start the discovery of MQTT devices.
 
     This method is a coroutine.
@@ -334,7 +335,8 @@ async def _async_setup_discovery(hass: HomeAssistantType, conf: ConfigType,
         return False
 
     success = await discovery.async_start(
-        hass, conf[CONF_DISCOVERY_PREFIX], hass_config)  # type: bool
+        hass, conf[CONF_DISCOVERY_PREFIX], hass_config,
+        config_entry)  # type: bool
 
     return success
 
@@ -525,7 +527,7 @@ async def async_setup_entry(hass, entry):
 
     if conf.get(CONF_DISCOVERY):
         await _async_setup_discovery(
-            hass, conf, hass.data[DATA_MQTT_HASS_CONFIG])
+            hass, conf, hass.data[DATA_MQTT_HASS_CONFIG], entry)
 
     return True
 

From d77e88645e9b96b7cd86c08a836d9ab1b1afbe09 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Thu, 27 Sep 2018 23:04:03 +0200
Subject: [PATCH 336/357] Bump frontend to 20180927.0

---
 homeassistant/components/frontend/__init__.py | 2 +-
 requirements_all.txt                          | 2 +-
 requirements_test_all.txt                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/frontend/__init__.py b/homeassistant/components/frontend/__init__.py
index c444ef2e3ca..023e75aac85 100644
--- a/homeassistant/components/frontend/__init__.py
+++ b/homeassistant/components/frontend/__init__.py
@@ -24,7 +24,7 @@ from homeassistant.core import callback
 from homeassistant.helpers.translation import async_get_translations
 from homeassistant.loader import bind_hass
 
-REQUIREMENTS = ['home-assistant-frontend==20180926.0']
+REQUIREMENTS = ['home-assistant-frontend==20180927.0']
 
 DOMAIN = 'frontend'
 DEPENDENCIES = ['api', 'websocket_api', 'http', 'system_log',
diff --git a/requirements_all.txt b/requirements_all.txt
index 6efd9a21d7e..eeee16a6138 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -455,7 +455,7 @@ hole==0.3.0
 holidays==0.9.7
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180926.0
+home-assistant-frontend==20180927.0
 
 # homeassistant.components.homekit_controller
 # homekit==0.10
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 1f7d58ef6aa..736310a719a 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -88,7 +88,7 @@ hdate==0.6.3
 holidays==0.9.7
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180926.0
+home-assistant-frontend==20180927.0
 
 # homeassistant.components.homematicip_cloud
 homematicip==0.9.8

From bac71d3d223d64223b16d9dc495ad3f1517981d7 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Thu, 27 Sep 2018 23:04:28 +0200
Subject: [PATCH 337/357] Update translations

---
 .../components/auth/.translations/de.json     |  3 ++-
 .../components/auth/.translations/en.json     |  6 +++---
 .../components/auth/.translations/no.json     | 19 +++++++++++++++++++
 .../auth/.translations/zh-Hans.json           |  4 ++--
 .../components/deconz/.translations/de.json   |  4 ++--
 .../components/mqtt/.translations/de.json     |  1 +
 .../components/mqtt/.translations/ko.json     |  1 +
 .../components/mqtt/.translations/no.json     |  1 +
 .../components/nest/.translations/de.json     |  6 +++---
 .../components/zone/.translations/de.json     |  2 +-
 10 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/homeassistant/components/auth/.translations/de.json b/homeassistant/components/auth/.translations/de.json
index 2abc64f5f5d..21c83290629 100644
--- a/homeassistant/components/auth/.translations/de.json
+++ b/homeassistant/components/auth/.translations/de.json
@@ -9,7 +9,8 @@
             },
             "step": {
                 "init": {
-                    "description": "Bitte w\u00e4hle einen der Benachrichtigungsdienste:"
+                    "description": "Bitte w\u00e4hle einen der Benachrichtigungsdienste:",
+                    "title": "Einmal Passwort f\u00fcr Notify einrichten"
                 },
                 "setup": {
                     "description": "Ein Einmal-Passwort wurde per ** notify gesendet. {notify_service} **. Bitte gebe es unten ein:",
diff --git a/homeassistant/components/auth/.translations/en.json b/homeassistant/components/auth/.translations/en.json
index 21cb45e3050..66c0e92d9b5 100644
--- a/homeassistant/components/auth/.translations/en.json
+++ b/homeassistant/components/auth/.translations/en.json
@@ -2,18 +2,18 @@
     "mfa_setup": {
         "notify": {
             "abort": {
-                "no_available_service": "No available notify services."
+                "no_available_service": "No notification services available."
             },
             "error": {
                 "invalid_code": "Invalid code, please try again."
             },
             "step": {
                 "init": {
-                    "description": "Please select one of notify service:",
+                    "description": "Please select one of the notification services:",
                     "title": "Set up one-time password delivered by notify component"
                 },
                 "setup": {
-                    "description": "A one-time password have sent by **notify.{notify_service}**. Please input it in below:",
+                    "description": "A one-time password has been sent via **notify.{notify_service}**. Please enter it below:",
                     "title": "Verify setup"
                 }
             },
diff --git a/homeassistant/components/auth/.translations/no.json b/homeassistant/components/auth/.translations/no.json
index 43ec497cfb1..48b5db8a3b6 100644
--- a/homeassistant/components/auth/.translations/no.json
+++ b/homeassistant/components/auth/.translations/no.json
@@ -1,5 +1,24 @@
 {
     "mfa_setup": {
+        "notify": {
+            "abort": {
+                "no_available_service": "Ingen varslingstjenester er tilgjengelig."
+            },
+            "error": {
+                "invalid_code": "Ugyldig kode, vennligst pr\u00f8v igjen."
+            },
+            "step": {
+                "init": {
+                    "description": "Vennligst velg en av varslingstjenestene:",
+                    "title": "Sett opp engangspassord levert av varsel komponent"
+                },
+                "setup": {
+                    "description": "Et engangspassord har blitt sendt via **notify.{notify_service}**. Vennligst skriv det inn nedenfor:",
+                    "title": "Bekreft oppsettet"
+                }
+            },
+            "title": "Varsle engangspassord"
+        },
         "totp": {
             "error": {
                 "invalid_code": "Ugyldig kode, pr\u00f8v igjen. Hvis du f\u00e5r denne feilen konsekvent, m\u00e5 du s\u00f8rge for at klokken p\u00e5 Home Assistant systemet er riktig."
diff --git a/homeassistant/components/auth/.translations/zh-Hans.json b/homeassistant/components/auth/.translations/zh-Hans.json
index d2a1b97b9b7..1cb311f016f 100644
--- a/homeassistant/components/auth/.translations/zh-Hans.json
+++ b/homeassistant/components/auth/.translations/zh-Hans.json
@@ -9,11 +9,11 @@
             },
             "step": {
                 "init": {
-                    "description": "\u8bf7\u9009\u62e9\u4ee5\u4e0b\u4e00\u4e2a\u901a\u77e5\u670d\u52a1\uff1a",
+                    "description": "\u8bf7\u4ece\u4e0b\u9762\u9009\u62e9\u4e00\u4e2a\u901a\u77e5\u670d\u52a1\uff1a",
                     "title": "\u8bbe\u7f6e\u7531\u901a\u77e5\u7ec4\u4ef6\u4f20\u9012\u7684\u4e00\u6b21\u6027\u5bc6\u7801"
                 },
                 "setup": {
-                    "description": "\u4e00\u6b21\u6027\u5bc6\u7801\u5df2\u7531 **notify.{notify_service}**\u53d1\u9001\u3002\u8bf7\u5728\u4e0b\u9762\u8f93\u5165:",
+                    "description": "\u4e00\u6b21\u6027\u5bc6\u7801\u5df2\u7531 **notify.{notify_service}** \u53d1\u9001\u3002\u8bf7\u5728\u4e0b\u9762\u8f93\u5165\uff1a",
                     "title": "\u9a8c\u8bc1\u8bbe\u7f6e"
                 }
             },
diff --git a/homeassistant/components/deconz/.translations/de.json b/homeassistant/components/deconz/.translations/de.json
index 51b496906a2..645daa56f6b 100644
--- a/homeassistant/components/deconz/.translations/de.json
+++ b/homeassistant/components/deconz/.translations/de.json
@@ -14,10 +14,10 @@
                     "host": "Host",
                     "port": "Port (Standartwert : '80')"
                 },
-                "title": "Definieren Sie den deCONZ-Gateway"
+                "title": "Definiere das deCONZ-Gateway"
             },
             "link": {
-                "description": "Entsperren Sie Ihr deCONZ-Gateway, um sich bei Home Assistant zu registrieren. \n\n 1. Gehen Sie zu den deCONZ-Systemeinstellungen \n 2. Dr\u00fccken Sie die Taste \"Gateway entsperren\"",
+                "description": "Entsperre dein deCONZ-Gateway, um dich bei Home Assistant zu registrieren. \n\n 1. Gehe zu den deCONZ-Systemeinstellungen \n 2. Dr\u00fccke die Taste \"Gateway entsperren\"",
                 "title": "Mit deCONZ verbinden"
             },
             "options": {
diff --git a/homeassistant/components/mqtt/.translations/de.json b/homeassistant/components/mqtt/.translations/de.json
index eeff1ca3041..2a35e95f559 100644
--- a/homeassistant/components/mqtt/.translations/de.json
+++ b/homeassistant/components/mqtt/.translations/de.json
@@ -9,6 +9,7 @@
         "step": {
             "broker": {
                 "data": {
+                    "discovery": "Suche aktivieren",
                     "password": "Passwort",
                     "username": "Benutzername"
                 },
diff --git a/homeassistant/components/mqtt/.translations/ko.json b/homeassistant/components/mqtt/.translations/ko.json
index 3775c8328d1..f20658d252c 100644
--- a/homeassistant/components/mqtt/.translations/ko.json
+++ b/homeassistant/components/mqtt/.translations/ko.json
@@ -10,6 +10,7 @@
             "broker": {
                 "data": {
                     "broker": "\ube0c\ub85c\ucee4",
+                    "discovery": "\uae30\uae30 \uac80\uc0c9 \ud65c\uc131\ud654",
                     "password": "\ube44\ubc00\ubc88\ud638",
                     "port": "\ud3ec\ud2b8",
                     "username": "\uc0ac\uc6a9\uc790 \uc774\ub984"
diff --git a/homeassistant/components/mqtt/.translations/no.json b/homeassistant/components/mqtt/.translations/no.json
index a9c60fb0c7f..412efd3e107 100644
--- a/homeassistant/components/mqtt/.translations/no.json
+++ b/homeassistant/components/mqtt/.translations/no.json
@@ -10,6 +10,7 @@
             "broker": {
                 "data": {
                     "broker": "Megler",
+                    "discovery": "Aktiver oppdagelse",
                     "password": "Passord",
                     "port": "Port",
                     "username": "Brukernavn"
diff --git a/homeassistant/components/nest/.translations/de.json b/homeassistant/components/nest/.translations/de.json
index 975d15e4470..500862039a2 100644
--- a/homeassistant/components/nest/.translations/de.json
+++ b/homeassistant/components/nest/.translations/de.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_setup": "Sie k\u00f6nnen nur ein einziges Nest-Konto konfigurieren.",
+            "already_setup": "Du kannst nur ein einziges Nest-Konto konfigurieren.",
             "authorize_url_fail": "Unbekannter Fehler beim Erstellen der Authorisierungs-URL",
             "authorize_url_timeout": "Zeit\u00fcberschreitung beim Erstellen der Authorisierungs-URL",
-            "no_flows": "Sie m\u00fcssen Nest konfigurieren, bevor Sie sich authentifizieren k\u00f6nnen. [Bitte lesen Sie die Anweisungen] (https://www.home-assistant.io/components/nest/)."
+            "no_flows": "Du musst Nest konfigurieren, bevor du dich authentifizieren kannst. [Bitte lese die Anweisungen] (https://www.home-assistant.io/components/nest/)."
         },
         "error": {
             "internal_error": "Ein interner Fehler ist aufgetreten",
@@ -17,7 +17,7 @@
                 "data": {
                     "flow_impl": "Anbieter"
                 },
-                "description": "W\u00e4hlen Sie, \u00fcber welchen Authentifizierungsanbieter Sie sich bei Nest authentifizieren m\u00f6chten.",
+                "description": "W\u00e4hlen, \u00fcber welchen Authentifizierungsanbieter du dich bei Nest authentifizieren m\u00f6chtest.",
                 "title": "Authentifizierungsanbieter"
             },
             "link": {
diff --git a/homeassistant/components/zone/.translations/de.json b/homeassistant/components/zone/.translations/de.json
index fc1e3537f33..483c7f065a3 100644
--- a/homeassistant/components/zone/.translations/de.json
+++ b/homeassistant/components/zone/.translations/de.json
@@ -13,7 +13,7 @@
                     "passive": "Passiv",
                     "radius": "Radius"
                 },
-                "title": "Definieren Sie die Zonenparameter"
+                "title": "Definiere die Zonenparameter"
             }
         },
         "title": "Zone"

From a7248d4574202bab7413b11ab54c95937ed5c026 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Thu, 27 Sep 2018 23:10:07 +0200
Subject: [PATCH 338/357] Handle exception handling websocket command (#16927)

* Handle exception handling websocket command

* lint

* Lint2
---
 homeassistant/components/websocket_api.py |  9 ++++++++-
 tests/components/test_websocket_api.py    | 19 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/websocket_api.py b/homeassistant/components/websocket_api.py
index 9bd4aac4b6a..4e7c186facc 100644
--- a/homeassistant/components/websocket_api.py
+++ b/homeassistant/components/websocket_api.py
@@ -40,6 +40,7 @@ ERR_ID_REUSE = 1
 ERR_INVALID_FORMAT = 2
 ERR_NOT_FOUND = 3
 ERR_UNKNOWN_COMMAND = 4
+ERR_UNKNOWN_ERROR = 5
 
 TYPE_AUTH = 'auth'
 TYPE_AUTH_INVALID = 'auth_invalid'
@@ -405,7 +406,13 @@ class ActiveConnection:
 
                 else:
                     handler, schema = handlers[msg['type']]
-                    handler(self.hass, self, schema(msg))
+                    try:
+                        handler(self.hass, self, schema(msg))
+                    except Exception:  # pylint: disable=broad-except
+                        _LOGGER.exception('Error handling message: %s', msg)
+                        self.to_write.put_nowait(error_message(
+                            cur_id, ERR_UNKNOWN_ERROR,
+                            'Unknown error.'))
 
                 last_id = cur_id
                 msg = await wsock.receive_json()
diff --git a/tests/components/test_websocket_api.py b/tests/components/test_websocket_api.py
index 199a9d804f8..cf74081adb1 100644
--- a/tests/components/test_websocket_api.py
+++ b/tests/components/test_websocket_api.py
@@ -1,6 +1,6 @@
 """Tests for the Home Assistant Websocket API."""
 import asyncio
-from unittest.mock import patch
+from unittest.mock import patch, Mock
 
 from aiohttp import WSMsgType
 from async_timeout import timeout
@@ -539,3 +539,20 @@ async def test_call_service_context_no_user(hass, aiohttp_client):
         assert call.service == 'test_service'
         assert call.data == {'hello': 'world'}
         assert call.context.user_id is None
+
+
+async def test_handler_failing(hass, websocket_client):
+    """Test a command that raises."""
+    hass.components.websocket_api.async_register_command(
+        'bla', Mock(side_effect=TypeError),
+        wapi.BASE_COMMAND_MESSAGE_SCHEMA.extend({'type': 'bla'}))
+    await websocket_client.send_json({
+        'id': 5,
+        'type': 'bla',
+    })
+
+    msg = await websocket_client.receive_json()
+    assert msg['id'] == 5
+    assert msg['type'] == wapi.TYPE_RESULT
+    assert not msg['success']
+    assert msg['error']['code'] == wapi.ERR_UNKNOWN_ERROR

From 70b901017fea68031709175297ae7db73aa03a7b Mon Sep 17 00:00:00 2001
From: cdce8p <30130371+cdce8p@users.noreply.github.com>
Date: Thu, 27 Sep 2018 23:13:11 +0200
Subject: [PATCH 339/357] Remove service helper (5) (#16917)

* Update switch

* Update script

* Update light

* Fix tests

* Fix config/script hook

* Async_create_task

* Fix flux switch
---
 homeassistant/components/config/script.py     |  9 +-
 .../components/device_sun_light_trigger.py    | 27 ++++--
 homeassistant/components/light/__init__.py    | 85 ----------------
 homeassistant/components/script.py            | 36 -------
 homeassistant/components/switch/__init__.py   | 37 -------
 homeassistant/components/switch/flux.py       | 22 +++--
 tests/components/light/common.py              | 97 +++++++++++++++++++
 tests/components/light/test_demo.py           | 10 +-
 tests/components/light/test_group.py          | 13 +--
 tests/components/light/test_init.py           | 51 +++++-----
 tests/components/light/test_litejet.py        | 10 +-
 tests/components/light/test_mqtt.py           | 34 ++++---
 tests/components/light/test_mqtt_json.py      | 26 ++---
 tests/components/light/test_mqtt_template.py  | 21 ++--
 tests/components/light/test_template.py       | 13 +--
 tests/components/scene/test_init.py           |  3 +-
 tests/components/switch/common.py             | 39 ++++++++
 tests/components/switch/test_command_line.py  | 17 ++--
 tests/components/switch/test_flux.py          | 36 +++----
 tests/components/switch/test_init.py          |  9 +-
 tests/components/switch/test_litejet.py       |  8 +-
 tests/components/switch/test_mqtt.py          |  6 +-
 tests/components/switch/test_template.py      |  6 +-
 tests/components/switch/test_wake_on_lan.py   | 15 +--
 .../test_device_sun_light_trigger.py          |  7 +-
 tests/components/test_script.py               | 60 ++++++++++--
 tests/test_loader.py                          |  4 +-
 27 files changed, 385 insertions(+), 316 deletions(-)
 create mode 100644 tests/components/light/common.py
 create mode 100644 tests/components/switch/common.py

diff --git a/homeassistant/components/config/script.py b/homeassistant/components/config/script.py
index 345c8e4a849..6f2eaa3ff67 100644
--- a/homeassistant/components/config/script.py
+++ b/homeassistant/components/config/script.py
@@ -2,7 +2,8 @@
 import asyncio
 
 from homeassistant.components.config import EditKeyBasedConfigView
-from homeassistant.components.script import SCRIPT_ENTRY_SCHEMA, async_reload
+from homeassistant.components.script import DOMAIN, SCRIPT_ENTRY_SCHEMA
+from homeassistant.const import SERVICE_RELOAD
 import homeassistant.helpers.config_validation as cv
 
 
@@ -12,8 +13,12 @@ CONFIG_PATH = 'scripts.yaml'
 @asyncio.coroutine
 def async_setup(hass):
     """Set up the script config API."""
+    async def hook(hass):
+        """post_write_hook for Config View that reloads scripts."""
+        await hass.services.async_call(DOMAIN, SERVICE_RELOAD)
+
     hass.http.register_view(EditKeyBasedConfigView(
         'script', 'config', CONFIG_PATH, cv.slug, SCRIPT_ENTRY_SCHEMA,
-        post_write_hook=async_reload
+        post_write_hook=hook
     ))
     return True
diff --git a/homeassistant/components/device_sun_light_trigger.py b/homeassistant/components/device_sun_light_trigger.py
index 641ade7308b..b766513f1f4 100644
--- a/homeassistant/components/device_sun_light_trigger.py
+++ b/homeassistant/components/device_sun_light_trigger.py
@@ -12,7 +12,9 @@ import voluptuous as vol
 
 from homeassistant.core import callback
 import homeassistant.util.dt as dt_util
-from homeassistant.const import STATE_HOME, STATE_NOT_HOME
+from homeassistant.const import (
+    SERVICE_TURN_OFF, SERVICE_TURN_ON, STATE_HOME, STATE_NOT_HOME)
+from homeassistant.components.light import DOMAIN as DOMAIN_LIGHT
 from homeassistant.helpers.event import (
     async_track_point_in_utc_time, async_track_state_change)
 from homeassistant.helpers.sun import is_up, get_astral_event_next
@@ -86,9 +88,12 @@ def async_setup(hass, config):
         """Turn on lights."""
         if not device_tracker.is_on() or light.is_on(light_id):
             return
-        light.async_turn_on(light_id,
-                            transition=LIGHT_TRANSITION_TIME.seconds,
-                            profile=light_profile)
+        hass.async_create_task(
+            hass.services.async_call(
+                DOMAIN_LIGHT, SERVICE_TURN_ON, dict(
+                    entity_id=light_id,
+                    transition=LIGHT_TRANSITION_TIME.seconds,
+                    profile=light_profile)))
 
     def async_turn_on_factory(light_id):
         """Generate turn on callbacks as factory."""
@@ -138,7 +143,10 @@ def async_setup(hass, config):
         # Do we need lights?
         if light_needed:
             logger.info("Home coming event for %s. Turning lights on", entity)
-            light.async_turn_on(light_ids, profile=light_profile)
+            hass.async_create_task(
+                hass.services.async_call(
+                    DOMAIN_LIGHT, SERVICE_TURN_ON,
+                    dict(entity_id=light_ids, profile=light_profile)))
 
         # Are we in the time span were we would turn on the lights
         # if someone would be home?
@@ -151,7 +159,10 @@ def async_setup(hass, config):
             # when the fading in started and turn it on if so
             for index, light_id in enumerate(light_ids):
                 if now > start_point + index * LIGHT_TRANSITION_TIME:
-                    light.async_turn_on(light_id)
+                    hass.async_create_task(
+                        hass.services.async_call(
+                            DOMAIN_LIGHT, SERVICE_TURN_ON,
+                            dict(entity_id=light_id)))
 
                 else:
                     # If this light didn't happen to be turned on yet so
@@ -173,7 +184,9 @@ def async_setup(hass, config):
 
         logger.info(
             "Everyone has left but there are lights on. Turning them off")
-        light.async_turn_off(light_ids)
+        hass.async_create_task(
+            hass.services.async_call(
+                DOMAIN_LIGHT, SERVICE_TURN_OFF, dict(entity_id=light_ids)))
 
     async_track_state_change(
         hass, device_group, turn_off_lights_when_all_leave,
diff --git a/homeassistant/components/light/__init__.py b/homeassistant/components/light/__init__.py
index bc7f136322b..41dbbcd6d0c 100644
--- a/homeassistant/components/light/__init__.py
+++ b/homeassistant/components/light/__init__.py
@@ -17,7 +17,6 @@ from homeassistant.components.group import \
 from homeassistant.const import (
     ATTR_ENTITY_ID, SERVICE_TOGGLE, SERVICE_TURN_OFF, SERVICE_TURN_ON,
     STATE_ON)
-from homeassistant.core import callback
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.config_validation import PLATFORM_SCHEMA  # noqa
 from homeassistant.helpers.entity import ToggleEntity
@@ -142,90 +141,6 @@ def is_on(hass, entity_id=None):
     return hass.states.is_state(entity_id, STATE_ON)
 
 
-@bind_hass
-def turn_on(hass, entity_id=None, transition=None, brightness=None,
-            brightness_pct=None, rgb_color=None, xy_color=None, hs_color=None,
-            color_temp=None, kelvin=None, white_value=None,
-            profile=None, flash=None, effect=None, color_name=None):
-    """Turn all or specified light on."""
-    hass.add_job(
-        async_turn_on, hass, entity_id, transition, brightness, brightness_pct,
-        rgb_color, xy_color, hs_color, color_temp, kelvin, white_value,
-        profile, flash, effect, color_name)
-
-
-@callback
-@bind_hass
-def async_turn_on(hass, entity_id=None, transition=None, brightness=None,
-                  brightness_pct=None, rgb_color=None, xy_color=None,
-                  hs_color=None, color_temp=None, kelvin=None,
-                  white_value=None, profile=None, flash=None, effect=None,
-                  color_name=None):
-    """Turn all or specified light on."""
-    data = {
-        key: value for key, value in [
-            (ATTR_ENTITY_ID, entity_id),
-            (ATTR_PROFILE, profile),
-            (ATTR_TRANSITION, transition),
-            (ATTR_BRIGHTNESS, brightness),
-            (ATTR_BRIGHTNESS_PCT, brightness_pct),
-            (ATTR_RGB_COLOR, rgb_color),
-            (ATTR_XY_COLOR, xy_color),
-            (ATTR_HS_COLOR, hs_color),
-            (ATTR_COLOR_TEMP, color_temp),
-            (ATTR_KELVIN, kelvin),
-            (ATTR_WHITE_VALUE, white_value),
-            (ATTR_FLASH, flash),
-            (ATTR_EFFECT, effect),
-            (ATTR_COLOR_NAME, color_name),
-        ] if value is not None
-    }
-
-    hass.async_add_job(hass.services.async_call(DOMAIN, SERVICE_TURN_ON, data))
-
-
-@bind_hass
-def turn_off(hass, entity_id=None, transition=None):
-    """Turn all or specified light off."""
-    hass.add_job(async_turn_off, hass, entity_id, transition)
-
-
-@callback
-@bind_hass
-def async_turn_off(hass, entity_id=None, transition=None):
-    """Turn all or specified light off."""
-    data = {
-        key: value for key, value in [
-            (ATTR_ENTITY_ID, entity_id),
-            (ATTR_TRANSITION, transition),
-        ] if value is not None
-    }
-
-    hass.async_add_job(hass.services.async_call(
-        DOMAIN, SERVICE_TURN_OFF, data))
-
-
-@callback
-@bind_hass
-def async_toggle(hass, entity_id=None, transition=None):
-    """Toggle all or specified light."""
-    data = {
-        key: value for key, value in [
-            (ATTR_ENTITY_ID, entity_id),
-            (ATTR_TRANSITION, transition),
-        ] if value is not None
-    }
-
-    hass.async_add_job(hass.services.async_call(
-        DOMAIN, SERVICE_TOGGLE, data))
-
-
-@bind_hass
-def toggle(hass, entity_id=None, transition=None):
-    """Toggle all or specified light."""
-    hass.add_job(async_toggle, hass, entity_id, transition)
-
-
 def preprocess_turn_on_alternatives(params):
     """Process extra data for turn light on request."""
     profile = Profiles.get(params.pop(ATTR_PROFILE, None))
diff --git a/homeassistant/components/script.py b/homeassistant/components/script.py
index 247ac07283e..16c9f65420c 100644
--- a/homeassistant/components/script.py
+++ b/homeassistant/components/script.py
@@ -15,7 +15,6 @@ import voluptuous as vol
 from homeassistant.const import (
     ATTR_ENTITY_ID, SERVICE_TURN_OFF, SERVICE_TURN_ON,
     SERVICE_TOGGLE, SERVICE_RELOAD, STATE_ON, CONF_ALIAS)
-from homeassistant.core import split_entity_id
 from homeassistant.loader import bind_hass
 from homeassistant.helpers.entity import ToggleEntity
 from homeassistant.helpers.entity_component import EntityComponent
@@ -62,41 +61,6 @@ def is_on(hass, entity_id):
     return hass.states.is_state(entity_id, STATE_ON)
 
 
-@bind_hass
-def turn_on(hass, entity_id, variables=None, context=None):
-    """Turn script on."""
-    _, object_id = split_entity_id(entity_id)
-
-    hass.services.call(DOMAIN, object_id, variables, context=context)
-
-
-@bind_hass
-def turn_off(hass, entity_id):
-    """Turn script on."""
-    hass.services.call(DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: entity_id})
-
-
-@bind_hass
-def toggle(hass, entity_id):
-    """Toggle the script."""
-    hass.services.call(DOMAIN, SERVICE_TOGGLE, {ATTR_ENTITY_ID: entity_id})
-
-
-@bind_hass
-def reload(hass):
-    """Reload script component."""
-    hass.services.call(DOMAIN, SERVICE_RELOAD)
-
-
-@bind_hass
-def async_reload(hass):
-    """Reload the scripts from config.
-
-    Returns a coroutine object.
-    """
-    return hass.services.async_call(DOMAIN, SERVICE_RELOAD)
-
-
 async def async_setup(hass, config):
     """Load the scripts from the configuration."""
     component = EntityComponent(
diff --git a/homeassistant/components/switch/__init__.py b/homeassistant/components/switch/__init__.py
index c95c752435a..1adabe4b57e 100644
--- a/homeassistant/components/switch/__init__.py
+++ b/homeassistant/components/switch/__init__.py
@@ -9,7 +9,6 @@ import logging
 
 import voluptuous as vol
 
-from homeassistant.core import callback
 from homeassistant.loader import bind_hass
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.entity import ToggleEntity
@@ -56,42 +55,6 @@ def is_on(hass, entity_id=None):
     return hass.states.is_state(entity_id, STATE_ON)
 
 
-@bind_hass
-def turn_on(hass, entity_id=None):
-    """Turn all or specified switch on."""
-    hass.add_job(async_turn_on, hass, entity_id)
-
-
-@callback
-@bind_hass
-def async_turn_on(hass, entity_id=None):
-    """Turn all or specified switch on."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
-    hass.async_add_job(hass.services.async_call(DOMAIN, SERVICE_TURN_ON, data))
-
-
-@bind_hass
-def turn_off(hass, entity_id=None):
-    """Turn all or specified switch off."""
-    hass.add_job(async_turn_off, hass, entity_id)
-
-
-@callback
-@bind_hass
-def async_turn_off(hass, entity_id=None):
-    """Turn all or specified switch off."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
-    hass.async_add_job(
-        hass.services.async_call(DOMAIN, SERVICE_TURN_OFF, data))
-
-
-@bind_hass
-def toggle(hass, entity_id=None):
-    """Toggle all or specified switch."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
-    hass.services.call(DOMAIN, SERVICE_TOGGLE, data)
-
-
 async def async_setup(hass, config):
     """Track states and offer events for switches."""
     component = hass.data[DOMAIN] = EntityComponent(
diff --git a/homeassistant/components/switch/flux.py b/homeassistant/components/switch/flux.py
index 15fdee59eaf..793d6ab91d0 100644
--- a/homeassistant/components/switch/flux.py
+++ b/homeassistant/components/switch/flux.py
@@ -13,10 +13,10 @@ import voluptuous as vol
 
 import homeassistant.helpers.config_validation as cv
 from homeassistant.components.light import (
-    is_on, turn_on, VALID_TRANSITION, ATTR_TRANSITION)
+    is_on, DOMAIN as LIGHT_DOMAIN, VALID_TRANSITION, ATTR_TRANSITION)
 from homeassistant.components.switch import DOMAIN, SwitchDevice
 from homeassistant.const import (
-    CONF_NAME, CONF_PLATFORM, CONF_LIGHTS, CONF_MODE)
+    CONF_NAME, CONF_PLATFORM, CONF_LIGHTS, CONF_MODE, SERVICE_TURN_ON)
 from homeassistant.helpers.event import track_time_change
 from homeassistant.helpers.sun import get_astral_event_date
 from homeassistant.util import slugify
@@ -69,30 +69,36 @@ def set_lights_xy(hass, lights, x_val, y_val, brightness, transition):
     """Set color of array of lights."""
     for light in lights:
         if is_on(hass, light):
-            turn_on(hass, light,
+            hass.services.call(
+                LIGHT_DOMAIN, SERVICE_TURN_ON, dict(
                     xy_color=[x_val, y_val],
                     brightness=brightness,
                     transition=transition,
-                    white_value=brightness)
+                    white_value=brightness,
+                    entity_id=light))
 
 
 def set_lights_temp(hass, lights, mired, brightness, transition):
     """Set color of array of lights."""
     for light in lights:
         if is_on(hass, light):
-            turn_on(hass, light,
+            hass.services.call(
+                LIGHT_DOMAIN, SERVICE_TURN_ON, dict(
                     color_temp=int(mired),
                     brightness=brightness,
-                    transition=transition)
+                    transition=transition,
+                    entity_id=light))
 
 
 def set_lights_rgb(hass, lights, rgb, transition):
     """Set color of array of lights."""
     for light in lights:
         if is_on(hass, light):
-            turn_on(hass, light,
+            hass.services.call(
+                LIGHT_DOMAIN, SERVICE_TURN_ON, dict(
                     rgb_color=rgb,
-                    transition=transition)
+                    transition=transition,
+                    entity_id=light))
 
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
diff --git a/tests/components/light/common.py b/tests/components/light/common.py
new file mode 100644
index 00000000000..906e0458dba
--- /dev/null
+++ b/tests/components/light/common.py
@@ -0,0 +1,97 @@
+"""Collection of helper methods.
+
+All containing methods are legacy helpers that should not be used by new
+components. Instead call the service directly.
+"""
+from homeassistant.components.light import (
+    ATTR_BRIGHTNESS, ATTR_BRIGHTNESS_PCT, ATTR_COLOR_NAME, ATTR_COLOR_TEMP,
+    ATTR_EFFECT, ATTR_FLASH, ATTR_HS_COLOR, ATTR_KELVIN, ATTR_PROFILE,
+    ATTR_RGB_COLOR, ATTR_TRANSITION, ATTR_WHITE_VALUE, ATTR_XY_COLOR, DOMAIN)
+from homeassistant.const import (
+    ATTR_ENTITY_ID, SERVICE_TOGGLE, SERVICE_TURN_OFF, SERVICE_TURN_ON)
+from homeassistant.core import callback
+from homeassistant.loader import bind_hass
+
+
+@bind_hass
+def turn_on(hass, entity_id=None, transition=None, brightness=None,
+            brightness_pct=None, rgb_color=None, xy_color=None, hs_color=None,
+            color_temp=None, kelvin=None, white_value=None,
+            profile=None, flash=None, effect=None, color_name=None):
+    """Turn all or specified light on."""
+    hass.add_job(
+        async_turn_on, hass, entity_id, transition, brightness, brightness_pct,
+        rgb_color, xy_color, hs_color, color_temp, kelvin, white_value,
+        profile, flash, effect, color_name)
+
+
+@callback
+@bind_hass
+def async_turn_on(hass, entity_id=None, transition=None, brightness=None,
+                  brightness_pct=None, rgb_color=None, xy_color=None,
+                  hs_color=None, color_temp=None, kelvin=None,
+                  white_value=None, profile=None, flash=None, effect=None,
+                  color_name=None):
+    """Turn all or specified light on."""
+    data = {
+        key: value for key, value in [
+            (ATTR_ENTITY_ID, entity_id),
+            (ATTR_PROFILE, profile),
+            (ATTR_TRANSITION, transition),
+            (ATTR_BRIGHTNESS, brightness),
+            (ATTR_BRIGHTNESS_PCT, brightness_pct),
+            (ATTR_RGB_COLOR, rgb_color),
+            (ATTR_XY_COLOR, xy_color),
+            (ATTR_HS_COLOR, hs_color),
+            (ATTR_COLOR_TEMP, color_temp),
+            (ATTR_KELVIN, kelvin),
+            (ATTR_WHITE_VALUE, white_value),
+            (ATTR_FLASH, flash),
+            (ATTR_EFFECT, effect),
+            (ATTR_COLOR_NAME, color_name),
+        ] if value is not None
+    }
+
+    hass.async_add_job(hass.services.async_call(DOMAIN, SERVICE_TURN_ON, data))
+
+
+@bind_hass
+def turn_off(hass, entity_id=None, transition=None):
+    """Turn all or specified light off."""
+    hass.add_job(async_turn_off, hass, entity_id, transition)
+
+
+@callback
+@bind_hass
+def async_turn_off(hass, entity_id=None, transition=None):
+    """Turn all or specified light off."""
+    data = {
+        key: value for key, value in [
+            (ATTR_ENTITY_ID, entity_id),
+            (ATTR_TRANSITION, transition),
+        ] if value is not None
+    }
+
+    hass.async_add_job(hass.services.async_call(
+        DOMAIN, SERVICE_TURN_OFF, data))
+
+
+@bind_hass
+def toggle(hass, entity_id=None, transition=None):
+    """Toggle all or specified light."""
+    hass.add_job(async_toggle, hass, entity_id, transition)
+
+
+@callback
+@bind_hass
+def async_toggle(hass, entity_id=None, transition=None):
+    """Toggle all or specified light."""
+    data = {
+        key: value for key, value in [
+            (ATTR_ENTITY_ID, entity_id),
+            (ATTR_TRANSITION, transition),
+        ] if value is not None
+    }
+
+    hass.async_add_job(hass.services.async_call(
+        DOMAIN, SERVICE_TOGGLE, data))
diff --git a/tests/components/light/test_demo.py b/tests/components/light/test_demo.py
index c61bd83cde2..8711acaa318 100644
--- a/tests/components/light/test_demo.py
+++ b/tests/components/light/test_demo.py
@@ -4,6 +4,8 @@ import pytest
 from homeassistant.setup import async_setup_component
 from homeassistant.components import light
 
+from tests.components.light import common
+
 ENTITY_LIGHT = 'light.bed_light'
 
 
@@ -18,7 +20,7 @@ def setup_comp(hass):
 
 async def test_state_attributes(hass):
     """Test light state attributes."""
-    light.async_turn_on(
+    common.async_turn_on(
         hass, ENTITY_LIGHT, xy_color=(.4, .4), brightness=25)
     await hass.async_block_till_done()
     state = hass.states.get(ENTITY_LIGHT)
@@ -27,7 +29,7 @@ async def test_state_attributes(hass):
     assert 25 == state.attributes.get(light.ATTR_BRIGHTNESS)
     assert (255, 234, 164) == state.attributes.get(light.ATTR_RGB_COLOR)
     assert 'rainbow' == state.attributes.get(light.ATTR_EFFECT)
-    light.async_turn_on(
+    common.async_turn_on(
         hass, ENTITY_LIGHT, rgb_color=(251, 253, 255),
         white_value=254)
     await hass.async_block_till_done()
@@ -35,14 +37,14 @@ async def test_state_attributes(hass):
     assert 254 == state.attributes.get(light.ATTR_WHITE_VALUE)
     assert (250, 252, 255) == state.attributes.get(light.ATTR_RGB_COLOR)
     assert (0.319, 0.326) == state.attributes.get(light.ATTR_XY_COLOR)
-    light.async_turn_on(hass, ENTITY_LIGHT, color_temp=400, effect='none')
+    common.async_turn_on(hass, ENTITY_LIGHT, color_temp=400, effect='none')
     await hass.async_block_till_done()
     state = hass.states.get(ENTITY_LIGHT)
     assert 400 == state.attributes.get(light.ATTR_COLOR_TEMP)
     assert 153 == state.attributes.get(light.ATTR_MIN_MIREDS)
     assert 500 == state.attributes.get(light.ATTR_MAX_MIREDS)
     assert 'none' == state.attributes.get(light.ATTR_EFFECT)
-    light.async_turn_on(hass, ENTITY_LIGHT, kelvin=3000, brightness_pct=50)
+    common.async_turn_on(hass, ENTITY_LIGHT, kelvin=3000, brightness_pct=50)
     await hass.async_block_till_done()
     state = hass.states.get(ENTITY_LIGHT)
     assert 333 == state.attributes.get(light.ATTR_COLOR_TEMP)
diff --git a/tests/components/light/test_group.py b/tests/components/light/test_group.py
index 4619e9fb9bd..472bdf42385 100644
--- a/tests/components/light/test_group.py
+++ b/tests/components/light/test_group.py
@@ -3,10 +3,11 @@ from unittest.mock import MagicMock
 
 import asynctest
 
-from homeassistant.components import light
 from homeassistant.components.light import group
 from homeassistant.setup import async_setup_component
 
+from tests.components.light import common
+
 
 async def test_default_state(hass):
     """Test light group default state."""
@@ -300,29 +301,29 @@ async def test_service_calls(hass):
     await hass.async_block_till_done()
 
     assert hass.states.get('light.light_group').state == 'on'
-    light.async_toggle(hass, 'light.light_group')
+    common.async_toggle(hass, 'light.light_group')
     await hass.async_block_till_done()
 
     assert hass.states.get('light.bed_light').state == 'off'
     assert hass.states.get('light.ceiling_lights').state == 'off'
     assert hass.states.get('light.kitchen_lights').state == 'off'
 
-    light.async_turn_on(hass, 'light.light_group')
+    common.async_turn_on(hass, 'light.light_group')
     await hass.async_block_till_done()
 
     assert hass.states.get('light.bed_light').state == 'on'
     assert hass.states.get('light.ceiling_lights').state == 'on'
     assert hass.states.get('light.kitchen_lights').state == 'on'
 
-    light.async_turn_off(hass, 'light.light_group')
+    common.async_turn_off(hass, 'light.light_group')
     await hass.async_block_till_done()
 
     assert hass.states.get('light.bed_light').state == 'off'
     assert hass.states.get('light.ceiling_lights').state == 'off'
     assert hass.states.get('light.kitchen_lights').state == 'off'
 
-    light.async_turn_on(hass, 'light.light_group', brightness=128,
-                        effect='Random', rgb_color=(42, 255, 255))
+    common.async_turn_on(hass, 'light.light_group', brightness=128,
+                         effect='Random', rgb_color=(42, 255, 255))
     await hass.async_block_till_done()
 
     state = hass.states.get('light.bed_light')
diff --git a/tests/components/light/test_init.py b/tests/components/light/test_init.py
index 66dbadb5c38..6253de8cbae 100644
--- a/tests/components/light/test_init.py
+++ b/tests/components/light/test_init.py
@@ -15,6 +15,7 @@ from homeassistant.helpers.intent import IntentHandleError
 
 from tests.common import (
     async_mock_service, mock_service, get_test_home_assistant, mock_storage)
+from tests.components.light import common
 
 
 class TestLight(unittest.TestCase):
@@ -54,7 +55,7 @@ class TestLight(unittest.TestCase):
         turn_on_calls = mock_service(
             self.hass, light.DOMAIN, SERVICE_TURN_ON)
 
-        light.turn_on(
+        common.turn_on(
             self.hass,
             entity_id='entity_id_val',
             transition='transition_val',
@@ -88,7 +89,7 @@ class TestLight(unittest.TestCase):
         turn_off_calls = mock_service(
             self.hass, light.DOMAIN, SERVICE_TURN_OFF)
 
-        light.turn_off(
+        common.turn_off(
             self.hass, entity_id='entity_id_val', transition='transition_val')
 
         self.hass.block_till_done()
@@ -105,7 +106,7 @@ class TestLight(unittest.TestCase):
         toggle_calls = mock_service(
             self.hass, light.DOMAIN, SERVICE_TOGGLE)
 
-        light.toggle(
+        common.toggle(
             self.hass, entity_id='entity_id_val', transition='transition_val')
 
         self.hass.block_till_done()
@@ -135,8 +136,8 @@ class TestLight(unittest.TestCase):
         self.assertFalse(light.is_on(self.hass, dev3.entity_id))
 
         # Test basic turn_on, turn_off, toggle services
-        light.turn_off(self.hass, entity_id=dev1.entity_id)
-        light.turn_on(self.hass, entity_id=dev2.entity_id)
+        common.turn_off(self.hass, entity_id=dev1.entity_id)
+        common.turn_on(self.hass, entity_id=dev2.entity_id)
 
         self.hass.block_till_done()
 
@@ -144,7 +145,7 @@ class TestLight(unittest.TestCase):
         self.assertTrue(light.is_on(self.hass, dev2.entity_id))
 
         # turn on all lights
-        light.turn_on(self.hass)
+        common.turn_on(self.hass)
 
         self.hass.block_till_done()
 
@@ -153,7 +154,7 @@ class TestLight(unittest.TestCase):
         self.assertTrue(light.is_on(self.hass, dev3.entity_id))
 
         # turn off all lights
-        light.turn_off(self.hass)
+        common.turn_off(self.hass)
 
         self.hass.block_till_done()
 
@@ -162,7 +163,7 @@ class TestLight(unittest.TestCase):
         self.assertFalse(light.is_on(self.hass, dev3.entity_id))
 
         # toggle all lights
-        light.toggle(self.hass)
+        common.toggle(self.hass)
 
         self.hass.block_till_done()
 
@@ -171,7 +172,7 @@ class TestLight(unittest.TestCase):
         self.assertTrue(light.is_on(self.hass, dev3.entity_id))
 
         # toggle all lights
-        light.toggle(self.hass)
+        common.toggle(self.hass)
 
         self.hass.block_till_done()
 
@@ -180,12 +181,12 @@ class TestLight(unittest.TestCase):
         self.assertFalse(light.is_on(self.hass, dev3.entity_id))
 
         # Ensure all attributes process correctly
-        light.turn_on(self.hass, dev1.entity_id,
-                      transition=10, brightness=20, color_name='blue')
-        light.turn_on(
+        common.turn_on(self.hass, dev1.entity_id,
+                       transition=10, brightness=20, color_name='blue')
+        common.turn_on(
             self.hass, dev2.entity_id, rgb_color=(255, 255, 255),
             white_value=255)
-        light.turn_on(self.hass, dev3.entity_id, xy_color=(.4, .6))
+        common.turn_on(self.hass, dev3.entity_id, xy_color=(.4, .6))
 
         self.hass.block_till_done()
 
@@ -211,9 +212,9 @@ class TestLight(unittest.TestCase):
         prof_name, prof_h, prof_s, prof_bri = 'relax', 35.932, 69.412, 144
 
         # Test light profiles
-        light.turn_on(self.hass, dev1.entity_id, profile=prof_name)
+        common.turn_on(self.hass, dev1.entity_id, profile=prof_name)
         # Specify a profile and a brightness attribute to overwrite it
-        light.turn_on(
+        common.turn_on(
             self.hass, dev2.entity_id,
             profile=prof_name, brightness=100)
 
@@ -232,10 +233,10 @@ class TestLight(unittest.TestCase):
         }, data)
 
         # Test bad data
-        light.turn_on(self.hass)
-        light.turn_on(self.hass, dev1.entity_id, profile="nonexisting")
-        light.turn_on(self.hass, dev2.entity_id, xy_color=["bla-di-bla", 5])
-        light.turn_on(self.hass, dev3.entity_id, rgb_color=[255, None, 2])
+        common.turn_on(self.hass)
+        common.turn_on(self.hass, dev1.entity_id, profile="nonexisting")
+        common.turn_on(self.hass, dev2.entity_id, xy_color=["bla-di-bla", 5])
+        common.turn_on(self.hass, dev3.entity_id, rgb_color=[255, None, 2])
 
         self.hass.block_till_done()
 
@@ -249,13 +250,13 @@ class TestLight(unittest.TestCase):
         self.assertEqual({}, data)
 
         # faulty attributes will not trigger a service call
-        light.turn_on(
+        common.turn_on(
             self.hass, dev1.entity_id,
             profile=prof_name, brightness='bright')
-        light.turn_on(
+        common.turn_on(
             self.hass, dev1.entity_id,
             rgb_color='yellowish')
-        light.turn_on(
+        common.turn_on(
             self.hass, dev2.entity_id,
             white_value='high')
 
@@ -299,7 +300,7 @@ class TestLight(unittest.TestCase):
 
         dev1, _, _ = platform.DEVICES
 
-        light.turn_on(self.hass, dev1.entity_id, profile='test')
+        common.turn_on(self.hass, dev1.entity_id, profile='test')
 
         self.hass.block_till_done()
 
@@ -340,7 +341,7 @@ class TestLight(unittest.TestCase):
                     ))
 
         dev, _, _ = platform.DEVICES
-        light.turn_on(self.hass, dev.entity_id)
+        common.turn_on(self.hass, dev.entity_id)
         self.hass.block_till_done()
         _, data = dev.last_call('turn_on')
         self.assertEqual({
@@ -380,7 +381,7 @@ class TestLight(unittest.TestCase):
 
         dev = next(filter(lambda x: x.entity_id == 'light.ceiling_2',
                           platform.DEVICES))
-        light.turn_on(self.hass, dev.entity_id)
+        common.turn_on(self.hass, dev.entity_id)
         self.hass.block_till_done()
         _, data = dev.last_call('turn_on')
         self.assertEqual({
diff --git a/tests/components/light/test_litejet.py b/tests/components/light/test_litejet.py
index 3040c95e0ac..1d7b8ea97fa 100644
--- a/tests/components/light/test_litejet.py
+++ b/tests/components/light/test_litejet.py
@@ -5,9 +5,11 @@ from unittest import mock
 
 from homeassistant import setup
 from homeassistant.components import litejet
-from tests.common import get_test_home_assistant
 import homeassistant.components.light as light
 
+from tests.common import get_test_home_assistant
+from tests.components.light import common
+
 _LOGGER = logging.getLogger(__name__)
 
 ENTITY_LIGHT = 'light.mock_load_1'
@@ -78,7 +80,7 @@ class TestLiteJetLight(unittest.TestCase):
 
         assert not light.is_on(self.hass, ENTITY_LIGHT)
 
-        light.turn_on(self.hass, ENTITY_LIGHT, brightness=102)
+        common.turn_on(self.hass, ENTITY_LIGHT, brightness=102)
         self.hass.block_till_done()
         self.mock_lj.activate_load_at.assert_called_with(
             ENTITY_LIGHT_NUMBER, 39, 0)
@@ -90,11 +92,11 @@ class TestLiteJetLight(unittest.TestCase):
 
         assert not light.is_on(self.hass, ENTITY_LIGHT)
 
-        light.turn_on(self.hass, ENTITY_LIGHT)
+        common.turn_on(self.hass, ENTITY_LIGHT)
         self.hass.block_till_done()
         self.mock_lj.activate_load.assert_called_with(ENTITY_LIGHT_NUMBER)
 
-        light.turn_off(self.hass, ENTITY_LIGHT)
+        common.turn_off(self.hass, ENTITY_LIGHT)
         self.hass.block_till_done()
         self.mock_lj.deactivate_load.assert_called_with(ENTITY_LIGHT_NUMBER)
 
diff --git a/tests/components/light/test_mqtt.py b/tests/components/light/test_mqtt.py
index 3640a6a0130..b4c76b6b895 100644
--- a/tests/components/light/test_mqtt.py
+++ b/tests/components/light/test_mqtt.py
@@ -148,9 +148,11 @@ from homeassistant.const import (
 import homeassistant.components.light as light
 from homeassistant.components.mqtt.discovery import async_start
 import homeassistant.core as ha
+
 from tests.common import (
     assert_setup_component, get_test_home_assistant, mock_mqtt_component,
     async_fire_mqtt_message, fire_mqtt_message, mock_coro)
+from tests.components.light import common
 
 
 class TestLightMQTT(unittest.TestCase):
@@ -506,7 +508,7 @@ class TestLightMQTT(unittest.TestCase):
         self.assertEqual(50, state.attributes.get('white_value'))
         self.assertTrue(state.attributes.get(ATTR_ASSUMED_STATE))
 
-        light.turn_on(self.hass, 'light.test')
+        common.turn_on(self.hass, 'light.test')
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_called_once_with(
@@ -515,7 +517,7 @@ class TestLightMQTT(unittest.TestCase):
         state = self.hass.states.get('light.test')
         self.assertEqual(STATE_ON, state.state)
 
-        light.turn_off(self.hass, 'light.test')
+        common.turn_off(self.hass, 'light.test')
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_called_once_with(
@@ -525,10 +527,10 @@ class TestLightMQTT(unittest.TestCase):
         self.assertEqual(STATE_OFF, state.state)
 
         self.mock_publish.reset_mock()
-        light.turn_on(self.hass, 'light.test',
-                      brightness=50, xy_color=[0.123, 0.123])
-        light.turn_on(self.hass, 'light.test', rgb_color=[255, 128, 0],
-                      white_value=80)
+        common.turn_on(self.hass, 'light.test',
+                       brightness=50, xy_color=[0.123, 0.123])
+        common.turn_on(self.hass, 'light.test', rgb_color=[255, 128, 0],
+                       white_value=80)
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_has_calls([
@@ -566,7 +568,7 @@ class TestLightMQTT(unittest.TestCase):
         state = self.hass.states.get('light.test')
         self.assertEqual(STATE_OFF, state.state)
 
-        light.turn_on(self.hass, 'light.test', rgb_color=[255, 128, 64])
+        common.turn_on(self.hass, 'light.test', rgb_color=[255, 128, 64])
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_has_calls([
@@ -714,7 +716,7 @@ class TestLightMQTT(unittest.TestCase):
         state = self.hass.states.get('light.test')
         self.assertEqual(STATE_OFF, state.state)
 
-        light.turn_on(self.hass, 'light.test', brightness=50)
+        common.turn_on(self.hass, 'light.test', brightness=50)
         self.hass.block_till_done()
 
         # Should get the following MQTT messages.
@@ -726,7 +728,7 @@ class TestLightMQTT(unittest.TestCase):
         ], any_order=True)
         self.mock_publish.async_publish.reset_mock()
 
-        light.turn_off(self.hass, 'light.test')
+        common.turn_off(self.hass, 'light.test')
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_called_once_with(
@@ -747,7 +749,7 @@ class TestLightMQTT(unittest.TestCase):
         state = self.hass.states.get('light.test')
         self.assertEqual(STATE_OFF, state.state)
 
-        light.turn_on(self.hass, 'light.test', brightness=50)
+        common.turn_on(self.hass, 'light.test', brightness=50)
         self.hass.block_till_done()
 
         # Should get the following MQTT messages.
@@ -759,7 +761,7 @@ class TestLightMQTT(unittest.TestCase):
         ], any_order=True)
         self.mock_publish.async_publish.reset_mock()
 
-        light.turn_off(self.hass, 'light.test')
+        common.turn_off(self.hass, 'light.test')
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_called_once_with(
@@ -783,7 +785,7 @@ class TestLightMQTT(unittest.TestCase):
         self.assertEqual(STATE_OFF, state.state)
 
         # Turn on w/ no brightness - should set to max
-        light.turn_on(self.hass, 'light.test')
+        common.turn_on(self.hass, 'light.test')
         self.hass.block_till_done()
 
         # Should get the following MQTT messages.
@@ -792,7 +794,7 @@ class TestLightMQTT(unittest.TestCase):
             'test_light/bright', 255, 0, False)
         self.mock_publish.async_publish.reset_mock()
 
-        light.turn_off(self.hass, 'light.test')
+        common.turn_off(self.hass, 'light.test')
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_called_once_with(
@@ -800,19 +802,19 @@ class TestLightMQTT(unittest.TestCase):
         self.mock_publish.async_publish.reset_mock()
 
         # Turn on w/ brightness
-        light.turn_on(self.hass, 'light.test', brightness=50)
+        common.turn_on(self.hass, 'light.test', brightness=50)
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_called_once_with(
             'test_light/bright', 50, 0, False)
         self.mock_publish.async_publish.reset_mock()
 
-        light.turn_off(self.hass, 'light.test')
+        common.turn_off(self.hass, 'light.test')
         self.hass.block_till_done()
 
         # Turn on w/ just a color to insure brightness gets
         # added and sent.
-        light.turn_on(self.hass, 'light.test', rgb_color=[255, 128, 0])
+        common.turn_on(self.hass, 'light.test', rgb_color=[255, 128, 0])
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_has_calls([
diff --git a/tests/components/light/test_mqtt_json.py b/tests/components/light/test_mqtt_json.py
index 90875285f17..dbae4c53bfc 100644
--- a/tests/components/light/test_mqtt_json.py
+++ b/tests/components/light/test_mqtt_json.py
@@ -98,9 +98,11 @@ from homeassistant.const import (
     ATTR_SUPPORTED_FEATURES)
 import homeassistant.components.light as light
 import homeassistant.core as ha
+
 from tests.common import (
     get_test_home_assistant, mock_mqtt_component, fire_mqtt_message,
     assert_setup_component, mock_coro)
+from tests.components.light import common
 
 
 class TestLightMQTTJSON(unittest.TestCase):
@@ -315,7 +317,7 @@ class TestLightMQTTJSON(unittest.TestCase):
         self.assertEqual(191, state.attributes.get(ATTR_SUPPORTED_FEATURES))
         self.assertTrue(state.attributes.get(ATTR_ASSUMED_STATE))
 
-        light.turn_on(self.hass, 'light.test')
+        common.turn_on(self.hass, 'light.test')
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_called_once_with(
@@ -324,7 +326,7 @@ class TestLightMQTTJSON(unittest.TestCase):
         state = self.hass.states.get('light.test')
         self.assertEqual(STATE_ON, state.state)
 
-        light.turn_off(self.hass, 'light.test')
+        common.turn_off(self.hass, 'light.test')
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_called_once_with(
@@ -333,9 +335,9 @@ class TestLightMQTTJSON(unittest.TestCase):
         state = self.hass.states.get('light.test')
         self.assertEqual(STATE_OFF, state.state)
 
-        light.turn_on(self.hass, 'light.test',
-                      brightness=50, color_temp=155, effect='colorloop',
-                      white_value=170)
+        common.turn_on(self.hass, 'light.test',
+                       brightness=50, color_temp=155, effect='colorloop',
+                       white_value=170)
         self.hass.block_till_done()
 
         self.assertEqual('test_light_rgb/set',
@@ -361,8 +363,8 @@ class TestLightMQTTJSON(unittest.TestCase):
         self.assertEqual(170, state.attributes['white_value'])
 
         # Test a color command
-        light.turn_on(self.hass, 'light.test',
-                      brightness=50, hs_color=(125, 100))
+        common.turn_on(self.hass, 'light.test',
+                       brightness=50, hs_color=(125, 100))
         self.hass.block_till_done()
 
         self.assertEqual('test_light_rgb/set',
@@ -398,7 +400,7 @@ class TestLightMQTTJSON(unittest.TestCase):
             }
         })
 
-        light.turn_on(self.hass, 'light.test', hs_color=(180.0, 50.0))
+        common.turn_on(self.hass, 'light.test', hs_color=(180.0, 50.0))
         self.hass.block_till_done()
 
         message_json = json.loads(
@@ -427,7 +429,7 @@ class TestLightMQTTJSON(unittest.TestCase):
         self.assertEqual(STATE_OFF, state.state)
         self.assertEqual(40, state.attributes.get(ATTR_SUPPORTED_FEATURES))
 
-        light.turn_on(self.hass, 'light.test', flash="short")
+        common.turn_on(self.hass, 'light.test', flash="short")
         self.hass.block_till_done()
 
         self.assertEqual('test_light_rgb/set',
@@ -443,7 +445,7 @@ class TestLightMQTTJSON(unittest.TestCase):
         self.assertEqual("ON", message_json["state"])
 
         self.mock_publish.async_publish.reset_mock()
-        light.turn_on(self.hass, 'light.test', flash="long")
+        common.turn_on(self.hass, 'light.test', flash="long")
         self.hass.block_till_done()
 
         self.assertEqual('test_light_rgb/set',
@@ -474,7 +476,7 @@ class TestLightMQTTJSON(unittest.TestCase):
         self.assertEqual(STATE_OFF, state.state)
         self.assertEqual(40, state.attributes.get(ATTR_SUPPORTED_FEATURES))
 
-        light.turn_on(self.hass, 'light.test', transition=10)
+        common.turn_on(self.hass, 'light.test', transition=10)
         self.hass.block_till_done()
 
         self.assertEqual('test_light_rgb/set',
@@ -490,7 +492,7 @@ class TestLightMQTTJSON(unittest.TestCase):
         self.assertEqual("ON", message_json["state"])
 
         # Transition back off
-        light.turn_off(self.hass, 'light.test', transition=10)
+        common.turn_off(self.hass, 'light.test', transition=10)
         self.hass.block_till_done()
 
         self.assertEqual('test_light_rgb/set',
diff --git a/tests/components/light/test_mqtt_template.py b/tests/components/light/test_mqtt_template.py
index 8f92d659b9b..731e7cd4e45 100644
--- a/tests/components/light/test_mqtt_template.py
+++ b/tests/components/light/test_mqtt_template.py
@@ -34,9 +34,11 @@ from homeassistant.const import (
     STATE_ON, STATE_OFF, STATE_UNAVAILABLE, ATTR_ASSUMED_STATE)
 import homeassistant.components.light as light
 import homeassistant.core as ha
+
 from tests.common import (
     get_test_home_assistant, mock_mqtt_component, fire_mqtt_message,
     assert_setup_component, mock_coro)
+from tests.components.light import common
 
 
 class TestLightMQTTTemplate(unittest.TestCase):
@@ -244,7 +246,7 @@ class TestLightMQTTTemplate(unittest.TestCase):
         self.assertTrue(state.attributes.get(ATTR_ASSUMED_STATE))
 
         # turn on the light
-        light.turn_on(self.hass, 'light.test')
+        common.turn_on(self.hass, 'light.test')
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_called_once_with(
@@ -254,7 +256,7 @@ class TestLightMQTTTemplate(unittest.TestCase):
         self.assertEqual(STATE_ON, state.state)
 
         # turn the light off
-        light.turn_off(self.hass, 'light.test')
+        common.turn_off(self.hass, 'light.test')
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_called_once_with(
@@ -264,8 +266,8 @@ class TestLightMQTTTemplate(unittest.TestCase):
         self.assertEqual(STATE_OFF, state.state)
 
         # turn on the light with brightness, color
-        light.turn_on(self.hass, 'light.test', brightness=50,
-                      rgb_color=[75, 75, 75])
+        common.turn_on(self.hass, 'light.test', brightness=50,
+                       rgb_color=[75, 75, 75])
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_called_once_with(
@@ -273,7 +275,8 @@ class TestLightMQTTTemplate(unittest.TestCase):
         self.mock_publish.async_publish.reset_mock()
 
         # turn on the light with color temp and white val
-        light.turn_on(self.hass, 'light.test', color_temp=200, white_value=139)
+        common.turn_on(self.hass, 'light.test',
+                       color_temp=200, white_value=139)
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_called_once_with(
@@ -305,7 +308,7 @@ class TestLightMQTTTemplate(unittest.TestCase):
         self.assertEqual(STATE_OFF, state.state)
 
         # short flash
-        light.turn_on(self.hass, 'light.test', flash='short')
+        common.turn_on(self.hass, 'light.test', flash='short')
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_called_once_with(
@@ -313,7 +316,7 @@ class TestLightMQTTTemplate(unittest.TestCase):
         self.mock_publish.async_publish.reset_mock()
 
         # long flash
-        light.turn_on(self.hass, 'light.test', flash='long')
+        common.turn_on(self.hass, 'light.test', flash='long')
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_called_once_with(
@@ -336,7 +339,7 @@ class TestLightMQTTTemplate(unittest.TestCase):
         self.assertEqual(STATE_OFF, state.state)
 
         # transition on
-        light.turn_on(self.hass, 'light.test', transition=10)
+        common.turn_on(self.hass, 'light.test', transition=10)
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_called_once_with(
@@ -344,7 +347,7 @@ class TestLightMQTTTemplate(unittest.TestCase):
         self.mock_publish.async_publish.reset_mock()
 
         # transition off
-        light.turn_off(self.hass, 'light.test', transition=4)
+        common.turn_off(self.hass, 'light.test', transition=4)
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_called_once_with(
diff --git a/tests/components/light/test_template.py b/tests/components/light/test_template.py
index cc481fabb5c..5e4dd8555ae 100644
--- a/tests/components/light/test_template.py
+++ b/tests/components/light/test_template.py
@@ -3,12 +3,13 @@ import logging
 
 from homeassistant.core import callback
 from homeassistant import setup
-import homeassistant.components as core
 from homeassistant.components.light import ATTR_BRIGHTNESS
 from homeassistant.const import STATE_ON, STATE_OFF
 
 from tests.common import (
     get_test_home_assistant, assert_setup_component)
+from tests.components.light import common
+
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -378,7 +379,7 @@ class TestTemplateLight:
         state = self.hass.states.get('light.test_template_light')
         assert state.state == STATE_OFF
 
-        core.light.turn_on(self.hass, 'light.test_template_light')
+        common.turn_on(self.hass, 'light.test_template_light')
         self.hass.block_till_done()
 
         assert len(self.calls) == 1
@@ -418,7 +419,7 @@ class TestTemplateLight:
         state = self.hass.states.get('light.test_template_light')
         assert state.state == STATE_OFF
 
-        core.light.turn_on(self.hass, 'light.test_template_light')
+        common.turn_on(self.hass, 'light.test_template_light')
         self.hass.block_till_done()
 
         state = self.hass.states.get('light.test_template_light')
@@ -461,7 +462,7 @@ class TestTemplateLight:
         state = self.hass.states.get('light.test_template_light')
         assert state.state == STATE_ON
 
-        core.light.turn_off(self.hass, 'light.test_template_light')
+        common.turn_off(self.hass, 'light.test_template_light')
         self.hass.block_till_done()
 
         assert len(self.calls) == 1
@@ -498,7 +499,7 @@ class TestTemplateLight:
         state = self.hass.states.get('light.test_template_light')
         assert state.state == STATE_OFF
 
-        core.light.turn_off(self.hass, 'light.test_template_light')
+        common.turn_off(self.hass, 'light.test_template_light')
         self.hass.block_till_done()
 
         assert len(self.calls) == 1
@@ -538,7 +539,7 @@ class TestTemplateLight:
         state = self.hass.states.get('light.test_template_light')
         assert state.attributes.get('brightness') is None
 
-        core.light.turn_on(
+        common.turn_on(
             self.hass, 'light.test_template_light', **{ATTR_BRIGHTNESS: 124})
         self.hass.block_till_done()
         assert len(self.calls) == 1
diff --git a/tests/components/scene/test_init.py b/tests/components/scene/test_init.py
index 08d9af95275..81ab5f89c25 100644
--- a/tests/components/scene/test_init.py
+++ b/tests/components/scene/test_init.py
@@ -8,6 +8,7 @@ from homeassistant.components import light, scene
 from homeassistant.util import yaml
 
 from tests.common import get_test_home_assistant
+from tests.components.light import common as common_light
 from tests.components.scene import common
 
 
@@ -26,7 +27,7 @@ class TestScene(unittest.TestCase):
 
         self.light_1, self.light_2 = test_light.DEVICES[0:2]
 
-        light.turn_off(
+        common_light.turn_off(
             self.hass, [self.light_1.entity_id, self.light_2.entity_id])
 
         self.hass.block_till_done()
diff --git a/tests/components/switch/common.py b/tests/components/switch/common.py
new file mode 100644
index 00000000000..8db8e425ddb
--- /dev/null
+++ b/tests/components/switch/common.py
@@ -0,0 +1,39 @@
+"""Collection of helper methods.
+
+All containing methods are legacy helpers that should not be used by new
+components. Instead call the service directly.
+"""
+from homeassistant.components.switch import DOMAIN
+from homeassistant.const import (
+    ATTR_ENTITY_ID, SERVICE_TURN_OFF, SERVICE_TURN_ON)
+from homeassistant.core import callback
+from homeassistant.loader import bind_hass
+
+
+@bind_hass
+def turn_on(hass, entity_id=None):
+    """Turn all or specified switch on."""
+    hass.add_job(async_turn_on, hass, entity_id)
+
+
+@callback
+@bind_hass
+def async_turn_on(hass, entity_id=None):
+    """Turn all or specified switch on."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
+    hass.async_add_job(hass.services.async_call(DOMAIN, SERVICE_TURN_ON, data))
+
+
+@bind_hass
+def turn_off(hass, entity_id=None):
+    """Turn all or specified switch off."""
+    hass.add_job(async_turn_off, hass, entity_id)
+
+
+@callback
+@bind_hass
+def async_turn_off(hass, entity_id=None):
+    """Turn all or specified switch off."""
+    data = {ATTR_ENTITY_ID: entity_id} if entity_id else None
+    hass.async_add_job(
+        hass.services.async_call(DOMAIN, SERVICE_TURN_OFF, data))
diff --git a/tests/components/switch/test_command_line.py b/tests/components/switch/test_command_line.py
index 9ec0507627d..a84281b4375 100644
--- a/tests/components/switch/test_command_line.py
+++ b/tests/components/switch/test_command_line.py
@@ -10,6 +10,7 @@ import homeassistant.components.switch as switch
 import homeassistant.components.switch.command_line as command_line
 
 from tests.common import get_test_home_assistant
+from tests.components.switch import common
 
 
 # pylint: disable=invalid-name
@@ -44,13 +45,13 @@ class TestCommandSwitch(unittest.TestCase):
             state = self.hass.states.get('switch.test')
             self.assertEqual(STATE_OFF, state.state)
 
-            switch.turn_on(self.hass, 'switch.test')
+            common.turn_on(self.hass, 'switch.test')
             self.hass.block_till_done()
 
             state = self.hass.states.get('switch.test')
             self.assertEqual(STATE_ON, state.state)
 
-            switch.turn_off(self.hass, 'switch.test')
+            common.turn_off(self.hass, 'switch.test')
             self.hass.block_till_done()
 
             state = self.hass.states.get('switch.test')
@@ -78,13 +79,13 @@ class TestCommandSwitch(unittest.TestCase):
             state = self.hass.states.get('switch.test')
             self.assertEqual(STATE_OFF, state.state)
 
-            switch.turn_on(self.hass, 'switch.test')
+            common.turn_on(self.hass, 'switch.test')
             self.hass.block_till_done()
 
             state = self.hass.states.get('switch.test')
             self.assertEqual(STATE_ON, state.state)
 
-            switch.turn_off(self.hass, 'switch.test')
+            common.turn_off(self.hass, 'switch.test')
             self.hass.block_till_done()
 
             state = self.hass.states.get('switch.test')
@@ -114,13 +115,13 @@ class TestCommandSwitch(unittest.TestCase):
             state = self.hass.states.get('switch.test')
             self.assertEqual(STATE_OFF, state.state)
 
-            switch.turn_on(self.hass, 'switch.test')
+            common.turn_on(self.hass, 'switch.test')
             self.hass.block_till_done()
 
             state = self.hass.states.get('switch.test')
             self.assertEqual(STATE_ON, state.state)
 
-            switch.turn_off(self.hass, 'switch.test')
+            common.turn_off(self.hass, 'switch.test')
             self.hass.block_till_done()
 
             state = self.hass.states.get('switch.test')
@@ -147,13 +148,13 @@ class TestCommandSwitch(unittest.TestCase):
             state = self.hass.states.get('switch.test')
             self.assertEqual(STATE_OFF, state.state)
 
-            switch.turn_on(self.hass, 'switch.test')
+            common.turn_on(self.hass, 'switch.test')
             self.hass.block_till_done()
 
             state = self.hass.states.get('switch.test')
             self.assertEqual(STATE_ON, state.state)
 
-            switch.turn_off(self.hass, 'switch.test')
+            common.turn_off(self.hass, 'switch.test')
             self.hass.block_till_done()
 
             state = self.hass.states.get('switch.test')
diff --git a/tests/components/switch/test_flux.py b/tests/components/switch/test_flux.py
index f9ea88c5254..69e65e24659 100644
--- a/tests/components/switch/test_flux.py
+++ b/tests/components/switch/test_flux.py
@@ -11,6 +11,8 @@ import homeassistant.util.dt as dt_util
 from tests.common import (
     assert_setup_component, get_test_home_assistant, fire_time_changed,
     mock_service)
+from tests.components.light import common as common_light
+from tests.components.switch import common
 
 
 class TestSwitchFlux(unittest.TestCase):
@@ -147,7 +149,7 @@ class TestSwitchFlux(unittest.TestCase):
                 })
                 turn_on_calls = mock_service(
                     self.hass, light.DOMAIN, SERVICE_TURN_ON)
-                switch.turn_on(self.hass, 'switch.flux')
+                common.turn_on(self.hass, 'switch.flux')
                 self.hass.block_till_done()
                 fire_time_changed(self.hass, test_time)
                 self.hass.block_till_done()
@@ -193,7 +195,7 @@ class TestSwitchFlux(unittest.TestCase):
                 })
                 turn_on_calls = mock_service(
                     self.hass, light.DOMAIN, SERVICE_TURN_ON)
-                switch.turn_on(self.hass, 'switch.flux')
+                common.turn_on(self.hass, 'switch.flux')
                 self.hass.block_till_done()
                 fire_time_changed(self.hass, test_time)
                 self.hass.block_till_done()
@@ -240,7 +242,7 @@ class TestSwitchFlux(unittest.TestCase):
                 })
                 turn_on_calls = mock_service(
                     self.hass, light.DOMAIN, SERVICE_TURN_ON)
-                switch.turn_on(self.hass, 'switch.flux')
+                common.turn_on(self.hass, 'switch.flux')
                 self.hass.block_till_done()
                 fire_time_changed(self.hass, test_time)
                 self.hass.block_till_done()
@@ -286,7 +288,7 @@ class TestSwitchFlux(unittest.TestCase):
                 })
                 turn_on_calls = mock_service(
                     self.hass, light.DOMAIN, SERVICE_TURN_ON)
-                switch.turn_on(self.hass, 'switch.flux')
+                common.turn_on(self.hass, 'switch.flux')
                 self.hass.block_till_done()
                 fire_time_changed(self.hass, test_time)
                 self.hass.block_till_done()
@@ -334,7 +336,7 @@ class TestSwitchFlux(unittest.TestCase):
                 })
                 turn_on_calls = mock_service(
                     self.hass, light.DOMAIN, SERVICE_TURN_ON)
-                switch.turn_on(self.hass, 'switch.flux')
+                common.turn_on(self.hass, 'switch.flux')
                 self.hass.block_till_done()
                 fire_time_changed(self.hass, test_time)
                 self.hass.block_till_done()
@@ -383,7 +385,7 @@ class TestSwitchFlux(unittest.TestCase):
                 })
                 turn_on_calls = mock_service(
                     self.hass, light.DOMAIN, SERVICE_TURN_ON)
-                switch.turn_on(self.hass, 'switch.flux')
+                common.turn_on(self.hass, 'switch.flux')
                 self.hass.block_till_done()
                 fire_time_changed(self.hass, test_time)
                 self.hass.block_till_done()
@@ -434,7 +436,7 @@ class TestSwitchFlux(unittest.TestCase):
                 })
                 turn_on_calls = mock_service(
                     self.hass, light.DOMAIN, SERVICE_TURN_ON)
-                switch.turn_on(self.hass, 'switch.flux')
+                common.turn_on(self.hass, 'switch.flux')
                 self.hass.block_till_done()
                 fire_time_changed(self.hass, test_time)
                 self.hass.block_till_done()
@@ -484,7 +486,7 @@ class TestSwitchFlux(unittest.TestCase):
                 })
                 turn_on_calls = mock_service(
                     self.hass, light.DOMAIN, SERVICE_TURN_ON)
-                switch.turn_on(self.hass, 'switch.flux')
+                common.turn_on(self.hass, 'switch.flux')
                 self.hass.block_till_done()
                 fire_time_changed(self.hass, test_time)
                 self.hass.block_till_done()
@@ -534,7 +536,7 @@ class TestSwitchFlux(unittest.TestCase):
                 })
                 turn_on_calls = mock_service(
                     self.hass, light.DOMAIN, SERVICE_TURN_ON)
-                switch.turn_on(self.hass, 'switch.flux')
+                common.turn_on(self.hass, 'switch.flux')
                 self.hass.block_till_done()
                 fire_time_changed(self.hass, test_time)
                 self.hass.block_till_done()
@@ -584,7 +586,7 @@ class TestSwitchFlux(unittest.TestCase):
                 })
                 turn_on_calls = mock_service(
                     self.hass, light.DOMAIN, SERVICE_TURN_ON)
-                switch.turn_on(self.hass, 'switch.flux')
+                common.turn_on(self.hass, 'switch.flux')
                 self.hass.block_till_done()
                 fire_time_changed(self.hass, test_time)
                 self.hass.block_till_done()
@@ -633,7 +635,7 @@ class TestSwitchFlux(unittest.TestCase):
                 })
                 turn_on_calls = mock_service(
                     self.hass, light.DOMAIN, SERVICE_TURN_ON)
-                switch.turn_on(self.hass, 'switch.flux')
+                common.turn_on(self.hass, 'switch.flux')
                 self.hass.block_till_done()
                 fire_time_changed(self.hass, test_time)
                 self.hass.block_till_done()
@@ -681,7 +683,7 @@ class TestSwitchFlux(unittest.TestCase):
                 })
                 turn_on_calls = mock_service(
                     self.hass, light.DOMAIN, SERVICE_TURN_ON)
-                switch.turn_on(self.hass, 'switch.flux')
+                common.turn_on(self.hass, 'switch.flux')
                 self.hass.block_till_done()
                 fire_time_changed(self.hass, test_time)
                 self.hass.block_till_done()
@@ -698,9 +700,9 @@ class TestSwitchFlux(unittest.TestCase):
                             {light.DOMAIN: {CONF_PLATFORM: 'test'}}))
 
         dev1, dev2, dev3 = platform.DEVICES
-        light.turn_on(self.hass, entity_id=dev2.entity_id)
+        common_light.turn_on(self.hass, entity_id=dev2.entity_id)
         self.hass.block_till_done()
-        light.turn_on(self.hass, entity_id=dev3.entity_id)
+        common_light.turn_on(self.hass, entity_id=dev3.entity_id)
         self.hass.block_till_done()
 
         state = self.hass.states.get(dev1.entity_id)
@@ -743,7 +745,7 @@ class TestSwitchFlux(unittest.TestCase):
                 })
                 turn_on_calls = mock_service(
                     self.hass, light.DOMAIN, SERVICE_TURN_ON)
-                switch.turn_on(self.hass, 'switch.flux')
+                common.turn_on(self.hass, 'switch.flux')
                 self.hass.block_till_done()
                 fire_time_changed(self.hass, test_time)
                 self.hass.block_till_done()
@@ -794,7 +796,7 @@ class TestSwitchFlux(unittest.TestCase):
                 })
                 turn_on_calls = mock_service(
                     self.hass, light.DOMAIN, SERVICE_TURN_ON)
-                switch.turn_on(self.hass, 'switch.flux')
+                common.turn_on(self.hass, 'switch.flux')
                 self.hass.block_till_done()
                 fire_time_changed(self.hass, test_time)
                 self.hass.block_till_done()
@@ -838,7 +840,7 @@ class TestSwitchFlux(unittest.TestCase):
                 })
                 turn_on_calls = mock_service(
                     self.hass, light.DOMAIN, SERVICE_TURN_ON)
-                switch.turn_on(self.hass, 'switch.flux')
+                common.turn_on(self.hass, 'switch.flux')
                 self.hass.block_till_done()
                 fire_time_changed(self.hass, test_time)
                 self.hass.block_till_done()
diff --git a/tests/components/switch/test_init.py b/tests/components/switch/test_init.py
index 579898437ca..a7462eecd42 100644
--- a/tests/components/switch/test_init.py
+++ b/tests/components/switch/test_init.py
@@ -8,6 +8,7 @@ from homeassistant.components import switch
 from homeassistant.const import STATE_ON, STATE_OFF, CONF_PLATFORM
 
 from tests.common import get_test_home_assistant
+from tests.components.switch import common
 
 
 class TestSwitch(unittest.TestCase):
@@ -41,8 +42,8 @@ class TestSwitch(unittest.TestCase):
         self.assertFalse(switch.is_on(self.hass, self.switch_2.entity_id))
         self.assertFalse(switch.is_on(self.hass, self.switch_3.entity_id))
 
-        switch.turn_off(self.hass, self.switch_1.entity_id)
-        switch.turn_on(self.hass, self.switch_2.entity_id)
+        common.turn_off(self.hass, self.switch_1.entity_id)
+        common.turn_on(self.hass, self.switch_2.entity_id)
 
         self.hass.block_till_done()
 
@@ -51,7 +52,7 @@ class TestSwitch(unittest.TestCase):
         self.assertTrue(switch.is_on(self.hass, self.switch_2.entity_id))
 
         # Turn all off
-        switch.turn_off(self.hass)
+        common.turn_off(self.hass)
 
         self.hass.block_till_done()
 
@@ -64,7 +65,7 @@ class TestSwitch(unittest.TestCase):
         self.assertFalse(switch.is_on(self.hass, self.switch_3.entity_id))
 
         # Turn all on
-        switch.turn_on(self.hass)
+        common.turn_on(self.hass)
 
         self.hass.block_till_done()
 
diff --git a/tests/components/switch/test_litejet.py b/tests/components/switch/test_litejet.py
index 45e5509c169..f1d23f48b86 100644
--- a/tests/components/switch/test_litejet.py
+++ b/tests/components/switch/test_litejet.py
@@ -5,9 +5,11 @@ from unittest import mock
 
 from homeassistant import setup
 from homeassistant.components import litejet
-from tests.common import get_test_home_assistant
 import homeassistant.components.switch as switch
 
+from tests.common import get_test_home_assistant
+from tests.components.switch import common
+
 _LOGGER = logging.getLogger(__name__)
 
 ENTITY_SWITCH = 'switch.mock_switch_1'
@@ -88,11 +90,11 @@ class TestLiteJetSwitch(unittest.TestCase):
 
         assert not switch.is_on(self.hass, ENTITY_SWITCH)
 
-        switch.turn_on(self.hass, ENTITY_SWITCH)
+        common.turn_on(self.hass, ENTITY_SWITCH)
         self.hass.block_till_done()
         self.mock_lj.press_switch.assert_called_with(ENTITY_SWITCH_NUMBER)
 
-        switch.turn_off(self.hass, ENTITY_SWITCH)
+        common.turn_off(self.hass, ENTITY_SWITCH)
         self.hass.block_till_done()
         self.mock_lj.release_switch.assert_called_with(ENTITY_SWITCH_NUMBER)
 
diff --git a/tests/components/switch/test_mqtt.py b/tests/components/switch/test_mqtt.py
index cad93e3bfce..ac113a05829 100644
--- a/tests/components/switch/test_mqtt.py
+++ b/tests/components/switch/test_mqtt.py
@@ -8,9 +8,11 @@ from homeassistant.const import STATE_ON, STATE_OFF, STATE_UNAVAILABLE,\
 import homeassistant.core as ha
 import homeassistant.components.switch as switch
 from homeassistant.components.mqtt.discovery import async_start
+
 from tests.common import (
     mock_mqtt_component, fire_mqtt_message, get_test_home_assistant, mock_coro,
     async_mock_mqtt_component, async_fire_mqtt_message)
+from tests.components.switch import common
 
 
 class TestSwitchMQTT(unittest.TestCase):
@@ -75,7 +77,7 @@ class TestSwitchMQTT(unittest.TestCase):
         self.assertEqual(STATE_ON, state.state)
         self.assertTrue(state.attributes.get(ATTR_ASSUMED_STATE))
 
-        switch.turn_on(self.hass, 'switch.test')
+        common.turn_on(self.hass, 'switch.test')
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_called_once_with(
@@ -84,7 +86,7 @@ class TestSwitchMQTT(unittest.TestCase):
         state = self.hass.states.get('switch.test')
         self.assertEqual(STATE_ON, state.state)
 
-        switch.turn_off(self.hass, 'switch.test')
+        common.turn_off(self.hass, 'switch.test')
         self.hass.block_till_done()
 
         self.mock_publish.async_publish.assert_called_once_with(
diff --git a/tests/components/switch/test_template.py b/tests/components/switch/test_template.py
index 47766e31f4d..1492aab250f 100644
--- a/tests/components/switch/test_template.py
+++ b/tests/components/switch/test_template.py
@@ -1,11 +1,11 @@
 """The tests for the  Template switch platform."""
 from homeassistant.core import callback
 from homeassistant import setup
-import homeassistant.components as core
 from homeassistant.const import STATE_ON, STATE_OFF
 
 from tests.common import (
     get_test_home_assistant, assert_setup_component)
+from tests.components.switch import common
 
 
 class TestTemplateSwitch:
@@ -406,7 +406,7 @@ class TestTemplateSwitch:
         state = self.hass.states.get('switch.test_template_switch')
         assert state.state == STATE_OFF
 
-        core.switch.turn_on(self.hass, 'switch.test_template_switch')
+        common.turn_on(self.hass, 'switch.test_template_switch')
         self.hass.block_till_done()
 
         assert len(self.calls) == 1
@@ -442,7 +442,7 @@ class TestTemplateSwitch:
         state = self.hass.states.get('switch.test_template_switch')
         assert state.state == STATE_ON
 
-        core.switch.turn_off(self.hass, 'switch.test_template_switch')
+        common.turn_off(self.hass, 'switch.test_template_switch')
         self.hass.block_till_done()
 
         assert len(self.calls) == 1
diff --git a/tests/components/switch/test_wake_on_lan.py b/tests/components/switch/test_wake_on_lan.py
index abe1532cec7..42ebd1ff231 100644
--- a/tests/components/switch/test_wake_on_lan.py
+++ b/tests/components/switch/test_wake_on_lan.py
@@ -7,6 +7,7 @@ from homeassistant.const import STATE_ON, STATE_OFF
 import homeassistant.components.switch as switch
 
 from tests.common import get_test_home_assistant, mock_service
+from tests.components.switch import common
 
 
 TEST_STATE = None
@@ -59,13 +60,13 @@ class TestWOLSwitch(unittest.TestCase):
 
         TEST_STATE = True
 
-        switch.turn_on(self.hass, 'switch.wake_on_lan')
+        common.turn_on(self.hass, 'switch.wake_on_lan')
         self.hass.block_till_done()
 
         state = self.hass.states.get('switch.wake_on_lan')
         self.assertEqual(STATE_ON, state.state)
 
-        switch.turn_off(self.hass, 'switch.wake_on_lan')
+        common.turn_off(self.hass, 'switch.wake_on_lan')
         self.hass.block_till_done()
 
         state = self.hass.states.get('switch.wake_on_lan')
@@ -91,7 +92,7 @@ class TestWOLSwitch(unittest.TestCase):
 
         TEST_STATE = True
 
-        switch.turn_on(self.hass, 'switch.wake_on_lan')
+        common.turn_on(self.hass, 'switch.wake_on_lan')
         self.hass.block_till_done()
 
         state = self.hass.states.get('switch.wake_on_lan')
@@ -123,7 +124,7 @@ class TestWOLSwitch(unittest.TestCase):
         state = self.hass.states.get('switch.wake_on_lan')
         self.assertEqual(STATE_OFF, state.state)
 
-        switch.turn_on(self.hass, 'switch.wake_on_lan')
+        common.turn_on(self.hass, 'switch.wake_on_lan')
         self.hass.block_till_done()
 
     @patch('wakeonlan.send_magic_packet', new=send_magic_packet)
@@ -149,7 +150,7 @@ class TestWOLSwitch(unittest.TestCase):
 
         TEST_STATE = True
 
-        switch.turn_on(self.hass, 'switch.wake_on_lan')
+        common.turn_on(self.hass, 'switch.wake_on_lan')
         self.hass.block_till_done()
 
         state = self.hass.states.get('switch.wake_on_lan')
@@ -158,7 +159,7 @@ class TestWOLSwitch(unittest.TestCase):
 
         TEST_STATE = False
 
-        switch.turn_off(self.hass, 'switch.wake_on_lan')
+        common.turn_off(self.hass, 'switch.wake_on_lan')
         self.hass.block_till_done()
 
         state = self.hass.states.get('switch.wake_on_lan')
@@ -185,7 +186,7 @@ class TestWOLSwitch(unittest.TestCase):
 
         TEST_STATE = True
 
-        switch.turn_on(self.hass, 'switch.wake_on_lan')
+        common.turn_on(self.hass, 'switch.wake_on_lan')
         self.hass.block_till_done()
 
         state = self.hass.states.get('switch.wake_on_lan')
diff --git a/tests/components/test_device_sun_light_trigger.py b/tests/components/test_device_sun_light_trigger.py
index 35d53f9a5c8..7107eee74fe 100644
--- a/tests/components/test_device_sun_light_trigger.py
+++ b/tests/components/test_device_sun_light_trigger.py
@@ -12,6 +12,7 @@ from homeassistant.components import (
 from homeassistant.util import dt as dt_util
 
 from tests.common import get_test_home_assistant, fire_time_changed
+from tests.components.light import common as common_light
 
 
 class TestDeviceSunLightTrigger(unittest.TestCase):
@@ -68,7 +69,7 @@ class TestDeviceSunLightTrigger(unittest.TestCase):
                 self.hass, device_sun_light_trigger.DOMAIN, {
                     device_sun_light_trigger.DOMAIN: {}}))
 
-        light.turn_off(self.hass)
+        common_light.turn_off(self.hass)
 
         self.hass.block_till_done()
 
@@ -81,7 +82,7 @@ class TestDeviceSunLightTrigger(unittest.TestCase):
 
     def test_lights_turn_off_when_everyone_leaves(self):
         """Test lights turn off when everyone leaves the house."""
-        light.turn_on(self.hass)
+        common_light.turn_on(self.hass)
 
         self.hass.block_till_done()
 
@@ -100,7 +101,7 @@ class TestDeviceSunLightTrigger(unittest.TestCase):
         """Test lights turn on when coming home after sun set."""
         test_time = datetime(2017, 4, 5, 3, 2, 3, tzinfo=dt_util.UTC)
         with patch('homeassistant.util.dt.utcnow', return_value=test_time):
-            light.turn_off(self.hass)
+            common_light.turn_off(self.hass)
             self.hass.block_till_done()
 
             self.assertTrue(setup_component(
diff --git a/tests/components/test_script.py b/tests/components/test_script.py
index b9aa921cb63..43727b6d559 100644
--- a/tests/components/test_script.py
+++ b/tests/components/test_script.py
@@ -3,9 +3,13 @@
 import unittest
 from unittest.mock import patch
 
-from homeassistant.core import Context, callback
-from homeassistant.setup import setup_component
 from homeassistant.components import script
+from homeassistant.components.script import DOMAIN
+from homeassistant.const import (
+    ATTR_ENTITY_ID, SERVICE_RELOAD, SERVICE_TOGGLE, SERVICE_TURN_OFF)
+from homeassistant.core import Context, callback, split_entity_id
+from homeassistant.loader import bind_hass
+from homeassistant.setup import setup_component
 
 from tests.common import get_test_home_assistant
 
@@ -13,6 +17,44 @@ from tests.common import get_test_home_assistant
 ENTITY_ID = 'script.test'
 
 
+@bind_hass
+def turn_on(hass, entity_id, variables=None, context=None):
+    """Turn script on.
+
+    This is a legacy helper method. Do not use it for new tests.
+    """
+    _, object_id = split_entity_id(entity_id)
+
+    hass.services.call(DOMAIN, object_id, variables, context=context)
+
+
+@bind_hass
+def turn_off(hass, entity_id):
+    """Turn script on.
+
+    This is a legacy helper method. Do not use it for new tests.
+    """
+    hass.services.call(DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: entity_id})
+
+
+@bind_hass
+def toggle(hass, entity_id):
+    """Toggle the script.
+
+    This is a legacy helper method. Do not use it for new tests.
+    """
+    hass.services.call(DOMAIN, SERVICE_TOGGLE, {ATTR_ENTITY_ID: entity_id})
+
+
+@bind_hass
+def reload(hass):
+    """Reload script component.
+
+    This is a legacy helper method. Do not use it for new tests.
+    """
+    hass.services.call(DOMAIN, SERVICE_RELOAD)
+
+
 class TestScriptComponent(unittest.TestCase):
     """Test the Script component."""
 
@@ -76,17 +118,17 @@ class TestScriptComponent(unittest.TestCase):
             }
         })
 
-        script.turn_on(self.hass, ENTITY_ID)
+        turn_on(self.hass, ENTITY_ID)
         self.hass.block_till_done()
         self.assertTrue(script.is_on(self.hass, ENTITY_ID))
         self.assertEqual(0, len(events))
 
         # Calling turn_on a second time should not advance the script
-        script.turn_on(self.hass, ENTITY_ID)
+        turn_on(self.hass, ENTITY_ID)
         self.hass.block_till_done()
         self.assertEqual(0, len(events))
 
-        script.turn_off(self.hass, ENTITY_ID)
+        turn_off(self.hass, ENTITY_ID)
         self.hass.block_till_done()
         self.assertFalse(script.is_on(self.hass, ENTITY_ID))
         self.assertEqual(0, len(events))
@@ -121,12 +163,12 @@ class TestScriptComponent(unittest.TestCase):
             }
         })
 
-        script.toggle(self.hass, ENTITY_ID)
+        toggle(self.hass, ENTITY_ID)
         self.hass.block_till_done()
         self.assertTrue(script.is_on(self.hass, ENTITY_ID))
         self.assertEqual(0, len(events))
 
-        script.toggle(self.hass, ENTITY_ID)
+        toggle(self.hass, ENTITY_ID)
         self.hass.block_till_done()
         self.assertFalse(script.is_on(self.hass, ENTITY_ID))
         self.assertEqual(0, len(events))
@@ -156,7 +198,7 @@ class TestScriptComponent(unittest.TestCase):
             },
         })
 
-        script.turn_on(self.hass, ENTITY_ID, {
+        turn_on(self.hass, ENTITY_ID, {
             'greeting': 'world'
         }, context=context)
 
@@ -204,7 +246,7 @@ class TestScriptComponent(unittest.TestCase):
                     }}}):
             with patch('homeassistant.config.find_config_file',
                        return_value=''):
-                script.reload(self.hass)
+                reload(self.hass)
                 self.hass.block_till_done()
 
         assert self.hass.states.get(ENTITY_ID) is None
diff --git a/tests/test_loader.py b/tests/test_loader.py
index 4beb7db570e..c4adb971593 100644
--- a/tests/test_loader.py
+++ b/tests/test_loader.py
@@ -79,10 +79,10 @@ def test_component_loader_non_existing(hass):
 @asyncio.coroutine
 def test_component_wrapper(hass):
     """Test component wrapper."""
-    calls = async_mock_service(hass, 'light', 'turn_on')
+    calls = async_mock_service(hass, 'persistent_notification', 'create')
 
     components = loader.Components(hass)
-    components.light.async_turn_on('light.test')
+    components.persistent_notification.async_create('message')
     yield from hass.async_block_till_done()
 
     assert len(calls) == 1

From f879ac0993f0650ce89dbc513362a2663c0ee528 Mon Sep 17 00:00:00 2001
From: cdce8p <30130371+cdce8p@users.noreply.github.com>
Date: Thu, 27 Sep 2018 23:14:09 +0200
Subject: [PATCH 340/357] Remove service helper (6) (#16920)

* Update automation

* Update group

* Async_create_task
---
 .../components/automation/__init__.py         | 15 -----
 homeassistant/components/config/automation.py | 11 ++--
 .../components/device_tracker/__init__.py     | 22 ++++---
 homeassistant/components/group/__init__.py    | 57 ------------------
 homeassistant/helpers/entity_component.py     | 15 +++--
 tests/components/group/common.py              | 60 ++++++++++++++++++-
 tests/components/group/test_init.py           | 12 ++--
 7 files changed, 95 insertions(+), 97 deletions(-)

diff --git a/homeassistant/components/automation/__init__.py b/homeassistant/components/automation/__init__.py
index e657409ea01..b34a6b7cf40 100644
--- a/homeassistant/components/automation/__init__.py
+++ b/homeassistant/components/automation/__init__.py
@@ -115,21 +115,6 @@ def is_on(hass, entity_id):
     return hass.states.is_state(entity_id, STATE_ON)
 
 
-@bind_hass
-def reload(hass):
-    """Reload the automation from config."""
-    hass.services.call(DOMAIN, SERVICE_RELOAD)
-
-
-@bind_hass
-def async_reload(hass):
-    """Reload the automation from config.
-
-    Returns a coroutine object.
-    """
-    return hass.services.async_call(DOMAIN, SERVICE_RELOAD)
-
-
 async def async_setup(hass, config):
     """Set up the automation."""
     component = EntityComponent(_LOGGER, DOMAIN, hass,
diff --git a/homeassistant/components/config/automation.py b/homeassistant/components/config/automation.py
index 223159eb415..2d13ac07025 100644
--- a/homeassistant/components/config/automation.py
+++ b/homeassistant/components/config/automation.py
@@ -3,10 +3,9 @@ import asyncio
 from collections import OrderedDict
 import uuid
 
-from homeassistant.const import CONF_ID
 from homeassistant.components.config import EditIdBasedConfigView
-from homeassistant.components.automation import (
-    PLATFORM_SCHEMA, DOMAIN, async_reload)
+from homeassistant.const import CONF_ID, SERVICE_RELOAD
+from homeassistant.components.automation import DOMAIN, PLATFORM_SCHEMA
 import homeassistant.helpers.config_validation as cv
 
 
@@ -16,9 +15,13 @@ CONFIG_PATH = 'automations.yaml'
 @asyncio.coroutine
 def async_setup(hass):
     """Set up the Automation config API."""
+    async def hook(hass):
+        """post_write_hook for Config View that reloads automations."""
+        await hass.services.async_call(DOMAIN, SERVICE_RELOAD)
+
     hass.http.register_view(EditAutomationConfigView(
         DOMAIN, 'config', CONFIG_PATH, cv.string,
-        PLATFORM_SCHEMA, post_write_hook=async_reload
+        PLATFORM_SCHEMA, post_write_hook=hook
     ))
     return True
 
diff --git a/homeassistant/components/device_tracker/__init__.py b/homeassistant/components/device_tracker/__init__.py
index 408672a974f..af1bb1cd9b5 100644
--- a/homeassistant/components/device_tracker/__init__.py
+++ b/homeassistant/components/device_tracker/__init__.py
@@ -15,6 +15,7 @@ from homeassistant.setup import async_prepare_setup_platform
 from homeassistant.core import callback
 from homeassistant.loader import bind_hass
 from homeassistant.components import group, zone
+from homeassistant.components.group import DOMAIN as DOMAIN_GROUP, SERVICE_SET
 from homeassistant.components.zone.zone import async_active_zone
 from homeassistant.config import load_yaml_config_file, async_log_exception
 from homeassistant.exceptions import HomeAssistantError
@@ -319,9 +320,13 @@ class DeviceTracker:
 
         # During init, we ignore the group
         if self.group and self.track_new:
-            self.group.async_set_group(
-                util.slugify(GROUP_NAME_ALL_DEVICES), visible=False,
-                name=GROUP_NAME_ALL_DEVICES, add=[device.entity_id])
+            self.hass.async_create_task(
+                self.hass.async_call(
+                    DOMAIN_GROUP, SERVICE_SET, dict(
+                        object_id=util.slugify(GROUP_NAME_ALL_DEVICES),
+                        visible=False,
+                        name=GROUP_NAME_ALL_DEVICES,
+                        add=[device.entity_id])))
 
         self.hass.bus.async_fire(EVENT_NEW_DEVICE, {
             ATTR_ENTITY_ID: device.entity_id,
@@ -354,10 +359,13 @@ class DeviceTracker:
         entity_ids = [dev.entity_id for dev in self.devices.values()
                       if dev.track]
 
-        self.group = self.hass.components.group
-        self.group.async_set_group(
-            util.slugify(GROUP_NAME_ALL_DEVICES), visible=False,
-            name=GROUP_NAME_ALL_DEVICES, entity_ids=entity_ids)
+        self.hass.async_create_task(
+            self.hass.services.async_call(
+                DOMAIN_GROUP, SERVICE_SET, dict(
+                    object_id=util.slugify(GROUP_NAME_ALL_DEVICES),
+                    visible=False,
+                    name=GROUP_NAME_ALL_DEVICES,
+                    entities=entity_ids)))
 
     @callback
     def async_update_stale(self, now: dt_util.dt.datetime):
diff --git a/homeassistant/components/group/__init__.py b/homeassistant/components/group/__init__.py
index 7b5a75dc13f..39fd7567c98 100644
--- a/homeassistant/components/group/__init__.py
+++ b/homeassistant/components/group/__init__.py
@@ -120,63 +120,6 @@ def is_on(hass, entity_id):
     return False
 
 
-@bind_hass
-def reload(hass):
-    """Reload the automation from config."""
-    hass.add_job(async_reload, hass)
-
-
-@callback
-@bind_hass
-def async_reload(hass):
-    """Reload the automation from config."""
-    hass.async_add_job(hass.services.async_call(DOMAIN, SERVICE_RELOAD))
-
-
-@bind_hass
-def set_group(hass, object_id, name=None, entity_ids=None, visible=None,
-              icon=None, view=None, control=None, add=None):
-    """Create/Update a group."""
-    hass.add_job(
-        async_set_group, hass, object_id, name, entity_ids, visible, icon,
-        view, control, add)
-
-
-@callback
-@bind_hass
-def async_set_group(hass, object_id, name=None, entity_ids=None, visible=None,
-                    icon=None, view=None, control=None, add=None):
-    """Create/Update a group."""
-    data = {
-        key: value for key, value in [
-            (ATTR_OBJECT_ID, object_id),
-            (ATTR_NAME, name),
-            (ATTR_ENTITIES, entity_ids),
-            (ATTR_VISIBLE, visible),
-            (ATTR_ICON, icon),
-            (ATTR_VIEW, view),
-            (ATTR_CONTROL, control),
-            (ATTR_ADD_ENTITIES, add),
-        ] if value is not None
-    }
-
-    hass.async_add_job(hass.services.async_call(DOMAIN, SERVICE_SET, data))
-
-
-@bind_hass
-def remove(hass, name):
-    """Remove a user group."""
-    hass.add_job(async_remove, hass, name)
-
-
-@callback
-@bind_hass
-def async_remove(hass, object_id):
-    """Remove a user group."""
-    data = {ATTR_OBJECT_ID: object_id}
-    hass.async_add_job(hass.services.async_call(DOMAIN, SERVICE_REMOVE, data))
-
-
 @bind_hass
 def expand_entity_ids(hass, entity_ids):
     """Return entity_ids with group entity ids replaced by their members.
diff --git a/homeassistant/helpers/entity_component.py b/homeassistant/helpers/entity_component.py
index 09f8838b160..c2ab8722c97 100644
--- a/homeassistant/helpers/entity_component.py
+++ b/homeassistant/helpers/entity_component.py
@@ -190,10 +190,13 @@ class EntityComponent:
                sorted(self.entities,
                       key=lambda entity: entity.name or entity.entity_id)]
 
-        self.hass.components.group.async_set_group(
-            slugify(self.group_name), name=self.group_name,
-            visible=False, entity_ids=ids
-        )
+        self.hass.async_create_task(
+            self.hass.services.async_call(
+                'group', 'set', dict(
+                    object_id=slugify(self.group_name),
+                    name=self.group_name,
+                    visible=False,
+                    entities=ids)))
 
     async def _async_reset(self):
         """Remove entities and reset the entity component to initial values.
@@ -212,7 +215,9 @@ class EntityComponent:
         self.config = None
 
         if self.group_name is not None:
-            self.hass.components.group.async_remove(slugify(self.group_name))
+            await self.hass.services.async_call(
+                'group', 'remove', dict(
+                    object_id=slugify(self.group_name)))
 
     async def async_remove_entity(self, entity_id):
         """Remove an entity managed by one of the platforms."""
diff --git a/tests/components/group/common.py b/tests/components/group/common.py
index 1a59eb265e0..380586e3854 100644
--- a/tests/components/group/common.py
+++ b/tests/components/group/common.py
@@ -3,12 +3,66 @@
 All containing methods are legacy helpers that should not be used by new
 components. Instead call the service directly.
 """
-from homeassistant.components.group import ATTR_VISIBLE, DOMAIN, \
-    SERVICE_SET_VISIBILITY
-from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.components.group import (
+    ATTR_ADD_ENTITIES, ATTR_CONTROL, ATTR_ENTITIES, ATTR_OBJECT_ID, ATTR_VIEW,
+    ATTR_VISIBLE, DOMAIN, SERVICE_REMOVE, SERVICE_SET, SERVICE_SET_VISIBILITY)
+from homeassistant.const import (
+    ATTR_ENTITY_ID, ATTR_ICON, ATTR_NAME, SERVICE_RELOAD)
+from homeassistant.core import callback
 from homeassistant.loader import bind_hass
 
 
+@bind_hass
+def reload(hass):
+    """Reload the automation from config."""
+    hass.add_job(async_reload, hass)
+
+
+@callback
+@bind_hass
+def async_reload(hass):
+    """Reload the automation from config."""
+    hass.async_add_job(hass.services.async_call(DOMAIN, SERVICE_RELOAD))
+
+
+@bind_hass
+def set_group(hass, object_id, name=None, entity_ids=None, visible=None,
+              icon=None, view=None, control=None, add=None):
+    """Create/Update a group."""
+    hass.add_job(
+        async_set_group, hass, object_id, name, entity_ids, visible, icon,
+        view, control, add)
+
+
+@callback
+@bind_hass
+def async_set_group(hass, object_id, name=None, entity_ids=None, visible=None,
+                    icon=None, view=None, control=None, add=None):
+    """Create/Update a group."""
+    data = {
+        key: value for key, value in [
+            (ATTR_OBJECT_ID, object_id),
+            (ATTR_NAME, name),
+            (ATTR_ENTITIES, entity_ids),
+            (ATTR_VISIBLE, visible),
+            (ATTR_ICON, icon),
+            (ATTR_VIEW, view),
+            (ATTR_CONTROL, control),
+            (ATTR_ADD_ENTITIES, add),
+        ] if value is not None
+    }
+
+    hass.async_add_job(hass.services.async_call(DOMAIN, SERVICE_SET, data))
+
+
+@callback
+@bind_hass
+def async_remove(hass, object_id):
+    """Remove a user group."""
+    data = {ATTR_OBJECT_ID: object_id}
+    hass.async_add_job(hass.services.async_call(DOMAIN, SERVICE_REMOVE, data))
+
+
 @bind_hass
 def set_visibility(hass, entity_id=None, visible=True):
     """Hide or shows a group."""
diff --git a/tests/components/group/test_init.py b/tests/components/group/test_init.py
index 619ce86583a..55c8a7778cb 100644
--- a/tests/components/group/test_init.py
+++ b/tests/components/group/test_init.py
@@ -368,7 +368,7 @@ class TestComponentsGroup(unittest.TestCase):
                 }}}):
             with patch('homeassistant.config.find_config_file',
                        return_value=''):
-                group.reload(self.hass)
+                common.reload(self.hass)
                 self.hass.block_till_done()
 
         assert sorted(self.hass.states.entity_ids()) == \
@@ -409,7 +409,7 @@ class TestComponentsGroup(unittest.TestCase):
 
         # The old way would create a new group modify_group1 because
         # internally it didn't know anything about those created in the config
-        group.set_group(self.hass, 'modify_group', icon="mdi:play")
+        common.set_group(self.hass, 'modify_group', icon="mdi:play")
         self.hass.block_till_done()
 
         group_state = self.hass.states.get(
@@ -442,7 +442,7 @@ def test_service_group_set_group_remove_group(hass):
             'group': {}
         })
 
-    group.async_set_group(hass, 'user_test_group', name="Test")
+    common.async_set_group(hass, 'user_test_group', name="Test")
     yield from hass.async_block_till_done()
 
     group_state = hass.states.get('group.user_test_group')
@@ -450,7 +450,7 @@ def test_service_group_set_group_remove_group(hass):
     assert group_state.attributes[group.ATTR_AUTO]
     assert group_state.attributes['friendly_name'] == "Test"
 
-    group.async_set_group(
+    common.async_set_group(
         hass, 'user_test_group', view=True, visible=False,
         entity_ids=['test.entity_bla1'])
     yield from hass.async_block_till_done()
@@ -463,7 +463,7 @@ def test_service_group_set_group_remove_group(hass):
     assert group_state.attributes['friendly_name'] == "Test"
     assert list(group_state.attributes['entity_id']) == ['test.entity_bla1']
 
-    group.async_set_group(
+    common.async_set_group(
         hass, 'user_test_group', icon="mdi:camera", name="Test2",
         control="hidden", add=['test.entity_id2'])
     yield from hass.async_block_till_done()
@@ -479,7 +479,7 @@ def test_service_group_set_group_remove_group(hass):
     assert sorted(list(group_state.attributes['entity_id'])) == sorted([
         'test.entity_bla1', 'test.entity_id2'])
 
-    group.async_remove(hass, 'user_test_group')
+    common.async_remove(hass, 'user_test_group')
     yield from hass.async_block_till_done()
 
     group_state = hass.states.get('group.user_test_group')

From 9abdbf3db62ac07cf718910179f6741e1ee228b4 Mon Sep 17 00:00:00 2001
From: Greg Laabs <OverloadUT@gmail.com>
Date: Thu, 27 Sep 2018 14:17:15 -0700
Subject: [PATCH 341/357] Rachio component modernization (#16911)

Add `unique_id` to all rachio entities
Add platform discovery to rachio component
Move config options from switch.rachio platform to the rachio component
---
 .../components/binary_sensor/rachio.py        |  5 ++++
 homeassistant/components/rachio.py            | 20 +++++++++++--
 homeassistant/components/switch/rachio.py     | 30 ++++++++++---------
 3 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/homeassistant/components/binary_sensor/rachio.py b/homeassistant/components/binary_sensor/rachio.py
index 798b6a754d1..36a32c79c5c 100644
--- a/homeassistant/components/binary_sensor/rachio.py
+++ b/homeassistant/components/binary_sensor/rachio.py
@@ -92,6 +92,11 @@ class RachioControllerOnlineBinarySensor(RachioControllerBinarySensor):
         """Return the name of this sensor including the controller name."""
         return "{} online".format(self._controller.name)
 
+    @property
+    def unique_id(self) -> str:
+        """Return a unique id for this entity."""
+        return "{}-online".format(self._controller.controller_id)
+
     @property
     def device_class(self) -> str:
         """Return the class of this device, from component DEVICE_CLASSES."""
diff --git a/homeassistant/components/rachio.py b/homeassistant/components/rachio.py
index cd80b7bec9b..27827da0182 100644
--- a/homeassistant/components/rachio.py
+++ b/homeassistant/components/rachio.py
@@ -13,7 +13,7 @@ import voluptuous as vol
 from homeassistant.auth.util import generate_secret
 from homeassistant.components.http import HomeAssistantView
 from homeassistant.const import CONF_API_KEY, EVENT_HOMEASSISTANT_STOP, URL_API
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import discovery, config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 
 REQUIREMENTS = ['rachiopy==0.1.3']
@@ -22,11 +22,19 @@ _LOGGER = logging.getLogger(__name__)
 
 DOMAIN = 'rachio'
 
+SUPPORTED_DOMAINS = ['switch', 'binary_sensor']
+
+# Manual run length
+CONF_MANUAL_RUN_MINS = 'manual_run_mins'
+DEFAULT_MANUAL_RUN_MINS = 10
 CONF_CUSTOM_URL = 'hass_url_override'
+
 CONFIG_SCHEMA = vol.Schema({
     DOMAIN: vol.Schema({
         vol.Required(CONF_API_KEY): cv.string,
         vol.Optional(CONF_CUSTOM_URL): cv.string,
+        vol.Optional(CONF_MANUAL_RUN_MINS, default=DEFAULT_MANUAL_RUN_MINS):
+            cv.positive_int,
     })
 }, extra=vol.ALLOW_EXTRA)
 
@@ -112,7 +120,7 @@ def setup(hass, config) -> bool:
 
     # Get the API user
     try:
-        person = RachioPerson(hass, rachio)
+        person = RachioPerson(hass, rachio, config[DOMAIN])
     except AssertionError as error:
         _LOGGER.error("Could not reach the Rachio API: %s", error)
         return False
@@ -126,17 +134,23 @@ def setup(hass, config) -> bool:
 
     # Enable component
     hass.data[DOMAIN] = person
+
+    # Load platforms
+    for component in SUPPORTED_DOMAINS:
+        discovery.load_platform(hass, component, DOMAIN, {}, config)
+
     return True
 
 
 class RachioPerson:
     """Represent a Rachio user."""
 
-    def __init__(self, hass, rachio):
+    def __init__(self, hass, rachio, config):
         """Create an object from the provided API instance."""
         # Use API token to get user ID
         self._hass = hass
         self.rachio = rachio
+        self.config = config
 
         response = rachio.person.getInfo()
         assert int(response[0][KEY_STATUS]) == 200, "API key error"
diff --git a/homeassistant/components/switch/rachio.py b/homeassistant/components/switch/rachio.py
index 956befeeb9f..4797aae9a8c 100644
--- a/homeassistant/components/switch/rachio.py
+++ b/homeassistant/components/switch/rachio.py
@@ -7,10 +7,10 @@ https://home-assistant.io/components/switch.rachio/
 from abc import abstractmethod
 from datetime import timedelta
 import logging
-import voluptuous as vol
 
-from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchDevice
-from homeassistant.components.rachio import (DOMAIN as DOMAIN_RACHIO,
+from homeassistant.components.switch import SwitchDevice
+from homeassistant.components.rachio import (CONF_MANUAL_RUN_MINS,
+                                             DOMAIN as DOMAIN_RACHIO,
                                              KEY_DEVICE_ID,
                                              KEY_ENABLED,
                                              KEY_ID,
@@ -27,29 +27,20 @@ from homeassistant.components.rachio import (DOMAIN as DOMAIN_RACHIO,
                                              SUBTYPE_ZONE_COMPLETED,
                                              SUBTYPE_SLEEP_MODE_ON,
                                              SUBTYPE_SLEEP_MODE_OFF)
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.dispatcher import dispatcher_connect
 
 DEPENDENCIES = ['rachio']
 
 _LOGGER = logging.getLogger(__name__)
 
-# Manual run length
-CONF_MANUAL_RUN_MINS = 'manual_run_mins'
-DEFAULT_MANUAL_RUN_MINS = 10
-
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Optional(CONF_MANUAL_RUN_MINS, default=DEFAULT_MANUAL_RUN_MINS):
-        cv.positive_int,
-})
-
 ATTR_ZONE_SUMMARY = 'Summary'
 ATTR_ZONE_NUMBER = 'Zone number'
 
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Rachio switches."""
-    manual_run_time = timedelta(minutes=config.get(CONF_MANUAL_RUN_MINS))
+    manual_run_time = timedelta(minutes=hass.data[DOMAIN_RACHIO].config.get(
+        CONF_MANUAL_RUN_MINS))
     _LOGGER.info("Rachio run time is %s", str(manual_run_time))
 
     # Add all zones from all controllers as switches
@@ -126,6 +117,11 @@ class RachioStandbySwitch(RachioSwitch):
         """Return the name of the standby switch."""
         return "{} in standby mode".format(self._controller.name)
 
+    @property
+    def unique_id(self) -> str:
+        """Return a unique id by combinining controller id and purpose."""
+        return "{}-standby".format(self._controller.controller_id)
+
     @property
     def icon(self) -> str:
         """Return an icon for the standby switch."""
@@ -189,6 +185,12 @@ class RachioZone(RachioSwitch):
         """Return the friendly name of the zone."""
         return self._zone_name
 
+    @property
+    def unique_id(self) -> str:
+        """Return a unique id by combinining controller id and zone number."""
+        return "{}-zone-{}".format(self._controller.controller_id,
+                                   self.zone_id)
+
     @property
     def icon(self) -> str:
         """Return the icon to display."""

From c9b65672654dbdc57971b878feaec68ce86e9177 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Fri, 28 Sep 2018 00:25:51 +0200
Subject: [PATCH 342/357] Remove discovered mqtt_json light entity when
 discovery is cleared (#16906)

* Remove discovered mqtt_json entity device when discovery topic is cleared

* Keep imports ordered
---
 homeassistant/components/light/mqtt_json.py | 49 +++++++++++++--------
 tests/components/light/test_mqtt_json.py    | 25 ++++++++++-
 2 files changed, 54 insertions(+), 20 deletions(-)

diff --git a/homeassistant/components/light/mqtt_json.py b/homeassistant/components/light/mqtt_json.py
index ed4d350d96d..1ed43a6385a 100644
--- a/homeassistant/components/light/mqtt_json.py
+++ b/homeassistant/components/light/mqtt_json.py
@@ -4,29 +4,31 @@ Support for MQTT JSON lights.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/light.mqtt_json/
 """
-import logging
 import json
+import logging
+from typing import Optional
+
 import voluptuous as vol
 
-from homeassistant.core import callback
 from homeassistant.components import mqtt
 from homeassistant.components.light import (
-    ATTR_BRIGHTNESS, ATTR_COLOR_TEMP, ATTR_EFFECT, ATTR_FLASH,
-    ATTR_TRANSITION, ATTR_WHITE_VALUE, ATTR_HS_COLOR,
-    FLASH_LONG, FLASH_SHORT, Light, PLATFORM_SCHEMA, SUPPORT_BRIGHTNESS,
-    SUPPORT_COLOR_TEMP, SUPPORT_EFFECT, SUPPORT_FLASH, SUPPORT_COLOR,
-    SUPPORT_TRANSITION, SUPPORT_WHITE_VALUE)
+    ATTR_BRIGHTNESS, ATTR_COLOR_TEMP, ATTR_EFFECT, ATTR_FLASH, ATTR_HS_COLOR,
+    ATTR_TRANSITION, ATTR_WHITE_VALUE, FLASH_LONG, FLASH_SHORT,
+    PLATFORM_SCHEMA, SUPPORT_BRIGHTNESS, SUPPORT_COLOR, SUPPORT_COLOR_TEMP,
+    SUPPORT_EFFECT, SUPPORT_FLASH, SUPPORT_TRANSITION, SUPPORT_WHITE_VALUE,
+    Light)
 from homeassistant.components.light.mqtt import CONF_BRIGHTNESS_SCALE
-from homeassistant.const import (
-    CONF_BRIGHTNESS, CONF_COLOR_TEMP, CONF_EFFECT, STATE_ON,
-    CONF_NAME, CONF_OPTIMISTIC, CONF_RGB, CONF_WHITE_VALUE, CONF_XY)
 from homeassistant.components.mqtt import (
-    CONF_AVAILABILITY_TOPIC, CONF_STATE_TOPIC, CONF_COMMAND_TOPIC,
+    ATTR_DISCOVERY_HASH, CONF_AVAILABILITY_TOPIC, CONF_COMMAND_TOPIC,
     CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE, CONF_QOS, CONF_RETAIN,
-    MqttAvailability)
+    CONF_STATE_TOPIC, MqttAvailability, MqttDiscoveryUpdate)
+from homeassistant.const import (
+    CONF_BRIGHTNESS, CONF_COLOR_TEMP, CONF_EFFECT, CONF_NAME, CONF_OPTIMISTIC,
+    CONF_RGB, CONF_WHITE_VALUE, CONF_XY, STATE_ON)
+from homeassistant.core import callback
 import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.typing import HomeAssistantType, ConfigType
 from homeassistant.helpers.restore_state import async_get_last_state
+from homeassistant.helpers.typing import ConfigType, HomeAssistantType
 import homeassistant.util.color as color_util
 
 _LOGGER = logging.getLogger(__name__)
@@ -87,6 +89,11 @@ async def async_setup_platform(hass: HomeAssistantType, config: ConfigType,
     """Set up a MQTT JSON Light."""
     if discovery_info is not None:
         config = PLATFORM_SCHEMA(discovery_info)
+
+    discovery_hash = None
+    if discovery_info is not None and ATTR_DISCOVERY_HASH in discovery_info:
+        discovery_hash = discovery_info[ATTR_DISCOVERY_HASH]
+
     async_add_entities([MqttJson(
         config.get(CONF_NAME),
         config.get(CONF_UNIQUE_ID),
@@ -116,20 +123,23 @@ async def async_setup_platform(hass: HomeAssistantType, config: ConfigType,
         config.get(CONF_AVAILABILITY_TOPIC),
         config.get(CONF_PAYLOAD_AVAILABLE),
         config.get(CONF_PAYLOAD_NOT_AVAILABLE),
-        config.get(CONF_BRIGHTNESS_SCALE)
+        config.get(CONF_BRIGHTNESS_SCALE),
+        discovery_hash,
     )])
 
 
-class MqttJson(MqttAvailability, Light):
+class MqttJson(MqttAvailability, MqttDiscoveryUpdate, Light):
     """Representation of a MQTT JSON light."""
 
     def __init__(self, name, unique_id, effect_list, topic, qos, retain,
                  optimistic, brightness, color_temp, effect, rgb, white_value,
                  xy, hs, flash_times, availability_topic, payload_available,
-                 payload_not_available, brightness_scale):
+                 payload_not_available, brightness_scale,
+                 discovery_hash: Optional[str]):
         """Initialize MQTT JSON light."""
-        super().__init__(availability_topic, qos, payload_available,
-                         payload_not_available)
+        MqttAvailability.__init__(self, availability_topic, qos,
+                                  payload_available, payload_not_available)
+        MqttDiscoveryUpdate.__init__(self, discovery_hash)
         self._name = name
         self._unique_id = unique_id
         self._effect_list = effect_list
@@ -180,7 +190,8 @@ class MqttJson(MqttAvailability, Light):
 
     async def async_added_to_hass(self):
         """Subscribe to MQTT events."""
-        await super().async_added_to_hass()
+        await MqttAvailability.async_added_to_hass(self)
+        await MqttDiscoveryUpdate.async_added_to_hass(self)
 
         last_state = await async_get_last_state(self.hass, self.entity_id)
 
diff --git a/tests/components/light/test_mqtt_json.py b/tests/components/light/test_mqtt_json.py
index dbae4c53bfc..46db2f61fb3 100644
--- a/tests/components/light/test_mqtt_json.py
+++ b/tests/components/light/test_mqtt_json.py
@@ -97,11 +97,12 @@ from homeassistant.const import (
     STATE_ON, STATE_OFF, STATE_UNAVAILABLE, ATTR_ASSUMED_STATE,
     ATTR_SUPPORTED_FEATURES)
 import homeassistant.components.light as light
+from homeassistant.components.mqtt.discovery import async_start
 import homeassistant.core as ha
 
 from tests.common import (
     get_test_home_assistant, mock_mqtt_component, fire_mqtt_message,
-    assert_setup_component, mock_coro)
+    assert_setup_component, mock_coro, async_fire_mqtt_message)
 from tests.components.light import common
 
 
@@ -669,3 +670,25 @@ class TestLightMQTTJSON(unittest.TestCase):
 
         state = self.hass.states.get('light.test')
         self.assertEqual(STATE_UNAVAILABLE, state.state)
+
+
+async def test_discovery_removal(hass, mqtt_mock, caplog):
+    """Test removal of discovered mqtt_json lights."""
+    await async_start(hass, 'homeassistant', {})
+    data = (
+        '{ "name": "Beer",'
+        '  "platform": "mqtt_json",'
+        '  "command_topic": "test_topic" }'
+    )
+    async_fire_mqtt_message(hass, 'homeassistant/light/bla/config',
+                            data)
+    await hass.async_block_till_done()
+    state = hass.states.get('light.beer')
+    assert state is not None
+    assert state.name == 'Beer'
+    async_fire_mqtt_message(hass, 'homeassistant/light/bla/config',
+                            '')
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+    state = hass.states.get('light.beer')
+    assert state is None

From 720b05c301f1a22128839b71e8589b26623c33a1 Mon Sep 17 00:00:00 2001
From: Anders Melchiorsen <amelchio@nogoto.net>
Date: Fri, 28 Sep 2018 06:08:09 +0200
Subject: [PATCH 343/357] Fix race between script delay and turn_off (#16923)

---
 homeassistant/helpers/script.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/helpers/script.py b/homeassistant/helpers/script.py
index 96f9b2d5069..ac53a3e32a2 100644
--- a/homeassistant/helpers/script.py
+++ b/homeassistant/helpers/script.py
@@ -95,7 +95,7 @@ class Script():
                 def async_script_delay(now):
                     """Handle delay."""
                     # pylint: disable=cell-var-from-loop
-                    self._async_listener.remove(unsub)
+                    self._async_remove_listener()
                     self.hass.async_create_task(
                         self.async_run(variables, context))
 
@@ -240,7 +240,7 @@ class Script():
         @callback
         def async_script_timeout(now):
             """Call after timeout is retrieve."""
-            self._async_listener.remove(unsub)
+            self._async_remove_listener()
 
             # Check if we want to continue to execute
             # the script after the timeout

From af89e7c50f65afb233341525eb81d6dcc6ba599f Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Fri, 28 Sep 2018 16:57:17 +0200
Subject: [PATCH 344/357] Move more MQTT platforms to config entries (#16918)

* Move more MQTT platforms to config entries

* Address comments
---
 .../components/alarm_control_panel/mqtt.py    | 34 ++++++++++++-----
 .../components/binary_sensor/mqtt.py          | 36 ++++++++++++------
 homeassistant/components/camera/mqtt.py       | 30 +++++++++++----
 homeassistant/components/climate/mqtt.py      | 36 ++++++++++++------
 homeassistant/components/cover/mqtt.py        | 37 +++++++++++++------
 homeassistant/components/light/mqtt.py        | 35 +++++++++++++-----
 homeassistant/components/mqtt/discovery.py    |  7 ++++
 homeassistant/components/sensor/mqtt.py       | 21 ++++-------
 homeassistant/components/switch/mqtt.py       | 36 +++++++++++++-----
 .../alarm_control_panel/test_mqtt.py          |  7 ++--
 tests/components/binary_sensor/test_mqtt.py   |  8 ++--
 tests/components/climate/test_mqtt.py         |  7 ++--
 tests/components/cover/test_mqtt.py           |  7 ++--
 tests/components/light/test_mqtt.py           |  7 ++--
 tests/components/switch/test_mqtt.py          |  7 ++--
 15 files changed, 214 insertions(+), 101 deletions(-)

diff --git a/homeassistant/components/alarm_control_panel/mqtt.py b/homeassistant/components/alarm_control_panel/mqtt.py
index e36765b2460..d8193f958da 100644
--- a/homeassistant/components/alarm_control_panel/mqtt.py
+++ b/homeassistant/components/alarm_control_panel/mqtt.py
@@ -21,7 +21,10 @@ from homeassistant.components.mqtt import (
     ATTR_DISCOVERY_HASH, CONF_AVAILABILITY_TOPIC, CONF_STATE_TOPIC,
     CONF_COMMAND_TOPIC, CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE,
     CONF_QOS, CONF_RETAIN, MqttAvailability, MqttDiscoveryUpdate)
+from homeassistant.components.mqtt.discovery import MQTT_DISCOVERY_NEW
 import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
+from homeassistant.helpers.typing import HomeAssistantType, ConfigType
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -46,17 +49,28 @@ PLATFORM_SCHEMA = mqtt.MQTT_BASE_PLATFORM_SCHEMA.extend({
 }).extend(mqtt.MQTT_AVAILABILITY_SCHEMA.schema)
 
 
-@asyncio.coroutine
-def async_setup_platform(hass, config, async_add_entities,
-                         discovery_info=None):
+async def async_setup_platform(hass: HomeAssistantType, config: ConfigType,
+                               async_add_entities, discovery_info=None):
+    """Set up MQTT alarm control panel through configuration.yaml."""
+    await _async_setup_entity(hass, config, async_add_entities)
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up MQTT alarm control panel dynamically through MQTT discovery."""
+    async def async_discover(discovery_payload):
+        """Discover and add an MQTT alarm control panel."""
+        config = PLATFORM_SCHEMA(discovery_payload)
+        await _async_setup_entity(hass, config, async_add_entities,
+                                  discovery_payload[ATTR_DISCOVERY_HASH])
+
+    async_dispatcher_connect(
+        hass, MQTT_DISCOVERY_NEW.format(alarm.DOMAIN, 'mqtt'),
+        async_discover)
+
+
+async def _async_setup_entity(hass, config, async_add_entities,
+                              discovery_hash=None):
     """Set up the MQTT Alarm Control Panel platform."""
-    if discovery_info is not None:
-        config = PLATFORM_SCHEMA(discovery_info)
-
-    discovery_hash = None
-    if discovery_info is not None and ATTR_DISCOVERY_HASH in discovery_info:
-        discovery_hash = discovery_info[ATTR_DISCOVERY_HASH]
-
     async_add_entities([MqttAlarm(
         config.get(CONF_NAME),
         config.get(CONF_STATE_TOPIC),
diff --git a/homeassistant/components/binary_sensor/mqtt.py b/homeassistant/components/binary_sensor/mqtt.py
index ca2ff2074c3..944cea96b33 100644
--- a/homeassistant/components/binary_sensor/mqtt.py
+++ b/homeassistant/components/binary_sensor/mqtt.py
@@ -11,7 +11,7 @@ from typing import Optional
 import voluptuous as vol
 
 from homeassistant.core import callback
-from homeassistant.components import mqtt
+from homeassistant.components import mqtt, binary_sensor
 from homeassistant.components.binary_sensor import (
     BinarySensorDevice, DEVICE_CLASSES_SCHEMA)
 from homeassistant.const import (
@@ -21,7 +21,10 @@ from homeassistant.components.mqtt import (
     ATTR_DISCOVERY_HASH, CONF_STATE_TOPIC, CONF_AVAILABILITY_TOPIC,
     CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE, CONF_QOS,
     MqttAvailability, MqttDiscoveryUpdate)
+from homeassistant.components.mqtt.discovery import MQTT_DISCOVERY_NEW
 import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
+from homeassistant.helpers.typing import HomeAssistantType, ConfigType
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -45,21 +48,32 @@ PLATFORM_SCHEMA = mqtt.MQTT_RO_PLATFORM_SCHEMA.extend({
 }).extend(mqtt.MQTT_AVAILABILITY_SCHEMA.schema)
 
 
-@asyncio.coroutine
-def async_setup_platform(hass, config, async_add_entities,
-                         discovery_info=None):
-    """Set up the MQTT binary sensor."""
-    if discovery_info is not None:
-        config = PLATFORM_SCHEMA(discovery_info)
+async def async_setup_platform(hass: HomeAssistantType, config: ConfigType,
+                               async_add_entities, discovery_info=None):
+    """Set up MQTT binary sensor through configuration.yaml."""
+    await _async_setup_entity(hass, config, async_add_entities)
 
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up MQTT binary sensor dynamically through MQTT discovery."""
+    async def async_discover(discovery_payload):
+        """Discover and add a MQTT binary sensor."""
+        config = PLATFORM_SCHEMA(discovery_payload)
+        await _async_setup_entity(hass, config, async_add_entities,
+                                  discovery_payload[ATTR_DISCOVERY_HASH])
+
+    async_dispatcher_connect(
+        hass, MQTT_DISCOVERY_NEW.format(binary_sensor.DOMAIN, 'mqtt'),
+        async_discover)
+
+
+async def _async_setup_entity(hass, config, async_add_entities,
+                              discovery_hash=None):
+    """Set up the MQTT binary sensor."""
     value_template = config.get(CONF_VALUE_TEMPLATE)
     if value_template is not None:
         value_template.hass = hass
 
-    discovery_hash = None
-    if discovery_info is not None and ATTR_DISCOVERY_HASH in discovery_info:
-        discovery_hash = discovery_info[ATTR_DISCOVERY_HASH]
-
     async_add_entities([MqttBinarySensor(
         config.get(CONF_NAME),
         config.get(CONF_STATE_TOPIC),
diff --git a/homeassistant/components/camera/mqtt.py b/homeassistant/components/camera/mqtt.py
index 13c1745615d..42ad7d6fa66 100644
--- a/homeassistant/components/camera/mqtt.py
+++ b/homeassistant/components/camera/mqtt.py
@@ -10,10 +10,13 @@ import logging
 
 import voluptuous as vol
 
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
+from homeassistant.helpers.typing import HomeAssistantType, ConfigType
 from homeassistant.core import callback
-from homeassistant.components import mqtt
 from homeassistant.const import CONF_NAME
+from homeassistant.components import mqtt, camera
 from homeassistant.components.camera import Camera, PLATFORM_SCHEMA
+from homeassistant.components.mqtt.discovery import MQTT_DISCOVERY_NEW
 from homeassistant.helpers import config_validation as cv
 
 _LOGGER = logging.getLogger(__name__)
@@ -31,13 +34,26 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-@asyncio.coroutine
-def async_setup_platform(hass, config, async_add_entities,
-                         discovery_info=None):
-    """Set up the MQTT Camera."""
-    if discovery_info is not None:
-        config = PLATFORM_SCHEMA(discovery_info)
+async def async_setup_platform(hass: HomeAssistantType, config: ConfigType,
+                               async_add_entities, discovery_info=None):
+    """Set up MQTT camera through configuration.yaml."""
+    await _async_setup_entity(hass, config, async_add_entities)
 
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up MQTT camera dynamically through MQTT discovery."""
+    async def async_discover(discovery_payload):
+        """Discover and add a MQTT camera."""
+        config = PLATFORM_SCHEMA(discovery_payload)
+        await _async_setup_entity(hass, config, async_add_entities)
+
+    async_dispatcher_connect(
+        hass, MQTT_DISCOVERY_NEW.format(camera.DOMAIN, 'mqtt'),
+        async_discover)
+
+
+async def _async_setup_entity(hass, config, async_add_entities):
+    """Set up the MQTT Camera."""
     async_add_entities([MqttCamera(
         config.get(CONF_NAME),
         config.get(CONF_UNIQUE_ID),
diff --git a/homeassistant/components/climate/mqtt.py b/homeassistant/components/climate/mqtt.py
index 66f76ac1aaa..23def7c4b87 100644
--- a/homeassistant/components/climate/mqtt.py
+++ b/homeassistant/components/climate/mqtt.py
@@ -10,7 +10,7 @@ import logging
 import voluptuous as vol
 
 from homeassistant.core import callback
-from homeassistant.components import mqtt
+from homeassistant.components import mqtt, climate
 
 from homeassistant.components.climate import (
     STATE_HEAT, STATE_COOL, STATE_DRY, STATE_FAN_ONLY, ClimateDevice,
@@ -24,7 +24,10 @@ from homeassistant.components.mqtt import (
     ATTR_DISCOVERY_HASH, CONF_AVAILABILITY_TOPIC, CONF_QOS, CONF_RETAIN,
     CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE,
     MQTT_BASE_PLATFORM_SCHEMA, MqttAvailability, MqttDiscoveryUpdate)
+from homeassistant.components.mqtt.discovery import MQTT_DISCOVERY_NEW
 import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
+from homeassistant.helpers.typing import HomeAssistantType, ConfigType
 from homeassistant.components.fan import (SPEED_LOW, SPEED_MEDIUM,
                                           SPEED_HIGH)
 
@@ -127,13 +130,28 @@ PLATFORM_SCHEMA = SCHEMA_BASE.extend({
 }).extend(mqtt.MQTT_AVAILABILITY_SCHEMA.schema)
 
 
-@asyncio.coroutine
-def async_setup_platform(hass, config, async_add_entities,
-                         discovery_info=None):
-    """Set up the MQTT climate devices."""
-    if discovery_info is not None:
-        config = PLATFORM_SCHEMA(discovery_info)
+async def async_setup_platform(hass: HomeAssistantType, config: ConfigType,
+                               async_add_entities, discovery_info=None):
+    """Set up MQTT climate device through configuration.yaml."""
+    await _async_setup_entity(hass, config, async_add_entities)
 
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up MQTT climate device dynamically through MQTT discovery."""
+    async def async_discover(discovery_payload):
+        """Discover and add a MQTT climate device."""
+        config = PLATFORM_SCHEMA(discovery_payload)
+        await _async_setup_entity(hass, config, async_add_entities,
+                                  discovery_payload[ATTR_DISCOVERY_HASH])
+
+    async_dispatcher_connect(
+        hass, MQTT_DISCOVERY_NEW.format(climate.DOMAIN, 'mqtt'),
+        async_discover)
+
+
+async def _async_setup_entity(hass, config, async_add_entities,
+                              discovery_hash=None):
+    """Set up the MQTT climate devices."""
     template_keys = (
         CONF_POWER_STATE_TEMPLATE,
         CONF_MODE_STATE_TEMPLATE,
@@ -154,10 +172,6 @@ def async_setup_platform(hass, config, async_add_entities,
         value_templates[key] = config.get(key)
         value_templates[key].hass = hass
 
-    discovery_hash = None
-    if discovery_info is not None and ATTR_DISCOVERY_HASH in discovery_info:
-        discovery_hash = discovery_info[ATTR_DISCOVERY_HASH]
-
     async_add_entities([
         MqttClimate(
             hass,
diff --git a/homeassistant/components/cover/mqtt.py b/homeassistant/components/cover/mqtt.py
index ae1162f7120..a239f4cd4f8 100644
--- a/homeassistant/components/cover/mqtt.py
+++ b/homeassistant/components/cover/mqtt.py
@@ -9,7 +9,7 @@ import logging
 import voluptuous as vol
 
 from homeassistant.core import callback
-from homeassistant.components import mqtt
+from homeassistant.components import mqtt, cover
 from homeassistant.components.cover import (
     CoverDevice, ATTR_TILT_POSITION, SUPPORT_OPEN_TILT,
     SUPPORT_CLOSE_TILT, SUPPORT_STOP_TILT, SUPPORT_SET_TILT_POSITION,
@@ -24,7 +24,10 @@ from homeassistant.components.mqtt import (
     CONF_COMMAND_TOPIC, CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE,
     CONF_QOS, CONF_RETAIN, valid_publish_topic, valid_subscribe_topic,
     MqttAvailability, MqttDiscoveryUpdate)
+from homeassistant.components.mqtt.discovery import MQTT_DISCOVERY_NEW
 import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
+from homeassistant.helpers.typing import HomeAssistantType, ConfigType
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -93,12 +96,28 @@ PLATFORM_SCHEMA = mqtt.MQTT_BASE_PLATFORM_SCHEMA.extend({
 }).extend(mqtt.MQTT_AVAILABILITY_SCHEMA.schema)
 
 
-async def async_setup_platform(hass, config, async_add_entities,
-                               discovery_info=None):
-    """Set up the MQTT Cover."""
-    if discovery_info is not None:
-        config = PLATFORM_SCHEMA(discovery_info)
+async def async_setup_platform(hass: HomeAssistantType, config: ConfigType,
+                               async_add_entities, discovery_info=None):
+    """Set up MQTT cover through configuration.yaml."""
+    await _async_setup_entity(hass, config, async_add_entities)
 
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up MQTT cover dynamically through MQTT discovery."""
+    async def async_discover(discovery_payload):
+        """Discover and add an MQTT cover."""
+        config = PLATFORM_SCHEMA(discovery_payload)
+        await _async_setup_entity(hass, config, async_add_entities,
+                                  discovery_payload[ATTR_DISCOVERY_HASH])
+
+    async_dispatcher_connect(
+        hass, MQTT_DISCOVERY_NEW.format(cover.DOMAIN, 'mqtt'),
+        async_discover)
+
+
+async def _async_setup_entity(hass, config, async_add_entities,
+                              discovery_hash=None):
+    """Set up the MQTT Cover."""
     value_template = config.get(CONF_VALUE_TEMPLATE)
     if value_template is not None:
         value_template.hass = hass
@@ -106,10 +125,6 @@ async def async_setup_platform(hass, config, async_add_entities,
     if set_position_template is not None:
         set_position_template.hass = hass
 
-    discovery_hash = None
-    if discovery_info is not None and ATTR_DISCOVERY_HASH in discovery_info:
-        discovery_hash = discovery_info[ATTR_DISCOVERY_HASH]
-
     async_add_entities([MqttCover(
         config.get(CONF_NAME),
         config.get(CONF_STATE_TOPIC),
@@ -136,7 +151,7 @@ async def async_setup_platform(hass, config, async_add_entities,
         config.get(CONF_TILT_INVERT_STATE),
         config.get(CONF_POSITION_TOPIC),
         set_position_template,
-        discovery_hash,
+        discovery_hash
     )])
 
 
diff --git a/homeassistant/components/light/mqtt.py b/homeassistant/components/light/mqtt.py
index 8bd50700c53..3b095aa4bfd 100644
--- a/homeassistant/components/light/mqtt.py
+++ b/homeassistant/components/light/mqtt.py
@@ -9,7 +9,7 @@ import logging
 import voluptuous as vol
 
 from homeassistant.core import callback
-from homeassistant.components import mqtt
+from homeassistant.components import mqtt, light
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS, ATTR_COLOR_TEMP, ATTR_EFFECT, ATTR_HS_COLOR,
     ATTR_WHITE_VALUE, Light, SUPPORT_BRIGHTNESS, SUPPORT_COLOR_TEMP,
@@ -22,7 +22,10 @@ from homeassistant.components.mqtt import (
     ATTR_DISCOVERY_HASH, CONF_AVAILABILITY_TOPIC, CONF_COMMAND_TOPIC,
     CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE, CONF_QOS, CONF_RETAIN,
     CONF_STATE_TOPIC, MqttAvailability, MqttDiscoveryUpdate)
+from homeassistant.components.mqtt.discovery import MQTT_DISCOVERY_NEW
 from homeassistant.helpers.restore_state import async_get_last_state
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
+from homeassistant.helpers.typing import HomeAssistantType, ConfigType
 import homeassistant.helpers.config_validation as cv
 import homeassistant.util.color as color_util
 
@@ -102,19 +105,31 @@ PLATFORM_SCHEMA = mqtt.MQTT_RW_PLATFORM_SCHEMA.extend({
 }).extend(mqtt.MQTT_AVAILABILITY_SCHEMA.schema)
 
 
-async def async_setup_platform(hass, config, async_add_entities,
-                               discovery_info=None):
-    """Set up a MQTT Light."""
-    if discovery_info is not None:
-        config = PLATFORM_SCHEMA(discovery_info)
+async def async_setup_platform(hass: HomeAssistantType, config: ConfigType,
+                               async_add_entities, discovery_info=None):
+    """Set up MQTT light through configuration.yaml."""
+    await _async_setup_entity(hass, config, async_add_entities)
 
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up MQTT light dynamically through MQTT discovery."""
+    async def async_discover(discovery_payload):
+        """Discover and add a MQTT light."""
+        config = PLATFORM_SCHEMA(discovery_payload)
+        await _async_setup_entity(hass, config, async_add_entities,
+                                  discovery_payload[ATTR_DISCOVERY_HASH])
+
+    async_dispatcher_connect(
+        hass, MQTT_DISCOVERY_NEW.format(light.DOMAIN, 'mqtt'),
+        async_discover)
+
+
+async def _async_setup_entity(hass, config, async_add_entities,
+                              discovery_hash=None):
+    """Set up a MQTT Light."""
     config.setdefault(
         CONF_STATE_VALUE_TEMPLATE, config.get(CONF_VALUE_TEMPLATE))
 
-    discovery_hash = None
-    if discovery_info is not None and ATTR_DISCOVERY_HASH in discovery_info:
-        discovery_hash = discovery_info[ATTR_DISCOVERY_HASH]
-
     async_add_entities([MqttLight(
         config.get(CONF_NAME),
         config.get(CONF_UNIQUE_ID),
diff --git a/homeassistant/components/mqtt/discovery.py b/homeassistant/components/mqtt/discovery.py
index d5ed5e25b47..6a0b8555ddb 100644
--- a/homeassistant/components/mqtt/discovery.py
+++ b/homeassistant/components/mqtt/discovery.py
@@ -40,7 +40,14 @@ ALLOWED_PLATFORMS = {
 }
 
 CONFIG_ENTRY_PLATFORMS = {
+    'binary_sensor': ['mqtt'],
+    'camera': ['mqtt'],
+    'cover': ['mqtt'],
+    'light': ['mqtt'],
     'sensor': ['mqtt'],
+    'switch': ['mqtt'],
+    'climate': ['mqtt'],
+    'alarm_control_panel': ['mqtt'],
 }
 
 ALREADY_DISCOVERED = 'mqtt_discovered_components'
diff --git a/homeassistant/components/sensor/mqtt.py b/homeassistant/components/sensor/mqtt.py
index 2d15fca755b..fe0b77b2024 100644
--- a/homeassistant/components/sensor/mqtt.py
+++ b/homeassistant/components/sensor/mqtt.py
@@ -57,34 +57,29 @@ PLATFORM_SCHEMA = mqtt.MQTT_RO_PLATFORM_SCHEMA.extend({
 async def async_setup_platform(hass: HomeAssistantType, config: ConfigType,
                                async_add_entities, discovery_info=None):
     """Set up MQTT sensors through configuration.yaml."""
-    await _async_setup_platform(hass, config, async_add_entities,
-                                discovery_info)
+    await _async_setup_entity(hass, config, async_add_entities)
 
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up MQTT sensors dynamically through MQTT discovery."""
-    async def async_discover_sensor(config):
+    async def async_discover_sensor(discovery_payload):
         """Discover and add a discovered MQTT sensor."""
-        await _async_setup_platform(hass, {}, async_add_entities, config)
+        config = PLATFORM_SCHEMA(discovery_payload)
+        await _async_setup_entity(hass, config, async_add_entities,
+                                  discovery_payload[ATTR_DISCOVERY_HASH])
 
     async_dispatcher_connect(hass,
                              MQTT_DISCOVERY_NEW.format(sensor.DOMAIN, 'mqtt'),
                              async_discover_sensor)
 
 
-async def _async_setup_platform(hass: HomeAssistantType, config: ConfigType,
-                                async_add_entities, discovery_info=None):
-    if discovery_info is not None:
-        config = PLATFORM_SCHEMA(discovery_info)
-
+async def _async_setup_entity(hass: HomeAssistantType, config: ConfigType,
+                              async_add_entities, discovery_hash=None):
+    """Set up MQTT sensor."""
     value_template = config.get(CONF_VALUE_TEMPLATE)
     if value_template is not None:
         value_template.hass = hass
 
-    discovery_hash = None
-    if discovery_info is not None and ATTR_DISCOVERY_HASH in discovery_info:
-        discovery_hash = discovery_info[ATTR_DISCOVERY_HASH]
-
     async_add_entities([MqttSensor(
         config.get(CONF_NAME),
         config.get(CONF_STATE_TOPIC),
diff --git a/homeassistant/components/switch/mqtt.py b/homeassistant/components/switch/mqtt.py
index b79f8f12b87..bb57f179340 100644
--- a/homeassistant/components/switch/mqtt.py
+++ b/homeassistant/components/switch/mqtt.py
@@ -15,12 +15,15 @@ from homeassistant.components.mqtt import (
     CONF_AVAILABILITY_TOPIC, CONF_PAYLOAD_AVAILABLE,
     CONF_PAYLOAD_NOT_AVAILABLE, CONF_QOS, CONF_RETAIN, MqttAvailability,
     MqttDiscoveryUpdate)
+from homeassistant.components.mqtt.discovery import MQTT_DISCOVERY_NEW
 from homeassistant.components.switch import SwitchDevice
 from homeassistant.const import (
     CONF_NAME, CONF_OPTIMISTIC, CONF_VALUE_TEMPLATE, CONF_PAYLOAD_OFF,
     CONF_PAYLOAD_ON, CONF_ICON, STATE_ON)
-from homeassistant.components import mqtt
+from homeassistant.components import mqtt, switch
 import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
+from homeassistant.helpers.typing import HomeAssistantType, ConfigType
 from homeassistant.helpers.restore_state import async_get_last_state
 
 _LOGGER = logging.getLogger(__name__)
@@ -47,20 +50,33 @@ PLATFORM_SCHEMA = mqtt.MQTT_RW_PLATFORM_SCHEMA.extend({
 }).extend(mqtt.MQTT_AVAILABILITY_SCHEMA.schema)
 
 
-async def async_setup_platform(hass, config, async_add_entities,
-                               discovery_info=None):
-    """Set up the MQTT switch."""
-    if discovery_info is not None:
-        config = PLATFORM_SCHEMA(discovery_info)
+async def async_setup_platform(hass: HomeAssistantType, config: ConfigType,
+                               async_add_entities, discovery_info=None):
+    """Set up MQTT switch through configuration.yaml."""
+    await _async_setup_entity(hass, config, async_add_entities,
+                              discovery_info)
 
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up MQTT switch dynamically through MQTT discovery."""
+    async def async_discover(discovery_payload):
+        """Discover and add a MQTT switch."""
+        config = PLATFORM_SCHEMA(discovery_payload)
+        await _async_setup_entity(hass, config, async_add_entities,
+                                  discovery_payload[ATTR_DISCOVERY_HASH])
+
+    async_dispatcher_connect(
+        hass, MQTT_DISCOVERY_NEW.format(switch.DOMAIN, 'mqtt'),
+        async_discover)
+
+
+async def _async_setup_entity(hass, config, async_add_entities,
+                              discovery_hash=None):
+    """Set up the MQTT switch."""
     value_template = config.get(CONF_VALUE_TEMPLATE)
     if value_template is not None:
         value_template.hass = hass
 
-    discovery_hash = None
-    if discovery_info is not None and ATTR_DISCOVERY_HASH in discovery_info:
-        discovery_hash = discovery_info[ATTR_DISCOVERY_HASH]
-
     newswitch = MqttSwitch(
         config.get(CONF_NAME),
         config.get(CONF_ICON),
diff --git a/tests/components/alarm_control_panel/test_mqtt.py b/tests/components/alarm_control_panel/test_mqtt.py
index b77767980a7..dd606bb53ec 100644
--- a/tests/components/alarm_control_panel/test_mqtt.py
+++ b/tests/components/alarm_control_panel/test_mqtt.py
@@ -6,12 +6,12 @@ from homeassistant.const import (
     STATE_ALARM_DISARMED, STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_AWAY,
     STATE_ALARM_PENDING, STATE_ALARM_TRIGGERED, STATE_UNAVAILABLE,
     STATE_UNKNOWN)
-from homeassistant.components import alarm_control_panel
+from homeassistant.components import alarm_control_panel, mqtt
 from homeassistant.components.mqtt.discovery import async_start
 
 from tests.common import (
     mock_mqtt_component, async_fire_mqtt_message, fire_mqtt_message,
-    get_test_home_assistant, assert_setup_component)
+    get_test_home_assistant, assert_setup_component, MockConfigEntry)
 from tests.components.alarm_control_panel import common
 
 CODE = 'HELLO_CODE'
@@ -245,7 +245,8 @@ class TestAlarmControlPanelMQTT(unittest.TestCase):
 
 async def test_discovery_removal_alarm(hass, mqtt_mock, caplog):
     """Test removal of discovered alarm_control_panel."""
-    await async_start(hass, 'homeassistant', {})
+    entry = MockConfigEntry(domain=mqtt.DOMAIN)
+    await async_start(hass, 'homeassistant', {}, entry)
 
     data = (
         '{ "name": "Beer",'
diff --git a/tests/components/binary_sensor/test_mqtt.py b/tests/components/binary_sensor/test_mqtt.py
index dfa01898ba4..84619ce4ee6 100644
--- a/tests/components/binary_sensor/test_mqtt.py
+++ b/tests/components/binary_sensor/test_mqtt.py
@@ -3,7 +3,7 @@ import unittest
 
 import homeassistant.core as ha
 from homeassistant.setup import setup_component, async_setup_component
-import homeassistant.components.binary_sensor as binary_sensor
+from homeassistant.components import binary_sensor, mqtt
 from homeassistant.components.mqtt.discovery import async_start
 
 from homeassistant.const import STATE_OFF, STATE_ON
@@ -11,7 +11,8 @@ from homeassistant.const import EVENT_STATE_CHANGED, STATE_UNAVAILABLE
 
 from tests.common import (
     get_test_home_assistant, fire_mqtt_message, async_fire_mqtt_message,
-    mock_component, mock_mqtt_component, async_mock_mqtt_component)
+    mock_component, mock_mqtt_component, async_mock_mqtt_component,
+    MockConfigEntry)
 
 
 class TestSensorMQTT(unittest.TestCase):
@@ -231,7 +232,8 @@ async def test_unique_id(hass):
 
 async def test_discovery_removal_binary_sensor(hass, mqtt_mock, caplog):
     """Test removal of discovered binary_sensor."""
-    await async_start(hass, 'homeassistant', {})
+    entry = MockConfigEntry(domain=mqtt.DOMAIN)
+    await async_start(hass, 'homeassistant', {}, entry)
     data = (
         '{ "name": "Beer",'
         '  "status_topic": "test_topic" }'
diff --git a/tests/components/climate/test_mqtt.py b/tests/components/climate/test_mqtt.py
index 1fdf72e34ba..c63dbf26690 100644
--- a/tests/components/climate/test_mqtt.py
+++ b/tests/components/climate/test_mqtt.py
@@ -6,7 +6,7 @@ from homeassistant.util.unit_system import (
     METRIC_SYSTEM
 )
 from homeassistant.setup import setup_component
-from homeassistant.components import climate
+from homeassistant.components import climate, mqtt
 from homeassistant.const import STATE_OFF, STATE_UNAVAILABLE
 from homeassistant.components.climate import (
     SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE,
@@ -15,7 +15,7 @@ from homeassistant.components.climate import (
 from homeassistant.components.mqtt.discovery import async_start
 from tests.common import (get_test_home_assistant, mock_mqtt_component,
                           async_fire_mqtt_message, fire_mqtt_message,
-                          mock_component)
+                          mock_component, MockConfigEntry)
 from tests.components.climate import common
 
 ENTITY_CLIMATE = 'climate.test'
@@ -656,7 +656,8 @@ class TestMQTTClimate(unittest.TestCase):
 
 async def test_discovery_removal_climate(hass, mqtt_mock, caplog):
     """Test removal of discovered climate."""
-    await async_start(hass, 'homeassistant', {})
+    entry = MockConfigEntry(domain=mqtt.DOMAIN)
+    await async_start(hass, 'homeassistant', {}, entry)
     data = (
         '{ "name": "Beer" }'
     )
diff --git a/tests/components/cover/test_mqtt.py b/tests/components/cover/test_mqtt.py
index f1d3da9be84..b41a047e3db 100644
--- a/tests/components/cover/test_mqtt.py
+++ b/tests/components/cover/test_mqtt.py
@@ -1,7 +1,7 @@
 """The tests for the MQTT cover platform."""
 import unittest
 
-import homeassistant.components.cover as cover
+from homeassistant.components import cover, mqtt
 from homeassistant.components.cover import (ATTR_POSITION, ATTR_TILT_POSITION)
 from homeassistant.components.cover.mqtt import MqttCover
 from homeassistant.components.mqtt.discovery import async_start
@@ -15,7 +15,7 @@ from homeassistant.setup import setup_component
 
 from tests.common import (
     get_test_home_assistant, mock_mqtt_component, async_fire_mqtt_message,
-    fire_mqtt_message)
+    fire_mqtt_message, MockConfigEntry)
 
 
 class TestCoverMQTT(unittest.TestCase):
@@ -761,7 +761,8 @@ class TestCoverMQTT(unittest.TestCase):
 
 async def test_discovery_removal_cover(hass, mqtt_mock, caplog):
     """Test removal of discovered cover."""
-    await async_start(hass, 'homeassistant', {})
+    entry = MockConfigEntry(domain=mqtt.DOMAIN)
+    await async_start(hass, 'homeassistant', {}, entry)
     data = (
         '{ "name": "Beer",'
         '  "command_topic": "test_topic" }'
diff --git a/tests/components/light/test_mqtt.py b/tests/components/light/test_mqtt.py
index b4c76b6b895..118cdb3c995 100644
--- a/tests/components/light/test_mqtt.py
+++ b/tests/components/light/test_mqtt.py
@@ -145,13 +145,13 @@ from unittest.mock import patch
 from homeassistant.setup import setup_component
 from homeassistant.const import (
     STATE_ON, STATE_OFF, STATE_UNAVAILABLE, ATTR_ASSUMED_STATE)
-import homeassistant.components.light as light
+from homeassistant.components import light, mqtt
 from homeassistant.components.mqtt.discovery import async_start
 import homeassistant.core as ha
 
 from tests.common import (
     assert_setup_component, get_test_home_assistant, mock_mqtt_component,
-    async_fire_mqtt_message, fire_mqtt_message, mock_coro)
+    async_fire_mqtt_message, fire_mqtt_message, mock_coro, MockConfigEntry)
 from tests.components.light import common
 
 
@@ -883,7 +883,8 @@ class TestLightMQTT(unittest.TestCase):
 
 async def test_discovery_removal_light(hass, mqtt_mock, caplog):
     """Test removal of discovered light."""
-    await async_start(hass, 'homeassistant', {})
+    entry = MockConfigEntry(domain=mqtt.DOMAIN)
+    await async_start(hass, 'homeassistant', {}, entry)
 
     data = (
         '{ "name": "Beer",'
diff --git a/tests/components/switch/test_mqtt.py b/tests/components/switch/test_mqtt.py
index ac113a05829..5ad233de284 100644
--- a/tests/components/switch/test_mqtt.py
+++ b/tests/components/switch/test_mqtt.py
@@ -6,12 +6,12 @@ from homeassistant.setup import setup_component, async_setup_component
 from homeassistant.const import STATE_ON, STATE_OFF, STATE_UNAVAILABLE,\
     ATTR_ASSUMED_STATE
 import homeassistant.core as ha
-import homeassistant.components.switch as switch
+from homeassistant.components import switch, mqtt
 from homeassistant.components.mqtt.discovery import async_start
 
 from tests.common import (
     mock_mqtt_component, fire_mqtt_message, get_test_home_assistant, mock_coro,
-    async_mock_mqtt_component, async_fire_mqtt_message)
+    async_mock_mqtt_component, async_fire_mqtt_message, MockConfigEntry)
 from tests.components.switch import common
 
 
@@ -313,7 +313,8 @@ async def test_unique_id(hass):
 
 async def test_discovery_removal_switch(hass, mqtt_mock, caplog):
     """Test expansion of discovered switch."""
-    await async_start(hass, 'homeassistant', {})
+    entry = MockConfigEntry(domain=mqtt.DOMAIN)
+    await async_start(hass, 'homeassistant', {}, entry)
 
     data = (
         '{ "name": "Beer",'

From 7d1960baba0c9d6d5bcd86aaecdd9129f84ba9fc Mon Sep 17 00:00:00 2001
From: Jan van Helvoort <janvanhelvoort@outlook.com>
Date: Fri, 28 Sep 2018 19:14:57 +0200
Subject: [PATCH 345/357] Add zwave.network_complete_some_dead event (#16894)

* Add zwave.network_complete_some_dead event

* add missing comma

* typo

* Add SIGNAL_AWAKE_NODES_QUERIED_SOME_DEAD Test

* Add blank lines

* fix linter warnings

Line too long

* remove trailing whitespace

* Change test signal

* Listen to other event
---
 homeassistant/components/zwave/__init__.py | 13 ++++++++++-
 homeassistant/components/zwave/const.py    |  1 +
 tests/components/zwave/test_init.py        | 27 ++++++++++++++++++++++
 tests/mock/zwave.py                        |  3 ++-
 4 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/zwave/__init__.py b/homeassistant/components/zwave/__init__.py
index 8de8c713f04..fa78f719557 100644
--- a/homeassistant/components/zwave/__init__.py
+++ b/homeassistant/components/zwave/__init__.py
@@ -275,7 +275,9 @@ async def async_setup(hass, config):
                                     ZWaveNetwork.SIGNAL_SCENE_EVENT,
                                     ZWaveNetwork.SIGNAL_NODE_EVENT,
                                     ZWaveNetwork.SIGNAL_AWAKE_NODES_QUERIED,
-                                    ZWaveNetwork.SIGNAL_ALL_NODES_QUERIED):
+                                    ZWaveNetwork.SIGNAL_ALL_NODES_QUERIED,
+                                    ZWaveNetwork
+                                    .SIGNAL_ALL_NODES_QUERIED_SOME_DEAD):
                 pprint(_obj_to_dict(value))
 
             print("")
@@ -356,6 +358,12 @@ async def async_setup(hass, config):
                      "have been queried")
         hass.bus.fire(const.EVENT_NETWORK_COMPLETE)
 
+    def network_complete_some_dead():
+        """Handle the querying of all nodes on network."""
+        _LOGGER.info("Z-Wave network is complete. All nodes on the network "
+                     "have been queried, but some node are marked dead")
+        hass.bus.fire(const.EVENT_NETWORK_COMPLETE_SOME_DEAD)
+
     dispatcher.connect(
         value_added, ZWaveNetwork.SIGNAL_VALUE_ADDED, weak=False)
     dispatcher.connect(
@@ -364,6 +372,9 @@ async def async_setup(hass, config):
         network_ready, ZWaveNetwork.SIGNAL_AWAKE_NODES_QUERIED, weak=False)
     dispatcher.connect(
         network_complete, ZWaveNetwork.SIGNAL_ALL_NODES_QUERIED, weak=False)
+    dispatcher.connect(
+        network_complete_some_dead,
+        ZWaveNetwork.SIGNAL_ALL_NODES_QUERIED_SOME_DEAD, weak=False)
 
     def add_node(service):
         """Switch into inclusion mode."""
diff --git a/homeassistant/components/zwave/const.py b/homeassistant/components/zwave/const.py
index 775da8fbc51..b84f0287349 100644
--- a/homeassistant/components/zwave/const.py
+++ b/homeassistant/components/zwave/const.py
@@ -60,6 +60,7 @@ EVENT_SCENE_ACTIVATED = "zwave.scene_activated"
 EVENT_NODE_EVENT = "zwave.node_event"
 EVENT_NETWORK_READY = "zwave.network_ready"
 EVENT_NETWORK_COMPLETE = "zwave.network_complete"
+EVENT_NETWORK_COMPLETE_SOME_DEAD = "zwave.network_complete_some_dead"
 EVENT_NETWORK_START = "zwave.network_start"
 EVENT_NETWORK_STOP = "zwave.network_stop"
 
diff --git a/tests/components/zwave/test_init.py b/tests/components/zwave/test_init.py
index 2b3019b2f8d..a2290d8aabf 100644
--- a/tests/components/zwave/test_init.py
+++ b/tests/components/zwave/test_init.py
@@ -458,6 +458,33 @@ def test_network_complete(hass, mock_openzwave):
     assert len(events) == 1
 
 
+@asyncio.coroutine
+def test_network_complete_some_dead(hass, mock_openzwave):
+    """Test Node network complete some dead event."""
+    mock_receivers = []
+
+    def mock_connect(receiver, signal, *args, **kwargs):
+        if signal == MockNetwork.SIGNAL_ALL_NODES_QUERIED_SOME_DEAD:
+            mock_receivers.append(receiver)
+
+    with patch('pydispatch.dispatcher.connect', new=mock_connect):
+        yield from async_setup_component(hass, 'zwave', {'zwave': {}})
+
+    assert len(mock_receivers) == 1
+
+    events = []
+
+    def listener(event):
+        events.append(event)
+
+    hass.bus.async_listen(const.EVENT_NETWORK_COMPLETE_SOME_DEAD, listener)
+
+    hass.async_add_job(mock_receivers[0])
+    yield from hass.async_block_till_done()
+
+    assert len(events) == 1
+
+
 class TestZWaveDeviceEntityValues(unittest.TestCase):
     """Tests for the ZWaveDeviceEntityValues helper."""
 
diff --git a/tests/mock/zwave.py b/tests/mock/zwave.py
index 59d97ddb621..36735b1693b 100644
--- a/tests/mock/zwave.py
+++ b/tests/mock/zwave.py
@@ -88,7 +88,8 @@ class MockNetwork(MagicMock):
     SIGNAL_NODE_QUERIES_COMPLETE = 'mock_NodeQueriesComplete'
     SIGNAL_AWAKE_NODES_QUERIED = 'mock_AwakeNodesQueried'
     SIGNAL_ALL_NODES_QUERIED = 'mock_AllNodesQueried'
-    SIGNAL_ALL_NODES_QUERIED_SOME_DEAD = 'mock_AllNodesQueriedSomeDead'
+    SIGNAL_ALL_NODES_QUERIED_SOME_DEAD = \
+        'mock_AllNodesQueriedSomeDead'
     SIGNAL_MSG_COMPLETE = 'mock_MsgComplete'
     SIGNAL_NOTIFICATION = 'mock_Notification'
     SIGNAL_CONTROLLER_COMMAND = 'mock_ControllerCommand'

From 4b8c38819e2d3e0816fdae9d501ea90ae3865fe5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ab=C3=ADlio=20Costa?= <abmantis@users.noreply.github.com>
Date: Fri, 28 Sep 2018 22:47:29 +0100
Subject: [PATCH 346/357] Add myself to CODEOWNERS

---
 CODEOWNERS | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CODEOWNERS b/CODEOWNERS
index b6ce8c04909..4b4019151b5 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -50,6 +50,7 @@ homeassistant/components/climate/sensibo.py @andrey-git
 homeassistant/components/cover/group.py @cdce8p
 homeassistant/components/cover/template.py @PhracturedBlue
 homeassistant/components/device_tracker/automatic.py @armills
+homeassistant/components/device_tracker/huawei_router.py @abmantis
 homeassistant/components/device_tracker/tile.py @bachya
 homeassistant/components/history_graph.py @andrey-git
 homeassistant/components/light/lifx.py @amelchio
@@ -93,6 +94,8 @@ homeassistant/components/*/broadlink.py @danielhiversen
 homeassistant/components/*/deconz.py @kane610
 homeassistant/components/ecovacs.py @OverloadUT
 homeassistant/components/*/ecovacs.py @OverloadUT
+homeassistant/components/edp_redy.py @abmantis
+homeassistant/components/*/edp_redy.py @abmantis
 homeassistant/components/eight_sleep.py @mezz64
 homeassistant/components/*/eight_sleep.py @mezz64
 homeassistant/components/hive.py @Rendili @KJonline

From c600d28b6a1b064cf6bfc80080572bb597661aff Mon Sep 17 00:00:00 2001
From: Jason Hu <awarecan@users.noreply.github.com>
Date: Sat, 29 Sep 2018 11:53:02 -0700
Subject: [PATCH 347/357] Override unique_id of NestActivityZoneSensor (#16961)

---
 homeassistant/components/binary_sensor/nest.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/homeassistant/components/binary_sensor/nest.py b/homeassistant/components/binary_sensor/nest.py
index c60463a8663..7f7278d9789 100644
--- a/homeassistant/components/binary_sensor/nest.py
+++ b/homeassistant/components/binary_sensor/nest.py
@@ -147,6 +147,11 @@ class NestActivityZoneSensor(NestBinarySensor):
         self.zone = zone
         self._name = "{} {} activity".format(self._name, self.zone.name)
 
+    @property
+    def unique_id(self):
+        """Return unique id based on camera serial and zone id."""
+        return "{}-{}".format(self.device.serial, self.zone.zone_id)
+
     @property
     def device_class(self):
         """Return the device class of the binary sensor."""

From 35b60645811e58d4a50239da560c94172150d8f1 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sat, 29 Sep 2018 20:53:48 +0200
Subject: [PATCH 348/357] Convert fan component to config entry (#16951)

* Conver fan component to config entry

* Lint
---
 homeassistant/components/fan/__init__.py | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/homeassistant/components/fan/__init__.py b/homeassistant/components/fan/__init__.py
index ec18637f065..36b075747e0 100644
--- a/homeassistant/components/fan/__init__.py
+++ b/homeassistant/components/fan/__init__.py
@@ -4,7 +4,6 @@ Provides functionality to interact with fans.
 For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/fan/
 """
-import asyncio
 from datetime import timedelta
 import functools as ft
 import logging
@@ -98,13 +97,12 @@ def is_on(hass, entity_id: str = None) -> bool:
     return state.attributes[ATTR_SPEED] not in [SPEED_OFF, STATE_UNKNOWN]
 
 
-@asyncio.coroutine
-def async_setup(hass, config: dict):
+async def async_setup(hass, config: dict):
     """Expose fan control via statemachine and services."""
-    component = EntityComponent(
+    component = hass.data[DOMAIN] = EntityComponent(
         _LOGGER, DOMAIN, hass, SCAN_INTERVAL, GROUP_NAME_ALL_FANS)
 
-    yield from component.async_setup(config)
+    await component.async_setup(config)
 
     component.async_register_entity_service(
         SERVICE_TURN_ON, FAN_TURN_ON_SCHEMA,
@@ -134,6 +132,16 @@ def async_setup(hass, config: dict):
     return True
 
 
+async def async_setup_entry(hass, entry):
+    """Set up a config entry."""
+    return await hass.data[DOMAIN].async_setup_entry(entry)
+
+
+async def async_unload_entry(hass, entry):
+    """Unload a config entry."""
+    return await hass.data[DOMAIN].async_unload_entry(entry)
+
+
 class FanEntity(ToggleEntity):
     """Representation of a fan."""
 

From 3ddad83a84b260479a72627fce2521fbf6aec457 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sat, 29 Sep 2018 20:54:57 +0200
Subject: [PATCH 349/357] Add unique_id to MQTT cover (#16950)

* Add unique_id to MQTT cover

* Fix tests
---
 homeassistant/components/cover/mqtt.py | 12 +++++-
 tests/components/cover/test_mqtt.py    | 51 +++++++++++++++++++++-----
 2 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/homeassistant/components/cover/mqtt.py b/homeassistant/components/cover/mqtt.py
index a239f4cd4f8..cbc8fbee274 100644
--- a/homeassistant/components/cover/mqtt.py
+++ b/homeassistant/components/cover/mqtt.py
@@ -5,6 +5,7 @@ For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/cover.mqtt/
 """
 import logging
+from typing import Optional
 
 import voluptuous as vol
 
@@ -49,6 +50,7 @@ CONF_TILT_MIN = 'tilt_min'
 CONF_TILT_MAX = 'tilt_max'
 CONF_TILT_STATE_OPTIMISTIC = 'tilt_optimistic'
 CONF_TILT_INVERT_STATE = 'tilt_invert_state'
+CONF_UNIQUE_ID = 'unique_id'
 
 DEFAULT_NAME = 'MQTT Cover'
 DEFAULT_PAYLOAD_OPEN = 'OPEN'
@@ -93,6 +95,7 @@ PLATFORM_SCHEMA = mqtt.MQTT_BASE_PLATFORM_SCHEMA.extend({
                  default=DEFAULT_TILT_OPTIMISTIC): cv.boolean,
     vol.Optional(CONF_TILT_INVERT_STATE,
                  default=DEFAULT_TILT_INVERT_STATE): cv.boolean,
+    vol.Optional(CONF_UNIQUE_ID): cv.string,
 }).extend(mqtt.MQTT_AVAILABILITY_SCHEMA.schema)
 
 
@@ -151,6 +154,7 @@ async def _async_setup_entity(hass, config, async_add_entities,
         config.get(CONF_TILT_INVERT_STATE),
         config.get(CONF_POSITION_TOPIC),
         set_position_template,
+        config.get(CONF_UNIQUE_ID),
         discovery_hash
     )])
 
@@ -165,7 +169,7 @@ class MqttCover(MqttAvailability, MqttDiscoveryUpdate, CoverDevice):
                  optimistic, value_template, tilt_open_position,
                  tilt_closed_position, tilt_min, tilt_max, tilt_optimistic,
                  tilt_invert, position_topic, set_position_template,
-                 discovery_hash):
+                 unique_id: Optional[str], discovery_hash):
         """Initialize the cover."""
         MqttAvailability.__init__(self, availability_topic, qos,
                                   payload_available, payload_not_available)
@@ -195,6 +199,7 @@ class MqttCover(MqttAvailability, MqttDiscoveryUpdate, CoverDevice):
         self._tilt_invert = tilt_invert
         self._position_topic = position_topic
         self._set_position_template = set_position_template
+        self._unique_id = unique_id
         self._discovery_hash = discovery_hash
 
     async def async_added_to_hass(self):
@@ -412,3 +417,8 @@ class MqttCover(MqttAvailability, MqttDiscoveryUpdate, CoverDevice):
         if self._tilt_invert:
             position = self._tilt_max - position + offset
         return position
+
+    @property
+    def unique_id(self):
+        """Return a unique ID."""
+        return self._unique_id
diff --git a/tests/components/cover/test_mqtt.py b/tests/components/cover/test_mqtt.py
index b41a047e3db..355f620520a 100644
--- a/tests/components/cover/test_mqtt.py
+++ b/tests/components/cover/test_mqtt.py
@@ -11,11 +11,11 @@ from homeassistant.const import (
     SERVICE_OPEN_COVER_TILT, SERVICE_SET_COVER_POSITION,
     SERVICE_SET_COVER_TILT_POSITION, SERVICE_STOP_COVER,
     STATE_CLOSED, STATE_OPEN, STATE_UNAVAILABLE, STATE_UNKNOWN)
-from homeassistant.setup import setup_component
+from homeassistant.setup import setup_component, async_setup_component
 
 from tests.common import (
     get_test_home_assistant, mock_mqtt_component, async_fire_mqtt_message,
-    fire_mqtt_message, MockConfigEntry)
+    fire_mqtt_message, MockConfigEntry, async_mock_mqtt_component)
 
 
 class TestCoverMQTT(unittest.TestCase):
@@ -614,7 +614,8 @@ class TestCoverMQTT(unittest.TestCase):
             'cover.test', 'state-topic', 'command-topic', None,
             'tilt-command-topic', 'tilt-status-topic', 0, False,
             'OPEN', 'CLOSE', 'OPEN', 'CLOSE', 'STOP', None, None,
-            False, None, 100, 0, 0, 100, False, False, None, None, None)
+            False, None, 100, 0, 0, 100, False, False, None, None, None,
+            None)
 
         self.assertEqual(44, mqtt_cover.find_percentage_in_range(44))
 
@@ -624,7 +625,8 @@ class TestCoverMQTT(unittest.TestCase):
             'cover.test', 'state-topic', 'command-topic', None,
             'tilt-command-topic', 'tilt-status-topic', 0, False,
             'OPEN', 'CLOSE', 'OPEN', 'CLOSE', 'STOP', None, None,
-            False, None, 180, 80, 80, 180, False, False, None, None, None)
+            False, None, 180, 80, 80, 180, False, False, None, None, None,
+            None)
 
         self.assertEqual(40, mqtt_cover.find_percentage_in_range(120))
 
@@ -634,7 +636,8 @@ class TestCoverMQTT(unittest.TestCase):
             'cover.test', 'state-topic', 'command-topic', None,
             'tilt-command-topic', 'tilt-status-topic', 0, False,
             'OPEN', 'CLOSE', 'OPEN', 'CLOSE', 'STOP', None, None,
-            False, None, 100, 0, 0, 100, False, True, None, None, None)
+            False, None, 100, 0, 0, 100, False, True, None, None, None,
+            None)
 
         self.assertEqual(56, mqtt_cover.find_percentage_in_range(44))
 
@@ -644,7 +647,8 @@ class TestCoverMQTT(unittest.TestCase):
             'cover.test', 'state-topic', 'command-topic', None,
             'tilt-command-topic', 'tilt-status-topic', 0, False,
             'OPEN', 'CLOSE', 'OPEN', 'CLOSE', 'STOP', None, None,
-            False, None, 180, 80, 80, 180, False, True, None, None, None)
+            False, None, 180, 80, 80, 180, False, True, None, None, None,
+            None)
 
         self.assertEqual(60, mqtt_cover.find_percentage_in_range(120))
 
@@ -654,7 +658,8 @@ class TestCoverMQTT(unittest.TestCase):
             'cover.test', 'state-topic', 'command-topic', None,
             'tilt-command-topic', 'tilt-status-topic', 0, False,
             'OPEN', 'CLOSE', 'OPEN', 'CLOSE', 'STOP', None, None,
-            False, None, 100, 0, 0, 100, False, False, None, None, None)
+            False, None, 100, 0, 0, 100, False, False, None, None, None,
+            None)
 
         self.assertEqual(44, mqtt_cover.find_in_range_from_percent(44))
 
@@ -664,7 +669,8 @@ class TestCoverMQTT(unittest.TestCase):
             'cover.test', 'state-topic', 'command-topic', None,
             'tilt-command-topic', 'tilt-status-topic', 0, False,
             'OPEN', 'CLOSE', 'OPEN', 'CLOSE', 'STOP', None, None,
-            False, None, 180, 80, 80, 180, False, False, None, None, None)
+            False, None, 180, 80, 80, 180, False, False, None, None, None,
+            None)
 
         self.assertEqual(120, mqtt_cover.find_in_range_from_percent(40))
 
@@ -674,7 +680,8 @@ class TestCoverMQTT(unittest.TestCase):
             'cover.test', 'state-topic', 'command-topic', None,
             'tilt-command-topic', 'tilt-status-topic', 0, False,
             'OPEN', 'CLOSE', 'OPEN', 'CLOSE', 'STOP', None, None,
-            False, None, 100, 0, 0, 100, False, True, None, None, None)
+            False, None, 100, 0, 0, 100, False, True, None, None, None,
+            None)
 
         self.assertEqual(44, mqtt_cover.find_in_range_from_percent(56))
 
@@ -684,7 +691,8 @@ class TestCoverMQTT(unittest.TestCase):
             'cover.test', 'state-topic', 'command-topic', None,
             'tilt-command-topic', 'tilt-status-topic', 0, False,
             'OPEN', 'CLOSE', 'OPEN', 'CLOSE', 'STOP', None, None,
-            False, None, 180, 80, 80, 180, False, True, None, None, None)
+            False, None, 180, 80, 80, 180, False, True, None, None, None,
+            None)
 
         self.assertEqual(120, mqtt_cover.find_in_range_from_percent(60))
 
@@ -779,3 +787,26 @@ async def test_discovery_removal_cover(hass, mqtt_mock, caplog):
     await hass.async_block_till_done()
     state = hass.states.get('cover.beer')
     assert state is None
+
+
+async def test_unique_id(hass):
+    """Test unique_id option only creates one cover per id."""
+    await async_mock_mqtt_component(hass)
+    assert await async_setup_component(hass, cover.DOMAIN, {
+        cover.DOMAIN: [{
+            'platform': 'mqtt',
+            'name': 'Test 1',
+            'state_topic': 'test-topic',
+            'unique_id': 'TOTALLY_UNIQUE'
+        }, {
+            'platform': 'mqtt',
+            'name': 'Test 2',
+            'state_topic': 'test-topic',
+            'unique_id': 'TOTALLY_UNIQUE'
+        }]
+    })
+
+    async_fire_mqtt_message(hass, 'test-topic', 'payload')
+    await hass.async_block_till_done()
+
+    assert len(hass.states.async_entity_ids(cover.DOMAIN)) == 1

From caaf4f56942672cd139ed9fb96d90c134f8c880b Mon Sep 17 00:00:00 2001
From: Anders Melchiorsen <amelchio@nogoto.net>
Date: Sat, 29 Sep 2018 21:22:24 +0200
Subject: [PATCH 350/357] Fix exception during history_stats startup (#16932)

* Fix exception during history_stats startup

* Do not track changes during startup

* Ignore args
---
 .../components/sensor/history_stats.py        | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/homeassistant/components/sensor/history_stats.py b/homeassistant/components/sensor/history_stats.py
index c76d2cefca0..a8d9276edc8 100644
--- a/homeassistant/components/sensor/history_stats.py
+++ b/homeassistant/components/sensor/history_stats.py
@@ -10,6 +10,7 @@ import math
 
 import voluptuous as vol
 
+from homeassistant.core import callback
 from homeassistant.components import history
 import homeassistant.helpers.config_validation as cv
 import homeassistant.util.dt as dt_util
@@ -19,7 +20,7 @@ from homeassistant.const import (
     EVENT_HOMEASSISTANT_START)
 from homeassistant.exceptions import TemplateError
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.event import track_state_change
+from homeassistant.helpers.event import async_track_state_change
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -94,8 +95,6 @@ class HistoryStatsSensor(Entity):
             self, hass, entity_id, entity_state, start, end, duration,
             sensor_type, name):
         """Initialize the HistoryStats sensor."""
-        self._hass = hass
-
         self._entity_id = entity_id
         self._entity_state = entity_state
         self._duration = duration
@@ -109,15 +108,19 @@ class HistoryStatsSensor(Entity):
         self.value = None
         self.count = None
 
-        def force_refresh(*args):
-            """Force the component to refresh."""
-            self.schedule_update_ha_state(True)
+        @callback
+        def start_refresh(*args):
+            """Register state tracking."""
+            @callback
+            def force_refresh(*args):
+                """Force the component to refresh."""
+                self.async_schedule_update_ha_state(True)
 
-        # Update value when home assistant starts
-        hass.bus.listen_once(EVENT_HOMEASSISTANT_START, force_refresh)
+            force_refresh()
+            async_track_state_change(self.hass, self._entity_id, force_refresh)
 
-        # Update value when tracked entity changes its state
-        track_state_change(hass, entity_id, force_refresh)
+        # Delay first refresh to keep startup fast
+        hass.bus.listen_once(EVENT_HOMEASSISTANT_START, start_refresh)
 
     @property
     def name(self):

From 45fdda3f5d3d4fbaa8af7843be38737581c29cb5 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sat, 29 Sep 2018 21:22:57 +0200
Subject: [PATCH 351/357] Add unique_id to MQTT fan (#16949)

---
 homeassistant/components/fan/mqtt.py | 13 ++++++++++++-
 tests/components/fan/test_mqtt.py    | 29 ++++++++++++++++++++++++++--
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/fan/mqtt.py b/homeassistant/components/fan/mqtt.py
index 4ff8e1ec757..3e1ad2704e7 100644
--- a/homeassistant/components/fan/mqtt.py
+++ b/homeassistant/components/fan/mqtt.py
@@ -5,6 +5,7 @@ For more details about this platform, please refer to the documentation
 https://home-assistant.io/components/fan.mqtt/
 """
 import logging
+from typing import Optional
 
 import voluptuous as vol
 
@@ -41,6 +42,7 @@ CONF_PAYLOAD_LOW_SPEED = 'payload_low_speed'
 CONF_PAYLOAD_MEDIUM_SPEED = 'payload_medium_speed'
 CONF_PAYLOAD_HIGH_SPEED = 'payload_high_speed'
 CONF_SPEED_LIST = 'speeds'
+CONF_UNIQUE_ID = 'unique_id'
 
 DEFAULT_NAME = 'MQTT Fan'
 DEFAULT_PAYLOAD_ON = 'ON'
@@ -74,6 +76,7 @@ PLATFORM_SCHEMA = mqtt.MQTT_RW_PLATFORM_SCHEMA.extend({
                  default=[SPEED_OFF, SPEED_LOW,
                           SPEED_MEDIUM, SPEED_HIGH]): cv.ensure_list,
     vol.Optional(CONF_OPTIMISTIC, default=DEFAULT_OPTIMISTIC): cv.boolean,
+    vol.Optional(CONF_UNIQUE_ID): cv.string,
 }).extend(mqtt.MQTT_AVAILABILITY_SCHEMA.schema)
 
 
@@ -120,6 +123,7 @@ async def async_setup_platform(hass: HomeAssistantType, config: ConfigType,
         config.get(CONF_AVAILABILITY_TOPIC),
         config.get(CONF_PAYLOAD_AVAILABLE),
         config.get(CONF_PAYLOAD_NOT_AVAILABLE),
+        config.get(CONF_UNIQUE_ID),
         discovery_hash,
     )])
 
@@ -129,7 +133,8 @@ class MqttFan(MqttAvailability, MqttDiscoveryUpdate, FanEntity):
 
     def __init__(self, name, topic, templates, qos, retain, payload,
                  speed_list, optimistic, availability_topic, payload_available,
-                 payload_not_available, discovery_hash):
+                 payload_not_available, unique_id: Optional[str],
+                 discovery_hash):
         """Initialize the MQTT fan."""
         MqttAvailability.__init__(self, availability_topic, qos,
                                   payload_available, payload_not_available)
@@ -154,6 +159,7 @@ class MqttFan(MqttAvailability, MqttDiscoveryUpdate, FanEntity):
                                      is not None and SUPPORT_OSCILLATE)
         self._supported_features |= (topic[CONF_SPEED_STATE_TOPIC]
                                      is not None and SUPPORT_SET_SPEED)
+        self._unique_id = unique_id
         self._discovery_hash = discovery_hash
 
     async def async_added_to_hass(self):
@@ -323,3 +329,8 @@ class MqttFan(MqttAvailability, MqttDiscoveryUpdate, FanEntity):
         if self._optimistic_oscillation:
             self._oscillation = oscillating
             self.async_schedule_update_ha_state()
+
+    @property
+    def unique_id(self):
+        """Return a unique ID."""
+        return self._unique_id
diff --git a/tests/components/fan/test_mqtt.py b/tests/components/fan/test_mqtt.py
index 5f59ebe4a76..7434e5aa1c9 100644
--- a/tests/components/fan/test_mqtt.py
+++ b/tests/components/fan/test_mqtt.py
@@ -1,14 +1,14 @@
 """Test MQTT fans."""
 import unittest
 
-from homeassistant.setup import setup_component
+from homeassistant.setup import setup_component, async_setup_component
 from homeassistant.components import fan
 from homeassistant.components.mqtt.discovery import async_start
 from homeassistant.const import ATTR_ASSUMED_STATE, STATE_UNAVAILABLE
 
 from tests.common import (
     mock_mqtt_component, async_fire_mqtt_message, fire_mqtt_message,
-    get_test_home_assistant)
+    get_test_home_assistant, async_mock_mqtt_component)
 
 
 class TestMqttFan(unittest.TestCase):
@@ -125,3 +125,28 @@ async def test_discovery_removal_fan(hass, mqtt_mock, caplog):
     await hass.async_block_till_done()
     state = hass.states.get('fan.beer')
     assert state is None
+
+
+async def test_unique_id(hass):
+    """Test unique_id option only creates one fan per id."""
+    await async_mock_mqtt_component(hass)
+    assert await async_setup_component(hass, fan.DOMAIN, {
+        fan.DOMAIN: [{
+            'platform': 'mqtt',
+            'name': 'Test 1',
+            'state_topic': 'test-topic',
+            'command_topic': 'test-topic',
+            'unique_id': 'TOTALLY_UNIQUE'
+        }, {
+            'platform': 'mqtt',
+            'name': 'Test 2',
+            'state_topic': 'test-topic',
+            'command_topic': 'test-topic',
+            'unique_id': 'TOTALLY_UNIQUE'
+        }]
+    })
+
+    async_fire_mqtt_message(hass, 'test-topic', 'payload')
+    await hass.async_block_till_done()
+
+    assert len(hass.states.async_entity_ids(fan.DOMAIN)) == 1

From 70ce9bb7bc15b1a66bb1d21598efd0bb8b102522 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sat, 29 Sep 2018 22:01:04 +0200
Subject: [PATCH 352/357] Add pressure sensor device class (#16965)

* Add pressure sensor device class

* Undo github desktop line exclude
---
 homeassistant/components/sensor/__init__.py     | 3 ++-
 homeassistant/components/sensor/xiaomi_aqara.py | 4 ++--
 homeassistant/const.py                          | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/sensor/__init__.py b/homeassistant/components/sensor/__init__.py
index 948f844cfd4..be599cc295a 100644
--- a/homeassistant/components/sensor/__init__.py
+++ b/homeassistant/components/sensor/__init__.py
@@ -14,7 +14,7 @@ from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.config_validation import PLATFORM_SCHEMA  # noqa
 from homeassistant.const import (
     DEVICE_CLASS_BATTERY, DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_ILLUMINANCE,
-    DEVICE_CLASS_TEMPERATURE)
+    DEVICE_CLASS_TEMPERATURE, DEVICE_CLASS_PRESSURE)
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -28,6 +28,7 @@ DEVICE_CLASSES = [
     DEVICE_CLASS_HUMIDITY,  # % of humidity in the air
     DEVICE_CLASS_ILLUMINANCE,  # current light level (lx/lm)
     DEVICE_CLASS_TEMPERATURE,  # temperature (C/F)
+    DEVICE_CLASS_PRESSURE,  # pressure (hPa/mbar)
 ]
 
 DEVICE_CLASSES_SCHEMA = vol.All(vol.Lower, vol.In(DEVICE_CLASSES))
diff --git a/homeassistant/components/sensor/xiaomi_aqara.py b/homeassistant/components/sensor/xiaomi_aqara.py
index 8a3a11db051..31366fe0097 100644
--- a/homeassistant/components/sensor/xiaomi_aqara.py
+++ b/homeassistant/components/sensor/xiaomi_aqara.py
@@ -5,7 +5,7 @@ from homeassistant.components.xiaomi_aqara import (PY_XIAOMI_GATEWAY,
                                                    XiaomiDevice)
 from homeassistant.const import (
     DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_ILLUMINANCE, DEVICE_CLASS_TEMPERATURE,
-    TEMP_CELSIUS)
+    TEMP_CELSIUS, DEVICE_CLASS_PRESSURE)
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -14,7 +14,7 @@ SENSOR_TYPES = {
     'humidity': ['%', None, DEVICE_CLASS_HUMIDITY],
     'illumination': ['lm', None, DEVICE_CLASS_ILLUMINANCE],
     'lux': ['lx', None, DEVICE_CLASS_ILLUMINANCE],
-    'pressure': ['hPa', 'mdi:gauge', None]
+    'pressure': ['hPa', None, DEVICE_CLASS_PRESSURE]
 }
 
 
diff --git a/homeassistant/const.py b/homeassistant/const.py
index 1d3adf7ee45..93ab0deeba2 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -172,6 +172,7 @@ DEVICE_CLASS_BATTERY = 'battery'
 DEVICE_CLASS_HUMIDITY = 'humidity'
 DEVICE_CLASS_ILLUMINANCE = 'illuminance'
 DEVICE_CLASS_TEMPERATURE = 'temperature'
+DEVICE_CLASS_PRESSURE = 'pressure'
 
 # #### STATES ####
 STATE_ON = 'on'

From 8b1bdda0faec9f0a8ca58c88738d8ab63d9f73e5 Mon Sep 17 00:00:00 2001
From: Rohan Kapoor <rohan@rohankapoor.com>
Date: Sun, 30 Sep 2018 00:21:07 -0700
Subject: [PATCH 353/357] Bump zm-py to 0.0.4 (#16979)

---
 homeassistant/components/zoneminder.py | 2 +-
 requirements_all.txt                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/zoneminder.py b/homeassistant/components/zoneminder.py
index 53d6d8b2536..b7f43177200 100644
--- a/homeassistant/components/zoneminder.py
+++ b/homeassistant/components/zoneminder.py
@@ -15,7 +15,7 @@ import homeassistant.helpers.config_validation as cv
 
 _LOGGER = logging.getLogger(__name__)
 
-REQUIREMENTS = ['zm-py==0.0.3']
+REQUIREMENTS = ['zm-py==0.0.4']
 
 CONF_PATH_ZMS = 'path_zms'
 
diff --git a/requirements_all.txt b/requirements_all.txt
index eeee16a6138..53d38f09f3b 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1574,4 +1574,4 @@ zigpy-xbee==0.1.1
 zigpy==0.2.0
 
 # homeassistant.components.zoneminder
-zm-py==0.0.3
+zm-py==0.0.4

From 7f47d601f172689032020b2b8c1a4d6078791d81 Mon Sep 17 00:00:00 2001
From: Greg Laabs <OverloadUT@gmail.com>
Date: Sun, 30 Sep 2018 00:21:27 -0700
Subject: [PATCH 354/357] Fix ISY blocking bug (#16978)

This fix results in `is_on` returning False if the state is unknown (which was a bug in 0.79).
---
 homeassistant/components/light/isy994.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/light/isy994.py b/homeassistant/components/light/isy994.py
index 4349bfa1467..d54aa3cd4ce 100644
--- a/homeassistant/components/light/isy994.py
+++ b/homeassistant/components/light/isy994.py
@@ -31,12 +31,14 @@ class ISYLightDevice(ISYDevice, Light):
     @property
     def is_on(self) -> bool:
         """Get whether the ISY994 light is on."""
+        if self.is_unknown():
+            return False
         return self.value != 0
 
     @property
     def brightness(self) -> float:
         """Get the brightness of the ISY994 light."""
-        return self.value
+        return None if self.is_unknown() else self.value
 
     def turn_off(self, **kwargs) -> None:
         """Send the turn off command to the ISY994 light device."""

From 06d959ed43ac0f04d38faecedf742e2eaf5df9c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 30 Sep 2018 11:20:10 +0300
Subject: [PATCH 355/357] Upgrade pytest to 3.8.1 (#16980)

---
 requirements_test.txt     | 2 +-
 requirements_test_all.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements_test.txt b/requirements_test.txt
index 15e06c4e53d..87450f5422d 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -13,5 +13,5 @@ pytest-aiohttp==0.3.0
 pytest-cov==2.5.1
 pytest-sugar==0.9.1
 pytest-timeout==1.3.2
-pytest==3.8.0
+pytest==3.8.1
 requests_mock==1.5.2
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 736310a719a..a04f0570ee9 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -14,7 +14,7 @@ pytest-aiohttp==0.3.0
 pytest-cov==2.5.1
 pytest-sugar==0.9.1
 pytest-timeout==1.3.2
-pytest==3.8.0
+pytest==3.8.1
 requests_mock==1.5.2
 
 

From f5632a5da5f1ad00c27ee423344dada6c099844e Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Sun, 30 Sep 2018 14:45:48 +0200
Subject: [PATCH 356/357] Add webhook + IFTTT example (#16817)

* Add webhook + IFTTT example

* Abort if not externally accessible

* Abort on local url

* Add description to create entry

* Make body optional

* Allow ifttt setup without config

* Add tests

* Lint

* Fix Lint + Tests

* Fix typing
---
 homeassistant/components/auth/indieauth.py    |  19 +--
 homeassistant/components/ifttt.py             |  74 ----------
 .../components/ifttt/.translations/en.json    |  18 +++
 homeassistant/components/ifttt/__init__.py    | 135 ++++++++++++++++++
 homeassistant/components/ifttt/strings.json   |  18 +++
 homeassistant/components/webhook.py           |  94 ++++++++++++
 homeassistant/config_entries.py               |   1 +
 homeassistant/data_entry_flow.py              |   7 +-
 homeassistant/util/network.py                 |  22 +++
 .../components/config/test_config_entries.py  |   4 +
 tests/components/ifttt/__init__.py            |   1 +
 tests/components/ifttt/test_init.py           |  48 +++++++
 tests/components/test_webhook.py              |  98 +++++++++++++
 13 files changed, 448 insertions(+), 91 deletions(-)
 delete mode 100644 homeassistant/components/ifttt.py
 create mode 100644 homeassistant/components/ifttt/.translations/en.json
 create mode 100644 homeassistant/components/ifttt/__init__.py
 create mode 100644 homeassistant/components/ifttt/strings.json
 create mode 100644 homeassistant/components/webhook.py
 create mode 100644 homeassistant/util/network.py
 create mode 100644 tests/components/ifttt/__init__.py
 create mode 100644 tests/components/ifttt/test_init.py
 create mode 100644 tests/components/test_webhook.py

diff --git a/homeassistant/components/auth/indieauth.py b/homeassistant/components/auth/indieauth.py
index bcf73258ffa..30432a612a4 100644
--- a/homeassistant/components/auth/indieauth.py
+++ b/homeassistant/components/auth/indieauth.py
@@ -1,24 +1,13 @@
 """Helpers to resolve client ID/secret."""
 import asyncio
+from ipaddress import ip_address
 from html.parser import HTMLParser
-from ipaddress import ip_address, ip_network
 from urllib.parse import urlparse, urljoin
 
 import aiohttp
 from aiohttp.client_exceptions import ClientError
 
-# IP addresses of loopback interfaces
-ALLOWED_IPS = (
-    ip_address('127.0.0.1'),
-    ip_address('::1'),
-)
-
-# RFC1918 - Address allocation for Private Internets
-ALLOWED_NETWORKS = (
-    ip_network('10.0.0.0/8'),
-    ip_network('172.16.0.0/12'),
-    ip_network('192.168.0.0/16'),
-)
+from homeassistant.util.network import is_local
 
 
 async def verify_redirect_uri(hass, client_id, redirect_uri):
@@ -185,9 +174,7 @@ def _parse_client_id(client_id):
         # Not an ip address
         pass
 
-    if (address is None or
-            address in ALLOWED_IPS or
-            any(address in network for network in ALLOWED_NETWORKS)):
+    if address is None or is_local(address):
         return parts
 
     raise ValueError('Hostname should be a domain name or local IP address')
diff --git a/homeassistant/components/ifttt.py b/homeassistant/components/ifttt.py
deleted file mode 100644
index 9497282ab21..00000000000
--- a/homeassistant/components/ifttt.py
+++ /dev/null
@@ -1,74 +0,0 @@
-"""
-Support to trigger Maker IFTTT recipes.
-
-For more details about this component, please refer to the documentation at
-https://home-assistant.io/components/ifttt/
-"""
-import logging
-
-import requests
-import voluptuous as vol
-
-import homeassistant.helpers.config_validation as cv
-
-REQUIREMENTS = ['pyfttt==0.3']
-
-_LOGGER = logging.getLogger(__name__)
-
-ATTR_EVENT = 'event'
-ATTR_VALUE1 = 'value1'
-ATTR_VALUE2 = 'value2'
-ATTR_VALUE3 = 'value3'
-
-CONF_KEY = 'key'
-
-DOMAIN = 'ifttt'
-
-SERVICE_TRIGGER = 'trigger'
-
-SERVICE_TRIGGER_SCHEMA = vol.Schema({
-    vol.Required(ATTR_EVENT): cv.string,
-    vol.Optional(ATTR_VALUE1): cv.string,
-    vol.Optional(ATTR_VALUE2): cv.string,
-    vol.Optional(ATTR_VALUE3): cv.string,
-})
-
-CONFIG_SCHEMA = vol.Schema({
-    DOMAIN: vol.Schema({
-        vol.Required(CONF_KEY): cv.string,
-    }),
-}, extra=vol.ALLOW_EXTRA)
-
-
-def trigger(hass, event, value1=None, value2=None, value3=None):
-    """Trigger a Maker IFTTT recipe."""
-    data = {
-        ATTR_EVENT: event,
-        ATTR_VALUE1: value1,
-        ATTR_VALUE2: value2,
-        ATTR_VALUE3: value3,
-    }
-    hass.services.call(DOMAIN, SERVICE_TRIGGER, data)
-
-
-def setup(hass, config):
-    """Set up the IFTTT service component."""
-    key = config[DOMAIN][CONF_KEY]
-
-    def trigger_service(call):
-        """Handle IFTTT trigger service calls."""
-        event = call.data[ATTR_EVENT]
-        value1 = call.data.get(ATTR_VALUE1)
-        value2 = call.data.get(ATTR_VALUE2)
-        value3 = call.data.get(ATTR_VALUE3)
-
-        try:
-            import pyfttt
-            pyfttt.send_event(key, event, value1, value2, value3)
-        except requests.exceptions.RequestException:
-            _LOGGER.exception("Error communicating with IFTTT")
-
-    hass.services.register(DOMAIN, SERVICE_TRIGGER, trigger_service,
-                           schema=SERVICE_TRIGGER_SCHEMA)
-
-    return True
diff --git a/homeassistant/components/ifttt/.translations/en.json b/homeassistant/components/ifttt/.translations/en.json
new file mode 100644
index 00000000000..dae4b24de47
--- /dev/null
+++ b/homeassistant/components/ifttt/.translations/en.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "not_internet_accessible": "Your Home Assistant instance needs to be accessible from the internet to receive IFTTT messages.",
+            "one_instance_allowed": "Only a single instance is necessary."
+        },
+        "create_entry": {
+            "default": "To send events to Home Assistant, you will need to use the \"Make a web request\" action from the [IFTTT Webhook applet]({applet_url}).\n\nFill in the following info:\n\n- URL: `{webhook_url}`\n- Method: POST\n- Content Type: application/json\n\nSee [the documentation]({docs_url}) on how to configure automations to handle incoming data."
+        },
+        "step": {
+            "user": {
+                "description": "Are you sure you want to set up IFTTT?",
+                "title": "Set up the IFTTT Webhook Applet"
+            }
+        },
+        "title": "IFTTT"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ifttt/__init__.py b/homeassistant/components/ifttt/__init__.py
new file mode 100644
index 00000000000..534217a7ba2
--- /dev/null
+++ b/homeassistant/components/ifttt/__init__.py
@@ -0,0 +1,135 @@
+"""
+Support to trigger Maker IFTTT recipes.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/ifttt/
+"""
+from ipaddress import ip_address
+import logging
+from urllib.parse import urlparse
+
+import requests
+import voluptuous as vol
+
+import homeassistant.helpers.config_validation as cv
+from homeassistant import config_entries
+from homeassistant.util.network import is_local
+
+REQUIREMENTS = ['pyfttt==0.3']
+DEPENDENCIES = ['webhook']
+
+_LOGGER = logging.getLogger(__name__)
+
+EVENT_RECEIVED = 'ifttt_webhook_received'
+
+ATTR_EVENT = 'event'
+ATTR_VALUE1 = 'value1'
+ATTR_VALUE2 = 'value2'
+ATTR_VALUE3 = 'value3'
+
+CONF_KEY = 'key'
+CONF_WEBHOOK_ID = 'webhook_id'
+
+DOMAIN = 'ifttt'
+
+SERVICE_TRIGGER = 'trigger'
+
+SERVICE_TRIGGER_SCHEMA = vol.Schema({
+    vol.Required(ATTR_EVENT): cv.string,
+    vol.Optional(ATTR_VALUE1): cv.string,
+    vol.Optional(ATTR_VALUE2): cv.string,
+    vol.Optional(ATTR_VALUE3): cv.string,
+})
+
+CONFIG_SCHEMA = vol.Schema({
+    vol.Optional(DOMAIN): vol.Schema({
+        vol.Required(CONF_KEY): cv.string,
+    }),
+}, extra=vol.ALLOW_EXTRA)
+
+
+async def async_setup(hass, config):
+    """Set up the IFTTT service component."""
+    if DOMAIN not in config:
+        return True
+
+    key = config[DOMAIN][CONF_KEY]
+
+    def trigger_service(call):
+        """Handle IFTTT trigger service calls."""
+        event = call.data[ATTR_EVENT]
+        value1 = call.data.get(ATTR_VALUE1)
+        value2 = call.data.get(ATTR_VALUE2)
+        value3 = call.data.get(ATTR_VALUE3)
+
+        try:
+            import pyfttt
+            pyfttt.send_event(key, event, value1, value2, value3)
+        except requests.exceptions.RequestException:
+            _LOGGER.exception("Error communicating with IFTTT")
+
+    hass.services.async_register(DOMAIN, SERVICE_TRIGGER, trigger_service,
+                                 schema=SERVICE_TRIGGER_SCHEMA)
+
+    return True
+
+
+async def handle_webhook(hass, webhook_id, data):
+    """Handle webhook callback."""
+    if isinstance(data, dict):
+        data['webhook_id'] = webhook_id
+    hass.bus.async_fire(EVENT_RECEIVED, data)
+
+
+async def async_setup_entry(hass, entry):
+    """Configure based on config entry."""
+    hass.components.webhook.async_register(
+        entry.data['webhook_id'], handle_webhook)
+    return True
+
+
+async def async_unload_entry(hass, entry):
+    """Unload a config entry."""
+    hass.components.webhook.async_unregister(entry.data['webhook_id'])
+    return True
+
+
+@config_entries.HANDLERS.register(DOMAIN)
+class ConfigFlow(config_entries.ConfigFlow):
+    """Handle an IFTTT config flow."""
+
+    async def async_step_user(self, user_input=None):
+        """Handle a user initiated set up flow."""
+        if self._async_current_entries():
+            return self.async_abort(reason='one_instance_allowed')
+
+        try:
+            url_parts = urlparse(self.hass.config.api.base_url)
+
+            if is_local(ip_address(url_parts.hostname)):
+                return self.async_abort(reason='not_internet_accessible')
+        except ValueError:
+            # If it's not an IP address, it's very likely publicly accessible
+            pass
+
+        if user_input is None:
+            return self.async_show_form(
+                step_id='user',
+            )
+
+        webhook_id = self.hass.components.webhook.async_generate_id()
+        webhook_url = \
+            self.hass.components.webhook.async_generate_url(webhook_id)
+
+        return self.async_create_entry(
+            title='IFTTT Webhook',
+            data={
+                CONF_WEBHOOK_ID: webhook_id
+            },
+            description_placeholders={
+                'applet_url': 'https://ifttt.com/maker_webhooks',
+                'webhook_url': webhook_url,
+                'docs_url':
+                'https://www.home-assistant.io/components/ifttt/'
+            }
+        )
diff --git a/homeassistant/components/ifttt/strings.json b/homeassistant/components/ifttt/strings.json
new file mode 100644
index 00000000000..9fc47504b9b
--- /dev/null
+++ b/homeassistant/components/ifttt/strings.json
@@ -0,0 +1,18 @@
+{
+  "config": {
+    "title": "IFTTT",
+    "step": {
+      "user": {
+        "title": "Set up the IFTTT Webhook Applet",
+        "description": "Are you sure you want to set up IFTTT?"
+      }
+    },
+    "abort": {
+      "one_instance_allowed": "Only a single instance is necessary.",
+      "not_internet_accessible": "Your Home Assistant instance needs to be accessible from the internet to receive IFTTT messages."
+    },
+    "create_entry": {
+      "default": "To send events to Home Assistant, you will need to use the \"Make a web request\" action from the [IFTTT Webhook applet]({applet_url}).\n\nFill in the following info:\n\n- URL: `{webhook_url}`\n- Method: POST\n- Content Type: application/json\n\nSee [the documentation]({docs_url}) on how to configure automations to handle incoming data."
+    }
+  }
+}
diff --git a/homeassistant/components/webhook.py b/homeassistant/components/webhook.py
new file mode 100644
index 00000000000..0e44ffbab25
--- /dev/null
+++ b/homeassistant/components/webhook.py
@@ -0,0 +1,94 @@
+"""Webhooks for Home Assistant.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/webhook/
+"""
+import json
+import logging
+
+from aiohttp.web import Response
+
+from homeassistant.core import callback
+from homeassistant.loader import bind_hass
+from homeassistant.auth.util import generate_secret
+from homeassistant.components.http.view import HomeAssistantView
+
+DOMAIN = 'webhook'
+DEPENDENCIES = ['http']
+_LOGGER = logging.getLogger(__name__)
+
+
+@callback
+@bind_hass
+def async_register(hass, webhook_id, handler):
+    """Register a webhook."""
+    handlers = hass.data.setdefault(DOMAIN, {})
+
+    if webhook_id in handlers:
+        raise ValueError('Handler is already defined!')
+
+    handlers[webhook_id] = handler
+
+
+@callback
+@bind_hass
+def async_unregister(hass, webhook_id):
+    """Remove a webhook."""
+    handlers = hass.data.setdefault(DOMAIN, {})
+    handlers.pop(webhook_id, None)
+
+
+@callback
+def async_generate_id():
+    """Generate a webhook_id."""
+    return generate_secret(entropy=32)
+
+
+@callback
+@bind_hass
+def async_generate_url(hass, webhook_id):
+    """Generate a webhook_id."""
+    return "{}/api/webhook/{}".format(hass.config.api.base_url, webhook_id)
+
+
+async def async_setup(hass, config):
+    """Initialize the webhook component."""
+    hass.http.register_view(WebhookView)
+    return True
+
+
+class WebhookView(HomeAssistantView):
+    """Handle incoming webhook requests."""
+
+    url = "/api/webhook/{webhook_id}"
+    name = "api:webhook"
+    requires_auth = False
+
+    async def post(self, request, webhook_id):
+        """Handle webhook call."""
+        hass = request.app['hass']
+        handlers = hass.data.setdefault(DOMAIN, {})
+        handler = handlers.get(webhook_id)
+
+        # Always respond successfully to not give away if a hook exists or not.
+        if handler is None:
+            _LOGGER.warning(
+                'Received message for unregistered webhook %s', webhook_id)
+            return Response(status=200)
+
+        body = await request.text()
+        try:
+            data = json.loads(body) if body else {}
+        except ValueError:
+            _LOGGER.warning(
+                'Received webhook %s with invalid JSON', webhook_id)
+            return Response(status=200)
+
+        try:
+            response = await handler(hass, webhook_id, data)
+            if response is None:
+                response = Response(status=200)
+            return response
+        except Exception:  # pylint: disable=broad-except
+            _LOGGER.exception("Error processing webhook %s", webhook_id)
+            return Response(status=200)
diff --git a/homeassistant/config_entries.py b/homeassistant/config_entries.py
index 83bf9d22de3..fcc8a1f92ac 100644
--- a/homeassistant/config_entries.py
+++ b/homeassistant/config_entries.py
@@ -141,6 +141,7 @@ FLOWS = [
     'deconz',
     'homematicip_cloud',
     'hue',
+    'ifttt',
     'ios',
     'mqtt',
     'nest',
diff --git a/homeassistant/data_entry_flow.py b/homeassistant/data_entry_flow.py
index ecf9850a67c..57265cf696d 100644
--- a/homeassistant/data_entry_flow.py
+++ b/homeassistant/data_entry_flow.py
@@ -153,7 +153,10 @@ class FlowHandler:
         }
 
     @callback
-    def async_create_entry(self, *, title: str, data: Dict) -> Dict:
+    def async_create_entry(self, *, title: str, data: Dict,
+                           description: Optional[str] = None,
+                           description_placeholders: Optional[Dict] = None) \
+            -> Dict:
         """Finish config flow and create a config entry."""
         return {
             'version': self.VERSION,
@@ -162,6 +165,8 @@ class FlowHandler:
             'handler': self.handler,
             'title': title,
             'data': data,
+            'description': description,
+            'description_placeholders': description_placeholders,
         }
 
     @callback
diff --git a/homeassistant/util/network.py b/homeassistant/util/network.py
new file mode 100644
index 00000000000..48840f339c1
--- /dev/null
+++ b/homeassistant/util/network.py
@@ -0,0 +1,22 @@
+"""Network utilities."""
+from ipaddress import IPv4Address, IPv6Address, ip_address, ip_network
+from typing import Union
+
+# IP addresses of loopback interfaces
+LOCAL_IPS = (
+    ip_address('127.0.0.1'),
+    ip_address('::1'),
+)
+
+# RFC1918 - Address allocation for Private Internets
+LOCAL_NETWORKS = (
+    ip_network('10.0.0.0/8'),
+    ip_network('172.16.0.0/12'),
+    ip_network('192.168.0.0/16'),
+)
+
+
+def is_local(address: Union[IPv4Address, IPv6Address]) -> bool:
+    """Check if an address is local."""
+    return address in LOCAL_IPS or \
+        any(address in network for network in LOCAL_NETWORKS)
diff --git a/tests/components/config/test_config_entries.py b/tests/components/config/test_config_entries.py
index 1e3b507727c..67d7eebbfec 100644
--- a/tests/components/config/test_config_entries.py
+++ b/tests/components/config/test_config_entries.py
@@ -206,6 +206,8 @@ def test_create_account(hass, client):
         'title': 'Test Entry',
         'type': 'create_entry',
         'version': 1,
+        'description': None,
+        'description_placeholders': None,
     }
 
 
@@ -266,6 +268,8 @@ def test_two_step_flow(hass, client):
             'type': 'create_entry',
             'title': 'user-title',
             'version': 1,
+            'description': None,
+            'description_placeholders': None,
         }
 
 
diff --git a/tests/components/ifttt/__init__.py b/tests/components/ifttt/__init__.py
new file mode 100644
index 00000000000..2fe2f40276c
--- /dev/null
+++ b/tests/components/ifttt/__init__.py
@@ -0,0 +1 @@
+"""Tests for the IFTTT component."""
diff --git a/tests/components/ifttt/test_init.py b/tests/components/ifttt/test_init.py
new file mode 100644
index 00000000000..61d6654ba55
--- /dev/null
+++ b/tests/components/ifttt/test_init.py
@@ -0,0 +1,48 @@
+"""Test the init file of IFTTT."""
+from unittest.mock import Mock, patch
+
+from homeassistant import data_entry_flow
+from homeassistant.core import callback
+from homeassistant.components import ifttt
+
+
+async def test_config_flow_registers_webhook(hass, aiohttp_client):
+    """Test setting up IFTTT and sending webhook."""
+    with patch('homeassistant.util.get_local_ip', return_value='example.com'):
+        result = await hass.config_entries.flow.async_init('ifttt', context={
+            'source': 'user'
+        })
+    assert result['type'] == data_entry_flow.RESULT_TYPE_FORM, result
+
+    result = await hass.config_entries.flow.async_configure(
+        result['flow_id'], {})
+    assert result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    webhook_id = result['result'].data['webhook_id']
+
+    ifttt_events = []
+
+    @callback
+    def handle_event(event):
+        """Handle IFTTT event."""
+        ifttt_events.append(event)
+
+    hass.bus.async_listen(ifttt.EVENT_RECEIVED, handle_event)
+
+    client = await aiohttp_client(hass.http.app)
+    await client.post('/api/webhook/{}'.format(webhook_id), json={
+        'hello': 'ifttt'
+    })
+
+    assert len(ifttt_events) == 1
+    assert ifttt_events[0].data['webhook_id'] == webhook_id
+    assert ifttt_events[0].data['hello'] == 'ifttt'
+
+
+async def test_config_flow_aborts_external_url(hass, aiohttp_client):
+    """Test setting up IFTTT and sending webhook."""
+    hass.config.api = Mock(base_url='http://192.168.1.10')
+    result = await hass.config_entries.flow.async_init('ifttt', context={
+        'source': 'user'
+    })
+    assert result['type'] == data_entry_flow.RESULT_TYPE_ABORT
+    assert result['reason'] == 'not_internet_accessible'
diff --git a/tests/components/test_webhook.py b/tests/components/test_webhook.py
new file mode 100644
index 00000000000..c87687292a8
--- /dev/null
+++ b/tests/components/test_webhook.py
@@ -0,0 +1,98 @@
+"""Test the webhook component."""
+from unittest.mock import Mock
+
+import pytest
+
+from homeassistant.setup import async_setup_component
+
+
+@pytest.fixture
+def mock_client(hass, aiohttp_client):
+    """Create http client for webhooks."""
+    hass.loop.run_until_complete(async_setup_component(hass, 'webhook', {}))
+    return hass.loop.run_until_complete(aiohttp_client(hass.http.app))
+
+
+async def test_unregistering_webhook(hass, mock_client):
+    """Test unregistering a webhook."""
+    hooks = []
+    webhook_id = hass.components.webhook.async_generate_id()
+
+    async def handle(*args):
+        """Handle webhook."""
+        hooks.append(args)
+
+    hass.components.webhook.async_register(webhook_id, handle)
+
+    resp = await mock_client.post('/api/webhook/{}'.format(webhook_id))
+    assert resp.status == 200
+    assert len(hooks) == 1
+
+    hass.components.webhook.async_unregister(webhook_id)
+
+    resp = await mock_client.post('/api/webhook/{}'.format(webhook_id))
+    assert resp.status == 200
+    assert len(hooks) == 1
+
+
+async def test_generate_webhook_url(hass):
+    """Test we generate a webhook url correctly."""
+    hass.config.api = Mock(base_url='https://example.com')
+    url = hass.components.webhook.async_generate_url('some_id')
+
+    assert url == 'https://example.com/api/webhook/some_id'
+
+
+async def test_posting_webhook_nonexisting(hass, mock_client):
+    """Test posting to a nonexisting webhook."""
+    resp = await mock_client.post('/api/webhook/non-existing')
+    assert resp.status == 200
+
+
+async def test_posting_webhook_invalid_json(hass, mock_client):
+    """Test posting to a nonexisting webhook."""
+    hass.components.webhook.async_register('hello', None)
+    resp = await mock_client.post('/api/webhook/hello', data='not-json')
+    assert resp.status == 200
+
+
+async def test_posting_webhook_json(hass, mock_client):
+    """Test posting a webhook with JSON data."""
+    hooks = []
+    webhook_id = hass.components.webhook.async_generate_id()
+
+    async def handle(*args):
+        """Handle webhook."""
+        hooks.append(args)
+
+    hass.components.webhook.async_register(webhook_id, handle)
+
+    resp = await mock_client.post('/api/webhook/{}'.format(webhook_id), json={
+        'data': True
+    })
+    assert resp.status == 200
+    assert len(hooks) == 1
+    assert hooks[0][0] is hass
+    assert hooks[0][1] == webhook_id
+    assert hooks[0][2] == {
+        'data': True
+    }
+
+
+async def test_posting_webhook_no_data(hass, mock_client):
+    """Test posting a webhook with no data."""
+    hooks = []
+    webhook_id = hass.components.webhook.async_generate_id()
+
+    async def handle(*args):
+        """Handle webhook."""
+        hooks.append(args)
+
+    hass.components.webhook.async_register(webhook_id, handle)
+
+    resp = await mock_client.post('/api/webhook/{}'.format(webhook_id))
+    assert resp.status == 200
+    assert len(hooks) == 1
+    assert hooks[0][0] is hass
+    assert hooks[0][1] == webhook_id
+    assert hooks[0][2] == {}

From 1b7bfec2477e98be8b1428085e5d40d1e9943c3e Mon Sep 17 00:00:00 2001
From: Totoo <ttotoo@gmail.com>
Date: Sun, 30 Sep 2018 15:17:39 +0200
Subject: [PATCH 357/357] Google Maps supports battery level and charging.
 (#16969)

* Google Maps supports battery level and charging.

With 3.0.2 locationsharinglib now the battery level and the charging attributes are available.

* Update google_maps.py

fix too long line error

* Update google_maps.py

Fix multi line import, and line length limit

* Update gen_requirements_all.py

Add locationsharinglib to gen_requirements_all

* update requirements_all

* Last try to fix requirements_all...
---
 homeassistant/components/device_tracker/google_maps.py | 8 ++++++--
 requirements_all.txt                                   | 2 +-
 requirements_test_all.txt                              | 3 +++
 script/gen_requirements_all.py                         | 1 +
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/device_tracker/google_maps.py b/homeassistant/components/device_tracker/google_maps.py
index 170d3de6800..c0dcd2f00a7 100644
--- a/homeassistant/components/device_tracker/google_maps.py
+++ b/homeassistant/components/device_tracker/google_maps.py
@@ -11,13 +11,15 @@ import voluptuous as vol
 
 from homeassistant.components.device_tracker import (
     PLATFORM_SCHEMA, SOURCE_TYPE_GPS)
-from homeassistant.const import ATTR_ID, CONF_PASSWORD, CONF_USERNAME
+from homeassistant.const import (
+    ATTR_ID, CONF_PASSWORD, CONF_USERNAME, ATTR_BATTERY_CHARGING,
+    ATTR_BATTERY_LEVEL)
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.event import track_time_interval
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util import slugify, dt as dt_util
 
-REQUIREMENTS = ['locationsharinglib==2.0.11']
+REQUIREMENTS = ['locationsharinglib==3.0.2']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -94,6 +96,8 @@ class GoogleMapsScanner:
                 ATTR_ID: person.id,
                 ATTR_LAST_SEEN: dt_util.as_utc(person.datetime),
                 ATTR_NICKNAME: person.nickname,
+                ATTR_BATTERY_CHARGING: person.charging,
+                ATTR_BATTERY_LEVEL: person.battery_level
             }
             self.see(
                 dev_id=dev_id,
diff --git a/requirements_all.txt b/requirements_all.txt
index 53d38f09f3b..638599b9642 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -558,7 +558,7 @@ liveboxplaytv==2.0.2
 lmnotify==0.0.4
 
 # homeassistant.components.device_tracker.google_maps
-locationsharinglib==2.0.11
+locationsharinglib==3.0.2
 
 # homeassistant.components.logi_circle
 logi_circle==0.1.7
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index a04f0570ee9..540a200ad32 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -103,6 +103,9 @@ libpurecoollink==0.4.2
 # homeassistant.components.media_player.soundtouch
 libsoundtouch==0.7.2
 
+# homeassistant.components.device_tracker.google_maps
+locationsharinglib==3.0.2
+
 # homeassistant.components.sensor.mfi
 # homeassistant.components.switch.mfi
 mficlient==0.3.0
diff --git a/script/gen_requirements_all.py b/script/gen_requirements_all.py
index 7493e523273..3fca95e1adf 100755
--- a/script/gen_requirements_all.py
+++ b/script/gen_requirements_all.py
@@ -63,6 +63,7 @@ TEST_REQUIREMENTS = (
     'influxdb',
     'libpurecoollink',
     'libsoundtouch',
+    'locationsharinglib',
     'mficlient',
     'numpy',
     'paho-mqtt',