deCONZ - retry if setup fails (#17772)
* Make component retry if setup fails * Improve overall test coverage
This commit is contained in:
1 parent
145677ed75
commit
a9140dc8f5
19 files changed
+823
-475
No files matched your search
@@ -8,21 +8,15 @@ import voluptuous as vol
|
||||
|
||||
from homeassistant import config_entries
|
||||
from homeassistant.const import (
|
||||
CONF_API_KEY, CONF_EVENT, CONF_HOST,
|
||||
CONF_ID, CONF_PORT, EVENT_HOMEASSISTANT_STOP)
|
||||
from homeassistant.core import EventOrigin, callback
|
||||
from homeassistant.helpers import aiohttp_client, config_validation as cv
|
||||
CONF_API_KEY, CONF_HOST, CONF_PORT, EVENT_HOMEASSISTANT_STOP)
|
||||
from homeassistant.helpers import config_validation as cv
|
||||
from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
|
||||
from homeassistant.helpers.dispatcher import (
|
||||
async_dispatcher_connect, async_dispatcher_send)
|
||||
from homeassistant.util import slugify
|
||||
from homeassistant.util.json import load_json
|
||||
|
||||
# Loading the config flow file will register the flow
|
||||
from .config_flow import configured_hosts
|
||||
from .const import (
|
||||
CONF_ALLOW_CLIP_SENSOR, CONFIG_FILE, DATA_DECONZ_EVENT,
|
||||
DATA_DECONZ_ID, DATA_DECONZ_UNSUB, DOMAIN, _LOGGER)
|
||||
from .const import CONFIG_FILE, DOMAIN, _LOGGER
|
||||
from .gateway import DeconzGateway
|
||||
|
||||
REQUIREMENTS = ['pydeconz==47']
|
||||
|
||||
@@ -80,61 +74,26 @@ async def async_setup_entry(hass, config_entry):
|
||||
Load config, group, light and sensor data for server information.
|
||||
Start websocket for push notification of state changes from deCONZ.
|
||||
"""
|
||||
from pydeconz import DeconzSession
|
||||
if DOMAIN in hass.data:
|
||||
_LOGGER.error(
|
||||
"Config entry failed since one deCONZ instance already exists")
|
||||
return False
|
||||
|
||||
@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)
|
||||
gateway = DeconzGateway(hass, config_entry)
|
||||
|
||||
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()
|
||||
hass.data[DOMAIN] = gateway
|
||||
|
||||
if result is False:
|
||||
if not await gateway.async_setup():
|
||||
return False
|
||||
|
||||
hass.data[DOMAIN] = deconz
|
||||
hass.data[DATA_DECONZ_ID] = {}
|
||||
hass.data[DATA_DECONZ_EVENT] = []
|
||||
hass.data[DATA_DECONZ_UNSUB] = []
|
||||
|
||||
for component in SUPPORTED_PLATFORMS:
|
||||
hass.async_create_task(hass.config_entries.async_forward_entry_setup(
|
||||
config_entry, component))
|
||||
|
||||
@callback
|
||||
def async_add_remote(sensors):
|
||||
"""Set up remote from deCONZ."""
|
||||
from pydeconz.sensor import SWITCH as DECONZ_REMOTE
|
||||
allow_clip_sensor = config_entry.data.get(CONF_ALLOW_CLIP_SENSOR, True)
|
||||
for sensor in sensors:
|
||||
if sensor.type in DECONZ_REMOTE and \
|
||||
not (not allow_clip_sensor and sensor.type.startswith('CLIP')):
|
||||
hass.data[DATA_DECONZ_EVENT].append(DeconzEvent(hass, sensor))
|
||||
hass.data[DATA_DECONZ_UNSUB].append(
|
||||
async_dispatcher_connect(hass, 'deconz_new_sensor', async_add_remote))
|
||||
|
||||
async_add_remote(deconz.sensors.values())
|
||||
|
||||
deconz.start()
|
||||
|
||||
device_registry = await \
|
||||
hass.helpers.device_registry.async_get_registry()
|
||||
device_registry.async_get_or_create(
|
||||
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,
|
||||
name=deconz.config.name, sw_version=deconz.config.swversion)
|
||||
connections={(CONNECTION_NETWORK_MAC, gateway.api.config.mac)},
|
||||
identifiers={(DOMAIN, gateway.api.config.bridgeid)},
|
||||
manufacturer='Dresden Elektronik', model=gateway.api.config.modelid,
|
||||
name=gateway.api.config.name, sw_version=gateway.api.config.swversion)
|
||||
|
||||
async def async_configure(call):
|
||||
"""Set attribute of device in deCONZ.
|
||||
@@ -155,121 +114,66 @@ async def async_setup_entry(hass, config_entry):
|
||||
field = call.data.get(SERVICE_FIELD, '')
|
||||
entity_id = call.data.get(SERVICE_ENTITY)
|
||||
data = call.data.get(SERVICE_DATA)
|
||||
deconz = hass.data[DOMAIN]
|
||||
gateway = hass.data[DOMAIN]
|
||||
|
||||
if entity_id:
|
||||
try:
|
||||
field = hass.data[DATA_DECONZ_ID][entity_id] + field
|
||||
field = gateway.deconz_ids[entity_id] + field
|
||||
except KeyError:
|
||||
_LOGGER.error('Could not find the entity %s', entity_id)
|
||||
return
|
||||
|
||||
await deconz.async_put_state(field, data)
|
||||
await gateway.api.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]
|
||||
gateway = hass.data[DOMAIN]
|
||||
|
||||
groups = list(deconz.groups.keys())
|
||||
lights = list(deconz.lights.keys())
|
||||
scenes = list(deconz.scenes.keys())
|
||||
sensors = list(deconz.sensors.keys())
|
||||
groups = set(gateway.api.groups.keys())
|
||||
lights = set(gateway.api.lights.keys())
|
||||
scenes = set(gateway.api.scenes.keys())
|
||||
sensors = set(gateway.api.sensors.keys())
|
||||
|
||||
if not await deconz.async_load_parameters():
|
||||
if not await gateway.api.async_load_parameters():
|
||||
return
|
||||
|
||||
async_add_device_callback(
|
||||
gateway.async_add_device_callback(
|
||||
'group', [group
|
||||
for group_id, group in deconz.groups.items()
|
||||
for group_id, group in gateway.api.groups.items()
|
||||
if group_id not in groups]
|
||||
)
|
||||
|
||||
async_add_device_callback(
|
||||
gateway.async_add_device_callback(
|
||||
'light', [light
|
||||
for light_id, light in deconz.lights.items()
|
||||
for light_id, light in gateway.api.lights.items()
|
||||
if light_id not in lights]
|
||||
)
|
||||
|
||||
async_add_device_callback(
|
||||
gateway.async_add_device_callback(
|
||||
'scene', [scene
|
||||
for scene_id, scene in deconz.scenes.items()
|
||||
for scene_id, scene in gateway.api.scenes.items()
|
||||
if scene_id not in scenes]
|
||||
)
|
||||
|
||||
async_add_device_callback(
|
||||
gateway.async_add_device_callback(
|
||||
'sensor', [sensor
|
||||
for sensor_id, sensor in deconz.sensors.items()
|
||||
for sensor_id, sensor in gateway.api.sensors.items()
|
||||
if sensor_id not in sensors]
|
||||
)
|
||||
|
||||
hass.services.async_register(
|
||||
DOMAIN, SERVICE_DEVICE_REFRESH, async_refresh_devices)
|
||||
|
||||
@callback
|
||||
def deconz_shutdown(event):
|
||||
"""
|
||||
Wrap the call to deconz.close.
|
||||
|
||||
Used as an argument to EventBus.async_listen_once - EventBus calls
|
||||
this method with the event as the first argument, which should not
|
||||
be passed on to deconz.close.
|
||||
"""
|
||||
deconz.close()
|
||||
|
||||
hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, deconz_shutdown)
|
||||
hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, gateway.shutdown)
|
||||
return True
|
||||
|
||||
|
||||
async def async_unload_entry(hass, config_entry):
|
||||
"""Unload deCONZ config entry."""
|
||||
deconz = hass.data.pop(DOMAIN)
|
||||
gateway = hass.data.pop(DOMAIN)
|
||||
hass.services.async_remove(DOMAIN, SERVICE_DECONZ)
|
||||
deconz.close()
|
||||
|
||||
for component in SUPPORTED_PLATFORMS:
|
||||
await hass.config_entries.async_forward_entry_unload(
|
||||
config_entry, component)
|
||||
|
||||
dispatchers = hass.data[DATA_DECONZ_UNSUB]
|
||||
for unsub_dispatcher in dispatchers:
|
||||
unsub_dispatcher()
|
||||
hass.data[DATA_DECONZ_UNSUB] = []
|
||||
|
||||
for event in hass.data[DATA_DECONZ_EVENT]:
|
||||
event.async_will_remove_from_hass()
|
||||
hass.data[DATA_DECONZ_EVENT].remove(event)
|
||||
|
||||
hass.data[DATA_DECONZ_ID] = []
|
||||
|
||||
return True
|
||||
|
||||
|
||||
class DeconzEvent:
|
||||
"""When you want signals instead of entities.
|
||||
|
||||
Stateless sensors such as remotes are expected to generate an event
|
||||
instead of a sensor entity in hass.
|
||||
"""
|
||||
|
||||
def __init__(self, hass, device):
|
||||
"""Register callback that will be used for signals."""
|
||||
self._hass = hass
|
||||
self._device = device
|
||||
self._device.register_async_callback(self.async_update_callback)
|
||||
self._event = 'deconz_{}'.format(CONF_EVENT)
|
||||
self._id = slugify(self._device.name)
|
||||
|
||||
@callback
|
||||
def async_will_remove_from_hass(self) -> None:
|
||||
"""Disconnect event object when removed."""
|
||||
self._device.remove_callback(self.async_update_callback)
|
||||
self._device = None
|
||||
|
||||
@callback
|
||||
def async_update_callback(self, reason):
|
||||
"""Fire the event if reason is that state is updated."""
|
||||
if reason['state']:
|
||||
data = {CONF_ID: self._id, CONF_EVENT: self._device.state}
|
||||
self._hass.bus.async_fire(self._event, data, EventOrigin.remote)
|
||||
hass.services.async_remove(DOMAIN, SERVICE_DEVICE_REFRESH)
|
||||
return await gateway.async_reset()
|
||||
Reference in new issue
Block a user