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

Fix Axis unique ID (#112132)

Browse Source
This commit is contained in:
Robert Svensson 2024-03-12 21:01:20 +01:00 committed by GitHub
parent 2cdf6b9937
commit c761b825ec
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/components/axis/entity.py
View File

@ -42,7 +42,7 @@ class AxisEntity(Entity):
self.hub = hub self.hub = hub
self._attr_device_info = DeviceInfo( self._attr_device_info = DeviceInfo(
identifiers={(AXIS_DOMAIN, hub.unique_id)}, # type: ignore[arg-type] identifiers={(AXIS_DOMAIN, hub.unique_id)},
serial_number=hub.unique_id, serial_number=hub.unique_id,
) )

16
homeassistant/components/axis/hub/hub.py
View File

@ -16,7 +16,7 @@ from homeassistant.components.mqtt.models import ReceiveMessage
from homeassistant.config_entries import ConfigEntry from homeassistant.config_entries import ConfigEntry
from homeassistant.core import Event, HomeAssistant, callback from homeassistant.core import Event, HomeAssistant, callback
from homeassistant.helpers import device_registry as dr from homeassistant.helpers import device_registry as dr
from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, format_mac
from homeassistant.helpers.dispatcher import async_dispatcher_send from homeassistant.helpers.dispatcher import async_dispatcher_send
from homeassistant.setup import async_when_setup from homeassistant.setup import async_when_setup
@ -38,6 +38,7 @@ class AxisHub:
self.available = True self.available = True
self.fw_version = api.vapix.firmware_version self.fw_version = api.vapix.firmware_version
self.product_type = api.vapix.product_type self.product_type = api.vapix.product_type
self.unique_id = format_mac(api.vapix.serial_number)
self.additional_diagnostics: dict[str, Any] = {} self.additional_diagnostics: dict[str, Any] = {}
@ -48,22 +49,17 @@ class AxisHub:
hub: AxisHub = hass.data[AXIS_DOMAIN][config_entry.entry_id] hub: AxisHub = hass.data[AXIS_DOMAIN][config_entry.entry_id]
return hub return hub
@property
def unique_id(self) -> str | None:
"""Return the unique ID (serial number) of this device."""
return self.config.entry.unique_id
# Signals # Signals
@property @property
def signal_reachable(self) -> str: def signal_reachable(self) -> str:
"""Device specific event to signal a change in connection status.""" """Device specific event to signal a change in connection status."""
return f"axis_reachable_{self.unique_id}" return f"axis_reachable_{self.config.entry.entry_id}"
@property @property
def signal_new_address(self) -> str: def signal_new_address(self) -> str:
"""Device specific event to signal a change in device address.""" """Device specific event to signal a change in device address."""
return f"axis_new_address_{self.unique_id}" return f"axis_new_address_{self.config.entry.entry_id}"
# Callbacks # Callbacks
@ -100,8 +96,8 @@ class AxisHub:
device_registry.async_get_or_create( device_registry.async_get_or_create(
config_entry_id=self.config.entry.entry_id, config_entry_id=self.config.entry.entry_id,
configuration_url=self.api.config.url, configuration_url=self.api.config.url,
connections={(CONNECTION_NETWORK_MAC, self.unique_id)}, # type: ignore[arg-type] connections={(CONNECTION_NETWORK_MAC, self.unique_id)},
identifiers={(AXIS_DOMAIN, self.unique_id)}, # type: ignore[arg-type] identifiers={(AXIS_DOMAIN, self.unique_id)},
manufacturer=ATTR_MANUFACTURER, manufacturer=ATTR_MANUFACTURER,
model=f"{self.config.model} {self.product_type}", model=f"{self.config.model} {self.product_type}",
name=self.config.name, name=self.config.name,

4
tests/components/axis/test_hub.py
View File

@ -212,7 +212,9 @@ async def test_shutdown(config) -> None:
entry = Mock() entry = Mock()
entry.data = config entry.data = config
axis_device = axis.hub.AxisHub(hass, entry, Mock()) mock_api = Mock()
mock_api.vapix.serial_number = FORMATTED_MAC
axis_device = axis.hub.AxisHub(hass, entry, mock_api)
await axis_device.shutdown(None) await axis_device.shutdown(None)