Simplify unifiprotect device removal code (#119517)

This commit is contained in:
J. Nick Koston 2024-06-12 12:03:12 -05:00 committed by GitHub
parent 8f7686082c
commit ae3134d875
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -36,7 +36,7 @@ from .const import (
OUTDATED_LOG_MESSAGE, OUTDATED_LOG_MESSAGE,
PLATFORMS, PLATFORMS,
) )
from .data import ProtectData, UFPConfigEntry, async_ufp_instance_for_config_entry_ids from .data import ProtectData, UFPConfigEntry
from .discovery import async_start_discovery from .discovery import async_start_discovery
from .migrate import async_migrate_data from .migrate import async_migrate_data
from .services import async_cleanup_services, async_setup_services from .services import async_cleanup_services, async_setup_services
@ -200,8 +200,7 @@ async def async_remove_config_entry_device(
for connection in device_entry.connections for connection in device_entry.connections
if connection[0] == dr.CONNECTION_NETWORK_MAC if connection[0] == dr.CONNECTION_NETWORK_MAC
} }
api = async_ufp_instance_for_config_entry_ids(hass, {config_entry.entry_id}) api = config_entry.runtime_data.api
assert api is not None
if api.bootstrap.nvr.mac in unifi_macs: if api.bootstrap.nvr.mac in unifi_macs:
return False return False
for device in async_get_devices(api.bootstrap, DEVICES_THAT_ADOPT): for device in async_get_devices(api.bootstrap, DEVICES_THAT_ADOPT):