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

Abort Shelly setup if MAC address mismatch #98807

Merged
merged 1 commit into from Aug 22, 2023

Conversation

thecode
Copy link
Member

@thecode thecode commented Aug 22, 2023

Proposed change

Recently bumped aioshelly to version 6.0.0 now reports if the supplied MAC address doesn't match the one read from the device under /shelly endpoint. This may happen due to DHCP address change while Home Assistant is offline, full details in home-assistant-libs/aioshelly#415

With this change we abort setup and when new IP address is updated (either by DHCP or mDNS) the device is init with the new IP.

Tested on Shelly 2.5 & Shelly Pro 2PM

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

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:

@home-assistant
Copy link

Hey there @balloob, @bieniu, @chemelli74, @bdraco, mind taking a look at this pull request as it has been labeled with an integration (shelly) you are listed as a code owner for? Thanks!

Code owner commands

Code owners of shelly 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 shelly Removes the current integration label and assignees on the pull request, add the integration domain after the command.

@bdraco
Copy link
Member

bdraco commented Aug 22, 2023

Also this problem affects nearly every integration where there are multiple devices of the same type

Some recent text from the esphome pr I just opened:

This is a more general problem as #97457 (tplink) and #92955 (lifx) also have the same problem. This solution is similar to the used in flux_led

# The device is offline and another flux_led device is now using the ip address
except for ESPHome we allow the name or the mac to change (for device replacement), but not both at the same time.

@bdraco
Copy link
Member

bdraco commented Aug 22, 2023

Tested on a us plug

@bdraco bdraco merged commit 406f06f into home-assistant:dev Aug 22, 2023
21 checks passed
@thecode thecode deleted the shelly-abort-mac branch August 22, 2023 12:46
@thecode
Copy link
Member Author

thecode commented Aug 22, 2023

Thanks!

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.

Device Connection error, seems to mix IP addresses
5 participants