deCONZ - Support device registry #16115

Kane610 · 2018-08-21T21:34:58Z

Description:

Use device registry #15980

Checklist:

The code change is tested and works locally.
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

If the code does not interact with devices:

Tests have been added to verify that the new code works.

houndci-bot · 2018-08-21T21:35:11Z

homeassistant/components/deconz/__init__.py

@@ -119,6 +119,13 @@ def async_add_remote(sensors):

    deconz.start()

+    device_registry = await \
+		              hass.helpers.device_registry.async_get_registry()
+    device_registry.async_get_or_create(


indentation contains mixed spaces and tabs

houndci-bot · 2018-08-21T21:35:11Z

homeassistant/components/deconz/__init__.py

@@ -119,6 +119,13 @@ def async_add_remote(sensors):

    deconz.start()

+    device_registry = await \
+		              hass.helpers.device_registry.async_get_registry()


indentation contains tabs
indentation contains mixed spaces and tabs
continuation line over-indented for visual indent

balloob · 2018-08-22T11:57:55Z

homeassistant/components/binary_sensor/deconz.py

+            'identifiers': [['serial', serial]],
+            'manufacturer': self._sensor.manufacturer,
+            'model': self._sensor.modelid,
+            'connection': [['Zigbee', serial]],


I think that we need to extract 'zigbee' and 'serial' into constants and store them in helpers/device_registry.py.

Also, I thought Zigbee had mac addresses to identify them on the network ?

I can create the constants for the once in this PR.

Yes, it is just that they name it serial in deconz. I also need to filter out the extra characters that define each sensor on device. I can rename it Mac if you want

balloob · 2018-08-22T11:58:57Z

homeassistant/components/deconz/__init__.py

+    device_registry = await \
+        hass.helpers.device_registry.async_get_registry()
+    device_registry.async_get_or_create(
+        [['bridgeid', deconz.config.bridgeid]], 'Dresden Elektronik',


This should not be 'bridgeid' but DOMAIN, as it's a unique identifier of the Deconz domain.

balloob · 2018-08-22T11:59:54Z

homeassistant/components/deconz/__init__.py

+        hass.helpers.device_registry.async_get_registry()
+    device_registry.async_get_or_create(
+        [['bridgeid', deconz.config.bridgeid]], 'Dresden Elektronik',
+        deconz.config.modelid, [['Ethernet', deconz.config.mac]],


WiFi and Ethernet share the same mac address space, so we should also group them into the same connection category.

So network?

balloob · 2018-08-22T12:01:02Z

homeassistant/components/deconz/__init__.py

@@ -119,6 +119,13 @@ def async_add_remote(sensors):

    deconz.start()

+    device_registry = await \
+        hass.helpers.device_registry.async_get_registry()
+    device_registry.async_get_or_create(


As this example might be copied a lot, I would prefer that we use named arguments to clarify what is what:

device_registry.async_get_or_create( identifiers=[[DOMAIN, deconz.config.bridgeid]], manufacturer='Dresden Elektronik', # etc )

balloob · 2018-08-22T12:02:35Z

homeassistant/components/light/deconz.py

+        else:
+            return None
+        dev = {
+            'identifiers': [['serial', serial]],


houndci-bot · 2018-08-22T20:01:19Z

tests/components/deconz/test_init.py

-               return_value=mock_coro(True)):
+    with patch('pydeconz.DeconzSession.async_get_state',
+               return_value=mock_coro(CONFIG)), \
+         patch('pydeconz.DeconzSession.start', return_value=True):


continuation line over-indented for visual indent

houndci-bot · 2018-08-22T20:01:19Z

tests/components/deconz/test_init.py

-              return_value=mock_coro(True)):
+         patch('pydeconz.DeconzSession.async_get_state',
+               return_value=mock_coro(CONFIG)), \
+         patch('pydeconz.DeconzSession.start', return_value=True):


continuation line over-indented for visual indent

houndci-bot · 2018-08-22T20:01:19Z

tests/components/deconz/test_init.py

    with patch.object(deconz, 'async_dispatcher_send') as mock_dispatch_send, \
-        patch('pydeconz.DeconzSession.async_load_parameters',
-              return_value=mock_coro(True)):
+         patch('pydeconz.DeconzSession.async_get_state',


continuation line over-indented for visual indent

houndci-bot · 2018-08-22T20:01:20Z

tests/components/deconz/test_init.py

+    entry.add_to_hass(hass)
+    with patch('pydeconz.DeconzSession.async_get_state',
+               return_value=mock_coro(CONFIG)), \
+         patch('pydeconz.DeconzSession.start', return_value=True):


continuation line over-indented for visual indent

Kane610 · 2018-08-23T05:01:06Z

Something weird is happening with the tests, they don't want to finish.

balloob · 2018-08-23T08:42:33Z

homeassistant/components/binary_sensor/deconz.py

+    @property
+    def device(self):
+        """Description for device registry."""
+        if (self._sensor.uniqueid is not None and


Can you inverse this logic to make the method a bit easier to read

if (self._sensor.uniqueid is None or self._sensor.uniqueid.count(':') != 7): return None return { … }

I can evaluate positive on the counter instead. Then leave return None to be at the end of the method instead.

balloob · 2018-08-23T09:00:39Z

homeassistant/components/light/deconz.py

+    @property
+    def device(self):
+        """Description for device registry."""
+        if (self._light.uniqueid is not None and


balloob · 2018-08-23T09:00:53Z

homeassistant/components/sensor/deconz.py

+    @property
+    def device(self):
+        """Description for device registry."""
+        if (self._device.uniqueid is not None and


balloob · 2018-08-23T09:00:59Z

homeassistant/components/switch/deconz.py

+    @property
+    def device(self):
+        """Description for device registry."""
+        if (self._switch.uniqueid is not None and


balloob · 2018-08-23T09:02:59Z

homeassistant/components/binary_sensor/deconz.py

+            return None
+        dev = {
+            'connection': [[CONNECTION_ZIGBEE, mac]],
+            'identifiers': [[IDENTIFIER_MAC, mac]],


There should not be an identifier MAC. There is already a connection one.

Is there a serial number for this sensor? In that case you could add [DECONZ_DOMAIN, serial]

Also MAC should never be used as just a standalone type, as there is Network MAC, Zigbee MAC etc.

Good point with DECONZ_DOMAIN since it should only map inside of deconz context 👍

Previously you asked if the sensor had a mac, I will go back to using serial :)

Should I just call them NETWORK_MAC and ZIGBEE_MAC?

balloob · 2018-08-24T15:00:30Z

ok to merge when tests pass.

Add support for device registry in deCONZ component

homeassistant added cla-signed integration: deconz platform: binary_sensor.deconz labels Aug 21, 2018

ghost assigned Kane610 Aug 21, 2018

ghost added the in progress label Aug 21, 2018

houndci-bot reviewed Aug 21, 2018

View reviewed changes

homeassistant added the cla-signed label Aug 21, 2018

balloob reviewed Aug 22, 2018

View reviewed changes

homeassistant/components/light/deconz.py Outdated

else:

return None

dev = {

'identifiers': [['serial', serial]],

Copy link

Member

balloob Aug 22, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

constant.

Kane610 added 2 commits August 22, 2018 16:09

Support device registry

8dbda5a

Fix hound comment

82c0745

Kane610 force-pushed the deconz-device-registry branch from efec03e to 82c0745 Compare August 22, 2018 14:10

homeassistant added the cla-signed label Aug 22, 2018

Fix Balloobs comments

38b51a1

Kane610 requested a review from a team as a code owner August 22, 2018 14:44

homeassistant added the cla-signed label Aug 22, 2018

Kane610 added 4 commits August 22, 2018 16:49

Update tests

bb8eb38

Add missing pydoc string

454c2da

Partial test fix

7069980

Update tests

15ba6ab

houndci-bot reviewed Aug 22, 2018

View reviewed changes

Fix styling comments

16a7191

Kane610 changed the title ~~WIP: deCONZ - Support device registry~~ deCONZ - Support device registry Aug 23, 2018

balloob reviewed Aug 23, 2018

View reviewed changes

Fix test

7fcfc74

homeassistant added the cla-signed label Aug 23, 2018

Kane610 added 4 commits August 23, 2018 17:00

Improve readability of platform device descriptions

7b48826

Fix identifiers

4d3c28c

Inverse check in device property

df79e77

Added second half of logic

33405d8

balloob approved these changes Aug 24, 2018

View reviewed changes

balloob added this to the 0.77 milestone Aug 24, 2018

Lint

067c0f8

homeassistant added the cla-signed label Aug 24, 2018

Kane610 merged commit e91a152 into home-assistant:dev Aug 24, 2018

ghost removed the in progress label Aug 24, 2018

balloob added the cherry-picked label Aug 25, 2018

balloob pushed a commit that referenced this pull request Aug 25, 2018

deCONZ - Support device registry (#16115)

e567b22

Add support for device registry in deCONZ component

Kane610 deleted the deconz-device-registry branch August 29, 2018 08:30

balloob mentioned this pull request Aug 29, 2018

0.77 #16256

Merged

girlpunk pushed a commit to girlpunk/home-assistant that referenced this pull request Sep 4, 2018

deCONZ - Support device registry (home-assistant#16115)

144057c

Add support for device registry in deCONZ component

home-assistant locked and limited conversation to collaborators Dec 10, 2018

ghost removed platform: binary_sensor.deconz labels Mar 21, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

deCONZ - Support device registry #16115

deCONZ - Support device registry #16115

Kane610 commented Aug 21, 2018 •

edited

Loading

houndci-bot Aug 21, 2018

houndci-bot Aug 21, 2018

balloob Aug 22, 2018

Kane610 Aug 22, 2018

balloob Aug 22, 2018

balloob Aug 22, 2018

Kane610 Aug 22, 2018

balloob Aug 22, 2018

balloob Aug 22, 2018

houndci-bot Aug 22, 2018

houndci-bot Aug 22, 2018

houndci-bot Aug 22, 2018

houndci-bot Aug 22, 2018

Kane610 commented Aug 23, 2018

balloob Aug 23, 2018 •

edited

Loading

Kane610 Aug 23, 2018

balloob Aug 23, 2018

balloob Aug 23, 2018

balloob Aug 23, 2018

balloob Aug 23, 2018

Kane610 Aug 23, 2018

balloob Aug 24, 2018

balloob commented Aug 24, 2018

deCONZ - Support device registry #16115

deCONZ - Support device registry #16115

Conversation

Kane610 commented Aug 21, 2018 • edited Loading

Description:

Checklist:

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Kane610 commented Aug 23, 2018

balloob Aug 23, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

balloob commented Aug 24, 2018

Kane610 commented Aug 21, 2018 •

edited

Loading

balloob Aug 23, 2018 •

edited

Loading