Avoid using zigbee macs as network macs in hue#175083
Draft
joostlek wants to merge 1 commit into
Draft
Conversation
home-assistant
Bot
added
bugfix
cla-signed
has-tests
integration: hue
Top 100
Contributor
|
Hey there @marcelveldt, mind taking a look at this pull request as it has been labeled with an integration ( Code owner commandsCode owners of
|
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes a bug in the Philips Hue integration where Zigbee MAC addresses of Hue devices were stored in the device registry as CONNECTION_NETWORK_MAC connections instead of CONNECTION_ZIGBEE. It corrects new device creation and adds a config-entry migration (minor version bump 1 → 2) to fix already-registered devices on existing v2 bridges.
Changes:
- In
v2/device.py, usedr.CONNECTION_ZIGBEE(instead ofCONNECTION_NETWORK_MAC) when registering a device's Zigbee MAC. - Add
async_migrate_entry/_migrate_v2_zigbee_connectionsto rewrite existing devices' connections, bumpMINOR_VERSIONto 2 in the config flow, and gracefully defer migration (retry next start) when the bridge is unavailable. - Add tests for the new device connection, the migration of existing entries, and the v1 skip path; mark existing/mock config entries as
minor_version=2so they bypass the new migration.
Reviewed changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| homeassistant/components/hue/v2/device.py | Register Zigbee MAC under CONNECTION_ZIGBEE instead of CONNECTION_NETWORK_MAC. |
| homeassistant/components/hue/init.py | Add async_migrate_entry and helper to migrate existing v2 device connections; defer on bridge errors. |
| homeassistant/components/hue/config_flow.py | Bump MINOR_VERSION to 2 to trigger the migration. |
| tests/components/hue/test_init.py | Add test that new devices get a Zigbee connection; set minor_version=2 on existing entries. |
| tests/components/hue/test_migration.py | Add tests for v2 connection migration and v1 skip behavior. |
| tests/components/hue/conftest.py | Default mock config entries to minor_version=2 to skip the new migration. |
Comment on lines
+38
to
+40
| except AiohueException, aiohttp.ClientError, TimeoutError: | ||
| # bridge unavailable, retry the migration on the next start | ||
| return True |
erwindouna
requested changes
Jun 29, 2026
| await _migrate_v2_zigbee_connections(hass, entry) | ||
| except AiohueException, aiohttp.ClientError, TimeoutError: | ||
| # bridge unavailable, retry the migration on the next start | ||
| return True |
Member
There was a problem hiding this comment.
How many times we allow the migrations retry? Also, maybe the users should be getting some information in the logging (e.g. maybe they can fix stuff on their end if they're aware of it).
Contributor
|
Please take a look at the requested changes, and use the Ready for review button when you are done, thanks 👍 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Proposed change
Avoid using zigbee macs as network macs in hue
Type of change
Additional information
Checklist
ruff format homeassistant tests)If user exposed functionality or configuration variables are added/changed:
If the code communicates with devices, web services, or third-party tools:
Updated and included derived files by running:
python3 -m script.hassfest.requirements_all.txt.Updated by running
python3 -m script.gen_requirements_all.To help with the load of incoming pull requests: