deCONZ config entry

homeassistant/components/deconz/.translations/en.json

@@ -0,0 +1,25 @@
+{
+    "config": {
+        "title": "deCONZ",
+        "step": {
+            "init": {
+                "title": "Define deCONZ gateway",
+                "data": {
+                    "host": "Host",
+                    "port": "Port (default value: '80')"
+                }
+            },
+            "link": {
+                "title": "Link with deCONZ",
+                "description": "Unlock your deCONZ gateway to register with Home Assistant.\n\n1. Go to deCONZ system settings\n2. Press \"Unlock Gateway\" button"
+            }
+        },
+        "error": {
+            "no_key": "Couldn't get an API key"
+        },
+        "abort": {
+            "no_bridges": "No deCONZ bridges discovered",
+            "one_instance_only": "Component only supports one deCONZ instance"
+        }
+    }
+}

homeassistant/components/deconz/__init__.py

@@ -8,16 +8,17 @@
 
 import voluptuous as vol
 
+from homeassistant import config_entries
 from homeassistant.components.discovery import SERVICE_DECONZ
 from homeassistant.const import (
     CONF_API_KEY, CONF_HOST, CONF_PORT, EVENT_HOMEASSISTANT_STOP)
 from homeassistant.core import callback
 from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers import discovery
+from homeassistant.helpers import discovery, aiohttp_client
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.util.json import load_json, save_json
 
-REQUIREMENTS = ['pydeconz==32']
+REQUIREMENTS = ['pydeconz==33']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -186,3 +187,91 @@ async def async_configuration_callback(data):
         entity_picture="/static/images/logo_deconz.jpeg",
         submit_caption="I have unlocked the gateway",
     )
+
+
+@config_entries.HANDLERS.register(DOMAIN)
+class DeconzFlowHandler(config_entries.ConfigFlowHandler):
+    """Handle a deCONZ config flow."""
+
+    VERSION = 1
+
+    def __init__(self):
+        """Initialize the deCONZ flow."""
+        self.bridges = []
+        self.deconz_config = {}
+
+    async def async_step_init(self, user_input=None):
+        """Handle a flow start."""
+        from pydeconz.utils import async_discovery
+
+        if DOMAIN in self.hass.data:
+            return self.async_abort(
+                reason='one_instance_only'
+            )
+
+        if user_input is not None:
+            for bridge in self.bridges:
+                if bridge[CONF_HOST] == user_input[CONF_HOST]:
+                    self.deconz_config = bridge
+                    return await self.async_step_link()
+
+        session = aiohttp_client.async_get_clientsession(self.hass)
+        self.bridges = await async_discovery(session)
+
+        if len(self.bridges) == 1:
+            self.deconz_config = self.bridges[0]
+            return await self.async_step_link()
+        elif len(self.bridges) > 1:
+            hosts = []
+            for bridge in self.bridges:
+                hosts.append(bridge[CONF_HOST])
+            return self.async_show_form(
+                step_id='init',
+                data_schema=vol.Schema({
+                    vol.Required(CONF_HOST): vol.In(hosts)
+                })
+            )
+        else:
+            return self.async_abort(
+                reason='no_bridges'
+            )
+
+    async def async_step_link(self, user_input=None):
+        """Attempt to link with the deCONZ bridge."""
+        from pydeconz.utils import async_get_api_key
+        errors = {}
+
+        if user_input is not None:
+            api_key = await async_get_api_key(self.hass.loop, **self.deconz_config)
+            if api_key:
+                self.deconz_config[CONF_API_KEY] = api_key
+                return self.async_create_entry(
+                    title='deCONZ',
+                    data=self.deconz_config
+                )
+            else:
+                errors['base'] = 'no_key'
+
+        return self.async_show_form(
+            step_id='link',
+            errors=errors,
+        )
+
+
+async def async_setup_entry(hass, entry):
+    """Set up a bridge for a config entry."""
+    result = await async_setup_deconz(hass, None, entry.data)
+    if result:
+        return True
+    return False
+
+
+async def async_unload_entry(hass, entry):
+    """Unload an entry."""
+    deconz = hass.data[DOMAIN]
+    entity_ids = hass.data[DATA_DECONZ_ID]
+    for entity_id in entity_ids.keys():
+        hass.states.async_remove(entity_id)
+    deconz.close()
+    del hass.data[DOMAIN]
+    return True

homeassistant/components/deconz/strings.json

@@ -0,0 +1,25 @@
+{
+    "config": {
+        "title": "deCONZ",
+        "step": {
+            "init": {
+                "title": "Define deCONZ gateway",
+                "data": {
+                    "host": "Host",
+                    "port": "Port (default value: '80')"
+                }
+            },
+            "link": {
+                "title": "Link with deCONZ",
+                "description": "Unlock your deCONZ gateway to register with Home Assistant.\n\n1. Go to deCONZ system settings\n2. Press \"Unlock Gateway\" button"
+            }
+        },
+        "error": {
+            "no_key": "Couldn't get an API key"
+        },
+        "abort": {
+            "no_bridges": "No deCONZ bridges discovered",
+            "one_instance_only": "Component only supports one deCONZ instance"
+        }
+    }
+}

homeassistant/config_entries.py

@@ -128,6 +128,7 @@ async def async_step_discovery(info):
 FLOWS = [
     'config_entry_example',
     'hue',
+    'deconz',
 ]
 
 SOURCE_USER = 'user'

requirements_all.txt

@@ -704,7 +704,7 @@ pycsspeechtts==1.0.2
 pydaikin==0.4
 
 # homeassistant.components.deconz
-pydeconz==32
+pydeconz==33
 
 # homeassistant.components.zwave
 pydispatcher==2.0.5