Skip to content

Use dataclass properties in bosch_shc discovery #60559

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
frenck merged 2 commits into from
Nov 30, 2021
Merged

Use dataclass properties in bosch_shc discovery #60559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fdd456
Use dataclass properties in bosch_shc discovery
epenet Nov 29, 2021
f941f78
host cannot be a list
epenet Nov 29, 2021
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
16 changes: 3 additions & 13 deletions homeassistant/components/bosch_shc/config_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,22 +190,12 @@ async def async_step_zeroconf(
return self.async_abort(reason="not_bosch_shc")

try:
hosts = (
discovery_info[zeroconf.ATTR_HOST]
if isinstance(discovery_info[zeroconf.ATTR_HOST], list)
else [discovery_info[zeroconf.ATTR_HOST]]
)
for host in hosts:
if host.startswith("169."): # skip link local address
continue
self.info = await self._get_info(host)
self.host = host
if self.info is None or self.host is None:
return self.async_abort(reason="cannot_connect")
self.info = await self._get_info(discovery_info.host)
except SHCConnectionError:
return self.async_abort(reason="cannot_connect")
self.host = discovery_info.host

local_name = discovery_info[zeroconf.ATTR_HOSTNAME][:-1]
local_name = discovery_info.hostname[:-1]
node_name = local_name[: -len(".local")]

await self.async_set_unique_id(self.info["unique_id"])
Expand Down
25 changes: 1 addition & 24 deletions tests/components/bosch_shc/test_config_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"device": {"mac": "test-mac", "hostname": "test-host"},
}
DISCOVERY_INFO = zeroconf.ZeroconfServiceInfo(
host=["169.1.1.1", "1.1.1.1"],
host="1.1.1.1",
hostname="shc012345.local.",
name="Bosch SHC [test-mac]._http._tcp.local.",
port=0,
Expand Down Expand Up @@ -527,29 +527,6 @@ async def test_zeroconf_cannot_connect(hass, mock_zeroconf):
assert result["reason"] == "cannot_connect"


async def test_zeroconf_link_local(hass, mock_zeroconf):
"""Test we get the form."""
DISCOVERY_INFO_LINK_LOCAL = zeroconf.ZeroconfServiceInfo(
host=["169.1.1.1"],
hostname="shc012345.local.",
name="Bosch SHC [test-mac]._http._tcp.local.",
port=0,
properties={},
type="_http._tcp.local.",
)

with patch(
"boschshcpy.session.SHCSession.mdns_info", side_effect=SHCConnectionError
):
result = await hass.config_entries.flow.async_init(
DOMAIN,
data=DISCOVERY_INFO_LINK_LOCAL,
context={"source": config_entries.SOURCE_ZEROCONF},
)
assert result["type"] == "abort"
assert result["reason"] == "cannot_connect"


async def test_zeroconf_not_bosch_shc(hass, mock_zeroconf):
"""Test we filter out non-bosch_shc devices."""
result = await hass.config_entries.flow.async_init(
Expand Down