From af15507588127749a8bbefc816b08c3d60131e86 Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Tue, 4 Feb 2025 18:57:39 +0100 Subject: [PATCH 1/3] Remove port-configuration by user --- custom_components/plugwise/config_flow.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/custom_components/plugwise/config_flow.py b/custom_components/plugwise/config_flow.py index b9c71e6ab..a4406cbda 100644 --- a/custom_components/plugwise/config_flow.py +++ b/custom_components/plugwise/config_flow.py @@ -88,8 +88,6 @@ def smile_user_schema(cf_input: ZeroconfServiceInfo | dict[str, Any] | None) -> { vol.Required(CONF_HOST): str, vol.Required(CONF_PASSWORD): str, - # Port under investigation for removal (hence not added in #132878) - vol.Optional(CONF_PORT, default=DEFAULT_PORT): int, vol.Required(CONF_USERNAME, default=SMILE): vol.In( {SMILE: FLOW_SMILE, STRETCH: FLOW_STRETCH} ), @@ -103,7 +101,6 @@ def smile_user_schema(cf_input: ZeroconfServiceInfo | dict[str, Any] | None) -> { vol.Required(CONF_HOST, default=cf_input[CONF_HOST]): str, vol.Required(CONF_PASSWORD, default=cf_input[CONF_PASSWORD]): str, - vol.Optional(CONF_PORT, default=cf_input[CONF_PORT]): int, vol.Required(CONF_USERNAME, default=cf_input[CONF_USERNAME]): vol.In( {SMILE: FLOW_SMILE, STRETCH: FLOW_STRETCH} ), @@ -239,6 +236,7 @@ async def async_step_user( errors: dict[str, str] = {} if user_input is not None: + user_input[CONF_PORT] = DEFAULT_PORT if self.discovery_info: user_input[CONF_HOST] = self.discovery_info.host user_input[CONF_PORT] = self.discovery_info.port From 6b93e8a603a508b79f7ab0c9de35b845960bbc62 Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Tue, 4 Feb 2025 19:44:58 +0100 Subject: [PATCH 2/3] Adapt test --- tests/components/plugwise/test_config_flow.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/components/plugwise/test_config_flow.py b/tests/components/plugwise/test_config_flow.py index fb2924018..9db611514 100644 --- a/tests/components/plugwise/test_config_flow.py +++ b/tests/components/plugwise/test_config_flow.py @@ -409,7 +409,6 @@ async def test_form_cannot_connect_port( user_input={ CONF_HOST: TEST_HOST, CONF_PASSWORD: TEST_PASSWORD, - CONF_PORT: TEST_PORT, }, ) From fb877793cacf05ec66b7da93034f45f4b88fafec Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Tue, 4 Feb 2025 19:49:29 +0100 Subject: [PATCH 3/3] Update CHANGELOG --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3685362d..c909a6462 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ Versions from 0.40 and up +## Ongoing + +- Remove user-configuration of port + ## v0.56.1 - Config_flow: follow [Core PR](https://github.com/home-assistant/core/pull/135653) movement of ZeroconfServiceInfo