Skip link local addresses in bosch_shc discovery step (#57074)
This commit is contained in:
parent
a809f5fcf7
commit
aa03b63884
2 changed files with 37 additions and 5 deletions
|
@ -187,16 +187,26 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
|
||||||
return self.async_abort(reason="not_bosch_shc")
|
return self.async_abort(reason="not_bosch_shc")
|
||||||
|
|
||||||
try:
|
try:
|
||||||
self.info = info = await self._get_info(discovery_info["host"])
|
hosts = (
|
||||||
|
discovery_info["host"]
|
||||||
|
if isinstance(discovery_info["host"], list)
|
||||||
|
else [discovery_info["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.host is None:
|
||||||
|
return self.async_abort(reason="cannot_connect")
|
||||||
except SHCConnectionError:
|
except SHCConnectionError:
|
||||||
return self.async_abort(reason="cannot_connect")
|
return self.async_abort(reason="cannot_connect")
|
||||||
|
|
||||||
local_name = discovery_info["hostname"][:-1]
|
local_name = discovery_info["hostname"][:-1]
|
||||||
node_name = local_name[: -len(".local")]
|
node_name = local_name[: -len(".local")]
|
||||||
|
|
||||||
await self.async_set_unique_id(info["unique_id"])
|
await self.async_set_unique_id(self.info["unique_id"])
|
||||||
self._abort_if_unique_id_configured({CONF_HOST: discovery_info["host"]})
|
self._abort_if_unique_id_configured({CONF_HOST: self.host})
|
||||||
self.host = discovery_info["host"]
|
|
||||||
self.context["title_placeholders"] = {"name": node_name}
|
self.context["title_placeholders"] = {"name": node_name}
|
||||||
return await self.async_step_confirm_discovery()
|
return await self.async_step_confirm_discovery()
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@ MOCK_SETTINGS = {
|
||||||
"device": {"mac": "test-mac", "hostname": "test-host"},
|
"device": {"mac": "test-mac", "hostname": "test-host"},
|
||||||
}
|
}
|
||||||
DISCOVERY_INFO = {
|
DISCOVERY_INFO = {
|
||||||
"host": "1.1.1.1",
|
"host": ["169.1.1.1", "1.1.1.1"],
|
||||||
"port": 0,
|
"port": 0,
|
||||||
"hostname": "shc012345.local.",
|
"hostname": "shc012345.local.",
|
||||||
"type": "_http._tcp.local.",
|
"type": "_http._tcp.local.",
|
||||||
|
@ -526,6 +526,28 @@ async def test_zeroconf_cannot_connect(hass, mock_zeroconf):
|
||||||
assert result["reason"] == "cannot_connect"
|
assert result["reason"] == "cannot_connect"
|
||||||
|
|
||||||
|
|
||||||
|
async def test_zeroconf_link_local(hass, mock_zeroconf):
|
||||||
|
"""Test we get the form."""
|
||||||
|
DISCOVERY_INFO_LINK_LOCAL = {
|
||||||
|
"host": ["169.1.1.1"],
|
||||||
|
"port": 0,
|
||||||
|
"hostname": "shc012345.local.",
|
||||||
|
"type": "_http._tcp.local.",
|
||||||
|
"name": "Bosch SHC [test-mac]._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):
|
async def test_zeroconf_not_bosch_shc(hass, mock_zeroconf):
|
||||||
"""Test we filter out non-bosch_shc devices."""
|
"""Test we filter out non-bosch_shc devices."""
|
||||||
result = await hass.config_entries.flow.async_init(
|
result = await hass.config_entries.flow.async_init(
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue