Add alias to DOMAIN import (part 1) (#125560)
* Add alias to DOMAIN import (part 1) * Revert tomato/xiaomi
This commit is contained in:
parent
e750f8f457
commit
ce4a62574a
22 changed files with 53 additions and 45 deletions
|
@ -9,7 +9,7 @@ from typing import Final
|
|||
import voluptuous as vol
|
||||
|
||||
from homeassistant.components.device_tracker import (
|
||||
DOMAIN,
|
||||
DOMAIN as DEVICE_TRACKER_DOMAIN,
|
||||
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
|
||||
DeviceScanner,
|
||||
)
|
||||
|
@ -36,7 +36,7 @@ def get_scanner(
|
|||
hass: HomeAssistant, config: ConfigType
|
||||
) -> ActiontecDeviceScanner | None:
|
||||
"""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
|
||||
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@ from arris_tg2492lg import ConnectBox, Device
|
|||
import voluptuous as vol
|
||||
|
||||
from homeassistant.components.device_tracker import (
|
||||
DOMAIN,
|
||||
DOMAIN as DEVICE_TRACKER_DOMAIN,
|
||||
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
|
||||
DeviceScanner,
|
||||
)
|
||||
|
@ -31,7 +31,7 @@ async def async_get_scanner(
|
|||
hass: HomeAssistant, config: ConfigType
|
||||
) -> ArrisDeviceScanner | None:
|
||||
"""Return the Arris device scanner if successful."""
|
||||
conf = config[DOMAIN]
|
||||
conf = config[DEVICE_TRACKER_DOMAIN]
|
||||
url = f"http://{conf[CONF_HOST]}"
|
||||
websession = async_get_clientsession(hass)
|
||||
connect_box = ConnectBox(websession, url, conf[CONF_PASSWORD])
|
||||
|
|
|
@ -10,7 +10,7 @@ import pexpect
|
|||
import voluptuous as vol
|
||||
|
||||
from homeassistant.components.device_tracker import (
|
||||
DOMAIN,
|
||||
DOMAIN as DEVICE_TRACKER_DOMAIN,
|
||||
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
|
||||
DeviceScanner,
|
||||
)
|
||||
|
@ -38,7 +38,7 @@ PLATFORM_SCHEMA = DEVICE_TRACKER_PLATFORM_SCHEMA.extend(
|
|||
|
||||
def get_scanner(hass: HomeAssistant, config: ConfigType) -> ArubaDeviceScanner | None:
|
||||
"""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
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@ import pybbox
|
|||
import voluptuous as vol
|
||||
|
||||
from homeassistant.components.device_tracker import (
|
||||
DOMAIN,
|
||||
DOMAIN as DEVICE_TRACKER_DOMAIN,
|
||||
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
|
||||
DeviceScanner,
|
||||
)
|
||||
|
@ -34,7 +34,7 @@ PLATFORM_SCHEMA = DEVICE_TRACKER_PLATFORM_SCHEMA.extend(
|
|||
|
||||
def get_scanner(hass: HomeAssistant, config: ConfigType) -> BboxDeviceScanner | None:
|
||||
"""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
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@ import bthomehub5_devicelist
|
|||
import voluptuous as vol
|
||||
|
||||
from homeassistant.components.device_tracker import (
|
||||
DOMAIN,
|
||||
DOMAIN as DEVICE_TRACKER_DOMAIN,
|
||||
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
|
||||
DeviceScanner,
|
||||
)
|
||||
|
@ -30,7 +30,7 @@ def get_scanner(
|
|||
hass: HomeAssistant, config: ConfigType
|
||||
) -> BTHomeHub5DeviceScanner | None:
|
||||
"""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
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@ from btsmarthub_devicelist import BTSmartHub
|
|||
import voluptuous as vol
|
||||
|
||||
from homeassistant.components.device_tracker import (
|
||||
DOMAIN,
|
||||
DOMAIN as DEVICE_TRACKER_DOMAIN,
|
||||
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
|
||||
DeviceScanner,
|
||||
)
|
||||
|
@ -33,7 +33,7 @@ PLATFORM_SCHEMA = DEVICE_TRACKER_PLATFORM_SCHEMA.extend(
|
|||
|
||||
def get_scanner(hass: HomeAssistant, config: ConfigType) -> BTSmartHubScanner | None:
|
||||
"""Return a BT Smart Hub scanner if successful."""
|
||||
info = config[DOMAIN]
|
||||
info = config[DEVICE_TRACKER_DOMAIN]
|
||||
smarthub_client = BTSmartHub(
|
||||
router_ip=info[CONF_HOST], smarthub_model=info.get(CONF_SMARTHUB_MODEL)
|
||||
)
|
||||
|
|
|
@ -9,7 +9,7 @@ from pexpect import pxssh
|
|||
import voluptuous as vol
|
||||
|
||||
from homeassistant.components.device_tracker import (
|
||||
DOMAIN,
|
||||
DOMAIN as DEVICE_TRACKER_DOMAIN,
|
||||
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
|
||||
DeviceScanner,
|
||||
)
|
||||
|
@ -34,7 +34,7 @@ PLATFORM_SCHEMA = vol.All(
|
|||
|
||||
def get_scanner(hass: HomeAssistant, config: ConfigType) -> CiscoDeviceScanner | None:
|
||||
"""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
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@ from ciscomobilityexpress.ciscome import CiscoMobilityExpress
|
|||
import voluptuous as vol
|
||||
|
||||
from homeassistant.components.device_tracker import (
|
||||
DOMAIN,
|
||||
DOMAIN as DEVICE_TRACKER_DOMAIN,
|
||||
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
|
||||
DeviceScanner,
|
||||
)
|
||||
|
@ -42,7 +42,7 @@ PLATFORM_SCHEMA = DEVICE_TRACKER_PLATFORM_SCHEMA.extend(
|
|||
def get_scanner(hass: HomeAssistant, config: ConfigType) -> CiscoMEDeviceScanner | None:
|
||||
"""Validate the configuration and return a Cisco ME scanner."""
|
||||
|
||||
config = config[DOMAIN]
|
||||
config = config[DEVICE_TRACKER_DOMAIN]
|
||||
|
||||
controller = CiscoMobilityExpress(
|
||||
config[CONF_HOST],
|
||||
|
|
|
@ -10,7 +10,7 @@ import requests
|
|||
import voluptuous as vol
|
||||
|
||||
from homeassistant.components.device_tracker import (
|
||||
DOMAIN,
|
||||
DOMAIN as DEVICE_TRACKER_DOMAIN,
|
||||
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
|
||||
DeviceScanner,
|
||||
)
|
||||
|
@ -50,7 +50,7 @@ PLATFORM_SCHEMA = DEVICE_TRACKER_PLATFORM_SCHEMA.extend(
|
|||
def get_scanner(hass: HomeAssistant, config: ConfigType) -> DdWrtDeviceScanner | None:
|
||||
"""Validate the configuration and return a DD-WRT scanner."""
|
||||
try:
|
||||
return DdWrtDeviceScanner(config[DOMAIN])
|
||||
return DdWrtDeviceScanner(config[DEVICE_TRACKER_DOMAIN])
|
||||
except ConnectionError:
|
||||
return None
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@ import requests
|
|||
import voluptuous as vol
|
||||
|
||||
from homeassistant.components.device_tracker import (
|
||||
DOMAIN,
|
||||
DOMAIN as DEVICE_TRACKER_DOMAIN,
|
||||
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
|
||||
DeviceScanner,
|
||||
)
|
||||
|
@ -37,7 +37,7 @@ def get_scanner(
|
|||
_hass: HomeAssistant, config: ConfigType
|
||||
) -> HitronCODADeviceScanner | None:
|
||||
"""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
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@ import requests
|
|||
import voluptuous as vol
|
||||
|
||||
from homeassistant.components.device_tracker import (
|
||||
DOMAIN,
|
||||
DOMAIN as DEVICE_TRACKER_DOMAIN,
|
||||
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
|
||||
DeviceScanner,
|
||||
)
|
||||
|
@ -32,7 +32,7 @@ def get_scanner(
|
|||
) -> LinksysSmartWifiDeviceScanner | None:
|
||||
"""Validate the configuration and return a Linksys AP scanner."""
|
||||
try:
|
||||
return LinksysSmartWifiDeviceScanner(config[DOMAIN])
|
||||
return LinksysSmartWifiDeviceScanner(config[DEVICE_TRACKER_DOMAIN])
|
||||
except ConnectionError:
|
||||
return None
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@ from openwrt_luci_rpc import OpenWrtRpc
|
|||
import voluptuous as vol
|
||||
|
||||
from homeassistant.components.device_tracker import (
|
||||
DOMAIN,
|
||||
DOMAIN as DEVICE_TRACKER_DOMAIN,
|
||||
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
|
||||
DeviceScanner,
|
||||
)
|
||||
|
@ -41,7 +41,7 @@ PLATFORM_SCHEMA = DEVICE_TRACKER_PLATFORM_SCHEMA.extend(
|
|||
|
||||
def get_scanner(hass: HomeAssistant, config: ConfigType) -> LuciDeviceScanner | None:
|
||||
"""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
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
from homeassistant.components.device_tracker import (
|
||||
ATTR_SOURCE_TYPE,
|
||||
DOMAIN,
|
||||
DOMAIN as DEVICE_TRACKER_DOMAIN,
|
||||
SourceType,
|
||||
TrackerEntity,
|
||||
)
|
||||
|
@ -66,7 +66,7 @@ class OwnTracksEntity(TrackerEntity, RestoreEntity):
|
|||
"""Set up OwnTracks entity."""
|
||||
self._dev_id = dev_id
|
||||
self._data = data or {}
|
||||
self.entity_id = f"{DOMAIN}.{dev_id}"
|
||||
self.entity_id = f"{DEVICE_TRACKER_DOMAIN}.{dev_id}"
|
||||
|
||||
@property
|
||||
def unique_id(self):
|
||||
|
|
|
@ -9,7 +9,7 @@ from requests.exceptions import RequestException
|
|||
import voluptuous as vol
|
||||
|
||||
from homeassistant.components.device_tracker import (
|
||||
DOMAIN,
|
||||
DOMAIN as DEVICE_TRACKER_DOMAIN,
|
||||
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
|
||||
DeviceScanner,
|
||||
)
|
||||
|
@ -35,7 +35,7 @@ def get_scanner(
|
|||
hass: HomeAssistant, config: ConfigType
|
||||
) -> QuantumGatewayDeviceScanner | None:
|
||||
"""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
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@ from pyskyqhub.skyq_hub import SkyQHub
|
|||
import voluptuous as vol
|
||||
|
||||
from homeassistant.components.device_tracker import (
|
||||
DOMAIN,
|
||||
DOMAIN as DEVICE_TRACKER_DOMAIN,
|
||||
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
|
||||
DeviceScanner,
|
||||
)
|
||||
|
@ -29,7 +29,7 @@ async def async_get_scanner(
|
|||
hass: HomeAssistant, config: ConfigType
|
||||
) -> SkyHubDeviceScanner | None:
|
||||
"""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)
|
||||
hub = SkyQHub(websession, host)
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@ from pysnmp.hlapi.asyncio import (
|
|||
import voluptuous as vol
|
||||
|
||||
from homeassistant.components.device_tracker import (
|
||||
DOMAIN,
|
||||
DOMAIN as DEVICE_TRACKER_DOMAIN,
|
||||
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
|
||||
DeviceScanner,
|
||||
)
|
||||
|
@ -59,7 +59,7 @@ async def async_get_scanner(
|
|||
hass: HomeAssistant, config: ConfigType
|
||||
) -> SnmpScanner | None:
|
||||
"""Validate the configuration and return an SNMP scanner."""
|
||||
scanner = SnmpScanner(config[DOMAIN])
|
||||
scanner = SnmpScanner(config[DEVICE_TRACKER_DOMAIN])
|
||||
await scanner.async_init(hass)
|
||||
|
||||
return scanner if scanner.success_init else None
|
||||
|
|
|
@ -9,7 +9,7 @@ import requests
|
|||
import voluptuous as vol
|
||||
|
||||
from homeassistant.components.device_tracker import (
|
||||
DOMAIN,
|
||||
DOMAIN as DEVICE_TRACKER_DOMAIN,
|
||||
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
|
||||
DeviceScanner,
|
||||
)
|
||||
|
@ -31,7 +31,7 @@ def get_scanner(
|
|||
hass: HomeAssistant, config: ConfigType
|
||||
) -> SwisscomDeviceScanner | None:
|
||||
"""Return the Swisscom device scanner."""
|
||||
scanner = SwisscomDeviceScanner(config[DOMAIN])
|
||||
scanner = SwisscomDeviceScanner(config[DEVICE_TRACKER_DOMAIN])
|
||||
|
||||
return scanner if scanner.success_init else None
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@ import synology_srm
|
|||
import voluptuous as vol
|
||||
|
||||
from homeassistant.components.device_tracker import (
|
||||
DOMAIN,
|
||||
DOMAIN as DEVICE_TRACKER_DOMAIN,
|
||||
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
|
||||
DeviceScanner,
|
||||
)
|
||||
|
@ -75,7 +75,7 @@ def get_scanner(
|
|||
hass: HomeAssistant, config: ConfigType
|
||||
) -> SynologySrmDeviceScanner | None:
|
||||
"""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
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@ import telnetlib # pylint: disable=deprecated-module
|
|||
import voluptuous as vol
|
||||
|
||||
from homeassistant.components.device_tracker import (
|
||||
DOMAIN,
|
||||
DOMAIN as DEVICE_TRACKER_DOMAIN,
|
||||
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
|
||||
DeviceScanner,
|
||||
)
|
||||
|
@ -41,7 +41,7 @@ PLATFORM_SCHEMA = DEVICE_TRACKER_PLATFORM_SCHEMA.extend(
|
|||
|
||||
def get_scanner(hass: HomeAssistant, config: ConfigType) -> ThomsonDeviceScanner | None:
|
||||
"""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
|
||||
|
||||
|
|
|
@ -18,7 +18,11 @@ from aiounifi.models.client import Client
|
|||
from aiounifi.models.device import Device
|
||||
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.helpers.dispatcher import async_dispatcher_connect
|
||||
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:
|
||||
"""Rework unique 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
|
||||
|
||||
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)
|
||||
|
||||
for obj_id in list(hub.api.clients) + list(hub.api.clients_all):
|
||||
|
|
|
@ -9,7 +9,7 @@ from unifi_ap import UniFiAP, UniFiAPConnectionException, UniFiAPDataException
|
|||
import voluptuous as vol
|
||||
|
||||
from homeassistant.components.device_tracker import (
|
||||
DOMAIN,
|
||||
DOMAIN as DEVICE_TRACKER_DOMAIN,
|
||||
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
|
||||
DeviceScanner,
|
||||
)
|
||||
|
@ -34,7 +34,7 @@ PLATFORM_SCHEMA = DEVICE_TRACKER_PLATFORM_SCHEMA.extend(
|
|||
|
||||
def get_scanner(hass: HomeAssistant, config: ConfigType) -> UnifiDeviceScanner | None:
|
||||
"""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
|
||||
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@ from connect_box.exceptions import ConnectBoxError, ConnectBoxLoginError
|
|||
import voluptuous as vol
|
||||
|
||||
from homeassistant.components.device_tracker import (
|
||||
DOMAIN,
|
||||
DOMAIN as DEVICE_TRACKER_DOMAIN,
|
||||
PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
|
||||
DeviceScanner,
|
||||
)
|
||||
|
@ -35,7 +35,7 @@ async def async_get_scanner(
|
|||
hass: HomeAssistant, config: ConfigType
|
||||
) -> UPCDeviceScanner | None:
|
||||
"""Return the UPC device scanner."""
|
||||
conf = config[DOMAIN]
|
||||
conf = config[DEVICE_TRACKER_DOMAIN]
|
||||
session = async_get_clientsession(hass)
|
||||
connect_box = ConnectBox(session, conf[CONF_PASSWORD], host=conf[CONF_HOST])
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue