Fix Reolink DHCP IP update #103654
Merged
Fix Reolink DHCP IP update #103654
Conversation
This file contains 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
home-assistant
bot
added
bugfix
cla-signed
integration: reolink
small-pr
bdraco
reviewed
Nov 9, 2023
| @@ -113,7 +113,9 @@ async def async_step_dhcp(self, discovery_info: dhcp.DhcpServiceInfo) -> FlowRes | |||
| raise AbortFlow("already_configured") | |||
|
|
|||
| # check if the camera is reachable at the new IP | |||
| host = ReolinkHost(self.hass, existing_entry.data, existing_entry.options) | |||
| new_config = dict(existing_entry.data) | |||
There was a problem hiding this comment.
It seems like this is missing test coverage if it can be changed without updating tests
There was a problem hiding this comment.
Well there is a check that goes over this code, but since the test controlls if a ConnectionError occurs or not it does not mather if the IP is valid or not.
The IP that is eventually saved to the config is checked, but that is correct, see line 142:
self._abort_if_unique_id_configured(updates={CONF_HOST: discovery_info.ip})
Where the correct discovery_info.ip is used
There was a problem hiding this comment.
I just added some extra assertions (assert_called_with) in the tests so that it would now fail if this would be changed in the future.
MartinHjelmare
approved these changes
Nov 10, 2023
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Breaking change
Proposed change
When DHCP indicates the IP adress of a Reolink camera has changed, first a connection is attempted to confirm the new IP actually works.
Unfortunetly the old IP is used in this attempt instead of the newly discovered IP, sorry my mistake when writing that code...
This fixes that mistake.
Tested in my production enviroment (changed the IP to some random value in core.config_entries file and let the DHCP set it back correctly).
Type of change
Additional information
Checklist
black --fast 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..coveragerc.To help with the load of incoming pull requests: