Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Retry yeelight setup later if the wrong device is found #98884

Merged
merged 3 commits into from Aug 24, 2023

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented Aug 23, 2023

Proposed change

If the DHCP reservation changed and there is now a different yeelight device at the saved IP address, retry setup later to avoid cross linking devices

Note: this will not fix existing cross linked devices. It will only prevent the problem from happening again. Existing config entries with the issue will have to be removed manually and set up again.

This is a more general problem.. see:

Type of change

  • Dependency upgrade
  • Bugfix (non-breaking change which fixes an issue)
  • New integration (thank you!)
  • New feature (which adds functionality to an existing integration)
  • Deprecation (breaking change to happen in the future)
  • Breaking change (fix/feature causing existing functionality to break)
  • Code quality improvements to existing code or addition of tests

Additional information

  • This PR fixes or closes issue: fixes #
  • This PR is related to issue:
  • Link to documentation pull request:

Checklist

  • The code change is tested and works locally.
  • Local tests pass. Your PR cannot be merged unless tests pass
  • There is no commented out code in this PR.
  • I have followed the development checklist
  • I have followed the perfect PR recommendations
  • The code has been formatted using Black (black --fast homeassistant tests)
  • Tests have been added to verify that the new code works.

If user exposed functionality or configuration variables are added/changed:

If the code communicates with devices, web services, or third-party tools:

  • The manifest file has all fields filled out correctly.
    Updated and included derived files by running: python3 -m script.hassfest.
  • New or updated dependencies have been added to requirements_all.txt.
    Updated by running python3 -m script.gen_requirements_all.
  • For the updated dependencies - a link to the changelog, or at minimum a diff between library versions is added to the PR description.
  • Untested files have been added to .coveragerc.

To help with the load of incoming pull requests:

If the DHCP reservation changed and there is now a different yeelight device at the saved IP address, retry setup later to avoid cross linking devices

Note: this will not fix existing cross linked devices. It will only prevent the problem from happening again. Existing config entries with the issue will have to be removed manually and set up again.

This is a more general problem.. see:

- #98783
- #98787
- #98807
@home-assistant
Copy link

Hey there @zewelor, @shenxn, @starkillerOG, @alexyao2015, mind taking a look at this pull request as it has been labeled with an integration (yeelight) you are listed as a code owner for? Thanks!

Code owner commands

Code owners of yeelight can trigger bot actions by commenting:

  • @home-assistant close Closes the pull request.
  • @home-assistant rename Awesome new title Renames the pull request.
  • @home-assistant reopen Reopen the pull request.
  • @home-assistant unassign yeelight Removes the current integration label and assignees on the pull request, add the integration domain after the command.

@bdraco bdraco marked this pull request as ready for review August 23, 2023 15:08
Copy link
Contributor

@starkillerOG starkillerOG left a comment

Choose a reason for hiding this comment

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

Seems good to me, but I have one question:
Why is the unique ID set with a or statement in the device?

self._unique_id = entry.unique_id or entry.entry_id

If it is set as the entry_id will this not cause problems?

@bdraco
Copy link
Member Author

bdraco commented Aug 23, 2023

Seems good to me, but I have one question: Why is the unique ID set with a or statement in the device?

self._unique_id = entry.unique_id or entry.entry_id

If it is set as the entry_id will this not cause problems?

If its unset we don't validate it so it will not be able to check if its the wrong device in
https://github.com/home-assistant/core/pull/98884/files#diff-523dd41ae1bde45cdfb516593d8f2f178477bf5ad2706205c96b9d14234c5cd2R222

That should only happen in the case where multicast is broken, but there isn't anything we can do about this problem as its a network issue.

Copy link
Member

@frenck frenck left a comment

Choose a reason for hiding this comment

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

Thanks, @bdraco 👍

../Frenck

@frenck frenck merged commit 849cfa3 into dev Aug 24, 2023
20 of 21 checks passed
@frenck frenck deleted the yeelight_wrong_device branch August 24, 2023 10:04
@bdraco
Copy link
Member Author

bdraco commented Aug 24, 2023

thanks

@github-actions github-actions bot locked and limited conversation to collaborators Aug 25, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants