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

Remove deprecated Guardian entity_id service parameter (#65484)

Browse Source
This commit is contained in:
Aaron Bach 2022-02-03 09:19:06 -07:00 committed by GitHub
parent efb6fd1569
commit 8d2fac09bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
homeassistant/components/guardian/__init__.py
View File

@ -3,7 +3,7 @@ from __future__ import annotations
import asyncio import asyncio
from collections.abc import Awaitable, Callable from collections.abc import Awaitable, Callable
from typing import TYPE_CHECKING, cast from typing import cast
from aioguardian import Client from aioguardian import Client
from aioguardian.errors import GuardianError from aioguardian.errors import GuardianError
@ -12,7 +12,6 @@ import voluptuous as vol
from homeassistant.config_entries import ConfigEntry, ConfigEntryState from homeassistant.config_entries import ConfigEntry, ConfigEntryState
from homeassistant.const import ( from homeassistant.const import (
ATTR_DEVICE_ID, ATTR_DEVICE_ID,
ATTR_ENTITY_ID,
CONF_DEVICE_ID, CONF_DEVICE_ID,
CONF_FILENAME, CONF_FILENAME,
CONF_IP_ADDRESS, CONF_IP_ADDRESS,
@ -22,11 +21,7 @@ from homeassistant.const import (
) )
from homeassistant.core import HomeAssistant, ServiceCall, callback from homeassistant.core import HomeAssistant, ServiceCall, callback
from homeassistant.exceptions import HomeAssistantError from homeassistant.exceptions import HomeAssistantError
from homeassistant.helpers import ( from homeassistant.helpers import config_validation as cv, device_registry as dr
config_validation as cv,
device_registry as dr,
entity_registry as er,
)
from homeassistant.helpers.dispatcher import async_dispatcher_send from homeassistant.helpers.dispatcher import async_dispatcher_send
from homeassistant.helpers.entity import DeviceInfo, EntityDescription from homeassistant.helpers.entity import DeviceInfo, EntityDescription
from homeassistant.helpers.update_coordinator import ( from homeassistant.helpers.update_coordinator import (
@ -71,41 +66,26 @@ SERVICES = (
SERVICE_NAME_UPGRADE_FIRMWARE, SERVICE_NAME_UPGRADE_FIRMWARE,
) )
SERVICE_BASE_SCHEMA = vol.All( SERVICE_BASE_SCHEMA = vol.Schema(
cv.deprecated(ATTR_ENTITY_ID), {
vol.Schema( vol.Required(ATTR_DEVICE_ID): cv.string,
{ }
vol.Optional(ATTR_DEVICE_ID): cv.string,
vol.Optional(ATTR_ENTITY_ID): cv.entity_id,
}
),
cv.has_at_least_one_key(ATTR_DEVICE_ID, ATTR_ENTITY_ID),
) )
SERVICE_PAIR_UNPAIR_SENSOR_SCHEMA = vol.All( SERVICE_PAIR_UNPAIR_SENSOR_SCHEMA = vol.Schema(
cv.deprecated(ATTR_ENTITY_ID), {
vol.Schema( vol.Required(ATTR_DEVICE_ID): cv.string,
{ vol.Required(CONF_UID): cv.string,
vol.Optional(ATTR_DEVICE_ID): cv.string, }
vol.Optional(ATTR_ENTITY_ID): cv.entity_id,
vol.Required(CONF_UID): cv.string,
}
),
cv.has_at_least_one_key(ATTR_DEVICE_ID, ATTR_ENTITY_ID),
) )
SERVICE_UPGRADE_FIRMWARE_SCHEMA = vol.All( SERVICE_UPGRADE_FIRMWARE_SCHEMA = vol.Schema(
cv.deprecated(ATTR_ENTITY_ID), {
vol.Schema( vol.Required(ATTR_DEVICE_ID): cv.string,
{ vol.Optional(CONF_URL): cv.url,
vol.Optional(ATTR_DEVICE_ID): cv.string, vol.Optional(CONF_PORT): cv.port,
vol.Optional(ATTR_ENTITY_ID): cv.entity_id, vol.Optional(CONF_FILENAME): cv.string,
vol.Optional(CONF_URL): cv.url, },
vol.Optional(CONF_PORT): cv.port,
vol.Optional(CONF_FILENAME): cv.string,
},
),
cv.has_at_least_one_key(ATTR_DEVICE_ID, ATTR_ENTITY_ID),
) )
@ -115,14 +95,6 @@ PLATFORMS = [Platform.BINARY_SENSOR, Platform.SENSOR, Platform.SWITCH]
@callback @callback
def async_get_entry_id_for_service_call(hass: HomeAssistant, call: ServiceCall) -> str: def async_get_entry_id_for_service_call(hass: HomeAssistant, call: ServiceCall) -> str:
"""Get the entry ID related to a service call (by device ID).""" """Get the entry ID related to a service call (by device ID)."""
if ATTR_ENTITY_ID in call.data:
entity_registry = er.async_get(hass)
entity_registry_entry = entity_registry.async_get(call.data[ATTR_ENTITY_ID])
if TYPE_CHECKING:
assert entity_registry_entry
assert entity_registry_entry.config_entry_id
return entity_registry_entry.config_entry_id
device_id = call.data[CONF_DEVICE_ID] device_id = call.data[CONF_DEVICE_ID]
device_registry = dr.async_get(hass) device_registry = dr.async_get(hass)