Skip to content

Use dataclass properties in nanoleaf discovery #60580

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

Use dataclass properties in nanoleaf discovery #60580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d76972
Use dataclass properties in nanoleaf discovery
epenet Nov 30, 2021
fd7c2af
Use ssdp_headers
epenet Nov 30, 2021
bcdb9e7
Use ssdp_headers for _host
epenet Nov 30, 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
14 changes: 6 additions & 8 deletions homeassistant/components/nanoleaf/config_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,20 +106,18 @@ async def _async_homekit_zeroconf_discovery_handler(
) -> FlowResult:
"""Handle Nanoleaf Homekit and Zeroconf discovery."""
return await self._async_discovery_handler(
discovery_info[zeroconf.ATTR_HOST],
discovery_info[zeroconf.ATTR_NAME].replace(
f".{discovery_info[zeroconf.ATTR_TYPE]}", ""
),
discovery_info[zeroconf.ATTR_PROPERTIES][zeroconf.ATTR_PROPERTIES_ID],
discovery_info.host,
discovery_info.name.replace(f".{discovery_info.type}", ""),
discovery_info.properties[zeroconf.ATTR_PROPERTIES_ID],
)

async def async_step_ssdp(self, discovery_info: ssdp.SsdpServiceInfo) -> FlowResult:
"""Handle Nanoleaf SSDP discovery."""
_LOGGER.debug("SSDP discovered: %s", discovery_info)
return await self._async_discovery_handler(
discovery_info["_host"],
discovery_info["nl-devicename"],
discovery_info["nl-deviceid"],
discovery_info.ssdp_headers["_host"],
discovery_info.ssdp_headers["nl-devicename"],
discovery_info.ssdp_headers["nl-deviceid"],
)

async def _async_discovery_handler(
Expand Down
3 changes: 2 additions & 1 deletion tests/components/nanoleaf/test_config_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,8 @@ async def test_ssdp_discovery(hass: HomeAssistant) -> None:
data=ssdp.SsdpServiceInfo(
ssdp_usn="mock_usn",
ssdp_st="mock_st",
upnp={
upnp={},
ssdp_headers={
"_host": TEST_HOST,
"nl-devicename": TEST_NAME,
"nl-deviceid": TEST_DEVICE_ID,
Expand Down