diff --git a/homeassistant/components/system_bridge/__init__.py b/homeassistant/components/system_bridge/__init__.py index 74be1faed40..392273dee45 100644 --- a/homeassistant/components/system_bridge/__init__.py +++ b/homeassistant/components/system_bridge/__init__.py @@ -286,6 +286,7 @@ class SystemBridgeEntity(CoordinatorEntity[SystemBridgeDataUpdateCoordinator]): f"http://{self._hostname}:{api_port}/app/settings.html" ) self._mac_address = coordinator.data.system.mac_address + self._uuid = coordinator.data.system.uuid self._version = coordinator.data.system.version @property @@ -298,16 +299,13 @@ class SystemBridgeEntity(CoordinatorEntity[SystemBridgeDataUpdateCoordinator]): """Return the name of the entity.""" return self._name - -class SystemBridgeDeviceEntity(SystemBridgeEntity): - """Defines a System Bridge device entity.""" - @property def device_info(self) -> DeviceInfo: """Return device information about this System Bridge instance.""" return DeviceInfo( configuration_url=self._configuration_url, connections={(dr.CONNECTION_NETWORK_MAC, self._mac_address)}, + identifiers={(DOMAIN, self._uuid)}, name=self._hostname, sw_version=self._version, ) diff --git a/homeassistant/components/system_bridge/binary_sensor.py b/homeassistant/components/system_bridge/binary_sensor.py index 9225aebf492..8feb1114285 100644 --- a/homeassistant/components/system_bridge/binary_sensor.py +++ b/homeassistant/components/system_bridge/binary_sensor.py @@ -14,7 +14,7 @@ from homeassistant.const import CONF_PORT from homeassistant.core import HomeAssistant from homeassistant.helpers.entity_platform import AddEntitiesCallback -from . import SystemBridgeDeviceEntity +from . import SystemBridgeEntity from .const import DOMAIN from .coordinator import SystemBridgeDataUpdateCoordinator @@ -72,7 +72,7 @@ async def async_setup_entry( async_add_entities(entities) -class SystemBridgeBinarySensor(SystemBridgeDeviceEntity, BinarySensorEntity): +class SystemBridgeBinarySensor(SystemBridgeEntity, BinarySensorEntity): """Define a System Bridge binary sensor.""" entity_description: SystemBridgeBinarySensorEntityDescription diff --git a/homeassistant/components/system_bridge/sensor.py b/homeassistant/components/system_bridge/sensor.py index bdfe5047e56..f9d6e09f0c6 100644 --- a/homeassistant/components/system_bridge/sensor.py +++ b/homeassistant/components/system_bridge/sensor.py @@ -29,7 +29,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.typing import StateType from homeassistant.util.dt import utcnow -from . import SystemBridgeDeviceEntity +from . import SystemBridgeEntity from .const import DOMAIN from .coordinator import SystemBridgeCoordinatorData, SystemBridgeDataUpdateCoordinator @@ -512,7 +512,7 @@ async def async_setup_entry( async_add_entities(entities) -class SystemBridgeSensor(SystemBridgeDeviceEntity, SensorEntity): +class SystemBridgeSensor(SystemBridgeEntity, SensorEntity): """Define a System Bridge sensor.""" entity_description: SystemBridgeSensorEntityDescription