jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-28 15:47:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use new ServiceInfo location in zha (#135703)

Browse Source
This commit is contained in:
epenet 2025-01-17 22:56:59 +01:00 committed by GitHub
parent 9868138fc4
commit 2b0e383b2e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
homeassistant/components/zha/config_flow.py
View File

@ -14,7 +14,7 @@ from zha.application.const import RadioType
import zigpy.backups import zigpy.backups
from zigpy.config import CONF_DEVICE, CONF_DEVICE_PATH from zigpy.config import CONF_DEVICE, CONF_DEVICE_PATH
from homeassistant.components import onboarding, usb, zeroconf from homeassistant.components import onboarding, usb
from homeassistant.components.file_upload import process_uploaded_file from homeassistant.components.file_upload import process_uploaded_file
from homeassistant.components.hassio import AddonError, AddonState from homeassistant.components.hassio import AddonError, AddonState
from homeassistant.components.homeassistant_hardware import silabs_multiprotocol_addon from homeassistant.components.homeassistant_hardware import silabs_multiprotocol_addon
@ -35,6 +35,8 @@ from homeassistant.core import HomeAssistant, callback
from homeassistant.exceptions import HomeAssistantError from homeassistant.exceptions import HomeAssistantError
from homeassistant.helpers.hassio import is_hassio from homeassistant.helpers.hassio import is_hassio
from homeassistant.helpers.selector import FileSelector, FileSelectorConfig from homeassistant.helpers.selector import FileSelector, FileSelectorConfig
from homeassistant.helpers.service_info.usb import UsbServiceInfo
from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
from homeassistant.util import dt as dt_util from homeassistant.util import dt as dt_util
from .const import CONF_BAUDRATE, CONF_FLOW_CONTROL, CONF_RADIO_TYPE, DOMAIN from .const import CONF_BAUDRATE, CONF_FLOW_CONTROL, CONF_RADIO_TYPE, DOMAIN
@ -586,9 +588,7 @@ class ZhaConfigFlowHandler(BaseZhaFlow, ConfigFlow, domain=DOMAIN):
description_placeholders={CONF_NAME: self._title}, description_placeholders={CONF_NAME: self._title},
) )
async def async_step_usb( async def async_step_usb(self, discovery_info: UsbServiceInfo) -> ConfigFlowResult:
self, discovery_info: usb.UsbServiceInfo
) -> ConfigFlowResult:
"""Handle usb discovery.""" """Handle usb discovery."""
vid = discovery_info.vid vid = discovery_info.vid
pid = discovery_info.pid pid = discovery_info.pid
@ -623,7 +623,7 @@ class ZhaConfigFlowHandler(BaseZhaFlow, ConfigFlow, domain=DOMAIN):
return await self.async_step_confirm() return await self.async_step_confirm()
async def async_step_zeroconf( async def async_step_zeroconf(
self, discovery_info: zeroconf.ZeroconfServiceInfo self, discovery_info: ZeroconfServiceInfo
) -> ConfigFlowResult: ) -> ConfigFlowResult:
"""Handle zeroconf discovery.""" """Handle zeroconf discovery."""
@ -649,7 +649,7 @@ class ZhaConfigFlowHandler(BaseZhaFlow, ConfigFlow, domain=DOMAIN):
fallback_title = name.split("._", 1)[0] fallback_title = name.split("._", 1)[0]
title = discovery_info.properties.get("name", fallback_title) title = discovery_info.properties.get("name", fallback_title)
discovery_info = zeroconf.ZeroconfServiceInfo( discovery_info = ZeroconfServiceInfo(
ip_address=discovery_info.ip_address, ip_address=discovery_info.ip_address,
ip_addresses=discovery_info.ip_addresses, ip_addresses=discovery_info.ip_addresses,
port=port, port=port,