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

Add alias to DOMAIN import (part 1) (#125560)

Browse Source 
* Add alias to DOMAIN import (part 1)

* Revert tomato/xiaomi
This commit is contained in:
epenet 2024-09-09 22:05:27 +02:00 committed by GitHub
parent e750f8f457
commit ce4a62574a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
22 changed files with 53 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
homeassistant/components/actiontec/device_tracker.py
View File

@ -9,7 +9,7 @@ from typing import Final
import voluptuous as vol import voluptuous as vol
from homeassistant.components.device_tracker import ( from homeassistant.components.device_tracker import (
DOMAIN, DOMAIN as DEVICE_TRACKER_DOMAIN,
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA, PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
DeviceScanner, DeviceScanner,
) )
@ -36,7 +36,7 @@ def get_scanner(
hass: HomeAssistant, config: ConfigType hass: HomeAssistant, config: ConfigType
) -> ActiontecDeviceScanner | None: ) -> ActiontecDeviceScanner | None:
"""Validate the configuration and return an Actiontec scanner.""" """Validate the configuration and return an Actiontec scanner."""
scanner = ActiontecDeviceScanner(config[DOMAIN]) scanner = ActiontecDeviceScanner(config[DEVICE_TRACKER_DOMAIN])
return scanner if scanner.success_init else None return scanner if scanner.success_init else None

4
homeassistant/components/arris_tg2492lg/device_tracker.py
View File

@ -7,7 +7,7 @@ from arris_tg2492lg import ConnectBox, Device
import voluptuous as vol import voluptuous as vol
from homeassistant.components.device_tracker import ( from homeassistant.components.device_tracker import (
DOMAIN, DOMAIN as DEVICE_TRACKER_DOMAIN,
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA, PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
DeviceScanner, DeviceScanner,
) )
@ -31,7 +31,7 @@ async def async_get_scanner(
hass: HomeAssistant, config: ConfigType hass: HomeAssistant, config: ConfigType
) -> ArrisDeviceScanner | None: ) -> ArrisDeviceScanner | None:
"""Return the Arris device scanner if successful.""" """Return the Arris device scanner if successful."""
conf = config[DOMAIN] conf = config[DEVICE_TRACKER_DOMAIN]
url = f"http://{conf[CONF_HOST]}" url = f"http://{conf[CONF_HOST]}"
websession = async_get_clientsession(hass) websession = async_get_clientsession(hass)
connect_box = ConnectBox(websession, url, conf[CONF_PASSWORD]) connect_box = ConnectBox(websession, url, conf[CONF_PASSWORD])

4
homeassistant/components/aruba/device_tracker.py
View File

@ -10,7 +10,7 @@ import pexpect
import voluptuous as vol import voluptuous as vol
from homeassistant.components.device_tracker import ( from homeassistant.components.device_tracker import (
DOMAIN, DOMAIN as DEVICE_TRACKER_DOMAIN,
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA, PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
DeviceScanner, DeviceScanner,
) )
@ -38,7 +38,7 @@ PLATFORM_SCHEMA = DEVICE_TRACKER_PLATFORM_SCHEMA.extend(
def get_scanner(hass: HomeAssistant, config: ConfigType) -> ArubaDeviceScanner | None: def get_scanner(hass: HomeAssistant, config: ConfigType) -> ArubaDeviceScanner | None:
"""Validate the configuration and return a Aruba scanner.""" """Validate the configuration and return a Aruba scanner."""
scanner = ArubaDeviceScanner(config[DOMAIN]) scanner = ArubaDeviceScanner(config[DEVICE_TRACKER_DOMAIN])
return scanner if scanner.success_init else None return scanner if scanner.success_init else None

4
homeassistant/components/bbox/device_tracker.py
View File

@ -10,7 +10,7 @@ import pybbox
import voluptuous as vol import voluptuous as vol
from homeassistant.components.device_tracker import ( from homeassistant.components.device_tracker import (
DOMAIN, DOMAIN as DEVICE_TRACKER_DOMAIN,
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA, PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
DeviceScanner, DeviceScanner,
) )
@ -34,7 +34,7 @@ PLATFORM_SCHEMA = DEVICE_TRACKER_PLATFORM_SCHEMA.extend(
def get_scanner(hass: HomeAssistant, config: ConfigType) -> BboxDeviceScanner | None: def get_scanner(hass: HomeAssistant, config: ConfigType) -> BboxDeviceScanner | None:
"""Validate the configuration and return a Bbox scanner.""" """Validate the configuration and return a Bbox scanner."""
scanner = BboxDeviceScanner(config[DOMAIN]) scanner = BboxDeviceScanner(config[DEVICE_TRACKER_DOMAIN])
return scanner if scanner.success_init else None return scanner if scanner.success_init else None

4
homeassistant/components/bt_home_hub_5/device_tracker.py
View File

@ -8,7 +8,7 @@ import bthomehub5_devicelist
import voluptuous as vol import voluptuous as vol
from homeassistant.components.device_tracker import ( from homeassistant.components.device_tracker import (
DOMAIN, DOMAIN as DEVICE_TRACKER_DOMAIN,
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA, PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
DeviceScanner, DeviceScanner,
) )
@ -30,7 +30,7 @@ def get_scanner(
hass: HomeAssistant, config: ConfigType hass: HomeAssistant, config: ConfigType
) -> BTHomeHub5DeviceScanner | None: ) -> BTHomeHub5DeviceScanner | None:
"""Return a BT Home Hub 5 scanner if successful.""" """Return a BT Home Hub 5 scanner if successful."""
scanner = BTHomeHub5DeviceScanner(config[DOMAIN]) scanner = BTHomeHub5DeviceScanner(config[DEVICE_TRACKER_DOMAIN])
return scanner if scanner.success_init else None return scanner if scanner.success_init else None

4
homeassistant/components/bt_smarthub/device_tracker.py
View File

@ -9,7 +9,7 @@ from btsmarthub_devicelist import BTSmartHub
import voluptuous as vol import voluptuous as vol
from homeassistant.components.device_tracker import ( from homeassistant.components.device_tracker import (
DOMAIN, DOMAIN as DEVICE_TRACKER_DOMAIN,
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA, PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
DeviceScanner, DeviceScanner,
) )
@ -33,7 +33,7 @@ PLATFORM_SCHEMA = DEVICE_TRACKER_PLATFORM_SCHEMA.extend(
def get_scanner(hass: HomeAssistant, config: ConfigType) -> BTSmartHubScanner | None: def get_scanner(hass: HomeAssistant, config: ConfigType) -> BTSmartHubScanner | None:
"""Return a BT Smart Hub scanner if successful.""" """Return a BT Smart Hub scanner if successful."""
info = config[DOMAIN] info = config[DEVICE_TRACKER_DOMAIN]
smarthub_client = BTSmartHub( smarthub_client = BTSmartHub(
router_ip=info[CONF_HOST], smarthub_model=info.get(CONF_SMARTHUB_MODEL) router_ip=info[CONF_HOST], smarthub_model=info.get(CONF_SMARTHUB_MODEL)
) )

4
homeassistant/components/cisco_ios/device_tracker.py
View File

@ -9,7 +9,7 @@ from pexpect import pxssh
import voluptuous as vol import voluptuous as vol
from homeassistant.components.device_tracker import ( from homeassistant.components.device_tracker import (
DOMAIN, DOMAIN as DEVICE_TRACKER_DOMAIN,
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA, PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
DeviceScanner, DeviceScanner,
) )
@ -34,7 +34,7 @@ PLATFORM_SCHEMA = vol.All(
def get_scanner(hass: HomeAssistant, config: ConfigType) -> CiscoDeviceScanner | None: def get_scanner(hass: HomeAssistant, config: ConfigType) -> CiscoDeviceScanner | None:
"""Validate the configuration and return a Cisco scanner.""" """Validate the configuration and return a Cisco scanner."""
scanner = CiscoDeviceScanner(config[DOMAIN]) scanner = CiscoDeviceScanner(config[DEVICE_TRACKER_DOMAIN])
return scanner if scanner.success_init else None return scanner if scanner.success_init else None

4
homeassistant/components/cisco_mobility_express/device_tracker.py
View File

@ -8,7 +8,7 @@ from ciscomobilityexpress.ciscome import CiscoMobilityExpress
import voluptuous as vol import voluptuous as vol
from homeassistant.components.device_tracker import ( from homeassistant.components.device_tracker import (
DOMAIN, DOMAIN as DEVICE_TRACKER_DOMAIN,
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA, PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
DeviceScanner, DeviceScanner,
) )
@ -42,7 +42,7 @@ PLATFORM_SCHEMA = DEVICE_TRACKER_PLATFORM_SCHEMA.extend(
def get_scanner(hass: HomeAssistant, config: ConfigType) -> CiscoMEDeviceScanner | None: def get_scanner(hass: HomeAssistant, config: ConfigType) -> CiscoMEDeviceScanner | None:
"""Validate the configuration and return a Cisco ME scanner.""" """Validate the configuration and return a Cisco ME scanner."""
config = config[DOMAIN] config = config[DEVICE_TRACKER_DOMAIN]
controller = CiscoMobilityExpress( controller = CiscoMobilityExpress(
config[CONF_HOST], config[CONF_HOST],

4
homeassistant/components/ddwrt/device_tracker.py
View File

@ -10,7 +10,7 @@ import requests
import voluptuous as vol import voluptuous as vol
from homeassistant.components.device_tracker import ( from homeassistant.components.device_tracker import (
DOMAIN, DOMAIN as DEVICE_TRACKER_DOMAIN,
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA, PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
DeviceScanner, DeviceScanner,
) )
@ -50,7 +50,7 @@ PLATFORM_SCHEMA = DEVICE_TRACKER_PLATFORM_SCHEMA.extend(
def get_scanner(hass: HomeAssistant, config: ConfigType) -> DdWrtDeviceScanner | None: def get_scanner(hass: HomeAssistant, config: ConfigType) -> DdWrtDeviceScanner | None:
"""Validate the configuration and return a DD-WRT scanner.""" """Validate the configuration and return a DD-WRT scanner."""
try: try:
return DdWrtDeviceScanner(config[DOMAIN]) return DdWrtDeviceScanner(config[DEVICE_TRACKER_DOMAIN])
except ConnectionError: except ConnectionError:
return None return None

4
homeassistant/components/hitron_coda/device_tracker.py
View File

@ -10,7 +10,7 @@ import requests
import voluptuous as vol import voluptuous as vol
from homeassistant.components.device_tracker import ( from homeassistant.components.device_tracker import (
DOMAIN, DOMAIN as DEVICE_TRACKER_DOMAIN,
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA, PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
DeviceScanner, DeviceScanner,
) )
@ -37,7 +37,7 @@ def get_scanner(
_hass: HomeAssistant, config: ConfigType _hass: HomeAssistant, config: ConfigType
) -> HitronCODADeviceScanner | None: ) -> HitronCODADeviceScanner | None:
"""Validate the configuration and return a Hitron CODA-4582U scanner.""" """Validate the configuration and return a Hitron CODA-4582U scanner."""
scanner = HitronCODADeviceScanner(config[DOMAIN]) scanner = HitronCODADeviceScanner(config[DEVICE_TRACKER_DOMAIN])
return scanner if scanner.success_init else None return scanner if scanner.success_init else None

4
homeassistant/components/linksys_smart/device_tracker.py
View File

@ -9,7 +9,7 @@ import requests
import voluptuous as vol import voluptuous as vol
from homeassistant.components.device_tracker import ( from homeassistant.components.device_tracker import (
DOMAIN, DOMAIN as DEVICE_TRACKER_DOMAIN,
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA, PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
DeviceScanner, DeviceScanner,
) )
@ -32,7 +32,7 @@ def get_scanner(
) -> LinksysSmartWifiDeviceScanner | None: ) -> LinksysSmartWifiDeviceScanner | None:
"""Validate the configuration and return a Linksys AP scanner.""" """Validate the configuration and return a Linksys AP scanner."""
try: try:
return LinksysSmartWifiDeviceScanner(config[DOMAIN]) return LinksysSmartWifiDeviceScanner(config[DEVICE_TRACKER_DOMAIN])
except ConnectionError: except ConnectionError:
return None return None

4
homeassistant/components/luci/device_tracker.py
View File

@ -8,7 +8,7 @@ from openwrt_luci_rpc import OpenWrtRpc
import voluptuous as vol import voluptuous as vol
from homeassistant.components.device_tracker import ( from homeassistant.components.device_tracker import (
DOMAIN, DOMAIN as DEVICE_TRACKER_DOMAIN,
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA, PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
DeviceScanner, DeviceScanner,
) )
@ -41,7 +41,7 @@ PLATFORM_SCHEMA = DEVICE_TRACKER_PLATFORM_SCHEMA.extend(
def get_scanner(hass: HomeAssistant, config: ConfigType) -> LuciDeviceScanner | None: def get_scanner(hass: HomeAssistant, config: ConfigType) -> LuciDeviceScanner | None:
"""Validate the configuration and return a Luci scanner.""" """Validate the configuration and return a Luci scanner."""
scanner = LuciDeviceScanner(config[DOMAIN]) scanner = LuciDeviceScanner(config[DEVICE_TRACKER_DOMAIN])
return scanner if scanner.success_init else None return scanner if scanner.success_init else None

4
homeassistant/components/owntracks/device_tracker.py
View File

@ -2,7 +2,7 @@
from homeassistant.components.device_tracker import ( from homeassistant.components.device_tracker import (
ATTR_SOURCE_TYPE, ATTR_SOURCE_TYPE,
DOMAIN, DOMAIN as DEVICE_TRACKER_DOMAIN,
SourceType, SourceType,
TrackerEntity, TrackerEntity,
) )
@ -66,7 +66,7 @@ class OwnTracksEntity(TrackerEntity, RestoreEntity):
"""Set up OwnTracks entity.""" """Set up OwnTracks entity."""
self._dev_id = dev_id self._dev_id = dev_id
self._data = data or {} self._data = data or {}
self.entity_id = f"{DOMAIN}.{dev_id}" self.entity_id = f"{DEVICE_TRACKER_DOMAIN}.{dev_id}"
@property @property
def unique_id(self): def unique_id(self):

4
homeassistant/components/quantum_gateway/device_tracker.py
View File

@ -9,7 +9,7 @@ from requests.exceptions import RequestException
import voluptuous as vol import voluptuous as vol
from homeassistant.components.device_tracker import ( from homeassistant.components.device_tracker import (
DOMAIN, DOMAIN as DEVICE_TRACKER_DOMAIN,
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA, PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
DeviceScanner, DeviceScanner,
) )
@ -35,7 +35,7 @@ def get_scanner(
hass: HomeAssistant, config: ConfigType hass: HomeAssistant, config: ConfigType
) -> QuantumGatewayDeviceScanner | None: ) -> QuantumGatewayDeviceScanner | None:
"""Validate the configuration and return a Quantum Gateway scanner.""" """Validate the configuration and return a Quantum Gateway scanner."""
scanner = QuantumGatewayDeviceScanner(config[DOMAIN]) scanner = QuantumGatewayDeviceScanner(config[DEVICE_TRACKER_DOMAIN])
return scanner if scanner.success_init else None return scanner if scanner.success_init else None

4
homeassistant/components/sky_hub/device_tracker.py
View File

@ -8,7 +8,7 @@ from pyskyqhub.skyq_hub import SkyQHub
import voluptuous as vol import voluptuous as vol
from homeassistant.components.device_tracker import ( from homeassistant.components.device_tracker import (
DOMAIN, DOMAIN as DEVICE_TRACKER_DOMAIN,
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA, PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
DeviceScanner, DeviceScanner,
) )
@ -29,7 +29,7 @@ async def async_get_scanner(
hass: HomeAssistant, config: ConfigType hass: HomeAssistant, config: ConfigType
) -> SkyHubDeviceScanner | None: ) -> SkyHubDeviceScanner | None:
"""Return a Sky Hub scanner if successful.""" """Return a Sky Hub scanner if successful."""
host = config[DOMAIN].get(CONF_HOST, "192.168.1.254") host = config[DEVICE_TRACKER_DOMAIN].get(CONF_HOST, "192.168.1.254")
websession = async_get_clientsession(hass) websession = async_get_clientsession(hass)
hub = SkyQHub(websession, host) hub = SkyQHub(websession, host)

4
homeassistant/components/snmp/device_tracker.py
View File

@ -18,7 +18,7 @@ from pysnmp.hlapi.asyncio import (
import voluptuous as vol import voluptuous as vol
from homeassistant.components.device_tracker import ( from homeassistant.components.device_tracker import (
DOMAIN, DOMAIN as DEVICE_TRACKER_DOMAIN,
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA, PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
DeviceScanner, DeviceScanner,
) )
@ -59,7 +59,7 @@ async def async_get_scanner(
hass: HomeAssistant, config: ConfigType hass: HomeAssistant, config: ConfigType
) -> SnmpScanner | None: ) -> SnmpScanner | None:
"""Validate the configuration and return an SNMP scanner.""" """Validate the configuration and return an SNMP scanner."""
scanner = SnmpScanner(config[DOMAIN]) scanner = SnmpScanner(config[DEVICE_TRACKER_DOMAIN])
await scanner.async_init(hass) await scanner.async_init(hass)
return scanner if scanner.success_init else None return scanner if scanner.success_init else None

4
homeassistant/components/swisscom/device_tracker.py
View File

@ -9,7 +9,7 @@ import requests
import voluptuous as vol import voluptuous as vol
from homeassistant.components.device_tracker import ( from homeassistant.components.device_tracker import (
DOMAIN, DOMAIN as DEVICE_TRACKER_DOMAIN,
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA, PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
DeviceScanner, DeviceScanner,
) )
@ -31,7 +31,7 @@ def get_scanner(
hass: HomeAssistant, config: ConfigType hass: HomeAssistant, config: ConfigType
) -> SwisscomDeviceScanner | None: ) -> SwisscomDeviceScanner | None:
"""Return the Swisscom device scanner.""" """Return the Swisscom device scanner."""
scanner = SwisscomDeviceScanner(config[DOMAIN]) scanner = SwisscomDeviceScanner(config[DEVICE_TRACKER_DOMAIN])
return scanner if scanner.success_init else None return scanner if scanner.success_init else None

4
homeassistant/components/synology_srm/device_tracker.py
View File

@ -8,7 +8,7 @@ import synology_srm
import voluptuous as vol import voluptuous as vol
from homeassistant.components.device_tracker import ( from homeassistant.components.device_tracker import (
DOMAIN, DOMAIN as DEVICE_TRACKER_DOMAIN,
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA, PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
DeviceScanner, DeviceScanner,
) )
@ -75,7 +75,7 @@ def get_scanner(
hass: HomeAssistant, config: ConfigType hass: HomeAssistant, config: ConfigType
) -> SynologySrmDeviceScanner | None: ) -> SynologySrmDeviceScanner | None:
"""Validate the configuration and return Synology SRM scanner.""" """Validate the configuration and return Synology SRM scanner."""
scanner = SynologySrmDeviceScanner(config[DOMAIN]) scanner = SynologySrmDeviceScanner(config[DEVICE_TRACKER_DOMAIN])
return scanner if scanner.success_init else None return scanner if scanner.success_init else None

4
homeassistant/components/thomson/device_tracker.py
View File

@ -9,7 +9,7 @@ import telnetlib # pylint: disable=deprecated-module
import voluptuous as vol import voluptuous as vol
from homeassistant.components.device_tracker import ( from homeassistant.components.device_tracker import (
DOMAIN, DOMAIN as DEVICE_TRACKER_DOMAIN,
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA, PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
DeviceScanner, DeviceScanner,
) )
@ -41,7 +41,7 @@ PLATFORM_SCHEMA = DEVICE_TRACKER_PLATFORM_SCHEMA.extend(
def get_scanner(hass: HomeAssistant, config: ConfigType) -> ThomsonDeviceScanner | None: def get_scanner(hass: HomeAssistant, config: ConfigType) -> ThomsonDeviceScanner | None:
"""Validate the configuration and return a THOMSON scanner.""" """Validate the configuration and return a THOMSON scanner."""
scanner = ThomsonDeviceScanner(config[DOMAIN]) scanner = ThomsonDeviceScanner(config[DEVICE_TRACKER_DOMAIN])
return scanner if scanner.success_init else None return scanner if scanner.success_init else None

14
homeassistant/components/unifi/device_tracker.py
View File

@ -18,7 +18,11 @@ from aiounifi.models.client import Client
from aiounifi.models.device import Device from aiounifi.models.device import Device
from aiounifi.models.event import Event, EventKey from aiounifi.models.event import Event, EventKey
from homeassistant.components.device_tracker import DOMAIN, ScannerEntity, SourceType from homeassistant.components.device_tracker import (
DOMAIN as DEVICE_TRACKER_DOMAIN,
ScannerEntity,
SourceType,
)
from homeassistant.core import Event as core_Event, HomeAssistant, callback from homeassistant.core import Event as core_Event, HomeAssistant, callback
from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.helpers.dispatcher import async_dispatcher_connect
from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.entity_platform import AddEntitiesCallback
@ -198,11 +202,15 @@ def async_update_unique_id(hass: HomeAssistant, config_entry: UnifiConfigEntry)
def update_unique_id(obj_id: str) -> None: def update_unique_id(obj_id: str) -> None:
"""Rework unique ID.""" """Rework unique ID."""
new_unique_id = f"{hub.site}-{obj_id}" new_unique_id = f"{hub.site}-{obj_id}"
if ent_reg.async_get_entity_id(DOMAIN, UNIFI_DOMAIN, new_unique_id): if ent_reg.async_get_entity_id(
DEVICE_TRACKER_DOMAIN, UNIFI_DOMAIN, new_unique_id
):
return return
unique_id = f"{obj_id}-{hub.site}" unique_id = f"{obj_id}-{hub.site}"
if entity_id := ent_reg.async_get_entity_id(DOMAIN, UNIFI_DOMAIN, unique_id): if entity_id := ent_reg.async_get_entity_id(
DEVICE_TRACKER_DOMAIN, UNIFI_DOMAIN, unique_id
):
ent_reg.async_update_entity(entity_id, new_unique_id=new_unique_id) ent_reg.async_update_entity(entity_id, new_unique_id=new_unique_id)
for obj_id in list(hub.api.clients) + list(hub.api.clients_all): for obj_id in list(hub.api.clients) + list(hub.api.clients_all):

4
homeassistant/components/unifi_direct/device_tracker.py
View File

@ -9,7 +9,7 @@ from unifi_ap import UniFiAP, UniFiAPConnectionException, UniFiAPDataException
import voluptuous as vol import voluptuous as vol
from homeassistant.components.device_tracker import ( from homeassistant.components.device_tracker import (
DOMAIN, DOMAIN as DEVICE_TRACKER_DOMAIN,
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA, PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
DeviceScanner, DeviceScanner,
) )
@ -34,7 +34,7 @@ PLATFORM_SCHEMA = DEVICE_TRACKER_PLATFORM_SCHEMA.extend(
def get_scanner(hass: HomeAssistant, config: ConfigType) -> UnifiDeviceScanner | None: def get_scanner(hass: HomeAssistant, config: ConfigType) -> UnifiDeviceScanner | None:
"""Validate the configuration and return a Unifi direct scanner.""" """Validate the configuration and return a Unifi direct scanner."""
scanner = UnifiDeviceScanner(config[DOMAIN]) scanner = UnifiDeviceScanner(config[DEVICE_TRACKER_DOMAIN])
return scanner if scanner.update_clients() else None return scanner if scanner.update_clients() else None

4
homeassistant/components/upc_connect/device_tracker.py
View File

@ -9,7 +9,7 @@ from connect_box.exceptions import ConnectBoxError, ConnectBoxLoginError
import voluptuous as vol import voluptuous as vol
from homeassistant.components.device_tracker import ( from homeassistant.components.device_tracker import (
DOMAIN, DOMAIN as DEVICE_TRACKER_DOMAIN,
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA, PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
DeviceScanner, DeviceScanner,
) )
@ -35,7 +35,7 @@ async def async_get_scanner(
hass: HomeAssistant, config: ConfigType hass: HomeAssistant, config: ConfigType
) -> UPCDeviceScanner | None: ) -> UPCDeviceScanner | None:
"""Return the UPC device scanner.""" """Return the UPC device scanner."""
conf = config[DOMAIN] conf = config[DEVICE_TRACKER_DOMAIN]
session = async_get_clientsession(hass) session = async_get_clientsession(hass)
connect_box = ConnectBox(session, conf[CONF_PASSWORD], host=conf[CONF_HOST]) connect_box = ConnectBox(session, conf[CONF_PASSWORD], host=conf[CONF_HOST])