Add sw_version to Shelly BLU TRV device info (home-assistant#152129)

Author: bieniu

homeassistant/components/shelly/binary_sensor.py

@@ -98,8 +98,9 @@ def __init__(
 
         super().__init__(coordinator, key, attribute, description)
         ble_addr: str = coordinator.device.config[key]["addr"]
+        fw_ver = coordinator.device.status[key].get("fw_ver")
         self._attr_device_info = get_blu_trv_device_info(
-            coordinator.device.config[key], ble_addr, coordinator.mac
+            coordinator.device.config[key], ble_addr, coordinator.mac, fw_ver
         )
 
 

homeassistant/components/shelly/button.py

@@ -254,11 +254,14 @@ def __init__(
         """Initialize."""
         super().__init__(coordinator, description)
 
-        config = coordinator.device.config[f"{BLU_TRV_IDENTIFIER}:{id_}"]
+        key = f"{BLU_TRV_IDENTIFIER}:{id_}"
+        config = coordinator.device.config[key]
         ble_addr: str = config["addr"]
+        fw_ver = coordinator.device.status[key].get("fw_ver")
+
         self._attr_unique_id = f"{ble_addr}_{description.key}"
         self._attr_device_info = get_blu_trv_device_info(
-            config, ble_addr, coordinator.mac
+            config, ble_addr, coordinator.mac, fw_ver
         )
         self._id = id_
 

homeassistant/components/shelly/climate.py

@@ -557,11 +557,12 @@ def __init__(self, coordinator: ShellyRpcCoordinator, id_: int) -> None:
 
         super().__init__(coordinator, f"{BLU_TRV_IDENTIFIER}:{id_}")
         self._id = id_
-        self._config = coordinator.device.config[f"{BLU_TRV_IDENTIFIER}:{id_}"]
+        self._config = coordinator.device.config[self.key]
         ble_addr: str = self._config["addr"]
         self._attr_unique_id = f"{ble_addr}-{self.key}"
+        fw_ver = coordinator.device.status[self.key].get("fw_ver")
         self._attr_device_info = get_blu_trv_device_info(
-            self._config, ble_addr, self.coordinator.mac
+            self._config, ble_addr, self.coordinator.mac, fw_ver
         )
 
     @property

homeassistant/components/shelly/number.py

@@ -125,8 +125,9 @@ def __init__(
 
         super().__init__(coordinator, key, attribute, description)
         ble_addr: str = coordinator.device.config[key]["addr"]
+        fw_ver = coordinator.device.status[key].get("fw_ver")
         self._attr_device_info = get_blu_trv_device_info(
-            coordinator.device.config[key], ble_addr, coordinator.mac
+            coordinator.device.config[key], ble_addr, coordinator.mac, fw_ver
         )
 
 

homeassistant/components/shelly/sensor.py

@@ -169,8 +169,9 @@ def __init__(
 
         super().__init__(coordinator, key, attribute, description)
         ble_addr: str = coordinator.device.config[key]["addr"]
+        fw_ver = coordinator.device.status[key].get("fw_ver")
         self._attr_device_info = get_blu_trv_device_info(
-            coordinator.device.config[key], ble_addr, coordinator.mac
+            coordinator.device.config[key], ble_addr, coordinator.mac, fw_ver
         )
 
 

homeassistant/components/shelly/utils.py

@@ -811,7 +811,7 @@ def get_rpc_device_info(
 
 
 def get_blu_trv_device_info(
-    config: dict[str, Any], ble_addr: str, parent_mac: str
+    config: dict[str, Any], ble_addr: str, parent_mac: str, fw_ver: str | None
 ) -> DeviceInfo:
     """Return device info for RPC device."""
     model_id = config.get("local_name")
@@ -823,6 +823,7 @@ def get_blu_trv_device_info(
         model=BLU_TRV_MODEL_NAME.get(model_id) if model_id else None,
         model_id=config.get("local_name"),
         name=config["name"] or f"shellyblutrv-{ble_addr.replace(':', '')}",
+        sw_version=fw_ver,
     )
 
 

tests/components/shelly/conftest.py

@@ -324,6 +324,7 @@ def mock_white_light_set_state(
         "rssi": -60,
         "battery": 100,
         "errors": [],
+        "fw_ver": "v1.2.10",
     },
     "blutrv:201": {
         "id": 0,

tests/components/shelly/test_devices.py

@@ -2,7 +2,7 @@
 
 from unittest.mock import Mock
 
-from aioshelly.const import MODEL_2PM_G3, MODEL_PRO_EM3
+from aioshelly.const import MODEL_2PM_G3, MODEL_BLU_GATEWAY_G3, MODEL_PRO_EM3
 from freezegun.api import FrozenDateTimeFactory
 import pytest
 from syrupy.assertion import SnapshotAssertion
@@ -510,3 +510,22 @@ async def test_block_channel_with_name(
     device_entry = device_registry.async_get(entry.device_id)
     assert device_entry
     assert device_entry.name == "Test name"
+
+
+async def test_blu_trv_device_info(
+    hass: HomeAssistant,
+    mock_blu_trv: Mock,
+    entity_registry: EntityRegistry,
+    device_registry: DeviceRegistry,
+) -> None:
+    """Test BLU TRV device info."""
+    await init_integration(hass, 3, model=MODEL_BLU_GATEWAY_G3)
+
+    entry = entity_registry.async_get("climate.trv_name")
+    assert entry
+
+    device_entry = device_registry.async_get(entry.device_id)
+    assert device_entry
+    assert device_entry.name == "TRV-Name"
+    assert device_entry.model_id == "SBTR-001AEU"
+    assert device_entry.sw_version == "v1.2.10"