From 8a3f8457e8bfcf65b94aff3d7cc5e7053ac87bb3 Mon Sep 17 00:00:00 2001
From: Walter Huf <hufman@gmail.com>
Date: Sun, 17 Sep 2017 02:32:22 -0700
Subject: [PATCH] Adds MQTT Fan Discovery (#9463)

---
 homeassistant/components/fan/mqtt.py       |  3 +++
 homeassistant/components/mqtt/discovery.py |  3 ++-
 tests/components/mqtt/test_discovery.py    | 17 +++++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/fan/mqtt.py b/homeassistant/components/fan/mqtt.py
index 58ac08ce16f..e76e11d4786 100644
--- a/homeassistant/components/fan/mqtt.py
+++ b/homeassistant/components/fan/mqtt.py
@@ -78,6 +78,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 fan platform."""
+    if discovery_info is not None:
+        config = PLATFORM_SCHEMA(discovery_info)
+
     async_add_devices([MqttFan(
         config.get(CONF_NAME),
         {
diff --git a/homeassistant/components/mqtt/discovery.py b/homeassistant/components/mqtt/discovery.py
index f76c4e9d527..7140423633e 100644
--- a/homeassistant/components/mqtt/discovery.py
+++ b/homeassistant/components/mqtt/discovery.py
@@ -20,10 +20,11 @@ TOPIC_MATCHER = re.compile(
     r'(?P<prefix_topic>\w+)/(?P<component>\w+)/'
     r'(?:(?P<node_id>[a-zA-Z0-9_-]+)/)?(?P<object_id>[a-zA-Z0-9_-]+)/config')
 
-SUPPORTED_COMPONENTS = ['binary_sensor', 'light', 'sensor', 'switch']
+SUPPORTED_COMPONENTS = ['binary_sensor', 'fan', 'light', 'sensor', 'switch']
 
 ALLOWED_PLATFORMS = {
     'binary_sensor': ['mqtt'],
+    'fan': ['mqtt'],
     'light': ['mqtt', 'mqtt_json', 'mqtt_template'],
     'sensor': ['mqtt'],
     'switch': ['mqtt'],
diff --git a/tests/components/mqtt/test_discovery.py b/tests/components/mqtt/test_discovery.py
index e865b524f85..d0704aac227 100644
--- a/tests/components/mqtt/test_discovery.py
+++ b/tests/components/mqtt/test_discovery.py
@@ -77,6 +77,23 @@ def test_correct_config_discovery(hass, mqtt_mock, caplog):
     assert ('binary_sensor', 'bla') in hass.data[ALREADY_DISCOVERED]
 
 
+@asyncio.coroutine
+def test_discover_fan(hass, mqtt_mock, caplog):
+    """Test discovering an MQTT fan."""
+    yield from async_start(hass, 'homeassistant', {})
+
+    async_fire_mqtt_message(hass, 'homeassistant/fan/bla/config',
+                            ('{ "name": "Beer",'
+                             '  "command_topic": "test_topic" }'))
+    yield from hass.async_block_till_done()
+
+    state = hass.states.get('fan.beer')
+
+    assert state is not None
+    assert state.name == 'Beer'
+    assert ('fan', 'bla') in hass.data[ALREADY_DISCOVERED]
+
+
 @asyncio.coroutine
 def test_discovery_incl_nodeid(hass, mqtt_mock, caplog):
     """Test sending in correct JSON with optional node_id included."""