Add WS command to help reset custom entity_id (#145504)

* Add WS command to help reset custom entity_id

* Calculate suggested object id from entity properties

* Fix logic and add additional tests

* Adjust test

* Update folder_watcher test

* Handle current entity id matches the automatic entity id

* Don't store calculated_object_id

* Update snapshots

* Update snapshots

* Update test

* Tweak logic for reusing current entity_id

* Improve test

* Don't assign same entity_id to several entities

* Prioritize custom entity name

* Update snapshots

* Update snapshots

homeassistant/components/config/entity_registry.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import logging
 from typing import Any
 
 import voluptuous as vol
@@ -10,18 +11,23 @@ from homeassistant import config_entries
 from homeassistant.components import websocket_api
 from homeassistant.components.websocket_api import ERR_NOT_FOUND, require_admin
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import (
     config_validation as cv,
     device_registry as dr,
     entity_registry as er,
 )
+from homeassistant.helpers.entity_component import async_get_entity_suggested_object_id
 from homeassistant.helpers.json import json_dumps
 
+_LOGGER = logging.getLogger(__name__)
+
 
 @callback
 def async_setup(hass: HomeAssistant) -> bool:
     """Enable the Entity Registry views."""
 
+    websocket_api.async_register_command(hass, websocket_get_automatic_entity_ids)
     websocket_api.async_register_command(hass, websocket_get_entities)
     websocket_api.async_register_command(hass, websocket_get_entity)
     websocket_api.async_register_command(hass, websocket_list_entities_for_display)
@@ -316,3 +322,54 @@ def websocket_remove_entity(
 
     registry.async_remove(msg["entity_id"])
     connection.send_message(websocket_api.result_message(msg["id"]))
+
+
+@websocket_api.websocket_command(
+    {
+        vol.Required("type"): "config/entity_registry/get_automatic_entity_ids",
+        vol.Required("entity_ids"): cv.entity_ids,
+    }
+)
+@callback
+def websocket_get_automatic_entity_ids(
+    hass: HomeAssistant,
+    connection: websocket_api.ActiveConnection,
+    msg: dict[str, Any],
+) -> None:
+    """Return the automatic entity IDs for the given entity IDs.
+
+    This is used to help user reset entity IDs which have been customized by the user.
+    """
+    registry = er.async_get(hass)
+
+    entity_ids = msg["entity_ids"]
+    automatic_entity_ids: dict[str, str | None] = {}
+    reserved_entity_ids: set[str] = set()
+    for entity_id in entity_ids:
+        if not (entry := registry.entities.get(entity_id)):
+            automatic_entity_ids[entity_id] = None
+            continue
+        try:
+            suggested = async_get_entity_suggested_object_id(hass, entity_id)
+        except HomeAssistantError as err:
+            # This is raised if the entity has no object.
+            _LOGGER.debug(
+                "Unable to get suggested object ID for %s, entity ID: %s (%s)",
+                entry.entity_id,
+                entity_id,
+                err,
+            )
+            automatic_entity_ids[entity_id] = None
+            continue
+        suggested_entity_id = registry.async_generate_entity_id(
+            entry.domain,
+            suggested or f"{entry.platform}_{entry.unique_id}",
+            current_entity_id=entity_id,
+            reserved_entity_ids=reserved_entity_ids,
+        )
+        automatic_entity_ids[entity_id] = suggested_entity_id
+        reserved_entity_ids.add(suggested_entity_id)
+
+    connection.send_message(
+        websocket_api.result_message(msg["id"], automatic_entity_ids)
+    )

homeassistant/helpers/entity_component.py

@@ -29,20 +29,27 @@ from homeassistant.core import (
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.loader import async_get_integration, bind_hass
 from homeassistant.setup import async_prepare_setup_platform
+from homeassistant.util.hass_dict import HassKey
 
-from . import config_validation as cv, discovery, entity, service
+from . import (
-from .entity_platform import EntityPlatform
+    config_validation as cv,
+    device_registry as dr,
+    discovery,
+    entity,
+    entity_registry as er,
+    service,
+)
+from .entity_platform import EntityPlatform, async_calculate_suggested_object_id
 from .typing import ConfigType, DiscoveryInfoType, VolDictType, VolSchemaType
 
 DEFAULT_SCAN_INTERVAL = timedelta(seconds=15)
-DATA_INSTANCES = "entity_components"
+DATA_INSTANCES: HassKey[dict[str, EntityComponent]] = HassKey("entity_components")
 
 
 @bind_hass
 async def async_update_entity(hass: HomeAssistant, entity_id: str) -> None:
     """Trigger an update for an entity."""
     domain = entity_id.partition(".")[0]
-    entity_comp: EntityComponent[entity.Entity] | None
     entity_comp = hass.data.get(DATA_INSTANCES, {}).get(domain)
 
     if entity_comp is None:
@@ -60,6 +67,36 @@ async def async_update_entity(hass: HomeAssistant, entity_id: str) -> None:
     await entity_obj.async_update_ha_state(True)
 
 
+@callback
+def async_get_entity_suggested_object_id(
+    hass: HomeAssistant, entity_id: str
+) -> str | None:
+    """Get the suggested object id for an entity.
+
+    Raises HomeAssistantError if the entity is not in the registry or
+    is not backed by an object.
+    """
+    entity_registry = er.async_get(hass)
+    if not (entity_entry := entity_registry.async_get(entity_id)):
+        raise HomeAssistantError(f"Entity {entity_id} is not in the registry.")
+
+    domain = entity_id.partition(".")[0]
+
+    if entity_entry.name:
+        return entity_entry.name
+
+    if entity_entry.suggested_object_id:
+        return entity_entry.suggested_object_id
+
+    entity_comp = hass.data.get(DATA_INSTANCES, {}).get(domain)
+    if not (entity_obj := entity_comp.get_entity(entity_id) if entity_comp else None):
+        raise HomeAssistantError(f"Entity {entity_id} has no object.")
+    device: dr.DeviceEntry | None = None
+    if device_id := entity_entry.device_id:
+        device = dr.async_get(hass).async_get(device_id)
+    return async_calculate_suggested_object_id(entity_obj, device)
+
+
 class EntityComponent[_EntityT: entity.Entity = entity.Entity]:
     """The EntityComponent manages platforms that manage entities.
 
@@ -95,7 +132,7 @@ class EntityComponent[_EntityT: entity.Entity = entity.Entity]:
         self.async_add_entities = domain_platform.async_add_entities
         self.add_entities = domain_platform.add_entities
         self._entities: dict[str, entity.Entity] = domain_platform.domain_entities
-        hass.data.setdefault(DATA_INSTANCES, {})[domain] = self
+        hass.data.setdefault(DATA_INSTANCES, {})[domain] = self  # type: ignore[assignment]
 
     @property
     def entities(self) -> Iterable[_EntityT]:

homeassistant/helpers/entity_platform.py

@@ -843,31 +843,23 @@ class EntityPlatform:
             else:
                 device = None
 
-            if not registered_entity_id:
+            calculated_object_id: str | None = None
-                # Do not bother working out a suggested_object_id
-                # if the entity is already registered as it will
-                # be ignored.
-                #
             # An entity may suggest the entity_id by setting entity_id itself
             suggested_entity_id: str | None = entity.entity_id
             if suggested_entity_id is not None:
                 suggested_object_id = split_entity_id(entity.entity_id)[1]
-                else:
-                    if device and entity.has_entity_name:
-                        device_name = device.name_by_user or device.name
-                        if entity.use_device_name:
-                            suggested_object_id = device_name
-                        else:
-                            suggested_object_id = (
-                                f"{device_name} {entity.suggested_object_id}"
-                            )
-                    if not suggested_object_id:
-                        suggested_object_id = entity.suggested_object_id
-
                 if self.entity_namespace is not None:
                     suggested_object_id = (
                         f"{self.entity_namespace} {suggested_object_id}"
                     )
+            if not registered_entity_id and suggested_entity_id is None:
+                # Do not bother working out a suggested_object_id
+                # if the entity is already registered as it will
+                # be ignored.
+                #
+                calculated_object_id = async_calculate_suggested_object_id(
+                    entity, device
+                )
 
             disabled_by: RegistryEntryDisabler | None = None
             if not entity.entity_registry_enabled_default:
@@ -881,6 +873,7 @@ class EntityPlatform:
                 self.domain,
                 self.platform_name,
                 entity.unique_id,
+                calculated_object_id=calculated_object_id,
                 capabilities=entity.capability_attributes,
                 config_entry=self.config_entry,
                 config_subentry_id=config_subentry_id,
@@ -1124,6 +1117,27 @@ class EntityPlatform:
                 await asyncio.gather(*tasks)
 
 
+@callback
+def async_calculate_suggested_object_id(
+    entity: Entity, device: dev_reg.DeviceEntry | None
+) -> str | None:
+    """Calculate the suggested object ID for an entity."""
+    calculated_object_id: str | None = None
+    if device and entity.has_entity_name:
+        device_name = device.name_by_user or device.name
+        if entity.use_device_name:
+            calculated_object_id = device_name
+        else:
+            calculated_object_id = f"{device_name} {entity.suggested_object_id}"
+    if not calculated_object_id:
+        calculated_object_id = entity.suggested_object_id
+
+    if (platform := entity.platform) and platform.entity_namespace is not None:
+        calculated_object_id = f"{platform.entity_namespace} {calculated_object_id}"
+
+    return calculated_object_id
+
+
 current_platform: ContextVar[EntityPlatform | None] = ContextVar(
     "current_platform", default=None
 )

homeassistant/helpers/entity_registry.py

@@ -79,7 +79,7 @@ EVENT_ENTITY_REGISTRY_UPDATED: EventType[EventEntityRegistryUpdatedData] = Event
 _LOGGER = logging.getLogger(__name__)
 
 STORAGE_VERSION_MAJOR = 1
-STORAGE_VERSION_MINOR = 16
+STORAGE_VERSION_MINOR = 17
 STORAGE_KEY = "core.entity_registry"
 
 CLEANUP_INTERVAL = 3600 * 24
@@ -198,6 +198,7 @@ class RegistryEntry:
     original_device_class: str | None = attr.ib()
     original_icon: str | None = attr.ib()
     original_name: str | None = attr.ib()
+    suggested_object_id: str | None = attr.ib()
     supported_features: int = attr.ib()
     translation_key: str | None = attr.ib()
     unit_of_measurement: str | None = attr.ib()
@@ -359,6 +360,7 @@ class RegistryEntry:
                     "original_icon": self.original_icon,
                     "original_name": self.original_name,
                     "platform": self.platform,
+                    "suggested_object_id": self.suggested_object_id,
                     "supported_features": self.supported_features,
                     "translation_key": self.translation_key,
                     "unique_id": self.unique_id,
@@ -549,6 +551,11 @@ class EntityRegistryStore(storage.Store[dict[str, list[dict[str, Any]]]]):
                 for entity in data["deleted_entities"]:
                     entity["config_subentry_id"] = None
 
+            if old_minor_version < 17:
+                # Version 1.17 adds suggested_object_id
+                for entity in data["entities"]:
+                    entity["suggested_object_id"] = None
+
         if old_major_version > 1:
             raise NotImplementedError
         return data
@@ -807,6 +814,9 @@ class EntityRegistry(BaseRegistry):
         self,
         domain: str,
         suggested_object_id: str,
+        *,
+        current_entity_id: str | None = None,
+        reserved_entity_ids: set[str] | None = None,
     ) -> str:
         """Generate an entity ID that does not conflict.
 
@@ -820,7 +830,10 @@ class EntityRegistry(BaseRegistry):
         test_string = preferred_string[:MAX_LENGTH_STATE_ENTITY_ID]
 
         tries = 1
-        while not self._entity_id_available(test_string):
+        while (
+            not self._entity_id_available(test_string)
+            and test_string != current_entity_id
+        ) or (reserved_entity_ids and test_string in reserved_entity_ids):
             tries += 1
             len_suffix = len(str(tries)) + 1
             test_string = (
@@ -837,6 +850,7 @@ class EntityRegistry(BaseRegistry):
         unique_id: str,
         *,
         # To influence entity ID generation
+        calculated_object_id: str | None = None,
         suggested_object_id: str | None = None,
         # To disable or hide an entity if it gets created
         disabled_by: RegistryEntryDisabler | None = None,
@@ -909,7 +923,7 @@ class EntityRegistry(BaseRegistry):
 
         entity_id = self.async_generate_entity_id(
             domain,
-            suggested_object_id or f"{platform}_{unique_id}",
+            suggested_object_id or calculated_object_id or f"{platform}_{unique_id}",
         )
 
         if (
@@ -943,6 +957,7 @@ class EntityRegistry(BaseRegistry):
             original_icon=none_if_undefined(original_icon),
             original_name=none_if_undefined(original_name),
             platform=platform,
+            suggested_object_id=suggested_object_id,
             supported_features=none_if_undefined(supported_features) or 0,
             translation_key=none_if_undefined(translation_key),
             unique_id=unique_id,
@@ -1380,6 +1395,7 @@ class EntityRegistry(BaseRegistry):
                     original_icon=entity["original_icon"],
                     original_name=entity["original_name"],
                     platform=entity["platform"],
+                    suggested_object_id=entity["suggested_object_id"],
                     supported_features=entity["supported_features"],
                     translation_key=entity["translation_key"],
                     unique_id=entity["unique_id"],

tests/common.py

@@ -674,6 +674,7 @@ class RegistryEntryWithDefaults(er.RegistryEntry):
     original_device_class: str | None = attr.ib(default=None)
     original_icon: str | None = attr.ib(default=None)
     original_name: str | None = attr.ib(default=None)
+    suggested_object_id: str | None = attr.ib(default=None)
     supported_features: int = attr.ib(default=0)
     translation_key: str | None = attr.ib(default=None)
     unit_of_measurement: str | None = attr.ib(default=None)

tests/components/acaia/snapshots/test_binary_sensor.ambr

@@ -27,6 +27,7 @@
     'original_name': 'Timer running',
     'platform': 'acaia',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'timer_running',
     'unique_id': 'aa:bb:cc:dd:ee:ff_timer_running',

tests/components/acaia/snapshots/test_button.ambr

@@ -27,6 +27,7 @@
     'original_name': 'Reset timer',
     'platform': 'acaia',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'reset_timer',
     'unique_id': 'aa:bb:cc:dd:ee:ff_reset_timer',
@@ -74,6 +75,7 @@
     'original_name': 'Start/stop timer',
     'platform': 'acaia',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'start_stop',
     'unique_id': 'aa:bb:cc:dd:ee:ff_start_stop',
@@ -121,6 +123,7 @@
     'original_name': 'Tare',
     'platform': 'acaia',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'tare',
     'unique_id': 'aa:bb:cc:dd:ee:ff_tare',

tests/components/acaia/snapshots/test_sensor.ambr

@@ -29,6 +29,7 @@
     'original_name': 'Battery',
     'platform': 'acaia',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'aa:bb:cc:dd:ee:ff_battery',
@@ -84,6 +85,7 @@
     'original_name': 'Volume flow rate',
     'platform': 'acaia',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'aa:bb:cc:dd:ee:ff_flow_rate',
@@ -136,6 +138,7 @@
     'original_name': 'Weight',
     'platform': 'acaia',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'aa:bb:cc:dd:ee:ff_weight',

tests/components/accuweather/snapshots/test_sensor.ambr

@@ -35,6 +35,7 @@
     'original_name': 'Air quality day 0',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'air_quality',
     'unique_id': '0123456-airquality-0',
@@ -99,6 +100,7 @@
     'original_name': 'Air quality day 1',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'air_quality',
     'unique_id': '0123456-airquality-1',
@@ -163,6 +165,7 @@
     'original_name': 'Air quality day 2',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'air_quality',
     'unique_id': '0123456-airquality-2',
@@ -227,6 +230,7 @@
     'original_name': 'Air quality day 3',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'air_quality',
     'unique_id': '0123456-airquality-3',
@@ -291,6 +295,7 @@
     'original_name': 'Air quality day 4',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'air_quality',
     'unique_id': '0123456-airquality-4',
@@ -349,6 +354,7 @@
     'original_name': 'Apparent temperature',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'apparent_temperature',
     'unique_id': '0123456-apparenttemperature',
@@ -405,6 +411,7 @@
     'original_name': 'Cloud ceiling',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'cloud_ceiling',
     'unique_id': '0123456-ceiling',
@@ -458,6 +465,7 @@
     'original_name': 'Cloud cover',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'cloud_cover',
     'unique_id': '0123456-cloudcover',
@@ -508,6 +516,7 @@
     'original_name': 'Cloud cover day 0',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'cloud_cover_day',
     'unique_id': '0123456-cloudcoverday-0',
@@ -557,6 +566,7 @@
     'original_name': 'Cloud cover day 1',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'cloud_cover_day',
     'unique_id': '0123456-cloudcoverday-1',
@@ -606,6 +616,7 @@
     'original_name': 'Cloud cover day 2',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'cloud_cover_day',
     'unique_id': '0123456-cloudcoverday-2',
@@ -655,6 +666,7 @@
     'original_name': 'Cloud cover day 3',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'cloud_cover_day',
     'unique_id': '0123456-cloudcoverday-3',
@@ -704,6 +716,7 @@
     'original_name': 'Cloud cover day 4',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'cloud_cover_day',
     'unique_id': '0123456-cloudcoverday-4',
@@ -753,6 +766,7 @@
     'original_name': 'Cloud cover night 0',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'cloud_cover_night',
     'unique_id': '0123456-cloudcovernight-0',
@@ -802,6 +816,7 @@
     'original_name': 'Cloud cover night 1',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'cloud_cover_night',
     'unique_id': '0123456-cloudcovernight-1',
@@ -851,6 +866,7 @@
     'original_name': 'Cloud cover night 2',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'cloud_cover_night',
     'unique_id': '0123456-cloudcovernight-2',
@@ -900,6 +916,7 @@
     'original_name': 'Cloud cover night 3',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'cloud_cover_night',
     'unique_id': '0123456-cloudcovernight-3',
@@ -949,6 +966,7 @@
     'original_name': 'Cloud cover night 4',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'cloud_cover_night',
     'unique_id': '0123456-cloudcovernight-4',
@@ -998,6 +1016,7 @@
     'original_name': 'Condition day 0',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'condition_day',
     'unique_id': '0123456-longphraseday-0',
@@ -1046,6 +1065,7 @@
     'original_name': 'Condition day 1',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'condition_day',
     'unique_id': '0123456-longphraseday-1',
@@ -1094,6 +1114,7 @@
     'original_name': 'Condition day 2',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'condition_day',
     'unique_id': '0123456-longphraseday-2',
@@ -1142,6 +1163,7 @@
     'original_name': 'Condition day 3',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'condition_day',
     'unique_id': '0123456-longphraseday-3',
@@ -1190,6 +1212,7 @@
     'original_name': 'Condition day 4',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'condition_day',
     'unique_id': '0123456-longphraseday-4',
@@ -1238,6 +1261,7 @@
     'original_name': 'Condition night 0',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'condition_night',
     'unique_id': '0123456-longphrasenight-0',
@@ -1286,6 +1310,7 @@
     'original_name': 'Condition night 1',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'condition_night',
     'unique_id': '0123456-longphrasenight-1',
@@ -1334,6 +1359,7 @@
     'original_name': 'Condition night 2',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'condition_night',
     'unique_id': '0123456-longphrasenight-2',
@@ -1382,6 +1408,7 @@
     'original_name': 'Condition night 3',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'condition_night',
     'unique_id': '0123456-longphrasenight-3',
@@ -1430,6 +1457,7 @@
     'original_name': 'Condition night 4',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'condition_night',
     'unique_id': '0123456-longphrasenight-4',
@@ -1480,6 +1508,7 @@
     'original_name': 'Dew point',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'dew_point',
     'unique_id': '0123456-dewpoint',
@@ -1531,6 +1560,7 @@
     'original_name': 'Grass pollen day 0',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'grass_pollen',
     'unique_id': '0123456-grass-0',
@@ -1581,6 +1611,7 @@
     'original_name': 'Grass pollen day 1',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'grass_pollen',
     'unique_id': '0123456-grass-1',
@@ -1631,6 +1662,7 @@
     'original_name': 'Grass pollen day 2',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'grass_pollen',
     'unique_id': '0123456-grass-2',
@@ -1681,6 +1713,7 @@
     'original_name': 'Grass pollen day 3',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'grass_pollen',
     'unique_id': '0123456-grass-3',
@@ -1731,6 +1764,7 @@
     'original_name': 'Grass pollen day 4',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'grass_pollen',
     'unique_id': '0123456-grass-4',
@@ -1781,6 +1815,7 @@
     'original_name': 'Hours of sun day 0',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'hours_of_sun',
     'unique_id': '0123456-hoursofsun-0',
@@ -1830,6 +1865,7 @@
     'original_name': 'Hours of sun day 1',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'hours_of_sun',
     'unique_id': '0123456-hoursofsun-1',
@@ -1879,6 +1915,7 @@
     'original_name': 'Hours of sun day 2',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'hours_of_sun',
     'unique_id': '0123456-hoursofsun-2',
@@ -1928,6 +1965,7 @@
     'original_name': 'Hours of sun day 3',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'hours_of_sun',
     'unique_id': '0123456-hoursofsun-3',
@@ -1977,6 +2015,7 @@
     'original_name': 'Hours of sun day 4',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'hours_of_sun',
     'unique_id': '0123456-hoursofsun-4',
@@ -2028,6 +2067,7 @@
     'original_name': 'Humidity',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'humidity',
     'unique_id': '0123456-relativehumidity',
@@ -2079,6 +2119,7 @@
     'original_name': 'Mold pollen day 0',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'mold_pollen',
     'unique_id': '0123456-mold-0',
@@ -2129,6 +2170,7 @@
     'original_name': 'Mold pollen day 1',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'mold_pollen',
     'unique_id': '0123456-mold-1',
@@ -2179,6 +2221,7 @@
     'original_name': 'Mold pollen day 2',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'mold_pollen',
     'unique_id': '0123456-mold-2',
@@ -2229,6 +2272,7 @@
     'original_name': 'Mold pollen day 3',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'mold_pollen',
     'unique_id': '0123456-mold-3',
@@ -2279,6 +2323,7 @@
     'original_name': 'Mold pollen day 4',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'mold_pollen',
     'unique_id': '0123456-mold-4',
@@ -2331,6 +2376,7 @@
     'original_name': 'Precipitation',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'precipitation',
     'unique_id': '0123456-precipitation',
@@ -2388,6 +2434,7 @@
     'original_name': 'Pressure',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'pressure',
     'unique_id': '0123456-pressure',
@@ -2445,6 +2492,7 @@
     'original_name': 'Pressure tendency',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'pressure_tendency',
     'unique_id': '0123456-pressuretendency',
@@ -2499,6 +2547,7 @@
     'original_name': 'Ragweed pollen day 0',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'ragweed_pollen',
     'unique_id': '0123456-ragweed-0',
@@ -2549,6 +2598,7 @@
     'original_name': 'Ragweed pollen day 1',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'ragweed_pollen',
     'unique_id': '0123456-ragweed-1',
@@ -2599,6 +2649,7 @@
     'original_name': 'Ragweed pollen day 2',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'ragweed_pollen',
     'unique_id': '0123456-ragweed-2',
@@ -2649,6 +2700,7 @@
     'original_name': 'Ragweed pollen day 3',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'ragweed_pollen',
     'unique_id': '0123456-ragweed-3',
@@ -2699,6 +2751,7 @@
     'original_name': 'Ragweed pollen day 4',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'ragweed_pollen',
     'unique_id': '0123456-ragweed-4',
@@ -2751,6 +2804,7 @@
     'original_name': 'RealFeel temperature',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'realfeel_temperature',
     'unique_id': '0123456-realfeeltemperature',
@@ -2802,6 +2856,7 @@
     'original_name': 'RealFeel temperature max day 0',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'realfeel_temperature_max',
     'unique_id': '0123456-realfeeltemperaturemax-0',
@@ -2852,6 +2907,7 @@
     'original_name': 'RealFeel temperature max day 1',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'realfeel_temperature_max',
     'unique_id': '0123456-realfeeltemperaturemax-1',
@@ -2902,6 +2958,7 @@
     'original_name': 'RealFeel temperature max day 2',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'realfeel_temperature_max',
     'unique_id': '0123456-realfeeltemperaturemax-2',
@@ -2952,6 +3009,7 @@
     'original_name': 'RealFeel temperature max day 3',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'realfeel_temperature_max',
     'unique_id': '0123456-realfeeltemperaturemax-3',
@@ -3002,6 +3060,7 @@
     'original_name': 'RealFeel temperature max day 4',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'realfeel_temperature_max',
     'unique_id': '0123456-realfeeltemperaturemax-4',
@@ -3052,6 +3111,7 @@
     'original_name': 'RealFeel temperature min day 0',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'realfeel_temperature_min',
     'unique_id': '0123456-realfeeltemperaturemin-0',
@@ -3102,6 +3162,7 @@
     'original_name': 'RealFeel temperature min day 1',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'realfeel_temperature_min',
     'unique_id': '0123456-realfeeltemperaturemin-1',
@@ -3152,6 +3213,7 @@
     'original_name': 'RealFeel temperature min day 2',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'realfeel_temperature_min',
     'unique_id': '0123456-realfeeltemperaturemin-2',
@@ -3202,6 +3264,7 @@
     'original_name': 'RealFeel temperature min day 3',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'realfeel_temperature_min',
     'unique_id': '0123456-realfeeltemperaturemin-3',
@@ -3252,6 +3315,7 @@
     'original_name': 'RealFeel temperature min day 4',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'realfeel_temperature_min',
     'unique_id': '0123456-realfeeltemperaturemin-4',
@@ -3304,6 +3368,7 @@
     'original_name': 'RealFeel temperature shade',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'realfeel_temperature_shade',
     'unique_id': '0123456-realfeeltemperatureshade',
@@ -3355,6 +3420,7 @@
     'original_name': 'RealFeel temperature shade max day 0',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'realfeel_temperature_shade_max',
     'unique_id': '0123456-realfeeltemperatureshademax-0',
@@ -3405,6 +3471,7 @@
     'original_name': 'RealFeel temperature shade max day 1',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'realfeel_temperature_shade_max',
     'unique_id': '0123456-realfeeltemperatureshademax-1',
@@ -3455,6 +3522,7 @@
     'original_name': 'RealFeel temperature shade max day 2',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'realfeel_temperature_shade_max',
     'unique_id': '0123456-realfeeltemperatureshademax-2',
@@ -3505,6 +3573,7 @@
     'original_name': 'RealFeel temperature shade max day 3',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'realfeel_temperature_shade_max',
     'unique_id': '0123456-realfeeltemperatureshademax-3',
@@ -3555,6 +3624,7 @@
     'original_name': 'RealFeel temperature shade max day 4',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'realfeel_temperature_shade_max',
     'unique_id': '0123456-realfeeltemperatureshademax-4',
@@ -3605,6 +3675,7 @@
     'original_name': 'RealFeel temperature shade min day 0',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'realfeel_temperature_shade_min',
     'unique_id': '0123456-realfeeltemperatureshademin-0',
@@ -3655,6 +3726,7 @@
     'original_name': 'RealFeel temperature shade min day 1',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'realfeel_temperature_shade_min',
     'unique_id': '0123456-realfeeltemperatureshademin-1',
@@ -3705,6 +3777,7 @@
     'original_name': 'RealFeel temperature shade min day 2',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'realfeel_temperature_shade_min',
     'unique_id': '0123456-realfeeltemperatureshademin-2',
@@ -3755,6 +3828,7 @@
     'original_name': 'RealFeel temperature shade min day 3',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'realfeel_temperature_shade_min',
     'unique_id': '0123456-realfeeltemperatureshademin-3',
@@ -3805,6 +3879,7 @@
     'original_name': 'RealFeel temperature shade min day 4',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'realfeel_temperature_shade_min',
     'unique_id': '0123456-realfeeltemperatureshademin-4',
@@ -3855,6 +3930,7 @@
     'original_name': 'Solar irradiance day 0',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'solar_irradiance_day',
     'unique_id': '0123456-solarirradianceday-0',
@@ -3905,6 +3981,7 @@
     'original_name': 'Solar irradiance day 1',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'solar_irradiance_day',
     'unique_id': '0123456-solarirradianceday-1',
@@ -3955,6 +4032,7 @@
     'original_name': 'Solar irradiance day 2',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'solar_irradiance_day',
     'unique_id': '0123456-solarirradianceday-2',
@@ -4005,6 +4083,7 @@
     'original_name': 'Solar irradiance day 3',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'solar_irradiance_day',
     'unique_id': '0123456-solarirradianceday-3',
@@ -4055,6 +4134,7 @@
     'original_name': 'Solar irradiance day 4',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'solar_irradiance_day',
     'unique_id': '0123456-solarirradianceday-4',
@@ -4105,6 +4185,7 @@
     'original_name': 'Solar irradiance night 0',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'solar_irradiance_night',
     'unique_id': '0123456-solarirradiancenight-0',
@@ -4155,6 +4236,7 @@
     'original_name': 'Solar irradiance night 1',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'solar_irradiance_night',
     'unique_id': '0123456-solarirradiancenight-1',
@@ -4205,6 +4287,7 @@
     'original_name': 'Solar irradiance night 2',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'solar_irradiance_night',
     'unique_id': '0123456-solarirradiancenight-2',
@@ -4255,6 +4338,7 @@
     'original_name': 'Solar irradiance night 3',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'solar_irradiance_night',
     'unique_id': '0123456-solarirradiancenight-3',
@@ -4305,6 +4389,7 @@
     'original_name': 'Solar irradiance night 4',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'solar_irradiance_night',
     'unique_id': '0123456-solarirradiancenight-4',
@@ -4357,6 +4442,7 @@
     'original_name': 'Temperature',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'temperature',
     'unique_id': '0123456-temperature',
@@ -4408,6 +4494,7 @@
     'original_name': 'Thunderstorm probability day 0',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'thunderstorm_probability_day',
     'unique_id': '0123456-thunderstormprobabilityday-0',
@@ -4457,6 +4544,7 @@
     'original_name': 'Thunderstorm probability day 1',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'thunderstorm_probability_day',
     'unique_id': '0123456-thunderstormprobabilityday-1',
@@ -4506,6 +4594,7 @@
     'original_name': 'Thunderstorm probability day 2',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'thunderstorm_probability_day',
     'unique_id': '0123456-thunderstormprobabilityday-2',
@@ -4555,6 +4644,7 @@
     'original_name': 'Thunderstorm probability day 3',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'thunderstorm_probability_day',
     'unique_id': '0123456-thunderstormprobabilityday-3',
@@ -4604,6 +4694,7 @@
     'original_name': 'Thunderstorm probability day 4',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'thunderstorm_probability_day',
     'unique_id': '0123456-thunderstormprobabilityday-4',
@@ -4653,6 +4744,7 @@
     'original_name': 'Thunderstorm probability night 0',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'thunderstorm_probability_night',
     'unique_id': '0123456-thunderstormprobabilitynight-0',
@@ -4702,6 +4794,7 @@
     'original_name': 'Thunderstorm probability night 1',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'thunderstorm_probability_night',
     'unique_id': '0123456-thunderstormprobabilitynight-1',
@@ -4751,6 +4844,7 @@
     'original_name': 'Thunderstorm probability night 2',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'thunderstorm_probability_night',
     'unique_id': '0123456-thunderstormprobabilitynight-2',
@@ -4800,6 +4894,7 @@
     'original_name': 'Thunderstorm probability night 3',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'thunderstorm_probability_night',
     'unique_id': '0123456-thunderstormprobabilitynight-3',
@@ -4849,6 +4944,7 @@
     'original_name': 'Thunderstorm probability night 4',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'thunderstorm_probability_night',
     'unique_id': '0123456-thunderstormprobabilitynight-4',
@@ -4898,6 +4994,7 @@
     'original_name': 'Tree pollen day 0',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'tree_pollen',
     'unique_id': '0123456-tree-0',
@@ -4948,6 +5045,7 @@
     'original_name': 'Tree pollen day 1',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'tree_pollen',
     'unique_id': '0123456-tree-1',
@@ -4998,6 +5096,7 @@
     'original_name': 'Tree pollen day 2',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'tree_pollen',
     'unique_id': '0123456-tree-2',
@@ -5048,6 +5147,7 @@
     'original_name': 'Tree pollen day 3',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'tree_pollen',
     'unique_id': '0123456-tree-3',
@@ -5098,6 +5198,7 @@
     'original_name': 'Tree pollen day 4',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'tree_pollen',
     'unique_id': '0123456-tree-4',
@@ -5150,6 +5251,7 @@
     'original_name': 'UV index',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'uv_index',
     'unique_id': '0123456-uvindex',
@@ -5201,6 +5303,7 @@
     'original_name': 'UV index day 0',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'uv_index_forecast',
     'unique_id': '0123456-uvindex-0',
@@ -5251,6 +5354,7 @@
     'original_name': 'UV index day 1',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'uv_index_forecast',
     'unique_id': '0123456-uvindex-1',
@@ -5301,6 +5405,7 @@
     'original_name': 'UV index day 2',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'uv_index_forecast',
     'unique_id': '0123456-uvindex-2',
@@ -5351,6 +5456,7 @@
     'original_name': 'UV index day 3',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'uv_index_forecast',
     'unique_id': '0123456-uvindex-3',
@@ -5401,6 +5507,7 @@
     'original_name': 'UV index day 4',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'uv_index_forecast',
     'unique_id': '0123456-uvindex-4',
@@ -5453,6 +5560,7 @@
     'original_name': 'Wet bulb temperature',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'wet_bulb_temperature',
     'unique_id': '0123456-wetbulbtemperature',
@@ -5506,6 +5614,7 @@
     'original_name': 'Wind chill temperature',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'wind_chill_temperature',
     'unique_id': '0123456-windchilltemperature',
@@ -5559,6 +5668,7 @@
     'original_name': 'Wind gust speed',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'wind_gust_speed',
     'unique_id': '0123456-windgust',
@@ -5610,6 +5720,7 @@
     'original_name': 'Wind gust speed day 0',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'wind_gust_speed_day',
     'unique_id': '0123456-windgustday-0',
@@ -5661,6 +5772,7 @@
     'original_name': 'Wind gust speed day 1',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'wind_gust_speed_day',
     'unique_id': '0123456-windgustday-1',
@@ -5712,6 +5824,7 @@
     'original_name': 'Wind gust speed day 2',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'wind_gust_speed_day',
     'unique_id': '0123456-windgustday-2',
@@ -5763,6 +5876,7 @@
     'original_name': 'Wind gust speed day 3',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'wind_gust_speed_day',
     'unique_id': '0123456-windgustday-3',
@@ -5814,6 +5928,7 @@
     'original_name': 'Wind gust speed day 4',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'wind_gust_speed_day',
     'unique_id': '0123456-windgustday-4',
@@ -5865,6 +5980,7 @@
     'original_name': 'Wind gust speed night 0',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'wind_gust_speed_night',
     'unique_id': '0123456-windgustnight-0',
@@ -5916,6 +6032,7 @@
     'original_name': 'Wind gust speed night 1',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'wind_gust_speed_night',
     'unique_id': '0123456-windgustnight-1',
@@ -5967,6 +6084,7 @@
     'original_name': 'Wind gust speed night 2',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'wind_gust_speed_night',
     'unique_id': '0123456-windgustnight-2',
@@ -6018,6 +6136,7 @@
     'original_name': 'Wind gust speed night 3',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'wind_gust_speed_night',
     'unique_id': '0123456-windgustnight-3',
@@ -6069,6 +6188,7 @@
     'original_name': 'Wind gust speed night 4',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'wind_gust_speed_night',
     'unique_id': '0123456-windgustnight-4',
@@ -6122,6 +6242,7 @@
     'original_name': 'Wind speed',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'wind_speed',
     'unique_id': '0123456-wind',
@@ -6173,6 +6294,7 @@
     'original_name': 'Wind speed day 0',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'wind_speed_day',
     'unique_id': '0123456-windday-0',
@@ -6224,6 +6346,7 @@
     'original_name': 'Wind speed day 1',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'wind_speed_day',
     'unique_id': '0123456-windday-1',
@@ -6275,6 +6398,7 @@
     'original_name': 'Wind speed day 2',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'wind_speed_day',
     'unique_id': '0123456-windday-2',
@@ -6326,6 +6450,7 @@
     'original_name': 'Wind speed day 3',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'wind_speed_day',
     'unique_id': '0123456-windday-3',
@@ -6377,6 +6502,7 @@
     'original_name': 'Wind speed day 4',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'wind_speed_day',
     'unique_id': '0123456-windday-4',
@@ -6428,6 +6554,7 @@
     'original_name': 'Wind speed night 0',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'wind_speed_night',
     'unique_id': '0123456-windnight-0',
@@ -6479,6 +6606,7 @@
     'original_name': 'Wind speed night 1',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'wind_speed_night',
     'unique_id': '0123456-windnight-1',
@@ -6530,6 +6658,7 @@
     'original_name': 'Wind speed night 2',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'wind_speed_night',
     'unique_id': '0123456-windnight-2',
@@ -6581,6 +6710,7 @@
     'original_name': 'Wind speed night 3',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'wind_speed_night',
     'unique_id': '0123456-windnight-3',
@@ -6632,6 +6762,7 @@
     'original_name': 'Wind speed night 4',
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'wind_speed_night',
     'unique_id': '0123456-windnight-4',

tests/components/accuweather/snapshots/test_weather.ambr

@@ -268,6 +268,7 @@
     'original_name': None,
     'platform': 'accuweather',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <WeatherEntityFeature: 1>,
     'translation_key': None,
     'unique_id': '0123456',

tests/components/airgradient/snapshots/test_button.ambr

@@ -27,6 +27,7 @@
     'original_name': 'Calibrate CO2 sensor',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'co2_calibration',
     'unique_id': '84fce612f5b8-co2_calibration',
@@ -74,6 +75,7 @@
     'original_name': 'Test LED bar',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'led_bar_test',
     'unique_id': '84fce612f5b8-led_bar_test',
@@ -121,6 +123,7 @@
     'original_name': 'Calibrate CO2 sensor',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'co2_calibration',
     'unique_id': '84fce612f5b8-co2_calibration',

tests/components/airgradient/snapshots/test_number.ambr

@@ -32,6 +32,7 @@
     'original_name': 'Display brightness',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'display_brightness',
     'unique_id': '84fce612f5b8-display_brightness',
@@ -89,6 +90,7 @@
     'original_name': 'LED bar brightness',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'led_bar_brightness',
     'unique_id': '84fce612f5b8-led_bar_brightness',

tests/components/airgradient/snapshots/test_select.ambr

@@ -36,6 +36,7 @@
     'original_name': 'CO2 automatic baseline duration',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'co2_automatic_baseline_calibration',
     'unique_id': '84fce612f5b8-co2_automatic_baseline_calibration',
@@ -96,6 +97,7 @@
     'original_name': 'Configuration source',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'configuration_control',
     'unique_id': '84fce612f5b8-configuration_control',
@@ -152,6 +154,7 @@
     'original_name': 'Display PM standard',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'display_pm_standard',
     'unique_id': '84fce612f5b8-display_pm_standard',
@@ -208,6 +211,7 @@
     'original_name': 'Display temperature unit',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'display_temperature_unit',
     'unique_id': '84fce612f5b8-display_temperature_unit',
@@ -265,6 +269,7 @@
     'original_name': 'LED bar mode',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'led_bar_mode',
     'unique_id': '84fce612f5b8-led_bar_mode',
@@ -325,6 +330,7 @@
     'original_name': 'NOx index learning offset',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'nox_index_learning_time_offset',
     'unique_id': '84fce612f5b8-nox_index_learning_time_offset',
@@ -387,6 +393,7 @@
     'original_name': 'VOC index learning offset',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'voc_index_learning_time_offset',
     'unique_id': '84fce612f5b8-voc_index_learning_time_offset',
@@ -450,6 +457,7 @@
     'original_name': 'CO2 automatic baseline duration',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'co2_automatic_baseline_calibration',
     'unique_id': '84fce612f5b8-co2_automatic_baseline_calibration',
@@ -510,6 +518,7 @@
     'original_name': 'Configuration source',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'configuration_control',
     'unique_id': '84fce612f5b8-configuration_control',
@@ -569,6 +578,7 @@
     'original_name': 'NOx index learning offset',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'nox_index_learning_time_offset',
     'unique_id': '84fce612f5b8-nox_index_learning_time_offset',
@@ -631,6 +641,7 @@
     'original_name': 'VOC index learning offset',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'voc_index_learning_time_offset',
     'unique_id': '84fce612f5b8-voc_index_learning_time_offset',

tests/components/airgradient/snapshots/test_sensor.ambr

@@ -29,6 +29,7 @@
     'original_name': 'Carbon dioxide',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '84fce612f5b8-co2',
@@ -79,6 +80,7 @@
     'original_name': 'Carbon dioxide automatic baseline calibration',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'co2_automatic_baseline_calibration_days',
     'unique_id': '84fce612f5b8-co2_automatic_baseline_calibration_days',
@@ -128,6 +130,7 @@
     'original_name': 'Display brightness',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'display_brightness',
     'unique_id': '84fce612f5b8-display_brightness',
@@ -181,6 +184,7 @@
     'original_name': 'Display PM standard',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'display_pm_standard',
     'unique_id': '84fce612f5b8-display_pm_standard',
@@ -238,6 +242,7 @@
     'original_name': 'Display temperature unit',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'display_temperature_unit',
     'unique_id': '84fce612f5b8-display_temperature_unit',
@@ -292,6 +297,7 @@
     'original_name': 'Humidity',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '84fce612f5b8-humidity',
@@ -342,6 +348,7 @@
     'original_name': 'LED bar brightness',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'led_bar_brightness',
     'unique_id': '84fce612f5b8-led_bar_brightness',
@@ -396,6 +403,7 @@
     'original_name': 'LED bar mode',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'led_bar_mode',
     'unique_id': '84fce612f5b8-led_bar_mode',
@@ -451,6 +459,7 @@
     'original_name': 'NOx index',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'nitrogen_index',
     'unique_id': '84fce612f5b8-nitrogen_index',
@@ -499,6 +508,7 @@
     'original_name': 'NOx index learning offset',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'nox_learning_offset',
     'unique_id': '84fce612f5b8-nox_learning_offset',
@@ -550,6 +560,7 @@
     'original_name': 'PM0.3',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'pm003_count',
     'unique_id': '84fce612f5b8-pm003',
@@ -601,6 +612,7 @@
     'original_name': 'PM1',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '84fce612f5b8-pm01',
@@ -653,6 +665,7 @@
     'original_name': 'PM10',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '84fce612f5b8-pm10',
@@ -705,6 +718,7 @@
     'original_name': 'PM2.5',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '84fce612f5b8-pm02',
@@ -757,6 +771,7 @@
     'original_name': 'Raw NOx',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'raw_nitrogen',
     'unique_id': '84fce612f5b8-nox_raw',
@@ -808,6 +823,7 @@
     'original_name': 'Raw PM2.5',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'raw_pm02',
     'unique_id': '84fce612f5b8-pm02_raw',
@@ -860,6 +876,7 @@
     'original_name': 'Raw VOC',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'raw_total_volatile_organic_component',
     'unique_id': '84fce612f5b8-tvoc_raw',
@@ -911,6 +928,7 @@
     'original_name': 'Signal strength',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '84fce612f5b8-signal_strength',
@@ -963,6 +981,7 @@
     'original_name': 'Temperature',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '84fce612f5b8-temperature',
@@ -1015,6 +1034,7 @@
     'original_name': 'VOC index',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'total_volatile_organic_component_index',
     'unique_id': '84fce612f5b8-tvoc',
@@ -1063,6 +1083,7 @@
     'original_name': 'VOC index learning offset',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'tvoc_learning_offset',
     'unique_id': '84fce612f5b8-tvoc_learning_offset',
@@ -1112,6 +1133,7 @@
     'original_name': 'Carbon dioxide automatic baseline calibration',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'co2_automatic_baseline_calibration_days',
     'unique_id': '84fce612f5b8-co2_automatic_baseline_calibration_days',
@@ -1163,6 +1185,7 @@
     'original_name': 'NOx index',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'nitrogen_index',
     'unique_id': '84fce612f5b8-nitrogen_index',
@@ -1211,6 +1234,7 @@
     'original_name': 'NOx index learning offset',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'nox_learning_offset',
     'unique_id': '84fce612f5b8-nox_learning_offset',
@@ -1262,6 +1286,7 @@
     'original_name': 'Raw NOx',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'raw_nitrogen',
     'unique_id': '84fce612f5b8-nox_raw',
@@ -1313,6 +1338,7 @@
     'original_name': 'Raw VOC',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'raw_total_volatile_organic_component',
     'unique_id': '84fce612f5b8-tvoc_raw',
@@ -1364,6 +1390,7 @@
     'original_name': 'Signal strength',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '84fce612f5b8-signal_strength',
@@ -1416,6 +1443,7 @@
     'original_name': 'VOC index',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'total_volatile_organic_component_index',
     'unique_id': '84fce612f5b8-tvoc',
@@ -1464,6 +1492,7 @@
     'original_name': 'VOC index learning offset',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'tvoc_learning_offset',
     'unique_id': '84fce612f5b8-tvoc_learning_offset',

tests/components/airgradient/snapshots/test_switch.ambr

@@ -27,6 +27,7 @@
     'original_name': 'Post data to Airgradient',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'post_data_to_airgradient',
     'unique_id': '84fce612f5b8-post_data_to_airgradient',

tests/components/airgradient/snapshots/test_update.ambr

@@ -27,6 +27,7 @@
     'original_name': 'Firmware',
     'platform': 'airgradient',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '84fce612f5b8-update',

tests/components/airly/snapshots/test_sensor.ambr

@@ -32,6 +32,7 @@
     'original_name': 'Carbon monoxide',
     'platform': 'airly',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'co',
     'unique_id': '123-456-co',
@@ -87,6 +88,7 @@
     'original_name': 'Common air quality index',
     'platform': 'airly',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'caqi',
     'unique_id': '123-456-caqi',
@@ -144,6 +146,7 @@
     'original_name': 'Humidity',
     'platform': 'airly',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '123-456-humidity',
@@ -200,6 +203,7 @@
     'original_name': 'Nitrogen dioxide',
     'platform': 'airly',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '123-456-no2',
@@ -258,6 +262,7 @@
     'original_name': 'Ozone',
     'platform': 'airly',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '123-456-o3',
@@ -316,6 +321,7 @@
     'original_name': 'PM1',
     'platform': 'airly',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '123-456-pm1',
@@ -372,6 +378,7 @@
     'original_name': 'PM10',
     'platform': 'airly',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '123-456-pm10',
@@ -430,6 +437,7 @@
     'original_name': 'PM2.5',
     'platform': 'airly',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '123-456-pm25',
@@ -488,6 +496,7 @@
     'original_name': 'Pressure',
     'platform': 'airly',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '123-456-pressure',
@@ -544,6 +553,7 @@
     'original_name': 'Sulphur dioxide',
     'platform': 'airly',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '123-456-so2',
@@ -602,6 +612,7 @@
     'original_name': 'Temperature',
     'platform': 'airly',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '123-456-temperature',

tests/components/airtouch5/snapshots/test_cover.ambr

@@ -27,6 +27,7 @@
     'original_name': 'Damper',
     'platform': 'airtouch5',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <CoverEntityFeature: 7>,
     'translation_key': 'damper',
     'unique_id': 'zone_1_open_percentage',
@@ -77,6 +78,7 @@
     'original_name': 'Damper',
     'platform': 'airtouch5',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <CoverEntityFeature: 7>,
     'translation_key': 'damper',
     'unique_id': 'zone_2_open_percentage',

tests/components/airzone/snapshots/test_sensor.ambr

@@ -29,6 +29,7 @@
     'original_name': 'Humidity',
     'platform': 'airzone',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'airzone_unique_id_2:1_humidity',
@@ -81,6 +82,7 @@
     'original_name': 'Temperature',
     'platform': 'airzone',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'airzone_unique_id_2:1_temp',
@@ -133,6 +135,7 @@
     'original_name': 'Temperature',
     'platform': 'airzone',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'airzone_unique_id_dhw_temp',
@@ -185,6 +188,7 @@
     'original_name': 'RSSI',
     'platform': 'airzone',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'rssi',
     'unique_id': 'airzone_unique_id_ws_wifi-rssi',
@@ -237,6 +241,7 @@
     'original_name': 'Temperature',
     'platform': 'airzone',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'airzone_unique_id_4:1_temp',
@@ -289,6 +294,7 @@
     'original_name': 'Battery',
     'platform': 'airzone',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'airzone_unique_id_1:4_thermostat-battery',
@@ -341,6 +347,7 @@
     'original_name': 'Humidity',
     'platform': 'airzone',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'airzone_unique_id_1:4_humidity',
@@ -393,6 +400,7 @@
     'original_name': 'Signal strength',
     'platform': 'airzone',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'thermostat_signal',
     'unique_id': 'airzone_unique_id_1:4_thermostat-signal',
@@ -444,6 +452,7 @@
     'original_name': 'Temperature',
     'platform': 'airzone',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'airzone_unique_id_1:4_temp',
@@ -496,6 +505,7 @@
     'original_name': 'Temperature',
     'platform': 'airzone',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'airzone_unique_id_3:1_temp',
@@ -548,6 +558,7 @@
     'original_name': 'Battery',
     'platform': 'airzone',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'airzone_unique_id_1:3_thermostat-battery',
@@ -600,6 +611,7 @@
     'original_name': 'Humidity',
     'platform': 'airzone',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'airzone_unique_id_1:3_humidity',
@@ -652,6 +664,7 @@
     'original_name': 'Signal strength',
     'platform': 'airzone',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'thermostat_signal',
     'unique_id': 'airzone_unique_id_1:3_thermostat-signal',
@@ -703,6 +716,7 @@
     'original_name': 'Temperature',
     'platform': 'airzone',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'airzone_unique_id_1:3_temp',
@@ -755,6 +769,7 @@
     'original_name': 'Battery',
     'platform': 'airzone',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'airzone_unique_id_1:5_thermostat-battery',
@@ -807,6 +822,7 @@
     'original_name': 'Humidity',
     'platform': 'airzone',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'airzone_unique_id_1:5_humidity',
@@ -859,6 +875,7 @@
     'original_name': 'Signal strength',
     'platform': 'airzone',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'thermostat_signal',
     'unique_id': 'airzone_unique_id_1:5_thermostat-signal',
@@ -910,6 +927,7 @@
     'original_name': 'Temperature',
     'platform': 'airzone',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'airzone_unique_id_1:5_temp',
@@ -962,6 +980,7 @@
     'original_name': 'Battery',
     'platform': 'airzone',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'airzone_unique_id_1:2_thermostat-battery',
@@ -1014,6 +1033,7 @@
     'original_name': 'Humidity',
     'platform': 'airzone',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'airzone_unique_id_1:2_humidity',
@@ -1066,6 +1086,7 @@
     'original_name': 'Signal strength',
     'platform': 'airzone',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'thermostat_signal',
     'unique_id': 'airzone_unique_id_1:2_thermostat-signal',
@@ -1117,6 +1138,7 @@
     'original_name': 'Temperature',
     'platform': 'airzone',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'airzone_unique_id_1:2_temp',
@@ -1169,6 +1191,7 @@
     'original_name': 'Humidity',
     'platform': 'airzone',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'airzone_unique_id_1:1_humidity',
@@ -1221,6 +1244,7 @@
     'original_name': 'Temperature',
     'platform': 'airzone',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'airzone_unique_id_1:1_temp',

tests/components/amazon_devices/snapshots/test_binary_sensor.ambr

@@ -27,6 +27,7 @@
     'original_name': 'Bluetooth',
     'platform': 'amazon_devices',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'bluetooth',
     'unique_id': 'echo_test_serial_number-bluetooth',
@@ -74,6 +75,7 @@
     'original_name': 'Connectivity',
     'platform': 'amazon_devices',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'echo_test_serial_number-online',

tests/components/amazon_devices/snapshots/test_notify.ambr

@@ -27,6 +27,7 @@
     'original_name': 'Announce',
     'platform': 'amazon_devices',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'announce',
     'unique_id': 'echo_test_serial_number-announce',
@@ -75,6 +76,7 @@
     'original_name': 'Speak',
     'platform': 'amazon_devices',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'speak',
     'unique_id': 'echo_test_serial_number-speak',

tests/components/amazon_devices/snapshots/test_switch.ambr

@@ -27,6 +27,7 @@
     'original_name': 'Do not disturb',
     'platform': 'amazon_devices',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'do_not_disturb',
     'unique_id': 'echo_test_serial_number-do_not_disturb',

tests/components/ambient_network/snapshots/test_sensor.ambr

@@ -35,6 +35,7 @@
     'original_name': 'Absolute pressure',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'absolute_pressure',
     'unique_id': 'AA:AA:AA:AA:AA:AA_baromabsin',
@@ -95,6 +96,7 @@
     'original_name': 'Daily rain',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'daily_rain',
     'unique_id': 'AA:AA:AA:AA:AA:AA_dailyrainin',
@@ -152,6 +154,7 @@
     'original_name': 'Dew point',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'dew_point',
     'unique_id': 'AA:AA:AA:AA:AA:AA_dewPoint',
@@ -209,6 +212,7 @@
     'original_name': 'Feels like',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'feels_like',
     'unique_id': 'AA:AA:AA:AA:AA:AA_feelsLike',
@@ -269,6 +273,7 @@
     'original_name': 'Hourly rain',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'hourly_rain',
     'unique_id': 'AA:AA:AA:AA:AA:AA_hourlyrainin',
@@ -326,6 +331,7 @@
     'original_name': 'Humidity',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'AA:AA:AA:AA:AA:AA_humidity',
@@ -383,6 +389,7 @@
     'original_name': 'Irradiance',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'AA:AA:AA:AA:AA:AA_solarradiation',
@@ -435,6 +442,7 @@
     'original_name': 'Last rain',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'last_rain',
     'unique_id': 'AA:AA:AA:AA:AA:AA_lastRain',
@@ -493,6 +501,7 @@
     'original_name': 'Max daily gust',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'max_daily_gust',
     'unique_id': 'AA:AA:AA:AA:AA:AA_maxdailygust',
@@ -553,6 +562,7 @@
     'original_name': 'Monthly rain',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'monthly_rain',
     'unique_id': 'AA:AA:AA:AA:AA:AA_monthlyrainin',
@@ -613,6 +623,7 @@
     'original_name': 'Relative pressure',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'relative_pressure',
     'unique_id': 'AA:AA:AA:AA:AA:AA_baromrelin',
@@ -670,6 +681,7 @@
     'original_name': 'Temperature',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'AA:AA:AA:AA:AA:AA_tempf',
@@ -727,6 +739,7 @@
     'original_name': 'UV index',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'uv_index',
     'unique_id': 'AA:AA:AA:AA:AA:AA_uv',
@@ -786,6 +799,7 @@
     'original_name': 'Weekly rain',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'weekly_rain',
     'unique_id': 'AA:AA:AA:AA:AA:AA_weeklyrainin',
@@ -843,6 +857,7 @@
     'original_name': 'Wind direction',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'wind_direction',
     'unique_id': 'AA:AA:AA:AA:AA:AA_winddir',
@@ -903,6 +918,7 @@
     'original_name': 'Wind gust',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'wind_gust',
     'unique_id': 'AA:AA:AA:AA:AA:AA_windgustmph',
@@ -963,6 +979,7 @@
     'original_name': 'Wind speed',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'AA:AA:AA:AA:AA:AA_windspeedmph',
@@ -1023,6 +1040,7 @@
     'original_name': 'Absolute pressure',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'absolute_pressure',
     'unique_id': 'CC:CC:CC:CC:CC:CC_baromabsin',
@@ -1083,6 +1101,7 @@
     'original_name': 'Daily rain',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'daily_rain',
     'unique_id': 'CC:CC:CC:CC:CC:CC_dailyrainin',
@@ -1140,6 +1159,7 @@
     'original_name': 'Dew point',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'dew_point',
     'unique_id': 'CC:CC:CC:CC:CC:CC_dewPoint',
@@ -1197,6 +1217,7 @@
     'original_name': 'Feels like',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'feels_like',
     'unique_id': 'CC:CC:CC:CC:CC:CC_feelsLike',
@@ -1257,6 +1278,7 @@
     'original_name': 'Hourly rain',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'hourly_rain',
     'unique_id': 'CC:CC:CC:CC:CC:CC_hourlyrainin',
@@ -1314,6 +1336,7 @@
     'original_name': 'Humidity',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'CC:CC:CC:CC:CC:CC_humidity',
@@ -1371,6 +1394,7 @@
     'original_name': 'Irradiance',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'CC:CC:CC:CC:CC:CC_solarradiation',
@@ -1423,6 +1447,7 @@
     'original_name': 'Last rain',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'last_rain',
     'unique_id': 'CC:CC:CC:CC:CC:CC_lastRain',
@@ -1481,6 +1506,7 @@
     'original_name': 'Max daily gust',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'max_daily_gust',
     'unique_id': 'CC:CC:CC:CC:CC:CC_maxdailygust',
@@ -1541,6 +1567,7 @@
     'original_name': 'Monthly rain',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'monthly_rain',
     'unique_id': 'CC:CC:CC:CC:CC:CC_monthlyrainin',
@@ -1601,6 +1628,7 @@
     'original_name': 'Relative pressure',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'relative_pressure',
     'unique_id': 'CC:CC:CC:CC:CC:CC_baromrelin',
@@ -1658,6 +1686,7 @@
     'original_name': 'Temperature',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'CC:CC:CC:CC:CC:CC_tempf',
@@ -1715,6 +1744,7 @@
     'original_name': 'UV index',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'uv_index',
     'unique_id': 'CC:CC:CC:CC:CC:CC_uv',
@@ -1774,6 +1804,7 @@
     'original_name': 'Weekly rain',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'weekly_rain',
     'unique_id': 'CC:CC:CC:CC:CC:CC_weeklyrainin',
@@ -1831,6 +1862,7 @@
     'original_name': 'Wind direction',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'wind_direction',
     'unique_id': 'CC:CC:CC:CC:CC:CC_winddir',
@@ -1891,6 +1923,7 @@
     'original_name': 'Wind gust',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'wind_gust',
     'unique_id': 'CC:CC:CC:CC:CC:CC_windgustmph',
@@ -1951,6 +1984,7 @@
     'original_name': 'Wind speed',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'CC:CC:CC:CC:CC:CC_windspeedmph',
@@ -2011,6 +2045,7 @@
     'original_name': 'Absolute pressure',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'absolute_pressure',
     'unique_id': 'DD:DD:DD:DD:DD:DD_baromabsin',
@@ -2070,6 +2105,7 @@
     'original_name': 'Daily rain',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'daily_rain',
     'unique_id': 'DD:DD:DD:DD:DD:DD_dailyrainin',
@@ -2126,6 +2162,7 @@
     'original_name': 'Dew point',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'dew_point',
     'unique_id': 'DD:DD:DD:DD:DD:DD_dewPoint',
@@ -2182,6 +2219,7 @@
     'original_name': 'Feels like',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'feels_like',
     'unique_id': 'DD:DD:DD:DD:DD:DD_feelsLike',
@@ -2241,6 +2279,7 @@
     'original_name': 'Hourly rain',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'hourly_rain',
     'unique_id': 'DD:DD:DD:DD:DD:DD_hourlyrainin',
@@ -2297,6 +2336,7 @@
     'original_name': 'Humidity',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'DD:DD:DD:DD:DD:DD_humidity',
@@ -2353,6 +2393,7 @@
     'original_name': 'Irradiance',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'DD:DD:DD:DD:DD:DD_solarradiation',
@@ -2412,6 +2453,7 @@
     'original_name': 'Max daily gust',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'max_daily_gust',
     'unique_id': 'DD:DD:DD:DD:DD:DD_maxdailygust',
@@ -2471,6 +2513,7 @@
     'original_name': 'Monthly rain',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'monthly_rain',
     'unique_id': 'DD:DD:DD:DD:DD:DD_monthlyrainin',
@@ -2530,6 +2573,7 @@
     'original_name': 'Relative pressure',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'relative_pressure',
     'unique_id': 'DD:DD:DD:DD:DD:DD_baromrelin',
@@ -2586,6 +2630,7 @@
     'original_name': 'Temperature',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'DD:DD:DD:DD:DD:DD_tempf',
@@ -2642,6 +2687,7 @@
     'original_name': 'UV index',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'uv_index',
     'unique_id': 'DD:DD:DD:DD:DD:DD_uv',
@@ -2700,6 +2746,7 @@
     'original_name': 'Weekly rain',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'weekly_rain',
     'unique_id': 'DD:DD:DD:DD:DD:DD_weeklyrainin',
@@ -2756,6 +2803,7 @@
     'original_name': 'Wind direction',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'wind_direction',
     'unique_id': 'DD:DD:DD:DD:DD:DD_winddir',
@@ -2815,6 +2863,7 @@
     'original_name': 'Wind gust',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'wind_gust',
     'unique_id': 'DD:DD:DD:DD:DD:DD_windgustmph',
@@ -2874,6 +2923,7 @@
     'original_name': 'Wind speed',
     'platform': 'ambient_network',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'DD:DD:DD:DD:DD:DD_windspeedmph',

tests/components/analytics_insights/snapshots/test_sensor.ambr

@@ -29,6 +29,7 @@
     'original_name': 'core_samba',
     'platform': 'analytics_insights',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'addons',
     'unique_id': 'addon_core_samba_active_installations',
@@ -80,6 +81,7 @@
     'original_name': 'hacs (custom)',
     'platform': 'analytics_insights',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'custom_integrations',
     'unique_id': 'custom_hacs_active_installations',
@@ -131,6 +133,7 @@
     'original_name': 'myq',
     'platform': 'analytics_insights',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'core_integrations',
     'unique_id': 'core_myq_active_installations',
@@ -182,6 +185,7 @@
     'original_name': 'spotify',
     'platform': 'analytics_insights',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'core_integrations',
     'unique_id': 'core_spotify_active_installations',
@@ -233,6 +237,7 @@
     'original_name': 'Total active installations',
     'platform': 'analytics_insights',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'total_active_installations',
     'unique_id': 'total_active_installations',
@@ -284,6 +289,7 @@
     'original_name': 'Total reported integrations',
     'platform': 'analytics_insights',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'total_reports_integrations',
     'unique_id': 'total_reports_integrations',
@@ -335,6 +341,7 @@
     'original_name': 'YouTube',
     'platform': 'analytics_insights',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'core_integrations',
     'unique_id': 'core_youtube_active_installations',

tests/components/aosmith/snapshots/test_sensor.ambr

@@ -32,6 +32,7 @@
     'original_name': 'Energy usage',
     'platform': 'aosmith',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'energy_usage',
     'unique_id': 'energy_usage_junctionId',
@@ -82,6 +83,7 @@
     'original_name': 'Hot water availability',
     'platform': 'aosmith',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'hot_water_availability',
     'unique_id': 'hot_water_availability_junctionId',

tests/components/aosmith/snapshots/test_water_heater.ambr

@@ -30,6 +30,7 @@
     'original_name': None,
     'platform': 'aosmith',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <WaterHeaterEntityFeature: 5>,
     'translation_key': None,
     'unique_id': 'junctionId',
@@ -93,6 +94,7 @@
     'original_name': None,
     'platform': 'aosmith',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <WaterHeaterEntityFeature: 7>,
     'translation_key': None,
     'unique_id': 'junctionId',

tests/components/apcupsd/snapshots/test_binary_sensor.ambr

@@ -27,6 +27,7 @@
     'original_name': 'Online status',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'online_status',
     'unique_id': 'XXXXXXXXXXXX_statflag',

tests/components/apcupsd/snapshots/test_sensor.ambr

@@ -27,6 +27,7 @@
     'original_name': 'Alarm delay',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'alarm_delay',
     'unique_id': 'XXXXXXXXXXXX_alarmdel',
@@ -77,6 +78,7 @@
     'original_name': 'Battery',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'XXXXXXXXXXXX_bcharge',
@@ -127,6 +129,7 @@
     'original_name': 'Battery nominal voltage',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'battery_nominal_voltage',
     'unique_id': 'XXXXXXXXXXXX_nombattv',
@@ -176,6 +179,7 @@
     'original_name': 'Battery replaced',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'battery_replacement_date',
     'unique_id': 'XXXXXXXXXXXX_battdate',
@@ -223,6 +227,7 @@
     'original_name': 'Battery shutdown',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'max_battery_charge',
     'unique_id': 'XXXXXXXXXXXX_mbattchg',
@@ -271,6 +276,7 @@
     'original_name': 'Battery timeout',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'max_time',
     'unique_id': 'XXXXXXXXXXXX_maxtime',
@@ -321,6 +327,7 @@
     'original_name': 'Battery voltage',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'battery_voltage',
     'unique_id': 'XXXXXXXXXXXX_battv',
@@ -371,6 +378,7 @@
     'original_name': 'Cable type',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'cable_type',
     'unique_id': 'XXXXXXXXXXXX_cable',
@@ -418,6 +426,7 @@
     'original_name': 'Daemon version',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'version',
     'unique_id': 'XXXXXXXXXXXX_version',
@@ -465,6 +474,7 @@
     'original_name': 'Date and time',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'date_and_time',
     'unique_id': 'XXXXXXXXXXXX_end apc',
@@ -512,6 +522,7 @@
     'original_name': 'Driver',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'driver',
     'unique_id': 'XXXXXXXXXXXX_driver',
@@ -559,6 +570,7 @@
     'original_name': 'Firmware version',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'firmware_version',
     'unique_id': 'XXXXXXXXXXXX_firmware',
@@ -608,6 +620,7 @@
     'original_name': 'Input voltage',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'line_voltage',
     'unique_id': 'XXXXXXXXXXXX_linev',
@@ -660,6 +673,7 @@
     'original_name': 'Internal temperature',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'internal_temperature',
     'unique_id': 'XXXXXXXXXXXX_itemp',
@@ -710,6 +724,7 @@
     'original_name': 'Last self-test',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'last_self_test',
     'unique_id': 'XXXXXXXXXXXX_laststest',
@@ -757,6 +772,7 @@
     'original_name': 'Last transfer',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'last_transfer',
     'unique_id': 'XXXXXXXXXXXX_lastxfer',
@@ -806,6 +822,7 @@
     'original_name': 'Load',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'load_capacity',
     'unique_id': 'XXXXXXXXXXXX_loadpct',
@@ -855,6 +872,7 @@
     'original_name': 'Mode',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'ups_mode',
     'unique_id': 'XXXXXXXXXXXX_upsmode',
@@ -902,6 +920,7 @@
     'original_name': 'Model',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'model',
     'unique_id': 'XXXXXXXXXXXX_model',
@@ -949,6 +968,7 @@
     'original_name': 'Name',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'ups_name',
     'unique_id': 'XXXXXXXXXXXX_upsname',
@@ -996,6 +1016,7 @@
     'original_name': 'Nominal apparent power',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'nominal_apparent_power',
     'unique_id': 'XXXXXXXXXXXX_nomapnt',
@@ -1045,6 +1066,7 @@
     'original_name': 'Nominal input voltage',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'nominal_input_voltage',
     'unique_id': 'XXXXXXXXXXXX_nominv',
@@ -1094,6 +1116,7 @@
     'original_name': 'Nominal output power',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'nominal_output_power',
     'unique_id': 'XXXXXXXXXXXX_nompower',
@@ -1145,6 +1168,7 @@
     'original_name': 'Output current',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'output_current',
     'unique_id': 'XXXXXXXXXXXX_outcurnt',
@@ -1195,6 +1219,7 @@
     'original_name': 'Self-test interval',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'self_test_interval',
     'unique_id': 'XXXXXXXXXXXX_stesti',
@@ -1243,6 +1268,7 @@
     'original_name': 'Self-test result',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'self_test_result',
     'unique_id': 'XXXXXXXXXXXX_selftest',
@@ -1290,6 +1316,7 @@
     'original_name': 'Sensitivity',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'sensitivity',
     'unique_id': 'XXXXXXXXXXXX_sense',
@@ -1337,6 +1364,7 @@
     'original_name': 'Serial number',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'serial_number',
     'unique_id': 'XXXXXXXXXXXX_serialno',
@@ -1384,6 +1412,7 @@
     'original_name': 'Shutdown time',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'min_time',
     'unique_id': 'XXXXXXXXXXXX_mintimel',
@@ -1432,6 +1461,7 @@
     'original_name': 'Status',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'status',
     'unique_id': 'XXXXXXXXXXXX_status',
@@ -1479,6 +1509,7 @@
     'original_name': 'Status data',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'apc_status',
     'unique_id': 'XXXXXXXXXXXX_apc',
@@ -1526,6 +1557,7 @@
     'original_name': 'Status date',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'date',
     'unique_id': 'XXXXXXXXXXXX_date',
@@ -1573,6 +1605,7 @@
     'original_name': 'Status flag',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'online_status',
     'unique_id': 'XXXXXXXXXXXX_statflag',
@@ -1622,6 +1655,7 @@
     'original_name': 'Time left',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'time_left',
     'unique_id': 'XXXXXXXXXXXX_timeleft',
@@ -1674,6 +1708,7 @@
     'original_name': 'Time on battery',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'time_on_battery',
     'unique_id': 'XXXXXXXXXXXX_tonbatt',
@@ -1726,6 +1761,7 @@
     'original_name': 'Total time on battery',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'total_time_on_battery',
     'unique_id': 'XXXXXXXXXXXX_cumonbatt',
@@ -1778,6 +1814,7 @@
     'original_name': 'Transfer count',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'transfer_count',
     'unique_id': 'XXXXXXXXXXXX_numxfers',
@@ -1826,6 +1863,7 @@
     'original_name': 'Transfer from battery',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'transfer_from_battery',
     'unique_id': 'XXXXXXXXXXXX_xoffbatt',
@@ -1873,6 +1911,7 @@
     'original_name': 'Transfer high',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'transfer_high',
     'unique_id': 'XXXXXXXXXXXX_hitrans',
@@ -1922,6 +1961,7 @@
     'original_name': 'Transfer low',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'transfer_low',
     'unique_id': 'XXXXXXXXXXXX_lotrans',
@@ -1971,6 +2011,7 @@
     'original_name': 'Transfer to battery',
     'platform': 'apcupsd',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'transfer_to_battery',
     'unique_id': 'XXXXXXXXXXXX_xonbatt',

tests/components/apsystems/snapshots/test_binary_sensor.ambr

@@ -27,6 +27,7 @@
     'original_name': 'DC 1 short circuit error status',
     'platform': 'apsystems',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'dc_1_short_circuit_error_status',
     'unique_id': 'MY_SERIAL_NUMBER_dc_1_short_circuit_error_status',
@@ -75,6 +76,7 @@
     'original_name': 'DC 2 short circuit error status',
     'platform': 'apsystems',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'dc_2_short_circuit_error_status',
     'unique_id': 'MY_SERIAL_NUMBER_dc_2_short_circuit_error_status',
@@ -123,6 +125,7 @@
     'original_name': 'Off-grid status',
     'platform': 'apsystems',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'off_grid_status',
     'unique_id': 'MY_SERIAL_NUMBER_off_grid_status',
@@ -171,6 +174,7 @@
     'original_name': 'Output fault status',
     'platform': 'apsystems',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'output_fault_status',
     'unique_id': 'MY_SERIAL_NUMBER_output_fault_status',

tests/components/apsystems/snapshots/test_number.ambr

@@ -32,6 +32,7 @@
     'original_name': 'Max output',
     'platform': 'apsystems',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'max_output',
     'unique_id': 'MY_SERIAL_NUMBER_output_limit',

tests/components/apsystems/snapshots/test_sensor.ambr

@@ -29,6 +29,7 @@
     'original_name': 'Lifetime production of P1',
     'platform': 'apsystems',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'lifetime_production_p1',
     'unique_id': 'MY_SERIAL_NUMBER_lifetime_production_p1',
@@ -81,6 +82,7 @@
     'original_name': 'Lifetime production of P2',
     'platform': 'apsystems',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'lifetime_production_p2',
     'unique_id': 'MY_SERIAL_NUMBER_lifetime_production_p2',
@@ -133,6 +135,7 @@
     'original_name': 'Power of P1',
     'platform': 'apsystems',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'total_power_p1',
     'unique_id': 'MY_SERIAL_NUMBER_total_power_p1',
@@ -185,6 +188,7 @@
     'original_name': 'Power of P2',
     'platform': 'apsystems',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'total_power_p2',
     'unique_id': 'MY_SERIAL_NUMBER_total_power_p2',
@@ -237,6 +241,7 @@
     'original_name': 'Production of today',
     'platform': 'apsystems',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'today_production',
     'unique_id': 'MY_SERIAL_NUMBER_today_production',
@@ -289,6 +294,7 @@
     'original_name': 'Production of today from P1',
     'platform': 'apsystems',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'today_production_p1',
     'unique_id': 'MY_SERIAL_NUMBER_today_production_p1',
@@ -341,6 +347,7 @@
     'original_name': 'Production of today from P2',
     'platform': 'apsystems',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'today_production_p2',
     'unique_id': 'MY_SERIAL_NUMBER_today_production_p2',
@@ -393,6 +400,7 @@
     'original_name': 'Total lifetime production',
     'platform': 'apsystems',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'lifetime_production',
     'unique_id': 'MY_SERIAL_NUMBER_lifetime_production',
@@ -445,6 +453,7 @@
     'original_name': 'Total power',
     'platform': 'apsystems',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'total_power',
     'unique_id': 'MY_SERIAL_NUMBER_total_power',

tests/components/apsystems/snapshots/test_switch.ambr

@@ -27,6 +27,7 @@
     'original_name': 'Inverter status',
     'platform': 'apsystems',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'inverter_status',
     'unique_id': 'MY_SERIAL_NUMBER_inverter_status',

tests/components/aquacell/snapshots/test_sensor.ambr

@@ -27,6 +27,7 @@
     'original_name': 'Battery',
     'platform': 'aquacell',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'DSN-battery',
@@ -78,6 +79,7 @@
     'original_name': 'Salt left side percentage',
     'platform': 'aquacell',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'salt_left_side_percentage',
     'unique_id': 'DSN-salt_left_side_percentage',
@@ -127,6 +129,7 @@
     'original_name': 'Salt left side time remaining',
     'platform': 'aquacell',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'salt_left_side_time_remaining',
     'unique_id': 'DSN-salt_left_side_time_remaining',
@@ -178,6 +181,7 @@
     'original_name': 'Salt right side percentage',
     'platform': 'aquacell',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'salt_right_side_percentage',
     'unique_id': 'DSN-salt_right_side_percentage',
@@ -227,6 +231,7 @@
     'original_name': 'Salt right side time remaining',
     'platform': 'aquacell',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'salt_right_side_time_remaining',
     'unique_id': 'DSN-salt_right_side_time_remaining',
@@ -282,6 +287,7 @@
     'original_name': 'Wi-Fi strength',
     'platform': 'aquacell',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'wi_fi_strength',
     'unique_id': 'DSN-wi_fi_strength',

tests/components/arve/snapshots/test_sensor.ambr

@@ -29,6 +29,7 @@
     'original_name': 'Air quality index',
     'platform': 'arve',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'test-serial-number_AQI',
@@ -65,6 +66,7 @@
     'original_name': 'Carbon dioxide',
     'platform': 'arve',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'test-serial-number_CO2',
@@ -101,6 +103,7 @@
     'original_name': 'Humidity',
     'platform': 'arve',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'test-serial-number_Humidity',
@@ -137,6 +140,7 @@
     'original_name': 'PM10',
     'platform': 'arve',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'test-serial-number_PM10',
@@ -173,6 +177,7 @@
     'original_name': 'PM2.5',
     'platform': 'arve',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'test-serial-number_PM25',
@@ -209,6 +214,7 @@
     'original_name': 'Temperature',
     'platform': 'arve',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'test-serial-number_Temperature',
@@ -245,6 +251,7 @@
     'original_name': 'Total volatile organic compounds',
     'platform': 'arve',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'tvoc',
     'unique_id': 'test-serial-number_TVOC',

tests/components/autarco/snapshots/test_sensor.ambr

@@ -29,6 +29,7 @@
     'original_name': 'Charged month',
     'platform': 'autarco',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'charged_month',
     'unique_id': '1_battery_charged_month',
@@ -81,6 +82,7 @@
     'original_name': 'Charged today',
     'platform': 'autarco',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'charged_today',
     'unique_id': '1_battery_charged_today',
@@ -133,6 +135,7 @@
     'original_name': 'Charged total',
     'platform': 'autarco',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'charged_total',
     'unique_id': '1_battery_charged_total',
@@ -185,6 +188,7 @@
     'original_name': 'Discharged month',
     'platform': 'autarco',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'discharged_month',
     'unique_id': '1_battery_discharged_month',
@@ -237,6 +241,7 @@
     'original_name': 'Discharged today',
     'platform': 'autarco',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'discharged_today',
     'unique_id': '1_battery_discharged_today',
@@ -289,6 +294,7 @@
     'original_name': 'Discharged total',
     'platform': 'autarco',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'discharged_total',
     'unique_id': '1_battery_discharged_total',
@@ -341,6 +347,7 @@
     'original_name': 'Flow now',
     'platform': 'autarco',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'flow_now',
     'unique_id': '1_battery_flow_now',
@@ -393,6 +400,7 @@
     'original_name': 'State of charge',
     'platform': 'autarco',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'state_of_charge',
     'unique_id': '1_battery_state_of_charge',
@@ -445,6 +453,7 @@
     'original_name': 'Energy AC output total',
     'platform': 'autarco',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'out_ac_energy_total',
     'unique_id': 'test-serial-1_out_ac_energy_total',
@@ -497,6 +506,7 @@
     'original_name': 'Power AC output',
     'platform': 'autarco',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'out_ac_power',
     'unique_id': 'test-serial-1_out_ac_power',
@@ -549,6 +559,7 @@
     'original_name': 'Energy AC output total',
     'platform': 'autarco',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'out_ac_energy_total',
     'unique_id': 'test-serial-2_out_ac_energy_total',
@@ -601,6 +612,7 @@
     'original_name': 'Power AC output',
     'platform': 'autarco',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'out_ac_power',
     'unique_id': 'test-serial-2_out_ac_power',
@@ -653,6 +665,7 @@
     'original_name': 'Energy production month',
     'platform': 'autarco',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'energy_production_month',
     'unique_id': '1_solar_energy_production_month',
@@ -705,6 +718,7 @@
     'original_name': 'Energy production today',
     'platform': 'autarco',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'energy_production_today',
     'unique_id': '1_solar_energy_production_today',
@@ -757,6 +771,7 @@
     'original_name': 'Energy production total',
     'platform': 'autarco',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'energy_production_total',
     'unique_id': '1_solar_energy_production_total',
@@ -809,6 +824,7 @@
     'original_name': 'Power production',
     'platform': 'autarco',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'power_production',
     'unique_id': '1_solar_power_production',

tests/components/axis/snapshots/test_binary_sensor.ambr

@@ -27,6 +27,7 @@
     'original_name': 'DayNight 1',
     'platform': 'axis',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:40:8c:12:34:56-tns1:VideoSource/tnsaxis:DayNightVision-1',
@@ -75,6 +76,7 @@
     'original_name': 'Object Analytics Device1Scenario8',
     'platform': 'axis',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:40:8c:12:34:56-tnsaxis:CameraApplicationPlatform/ObjectAnalytics/Device1Scenario8-Device1Scenario8',
@@ -123,6 +125,7 @@
     'original_name': 'Sound 1',
     'platform': 'axis',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:40:8c:12:34:56-tns1:AudioSource/tnsaxis:TriggerLevel-1',
@@ -171,6 +174,7 @@
     'original_name': 'PIR sensor',
     'platform': 'axis',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:40:8c:12:34:56-tns1:Device/tnsaxis:IO/Port-0',
@@ -219,6 +223,7 @@
     'original_name': 'PIR 0',
     'platform': 'axis',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:40:8c:12:34:56-tns1:Device/tnsaxis:Sensor/PIR-0',
@@ -267,6 +272,7 @@
     'original_name': 'Fence Guard Profile 1',
     'platform': 'axis',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:40:8c:12:34:56-tnsaxis:CameraApplicationPlatform/FenceGuard/Camera1Profile1-Camera1Profile1',
@@ -315,6 +321,7 @@
     'original_name': 'Motion Guard Profile 1',
     'platform': 'axis',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:40:8c:12:34:56-tnsaxis:CameraApplicationPlatform/MotionGuard/Camera1Profile1-Camera1Profile1',
@@ -363,6 +370,7 @@
     'original_name': 'Loitering Guard Profile 1',
     'platform': 'axis',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:40:8c:12:34:56-tnsaxis:CameraApplicationPlatform/LoiteringGuard/Camera1Profile1-Camera1Profile1',
@@ -411,6 +419,7 @@
     'original_name': 'VMD4 Profile 1',
     'platform': 'axis',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:40:8c:12:34:56-tnsaxis:CameraApplicationPlatform/VMD/Camera1Profile1-Camera1Profile1',
@@ -459,6 +468,7 @@
     'original_name': 'Object Analytics Scenario 1',
     'platform': 'axis',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:40:8c:12:34:56-tnsaxis:CameraApplicationPlatform/ObjectAnalytics/Device1Scenario1-Device1Scenario1',
@@ -507,6 +517,7 @@
     'original_name': 'VMD4 Camera1Profile9',
     'platform': 'axis',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:40:8c:12:34:56-tnsaxis:CameraApplicationPlatform/VMD/Camera1Profile9-Camera1Profile9',

tests/components/axis/snapshots/test_camera.ambr

@@ -27,6 +27,7 @@
     'original_name': None,
     'platform': 'axis',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <CameraEntityFeature: 2>,
     'translation_key': None,
     'unique_id': '00:40:8c:12:34:56-camera',
@@ -77,6 +78,7 @@
     'original_name': None,
     'platform': 'axis',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <CameraEntityFeature: 2>,
     'translation_key': None,
     'unique_id': '00:40:8c:12:34:56-camera',

tests/components/axis/snapshots/test_light.ambr

@@ -31,6 +31,7 @@
     'original_name': 'IR Light 0',
     'platform': 'axis',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:40:8c:12:34:56-tns1:Device/tnsaxis:Light/Status-0',

tests/components/axis/snapshots/test_switch.ambr

@@ -27,6 +27,7 @@
     'original_name': 'Doorbell',
     'platform': 'axis',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:40:8c:12:34:56-tns1:Device/Trigger/Relay-0',
@@ -75,6 +76,7 @@
     'original_name': 'Relay 1',
     'platform': 'axis',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:40:8c:12:34:56-tns1:Device/Trigger/Relay-1',
@@ -123,6 +125,7 @@
     'original_name': 'Doorbell',
     'platform': 'axis',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:40:8c:12:34:56-tns1:Device/Trigger/Relay-0',
@@ -171,6 +174,7 @@
     'original_name': 'Relay 1',
     'platform': 'axis',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:40:8c:12:34:56-tns1:Device/Trigger/Relay-1',

tests/components/azure_devops/snapshots/test_sensor.ambr

@@ -27,6 +27,7 @@
     'original_name': 'CI latest build',
     'platform': 'azure_devops',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'latest_build',
     'unique_id': 'testorg_1234_9876_latest_build',
@@ -86,6 +87,7 @@
     'original_name': 'CI latest build finish time',
     'platform': 'azure_devops',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'finish_time',
     'unique_id': 'testorg_1234_9876_finish_time',
@@ -134,6 +136,7 @@
     'original_name': 'CI latest build ID',
     'platform': 'azure_devops',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'build_id',
     'unique_id': 'testorg_1234_9876_build_id',
@@ -181,6 +184,7 @@
     'original_name': 'CI latest build queue time',
     'platform': 'azure_devops',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'queue_time',
     'unique_id': 'testorg_1234_9876_queue_time',
@@ -229,6 +233,7 @@
     'original_name': 'CI latest build reason',
     'platform': 'azure_devops',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'reason',
     'unique_id': 'testorg_1234_9876_reason',
@@ -276,6 +281,7 @@
     'original_name': 'CI latest build result',
     'platform': 'azure_devops',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'result',
     'unique_id': 'testorg_1234_9876_result',
@@ -323,6 +329,7 @@
     'original_name': 'CI latest build source branch',
     'platform': 'azure_devops',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'source_branch',
     'unique_id': 'testorg_1234_9876_source_branch',
@@ -370,6 +377,7 @@
     'original_name': 'CI latest build source version',
     'platform': 'azure_devops',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'source_version',
     'unique_id': 'testorg_1234_9876_source_version',
@@ -417,6 +425,7 @@
     'original_name': 'CI latest build start time',
     'platform': 'azure_devops',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'start_time',
     'unique_id': 'testorg_1234_9876_start_time',
@@ -465,6 +474,7 @@
     'original_name': 'CI latest build URL',
     'platform': 'azure_devops',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'url',
     'unique_id': 'testorg_1234_9876_url',

tests/components/backup/snapshots/test_event.ambr

@@ -33,6 +33,7 @@
     'original_name': 'Automatic backup',
     'platform': 'backup',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'automatic_backup_event',
     'unique_id': 'automatic_backup_event',

tests/components/backup/snapshots/test_sensors.ambr

@@ -35,6 +35,7 @@
     'original_name': 'Backup Manager state',
     'platform': 'backup',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'backup_manager_state',
     'unique_id': 'backup_manager_state',
@@ -90,6 +91,7 @@
     'original_name': 'Last attempted automatic backup',
     'platform': 'backup',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'last_attempted_automatic_backup',
     'unique_id': 'last_attempted_automatic_backup',
@@ -138,6 +140,7 @@
     'original_name': 'Last successful automatic backup',
     'platform': 'backup',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'last_successful_automatic_backup',
     'unique_id': 'last_successful_automatic_backup',
@@ -186,6 +189,7 @@
     'original_name': 'Next scheduled automatic backup',
     'platform': 'backup',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'next_scheduled_automatic_backup',
     'unique_id': 'next_scheduled_automatic_backup',

tests/components/balboa/snapshots/test_binary_sensor.ambr

@@ -27,6 +27,7 @@
     'original_name': 'Circulation pump',
     'platform': 'balboa',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'circ_pump',
     'unique_id': 'FakeSpa-Circ Pump-c0ffee',
@@ -75,6 +76,7 @@
     'original_name': 'Filter cycle 1',
     'platform': 'balboa',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'filter_1',
     'unique_id': 'FakeSpa-Filter1-c0ffee',
@@ -123,6 +125,7 @@
     'original_name': 'Filter cycle 2',
     'platform': 'balboa',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'filter_2',
     'unique_id': 'FakeSpa-Filter2-c0ffee',

tests/components/balboa/snapshots/test_climate.ambr

@@ -38,6 +38,7 @@
     'original_name': None,
     'platform': 'balboa',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <ClimateEntityFeature: 401>,
     'translation_key': 'balboa',
     'unique_id': 'FakeSpa-Climate-c0ffee',

tests/components/balboa/snapshots/test_event.ambr

@@ -48,6 +48,7 @@
     'original_name': 'Fault',
     'platform': 'balboa',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'fault',
     'unique_id': 'FakeSpa-fault-c0ffee',

tests/components/balboa/snapshots/test_fan.ambr

@@ -29,6 +29,7 @@
     'original_name': 'Pump 1',
     'platform': 'balboa',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <FanEntityFeature: 49>,
     'translation_key': 'pump',
     'unique_id': 'FakeSpa-Pump 1-c0ffee',

tests/components/balboa/snapshots/test_light.ambr

@@ -31,6 +31,7 @@
     'original_name': 'Light',
     'platform': 'balboa',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'only_light',
     'unique_id': 'FakeSpa-Light-c0ffee',

tests/components/balboa/snapshots/test_select.ambr

@@ -32,6 +32,7 @@
     'original_name': 'Temperature range',
     'platform': 'balboa',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'temperature_range',
     'unique_id': 'FakeSpa-TempHiLow-c0ffee',

tests/components/balboa/snapshots/test_switch.ambr

@@ -27,6 +27,7 @@
     'original_name': 'Filter cycle 2 enabled',
     'platform': 'balboa',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'filter_cycle_2_enabled',
     'unique_id': 'FakeSpa-filter_cycle_2_enabled-c0ffee',

tests/components/balboa/snapshots/test_time.ambr

@@ -27,6 +27,7 @@
     'original_name': 'Filter cycle 1 end',
     'platform': 'balboa',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'filter_cycle_end',
     'unique_id': 'FakeSpa-filter_cycle_1_end-c0ffee',
@@ -74,6 +75,7 @@
     'original_name': 'Filter cycle 1 start',
     'platform': 'balboa',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'filter_cycle_start',
     'unique_id': 'FakeSpa-filter_cycle_1_start-c0ffee',
@@ -121,6 +123,7 @@
     'original_name': 'Filter cycle 2 end',
     'platform': 'balboa',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'filter_cycle_end',
     'unique_id': 'FakeSpa-filter_cycle_2_end-c0ffee',
@@ -168,6 +171,7 @@
     'original_name': 'Filter cycle 2 start',
     'platform': 'balboa',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'filter_cycle_start',
     'unique_id': 'FakeSpa-filter_cycle_2_start-c0ffee',

tests/components/blue_current/snapshots/test_button.ambr

@@ -27,6 +27,7 @@
     'original_name': 'Reboot',
     'platform': 'blue_current',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'reboot',
     'unique_id': 'reboot_101',
@@ -75,6 +76,7 @@
     'original_name': 'Reset',
     'platform': 'blue_current',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'reset',
     'unique_id': 'reset_101',
@@ -123,6 +125,7 @@
     'original_name': 'Stop charge session',
     'platform': 'blue_current',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'stop_charge_session',
     'unique_id': 'stop_charge_session_101',

tests/components/bluemaestro/snapshots/test_sensor.ambr

@@ -29,6 +29,7 @@
     'original_name': 'Battery',
     'platform': 'bluemaestro',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'aa:bb:cc:dd:ee:ff-battery',
@@ -81,6 +82,7 @@
     'original_name': 'Dew point',
     'platform': 'bluemaestro',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'dew_point',
     'unique_id': 'aa:bb:cc:dd:ee:ff-dew_point',
@@ -133,6 +135,7 @@
     'original_name': 'Humidity',
     'platform': 'bluemaestro',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'aa:bb:cc:dd:ee:ff-humidity',
@@ -185,6 +188,7 @@
     'original_name': 'Signal strength',
     'platform': 'bluemaestro',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'aa:bb:cc:dd:ee:ff-signal_strength',
@@ -237,6 +241,7 @@
     'original_name': 'Temperature',
     'platform': 'bluemaestro',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'aa:bb:cc:dd:ee:ff-temperature',

tests/components/bmw_connected_drive/snapshots/test_binary_sensor.ambr

@@ -27,6 +27,7 @@
     'original_name': 'Charging status',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'charging_status',
     'unique_id': 'WBY00000000REXI01-charging_status',
@@ -75,6 +76,7 @@
     'original_name': 'Check control messages',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'check_control_messages',
     'unique_id': 'WBY00000000REXI01-check_control_messages',
@@ -123,6 +125,7 @@
     'original_name': 'Condition-based services',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'condition_based_services',
     'unique_id': 'WBY00000000REXI01-condition_based_services',
@@ -177,6 +180,7 @@
     'original_name': 'Connection status',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'connection_status',
     'unique_id': 'WBY00000000REXI01-connection_status',
@@ -225,6 +229,7 @@
     'original_name': 'Door lock state',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'door_lock_state',
     'unique_id': 'WBY00000000REXI01-door_lock_state',
@@ -274,6 +279,7 @@
     'original_name': 'Lids',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'lids',
     'unique_id': 'WBY00000000REXI01-lids',
@@ -329,6 +335,7 @@
     'original_name': 'Pre-entry climatization',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'is_pre_entry_climatization_enabled',
     'unique_id': 'WBY00000000REXI01-is_pre_entry_climatization_enabled',
@@ -376,6 +383,7 @@
     'original_name': 'Windows',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'windows',
     'unique_id': 'WBY00000000REXI01-windows',
@@ -426,6 +434,7 @@
     'original_name': 'Charging status',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'charging_status',
     'unique_id': 'WBA00000000DEMO02-charging_status',
@@ -474,6 +483,7 @@
     'original_name': 'Check control messages',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'check_control_messages',
     'unique_id': 'WBA00000000DEMO02-check_control_messages',
@@ -523,6 +533,7 @@
     'original_name': 'Condition-based services',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'condition_based_services',
     'unique_id': 'WBA00000000DEMO02-condition_based_services',
@@ -582,6 +593,7 @@
     'original_name': 'Connection status',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'connection_status',
     'unique_id': 'WBA00000000DEMO02-connection_status',
@@ -630,6 +642,7 @@
     'original_name': 'Door lock state',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'door_lock_state',
     'unique_id': 'WBA00000000DEMO02-door_lock_state',
@@ -679,6 +692,7 @@
     'original_name': 'Lids',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'lids',
     'unique_id': 'WBA00000000DEMO02-lids',
@@ -733,6 +747,7 @@
     'original_name': 'Pre-entry climatization',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'is_pre_entry_climatization_enabled',
     'unique_id': 'WBA00000000DEMO02-is_pre_entry_climatization_enabled',
@@ -780,6 +795,7 @@
     'original_name': 'Windows',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'windows',
     'unique_id': 'WBA00000000DEMO02-windows',
@@ -833,6 +849,7 @@
     'original_name': 'Charging status',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'charging_status',
     'unique_id': 'WBA00000000DEMO01-charging_status',
@@ -881,6 +898,7 @@
     'original_name': 'Check control messages',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'check_control_messages',
     'unique_id': 'WBA00000000DEMO01-check_control_messages',
@@ -930,6 +948,7 @@
     'original_name': 'Condition-based services',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'condition_based_services',
     'unique_id': 'WBA00000000DEMO01-condition_based_services',
@@ -989,6 +1008,7 @@
     'original_name': 'Connection status',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'connection_status',
     'unique_id': 'WBA00000000DEMO01-connection_status',
@@ -1037,6 +1057,7 @@
     'original_name': 'Door lock state',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'door_lock_state',
     'unique_id': 'WBA00000000DEMO01-door_lock_state',
@@ -1086,6 +1107,7 @@
     'original_name': 'Lids',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'lids',
     'unique_id': 'WBA00000000DEMO01-lids',
@@ -1141,6 +1163,7 @@
     'original_name': 'Pre-entry climatization',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'is_pre_entry_climatization_enabled',
     'unique_id': 'WBA00000000DEMO01-is_pre_entry_climatization_enabled',
@@ -1188,6 +1211,7 @@
     'original_name': 'Windows',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'windows',
     'unique_id': 'WBA00000000DEMO01-windows',
@@ -1241,6 +1265,7 @@
     'original_name': 'Check control messages',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'check_control_messages',
     'unique_id': 'WBA00000000DEMO03-check_control_messages',
@@ -1291,6 +1316,7 @@
     'original_name': 'Condition-based services',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'condition_based_services',
     'unique_id': 'WBA00000000DEMO03-condition_based_services',
@@ -1353,6 +1379,7 @@
     'original_name': 'Door lock state',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'door_lock_state',
     'unique_id': 'WBA00000000DEMO03-door_lock_state',
@@ -1402,6 +1429,7 @@
     'original_name': 'Lids',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'lids',
     'unique_id': 'WBA00000000DEMO03-lids',
@@ -1456,6 +1484,7 @@
     'original_name': 'Windows',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'windows',
     'unique_id': 'WBA00000000DEMO03-windows',

tests/components/bmw_connected_drive/snapshots/test_button.ambr

@@ -27,6 +27,7 @@
     'original_name': 'Activate air conditioning',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'activate_air_conditioning',
     'unique_id': 'WBY00000000REXI01-activate_air_conditioning',
@@ -74,6 +75,7 @@
     'original_name': 'Find vehicle',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'find_vehicle',
     'unique_id': 'WBY00000000REXI01-find_vehicle',
@@ -121,6 +123,7 @@
     'original_name': 'Flash lights',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'light_flash',
     'unique_id': 'WBY00000000REXI01-light_flash',
@@ -168,6 +171,7 @@
     'original_name': 'Sound horn',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'sound_horn',
     'unique_id': 'WBY00000000REXI01-sound_horn',
@@ -215,6 +219,7 @@
     'original_name': 'Activate air conditioning',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'activate_air_conditioning',
     'unique_id': 'WBA00000000DEMO02-activate_air_conditioning',
@@ -262,6 +267,7 @@
     'original_name': 'Deactivate air conditioning',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'deactivate_air_conditioning',
     'unique_id': 'WBA00000000DEMO02-deactivate_air_conditioning',
@@ -309,6 +315,7 @@
     'original_name': 'Find vehicle',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'find_vehicle',
     'unique_id': 'WBA00000000DEMO02-find_vehicle',
@@ -356,6 +363,7 @@
     'original_name': 'Flash lights',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'light_flash',
     'unique_id': 'WBA00000000DEMO02-light_flash',
@@ -403,6 +411,7 @@
     'original_name': 'Sound horn',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'sound_horn',
     'unique_id': 'WBA00000000DEMO02-sound_horn',
@@ -450,6 +459,7 @@
     'original_name': 'Activate air conditioning',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'activate_air_conditioning',
     'unique_id': 'WBA00000000DEMO01-activate_air_conditioning',
@@ -497,6 +507,7 @@
     'original_name': 'Deactivate air conditioning',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'deactivate_air_conditioning',
     'unique_id': 'WBA00000000DEMO01-deactivate_air_conditioning',
@@ -544,6 +555,7 @@
     'original_name': 'Find vehicle',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'find_vehicle',
     'unique_id': 'WBA00000000DEMO01-find_vehicle',
@@ -591,6 +603,7 @@
     'original_name': 'Flash lights',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'light_flash',
     'unique_id': 'WBA00000000DEMO01-light_flash',
@@ -638,6 +651,7 @@
     'original_name': 'Sound horn',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'sound_horn',
     'unique_id': 'WBA00000000DEMO01-sound_horn',
@@ -685,6 +699,7 @@
     'original_name': 'Activate air conditioning',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'activate_air_conditioning',
     'unique_id': 'WBA00000000DEMO03-activate_air_conditioning',
@@ -732,6 +747,7 @@
     'original_name': 'Deactivate air conditioning',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'deactivate_air_conditioning',
     'unique_id': 'WBA00000000DEMO03-deactivate_air_conditioning',
@@ -779,6 +795,7 @@
     'original_name': 'Find vehicle',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'find_vehicle',
     'unique_id': 'WBA00000000DEMO03-find_vehicle',
@@ -826,6 +843,7 @@
     'original_name': 'Flash lights',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'light_flash',
     'unique_id': 'WBA00000000DEMO03-light_flash',
@@ -873,6 +891,7 @@
     'original_name': 'Sound horn',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'sound_horn',
     'unique_id': 'WBA00000000DEMO03-sound_horn',

tests/components/bmw_connected_drive/snapshots/test_lock.ambr

@@ -27,6 +27,7 @@
     'original_name': 'Lock',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'lock',
     'unique_id': 'WBY00000000REXI01-lock',
@@ -76,6 +77,7 @@
     'original_name': 'Lock',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'lock',
     'unique_id': 'WBA00000000DEMO02-lock',
@@ -125,6 +127,7 @@
     'original_name': 'Lock',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'lock',
     'unique_id': 'WBA00000000DEMO01-lock',
@@ -174,6 +177,7 @@
     'original_name': 'Lock',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'lock',
     'unique_id': 'WBA00000000DEMO03-lock',

tests/components/bmw_connected_drive/snapshots/test_number.ambr

@@ -32,6 +32,7 @@
     'original_name': 'Target SoC',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'target_soc',
     'unique_id': 'WBA00000000DEMO02-target_soc',
@@ -89,6 +90,7 @@
     'original_name': 'Target SoC',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'target_soc',
     'unique_id': 'WBA00000000DEMO01-target_soc',

tests/components/bmw_connected_drive/snapshots/test_select.ambr

@@ -33,6 +33,7 @@
     'original_name': 'Charging mode',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'charging_mode',
     'unique_id': 'WBY00000000REXI01-charging_mode',
@@ -101,6 +102,7 @@
     'original_name': 'AC charging limit',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'ac_limit',
     'unique_id': 'WBA00000000DEMO02-ac_limit',
@@ -170,6 +172,7 @@
     'original_name': 'Charging mode',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'charging_mode',
     'unique_id': 'WBA00000000DEMO02-charging_mode',
@@ -238,6 +241,7 @@
     'original_name': 'AC charging limit',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'ac_limit',
     'unique_id': 'WBA00000000DEMO01-ac_limit',
@@ -307,6 +311,7 @@
     'original_name': 'Charging mode',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'charging_mode',
     'unique_id': 'WBA00000000DEMO01-charging_mode',

tests/components/bmw_connected_drive/snapshots/test_sensor.ambr

@@ -30,6 +30,7 @@
     'original_name': 'AC current limit',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'ac_current_limit',
     'unique_id': 'WBY00000000REXI01-charging_profile.ac_current_limit',
@@ -79,6 +80,7 @@
     'original_name': 'Charging end time',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'charging_end_time',
     'unique_id': 'WBY00000000REXI01-fuel_and_battery.charging_end_time',
@@ -127,6 +129,7 @@
     'original_name': 'Charging start time',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'charging_start_time',
     'unique_id': 'WBY00000000REXI01-fuel_and_battery.charging_start_time',
@@ -190,6 +193,7 @@
     'original_name': 'Charging status',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'charging_status',
     'unique_id': 'WBY00000000REXI01-fuel_and_battery.charging_status',
@@ -255,6 +259,7 @@
     'original_name': 'Charging target',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'charging_target',
     'unique_id': 'WBY00000000REXI01-fuel_and_battery.charging_target',
@@ -308,6 +313,7 @@
     'original_name': 'Mileage',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'mileage',
     'unique_id': 'WBY00000000REXI01-mileage',
@@ -363,6 +369,7 @@
     'original_name': 'Remaining battery percent',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'remaining_battery_percent',
     'unique_id': 'WBY00000000REXI01-fuel_and_battery.remaining_battery_percent',
@@ -418,6 +425,7 @@
     'original_name': 'Remaining fuel',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'remaining_fuel',
     'unique_id': 'WBY00000000REXI01-fuel_and_battery.remaining_fuel',
@@ -473,6 +481,7 @@
     'original_name': 'Remaining fuel percent',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'remaining_fuel_percent',
     'unique_id': 'WBY00000000REXI01-fuel_and_battery.remaining_fuel_percent',
@@ -527,6 +536,7 @@
     'original_name': 'Remaining range electric',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'remaining_range_electric',
     'unique_id': 'WBY00000000REXI01-fuel_and_battery.remaining_range_electric',
@@ -582,6 +592,7 @@
     'original_name': 'Remaining range fuel',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'remaining_range_fuel',
     'unique_id': 'WBY00000000REXI01-fuel_and_battery.remaining_range_fuel',
@@ -637,6 +648,7 @@
     'original_name': 'Remaining range total',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'remaining_range_total',
     'unique_id': 'WBY00000000REXI01-fuel_and_battery.remaining_range_total',
@@ -690,6 +702,7 @@
     'original_name': 'AC current limit',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'ac_current_limit',
     'unique_id': 'WBA00000000DEMO02-charging_profile.ac_current_limit',
@@ -739,6 +752,7 @@
     'original_name': 'Charging end time',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'charging_end_time',
     'unique_id': 'WBA00000000DEMO02-fuel_and_battery.charging_end_time',
@@ -787,6 +801,7 @@
     'original_name': 'Charging start time',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'charging_start_time',
     'unique_id': 'WBA00000000DEMO02-fuel_and_battery.charging_start_time',
@@ -850,6 +865,7 @@
     'original_name': 'Charging status',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'charging_status',
     'unique_id': 'WBA00000000DEMO02-fuel_and_battery.charging_status',
@@ -915,6 +931,7 @@
     'original_name': 'Charging target',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'charging_target',
     'unique_id': 'WBA00000000DEMO02-fuel_and_battery.charging_target',
@@ -971,6 +988,7 @@
     'original_name': 'Climate status',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'climate_status',
     'unique_id': 'WBA00000000DEMO02-climate.activity',
@@ -1034,6 +1052,7 @@
     'original_name': 'Front left target pressure',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'front_left_target_pressure',
     'unique_id': 'WBA00000000DEMO02-tires.front_left.target_pressure',
@@ -1092,6 +1111,7 @@
     'original_name': 'Front left tire pressure',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'front_left_current_pressure',
     'unique_id': 'WBA00000000DEMO02-tires.front_left.current_pressure',
@@ -1150,6 +1170,7 @@
     'original_name': 'Front right target pressure',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'front_right_target_pressure',
     'unique_id': 'WBA00000000DEMO02-tires.front_right.target_pressure',
@@ -1208,6 +1229,7 @@
     'original_name': 'Front right tire pressure',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'front_right_current_pressure',
     'unique_id': 'WBA00000000DEMO02-tires.front_right.current_pressure',
@@ -1263,6 +1285,7 @@
     'original_name': 'Mileage',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'mileage',
     'unique_id': 'WBA00000000DEMO02-mileage',
@@ -1321,6 +1344,7 @@
     'original_name': 'Rear left target pressure',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'rear_left_target_pressure',
     'unique_id': 'WBA00000000DEMO02-tires.rear_left.target_pressure',
@@ -1379,6 +1403,7 @@
     'original_name': 'Rear left tire pressure',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'rear_left_current_pressure',
     'unique_id': 'WBA00000000DEMO02-tires.rear_left.current_pressure',
@@ -1437,6 +1462,7 @@
     'original_name': 'Rear right target pressure',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'rear_right_target_pressure',
     'unique_id': 'WBA00000000DEMO02-tires.rear_right.target_pressure',
@@ -1495,6 +1521,7 @@
     'original_name': 'Rear right tire pressure',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'rear_right_current_pressure',
     'unique_id': 'WBA00000000DEMO02-tires.rear_right.current_pressure',
@@ -1550,6 +1577,7 @@
     'original_name': 'Remaining battery percent',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'remaining_battery_percent',
     'unique_id': 'WBA00000000DEMO02-fuel_and_battery.remaining_battery_percent',
@@ -1605,6 +1633,7 @@
     'original_name': 'Remaining range electric',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'remaining_range_electric',
     'unique_id': 'WBA00000000DEMO02-fuel_and_battery.remaining_range_electric',
@@ -1660,6 +1689,7 @@
     'original_name': 'Remaining range total',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'remaining_range_total',
     'unique_id': 'WBA00000000DEMO02-fuel_and_battery.remaining_range_total',
@@ -1713,6 +1743,7 @@
     'original_name': 'AC current limit',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'ac_current_limit',
     'unique_id': 'WBA00000000DEMO01-charging_profile.ac_current_limit',
@@ -1762,6 +1793,7 @@
     'original_name': 'Charging end time',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'charging_end_time',
     'unique_id': 'WBA00000000DEMO01-fuel_and_battery.charging_end_time',
@@ -1810,6 +1842,7 @@
     'original_name': 'Charging start time',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'charging_start_time',
     'unique_id': 'WBA00000000DEMO01-fuel_and_battery.charging_start_time',
@@ -1873,6 +1906,7 @@
     'original_name': 'Charging status',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'charging_status',
     'unique_id': 'WBA00000000DEMO01-fuel_and_battery.charging_status',
@@ -1938,6 +1972,7 @@
     'original_name': 'Charging target',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'charging_target',
     'unique_id': 'WBA00000000DEMO01-fuel_and_battery.charging_target',
@@ -1994,6 +2029,7 @@
     'original_name': 'Climate status',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'climate_status',
     'unique_id': 'WBA00000000DEMO01-climate.activity',
@@ -2057,6 +2093,7 @@
     'original_name': 'Front left target pressure',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'front_left_target_pressure',
     'unique_id': 'WBA00000000DEMO01-tires.front_left.target_pressure',
@@ -2115,6 +2152,7 @@
     'original_name': 'Front left tire pressure',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'front_left_current_pressure',
     'unique_id': 'WBA00000000DEMO01-tires.front_left.current_pressure',
@@ -2173,6 +2211,7 @@
     'original_name': 'Front right target pressure',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'front_right_target_pressure',
     'unique_id': 'WBA00000000DEMO01-tires.front_right.target_pressure',
@@ -2231,6 +2270,7 @@
     'original_name': 'Front right tire pressure',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'front_right_current_pressure',
     'unique_id': 'WBA00000000DEMO01-tires.front_right.current_pressure',
@@ -2286,6 +2326,7 @@
     'original_name': 'Mileage',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'mileage',
     'unique_id': 'WBA00000000DEMO01-mileage',
@@ -2344,6 +2385,7 @@
     'original_name': 'Rear left target pressure',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'rear_left_target_pressure',
     'unique_id': 'WBA00000000DEMO01-tires.rear_left.target_pressure',
@@ -2402,6 +2444,7 @@
     'original_name': 'Rear left tire pressure',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'rear_left_current_pressure',
     'unique_id': 'WBA00000000DEMO01-tires.rear_left.current_pressure',
@@ -2460,6 +2503,7 @@
     'original_name': 'Rear right target pressure',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'rear_right_target_pressure',
     'unique_id': 'WBA00000000DEMO01-tires.rear_right.target_pressure',
@@ -2518,6 +2562,7 @@
     'original_name': 'Rear right tire pressure',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'rear_right_current_pressure',
     'unique_id': 'WBA00000000DEMO01-tires.rear_right.current_pressure',
@@ -2573,6 +2618,7 @@
     'original_name': 'Remaining battery percent',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'remaining_battery_percent',
     'unique_id': 'WBA00000000DEMO01-fuel_and_battery.remaining_battery_percent',
@@ -2628,6 +2674,7 @@
     'original_name': 'Remaining range electric',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'remaining_range_electric',
     'unique_id': 'WBA00000000DEMO01-fuel_and_battery.remaining_range_electric',
@@ -2683,6 +2730,7 @@
     'original_name': 'Remaining range total',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'remaining_range_total',
     'unique_id': 'WBA00000000DEMO01-fuel_and_battery.remaining_range_total',
@@ -2741,6 +2789,7 @@
     'original_name': 'Climate status',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'climate_status',
     'unique_id': 'WBA00000000DEMO03-climate.activity',
@@ -2804,6 +2853,7 @@
     'original_name': 'Front left target pressure',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'front_left_target_pressure',
     'unique_id': 'WBA00000000DEMO03-tires.front_left.target_pressure',
@@ -2862,6 +2912,7 @@
     'original_name': 'Front left tire pressure',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'front_left_current_pressure',
     'unique_id': 'WBA00000000DEMO03-tires.front_left.current_pressure',
@@ -2920,6 +2971,7 @@
     'original_name': 'Front right target pressure',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'front_right_target_pressure',
     'unique_id': 'WBA00000000DEMO03-tires.front_right.target_pressure',
@@ -2978,6 +3030,7 @@
     'original_name': 'Front right tire pressure',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'front_right_current_pressure',
     'unique_id': 'WBA00000000DEMO03-tires.front_right.current_pressure',
@@ -3033,6 +3086,7 @@
     'original_name': 'Mileage',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'mileage',
     'unique_id': 'WBA00000000DEMO03-mileage',
@@ -3091,6 +3145,7 @@
     'original_name': 'Rear left target pressure',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'rear_left_target_pressure',
     'unique_id': 'WBA00000000DEMO03-tires.rear_left.target_pressure',
@@ -3149,6 +3204,7 @@
     'original_name': 'Rear left tire pressure',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'rear_left_current_pressure',
     'unique_id': 'WBA00000000DEMO03-tires.rear_left.current_pressure',
@@ -3207,6 +3263,7 @@
     'original_name': 'Rear right target pressure',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'rear_right_target_pressure',
     'unique_id': 'WBA00000000DEMO03-tires.rear_right.target_pressure',
@@ -3265,6 +3322,7 @@
     'original_name': 'Rear right tire pressure',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'rear_right_current_pressure',
     'unique_id': 'WBA00000000DEMO03-tires.rear_right.current_pressure',
@@ -3320,6 +3378,7 @@
     'original_name': 'Remaining fuel',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'remaining_fuel',
     'unique_id': 'WBA00000000DEMO03-fuel_and_battery.remaining_fuel',
@@ -3375,6 +3434,7 @@
     'original_name': 'Remaining fuel percent',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'remaining_fuel_percent',
     'unique_id': 'WBA00000000DEMO03-fuel_and_battery.remaining_fuel_percent',
@@ -3429,6 +3489,7 @@
     'original_name': 'Remaining range fuel',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'remaining_range_fuel',
     'unique_id': 'WBA00000000DEMO03-fuel_and_battery.remaining_range_fuel',
@@ -3484,6 +3545,7 @@
     'original_name': 'Remaining range total',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'remaining_range_total',
     'unique_id': 'WBA00000000DEMO03-fuel_and_battery.remaining_range_total',

tests/components/bmw_connected_drive/snapshots/test_switch.ambr

@@ -27,6 +27,7 @@
     'original_name': 'Climate',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'climate',
     'unique_id': 'WBA00000000DEMO02-climate',
@@ -74,6 +75,7 @@
     'original_name': 'Charging',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'charging',
     'unique_id': 'WBA00000000DEMO01-charging',
@@ -121,6 +123,7 @@
     'original_name': 'Climate',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'climate',
     'unique_id': 'WBA00000000DEMO01-climate',
@@ -168,6 +171,7 @@
     'original_name': 'Climate',
     'platform': 'bmw_connected_drive',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'climate',
     'unique_id': 'WBA00000000DEMO03-climate',

tests/components/bosch_alarm/snapshots/test_alarm_control_panel.ambr

@@ -27,6 +27,7 @@
     'original_name': None,
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <AlarmControlPanelEntityFeature: 3>,
     'translation_key': None,
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_area_1',
@@ -78,6 +79,7 @@
     'original_name': None,
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <AlarmControlPanelEntityFeature: 3>,
     'translation_key': None,
     'unique_id': '1234567890_area_1',
@@ -129,6 +131,7 @@
     'original_name': None,
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <AlarmControlPanelEntityFeature: 3>,
     'translation_key': None,
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_area_1',

tests/components/bosch_alarm/snapshots/test_binary_sensor.ambr

@@ -27,6 +27,7 @@
     'original_name': 'Area ready to arm away',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'area_ready_to_arm_away',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_area_1_ready_to_arm_away',
@@ -74,6 +75,7 @@
     'original_name': 'Area ready to arm home',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'area_ready_to_arm_home',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_area_1_ready_to_arm_home',
@@ -121,6 +123,7 @@
     'original_name': None,
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_point_6',
@@ -168,6 +171,7 @@
     'original_name': 'AC Failure',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'panel_fault_ac_fail',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_fault_panel_fault_ac_fail',
@@ -216,6 +220,7 @@
     'original_name': 'Battery',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_fault_panel_fault_battery_low',
@@ -264,6 +269,7 @@
     'original_name': 'Battery missing',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'panel_fault_battery_mising',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_fault_panel_fault_battery_mising',
@@ -312,6 +318,7 @@
     'original_name': 'CRC failure in panel configuration',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'panel_fault_parameter_crc_fail_in_pif',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_fault_panel_fault_parameter_crc_fail_in_pif',
@@ -360,6 +367,7 @@
     'original_name': 'Failure to call RPS since last RPS connection',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'panel_fault_fail_to_call_rps_since_rps_hang_up',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_fault_panel_fault_fail_to_call_rps_since_rps_hang_up',
@@ -407,6 +415,7 @@
     'original_name': 'Log overflow',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'panel_fault_log_overflow',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_fault_panel_fault_log_overflow',
@@ -455,6 +464,7 @@
     'original_name': 'Log threshold reached',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'panel_fault_log_threshold',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_fault_panel_fault_log_threshold',
@@ -503,6 +513,7 @@
     'original_name': 'Phone line failure',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'panel_fault_phone_line_failure',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_fault_panel_fault_phone_line_failure',
@@ -551,6 +562,7 @@
     'original_name': 'Point bus failure since last RPS connection',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'panel_fault_point_bus_fail_since_rps_hang_up',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_fault_panel_fault_point_bus_fail_since_rps_hang_up',
@@ -599,6 +611,7 @@
     'original_name': 'Problem',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'panel_fault_communication_fail_since_rps_hang_up',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_fault_panel_fault_communication_fail_since_rps_hang_up',
@@ -647,6 +660,7 @@
     'original_name': 'SDI failure since last RPS connection',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'panel_fault_sdi_fail_since_rps_hang_up',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_fault_panel_fault_sdi_fail_since_rps_hang_up',
@@ -695,6 +709,7 @@
     'original_name': 'User code tamper since last RPS connection',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'panel_fault_user_code_tamper_since_rps_hang_up',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_fault_panel_fault_user_code_tamper_since_rps_hang_up',
@@ -743,6 +758,7 @@
     'original_name': None,
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_point_3',
@@ -790,6 +806,7 @@
     'original_name': None,
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_point_1',
@@ -837,6 +854,7 @@
     'original_name': None,
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_point_5',
@@ -884,6 +902,7 @@
     'original_name': None,
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_point_2',
@@ -931,6 +950,7 @@
     'original_name': None,
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_point_4',
@@ -978,6 +998,7 @@
     'original_name': None,
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_point_0',
@@ -1025,6 +1046,7 @@
     'original_name': 'Area ready to arm away',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'area_ready_to_arm_away',
     'unique_id': '1234567890_area_1_ready_to_arm_away',
@@ -1072,6 +1094,7 @@
     'original_name': 'Area ready to arm home',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'area_ready_to_arm_home',
     'unique_id': '1234567890_area_1_ready_to_arm_home',
@@ -1119,6 +1142,7 @@
     'original_name': None,
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '1234567890_point_6',
@@ -1166,6 +1190,7 @@
     'original_name': 'AC Failure',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'panel_fault_ac_fail',
     'unique_id': '1234567890_fault_panel_fault_ac_fail',
@@ -1214,6 +1239,7 @@
     'original_name': 'Battery',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '1234567890_fault_panel_fault_battery_low',
@@ -1262,6 +1288,7 @@
     'original_name': 'Battery missing',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'panel_fault_battery_mising',
     'unique_id': '1234567890_fault_panel_fault_battery_mising',
@@ -1310,6 +1337,7 @@
     'original_name': 'CRC failure in panel configuration',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'panel_fault_parameter_crc_fail_in_pif',
     'unique_id': '1234567890_fault_panel_fault_parameter_crc_fail_in_pif',
@@ -1358,6 +1386,7 @@
     'original_name': 'Failure to call RPS since last RPS connection',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'panel_fault_fail_to_call_rps_since_rps_hang_up',
     'unique_id': '1234567890_fault_panel_fault_fail_to_call_rps_since_rps_hang_up',
@@ -1405,6 +1434,7 @@
     'original_name': 'Log overflow',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'panel_fault_log_overflow',
     'unique_id': '1234567890_fault_panel_fault_log_overflow',
@@ -1453,6 +1483,7 @@
     'original_name': 'Log threshold reached',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'panel_fault_log_threshold',
     'unique_id': '1234567890_fault_panel_fault_log_threshold',
@@ -1501,6 +1532,7 @@
     'original_name': 'Phone line failure',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'panel_fault_phone_line_failure',
     'unique_id': '1234567890_fault_panel_fault_phone_line_failure',
@@ -1549,6 +1581,7 @@
     'original_name': 'Point bus failure since last RPS connection',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'panel_fault_point_bus_fail_since_rps_hang_up',
     'unique_id': '1234567890_fault_panel_fault_point_bus_fail_since_rps_hang_up',
@@ -1597,6 +1630,7 @@
     'original_name': 'Problem',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'panel_fault_communication_fail_since_rps_hang_up',
     'unique_id': '1234567890_fault_panel_fault_communication_fail_since_rps_hang_up',
@@ -1645,6 +1679,7 @@
     'original_name': 'SDI failure since last RPS connection',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'panel_fault_sdi_fail_since_rps_hang_up',
     'unique_id': '1234567890_fault_panel_fault_sdi_fail_since_rps_hang_up',
@@ -1693,6 +1728,7 @@
     'original_name': 'User code tamper since last RPS connection',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'panel_fault_user_code_tamper_since_rps_hang_up',
     'unique_id': '1234567890_fault_panel_fault_user_code_tamper_since_rps_hang_up',
@@ -1741,6 +1777,7 @@
     'original_name': None,
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '1234567890_point_3',
@@ -1788,6 +1825,7 @@
     'original_name': None,
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '1234567890_point_1',
@@ -1835,6 +1873,7 @@
     'original_name': None,
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '1234567890_point_5',
@@ -1882,6 +1921,7 @@
     'original_name': None,
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '1234567890_point_2',
@@ -1929,6 +1969,7 @@
     'original_name': None,
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '1234567890_point_4',
@@ -1976,6 +2017,7 @@
     'original_name': None,
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '1234567890_point_0',
@@ -2023,6 +2065,7 @@
     'original_name': 'Area ready to arm away',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'area_ready_to_arm_away',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_area_1_ready_to_arm_away',
@@ -2070,6 +2113,7 @@
     'original_name': 'Area ready to arm home',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'area_ready_to_arm_home',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_area_1_ready_to_arm_home',
@@ -2117,6 +2161,7 @@
     'original_name': None,
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_point_6',
@@ -2164,6 +2209,7 @@
     'original_name': 'AC Failure',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'panel_fault_ac_fail',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_fault_panel_fault_ac_fail',
@@ -2212,6 +2258,7 @@
     'original_name': 'Battery',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_fault_panel_fault_battery_low',
@@ -2260,6 +2307,7 @@
     'original_name': 'Battery missing',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'panel_fault_battery_mising',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_fault_panel_fault_battery_mising',
@@ -2308,6 +2356,7 @@
     'original_name': 'CRC failure in panel configuration',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'panel_fault_parameter_crc_fail_in_pif',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_fault_panel_fault_parameter_crc_fail_in_pif',
@@ -2356,6 +2405,7 @@
     'original_name': 'Failure to call RPS since last RPS connection',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'panel_fault_fail_to_call_rps_since_rps_hang_up',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_fault_panel_fault_fail_to_call_rps_since_rps_hang_up',
@@ -2403,6 +2453,7 @@
     'original_name': 'Log overflow',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'panel_fault_log_overflow',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_fault_panel_fault_log_overflow',
@@ -2451,6 +2502,7 @@
     'original_name': 'Log threshold reached',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'panel_fault_log_threshold',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_fault_panel_fault_log_threshold',
@@ -2499,6 +2551,7 @@
     'original_name': 'Phone line failure',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'panel_fault_phone_line_failure',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_fault_panel_fault_phone_line_failure',
@@ -2547,6 +2600,7 @@
     'original_name': 'Point bus failure since last RPS connection',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'panel_fault_point_bus_fail_since_rps_hang_up',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_fault_panel_fault_point_bus_fail_since_rps_hang_up',
@@ -2595,6 +2649,7 @@
     'original_name': 'Problem',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'panel_fault_communication_fail_since_rps_hang_up',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_fault_panel_fault_communication_fail_since_rps_hang_up',
@@ -2643,6 +2698,7 @@
     'original_name': 'SDI failure since last RPS connection',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'panel_fault_sdi_fail_since_rps_hang_up',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_fault_panel_fault_sdi_fail_since_rps_hang_up',
@@ -2691,6 +2747,7 @@
     'original_name': 'User code tamper since last RPS connection',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'panel_fault_user_code_tamper_since_rps_hang_up',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_fault_panel_fault_user_code_tamper_since_rps_hang_up',
@@ -2739,6 +2796,7 @@
     'original_name': None,
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_point_3',
@@ -2786,6 +2844,7 @@
     'original_name': None,
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_point_1',
@@ -2833,6 +2892,7 @@
     'original_name': None,
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_point_5',
@@ -2880,6 +2940,7 @@
     'original_name': None,
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_point_2',
@@ -2927,6 +2988,7 @@
     'original_name': None,
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_point_4',
@@ -2974,6 +3036,7 @@
     'original_name': None,
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_point_0',

tests/components/bosch_alarm/snapshots/test_sensor.ambr

@@ -27,6 +27,7 @@
     'original_name': 'Burglary alarm issues',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'alarms_burglary',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_area_1_alarms_burglary',
@@ -74,6 +75,7 @@
     'original_name': 'Faulting points',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'faulting_points',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_area_1_faulting_points',
@@ -122,6 +124,7 @@
     'original_name': 'Fire alarm issues',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'alarms_fire',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_area_1_alarms_fire',
@@ -169,6 +172,7 @@
     'original_name': 'Gas alarm issues',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'alarms_gas',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_area_1_alarms_gas',
@@ -216,6 +220,7 @@
     'original_name': 'Burglary alarm issues',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'alarms_burglary',
     'unique_id': '1234567890_area_1_alarms_burglary',
@@ -263,6 +268,7 @@
     'original_name': 'Faulting points',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'faulting_points',
     'unique_id': '1234567890_area_1_faulting_points',
@@ -311,6 +317,7 @@
     'original_name': 'Fire alarm issues',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'alarms_fire',
     'unique_id': '1234567890_area_1_alarms_fire',
@@ -358,6 +365,7 @@
     'original_name': 'Gas alarm issues',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'alarms_gas',
     'unique_id': '1234567890_area_1_alarms_gas',
@@ -405,6 +413,7 @@
     'original_name': 'Burglary alarm issues',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'alarms_burglary',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_area_1_alarms_burglary',
@@ -452,6 +461,7 @@
     'original_name': 'Faulting points',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'faulting_points',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_area_1_faulting_points',
@@ -500,6 +510,7 @@
     'original_name': 'Fire alarm issues',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'alarms_fire',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_area_1_alarms_fire',
@@ -547,6 +558,7 @@
     'original_name': 'Gas alarm issues',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'alarms_gas',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_area_1_alarms_gas',

tests/components/bosch_alarm/snapshots/test_switch.ambr

@@ -27,6 +27,7 @@
     'original_name': 'Locked',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'locked',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_door_1_locked',
@@ -74,6 +75,7 @@
     'original_name': 'Momentarily unlocked',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'cycling',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_door_1_cycling',
@@ -121,6 +123,7 @@
     'original_name': 'Secured',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'secured',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_door_1_secured',
@@ -168,6 +171,7 @@
     'original_name': None,
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_output_1',
@@ -215,6 +219,7 @@
     'original_name': 'Locked',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'locked',
     'unique_id': '1234567890_door_1_locked',
@@ -262,6 +267,7 @@
     'original_name': 'Momentarily unlocked',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'cycling',
     'unique_id': '1234567890_door_1_cycling',
@@ -309,6 +315,7 @@
     'original_name': 'Secured',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'secured',
     'unique_id': '1234567890_door_1_secured',
@@ -356,6 +363,7 @@
     'original_name': None,
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '1234567890_output_1',
@@ -403,6 +411,7 @@
     'original_name': 'Locked',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'locked',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_door_1_locked',
@@ -450,6 +459,7 @@
     'original_name': 'Momentarily unlocked',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'cycling',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_door_1_cycling',
@@ -497,6 +507,7 @@
     'original_name': 'Secured',
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'secured',
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_door_1_secured',
@@ -544,6 +555,7 @@
     'original_name': None,
     'platform': 'bosch_alarm',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '01JQ917ACKQ33HHM7YCFXYZX51_output_1',

tests/components/bring/snapshots/test_event.ambr

@@ -33,6 +33,7 @@
     'original_name': 'Activities',
     'platform': 'bring',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'activities',
     'unique_id': '00000000-00000000-00000000-00000000_b4776778-7f6c-496e-951b-92a35d3db0dd_activities',
@@ -117,6 +118,7 @@
     'original_name': 'Activities',
     'platform': 'bring',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'activities',
     'unique_id': '00000000-00000000-00000000-00000000_e542eef6-dba7-4c31-a52c-29e6ab9d83a5_activities',

tests/components/bring/snapshots/test_sensor.ambr

@@ -27,6 +27,7 @@
     'original_name': 'Discount only',
     'platform': 'bring',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': <BringSensor.DISCOUNTED: 'discounted'>,
     'unique_id': '00000000-00000000-00000000-00000000_b4776778-7f6c-496e-951b-92a35d3db0dd_discounted',
@@ -81,6 +82,7 @@
     'original_name': 'List access',
     'platform': 'bring',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': <BringSensor.LIST_ACCESS: 'list_access'>,
     'unique_id': '00000000-00000000-00000000-00000000_b4776778-7f6c-496e-951b-92a35d3db0dd_list_access',
@@ -134,6 +136,7 @@
     'original_name': 'On occasion',
     'platform': 'bring',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': <BringSensor.CONVENIENT: 'convenient'>,
     'unique_id': '00000000-00000000-00000000-00000000_b4776778-7f6c-496e-951b-92a35d3db0dd_convenient',
@@ -205,6 +208,7 @@
     'original_name': 'Region & language',
     'platform': 'bring',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': <BringSensor.LIST_LANGUAGE: 'list_language'>,
     'unique_id': '00000000-00000000-00000000-00000000_b4776778-7f6c-496e-951b-92a35d3db0dd_list_language',
@@ -275,6 +279,7 @@
     'original_name': 'Urgent',
     'platform': 'bring',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': <BringSensor.URGENT: 'urgent'>,
     'unique_id': '00000000-00000000-00000000-00000000_b4776778-7f6c-496e-951b-92a35d3db0dd_urgent',
@@ -323,6 +328,7 @@
     'original_name': 'Discount only',
     'platform': 'bring',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': <BringSensor.DISCOUNTED: 'discounted'>,
     'unique_id': '00000000-00000000-00000000-00000000_e542eef6-dba7-4c31-a52c-29e6ab9d83a5_discounted',
@@ -377,6 +383,7 @@
     'original_name': 'List access',
     'platform': 'bring',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': <BringSensor.LIST_ACCESS: 'list_access'>,
     'unique_id': '00000000-00000000-00000000-00000000_e542eef6-dba7-4c31-a52c-29e6ab9d83a5_list_access',
@@ -430,6 +437,7 @@
     'original_name': 'On occasion',
     'platform': 'bring',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': <BringSensor.CONVENIENT: 'convenient'>,
     'unique_id': '00000000-00000000-00000000-00000000_e542eef6-dba7-4c31-a52c-29e6ab9d83a5_convenient',
@@ -501,6 +509,7 @@
     'original_name': 'Region & language',
     'platform': 'bring',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': <BringSensor.LIST_LANGUAGE: 'list_language'>,
     'unique_id': '00000000-00000000-00000000-00000000_e542eef6-dba7-4c31-a52c-29e6ab9d83a5_list_language',
@@ -571,6 +580,7 @@
     'original_name': 'Urgent',
     'platform': 'bring',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': <BringSensor.URGENT: 'urgent'>,
     'unique_id': '00000000-00000000-00000000-00000000_e542eef6-dba7-4c31-a52c-29e6ab9d83a5_urgent',

tests/components/bring/snapshots/test_todo.ambr

@@ -27,6 +27,7 @@
     'original_name': None,
     'platform': 'bring',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <TodoListEntityFeature: 71>,
     'translation_key': 'shopping_list',
     'unique_id': '00000000-00000000-00000000-00000000_b4776778-7f6c-496e-951b-92a35d3db0dd',
@@ -75,6 +76,7 @@
     'original_name': None,
     'platform': 'bring',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <TodoListEntityFeature: 71>,
     'translation_key': 'shopping_list',
     'unique_id': '00000000-00000000-00000000-00000000_e542eef6-dba7-4c31-a52c-29e6ab9d83a5',

tests/components/brother/snapshots/test_sensor.ambr

@@ -29,6 +29,7 @@
     'original_name': 'B/W pages',
     'platform': 'brother',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'bw_pages',
     'unique_id': '0123456789_bw_counter',
@@ -80,6 +81,7 @@
     'original_name': 'Belt unit remaining lifetime',
     'platform': 'brother',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'belt_unit_remaining_life',
     'unique_id': '0123456789_belt_unit_remaining_life',
@@ -131,6 +133,7 @@
     'original_name': 'Black drum page counter',
     'platform': 'brother',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'black_drum_page_counter',
     'unique_id': '0123456789_black_drum_counter',
@@ -182,6 +185,7 @@
     'original_name': 'Black drum remaining lifetime',
     'platform': 'brother',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'black_drum_remaining_life',
     'unique_id': '0123456789_black_drum_remaining_life',
@@ -233,6 +237,7 @@
     'original_name': 'Black drum remaining pages',
     'platform': 'brother',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'black_drum_remaining_pages',
     'unique_id': '0123456789_black_drum_remaining_pages',
@@ -284,6 +289,7 @@
     'original_name': 'Black toner remaining',
     'platform': 'brother',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'black_toner_remaining',
     'unique_id': '0123456789_black_toner_remaining',
@@ -335,6 +341,7 @@
     'original_name': 'Color pages',
     'platform': 'brother',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'color_pages',
     'unique_id': '0123456789_color_counter',
@@ -386,6 +393,7 @@
     'original_name': 'Cyan drum page counter',
     'platform': 'brother',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'cyan_drum_page_counter',
     'unique_id': '0123456789_cyan_drum_counter',
@@ -437,6 +445,7 @@
     'original_name': 'Cyan drum remaining lifetime',
     'platform': 'brother',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'cyan_drum_remaining_life',
     'unique_id': '0123456789_cyan_drum_remaining_life',
@@ -488,6 +497,7 @@
     'original_name': 'Cyan drum remaining pages',
     'platform': 'brother',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'cyan_drum_remaining_pages',
     'unique_id': '0123456789_cyan_drum_remaining_pages',
@@ -539,6 +549,7 @@
     'original_name': 'Cyan toner remaining',
     'platform': 'brother',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'cyan_toner_remaining',
     'unique_id': '0123456789_cyan_toner_remaining',
@@ -590,6 +601,7 @@
     'original_name': 'Drum page counter',
     'platform': 'brother',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'drum_page_counter',
     'unique_id': '0123456789_drum_counter',
@@ -641,6 +653,7 @@
     'original_name': 'Drum remaining lifetime',
     'platform': 'brother',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'drum_remaining_life',
     'unique_id': '0123456789_drum_remaining_life',
@@ -692,6 +705,7 @@
     'original_name': 'Drum remaining pages',
     'platform': 'brother',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'drum_remaining_pages',
     'unique_id': '0123456789_drum_remaining_pages',
@@ -743,6 +757,7 @@
     'original_name': 'Duplex unit page counter',
     'platform': 'brother',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'duplex_unit_page_counter',
     'unique_id': '0123456789_duplex_unit_pages_counter',
@@ -794,6 +809,7 @@
     'original_name': 'Fuser remaining lifetime',
     'platform': 'brother',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'fuser_remaining_life',
     'unique_id': '0123456789_fuser_remaining_life',
@@ -843,6 +859,7 @@
     'original_name': 'Last restart',
     'platform': 'brother',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'last_restart',
     'unique_id': '0123456789_uptime',
@@ -893,6 +910,7 @@
     'original_name': 'Magenta drum page counter',
     'platform': 'brother',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'magenta_drum_page_counter',
     'unique_id': '0123456789_magenta_drum_counter',
@@ -944,6 +962,7 @@
     'original_name': 'Magenta drum remaining lifetime',
     'platform': 'brother',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'magenta_drum_remaining_life',
     'unique_id': '0123456789_magenta_drum_remaining_life',
@@ -995,6 +1014,7 @@
     'original_name': 'Magenta drum remaining pages',
     'platform': 'brother',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'magenta_drum_remaining_pages',
     'unique_id': '0123456789_magenta_drum_remaining_pages',
@@ -1046,6 +1066,7 @@
     'original_name': 'Magenta toner remaining',
     'platform': 'brother',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'magenta_toner_remaining',
     'unique_id': '0123456789_magenta_toner_remaining',
@@ -1097,6 +1118,7 @@
     'original_name': 'Page counter',
     'platform': 'brother',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'page_counter',
     'unique_id': '0123456789_page_counter',
@@ -1148,6 +1170,7 @@
     'original_name': 'PF Kit 1 remaining lifetime',
     'platform': 'brother',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'pf_kit_1_remaining_life',
     'unique_id': '0123456789_pf_kit_1_remaining_life',
@@ -1197,6 +1220,7 @@
     'original_name': 'Status',
     'platform': 'brother',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'status',
     'unique_id': '0123456789_status',
@@ -1246,6 +1270,7 @@
     'original_name': 'Yellow drum page counter',
     'platform': 'brother',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'yellow_drum_page_counter',
     'unique_id': '0123456789_yellow_drum_counter',
@@ -1297,6 +1322,7 @@
     'original_name': 'Yellow drum remaining lifetime',
     'platform': 'brother',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'yellow_drum_remaining_life',
     'unique_id': '0123456789_yellow_drum_remaining_life',
@@ -1348,6 +1374,7 @@
     'original_name': 'Yellow drum remaining pages',
     'platform': 'brother',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'yellow_drum_remaining_pages',
     'unique_id': '0123456789_yellow_drum_remaining_pages',
@@ -1399,6 +1426,7 @@
     'original_name': 'Yellow toner remaining',
     'platform': 'brother',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'yellow_toner_remaining',
     'unique_id': '0123456789_yellow_toner_remaining',

tests/components/bryant_evolution/snapshots/test_climate.ambr

@@ -42,6 +42,7 @@
     'original_name': None,
     'platform': 'bryant_evolution',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <ClimateEntityFeature: 395>,
     'translation_key': None,
     'unique_id': '01J3XJZSTEF6G5V0QJX6HBC94T-S1-Z1',

tests/components/bsblan/snapshots/test_climate.ambr

@@ -39,6 +39,7 @@
     'original_name': None,
     'platform': 'bsblan',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <ClimateEntityFeature: 401>,
     'translation_key': None,
     'unique_id': '00:80:41:19:69:90-climate',
@@ -113,6 +114,7 @@
     'original_name': None,
     'platform': 'bsblan',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <ClimateEntityFeature: 401>,
     'translation_key': None,
     'unique_id': '00:80:41:19:69:90-climate',

tests/components/bsblan/snapshots/test_sensor.ambr

@@ -29,6 +29,7 @@
     'original_name': 'Current Temperature',
     'platform': 'bsblan',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'current_temperature',
     'unique_id': '00:80:41:19:69:90-current_temperature',
@@ -81,6 +82,7 @@
     'original_name': 'Outside Temperature',
     'platform': 'bsblan',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'outside_temperature',
     'unique_id': '00:80:41:19:69:90-outside_temperature',

tests/components/bsblan/snapshots/test_water_heater.ambr

@@ -35,6 +35,7 @@
     'original_name': None,
     'platform': 'bsblan',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <WaterHeaterEntityFeature: 3>,
     'translation_key': None,
     'unique_id': '00:80:41:19:69:90',

tests/components/cambridge_audio/snapshots/test_select.ambr

@@ -33,6 +33,7 @@
     'original_name': 'Audio output',
     'platform': 'cambridge_audio',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'audio_output',
     'unique_id': '0020c2d8-audio_output',
@@ -91,6 +92,7 @@
     'original_name': 'Control Bus mode',
     'platform': 'cambridge_audio',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'control_bus_mode',
     'unique_id': '0020c2d8-control_bus_mode',
@@ -149,6 +151,7 @@
     'original_name': 'Display brightness',
     'platform': 'cambridge_audio',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'display_brightness',
     'unique_id': '0020c2d8-display_brightness',

tests/components/cambridge_audio/snapshots/test_switch.ambr

@@ -27,6 +27,7 @@
     'original_name': 'Early update',
     'platform': 'cambridge_audio',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'early_update',
     'unique_id': '0020c2d8-early_update',
@@ -74,6 +75,7 @@
     'original_name': 'Pre-Amp',
     'platform': 'cambridge_audio',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'pre_amp',
     'unique_id': '0020c2d8-pre_amp',

tests/components/ccm15/snapshots/test_climate.ambr

@@ -49,6 +49,7 @@
     'original_name': None,
     'platform': 'ccm15',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <ClimateEntityFeature: 425>,
     'translation_key': None,
     'unique_id': '1.1.1.1.0',
@@ -105,6 +106,7 @@
     'original_name': None,
     'platform': 'ccm15',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <ClimateEntityFeature: 425>,
     'translation_key': None,
     'unique_id': '1.1.1.1.1',
@@ -241,6 +243,7 @@
     'original_name': None,
     'platform': 'ccm15',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <ClimateEntityFeature: 425>,
     'translation_key': None,
     'unique_id': '1.1.1.1.0',
@@ -297,6 +300,7 @@
     'original_name': None,
     'platform': 'ccm15',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <ClimateEntityFeature: 425>,
     'translation_key': None,
     'unique_id': '1.1.1.1.1',

tests/components/chacon_dio/snapshots/test_cover.ambr

@@ -27,6 +27,7 @@
     'original_name': None,
     'platform': 'chacon_dio',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <CoverEntityFeature: 15>,
     'translation_key': None,
     'unique_id': 'L4HActuator_idmock1',

tests/components/chacon_dio/snapshots/test_switch.ambr

@@ -27,6 +27,7 @@
     'original_name': None,
     'platform': 'chacon_dio',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'L4HActuator_idmock1',

tests/components/co2signal/snapshots/test_sensor.ambr

@@ -29,6 +29,7 @@
     'original_name': 'CO2 intensity',
     'platform': 'co2signal',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'carbon_intensity',
     'unique_id': '904a74160aa6f335526706bee85dfb83_co2intensity',
@@ -82,6 +83,7 @@
     'original_name': 'Grid fossil fuel percentage',
     'platform': 'co2signal',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'fossil_fuel_percentage',
     'unique_id': '904a74160aa6f335526706bee85dfb83_fossilFuelPercentage',

tests/components/comelit/snapshots/test_climate.ambr

@@ -40,6 +40,7 @@
     'original_name': None,
     'platform': 'comelit',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <ClimateEntityFeature: 401>,
     'translation_key': 'thermostat',
     'unique_id': 'serial_bridge_config_entry_id-0',

tests/components/comelit/snapshots/test_cover.ambr

@@ -27,6 +27,7 @@
     'original_name': None,
     'platform': 'comelit',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <CoverEntityFeature: 11>,
     'translation_key': None,
     'unique_id': 'serial_bridge_config_entry_id-0',

tests/components/comelit/snapshots/test_humidifier.ambr

@@ -34,6 +34,7 @@
     'original_name': 'Dehumidifier',
     'platform': 'comelit',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <HumidifierEntityFeature: 1>,
     'translation_key': 'dehumidifier',
     'unique_id': 'serial_bridge_config_entry_id-0-dehumidifier',
@@ -100,6 +101,7 @@
     'original_name': 'Humidifier',
     'platform': 'comelit',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <HumidifierEntityFeature: 1>,
     'translation_key': 'humidifier',
     'unique_id': 'serial_bridge_config_entry_id-0-humidifier',

tests/components/comelit/snapshots/test_light.ambr

@@ -31,6 +31,7 @@
     'original_name': None,
     'platform': 'comelit',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'serial_bridge_config_entry_id-0',

tests/components/comelit/snapshots/test_sensor.ambr

@@ -41,6 +41,7 @@
     'original_name': None,
     'platform': 'comelit',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'zone_status',
     'unique_id': 'vedo_config_entry_id-0',

tests/components/comelit/snapshots/test_switch.ambr

@@ -27,6 +27,7 @@
     'original_name': None,
     'platform': 'comelit',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'serial_bridge_config_entry_id-other-0',

tests/components/config/test_entity_registry.py

@@ -1,6 +1,7 @@
 """Test entity_registry API."""
 
 from datetime import datetime
+import logging
 
 from freezegun.api import FrozenDateTimeFactory
 import pytest
@@ -11,6 +12,7 @@ from homeassistant.const import ATTR_ICON, EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.device_registry import DeviceEntryDisabler
+from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.entity_registry import (
     RegistryEntryDisabler,
     RegistryEntryHider,
@@ -1288,3 +1290,170 @@ async def test_remove_non_existing_entity(
     msg = await client.receive_json()
 
     assert not msg["success"]
+
+
+_LOGGER = logging.getLogger(__name__)
+DOMAIN = "test_domain"
+
+
+async def test_get_automatic_entity_ids(
+    hass: HomeAssistant, client: MockHAClientWebSocket
+) -> None:
+    """Test get_automatic_entity_ids."""
+    mock_registry(
+        hass,
+        {
+            "test_domain.test_1": RegistryEntryWithDefaults(
+                entity_id="test_domain.test_1",
+                unique_id="uniq1",
+                platform="test_domain",
+            ),
+            "test_domain.test_2": RegistryEntryWithDefaults(
+                entity_id="test_domain.test_2",
+                unique_id="uniq2",
+                platform="test_domain",
+                suggested_object_id="collision",
+            ),
+            "test_domain.test_3": RegistryEntryWithDefaults(
+                entity_id="test_domain.test_3",
+                name="Name by User 3",
+                unique_id="uniq3",
+                platform="test_domain",
+                suggested_object_id="suggested_3",
+            ),
+            "test_domain.test_4": RegistryEntryWithDefaults(
+                entity_id="test_domain.test_4",
+                name="Name by User 4",
+                unique_id="uniq4",
+                platform="test_domain",
+            ),
+            "test_domain.test_5": RegistryEntryWithDefaults(
+                entity_id="test_domain.test_5",
+                unique_id="uniq5",
+                platform="test_domain",
+            ),
+            "test_domain.test_6": RegistryEntryWithDefaults(
+                entity_id="test_domain.test_6",
+                name="Test 6",
+                unique_id="uniq6",
+                platform="test_domain",
+            ),
+            "test_domain.test_7": RegistryEntryWithDefaults(
+                entity_id="test_domain.test_7",
+                unique_id="uniq7",
+                platform="test_domain",
+                suggested_object_id="test_7",
+            ),
+            "test_domain.not_unique": RegistryEntryWithDefaults(
+                entity_id="test_domain.not_unique",
+                unique_id="not_unique_1",
+                platform="test_domain",
+                suggested_object_id="not_unique",
+            ),
+            "test_domain.not_unique_2": RegistryEntryWithDefaults(
+                entity_id="test_domain.not_unique_2",
+                name="Not Unique",
+                unique_id="not_unique_2",
+                platform="test_domain",
+            ),
+            "test_domain.not_unique_3": RegistryEntryWithDefaults(
+                entity_id="test_domain.not_unique_3",
+                unique_id="not_unique_3",
+                platform="test_domain",
+                suggested_object_id="not_unique",
+            ),
+            "test_domain.also_not_unique_changed_1": RegistryEntryWithDefaults(
+                entity_id="test_domain.also_not_unique_changed_1",
+                unique_id="also_not_unique_1",
+                platform="test_domain",
+            ),
+            "test_domain.also_not_unique_changed_2": RegistryEntryWithDefaults(
+                entity_id="test_domain.also_not_unique_changed_2",
+                unique_id="also_not_unique_2",
+                platform="test_domain",
+            ),
+            "test_domain.collision": RegistryEntryWithDefaults(
+                entity_id="test_domain.collision",
+                unique_id="uniq_collision",
+                platform="test_platform",
+            ),
+        },
+    )
+
+    component = EntityComponent(_LOGGER, DOMAIN, hass)
+    await component.async_setup({})
+    entity2 = MockEntity(unique_id="uniq2", name="Entity Name 2")
+    entity3 = MockEntity(unique_id="uniq3", name="Entity Name 3")
+    entity4 = MockEntity(unique_id="uniq4", name="Entity Name 4")
+    entity5 = MockEntity(unique_id="uniq5", name="Entity Name 5")
+    entity6 = MockEntity(unique_id="uniq6", name="Entity Name 6")
+    entity7 = MockEntity(unique_id="uniq7", name="Entity Name 7")
+    entity8 = MockEntity(unique_id="not_unique_1", name="Entity Name 8")
+    entity9 = MockEntity(unique_id="not_unique_2", name="Entity Name 9")
+    entity10 = MockEntity(unique_id="not_unique_3", name="Not unique")
+    entity11 = MockEntity(unique_id="also_not_unique_1", name="Also not unique")
+    entity12 = MockEntity(unique_id="also_not_unique_2", name="Also not unique")
+    await component.async_add_entities(
+        [
+            entity2,
+            entity3,
+            entity4,
+            entity5,
+            entity6,
+            entity7,
+            entity8,
+            entity9,
+            entity10,
+            entity11,
+            entity12,
+        ]
+    )
+
+    await client.send_json_auto_id(
+        {
+            "type": "config/entity_registry/get_automatic_entity_ids",
+            "entity_ids": [
+                "test_domain.test_1",
+                "test_domain.test_2",
+                "test_domain.test_3",
+                "test_domain.test_4",
+                "test_domain.test_5",
+                "test_domain.test_6",
+                "test_domain.test_7",
+                "test_domain.not_unique",
+                "test_domain.not_unique_2",
+                "test_domain.not_unique_3",
+                "test_domain.also_not_unique_changed_1",
+                "test_domain.also_not_unique_changed_2",
+                "test_domain.unknown",
+            ],
+        }
+    )
+
+    msg = await client.receive_json()
+
+    assert msg["success"]
+    assert msg["result"] == {
+        # No entity object for test_domain.test_1
+        "test_domain.test_1": None,
+        # The suggested_object_id is taken, fall back to suggested_object_id + _2
+        "test_domain.test_2": "test_domain.collision_2",
+        # name set by user has higher priority than suggested_object_id or entity
+        "test_domain.test_3": "test_domain.name_by_user_3",
+        # name set by user has higher priority than entity properties
+        "test_domain.test_4": "test_domain.name_by_user_4",
+        # No suggested_object_id or name, fall back to entity properties
+        "test_domain.test_5": "test_domain.entity_name_5",
+        # automatic entity id matches current entity id
+        "test_domain.test_6": "test_domain.test_6",
+        "test_domain.test_7": "test_domain.test_7",
+        # colliding entity ids keep current entity id
+        "test_domain.not_unique": "test_domain.not_unique",
+        "test_domain.not_unique_2": "test_domain.not_unique_2",
+        "test_domain.not_unique_3": "test_domain.not_unique_3",
+        # Don't reuse entity id
+        "test_domain.also_not_unique_changed_1": "test_domain.also_not_unique",
+        "test_domain.also_not_unique_changed_2": "test_domain.also_not_unique_2",
+        # no test_domain.unknown in registry
+        "test_domain.unknown": None,
+    }

tests/components/cookidoo/snapshots/test_button.ambr

@@ -27,6 +27,7 @@
     'original_name': 'Clear shopping list and additional purchases',
     'platform': 'cookidoo',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'todo_clear',
     'unique_id': 'sub_uuid_todo_clear',

tests/components/cookidoo/snapshots/test_sensor.ambr

@@ -33,6 +33,7 @@
     'original_name': 'Subscription',
     'platform': 'cookidoo',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': <CookidooSensor.SUBSCRIPTION: 'subscription'>,
     'unique_id': 'sub_uuid_subscription',
@@ -86,6 +87,7 @@
     'original_name': 'Subscription expiration date',
     'platform': 'cookidoo',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': <CookidooSensor.EXPIRES: 'expires'>,
     'unique_id': 'sub_uuid_expires',

tests/components/cookidoo/snapshots/test_todo.ambr

@@ -27,6 +27,7 @@
     'original_name': 'Additional purchases',
     'platform': 'cookidoo',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <TodoListEntityFeature: 7>,
     'translation_key': 'additional_item_list',
     'unique_id': 'sub_uuid_additional_items',
@@ -75,6 +76,7 @@
     'original_name': 'Shopping list',
     'platform': 'cookidoo',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <TodoListEntityFeature: 4>,
     'translation_key': 'ingredient_list',
     'unique_id': 'sub_uuid_ingredients',

tests/components/deako/snapshots/test_light.ambr

@@ -31,6 +31,7 @@
     'original_name': None,
     'platform': 'deako',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'uuid',
@@ -88,6 +89,7 @@
     'original_name': None,
     'platform': 'deako',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'uuid',
@@ -144,6 +146,7 @@
     'original_name': None,
     'platform': 'deako',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'some_device',

tests/components/deconz/snapshots/test_alarm_control_panel.ambr

@@ -27,6 +27,7 @@
     'original_name': 'Keypad',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <AlarmControlPanelEntityFeature: 7>,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:00-00',

tests/components/deconz/snapshots/test_binary_sensor.ambr

@@ -27,6 +27,7 @@
     'original_name': 'Alarm 10',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:15:8d:00:02:b5:d1:80-01-0500-alarm',
@@ -77,6 +78,7 @@
     'original_name': 'Cave CO',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:15:8d:00:02:a5:21:24-01-0101-carbon_monoxide',
@@ -126,6 +128,7 @@
     'original_name': 'Cave CO Low Battery',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:15:8d:00:02:a5:21:24-01-0101-low_battery',
@@ -174,6 +177,7 @@
     'original_name': 'Cave CO Tampered',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:15:8d:00:02:a5:21:24-01-0101-tampered',
@@ -222,6 +226,7 @@
     'original_name': 'Presence sensor',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:00-00-presence',
@@ -273,6 +278,7 @@
     'original_name': 'Presence sensor Low Battery',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:00-00-low_battery',
@@ -321,6 +327,7 @@
     'original_name': 'Presence sensor Tampered',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:00-00-tampered',
@@ -369,6 +376,7 @@
     'original_name': 'sensor_kitchen_smoke',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:15:8d:00:01:d9:3e:7c-01-0500-fire',
@@ -418,6 +426,7 @@
     'original_name': 'sensor_kitchen_smoke Test Mode',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:15:8d:00:01:d9:3e:7c-01-0500-in_test_mode',
@@ -466,6 +475,7 @@
     'original_name': 'sensor_kitchen_smoke',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:15:8d:00:01:d9:3e:7c-01-0500-fire',
@@ -515,6 +525,7 @@
     'original_name': 'sensor_kitchen_smoke Test Mode',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:15:8d:00:01:d9:3e:7c-01-0500-in_test_mode',
@@ -563,6 +574,7 @@
     'original_name': 'Kitchen Switch',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'kitchen-switch-flag',
@@ -611,6 +623,7 @@
     'original_name': 'Back Door',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:15:8d:00:02:2b:96:b4-01-0006-open',
@@ -661,6 +674,7 @@
     'original_name': 'Motion sensor 4',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:17:88:01:03:28:8c:9b-02-0406-presence',
@@ -711,6 +725,7 @@
     'original_name': 'water2',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:15:8d:00:02:2f:07:db-01-0500-water',
@@ -761,6 +776,7 @@
     'original_name': 'water2 Low Battery',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:15:8d:00:02:2f:07:db-01-0500-low_battery',
@@ -809,6 +825,7 @@
     'original_name': 'water2 Tampered',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:15:8d:00:02:2f:07:db-01-0500-tampered',
@@ -857,6 +874,7 @@
     'original_name': 'Vibration 1',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:15:8d:00:02:a5:21:24-01-0101-vibration',
@@ -914,6 +932,7 @@
     'original_name': 'Presence sensor',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:00-00-presence',
@@ -965,6 +984,7 @@
     'original_name': 'Presence sensor Low Battery',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:00-00-low_battery',
@@ -1013,6 +1033,7 @@
     'original_name': 'Presence sensor Tampered',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:00-00-tampered',

tests/components/deconz/snapshots/test_button.ambr

@@ -27,6 +27,7 @@
     'original_name': 'Scene Store Current Scene',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '01234E56789A/groups/1/scenes/1-store',
@@ -75,6 +76,7 @@
     'original_name': 'Aqara FP1 Reset Presence',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'xx:xx:xx:xx:xx:xx:xx:xx-01-0406-reset_presence',

tests/components/deconz/snapshots/test_climate.ambr

@@ -45,6 +45,7 @@
     'original_name': 'Zen-01',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <ClimateEntityFeature: 393>,
     'translation_key': None,
     'unique_id': '00:24:46:00:00:11:6f:56-01-0201',
@@ -133,6 +134,7 @@
     'original_name': 'Zen-01',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <ClimateEntityFeature: 393>,
     'translation_key': None,
     'unique_id': '00:24:46:00:00:11:6f:56-01-0201',
@@ -230,6 +232,7 @@
     'original_name': 'Zen-01',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <ClimateEntityFeature: 409>,
     'translation_key': None,
     'unique_id': '00:24:46:00:00:11:6f:56-01-0201',
@@ -318,6 +321,7 @@
     'original_name': 'Thermostat',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <ClimateEntityFeature: 385>,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:00-00',
@@ -385,6 +389,7 @@
     'original_name': 'CLIP thermostat',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <ClimateEntityFeature: 385>,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:02-00',
@@ -451,6 +456,7 @@
     'original_name': 'Thermostat',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <ClimateEntityFeature: 385>,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:00-00',
@@ -518,6 +524,7 @@
     'original_name': 'thermostat',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <ClimateEntityFeature: 385>,
     'translation_key': None,
     'unique_id': '14:b4:57:ff:fe:d5:4e:77-01-0201',

tests/components/deconz/snapshots/test_cover.ambr

@@ -27,6 +27,7 @@
     'original_name': 'Window covering device',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <CoverEntityFeature: 15>,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:01-00',
@@ -77,6 +78,7 @@
     'original_name': 'Vent',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <CoverEntityFeature: 255>,
     'translation_key': None,
     'unique_id': '00:22:a3:00:00:00:00:00-01',
@@ -128,6 +130,7 @@
     'original_name': 'Covering device',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <CoverEntityFeature: 255>,
     'translation_key': None,
     'unique_id': '00:24:46:00:00:12:34:56-01',

tests/components/deconz/snapshots/test_fan.ambr

@@ -29,6 +29,7 @@
     'original_name': 'Ceiling fan',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <FanEntityFeature: 49>,
     'translation_key': None,
     'unique_id': '00:22:a3:00:00:27:8b:81-01',

tests/components/deconz/snapshots/test_light.ambr

@@ -31,6 +31,7 @@
     'original_name': 'Dimmable light',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <LightEntityFeature: 40>,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:02-00',
@@ -97,6 +98,7 @@
     'original_name': None,
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <LightEntityFeature: 44>,
     'translation_key': None,
     'unique_id': '01234E56789A-/groups/0',
@@ -183,6 +185,7 @@
     'original_name': 'RGB light',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <LightEntityFeature: 44>,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:00-00',
@@ -262,6 +265,7 @@
     'original_name': 'Tunable white light',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:01-00',
@@ -339,6 +343,7 @@
     'original_name': 'Dimmable light',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <LightEntityFeature: 40>,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:02-00',
@@ -405,6 +410,7 @@
     'original_name': None,
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <LightEntityFeature: 44>,
     'translation_key': None,
     'unique_id': '01234E56789A-/groups/0',
@@ -491,6 +497,7 @@
     'original_name': 'RGB light',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <LightEntityFeature: 44>,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:00-00',
@@ -570,6 +577,7 @@
     'original_name': 'Tunable white light',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:01-00',
@@ -647,6 +655,7 @@
     'original_name': 'Dimmable light',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <LightEntityFeature: 40>,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:02-00',
@@ -713,6 +722,7 @@
     'original_name': None,
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <LightEntityFeature: 44>,
     'translation_key': None,
     'unique_id': '01234E56789A-/groups/0',
@@ -799,6 +809,7 @@
     'original_name': 'RGB light',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <LightEntityFeature: 44>,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:00-00',
@@ -878,6 +889,7 @@
     'original_name': 'Tunable white light',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:01-00',
@@ -964,6 +976,7 @@
     'original_name': 'Hue Go',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <LightEntityFeature: 44>,
     'translation_key': None,
     'unique_id': '00:17:88:01:01:23:45:67-00',
@@ -1056,6 +1069,7 @@
     'original_name': 'Hue Ensis',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <LightEntityFeature: 44>,
     'translation_key': None,
     'unique_id': '00:17:88:01:01:23:45:67-01',
@@ -1157,6 +1171,7 @@
     'original_name': 'LIDL xmas light',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <LightEntityFeature: 44>,
     'translation_key': None,
     'unique_id': '58:8e:81:ff:fe:db:7b:be-01',
@@ -1251,6 +1266,7 @@
     'original_name': 'Hue White Ambiance',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <LightEntityFeature: 40>,
     'translation_key': None,
     'unique_id': '00:17:88:01:01:23:45:67-02',
@@ -1328,6 +1344,7 @@
     'original_name': 'Hue Filament',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <LightEntityFeature: 40>,
     'translation_key': None,
     'unique_id': '00:17:88:01:01:23:45:67-03',
@@ -1386,6 +1403,7 @@
     'original_name': 'Simple Light',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:15:8d:00:01:23:45:67-01',
@@ -1457,6 +1475,7 @@
     'original_name': 'Gradient light',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': <LightEntityFeature: 44>,
     'translation_key': None,
     'unique_id': '00:17:88:01:0b:0c:0d:0e-0f',

tests/components/deconz/snapshots/test_number.ambr

@@ -32,6 +32,7 @@
     'original_name': 'Presence sensor Delay',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:00-00-delay',
@@ -88,6 +89,7 @@
     'original_name': 'Presence sensor Duration',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:00-00-duration',

tests/components/deconz/snapshots/test_scene.ambr

@@ -27,6 +27,7 @@
     'original_name': 'Scene',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '01234E56789A/groups/1/scenes/1',

tests/components/deconz/snapshots/test_select.ambr

@@ -32,6 +32,7 @@
     'original_name': 'Aqara FP1 Device Mode',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'xx:xx:xx:xx:xx:xx:xx:xx-01-0406-device_mode',
@@ -89,6 +90,7 @@
     'original_name': 'Aqara FP1 Sensitivity',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'xx:xx:xx:xx:xx:xx:xx:xx-01-0406-sensitivity',
@@ -147,6 +149,7 @@
     'original_name': 'Aqara FP1 Trigger Distance',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'xx:xx:xx:xx:xx:xx:xx:xx-01-0406-trigger_distance',
@@ -204,6 +207,7 @@
     'original_name': 'Aqara FP1 Device Mode',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'xx:xx:xx:xx:xx:xx:xx:xx-01-0406-device_mode',
@@ -261,6 +265,7 @@
     'original_name': 'Aqara FP1 Sensitivity',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'xx:xx:xx:xx:xx:xx:xx:xx-01-0406-sensitivity',
@@ -319,6 +324,7 @@
     'original_name': 'Aqara FP1 Trigger Distance',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'xx:xx:xx:xx:xx:xx:xx:xx-01-0406-trigger_distance',
@@ -376,6 +382,7 @@
     'original_name': 'Aqara FP1 Device Mode',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'xx:xx:xx:xx:xx:xx:xx:xx-01-0406-device_mode',
@@ -433,6 +440,7 @@
     'original_name': 'Aqara FP1 Sensitivity',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'xx:xx:xx:xx:xx:xx:xx:xx-01-0406-sensitivity',
@@ -491,6 +499,7 @@
     'original_name': 'Aqara FP1 Trigger Distance',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'xx:xx:xx:xx:xx:xx:xx:xx-01-0406-trigger_distance',
@@ -553,6 +562,7 @@
     'original_name': 'IKEA Starkvind Fan Mode',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '0c:43:14:ff:fe:6c:20:12-01-fc7d-fan_mode',

tests/components/deconz/snapshots/test_sensor.ambr

@@ -27,6 +27,7 @@
     'original_name': 'CLIP Flur',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '/sensors/3-status',
@@ -77,6 +78,7 @@
     'original_name': 'CLIP light level sensor',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:01-00-light_level',
@@ -129,6 +131,7 @@
     'original_name': 'Light level sensor',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:00-00-light_level',
@@ -184,6 +187,7 @@
     'original_name': 'Light level sensor Temperature',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:00-00-internal_temperature',
@@ -234,6 +238,7 @@
     'original_name': 'BOSCH Air quality sensor',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:12:4b:00:14:4d:00:07-02-fdef-air_quality',
@@ -283,6 +288,7 @@
     'original_name': 'BOSCH Air quality sensor PPB',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:12:4b:00:14:4d:00:07-02-fdef-air_quality_ppb',
@@ -332,6 +338,7 @@
     'original_name': 'BOSCH Air quality sensor',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:12:4b:00:14:4d:00:07-02-fdef-air_quality',
@@ -381,6 +388,7 @@
     'original_name': 'BOSCH Air quality sensor PPB',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:12:4b:00:14:4d:00:07-02-fdef-air_quality_ppb',
@@ -430,6 +438,7 @@
     'original_name': 'FSM_STATE Motion stair',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'fsm-state-1520195376277-status',
@@ -483,6 +492,7 @@
     'original_name': 'Mi temperature 1',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:15:8d:00:02:45:dc:53-01-0405-humidity',
@@ -536,6 +546,7 @@
     'original_name': 'Mi temperature 1 Battery',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:15:8d:00:02:45:dc:53-01-0405-battery',
@@ -592,6 +603,7 @@
     'original_name': 'Soil Sensor',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'a4:c1:38:fe:86:8f:07:a3-01-0408-moisture',
@@ -644,6 +656,7 @@
     'original_name': 'Soil Sensor Battery',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'a4:c1:38:fe:86:8f:07:a3-01-0408-battery',
@@ -697,6 +710,7 @@
     'original_name': 'Motion sensor 4',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:17:88:01:03:28:8c:9b-02-0400-light_level',
@@ -752,6 +766,7 @@
     'original_name': 'Motion sensor 4 Battery',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:17:88:01:03:28:8c:9b-02-0400-battery',
@@ -807,6 +822,7 @@
     'original_name': 'STARKVIND AirPurifier PM25',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'xx:xx:xx:xx:xx:xx:xx:xx-01-042a-particulate_matter_pm2_5',
@@ -859,6 +875,7 @@
     'original_name': 'Power 16',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:0d:6f:00:0b:7a:64:29-01-0b04-power',
@@ -914,6 +931,7 @@
     'original_name': 'Mi temperature 1',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:15:8d:00:02:45:dc:53-01-0403-pressure',
@@ -967,6 +985,7 @@
     'original_name': 'Mi temperature 1 Battery',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:15:8d:00:02:45:dc:53-01-0403-battery',
@@ -1023,6 +1042,7 @@
     'original_name': 'Mi temperature 1',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:15:8d:00:02:45:dc:53-01-0402-temperature',
@@ -1076,6 +1096,7 @@
     'original_name': 'Mi temperature 1 Battery',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:15:8d:00:02:45:dc:53-01-0402-battery',
@@ -1127,6 +1148,7 @@
     'original_name': 'eTRV Séjour',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'cc:cc:cc:ff:fe:38:4d:b3-01-000a-last_set',
@@ -1177,6 +1199,7 @@
     'original_name': 'eTRV Séjour Battery',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'cc:cc:cc:ff:fe:38:4d:b3-01-000a-battery',
@@ -1230,6 +1253,7 @@
     'original_name': 'Alarm 10 Battery',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:15:8d:00:02:b5:d1:80-01-0500-battery',
@@ -1284,6 +1308,7 @@
     'original_name': 'Alarm 10 Temperature',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:15:8d:00:02:b5:d1:80-01-0500-internal_temperature',
@@ -1336,6 +1361,7 @@
     'original_name': 'AirQuality 1 CH2O',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:01-02-0113-air_quality_formaldehyde',
@@ -1388,6 +1414,7 @@
     'original_name': 'AirQuality 1 CO2',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:01-02-0113-air_quality_co2',
@@ -1440,6 +1467,7 @@
     'original_name': 'AirQuality 1 PM25',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:01-02-0113-air_quality_pm2_5',
@@ -1492,6 +1520,7 @@
     'original_name': 'AirQuality 1 PPB',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:01-02-0113-air_quality_ppb',
@@ -1543,6 +1572,7 @@
     'original_name': 'Dimmer switch 3 Battery',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:17:88:01:02:0e:32:a3-02-fc00-battery',
@@ -1601,6 +1631,7 @@
     'original_name': 'IKEA Starkvind Filter time',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '0c:43:14:ff:fe:6c:20:12-01-fc7d-air_purifier_filter_run_time',
@@ -1652,6 +1683,7 @@
     'original_name': 'AirQuality 1 CH2O',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:01-02-0113-air_quality_formaldehyde',
@@ -1704,6 +1736,7 @@
     'original_name': 'AirQuality 1 CO2',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:01-02-0113-air_quality_co2',
@@ -1756,6 +1789,7 @@
     'original_name': 'AirQuality 1 PM25',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:01-02-0113-air_quality_pm2_5',
@@ -1808,6 +1842,7 @@
     'original_name': 'AirQuality 1 PPB',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:01-02-0113-air_quality_ppb',
@@ -1859,6 +1894,7 @@
     'original_name': 'AirQuality 1 CH2O',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:01-02-0113-air_quality_formaldehyde',
@@ -1911,6 +1947,7 @@
     'original_name': 'AirQuality 1 CO2',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:01-02-0113-air_quality_co2',
@@ -1963,6 +2000,7 @@
     'original_name': 'AirQuality 1 PM25',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:01-02-0113-air_quality_pm2_5',
@@ -2015,6 +2053,7 @@
     'original_name': 'AirQuality 1 PPB',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:00:00:00:00:00:00:01-02-0113-air_quality_ppb',
@@ -2066,6 +2105,7 @@
     'original_name': 'FYRTUR block-out roller blind Battery',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:0d:6f:ff:fe:01:23:45-01-0001-battery',
@@ -2119,6 +2159,7 @@
     'original_name': 'CarbonDioxide 35',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'xx:xx:xx:xx:xx:xx:xx:xx-01-040d-carbon_dioxide',
@@ -2171,6 +2212,7 @@
     'original_name': 'Consumption 15',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '00:0d:6f:00:0b:7a:64:29-01-0702-consumption',
@@ -2223,6 +2265,7 @@
     'original_name': 'Daylight',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': '01:23:4E:FF:FF:56:78:9A-01-daylight_status',
@@ -2275,6 +2318,7 @@
     'original_name': 'Formaldehyde 34',
     'platform': 'deconz',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'xx:xx:xx:xx:xx:xx:xx:xx-01-042b-formaldehyde',

tests/components/devolo_home_control/snapshots/test_binary_sensor.ambr

@@ -41,6 +41,7 @@
     'original_name': 'Door',
     'platform': 'devolo_home_control',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': None,
     'unique_id': 'Test',
@@ -89,6 +90,7 @@
     'original_name': 'Overload',
     'platform': 'devolo_home_control',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'overload',
     'unique_id': 'Overload',
@@ -136,6 +138,7 @@
     'original_name': 'Button 1',
     'platform': 'devolo_home_control',
     'previous_unique_id': None,
+    'suggested_object_id': None,
     'supported_features': 0,
     'translation_key': 'button',
     'unique_id': 'Test_1',