evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ESPHome: do not set expected_name on APIClient (#84471)

Browse source
This commit is contained in:
Jesse Hills 2022-12-23 09:58:51 +13:00 • committed by GitHub
parent e575fffd23
commit 5874b4cdcf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
homeassistant/components/esphome/__init__.py
View file

@ -12,7 +12,6 @@ from aioesphomeapi import (
APIConnectionError, APIConnectionError,
APIIntEnum, APIIntEnum,
APIVersion, APIVersion,
BadNameAPIError,
DeviceInfo as EsphomeDeviceInfo, DeviceInfo as EsphomeDeviceInfo,
EntityCategory as EsphomeEntityCategory, EntityCategory as EsphomeEntityCategory,
EntityInfo, EntityInfo,
@ -273,7 +272,6 @@ async def async_setup_entry( # noqa: C901
entry_data.api_version = cli.api_version entry_data.api_version = cli.api_version
entry_data.available = True entry_data.available = True
if entry_data.device_info.name: if entry_data.device_info.name:
cli.expected_name = entry_data.device_info.name
reconnect_logic.name = entry_data.device_info.name reconnect_logic.name = entry_data.device_info.name
if device_info.bluetooth_proxy_version: if device_info.bluetooth_proxy_version:
@ -315,12 +313,6 @@ async def async_setup_entry( # noqa: C901
"""Start reauth flow if appropriate connect error type.""" """Start reauth flow if appropriate connect error type."""
if isinstance(err, (RequiresEncryptionAPIError, InvalidEncryptionKeyAPIError)): if isinstance(err, (RequiresEncryptionAPIError, InvalidEncryptionKeyAPIError)):
entry.async_start_reauth(hass) entry.async_start_reauth(hass)
if isinstance(err, BadNameAPIError):
_LOGGER.warning(
"Name of device %s changed to %s, potentially due to IP reassignment",
cli.expected_name,
err.received_name,
)
reconnect_logic = ReconnectLogic( reconnect_logic = ReconnectLogic(
client=cli, client=cli,
@ -336,11 +328,10 @@ async def async_setup_entry( # noqa: C901
await _setup_services(hass, entry_data, services) await _setup_services(hass, entry_data, services)
if entry_data.device_info is not None and entry_data.device_info.name: if entry_data.device_info is not None and entry_data.device_info.name:
cli.expected_name = entry_data.device_info.name
reconnect_logic.name = entry_data.device_info.name reconnect_logic.name = entry_data.device_info.name
if entry.unique_id is None: if entry.unique_id is None:
hass.config_entries.async_update_entry( hass.config_entries.async_update_entry(
entry, unique_id=entry_data.device_info.name entry, unique_id=format_mac(entry_data.device_info.mac_address)
) )
await reconnect_logic.start() await reconnect_logic.start()