Skip to content

Skip ignored hosts when checking existing config entries in config flow #34280

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.

Sign up for GitHub

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

Merged
balloob merged 7 commits into from
Apr 16, 2020
Merged

Skip ignored hosts when checking existing config entries in config flow #34280

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c175b1e
skip ignored hosts when checking existing config entries in config flow
raman325 Apr 16, 2020
ebe4cff
invert ignore check and use continue
raman325 Apr 16, 2020
ea192d2
use same continue strategy for all ignored source checks for consistency
raman325 Apr 16, 2020
bbe83b6
fix comments
raman325 Apr 16, 2020
56a0f20
line breaks
raman325 Apr 16, 2020
bb0a7b6
add tests and fix how config flow is checking source
raman325 Apr 16, 2020
909818e
remove logging statement that was being used to test
raman325 Apr 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions homeassistant/components/vizio/config_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@

from homeassistant import config_entries
from homeassistant.components.media_player import DEVICE_CLASS_SPEAKER, DEVICE_CLASS_TV
from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_ZEROCONF, ConfigEntry
from homeassistant.config_entries import (
SOURCE_IGNORE,
SOURCE_IMPORT,
SOURCE_ZEROCONF,
ConfigEntry,
)
from homeassistant.const import (
CONF_ACCESS_TOKEN,
CONF_DEVICE_CLASS,
Expand All @@ -18,6 +23,7 @@
CONF_NAME,
CONF_PIN,
CONF_PORT,
CONF_SOURCE,
CONF_TYPE,
)
from homeassistant.core import callback
Expand Down Expand Up @@ -198,10 +204,11 @@ async def async_step_user(

# Check if new config entry matches any existing config entries
for entry in self.hass.config_entries.async_entries(DOMAIN):
if _host_is_same(entry.data[CONF_HOST], user_input[CONF_HOST]):
errors[CONF_HOST] = "host_exists"
if entry.data[CONF_NAME] == user_input[CONF_NAME]:
errors[CONF_NAME] = "name_exists"
if entry.data.get(CONF_SOURCE) != SOURCE_IGNORE:
Comment thread
raman325 marked this conversation as resolved.
Outdated
if _host_is_same(entry.data[CONF_HOST], user_input[CONF_HOST]):
errors[CONF_HOST] = "host_exists"
if entry.data[CONF_NAME] == user_input[CONF_NAME]:
errors[CONF_NAME] = "name_exists"

if not errors:
# pylint: disable=no-member # https://github.com/PyCQA/pylint/issues/3167
Expand Down Expand Up @@ -270,7 +277,9 @@ async def async_step_import(self, import_config: Dict[str, Any]) -> Dict[str, An
"""Import a config entry from configuration.yaml."""
# Check if new config entry matches any existing config entries
for entry in self.hass.config_entries.async_entries(DOMAIN):
if _host_is_same(entry.data[CONF_HOST], import_config[CONF_HOST]):
if entry.data.get(CONF_SOURCE) != SOURCE_IGNORE and _host_is_same(
entry.data[CONF_HOST], import_config[CONF_HOST]
):
updated_options = {}
updated_data = {}
remove_apps = False
Expand Down Expand Up @@ -334,7 +343,9 @@ async def async_step_zeroconf(

# Check if new config entry matches any existing config entries and abort if so
for entry in self.hass.config_entries.async_entries(DOMAIN):
if _host_is_same(entry.data[CONF_HOST], discovery_info[CONF_HOST]):
if entry.data.get(CONF_SOURCE) != SOURCE_IGNORE and _host_is_same(
entry.data[CONF_HOST], discovery_info[CONF_HOST]
):
return self.async_abort(reason="already_setup")
Comment thread
raman325 marked this conversation as resolved.

# Set default name to discovered device name by stripping zeroconf service
Expand Down