Fix device identifiers in ping and add migration (#155343)

Author: jpbede

homeassistant/components/ping/__init__.py

@@ -7,8 +7,8 @@
 from icmplib import SocketPermissionError, async_ping
 
 from homeassistant.const import CONF_HOST, Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_validation as cv
+from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant
+from homeassistant.helpers import config_validation as cv, device_registry as dr
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util.hass_dict import HassKey
 
@@ -32,6 +32,19 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
 
 async def async_setup_entry(hass: HomeAssistant, entry: PingConfigEntry) -> bool:
     """Set up Ping (ICMP) from a config entry."""
+
+    # Migrate device registry identifiers from homeassistant domain to ping domain
+    registry = dr.async_get(hass)
+    if (
+        device := registry.async_get_device(
+            identifiers={(HOMEASSISTANT_DOMAIN, entry.entry_id)}
+        )
+    ) is not None and entry.entry_id in device.config_entries:
+        registry.async_update_device(
+            device_id=device.id,
+            new_identifiers={(DOMAIN, entry.entry_id)},
+        )
+
     privileged = hass.data[DATA_PRIVILEGED_KEY]
 
     host: str = entry.options[CONF_HOST]

homeassistant/components/ping/entity.py

@@ -1,9 +1,9 @@
 """Base entity for the Ping component."""
 
-from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
+from .const import DOMAIN
 from .coordinator import PingConfigEntry, PingUpdateCoordinator
 
 
@@ -23,6 +23,6 @@ def __init__(
 
         self._attr_unique_id = unique_id
         self._attr_device_info = DeviceInfo(
-            identifiers={(HOMEASSISTANT_DOMAIN, config_entry.entry_id)},
+            identifiers={(DOMAIN, config_entry.entry_id)},
             manufacturer="Ping",
         )

tests/components/ping/test_init.py

@@ -0,0 +1,46 @@
+"""Test init of ping component."""
+
+import pytest
+
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant
+from homeassistant.helpers import device_registry as dr
+
+from tests.common import MockConfigEntry
+
+
+@pytest.mark.usefixtures("patch_setup")
+async def test_config_setup(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+) -> None:
+    """Test for setup success."""
+    config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    assert config_entry.state is ConfigEntryState.LOADED
+
+
+async def test_device_migration(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    config_entry: MockConfigEntry,
+) -> None:
+    """Test for device migration."""
+    config_entry.add_to_hass(hass)
+
+    old_device = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        identifiers={(HOMEASSISTANT_DOMAIN, config_entry.entry_id)},
+    )
+
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    device = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        identifiers={(config_entry.domain, config_entry.entry_id)},
+    )
+
+    assert device is not None
+    assert device.id == old_device.id
+    assert device.config_entries == {config_entry.entry_id}