Skip to content

Use UsbServiceInfo in modem_callerid #60042

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

Closed
epenet wants to merge 3 commits into from
Closed

Use UsbServiceInfo in modem_callerid #60042

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
6fcd755
Use UsbServiceInfo in modem_callerid
epenet Nov 20, 2021
d7860bc
Revert constants
epenet Nov 21, 2021
089915b
Use usb constants
epenet Nov 21, 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
4 changes: 2 additions & 2 deletions homeassistant/components/modem_callerid/config_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ def __init__(self) -> None:

async def async_step_usb(self, discovery_info: usb.UsbServiceInfo) -> FlowResult:
"""Handle USB Discovery."""
device = discovery_info["device"]
device = discovery_info[usb.ATTR_DEVICE]

dev_path = await self.hass.async_add_executor_job(usb.get_serial_by_id, device)
unique_id = f"{discovery_info['vid']}:{discovery_info['pid']}_{discovery_info['serial_number']}_{discovery_info['manufacturer']}_{discovery_info['description']}"
unique_id = f"{discovery_info[usb.ATTR_VID]}:{discovery_info[usb.ATTR_PID]}_{discovery_info[usb.ATTR_SERIAL_NUMBER]}_{discovery_info[usb.ATTR_MANUFACTURER]}_{discovery_info[usb.ATTR_DESCRIPTION]}"
if (
await self.validate_device_errors(dev_path=dev_path, unique_id=unique_id)
is None
Expand Down
16 changes: 8 additions & 8 deletions tests/components/modem_callerid/test_config_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@

from . import _patch_config_flow_modem

DISCOVERY_INFO = {
"device": phone_modem.DEFAULT_PORT,
"pid": "1340",
"vid": "0572",
"serial_number": "1234",
"description": "modem",
"manufacturer": "Connexant",
}
DISCOVERY_INFO = usb.UsbServiceInfo(
device=phone_modem.DEFAULT_PORT,
pid="1340",
vid="0572",
serial_number="1234",
description="modem",
manufacturer="Connexant",
)


def _patch_setup():
Expand Down