Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use DeviceInfo on zwave (#58183) 

Co-authored-by: epenet <epenet@users.noreply.github.com>
pull/58181/head
epenet 2021-10-22 11:36:40 +02:00 committed by GitHub
parent 9990385926
commit 0b302ab141
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
homeassistant/components/zwave/__init__.py
View File

@ -12,6 +12,7 @@ from homeassistant import config_entries
from homeassistant.const import ( from homeassistant.const import (
ATTR_ENTITY_ID, ATTR_ENTITY_ID,
ATTR_NAME, ATTR_NAME,
ATTR_VIA_DEVICE,
EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_START,
EVENT_HOMEASSISTANT_STOP, EVENT_HOMEASSISTANT_STOP,
) )
@ -25,7 +26,7 @@ from homeassistant.helpers.dispatcher import (
async_dispatcher_connect, async_dispatcher_connect,
async_dispatcher_send, async_dispatcher_send,
) )
from homeassistant.helpers.entity import generate_entity_id from homeassistant.helpers.entity import DeviceInfo, generate_entity_id
from homeassistant.helpers.entity_component import DEFAULT_SCAN_INTERVAL from homeassistant.helpers.entity_component import DEFAULT_SCAN_INTERVAL
from homeassistant.helpers.entity_platform import EntityPlatform from homeassistant.helpers.entity_platform import EntityPlatform
from homeassistant.helpers.entity_registry import ( from homeassistant.helpers.entity_registry import (
@ -1301,21 +1302,21 @@ class ZWaveDeviceEntity(ZWaveBaseEntity):
return self._unique_id return self._unique_id
@property @property
def device_info(self): def device_info(self) -> DeviceInfo:
"""Return device information.""" """Return device information."""
identifier, name = node_device_id_and_name( identifier, name = node_device_id_and_name(
self.node, self.values.primary.instance self.node, self.values.primary.instance
) )
info = { info = DeviceInfo(
"name": name, name=name,
"identifiers": {identifier}, identifiers={identifier},
"manufacturer": self.node.manufacturer_name, manufacturer=self.node.manufacturer_name,
"model": self.node.product_name, model=self.node.product_name,
} )
if self.values.primary.instance > 1: if self.values.primary.instance > 1:
info["via_device"] = (DOMAIN, self.node_id) info[ATTR_VIA_DEVICE] = (DOMAIN, self.node_id)
elif self.node_id > 1: elif self.node_id > 1:
info["via_device"] = (DOMAIN, 1) info[ATTR_VIA_DEVICE] = (DOMAIN, 1)
return info return info
@property @property

25
homeassistant/components/zwave/node_entity.py
View File

@ -2,10 +2,15 @@
# pylint: disable=import-outside-toplevel # pylint: disable=import-outside-toplevel
from itertools import count from itertools import count
from homeassistant.const import ATTR_BATTERY_LEVEL, ATTR_ENTITY_ID, ATTR_WAKEUP from homeassistant.const import (
ATTR_BATTERY_LEVEL,
ATTR_ENTITY_ID,
ATTR_VIA_DEVICE,
ATTR_WAKEUP,
)
from homeassistant.core import callback from homeassistant.core import callback
from homeassistant.helpers.device_registry import async_get_registry as get_dev_reg from homeassistant.helpers.device_registry import async_get_registry as get_dev_reg
from homeassistant.helpers.entity import Entity from homeassistant.helpers.entity import DeviceInfo, Entity
from homeassistant.helpers.entity_registry import async_get_registry from homeassistant.helpers.entity_registry import async_get_registry
from .const import ( from .const import (
@ -151,17 +156,17 @@ class ZWaveNodeEntity(ZWaveBaseEntity):
return self._unique_id return self._unique_id
@property @property
def device_info(self): def device_info(self) -> DeviceInfo:
"""Return device information.""" """Return device information."""
identifier, name = node_device_id_and_name(self.node) identifier, name = node_device_id_and_name(self.node)
info = { info = DeviceInfo(
"identifiers": {identifier}, identifiers={identifier},
"manufacturer": self.node.manufacturer_name, manufacturer=self.node.manufacturer_name,
"model": self.node.product_name, model=self.node.product_name,
"name": name, name=name,
} )
if self.node_id > 1: if self.node_id > 1:
info["via_device"] = (DOMAIN, 1) info[ATTR_VIA_DEVICE] = (DOMAIN, 1)
return info return info
def maybe_update_application_version(self, value): def maybe_update_application_version(self, value):

1
homeassistant/const.py
View File

@ -355,6 +355,7 @@ ATTR_MODE: Final = "mode"
ATTR_MANUFACTURER: Final = "manufacturer" ATTR_MANUFACTURER: Final = "manufacturer"
ATTR_MODEL: Final = "model" ATTR_MODEL: Final = "model"
ATTR_SW_VERSION: Final = "sw_version" ATTR_SW_VERSION: Final = "sw_version"
ATTR_VIA_DEVICE: Final = "via_device"
ATTR_BATTERY_CHARGING: Final = "battery_charging" ATTR_BATTERY_CHARGING: Final = "battery_charging"
ATTR_BATTERY_LEVEL: Final = "battery_level" ATTR_BATTERY_LEVEL: Final = "battery_level"