From 1cbf9792d768255fb7a5e136de9c5b23bf2048d2 Mon Sep 17 00:00:00 2001
From: Erik Eriksson <molobrakos@users.noreply.github.com>
Date: Sun, 18 Mar 2018 17:26:07 +0100
Subject: [PATCH] Support MQTT Lock discovery (#13303)

---
 homeassistant/components/lock/mqtt.py      | 3 +++
 homeassistant/components/mqtt/discovery.py | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/lock/mqtt.py b/homeassistant/components/lock/mqtt.py
index e73e35a9900..d8af22cd5c3 100644
--- a/homeassistant/components/lock/mqtt.py
+++ b/homeassistant/components/lock/mqtt.py
@@ -44,6 +44,9 @@ PLATFORM_SCHEMA = mqtt.MQTT_RW_PLATFORM_SCHEMA.extend({
 @asyncio.coroutine
 def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     """Set up the MQTT lock."""
+    if discovery_info is not None:
+        config = PLATFORM_SCHEMA(discovery_info)
+
     value_template = config.get(CONF_VALUE_TEMPLATE)
     if value_template is not None:
         value_template.hass = hass
diff --git a/homeassistant/components/mqtt/discovery.py b/homeassistant/components/mqtt/discovery.py
index d0164706626..3263521f3f1 100644
--- a/homeassistant/components/mqtt/discovery.py
+++ b/homeassistant/components/mqtt/discovery.py
@@ -20,13 +20,14 @@ TOPIC_MATCHER = re.compile(
     r'(?:(?P<node_id>[a-zA-Z0-9_-]+)/)?(?P<object_id>[a-zA-Z0-9_-]+)/config')
 
 SUPPORTED_COMPONENTS = [
-    'binary_sensor', 'cover', 'fan', 'light', 'sensor', 'switch']
+    'binary_sensor', 'cover', 'fan', 'light', 'sensor', 'switch', 'lock']
 
 ALLOWED_PLATFORMS = {
     'binary_sensor': ['mqtt'],
     'cover': ['mqtt'],
     'fan': ['mqtt'],
     'light': ['mqtt', 'mqtt_json', 'mqtt_template'],
+    'lock': ['mqtt'],
     'sensor': ['mqtt'],
     'switch': ['mqtt'],
 }