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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Improve and fix Airzone config flow #70474

Merged
merged 2 commits into from Apr 26, 2022
Merged

Improve and fix Airzone config flow #70474

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f858992
airzone: improve and fix config flow
Noltari Apr 23, 2022
3df756e
airzone: simplify CONFIG_FLOW and update tests
Noltari Apr 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 10 additions & 12 deletions homeassistant/components/airzone/config_flow.py
View file
Open in desktop
Expand Up @@ -21,10 +21,8 @@
vol.Required(CONF_PORT, default=DEFAULT_PORT): int,
}
)
SYSTEM_ID_SCHEMA = vol.Schema(
SYSTEM_ID_SCHEMA = CONFIG_SCHEMA.extend(
{
vol.Required(CONF_HOST): str,
vol.Required(CONF_PORT, default=DEFAULT_PORT): int,
vol.Required(CONF_ID, default=1): int,
}
)
Expand All @@ -42,14 +40,14 @@ async def async_step_user(

if user_input is not None:
system_id = user_input.get(CONF_ID, DEFAULT_SYSTEM_ID)
entry_data: dict[str, Any] = {
CONF_HOST: user_input[CONF_HOST],
CONF_PORT: user_input[CONF_PORT],
}

self._async_abort_entries_match(
{
CONF_HOST: user_input[CONF_HOST],
CONF_PORT: user_input[CONF_PORT],
CONF_ID: system_id,
}
)
if system_id != DEFAULT_SYSTEM_ID:
entry_data[CONF_ID] = system_id
Noltari marked this conversation as resolved.
Show resolved Hide resolved
self._async_abort_entries_match(entry_data)

airzone = AirzoneLocalApi(
aiohttp_client.async_get_clientsession(self.hass),
Expand All @@ -64,12 +62,12 @@ async def async_step_user(
await airzone.validate()
except InvalidSystem:
data_schema = SYSTEM_ID_SCHEMA
errors["base"] = "invalid_system_id"
errors[CONF_ID] = "invalid_system_id"
except AirzoneError:
errors["base"] = "cannot_connect"
else:
title = f"Airzone {user_input[CONF_HOST]}:{user_input[CONF_PORT]}"
return self.async_create_entry(title=title, data=user_input)
return self.async_create_entry(title=title, data=entry_data)

return self.async_show_form(
step_id="user",
Expand Down
2 changes: 1 addition & 1 deletion tests/components/airzone/test_config_flow.py
View file
Open in desktop
Expand Up @@ -86,7 +86,7 @@ async def test_form_invalid_system_id(hass: HomeAssistant) -> None:

assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
assert result["step_id"] == SOURCE_USER
assert result["errors"] == {"base": "invalid_system_id"}
assert result["errors"] == {CONF_ID: "invalid_system_id"}

mock_hvac.return_value = HVAC_MOCK[API_SYSTEMS][0]
mock_hvac.side_effect = None
Expand Down