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

Remove device from known_devices upon import in ping device tracker #105009

Merged
merged 7 commits into from Dec 5, 2023

Conversation

jpbede
Copy link
Member

@jpbede jpbede commented Dec 4, 2023

Proposed change

If the YAML is imported via the config flow and the device still exists in known_devices.yaml, the config entry will suffix the new entity with _2 as the entity is already used by the device_tracker platform which restores the entities from known_devices.yaml on restart.

This PR solves this problem by delaying the import of the device tracker after the start of the HA and then checking if there is already a state with this entity ID and if the device exists in known_devices.yaml before the import is triggered. If this is the case, the device is deleted from known_devices.yaml and the state machine and the import is triggered.

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 Ruff (ruff format 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

home-assistant bot commented Dec 4, 2023

Hey there @home-assistant/core, mind taking a look at this pull request as it has been labeled with an integration (device_tracker) you are listed as a code owner for? Thanks!

Code owner commands

Code owners of device_tracker 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 device_tracker Removes the current integration label and assignees on the pull request, add the integration domain after the command.
  • @home-assistant add-label needs-more-information Add a label (needs-more-information, problem in dependency, problem in custom component) to the pull request.
  • @home-assistant remove-label needs-more-information Remove a label (needs-more-information, problem in dependency, problem in custom component) on the pull request.

homeassistant/components/ping/device_tracker.py Outdated Show resolved Hide resolved
homeassistant/components/ping/device_tracker.py Outdated Show resolved Hide resolved
homeassistant/components/ping/device_tracker.py Outdated Show resolved Hide resolved
homeassistant/components/ping/device_tracker.py Outdated Show resolved Hide resolved
homeassistant/components/ping/device_tracker.py Outdated Show resolved Hide resolved
tests/components/ping/test_device_tracker.py Outdated Show resolved Hide resolved
@home-assistant home-assistant bot marked this pull request as draft December 5, 2023 12:08
@home-assistant
Copy link

home-assistant bot commented Dec 5, 2023

Please take a look at the requested changes, and use the Ready for review button when you are done, thanks 👍

Learn more about our pull request process.

@jpbede jpbede marked this pull request as ready for review December 5, 2023 15:16
Copy link
Member

@MartinHjelmare MartinHjelmare left a comment

Choose a reason for hiding this comment

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

Looks good!

@frenck frenck merged commit dc17780 into home-assistant:dev Dec 5, 2023
53 checks passed
frenck pushed a commit that referenced this pull request Dec 5, 2023
…105009)

Co-authored-by: Joost Lekkerkerker <joostlek@outlook.com>
@jpbede jpbede deleted the ping-delete-known-devices branch December 5, 2023 18:58
@jpbede
Copy link
Member Author

jpbede commented Dec 5, 2023

Thanks @MartinHjelmare

@github-actions github-actions bot locked and limited conversation to collaborators Dec 6, 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

4 participants