From eb89ce47ea04578ae60337321d7873dd9c1e882b Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Tue, 18 Jun 2024 02:08:08 -0400 Subject: [PATCH] Inline primary integration (#119860) --- homeassistant/components/logbook/helpers.py | 2 +- homeassistant/components/unifiprotect/data.py | 2 +- homeassistant/helpers/device_registry.py | 62 +- homeassistant/helpers/entity_platform.py | 1 - .../airgradient/snapshots/test_init.ambr | 1 - .../aosmith/snapshots/test_device.ambr | 1 - .../components/config/test_device_registry.py | 13 +- .../snapshots/test_init.ambr | 1 - .../ecovacs/snapshots/test_init.ambr | 1 - .../elgato/snapshots/test_button.ambr | 2 - .../elgato/snapshots/test_light.ambr | 3 - .../elgato/snapshots/test_sensor.ambr | 5 - .../elgato/snapshots/test_switch.ambr | 2 - .../energyzero/snapshots/test_sensor.ambr | 6 - .../snapshots/test_diagnostics.ambr | 2 - .../snapshots/test_init.ambr | 1 - .../snapshots/test_init.ambr | 1488 ++++++++--------- .../homekit_controller/test_connection.py | 2 +- .../homewizard/snapshots/test_button.ambr | 1 - .../homewizard/snapshots/test_number.ambr | 2 - .../homewizard/snapshots/test_sensor.ambr | 218 --- .../homewizard/snapshots/test_switch.ambr | 11 - .../snapshots/test_init.ambr | 1 - tests/components/hyperion/test_camera.py | 2 +- tests/components/hyperion/test_light.py | 2 +- tests/components/hyperion/test_sensor.py | 2 +- tests/components/hyperion/test_switch.py | 2 +- .../ista_ecotrend/snapshots/test_init.ambr | 2 - .../kitchen_sink/snapshots/test_switch.ambr | 4 - .../lamarzocco/snapshots/test_switch.ambr | 1 - tests/components/lifx/test_migration.py | 6 +- .../components/lutron_caseta/test_logbook.py | 2 +- tests/components/motioneye/test_camera.py | 2 +- tests/components/mqtt/test_discovery.py | 16 +- tests/components/mqtt/test_tag.py | 4 +- .../netatmo/snapshots/test_init.ambr | 38 - .../netgear_lte/snapshots/test_init.ambr | 1 - .../ondilo_ico/snapshots/test_init.ambr | 2 - .../onewire/snapshots/test_binary_sensor.ambr | 22 - .../onewire/snapshots/test_sensor.ambr | 22 - .../onewire/snapshots/test_switch.ambr | 22 - .../renault/snapshots/test_binary_sensor.ambr | 8 - .../renault/snapshots/test_button.ambr | 8 - .../snapshots/test_device_tracker.ambr | 8 - .../renault/snapshots/test_select.ambr | 8 - .../renault/snapshots/test_sensor.ambr | 8 - .../components/rova/snapshots/test_init.ambr | 1 - .../sfr_box/snapshots/test_binary_sensor.ambr | 2 - .../sfr_box/snapshots/test_button.ambr | 1 - .../sfr_box/snapshots/test_sensor.ambr | 1 - .../snapshots/test_binary_sensor.ambr | 2 - .../tailwind/snapshots/test_button.ambr | 1 - .../tailwind/snapshots/test_cover.ambr | 2 - .../tailwind/snapshots/test_number.ambr | 1 - tests/components/tasmota/test_discovery.py | 8 +- .../components/tedee/snapshots/test_init.ambr | 1 - .../components/tedee/snapshots/test_lock.ambr | 2 - .../teslemetry/snapshots/test_init.ambr | 4 - .../twentemilieu/snapshots/test_calendar.ambr | 1 - .../twentemilieu/snapshots/test_sensor.ambr | 5 - .../uptime/snapshots/test_sensor.ambr | 1 - .../components/vesync/snapshots/test_fan.ambr | 9 - .../vesync/snapshots/test_light.ambr | 9 - .../vesync/snapshots/test_sensor.ambr | 9 - .../vesync/snapshots/test_switch.ambr | 9 - .../whois/snapshots/test_sensor.ambr | 9 - .../wled/snapshots/test_binary_sensor.ambr | 1 - .../wled/snapshots/test_button.ambr | 1 - .../wled/snapshots/test_number.ambr | 2 - .../wled/snapshots/test_select.ambr | 4 - .../wled/snapshots/test_switch.ambr | 4 - tests/helpers/test_device_registry.py | 84 +- tests/helpers/test_entity_platform.py | 1 - tests/helpers/test_entity_registry.py | 8 +- 74 files changed, 787 insertions(+), 1416 deletions(-) diff --git a/homeassistant/components/logbook/helpers.py b/homeassistant/components/logbook/helpers.py index 4fa0da9033a..674f1643793 100644 --- a/homeassistant/components/logbook/helpers.py +++ b/homeassistant/components/logbook/helpers.py @@ -58,7 +58,7 @@ def _async_config_entries_for_ids( dev_reg = dr.async_get(hass) for device_id in device_ids: if (device := dev_reg.async_get(device_id)) and device.config_entries: - config_entry_ids |= device.config_entries + config_entry_ids.update(device.config_entries) return config_entry_ids diff --git a/homeassistant/components/unifiprotect/data.py b/homeassistant/components/unifiprotect/data.py index 2c1f447229a..75c850702f3 100644 --- a/homeassistant/components/unifiprotect/data.py +++ b/homeassistant/components/unifiprotect/data.py @@ -337,7 +337,7 @@ class ProtectData: @callback def async_ufp_instance_for_config_entry_ids( - hass: HomeAssistant, config_entry_ids: set[str] + hass: HomeAssistant, config_entry_ids: list[str] ) -> ProtectApiClient | None: """Find the UFP instance for the config entry ids.""" return next( diff --git a/homeassistant/helpers/device_registry.py b/homeassistant/helpers/device_registry.py index 324d5ed89a6..2a90d885d70 100644 --- a/homeassistant/helpers/device_registry.py +++ b/homeassistant/helpers/device_registry.py @@ -244,11 +244,10 @@ class DeviceEntry: """Device Registry Entry.""" area_id: str | None = attr.ib(default=None) - config_entries: set[str] = attr.ib(converter=set, factory=set) + config_entries: list[str] = attr.ib(factory=list) configuration_url: str | None = attr.ib(default=None) connections: set[tuple[str, str]] = attr.ib(converter=set, factory=set) disabled_by: DeviceEntryDisabler | None = attr.ib(default=None) - primary_integration: str | None = attr.ib(default=None) entry_type: DeviceEntryType | None = attr.ib(default=None) hw_version: str | None = attr.ib(default=None) id: str = attr.ib(factory=uuid_util.random_uuid_hex) @@ -279,7 +278,7 @@ class DeviceEntry: return { "area_id": self.area_id, "configuration_url": self.configuration_url, - "config_entries": list(self.config_entries), + "config_entries": self.config_entries, "connections": list(self.connections), "disabled_by": self.disabled_by, "entry_type": self.entry_type, @@ -291,7 +290,6 @@ class DeviceEntry: "model": self.model, "name_by_user": self.name_by_user, "name": self.name, - "primary_integration": self.primary_integration, "serial_number": self.serial_number, "sw_version": self.sw_version, "via_device_id": self.via_device_id, @@ -320,7 +318,7 @@ class DeviceEntry: json_bytes( { "area_id": self.area_id, - "config_entries": list(self.config_entries), + "config_entries": self.config_entries, "configuration_url": self.configuration_url, "connections": list(self.connections), "disabled_by": self.disabled_by, @@ -345,7 +343,7 @@ class DeviceEntry: class DeletedDeviceEntry: """Deleted Device Registry Entry.""" - config_entries: set[str] = attr.ib() + config_entries: list[str] = attr.ib() connections: set[tuple[str, str]] = attr.ib() identifiers: set[tuple[str, str]] = attr.ib() id: str = attr.ib() @@ -360,7 +358,7 @@ class DeletedDeviceEntry: """Create DeviceEntry from DeletedDeviceEntry.""" return DeviceEntry( # type ignores: likely https://github.com/python/mypy/issues/8625 - config_entries={config_entry_id}, # type: ignore[arg-type] + config_entries=[config_entry_id], connections=self.connections & connections, # type: ignore[arg-type] identifiers=self.identifiers & identifiers, # type: ignore[arg-type] id=self.id, @@ -373,7 +371,7 @@ class DeletedDeviceEntry: return json_fragment( json_bytes( { - "config_entries": list(self.config_entries), + "config_entries": self.config_entries, "connections": list(self.connections), "identifiers": list(self.identifiers), "id": self.id, @@ -647,7 +645,6 @@ class DeviceRegistry(BaseRegistry[dict[str, list[dict[str, Any]]]]): default_name: str | None | UndefinedType = UNDEFINED, # To disable a device if it gets created disabled_by: DeviceEntryDisabler | None | UndefinedType = UNDEFINED, - domain: str | UndefinedType = UNDEFINED, entry_type: DeviceEntryType | None | UndefinedType = UNDEFINED, hw_version: str | None | UndefinedType = UNDEFINED, identifiers: set[tuple[str, str]] | None | UndefinedType = UNDEFINED, @@ -766,7 +763,6 @@ class DeviceRegistry(BaseRegistry[dict[str, list[dict[str, Any]]]]): configuration_url=configuration_url, device_info_type=device_info_type, disabled_by=disabled_by, - domain=domain, entry_type=entry_type, hw_version=hw_version, manufacturer=manufacturer, @@ -794,7 +790,6 @@ class DeviceRegistry(BaseRegistry[dict[str, list[dict[str, Any]]]]): area_id: str | None | UndefinedType = UNDEFINED, configuration_url: str | URL | None | UndefinedType = UNDEFINED, device_info_type: str | UndefinedType = UNDEFINED, - domain: str | UndefinedType = UNDEFINED, disabled_by: DeviceEntryDisabler | None | UndefinedType = UNDEFINED, entry_type: DeviceEntryType | None | UndefinedType = UNDEFINED, hw_version: str | None | UndefinedType = UNDEFINED, @@ -858,21 +853,32 @@ class DeviceRegistry(BaseRegistry[dict[str, list[dict[str, Any]]]]): area = ar.async_get(self.hass).async_get_or_create(suggested_area) area_id = area.id - if ( - add_config_entry_id is not UNDEFINED - and add_config_entry_id not in old.config_entries - ): - config_entries = old.config_entries | {add_config_entry_id} + if add_config_entry_id is not UNDEFINED: + # primary ones have to be at the start. + if device_info_type == "primary": + # Move entry to first spot + if not config_entries or config_entries[0] != add_config_entry_id: + config_entries = [add_config_entry_id] + [ + entry + for entry in config_entries + if entry != add_config_entry_id + ] + + # Not primary, append + elif add_config_entry_id not in config_entries: + config_entries = [*config_entries, add_config_entry_id] if ( remove_config_entry_id is not UNDEFINED and remove_config_entry_id in config_entries ): - if config_entries == {remove_config_entry_id}: + if config_entries == [remove_config_entry_id]: self.async_remove_device(device_id) return None - config_entries = config_entries - {remove_config_entry_id} + config_entries = [ + entry for entry in config_entries if entry != remove_config_entry_id + ] if config_entries != old.config_entries: new_values["config_entries"] = config_entries @@ -919,10 +925,6 @@ class DeviceRegistry(BaseRegistry[dict[str, list[dict[str, Any]]]]): new_values[attr_name] = value old_values[attr_name] = getattr(old, attr_name) - if device_info_type == "primary" and domain is not UNDEFINED: - new_values["primary_integration"] = domain - old_values["primary_integration"] = old.primary_integration - if old.is_new: new_values["is_new"] = False @@ -989,7 +991,7 @@ class DeviceRegistry(BaseRegistry[dict[str, list[dict[str, Any]]]]): for device in data["devices"]: devices[device["id"]] = DeviceEntry( area_id=device["area_id"], - config_entries=set(device["config_entries"]), + config_entries=device["config_entries"], configuration_url=device["configuration_url"], # type ignores (if tuple arg was cast): likely https://github.com/python/mypy/issues/8625 connections={ @@ -1024,7 +1026,7 @@ class DeviceRegistry(BaseRegistry[dict[str, list[dict[str, Any]]]]): # Introduced in 0.111 for device in data["deleted_devices"]: deleted_devices[device["id"]] = DeletedDeviceEntry( - config_entries=set(device["config_entries"]), + config_entries=device["config_entries"], connections={tuple(conn) for conn in device["connections"]}, identifiers={tuple(iden) for iden in device["identifiers"]}, id=device["id"], @@ -1055,13 +1057,15 @@ class DeviceRegistry(BaseRegistry[dict[str, list[dict[str, Any]]]]): config_entries = deleted_device.config_entries if config_entry_id not in config_entries: continue - if config_entries == {config_entry_id}: + if config_entries == [config_entry_id]: # Add a time stamp when the deleted device became orphaned self.deleted_devices[deleted_device.id] = attr.evolve( - deleted_device, orphaned_timestamp=now_time, config_entries=set() + deleted_device, orphaned_timestamp=now_time, config_entries=[] ) else: - config_entries = config_entries - {config_entry_id} + config_entries = [ + entry for entry in config_entries if entry != config_entry_id + ] # No need to reindex here since we currently # do not have a lookup by config entry self.deleted_devices[deleted_device.id] = attr.evolve( @@ -1167,8 +1171,8 @@ def async_config_entry_disabled_by_changed( if device.disabled: # Device already disabled, do not overwrite continue - if len(device.config_entries) > 1 and device.config_entries.intersection( - enabled_config_entries + if len(device.config_entries) > 1 and any( + entry_id in enabled_config_entries for entry_id in device.config_entries ): continue registry.async_update_device( diff --git a/homeassistant/helpers/entity_platform.py b/homeassistant/helpers/entity_platform.py index 2fb3c41fbfa..4dbe3ac68d8 100644 --- a/homeassistant/helpers/entity_platform.py +++ b/homeassistant/helpers/entity_platform.py @@ -771,7 +771,6 @@ class EntityPlatform: try: device = dev_reg.async_get(self.hass).async_get_or_create( config_entry_id=self.config_entry.entry_id, - domain=self.platform_name, **device_info, ) except dev_reg.DeviceInfoError as exc: diff --git a/tests/components/airgradient/snapshots/test_init.ambr b/tests/components/airgradient/snapshots/test_init.ambr index 92698023f1c..7109f603c9d 100644 --- a/tests/components/airgradient/snapshots/test_init.ambr +++ b/tests/components/airgradient/snapshots/test_init.ambr @@ -23,7 +23,6 @@ 'model': 'I-9PSL', 'name': 'Airgradient', 'name_by_user': None, - 'primary_integration': None, 'serial_number': '84fce612f5b8', 'suggested_area': None, 'sw_version': '3.1.1', diff --git a/tests/components/aosmith/snapshots/test_device.ambr b/tests/components/aosmith/snapshots/test_device.ambr index bee404076cd..f6e2625afdb 100644 --- a/tests/components/aosmith/snapshots/test_device.ambr +++ b/tests/components/aosmith/snapshots/test_device.ambr @@ -23,7 +23,6 @@ 'model': 'HPTS-50 200 202172000', 'name': 'My water heater', 'name_by_user': None, - 'primary_integration': None, 'serial_number': 'serial', 'suggested_area': 'Basement', 'sw_version': '2.14', diff --git a/tests/components/config/test_device_registry.py b/tests/components/config/test_device_registry.py index 7524de013f6..804cf29979e 100644 --- a/tests/components/config/test_device_registry.py +++ b/tests/components/config/test_device_registry.py @@ -70,7 +70,6 @@ async def test_list_devices( "model": "model", "name_by_user": None, "name": None, - "primary_integration": None, "serial_number": None, "sw_version": None, "via_device_id": None, @@ -89,7 +88,6 @@ async def test_list_devices( "model": "model", "name_by_user": None, "name": None, - "primary_integration": None, "serial_number": None, "sw_version": None, "via_device_id": dev1, @@ -121,7 +119,6 @@ async def test_list_devices( "model": "model", "name_by_user": None, "name": None, - "primary_integration": None, "serial_number": None, "sw_version": None, "via_device_id": None, @@ -277,7 +274,7 @@ async def test_remove_config_entry_from_device( config_entry_id=entry_2.entry_id, connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")}, ) - assert device_entry.config_entries == {entry_1.entry_id, entry_2.entry_id} + assert device_entry.config_entries == [entry_1.entry_id, entry_2.entry_id] # Try removing a config entry from the device, it should fail because # async_remove_config_entry_device returns False @@ -296,9 +293,9 @@ async def test_remove_config_entry_from_device( assert response["result"]["config_entries"] == [entry_2.entry_id] # Check that the config entry was removed from the device - assert device_registry.async_get(device_entry.id).config_entries == { + assert device_registry.async_get(device_entry.id).config_entries == [ entry_2.entry_id - } + ] # Remove the 2nd config entry response = await ws_client.remove_device(device_entry.id, entry_2.entry_id) @@ -368,11 +365,11 @@ async def test_remove_config_entry_from_device_fails( config_entry_id=entry_3.entry_id, connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")}, ) - assert device_entry.config_entries == { + assert device_entry.config_entries == [ entry_1.entry_id, entry_2.entry_id, entry_3.entry_id, - } + ] fake_entry_id = "abc123" assert entry_1.entry_id != fake_entry_id diff --git a/tests/components/devolo_home_network/snapshots/test_init.ambr b/tests/components/devolo_home_network/snapshots/test_init.ambr index 1a592d21836..b042dfec2f1 100644 --- a/tests/components/devolo_home_network/snapshots/test_init.ambr +++ b/tests/components/devolo_home_network/snapshots/test_init.ambr @@ -27,7 +27,6 @@ 'model': 'dLAN pro 1200+ WiFi ac', 'name': 'Mock Title', 'name_by_user': None, - 'primary_integration': 'devolo_home_network', 'serial_number': '1234567890', 'suggested_area': None, 'sw_version': '5.6.1', diff --git a/tests/components/ecovacs/snapshots/test_init.ambr b/tests/components/ecovacs/snapshots/test_init.ambr index 74b59637dba..f47e747b1cf 100644 --- a/tests/components/ecovacs/snapshots/test_init.ambr +++ b/tests/components/ecovacs/snapshots/test_init.ambr @@ -23,7 +23,6 @@ 'model': 'DEEBOT OZMO 950 Series', 'name': 'Ozmo 950', 'name_by_user': None, - 'primary_integration': 'ecovacs', 'serial_number': 'E1234567890000000001', 'suggested_area': None, 'sw_version': None, diff --git a/tests/components/elgato/snapshots/test_button.ambr b/tests/components/elgato/snapshots/test_button.ambr index 6995e265e1e..e7477540f46 100644 --- a/tests/components/elgato/snapshots/test_button.ambr +++ b/tests/components/elgato/snapshots/test_button.ambr @@ -74,7 +74,6 @@ 'model': 'Elgato Key Light Mini', 'name': 'Frenck', 'name_by_user': None, - 'primary_integration': 'elgato', 'serial_number': 'GW24L1A02987', 'suggested_area': None, 'sw_version': '1.0.4 (229)', @@ -156,7 +155,6 @@ 'model': 'Elgato Key Light Mini', 'name': 'Frenck', 'name_by_user': None, - 'primary_integration': 'elgato', 'serial_number': 'GW24L1A02987', 'suggested_area': None, 'sw_version': '1.0.4 (229)', diff --git a/tests/components/elgato/snapshots/test_light.ambr b/tests/components/elgato/snapshots/test_light.ambr index 9bb26f5efd9..e2f663d294b 100644 --- a/tests/components/elgato/snapshots/test_light.ambr +++ b/tests/components/elgato/snapshots/test_light.ambr @@ -106,7 +106,6 @@ 'model': 'Elgato Key Light', 'name': 'Frenck', 'name_by_user': None, - 'primary_integration': 'elgato', 'serial_number': 'CN11A1A00001', 'suggested_area': None, 'sw_version': '1.0.3 (192)', @@ -222,7 +221,6 @@ 'model': 'Elgato Light Strip', 'name': 'Frenck', 'name_by_user': None, - 'primary_integration': 'elgato', 'serial_number': 'CN11A1A00001', 'suggested_area': None, 'sw_version': '1.0.3 (192)', @@ -338,7 +336,6 @@ 'model': 'Elgato Light Strip', 'name': 'Frenck', 'name_by_user': None, - 'primary_integration': 'elgato', 'serial_number': 'CN11A1A00001', 'suggested_area': None, 'sw_version': '1.0.3 (192)', diff --git a/tests/components/elgato/snapshots/test_sensor.ambr b/tests/components/elgato/snapshots/test_sensor.ambr index aacaf34ef4f..2b52d6b9f23 100644 --- a/tests/components/elgato/snapshots/test_sensor.ambr +++ b/tests/components/elgato/snapshots/test_sensor.ambr @@ -81,7 +81,6 @@ 'model': 'Elgato Key Light Mini', 'name': 'Frenck', 'name_by_user': None, - 'primary_integration': 'elgato', 'serial_number': 'GW24L1A02987', 'suggested_area': None, 'sw_version': '1.0.4 (229)', @@ -173,7 +172,6 @@ 'model': 'Elgato Key Light Mini', 'name': 'Frenck', 'name_by_user': None, - 'primary_integration': 'elgato', 'serial_number': 'GW24L1A02987', 'suggested_area': None, 'sw_version': '1.0.4 (229)', @@ -265,7 +263,6 @@ 'model': 'Elgato Key Light Mini', 'name': 'Frenck', 'name_by_user': None, - 'primary_integration': 'elgato', 'serial_number': 'GW24L1A02987', 'suggested_area': None, 'sw_version': '1.0.4 (229)', @@ -354,7 +351,6 @@ 'model': 'Elgato Key Light Mini', 'name': 'Frenck', 'name_by_user': None, - 'primary_integration': 'elgato', 'serial_number': 'GW24L1A02987', 'suggested_area': None, 'sw_version': '1.0.4 (229)', @@ -446,7 +442,6 @@ 'model': 'Elgato Key Light Mini', 'name': 'Frenck', 'name_by_user': None, - 'primary_integration': 'elgato', 'serial_number': 'GW24L1A02987', 'suggested_area': None, 'sw_version': '1.0.4 (229)', diff --git a/tests/components/elgato/snapshots/test_switch.ambr b/tests/components/elgato/snapshots/test_switch.ambr index a501c20e2d7..41f3a8f3aaf 100644 --- a/tests/components/elgato/snapshots/test_switch.ambr +++ b/tests/components/elgato/snapshots/test_switch.ambr @@ -73,7 +73,6 @@ 'model': 'Elgato Key Light Mini', 'name': 'Frenck', 'name_by_user': None, - 'primary_integration': 'elgato', 'serial_number': 'GW24L1A02987', 'suggested_area': None, 'sw_version': '1.0.4 (229)', @@ -154,7 +153,6 @@ 'model': 'Elgato Key Light Mini', 'name': 'Frenck', 'name_by_user': None, - 'primary_integration': 'elgato', 'serial_number': 'GW24L1A02987', 'suggested_area': None, 'sw_version': '1.0.4 (229)', diff --git a/tests/components/energyzero/snapshots/test_sensor.ambr b/tests/components/energyzero/snapshots/test_sensor.ambr index 2663437ae33..23b232379df 100644 --- a/tests/components/energyzero/snapshots/test_sensor.ambr +++ b/tests/components/energyzero/snapshots/test_sensor.ambr @@ -64,7 +64,6 @@ 'model': None, 'name': 'Energy market price', 'name_by_user': None, - 'primary_integration': 'energyzero', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -139,7 +138,6 @@ 'model': None, 'name': 'Energy market price', 'name_by_user': None, - 'primary_integration': 'energyzero', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -211,7 +209,6 @@ 'model': None, 'name': 'Energy market price', 'name_by_user': None, - 'primary_integration': 'energyzero', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -283,7 +280,6 @@ 'model': None, 'name': 'Energy market price', 'name_by_user': None, - 'primary_integration': 'energyzero', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -355,7 +351,6 @@ 'model': None, 'name': 'Energy market price', 'name_by_user': None, - 'primary_integration': 'energyzero', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -430,7 +425,6 @@ 'model': None, 'name': 'Gas market price', 'name_by_user': None, - 'primary_integration': 'energyzero', 'serial_number': None, 'suggested_area': None, 'sw_version': None, diff --git a/tests/components/enphase_envoy/snapshots/test_diagnostics.ambr b/tests/components/enphase_envoy/snapshots/test_diagnostics.ambr index bcbd546c95e..c2ab51a7dbd 100644 --- a/tests/components/enphase_envoy/snapshots/test_diagnostics.ambr +++ b/tests/components/enphase_envoy/snapshots/test_diagnostics.ambr @@ -48,7 +48,6 @@ 'model': 'Envoy, phases: 3, phase mode: three, net-consumption CT, production CT, storage CT', 'name': 'Envoy <>', 'name_by_user': None, - 'primary_integration': 'enphase_envoy', 'serial_number': '<>', 'suggested_area': None, 'sw_version': '7.1.2', @@ -3773,7 +3772,6 @@ 'model': 'Inverter', 'name': 'Inverter 1', 'name_by_user': None, - 'primary_integration': 'enphase_envoy', 'serial_number': None, 'suggested_area': None, 'sw_version': None, diff --git a/tests/components/gardena_bluetooth/snapshots/test_init.ambr b/tests/components/gardena_bluetooth/snapshots/test_init.ambr index 2dd7aa2c7de..82e17896d60 100644 --- a/tests/components/gardena_bluetooth/snapshots/test_init.ambr +++ b/tests/components/gardena_bluetooth/snapshots/test_init.ambr @@ -23,7 +23,6 @@ 'model': 'Mock Model', 'name': 'Mock Title', 'name_by_user': None, - 'primary_integration': 'gardena_bluetooth', 'serial_number': None, 'suggested_area': None, 'sw_version': '1.2.3', diff --git a/tests/components/homekit_controller/snapshots/test_init.ambr b/tests/components/homekit_controller/snapshots/test_init.ambr index 35a2b4937fc..c52bf2c3b27 100644 --- a/tests/components/homekit_controller/snapshots/test_init.ambr +++ b/tests/components/homekit_controller/snapshots/test_init.ambr @@ -26,7 +26,6 @@ 'model': 'AP2', 'name': 'Airversa AP2 1808', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '1234', 'suggested_area': None, 'sw_version': '0.8.16', @@ -623,7 +622,6 @@ 'model': 'T8010', 'name': 'eufy HomeBase2-0AAA', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'A0000A000000000A', 'suggested_area': None, 'sw_version': '2.1.6', @@ -697,7 +695,6 @@ 'model': 'T8113', 'name': 'eufyCam2-0000', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'A0000A000000000D', 'suggested_area': None, 'sw_version': '1.6.7', @@ -939,7 +936,6 @@ 'model': 'T8113', 'name': 'eufyCam2-000A', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'A0000A000000000B', 'suggested_area': None, 'sw_version': '1.6.7', @@ -1181,7 +1177,6 @@ 'model': 'T8113', 'name': 'eufyCam2-000A', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'A0000A000000000C', 'suggested_area': None, 'sw_version': '1.6.7', @@ -1427,7 +1422,6 @@ 'model': 'HE1-G01', 'name': 'Aqara-Hub-E1-00A0', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '00aa00000a0', 'suggested_area': None, 'sw_version': '3.3.0', @@ -1634,7 +1628,6 @@ 'model': 'AS006', 'name': 'Contact Sensor', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '158d0007c59c6a', 'suggested_area': None, 'sw_version': '0', @@ -1799,7 +1792,6 @@ 'model': 'ZHWA11LM', 'name': 'Aqara Hub-1563', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '0000000123456789', 'suggested_area': None, 'sw_version': '1.4.7', @@ -2075,7 +2067,6 @@ 'model': 'AR004', 'name': 'Programmable Switch', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '111a1111a1a111', 'suggested_area': None, 'sw_version': '9', @@ -2199,7 +2190,6 @@ 'model': 'ABC1000', 'name': 'ArloBabyA0', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '00A0000000000', 'suggested_area': None, 'sw_version': '1.10.931', @@ -2684,7 +2674,6 @@ 'model': 'CS-IWO', 'name': 'InWall Outlet-0394DE', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '1020301376', 'suggested_area': None, 'sw_version': '1.0.0', @@ -3114,7 +3103,6 @@ 'model': 'REMOTE SENSOR', 'name': 'Basement', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'AB3C', 'suggested_area': None, 'sw_version': '1.0.0', @@ -3274,7 +3262,6 @@ 'model': 'ecobee3', 'name': 'HomeW', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '123456789012', 'suggested_area': None, 'sw_version': '4.2.394', @@ -3729,7 +3716,6 @@ 'model': 'REMOTE SENSOR', 'name': 'Kitchen', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'AB1C', 'suggested_area': None, 'sw_version': '1.0.0', @@ -3889,7 +3875,6 @@ 'model': 'REMOTE SENSOR', 'name': 'Porch', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'AB2C', 'suggested_area': None, 'sw_version': '1.0.0', @@ -4053,7 +4038,6 @@ 'model': 'ecobee3', 'name': 'HomeW', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '123456789012', 'suggested_area': None, 'sw_version': '4.2.394', @@ -4512,7 +4496,6 @@ 'model': 'REMOTE SENSOR', 'name': 'Basement', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'AB3C', 'suggested_area': None, 'sw_version': '1.0.0', @@ -4627,7 +4610,6 @@ 'model': 'ecobee3', 'name': 'HomeW', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '123456789012', 'suggested_area': None, 'sw_version': '4.2.394', @@ -4909,7 +4891,6 @@ 'model': 'REMOTE SENSOR', 'name': 'Kitchen', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'AB1C', 'suggested_area': None, 'sw_version': '1.0.0', @@ -5069,7 +5050,6 @@ 'model': 'REMOTE SENSOR', 'name': 'Porch', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'AB2C', 'suggested_area': None, 'sw_version': '1.0.0', @@ -5233,7 +5213,6 @@ 'model': 'ECB501', 'name': 'My ecobee', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '123456789016', 'suggested_area': None, 'sw_version': '4.7.340214', @@ -5701,7 +5680,6 @@ 'model': 'ecobee Switch+', 'name': 'Master Fan', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '111111111111', 'suggested_area': None, 'sw_version': '4.5.130201', @@ -5991,7 +5969,6 @@ 'model': 'Eve Degree 00AAA0000', 'name': 'Eve Degree AA11', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'AA00A0A00000', 'suggested_area': None, 'sw_version': '1.2.8', @@ -6348,7 +6325,6 @@ 'model': 'Eve Energy 20EAO8601', 'name': 'Eve Energy 50FF', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'AA00A0A00000', 'suggested_area': None, 'sw_version': '1.2.9', @@ -6687,7 +6663,6 @@ 'model': 'RavenSystem HAA', 'name': 'HAA-C718B3', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'C718B3-1', 'suggested_area': None, 'sw_version': '5.0.18', @@ -6893,7 +6868,6 @@ 'model': 'RavenSystem HAA', 'name': 'HAA-C718B3', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'C718B3-2', 'suggested_area': None, 'sw_version': '5.0.18', @@ -7011,7 +6985,6 @@ 'model': 'RavenSystem HAA', 'name': 'HAA-C718B3', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'C718B3-1', 'suggested_area': None, 'sw_version': '5.0.18', @@ -7213,7 +7186,6 @@ 'model': 'RavenSystem HAA', 'name': 'HAA-C718B3', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'C718B3-2', 'suggested_area': None, 'sw_version': '5.0.18', @@ -7331,7 +7303,6 @@ 'model': 'RYSE Shade', 'name': 'Family Room North', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'cover.family_door_north', 'suggested_area': None, 'sw_version': '3.6.2', @@ -7493,7 +7464,6 @@ 'model': 'Bridge', 'name': 'HASS Bridge S6', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'homekit.bridge', 'suggested_area': None, 'sw_version': '2024.2.0', @@ -7567,7 +7537,6 @@ 'model': 'RYSE Shade', 'name': 'Kitchen Window', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'cover.kitchen_window', 'suggested_area': None, 'sw_version': '3.6.2', @@ -7733,7 +7702,6 @@ 'model': 'Fan', 'name': 'Ceiling Fan', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'fan.ceiling_fan', 'suggested_area': None, 'sw_version': '0.104.0.dev0', @@ -7854,7 +7822,6 @@ 'model': 'Bridge', 'name': 'Home Assistant Bridge', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'homekit.bridge', 'suggested_area': None, 'sw_version': '0.104.0.dev0', @@ -7928,7 +7895,6 @@ 'model': 'Fan', 'name': 'Living Room Fan', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'fan.living_room_fan', 'suggested_area': None, 'sw_version': '0.104.0.dev0', @@ -8054,7 +8020,6 @@ 'model': 'Climate Control', 'name': '89 Living Room', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'climate.89_living_room', 'suggested_area': None, 'sw_version': '2024.2.0', @@ -8377,7 +8342,6 @@ 'model': 'Bridge', 'name': 'HASS Bridge S6', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'homekit.bridge', 'suggested_area': None, 'sw_version': '2024.2.0', @@ -8455,7 +8419,6 @@ 'model': 'Bridge', 'name': 'HASS Bridge S6', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'homekit.bridge', 'suggested_area': None, 'sw_version': '2024.2.0', @@ -8529,7 +8492,6 @@ 'model': '1039102', 'name': 'Laundry Smoke ED78', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'light.laundry_smoke_ed78', 'suggested_area': None, 'sw_version': '1.4.84', @@ -8703,7 +8665,6 @@ 'model': 'RYSE Shade', 'name': 'Family Room North', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'cover.family_door_north', 'suggested_area': None, 'sw_version': '3.6.2', @@ -8865,7 +8826,6 @@ 'model': 'Bridge', 'name': 'HASS Bridge S6', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'homekit.bridge', 'suggested_area': None, 'sw_version': '2024.2.0', @@ -8939,7 +8899,6 @@ 'model': 'RYSE Shade', 'name': 'Kitchen Window', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'cover.kitchen_window', 'suggested_area': None, 'sw_version': '3.6.2', @@ -9105,7 +9064,6 @@ 'model': 'Fan', 'name': 'Ceiling Fan', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'fan.ceiling_fan', 'suggested_area': None, 'sw_version': '0.104.0.dev0', @@ -9226,7 +9184,6 @@ 'model': 'Bridge', 'name': 'Home Assistant Bridge', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'homekit.bridge', 'suggested_area': None, 'sw_version': '0.104.0.dev0', @@ -9300,7 +9257,6 @@ 'model': 'Fan', 'name': 'Living Room Fan', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'fan.living_room_fan', 'suggested_area': None, 'sw_version': '0.104.0.dev0', @@ -9427,7 +9383,6 @@ 'model': 'Bridge', 'name': 'Home Assistant Bridge', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'homekit.bridge', 'suggested_area': None, 'sw_version': '0.104.0.dev0', @@ -9501,7 +9456,6 @@ 'model': 'Fan', 'name': 'Living Room Fan', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'fan.living_room_fan', 'suggested_area': None, 'sw_version': '0.104.0.dev0', @@ -9628,7 +9582,6 @@ 'model': 'Climate Control', 'name': '89 Living Room', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'climate.89_living_room', 'suggested_area': None, 'sw_version': '2024.2.0', @@ -9960,7 +9913,6 @@ 'model': 'Bridge', 'name': 'HASS Bridge S6', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'homekit.bridge', 'suggested_area': None, 'sw_version': '2024.2.0', @@ -10038,7 +9990,6 @@ 'model': 'Bridge', 'name': 'HASS Bridge S6', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'homekit.bridge', 'suggested_area': None, 'sw_version': '2024.2.0', @@ -10112,7 +10063,6 @@ 'model': 'WoHumi', 'name': 'Humidifier 182A', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'humidifier.humidifier_182a', 'suggested_area': None, 'sw_version': '2024.2.0', @@ -10293,7 +10243,6 @@ 'model': 'Bridge', 'name': 'HASS Bridge S6', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'homekit.bridge', 'suggested_area': None, 'sw_version': '2024.2.0', @@ -10367,7 +10316,6 @@ 'model': 'WoHumi', 'name': 'Humidifier 182A', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'humidifier.humidifier_182a', 'suggested_area': None, 'sw_version': '2024.2.0', @@ -10548,7 +10496,6 @@ 'model': 'Bridge', 'name': 'HASS Bridge S6', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'homekit.bridge', 'suggested_area': None, 'sw_version': '2024.2.0', @@ -10622,7 +10569,6 @@ 'model': '1039102', 'name': 'Laundry Smoke ED78', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'light.laundry_smoke_ed78', 'suggested_area': None, 'sw_version': '1.4.84', @@ -10811,7 +10757,6 @@ 'model': 'Daikin-fwec3a-esp32-homekit-bridge', 'name': 'Air Conditioner', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '00000001', 'suggested_area': None, 'sw_version': '1.0.0', @@ -10985,417 +10930,6 @@ # --- # name: test_snapshots[hue_bridge] list([ - dict({ - 'device': dict({ - 'area_id': None, - 'config_entries': list([ - 'TestData', - ]), - 'configuration_url': None, - 'connections': list([ - ]), - 'disabled_by': None, - 'entry_type': None, - 'hw_version': '', - 'identifiers': list([ - list([ - 'homekit_controller:accessory-id', - '00:00:00:00:00:00:aid:6623462403233419', - ]), - ]), - 'is_new': False, - 'labels': list([ - ]), - 'manufacturer': 'Philips', - 'model': 'LTW012', - 'name': 'Hue ambiance candle', - 'name_by_user': None, - 'primary_integration': 'homekit_controller', - 'serial_number': '6623462403233419', - 'suggested_area': None, - 'sw_version': '1.46.13', - }), - 'entities': list([ - dict({ - 'entry': dict({ - 'aliases': list([ - ]), - 'area_id': None, - 'capabilities': None, - 'categories': dict({ - }), - 'config_entry_id': 'TestData', - 'device_class': None, - 'disabled_by': None, - 'domain': 'button', - 'entity_category': , - 'entity_id': 'button.hue_ambiance_candle_identify', - 'has_entity_name': False, - 'hidden_by': None, - 'icon': None, - 'labels': list([ - ]), - 'name': None, - 'options': dict({ - }), - 'original_device_class': , - 'original_icon': None, - 'original_name': 'Hue ambiance candle Identify', - 'platform': 'homekit_controller', - 'previous_unique_id': None, - 'supported_features': 0, - 'translation_key': None, - 'unique_id': '00:00:00:00:00:00_6623462403233419_1_6', - 'unit_of_measurement': None, - }), - 'state': dict({ - 'attributes': dict({ - 'device_class': 'identify', - 'friendly_name': 'Hue ambiance candle Identify', - }), - 'entity_id': 'button.hue_ambiance_candle_identify', - 'state': 'unknown', - }), - }), - dict({ - 'entry': dict({ - 'aliases': list([ - ]), - 'area_id': None, - 'capabilities': dict({ - 'max_color_temp_kelvin': 6535, - 'max_mireds': 454, - 'min_color_temp_kelvin': 2202, - 'min_mireds': 153, - 'supported_color_modes': list([ - , - ]), - }), - 'categories': dict({ - }), - 'config_entry_id': 'TestData', - 'device_class': None, - 'disabled_by': None, - 'domain': 'light', - 'entity_category': None, - 'entity_id': 'light.hue_ambiance_candle', - 'has_entity_name': False, - 'hidden_by': None, - 'icon': None, - 'labels': list([ - ]), - 'name': None, - 'options': dict({ - }), - 'original_device_class': None, - 'original_icon': None, - 'original_name': 'Hue ambiance candle', - 'platform': 'homekit_controller', - 'previous_unique_id': None, - 'supported_features': 0, - 'translation_key': None, - 'unique_id': '00:00:00:00:00:00_6623462403233419_2816', - 'unit_of_measurement': None, - }), - 'state': dict({ - 'attributes': dict({ - 'brightness': None, - 'color_mode': None, - 'color_temp': None, - 'color_temp_kelvin': None, - 'friendly_name': 'Hue ambiance candle', - 'hs_color': None, - 'max_color_temp_kelvin': 6535, - 'max_mireds': 454, - 'min_color_temp_kelvin': 2202, - 'min_mireds': 153, - 'rgb_color': None, - 'supported_color_modes': list([ - , - ]), - 'supported_features': , - 'xy_color': None, - }), - 'entity_id': 'light.hue_ambiance_candle', - 'state': 'off', - }), - }), - ]), - }), - dict({ - 'device': dict({ - 'area_id': None, - 'config_entries': list([ - 'TestData', - ]), - 'configuration_url': None, - 'connections': list([ - ]), - 'disabled_by': None, - 'entry_type': None, - 'hw_version': '', - 'identifiers': list([ - list([ - 'homekit_controller:accessory-id', - '00:00:00:00:00:00:aid:6623462403113447', - ]), - ]), - 'is_new': False, - 'labels': list([ - ]), - 'manufacturer': 'Philips', - 'model': 'LTW012', - 'name': 'Hue ambiance candle', - 'name_by_user': None, - 'primary_integration': 'homekit_controller', - 'serial_number': '6623462403113447', - 'suggested_area': None, - 'sw_version': '1.46.13', - }), - 'entities': list([ - dict({ - 'entry': dict({ - 'aliases': list([ - ]), - 'area_id': None, - 'capabilities': None, - 'categories': dict({ - }), - 'config_entry_id': 'TestData', - 'device_class': None, - 'disabled_by': None, - 'domain': 'button', - 'entity_category': , - 'entity_id': 'button.hue_ambiance_candle_identify_2', - 'has_entity_name': False, - 'hidden_by': None, - 'icon': None, - 'labels': list([ - ]), - 'name': None, - 'options': dict({ - }), - 'original_device_class': , - 'original_icon': None, - 'original_name': 'Hue ambiance candle Identify', - 'platform': 'homekit_controller', - 'previous_unique_id': None, - 'supported_features': 0, - 'translation_key': None, - 'unique_id': '00:00:00:00:00:00_6623462403113447_1_6', - 'unit_of_measurement': None, - }), - 'state': dict({ - 'attributes': dict({ - 'device_class': 'identify', - 'friendly_name': 'Hue ambiance candle Identify', - }), - 'entity_id': 'button.hue_ambiance_candle_identify_2', - 'state': 'unknown', - }), - }), - dict({ - 'entry': dict({ - 'aliases': list([ - ]), - 'area_id': None, - 'capabilities': dict({ - 'max_color_temp_kelvin': 6535, - 'max_mireds': 454, - 'min_color_temp_kelvin': 2202, - 'min_mireds': 153, - 'supported_color_modes': list([ - , - ]), - }), - 'categories': dict({ - }), - 'config_entry_id': 'TestData', - 'device_class': None, - 'disabled_by': None, - 'domain': 'light', - 'entity_category': None, - 'entity_id': 'light.hue_ambiance_candle_2', - 'has_entity_name': False, - 'hidden_by': None, - 'icon': None, - 'labels': list([ - ]), - 'name': None, - 'options': dict({ - }), - 'original_device_class': None, - 'original_icon': None, - 'original_name': 'Hue ambiance candle', - 'platform': 'homekit_controller', - 'previous_unique_id': None, - 'supported_features': 0, - 'translation_key': None, - 'unique_id': '00:00:00:00:00:00_6623462403113447_2816', - 'unit_of_measurement': None, - }), - 'state': dict({ - 'attributes': dict({ - 'brightness': None, - 'color_mode': None, - 'color_temp': None, - 'color_temp_kelvin': None, - 'friendly_name': 'Hue ambiance candle', - 'hs_color': None, - 'max_color_temp_kelvin': 6535, - 'max_mireds': 454, - 'min_color_temp_kelvin': 2202, - 'min_mireds': 153, - 'rgb_color': None, - 'supported_color_modes': list([ - , - ]), - 'supported_features': , - 'xy_color': None, - }), - 'entity_id': 'light.hue_ambiance_candle_2', - 'state': 'off', - }), - }), - ]), - }), - dict({ - 'device': dict({ - 'area_id': None, - 'config_entries': list([ - 'TestData', - ]), - 'configuration_url': None, - 'connections': list([ - ]), - 'disabled_by': None, - 'entry_type': None, - 'hw_version': '', - 'identifiers': list([ - list([ - 'homekit_controller:accessory-id', - '00:00:00:00:00:00:aid:6623462395276939', - ]), - ]), - 'is_new': False, - 'labels': list([ - ]), - 'manufacturer': 'Philips', - 'model': 'LTW012', - 'name': 'Hue ambiance candle', - 'name_by_user': None, - 'primary_integration': 'homekit_controller', - 'serial_number': '6623462395276939', - 'suggested_area': None, - 'sw_version': '1.46.13', - }), - 'entities': list([ - dict({ - 'entry': dict({ - 'aliases': list([ - ]), - 'area_id': None, - 'capabilities': None, - 'categories': dict({ - }), - 'config_entry_id': 'TestData', - 'device_class': None, - 'disabled_by': None, - 'domain': 'button', - 'entity_category': , - 'entity_id': 'button.hue_ambiance_candle_identify_3', - 'has_entity_name': False, - 'hidden_by': None, - 'icon': None, - 'labels': list([ - ]), - 'name': None, - 'options': dict({ - }), - 'original_device_class': , - 'original_icon': None, - 'original_name': 'Hue ambiance candle Identify', - 'platform': 'homekit_controller', - 'previous_unique_id': None, - 'supported_features': 0, - 'translation_key': None, - 'unique_id': '00:00:00:00:00:00_6623462395276939_1_6', - 'unit_of_measurement': None, - }), - 'state': dict({ - 'attributes': dict({ - 'device_class': 'identify', - 'friendly_name': 'Hue ambiance candle Identify', - }), - 'entity_id': 'button.hue_ambiance_candle_identify_3', - 'state': 'unknown', - }), - }), - dict({ - 'entry': dict({ - 'aliases': list([ - ]), - 'area_id': None, - 'capabilities': dict({ - 'max_color_temp_kelvin': 6535, - 'max_mireds': 454, - 'min_color_temp_kelvin': 2202, - 'min_mireds': 153, - 'supported_color_modes': list([ - , - ]), - }), - 'categories': dict({ - }), - 'config_entry_id': 'TestData', - 'device_class': None, - 'disabled_by': None, - 'domain': 'light', - 'entity_category': None, - 'entity_id': 'light.hue_ambiance_candle_3', - 'has_entity_name': False, - 'hidden_by': None, - 'icon': None, - 'labels': list([ - ]), - 'name': None, - 'options': dict({ - }), - 'original_device_class': None, - 'original_icon': None, - 'original_name': 'Hue ambiance candle', - 'platform': 'homekit_controller', - 'previous_unique_id': None, - 'supported_features': 0, - 'translation_key': None, - 'unique_id': '00:00:00:00:00:00_6623462395276939_2816', - 'unit_of_measurement': None, - }), - 'state': dict({ - 'attributes': dict({ - 'brightness': None, - 'color_mode': None, - 'color_temp': None, - 'color_temp_kelvin': None, - 'friendly_name': 'Hue ambiance candle', - 'hs_color': None, - 'max_color_temp_kelvin': 6535, - 'max_mireds': 454, - 'min_color_temp_kelvin': 2202, - 'min_mireds': 153, - 'rgb_color': None, - 'supported_color_modes': list([ - , - ]), - 'supported_features': , - 'xy_color': None, - }), - 'entity_id': 'light.hue_ambiance_candle_3', - 'state': 'off', - }), - }), - ]), - }), dict({ 'device': dict({ 'area_id': None, @@ -11421,7 +10955,6 @@ 'model': 'LTW012', 'name': 'Hue ambiance candle', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '6623462395276914', 'suggested_area': None, 'sw_version': '1.46.13', @@ -11548,18 +11081,17 @@ 'identifiers': list([ list([ 'homekit_controller:accessory-id', - '00:00:00:00:00:00:aid:6623462412413293', + '00:00:00:00:00:00:aid:6623462395276939', ]), ]), 'is_new': False, 'labels': list([ ]), 'manufacturer': 'Philips', - 'model': 'LTW013', - 'name': 'Hue ambiance spot', + 'model': 'LTW012', + 'name': 'Hue ambiance candle', 'name_by_user': None, - 'primary_integration': 'homekit_controller', - 'serial_number': '6623462412413293', + 'serial_number': '6623462395276939', 'suggested_area': None, 'sw_version': '1.46.13', }), @@ -11577,7 +11109,7 @@ 'disabled_by': None, 'domain': 'button', 'entity_category': , - 'entity_id': 'button.hue_ambiance_spot_identify', + 'entity_id': 'button.hue_ambiance_candle_identify_3', 'has_entity_name': False, 'hidden_by': None, 'icon': None, @@ -11588,20 +11120,20 @@ }), 'original_device_class': , 'original_icon': None, - 'original_name': 'Hue ambiance spot Identify', + 'original_name': 'Hue ambiance candle Identify', 'platform': 'homekit_controller', 'previous_unique_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00:00:00:00:00:00_6623462412413293_1_6', + 'unique_id': '00:00:00:00:00:00_6623462395276939_1_6', 'unit_of_measurement': None, }), 'state': dict({ 'attributes': dict({ 'device_class': 'identify', - 'friendly_name': 'Hue ambiance spot Identify', + 'friendly_name': 'Hue ambiance candle Identify', }), - 'entity_id': 'button.hue_ambiance_spot_identify', + 'entity_id': 'button.hue_ambiance_candle_identify_3', 'state': 'unknown', }), }), @@ -11626,7 +11158,7 @@ 'disabled_by': None, 'domain': 'light', 'entity_category': None, - 'entity_id': 'light.hue_ambiance_spot', + 'entity_id': 'light.hue_ambiance_candle_3', 'has_entity_name': False, 'hidden_by': None, 'icon': None, @@ -11637,45 +11169,307 @@ }), 'original_device_class': None, 'original_icon': None, - 'original_name': 'Hue ambiance spot', + 'original_name': 'Hue ambiance candle', 'platform': 'homekit_controller', 'previous_unique_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00:00:00:00:00:00_6623462412413293_2816', + 'unique_id': '00:00:00:00:00:00_6623462395276939_2816', 'unit_of_measurement': None, }), 'state': dict({ 'attributes': dict({ - 'brightness': 255.0, - 'color_mode': , - 'color_temp': 366, - 'color_temp_kelvin': 2732, - 'friendly_name': 'Hue ambiance spot', - 'hs_color': tuple( - 28.327, - 64.71, - ), + 'brightness': None, + 'color_mode': None, + 'color_temp': None, + 'color_temp_kelvin': None, + 'friendly_name': 'Hue ambiance candle', + 'hs_color': None, 'max_color_temp_kelvin': 6535, 'max_mireds': 454, 'min_color_temp_kelvin': 2202, 'min_mireds': 153, - 'rgb_color': tuple( - 255, - 167, - 89, - ), + 'rgb_color': None, 'supported_color_modes': list([ , ]), 'supported_features': , - 'xy_color': tuple( - 0.524, - 0.387, - ), + 'xy_color': None, }), - 'entity_id': 'light.hue_ambiance_spot', - 'state': 'on', + 'entity_id': 'light.hue_ambiance_candle_3', + 'state': 'off', + }), + }), + ]), + }), + dict({ + 'device': dict({ + 'area_id': None, + 'config_entries': list([ + 'TestData', + ]), + 'configuration_url': None, + 'connections': list([ + ]), + 'disabled_by': None, + 'entry_type': None, + 'hw_version': '', + 'identifiers': list([ + list([ + 'homekit_controller:accessory-id', + '00:00:00:00:00:00:aid:6623462403113447', + ]), + ]), + 'is_new': False, + 'labels': list([ + ]), + 'manufacturer': 'Philips', + 'model': 'LTW012', + 'name': 'Hue ambiance candle', + 'name_by_user': None, + 'serial_number': '6623462403113447', + 'suggested_area': None, + 'sw_version': '1.46.13', + }), + 'entities': list([ + dict({ + 'entry': dict({ + 'aliases': list([ + ]), + 'area_id': None, + 'capabilities': None, + 'categories': dict({ + }), + 'config_entry_id': 'TestData', + 'device_class': None, + 'disabled_by': None, + 'domain': 'button', + 'entity_category': , + 'entity_id': 'button.hue_ambiance_candle_identify_2', + 'has_entity_name': False, + 'hidden_by': None, + 'icon': None, + 'labels': list([ + ]), + 'name': None, + 'options': dict({ + }), + 'original_device_class': , + 'original_icon': None, + 'original_name': 'Hue ambiance candle Identify', + 'platform': 'homekit_controller', + 'previous_unique_id': None, + 'supported_features': 0, + 'translation_key': None, + 'unique_id': '00:00:00:00:00:00_6623462403113447_1_6', + 'unit_of_measurement': None, + }), + 'state': dict({ + 'attributes': dict({ + 'device_class': 'identify', + 'friendly_name': 'Hue ambiance candle Identify', + }), + 'entity_id': 'button.hue_ambiance_candle_identify_2', + 'state': 'unknown', + }), + }), + dict({ + 'entry': dict({ + 'aliases': list([ + ]), + 'area_id': None, + 'capabilities': dict({ + 'max_color_temp_kelvin': 6535, + 'max_mireds': 454, + 'min_color_temp_kelvin': 2202, + 'min_mireds': 153, + 'supported_color_modes': list([ + , + ]), + }), + 'categories': dict({ + }), + 'config_entry_id': 'TestData', + 'device_class': None, + 'disabled_by': None, + 'domain': 'light', + 'entity_category': None, + 'entity_id': 'light.hue_ambiance_candle_2', + 'has_entity_name': False, + 'hidden_by': None, + 'icon': None, + 'labels': list([ + ]), + 'name': None, + 'options': dict({ + }), + 'original_device_class': None, + 'original_icon': None, + 'original_name': 'Hue ambiance candle', + 'platform': 'homekit_controller', + 'previous_unique_id': None, + 'supported_features': 0, + 'translation_key': None, + 'unique_id': '00:00:00:00:00:00_6623462403113447_2816', + 'unit_of_measurement': None, + }), + 'state': dict({ + 'attributes': dict({ + 'brightness': None, + 'color_mode': None, + 'color_temp': None, + 'color_temp_kelvin': None, + 'friendly_name': 'Hue ambiance candle', + 'hs_color': None, + 'max_color_temp_kelvin': 6535, + 'max_mireds': 454, + 'min_color_temp_kelvin': 2202, + 'min_mireds': 153, + 'rgb_color': None, + 'supported_color_modes': list([ + , + ]), + 'supported_features': , + 'xy_color': None, + }), + 'entity_id': 'light.hue_ambiance_candle_2', + 'state': 'off', + }), + }), + ]), + }), + dict({ + 'device': dict({ + 'area_id': None, + 'config_entries': list([ + 'TestData', + ]), + 'configuration_url': None, + 'connections': list([ + ]), + 'disabled_by': None, + 'entry_type': None, + 'hw_version': '', + 'identifiers': list([ + list([ + 'homekit_controller:accessory-id', + '00:00:00:00:00:00:aid:6623462403233419', + ]), + ]), + 'is_new': False, + 'labels': list([ + ]), + 'manufacturer': 'Philips', + 'model': 'LTW012', + 'name': 'Hue ambiance candle', + 'name_by_user': None, + 'serial_number': '6623462403233419', + 'suggested_area': None, + 'sw_version': '1.46.13', + }), + 'entities': list([ + dict({ + 'entry': dict({ + 'aliases': list([ + ]), + 'area_id': None, + 'capabilities': None, + 'categories': dict({ + }), + 'config_entry_id': 'TestData', + 'device_class': None, + 'disabled_by': None, + 'domain': 'button', + 'entity_category': , + 'entity_id': 'button.hue_ambiance_candle_identify', + 'has_entity_name': False, + 'hidden_by': None, + 'icon': None, + 'labels': list([ + ]), + 'name': None, + 'options': dict({ + }), + 'original_device_class': , + 'original_icon': None, + 'original_name': 'Hue ambiance candle Identify', + 'platform': 'homekit_controller', + 'previous_unique_id': None, + 'supported_features': 0, + 'translation_key': None, + 'unique_id': '00:00:00:00:00:00_6623462403233419_1_6', + 'unit_of_measurement': None, + }), + 'state': dict({ + 'attributes': dict({ + 'device_class': 'identify', + 'friendly_name': 'Hue ambiance candle Identify', + }), + 'entity_id': 'button.hue_ambiance_candle_identify', + 'state': 'unknown', + }), + }), + dict({ + 'entry': dict({ + 'aliases': list([ + ]), + 'area_id': None, + 'capabilities': dict({ + 'max_color_temp_kelvin': 6535, + 'max_mireds': 454, + 'min_color_temp_kelvin': 2202, + 'min_mireds': 153, + 'supported_color_modes': list([ + , + ]), + }), + 'categories': dict({ + }), + 'config_entry_id': 'TestData', + 'device_class': None, + 'disabled_by': None, + 'domain': 'light', + 'entity_category': None, + 'entity_id': 'light.hue_ambiance_candle', + 'has_entity_name': False, + 'hidden_by': None, + 'icon': None, + 'labels': list([ + ]), + 'name': None, + 'options': dict({ + }), + 'original_device_class': None, + 'original_icon': None, + 'original_name': 'Hue ambiance candle', + 'platform': 'homekit_controller', + 'previous_unique_id': None, + 'supported_features': 0, + 'translation_key': None, + 'unique_id': '00:00:00:00:00:00_6623462403233419_2816', + 'unit_of_measurement': None, + }), + 'state': dict({ + 'attributes': dict({ + 'brightness': None, + 'color_mode': None, + 'color_temp': None, + 'color_temp_kelvin': None, + 'friendly_name': 'Hue ambiance candle', + 'hs_color': None, + 'max_color_temp_kelvin': 6535, + 'max_mireds': 454, + 'min_color_temp_kelvin': 2202, + 'min_mireds': 153, + 'rgb_color': None, + 'supported_color_modes': list([ + , + ]), + 'supported_features': , + 'xy_color': None, + }), + 'entity_id': 'light.hue_ambiance_candle', + 'state': 'off', }), }), ]), @@ -11705,7 +11499,6 @@ 'model': 'LTW013', 'name': 'Hue ambiance spot', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '6623462412411853', 'suggested_area': None, 'sw_version': '1.46.13', @@ -11827,6 +11620,152 @@ }), ]), }), + dict({ + 'device': dict({ + 'area_id': None, + 'config_entries': list([ + 'TestData', + ]), + 'configuration_url': None, + 'connections': list([ + ]), + 'disabled_by': None, + 'entry_type': None, + 'hw_version': '', + 'identifiers': list([ + list([ + 'homekit_controller:accessory-id', + '00:00:00:00:00:00:aid:6623462412413293', + ]), + ]), + 'is_new': False, + 'labels': list([ + ]), + 'manufacturer': 'Philips', + 'model': 'LTW013', + 'name': 'Hue ambiance spot', + 'name_by_user': None, + 'serial_number': '6623462412413293', + 'suggested_area': None, + 'sw_version': '1.46.13', + }), + 'entities': list([ + dict({ + 'entry': dict({ + 'aliases': list([ + ]), + 'area_id': None, + 'capabilities': None, + 'categories': dict({ + }), + 'config_entry_id': 'TestData', + 'device_class': None, + 'disabled_by': None, + 'domain': 'button', + 'entity_category': , + 'entity_id': 'button.hue_ambiance_spot_identify', + 'has_entity_name': False, + 'hidden_by': None, + 'icon': None, + 'labels': list([ + ]), + 'name': None, + 'options': dict({ + }), + 'original_device_class': , + 'original_icon': None, + 'original_name': 'Hue ambiance spot Identify', + 'platform': 'homekit_controller', + 'previous_unique_id': None, + 'supported_features': 0, + 'translation_key': None, + 'unique_id': '00:00:00:00:00:00_6623462412413293_1_6', + 'unit_of_measurement': None, + }), + 'state': dict({ + 'attributes': dict({ + 'device_class': 'identify', + 'friendly_name': 'Hue ambiance spot Identify', + }), + 'entity_id': 'button.hue_ambiance_spot_identify', + 'state': 'unknown', + }), + }), + dict({ + 'entry': dict({ + 'aliases': list([ + ]), + 'area_id': None, + 'capabilities': dict({ + 'max_color_temp_kelvin': 6535, + 'max_mireds': 454, + 'min_color_temp_kelvin': 2202, + 'min_mireds': 153, + 'supported_color_modes': list([ + , + ]), + }), + 'categories': dict({ + }), + 'config_entry_id': 'TestData', + 'device_class': None, + 'disabled_by': None, + 'domain': 'light', + 'entity_category': None, + 'entity_id': 'light.hue_ambiance_spot', + 'has_entity_name': False, + 'hidden_by': None, + 'icon': None, + 'labels': list([ + ]), + 'name': None, + 'options': dict({ + }), + 'original_device_class': None, + 'original_icon': None, + 'original_name': 'Hue ambiance spot', + 'platform': 'homekit_controller', + 'previous_unique_id': None, + 'supported_features': 0, + 'translation_key': None, + 'unique_id': '00:00:00:00:00:00_6623462412413293_2816', + 'unit_of_measurement': None, + }), + 'state': dict({ + 'attributes': dict({ + 'brightness': 255.0, + 'color_mode': , + 'color_temp': 366, + 'color_temp_kelvin': 2732, + 'friendly_name': 'Hue ambiance spot', + 'hs_color': tuple( + 28.327, + 64.71, + ), + 'max_color_temp_kelvin': 6535, + 'max_mireds': 454, + 'min_color_temp_kelvin': 2202, + 'min_mireds': 153, + 'rgb_color': tuple( + 255, + 167, + 89, + ), + 'supported_color_modes': list([ + , + ]), + 'supported_features': , + 'xy_color': tuple( + 0.524, + 0.387, + ), + }), + 'entity_id': 'light.hue_ambiance_spot', + 'state': 'on', + }), + }), + ]), + }), dict({ 'device': dict({ 'area_id': None, @@ -11852,7 +11791,6 @@ 'model': 'RWL021', 'name': 'Hue dimmer switch', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '6623462389072572', 'suggested_area': None, 'sw_version': '45.1.17846', @@ -12168,7 +12106,6 @@ 'model': 'LWB010', 'name': 'Hue white lamp', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '6623462378982941', 'suggested_area': None, 'sw_version': '1.46.13', @@ -12292,7 +12229,6 @@ 'model': 'LWB010', 'name': 'Hue white lamp', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '6623462378983942', 'suggested_area': None, 'sw_version': '1.46.13', @@ -12391,130 +12327,6 @@ }), ]), }), - dict({ - 'device': dict({ - 'area_id': None, - 'config_entries': list([ - 'TestData', - ]), - 'configuration_url': None, - 'connections': list([ - ]), - 'disabled_by': None, - 'entry_type': None, - 'hw_version': '', - 'identifiers': list([ - list([ - 'homekit_controller:accessory-id', - '00:00:00:00:00:00:aid:6623462379123707', - ]), - ]), - 'is_new': False, - 'labels': list([ - ]), - 'manufacturer': 'Philips', - 'model': 'LWB010', - 'name': 'Hue white lamp', - 'name_by_user': None, - 'primary_integration': 'homekit_controller', - 'serial_number': '6623462379123707', - 'suggested_area': None, - 'sw_version': '1.46.13', - }), - 'entities': list([ - dict({ - 'entry': dict({ - 'aliases': list([ - ]), - 'area_id': None, - 'capabilities': None, - 'categories': dict({ - }), - 'config_entry_id': 'TestData', - 'device_class': None, - 'disabled_by': None, - 'domain': 'button', - 'entity_category': , - 'entity_id': 'button.hue_white_lamp_identify_3', - 'has_entity_name': False, - 'hidden_by': None, - 'icon': None, - 'labels': list([ - ]), - 'name': None, - 'options': dict({ - }), - 'original_device_class': , - 'original_icon': None, - 'original_name': 'Hue white lamp Identify', - 'platform': 'homekit_controller', - 'previous_unique_id': None, - 'supported_features': 0, - 'translation_key': None, - 'unique_id': '00:00:00:00:00:00_6623462379123707_1_6', - 'unit_of_measurement': None, - }), - 'state': dict({ - 'attributes': dict({ - 'device_class': 'identify', - 'friendly_name': 'Hue white lamp Identify', - }), - 'entity_id': 'button.hue_white_lamp_identify_3', - 'state': 'unknown', - }), - }), - dict({ - 'entry': dict({ - 'aliases': list([ - ]), - 'area_id': None, - 'capabilities': dict({ - 'supported_color_modes': list([ - , - ]), - }), - 'categories': dict({ - }), - 'config_entry_id': 'TestData', - 'device_class': None, - 'disabled_by': None, - 'domain': 'light', - 'entity_category': None, - 'entity_id': 'light.hue_white_lamp_3', - 'has_entity_name': False, - 'hidden_by': None, - 'icon': None, - 'labels': list([ - ]), - 'name': None, - 'options': dict({ - }), - 'original_device_class': None, - 'original_icon': None, - 'original_name': 'Hue white lamp', - 'platform': 'homekit_controller', - 'previous_unique_id': None, - 'supported_features': 0, - 'translation_key': None, - 'unique_id': '00:00:00:00:00:00_6623462379123707_2816', - 'unit_of_measurement': None, - }), - 'state': dict({ - 'attributes': dict({ - 'brightness': None, - 'color_mode': None, - 'friendly_name': 'Hue white lamp', - 'supported_color_modes': list([ - , - ]), - 'supported_features': , - }), - 'entity_id': 'light.hue_white_lamp_3', - 'state': 'off', - }), - }), - ]), - }), dict({ 'device': dict({ 'area_id': None, @@ -12540,7 +12352,6 @@ 'model': 'LWB010', 'name': 'Hue white lamp', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '6623462379122122', 'suggested_area': None, 'sw_version': '1.46.13', @@ -12654,7 +12465,7 @@ 'identifiers': list([ list([ 'homekit_controller:accessory-id', - '00:00:00:00:00:00:aid:6623462385996792', + '00:00:00:00:00:00:aid:6623462379123707', ]), ]), 'is_new': False, @@ -12664,8 +12475,7 @@ 'model': 'LWB010', 'name': 'Hue white lamp', 'name_by_user': None, - 'primary_integration': 'homekit_controller', - 'serial_number': '6623462385996792', + 'serial_number': '6623462379123707', 'suggested_area': None, 'sw_version': '1.46.13', }), @@ -12683,7 +12493,7 @@ 'disabled_by': None, 'domain': 'button', 'entity_category': , - 'entity_id': 'button.hue_white_lamp_identify_5', + 'entity_id': 'button.hue_white_lamp_identify_3', 'has_entity_name': False, 'hidden_by': None, 'icon': None, @@ -12699,7 +12509,7 @@ 'previous_unique_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00:00:00:00:00:00_6623462385996792_1_6', + 'unique_id': '00:00:00:00:00:00_6623462379123707_1_6', 'unit_of_measurement': None, }), 'state': dict({ @@ -12707,7 +12517,7 @@ 'device_class': 'identify', 'friendly_name': 'Hue white lamp Identify', }), - 'entity_id': 'button.hue_white_lamp_identify_5', + 'entity_id': 'button.hue_white_lamp_identify_3', 'state': 'unknown', }), }), @@ -12728,7 +12538,7 @@ 'disabled_by': None, 'domain': 'light', 'entity_category': None, - 'entity_id': 'light.hue_white_lamp_5', + 'entity_id': 'light.hue_white_lamp_3', 'has_entity_name': False, 'hidden_by': None, 'icon': None, @@ -12744,7 +12554,7 @@ 'previous_unique_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00:00:00:00:00:00_6623462385996792_2816', + 'unique_id': '00:00:00:00:00:00_6623462379123707_2816', 'unit_of_measurement': None, }), 'state': dict({ @@ -12757,131 +12567,7 @@ ]), 'supported_features': , }), - 'entity_id': 'light.hue_white_lamp_5', - 'state': 'off', - }), - }), - ]), - }), - dict({ - 'device': dict({ - 'area_id': None, - 'config_entries': list([ - 'TestData', - ]), - 'configuration_url': None, - 'connections': list([ - ]), - 'disabled_by': None, - 'entry_type': None, - 'hw_version': '', - 'identifiers': list([ - list([ - 'homekit_controller:accessory-id', - '00:00:00:00:00:00:aid:6623462383114193', - ]), - ]), - 'is_new': False, - 'labels': list([ - ]), - 'manufacturer': 'Philips', - 'model': 'LWB010', - 'name': 'Hue white lamp', - 'name_by_user': None, - 'primary_integration': 'homekit_controller', - 'serial_number': '6623462383114193', - 'suggested_area': None, - 'sw_version': '1.46.13', - }), - 'entities': list([ - dict({ - 'entry': dict({ - 'aliases': list([ - ]), - 'area_id': None, - 'capabilities': None, - 'categories': dict({ - }), - 'config_entry_id': 'TestData', - 'device_class': None, - 'disabled_by': None, - 'domain': 'button', - 'entity_category': , - 'entity_id': 'button.hue_white_lamp_identify_6', - 'has_entity_name': False, - 'hidden_by': None, - 'icon': None, - 'labels': list([ - ]), - 'name': None, - 'options': dict({ - }), - 'original_device_class': , - 'original_icon': None, - 'original_name': 'Hue white lamp Identify', - 'platform': 'homekit_controller', - 'previous_unique_id': None, - 'supported_features': 0, - 'translation_key': None, - 'unique_id': '00:00:00:00:00:00_6623462383114193_1_6', - 'unit_of_measurement': None, - }), - 'state': dict({ - 'attributes': dict({ - 'device_class': 'identify', - 'friendly_name': 'Hue white lamp Identify', - }), - 'entity_id': 'button.hue_white_lamp_identify_6', - 'state': 'unknown', - }), - }), - dict({ - 'entry': dict({ - 'aliases': list([ - ]), - 'area_id': None, - 'capabilities': dict({ - 'supported_color_modes': list([ - , - ]), - }), - 'categories': dict({ - }), - 'config_entry_id': 'TestData', - 'device_class': None, - 'disabled_by': None, - 'domain': 'light', - 'entity_category': None, - 'entity_id': 'light.hue_white_lamp_6', - 'has_entity_name': False, - 'hidden_by': None, - 'icon': None, - 'labels': list([ - ]), - 'name': None, - 'options': dict({ - }), - 'original_device_class': None, - 'original_icon': None, - 'original_name': 'Hue white lamp', - 'platform': 'homekit_controller', - 'previous_unique_id': None, - 'supported_features': 0, - 'translation_key': None, - 'unique_id': '00:00:00:00:00:00_6623462383114193_2816', - 'unit_of_measurement': None, - }), - 'state': dict({ - 'attributes': dict({ - 'brightness': None, - 'color_mode': None, - 'friendly_name': 'Hue white lamp', - 'supported_color_modes': list([ - , - ]), - 'supported_features': , - }), - 'entity_id': 'light.hue_white_lamp_6', + 'entity_id': 'light.hue_white_lamp_3', 'state': 'off', }), }), @@ -12912,7 +12598,6 @@ 'model': 'LWB010', 'name': 'Hue white lamp', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '6623462383114163', 'suggested_area': None, 'sw_version': '1.46.13', @@ -13011,6 +12696,252 @@ }), ]), }), + dict({ + 'device': dict({ + 'area_id': None, + 'config_entries': list([ + 'TestData', + ]), + 'configuration_url': None, + 'connections': list([ + ]), + 'disabled_by': None, + 'entry_type': None, + 'hw_version': '', + 'identifiers': list([ + list([ + 'homekit_controller:accessory-id', + '00:00:00:00:00:00:aid:6623462383114193', + ]), + ]), + 'is_new': False, + 'labels': list([ + ]), + 'manufacturer': 'Philips', + 'model': 'LWB010', + 'name': 'Hue white lamp', + 'name_by_user': None, + 'serial_number': '6623462383114193', + 'suggested_area': None, + 'sw_version': '1.46.13', + }), + 'entities': list([ + dict({ + 'entry': dict({ + 'aliases': list([ + ]), + 'area_id': None, + 'capabilities': None, + 'categories': dict({ + }), + 'config_entry_id': 'TestData', + 'device_class': None, + 'disabled_by': None, + 'domain': 'button', + 'entity_category': , + 'entity_id': 'button.hue_white_lamp_identify_6', + 'has_entity_name': False, + 'hidden_by': None, + 'icon': None, + 'labels': list([ + ]), + 'name': None, + 'options': dict({ + }), + 'original_device_class': , + 'original_icon': None, + 'original_name': 'Hue white lamp Identify', + 'platform': 'homekit_controller', + 'previous_unique_id': None, + 'supported_features': 0, + 'translation_key': None, + 'unique_id': '00:00:00:00:00:00_6623462383114193_1_6', + 'unit_of_measurement': None, + }), + 'state': dict({ + 'attributes': dict({ + 'device_class': 'identify', + 'friendly_name': 'Hue white lamp Identify', + }), + 'entity_id': 'button.hue_white_lamp_identify_6', + 'state': 'unknown', + }), + }), + dict({ + 'entry': dict({ + 'aliases': list([ + ]), + 'area_id': None, + 'capabilities': dict({ + 'supported_color_modes': list([ + , + ]), + }), + 'categories': dict({ + }), + 'config_entry_id': 'TestData', + 'device_class': None, + 'disabled_by': None, + 'domain': 'light', + 'entity_category': None, + 'entity_id': 'light.hue_white_lamp_6', + 'has_entity_name': False, + 'hidden_by': None, + 'icon': None, + 'labels': list([ + ]), + 'name': None, + 'options': dict({ + }), + 'original_device_class': None, + 'original_icon': None, + 'original_name': 'Hue white lamp', + 'platform': 'homekit_controller', + 'previous_unique_id': None, + 'supported_features': 0, + 'translation_key': None, + 'unique_id': '00:00:00:00:00:00_6623462383114193_2816', + 'unit_of_measurement': None, + }), + 'state': dict({ + 'attributes': dict({ + 'brightness': None, + 'color_mode': None, + 'friendly_name': 'Hue white lamp', + 'supported_color_modes': list([ + , + ]), + 'supported_features': , + }), + 'entity_id': 'light.hue_white_lamp_6', + 'state': 'off', + }), + }), + ]), + }), + dict({ + 'device': dict({ + 'area_id': None, + 'config_entries': list([ + 'TestData', + ]), + 'configuration_url': None, + 'connections': list([ + ]), + 'disabled_by': None, + 'entry_type': None, + 'hw_version': '', + 'identifiers': list([ + list([ + 'homekit_controller:accessory-id', + '00:00:00:00:00:00:aid:6623462385996792', + ]), + ]), + 'is_new': False, + 'labels': list([ + ]), + 'manufacturer': 'Philips', + 'model': 'LWB010', + 'name': 'Hue white lamp', + 'name_by_user': None, + 'serial_number': '6623462385996792', + 'suggested_area': None, + 'sw_version': '1.46.13', + }), + 'entities': list([ + dict({ + 'entry': dict({ + 'aliases': list([ + ]), + 'area_id': None, + 'capabilities': None, + 'categories': dict({ + }), + 'config_entry_id': 'TestData', + 'device_class': None, + 'disabled_by': None, + 'domain': 'button', + 'entity_category': , + 'entity_id': 'button.hue_white_lamp_identify_5', + 'has_entity_name': False, + 'hidden_by': None, + 'icon': None, + 'labels': list([ + ]), + 'name': None, + 'options': dict({ + }), + 'original_device_class': , + 'original_icon': None, + 'original_name': 'Hue white lamp Identify', + 'platform': 'homekit_controller', + 'previous_unique_id': None, + 'supported_features': 0, + 'translation_key': None, + 'unique_id': '00:00:00:00:00:00_6623462385996792_1_6', + 'unit_of_measurement': None, + }), + 'state': dict({ + 'attributes': dict({ + 'device_class': 'identify', + 'friendly_name': 'Hue white lamp Identify', + }), + 'entity_id': 'button.hue_white_lamp_identify_5', + 'state': 'unknown', + }), + }), + dict({ + 'entry': dict({ + 'aliases': list([ + ]), + 'area_id': None, + 'capabilities': dict({ + 'supported_color_modes': list([ + , + ]), + }), + 'categories': dict({ + }), + 'config_entry_id': 'TestData', + 'device_class': None, + 'disabled_by': None, + 'domain': 'light', + 'entity_category': None, + 'entity_id': 'light.hue_white_lamp_5', + 'has_entity_name': False, + 'hidden_by': None, + 'icon': None, + 'labels': list([ + ]), + 'name': None, + 'options': dict({ + }), + 'original_device_class': None, + 'original_icon': None, + 'original_name': 'Hue white lamp', + 'platform': 'homekit_controller', + 'previous_unique_id': None, + 'supported_features': 0, + 'translation_key': None, + 'unique_id': '00:00:00:00:00:00_6623462385996792_2816', + 'unit_of_measurement': None, + }), + 'state': dict({ + 'attributes': dict({ + 'brightness': None, + 'color_mode': None, + 'friendly_name': 'Hue white lamp', + 'supported_color_modes': list([ + , + ]), + 'supported_features': , + }), + 'entity_id': 'light.hue_white_lamp_5', + 'state': 'off', + }), + }), + ]), + }), dict({ 'device': dict({ 'area_id': None, @@ -13036,7 +12967,6 @@ 'model': 'BSB002', 'name': 'Philips hue - 482544', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '123456', 'suggested_area': None, 'sw_version': '1.32.1932126170', @@ -13114,7 +13044,6 @@ 'model': 'LS1', 'name': 'Koogeek-LS1-20833F', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'AAAA011111111111', 'suggested_area': None, 'sw_version': '2.2.15', @@ -13257,7 +13186,6 @@ 'model': 'P1EU', 'name': 'Koogeek-P1-A00AA0', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'EUCP03190xxxxx48', 'suggested_area': None, 'sw_version': '2.3.7', @@ -13421,7 +13349,6 @@ 'model': 'KH02CN', 'name': 'Koogeek-SW2-187A91', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'CNNT061751001372', 'suggested_area': None, 'sw_version': '1.0.3', @@ -13624,7 +13551,6 @@ 'model': 'E30 2B', 'name': 'Lennox', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'XXXXXXXX', 'suggested_area': None, 'sw_version': '3.40.XX', @@ -13905,7 +13831,6 @@ 'model': 'OLED55B9PUA', 'name': 'LG webOS TV AF80', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '999AAAAAA999', 'suggested_area': None, 'sw_version': '04.71.04', @@ -14085,7 +14010,6 @@ 'model': 'PD-FSQN-XX', 'name': 'Caséta® Wireless Fan Speed Control', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '39024290', 'suggested_area': None, 'sw_version': '001.005', @@ -14206,7 +14130,6 @@ 'model': 'L-BDG2-WH', 'name': 'Smart Bridge 2', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '12344331', 'suggested_area': None, 'sw_version': '08.08', @@ -14284,7 +14207,6 @@ 'model': 'MSS425F', 'name': 'MSS425F-15cc', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'HH41234', 'suggested_area': None, 'sw_version': '4.2.3', @@ -14562,7 +14484,6 @@ 'model': 'MSS565', 'name': 'MSS565-28da', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'BB1121', 'suggested_area': None, 'sw_version': '4.1.9', @@ -14690,7 +14611,6 @@ 'model': 'v1', 'name': 'Mysa-85dda9', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'AAAAAAA000', 'suggested_area': None, 'sw_version': '2.8.1', @@ -15019,7 +14939,6 @@ 'model': 'NL55', 'name': 'Nanoleaf Strip 3B32', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'AAAA011111111111', 'suggested_area': None, 'sw_version': '1.4.40', @@ -15290,7 +15209,6 @@ 'model': 'Netatmo Doorbell', 'name': 'Netatmo-Doorbell-g738658', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'g738658', 'suggested_area': None, 'sw_version': '80.0.0', @@ -15583,7 +15501,6 @@ 'model': 'Smart CO Alarm', 'name': 'Smart CO Alarm', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '1234', 'suggested_area': None, 'sw_version': '1.0.3', @@ -15743,7 +15660,6 @@ 'model': 'Healthy Home Coach', 'name': 'Healthy Home Coach', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'AAAAAAAAAAAAA', 'suggested_area': None, 'sw_version': '59', @@ -16045,7 +15961,6 @@ 'model': 'SPK5 Pro', 'name': 'RainMachine-00ce4a', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '00aa0000aa0a', 'suggested_area': None, 'sw_version': '1.0.4', @@ -16467,7 +16382,6 @@ 'model': 'RYSE Shade', 'name': 'Master Bath South', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '1.0.0', 'suggested_area': None, 'sw_version': '3.0.8', @@ -16629,7 +16543,6 @@ 'model': 'RYSE SmartBridge', 'name': 'RYSE SmartBridge', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '0101.3521.0436', 'suggested_area': None, 'sw_version': '1.3.0', @@ -16703,7 +16616,6 @@ 'model': 'RYSE Shade', 'name': 'RYSE SmartShade', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '', 'suggested_area': None, 'sw_version': '', @@ -16869,7 +16781,6 @@ 'model': 'RYSE Shade', 'name': 'BR Left', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '1.0.0', 'suggested_area': None, 'sw_version': '3.0.8', @@ -17031,7 +16942,6 @@ 'model': 'RYSE Shade', 'name': 'LR Left', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '1.0.0', 'suggested_area': None, 'sw_version': '3.0.8', @@ -17193,7 +17103,6 @@ 'model': 'RYSE Shade', 'name': 'LR Right', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '1.0.0', 'suggested_area': None, 'sw_version': '3.0.8', @@ -17355,7 +17264,6 @@ 'model': 'RYSE SmartBridge', 'name': 'RYSE SmartBridge', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '0401.3521.0679', 'suggested_area': None, 'sw_version': '1.3.0', @@ -17429,7 +17337,6 @@ 'model': 'RYSE Shade', 'name': 'RZSS', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '1.0.0', 'suggested_area': None, 'sw_version': '3.0.8', @@ -17595,7 +17502,6 @@ 'model': 'BE479CAM619', 'name': 'SENSE ', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'AAAAAAA000', 'suggested_area': None, 'sw_version': '004.027.000', @@ -17714,7 +17620,6 @@ 'model': 'SIMPLEconnect', 'name': 'SIMPLEconnect Fan-06F674', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '1234567890abcd', 'suggested_area': None, 'sw_version': '', @@ -17890,7 +17795,6 @@ 'model': 'VELUX Gateway', 'name': 'VELUX Gateway', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'a1a11a1', 'suggested_area': None, 'sw_version': '70', @@ -17964,7 +17868,6 @@ 'model': 'VELUX Sensor', 'name': 'VELUX Sensor', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'a11b111', 'suggested_area': None, 'sw_version': '16', @@ -18173,7 +18076,6 @@ 'model': 'VELUX Window', 'name': 'VELUX Window', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': '1111111a114a111a', 'suggested_area': None, 'sw_version': '48', @@ -18294,7 +18196,6 @@ 'model': 'Flowerbud', 'name': 'VOCOlinc-Flowerbud-0d324b', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'AM01121849000327', 'suggested_area': None, 'sw_version': '3.121.2', @@ -18599,7 +18500,6 @@ 'model': 'VP3', 'name': 'VOCOlinc-VP3-123456', 'name_by_user': None, - 'primary_integration': 'homekit_controller', 'serial_number': 'EU0121203xxxxx07', 'suggested_area': None, 'sw_version': '1.101.2', diff --git a/tests/components/homekit_controller/test_connection.py b/tests/components/homekit_controller/test_connection.py index 0a77509d675..0f2cdb7c9db 100644 --- a/tests/components/homekit_controller/test_connection.py +++ b/tests/components/homekit_controller/test_connection.py @@ -118,7 +118,7 @@ async def test_migrate_device_id_no_serial_skip_if_other_owner( bridge = device_registry.async_get(bridge.id) assert bridge.identifiers == variant.before - assert bridge.config_entries == {entry.entry_id} + assert bridge.config_entries == [entry.entry_id] @pytest.mark.parametrize("variant", DEVICE_MIGRATION_TESTS) diff --git a/tests/components/homewizard/snapshots/test_button.ambr b/tests/components/homewizard/snapshots/test_button.ambr index 47b6a889900..5ab108d344c 100644 --- a/tests/components/homewizard/snapshots/test_button.ambr +++ b/tests/components/homewizard/snapshots/test_button.ambr @@ -74,7 +74,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', diff --git a/tests/components/homewizard/snapshots/test_number.ambr b/tests/components/homewizard/snapshots/test_number.ambr index ff1f22a4336..a9c9e45098d 100644 --- a/tests/components/homewizard/snapshots/test_number.ambr +++ b/tests/components/homewizard/snapshots/test_number.ambr @@ -83,7 +83,6 @@ 'model': 'HWE-SKT', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.03', @@ -174,7 +173,6 @@ 'model': 'HWE-SKT', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.07', diff --git a/tests/components/homewizard/snapshots/test_sensor.ambr b/tests/components/homewizard/snapshots/test_sensor.ambr index 7f402cd7872..5e8ddc0d6be 100644 --- a/tests/components/homewizard/snapshots/test_sensor.ambr +++ b/tests/components/homewizard/snapshots/test_sensor.ambr @@ -60,7 +60,6 @@ 'model': 'HWE-KWH1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -146,7 +145,6 @@ 'model': 'HWE-KWH1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -232,7 +230,6 @@ 'model': 'HWE-KWH1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -318,7 +315,6 @@ 'model': 'HWE-KWH1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -404,7 +400,6 @@ 'model': 'HWE-KWH1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -490,7 +485,6 @@ 'model': 'HWE-KWH1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -579,7 +573,6 @@ 'model': 'HWE-KWH1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -665,7 +658,6 @@ 'model': 'HWE-KWH1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -751,7 +743,6 @@ 'model': 'HWE-KWH1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -837,7 +828,6 @@ 'model': 'HWE-KWH1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -918,7 +908,6 @@ 'model': 'HWE-KWH1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -1003,7 +992,6 @@ 'model': 'HWE-KWH3', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -1089,7 +1077,6 @@ 'model': 'HWE-KWH3', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -1175,7 +1162,6 @@ 'model': 'HWE-KWH3', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -1261,7 +1247,6 @@ 'model': 'HWE-KWH3', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -1347,7 +1332,6 @@ 'model': 'HWE-KWH3', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -1433,7 +1417,6 @@ 'model': 'HWE-KWH3', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -1519,7 +1502,6 @@ 'model': 'HWE-KWH3', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -1605,7 +1587,6 @@ 'model': 'HWE-KWH3', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -1691,7 +1672,6 @@ 'model': 'HWE-KWH3', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -1777,7 +1757,6 @@ 'model': 'HWE-KWH3', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -1863,7 +1842,6 @@ 'model': 'HWE-KWH3', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -1949,7 +1927,6 @@ 'model': 'HWE-KWH3', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -2038,7 +2015,6 @@ 'model': 'HWE-KWH3', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -2124,7 +2100,6 @@ 'model': 'HWE-KWH3', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -2210,7 +2185,6 @@ 'model': 'HWE-KWH3', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -2296,7 +2270,6 @@ 'model': 'HWE-KWH3', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -2385,7 +2358,6 @@ 'model': 'HWE-KWH3', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -2474,7 +2446,6 @@ 'model': 'HWE-KWH3', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -2563,7 +2534,6 @@ 'model': 'HWE-KWH3', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -2649,7 +2619,6 @@ 'model': 'HWE-KWH3', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -2735,7 +2704,6 @@ 'model': 'HWE-KWH3', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -2821,7 +2789,6 @@ 'model': 'HWE-KWH3', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -2907,7 +2874,6 @@ 'model': 'HWE-KWH3', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -2993,7 +2959,6 @@ 'model': 'HWE-KWH3', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -3079,7 +3044,6 @@ 'model': 'HWE-KWH3', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -3165,7 +3129,6 @@ 'model': 'HWE-KWH3', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -3246,7 +3209,6 @@ 'model': 'HWE-KWH3', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -3331,7 +3293,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -3414,7 +3375,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -3500,7 +3460,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -3586,7 +3545,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -3672,7 +3630,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -3753,7 +3710,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -3839,7 +3795,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -3925,7 +3880,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -4011,7 +3965,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -4097,7 +4050,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -4183,7 +4135,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -4269,7 +4220,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -4355,7 +4305,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -4441,7 +4390,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -4527,7 +4475,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -4613,7 +4560,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -4699,7 +4645,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -4780,7 +4725,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -4863,7 +4807,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -4952,7 +4895,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -5033,7 +4975,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -5122,7 +5063,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -5211,7 +5151,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -5300,7 +5239,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -5381,7 +5319,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -5462,7 +5399,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -5557,7 +5493,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -5643,7 +5578,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -5729,7 +5663,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -5815,7 +5748,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -5901,7 +5833,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -5982,7 +5913,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -6063,7 +5993,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -6144,7 +6073,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -6225,7 +6153,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -6306,7 +6233,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -6387,7 +6313,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -6472,7 +6397,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -6553,7 +6477,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -6634,7 +6557,6 @@ 'model': 'HWE-P1', 'name': 'Gas meter', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': 'gas_meter_G001', 'suggested_area': None, 'sw_version': None, @@ -6716,7 +6638,6 @@ 'model': 'HWE-P1', 'name': 'Heat meter', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': 'heat_meter_H001', 'suggested_area': None, 'sw_version': None, @@ -6798,7 +6719,6 @@ 'model': 'HWE-P1', 'name': 'Inlet heat meter', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': 'inlet_heat_meter_IH001', 'suggested_area': None, 'sw_version': None, @@ -6879,7 +6799,6 @@ 'model': 'HWE-P1', 'name': 'Warm water meter', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': 'warm_water_meter_WW001', 'suggested_area': None, 'sw_version': None, @@ -6961,7 +6880,6 @@ 'model': 'HWE-P1', 'name': 'Water meter', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': 'water_meter_W001', 'suggested_area': None, 'sw_version': None, @@ -7047,7 +6965,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -7130,7 +7047,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -7216,7 +7132,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -7302,7 +7217,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -7388,7 +7302,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -7469,7 +7382,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -7555,7 +7467,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -7641,7 +7552,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -7727,7 +7637,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -7813,7 +7722,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -7899,7 +7807,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -7985,7 +7892,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -8071,7 +7977,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -8157,7 +8062,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -8243,7 +8147,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -8329,7 +8232,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -8415,7 +8317,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -8496,7 +8397,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -8579,7 +8479,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -8668,7 +8567,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -8749,7 +8647,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -8838,7 +8735,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -8927,7 +8823,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -9016,7 +8911,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -9097,7 +8991,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -9178,7 +9071,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -9273,7 +9165,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -9359,7 +9250,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -9445,7 +9335,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -9531,7 +9420,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -9617,7 +9505,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -9698,7 +9585,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -9779,7 +9665,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -9860,7 +9745,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -9941,7 +9825,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -10022,7 +9905,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -10103,7 +9985,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -10188,7 +10069,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -10269,7 +10149,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -10350,7 +10229,6 @@ 'model': 'HWE-P1', 'name': 'Gas meter', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': 'gas_meter_\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', 'suggested_area': None, 'sw_version': None, @@ -10432,7 +10310,6 @@ 'model': 'HWE-P1', 'name': 'Heat meter', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': 'heat_meter_\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', 'suggested_area': None, 'sw_version': None, @@ -10514,7 +10391,6 @@ 'model': 'HWE-P1', 'name': 'Inlet heat meter', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': 'inlet_heat_meter_\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', 'suggested_area': None, 'sw_version': None, @@ -10595,7 +10471,6 @@ 'model': 'HWE-P1', 'name': 'Warm water meter', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': 'warm_water_meter_\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', 'suggested_area': None, 'sw_version': None, @@ -10677,7 +10552,6 @@ 'model': 'HWE-P1', 'name': 'Water meter', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': 'water_meter_\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', 'suggested_area': None, 'sw_version': None, @@ -10763,7 +10637,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -10846,7 +10719,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -10932,7 +10804,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -11018,7 +10889,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -11104,7 +10974,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -11190,7 +11059,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -11276,7 +11144,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -11362,7 +11229,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -11448,7 +11314,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -11534,7 +11399,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -11620,7 +11484,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -11706,7 +11569,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -11792,7 +11654,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -11878,7 +11739,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -11964,7 +11824,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -12050,7 +11909,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -12131,7 +11989,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -12220,7 +12077,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -12301,7 +12157,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -12390,7 +12245,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -12479,7 +12333,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -12568,7 +12421,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -12654,7 +12506,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -12740,7 +12591,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -12826,7 +12676,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -12912,7 +12761,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -12993,7 +12841,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -13074,7 +12921,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -13155,7 +13001,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -13236,7 +13081,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -13317,7 +13161,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -13398,7 +13241,6 @@ 'model': 'HWE-P1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.19', @@ -13483,7 +13325,6 @@ 'model': 'HWE-SKT', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.03', @@ -13569,7 +13410,6 @@ 'model': 'HWE-SKT', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.03', @@ -13655,7 +13495,6 @@ 'model': 'HWE-SKT', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.03', @@ -13744,7 +13583,6 @@ 'model': 'HWE-SKT', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.03', @@ -13833,7 +13671,6 @@ 'model': 'HWE-SKT', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.03', @@ -13914,7 +13751,6 @@ 'model': 'HWE-SKT', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.03', @@ -13999,7 +13835,6 @@ 'model': 'HWE-SKT', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.07', @@ -14085,7 +13920,6 @@ 'model': 'HWE-SKT', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.07', @@ -14171,7 +14005,6 @@ 'model': 'HWE-SKT', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.07', @@ -14257,7 +14090,6 @@ 'model': 'HWE-SKT', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.07', @@ -14343,7 +14175,6 @@ 'model': 'HWE-SKT', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.07', @@ -14429,7 +14260,6 @@ 'model': 'HWE-SKT', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.07', @@ -14518,7 +14348,6 @@ 'model': 'HWE-SKT', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.07', @@ -14604,7 +14433,6 @@ 'model': 'HWE-SKT', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.07', @@ -14693,7 +14521,6 @@ 'model': 'HWE-SKT', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.07', @@ -14779,7 +14606,6 @@ 'model': 'HWE-SKT', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.07', @@ -14865,7 +14691,6 @@ 'model': 'HWE-SKT', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.07', @@ -14946,7 +14771,6 @@ 'model': 'HWE-SKT', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.07', @@ -15031,7 +14855,6 @@ 'model': 'HWE-WTR', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '2.03', @@ -15117,7 +14940,6 @@ 'model': 'HWE-WTR', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '2.03', @@ -15202,7 +15024,6 @@ 'model': 'HWE-WTR', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '2.03', @@ -15283,7 +15104,6 @@ 'model': 'HWE-WTR', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '2.03', @@ -15368,7 +15188,6 @@ 'model': 'SDM230-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -15454,7 +15273,6 @@ 'model': 'SDM230-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -15540,7 +15358,6 @@ 'model': 'SDM230-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -15626,7 +15443,6 @@ 'model': 'SDM230-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -15712,7 +15528,6 @@ 'model': 'SDM230-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -15798,7 +15613,6 @@ 'model': 'SDM230-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -15887,7 +15701,6 @@ 'model': 'SDM230-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -15973,7 +15786,6 @@ 'model': 'SDM230-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -16059,7 +15871,6 @@ 'model': 'SDM230-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -16145,7 +15956,6 @@ 'model': 'SDM230-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -16226,7 +16036,6 @@ 'model': 'SDM230-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -16311,7 +16120,6 @@ 'model': 'SDM630-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -16397,7 +16205,6 @@ 'model': 'SDM630-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -16483,7 +16290,6 @@ 'model': 'SDM630-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -16569,7 +16375,6 @@ 'model': 'SDM630-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -16655,7 +16460,6 @@ 'model': 'SDM630-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -16741,7 +16545,6 @@ 'model': 'SDM630-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -16827,7 +16630,6 @@ 'model': 'SDM630-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -16913,7 +16715,6 @@ 'model': 'SDM630-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -16999,7 +16800,6 @@ 'model': 'SDM630-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -17085,7 +16885,6 @@ 'model': 'SDM630-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -17171,7 +16970,6 @@ 'model': 'SDM630-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -17257,7 +17055,6 @@ 'model': 'SDM630-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -17346,7 +17143,6 @@ 'model': 'SDM630-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -17432,7 +17228,6 @@ 'model': 'SDM630-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -17518,7 +17313,6 @@ 'model': 'SDM630-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -17604,7 +17398,6 @@ 'model': 'SDM630-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -17693,7 +17486,6 @@ 'model': 'SDM630-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -17782,7 +17574,6 @@ 'model': 'SDM630-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -17871,7 +17662,6 @@ 'model': 'SDM630-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -17957,7 +17747,6 @@ 'model': 'SDM630-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -18043,7 +17832,6 @@ 'model': 'SDM630-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -18129,7 +17917,6 @@ 'model': 'SDM630-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -18215,7 +18002,6 @@ 'model': 'SDM630-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -18301,7 +18087,6 @@ 'model': 'SDM630-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -18387,7 +18172,6 @@ 'model': 'SDM630-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -18473,7 +18257,6 @@ 'model': 'SDM630-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -18554,7 +18337,6 @@ 'model': 'SDM630-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', diff --git a/tests/components/homewizard/snapshots/test_switch.ambr b/tests/components/homewizard/snapshots/test_switch.ambr index 2834999a9ba..99a5bcab6cb 100644 --- a/tests/components/homewizard/snapshots/test_switch.ambr +++ b/tests/components/homewizard/snapshots/test_switch.ambr @@ -73,7 +73,6 @@ 'model': 'HWE-KWH1', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -154,7 +153,6 @@ 'model': 'HWE-KWH3', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -236,7 +234,6 @@ 'model': 'HWE-SKT', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.03', @@ -317,7 +314,6 @@ 'model': 'HWE-SKT', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.03', @@ -398,7 +394,6 @@ 'model': 'HWE-SKT', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.03', @@ -480,7 +475,6 @@ 'model': 'HWE-SKT', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.07', @@ -561,7 +555,6 @@ 'model': 'HWE-SKT', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.07', @@ -642,7 +635,6 @@ 'model': 'HWE-SKT', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '4.07', @@ -723,7 +715,6 @@ 'model': 'HWE-WTR', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '2.03', @@ -804,7 +795,6 @@ 'model': 'SDM230-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', @@ -885,7 +875,6 @@ 'model': 'SDM630-wifi', 'name': 'Device', 'name_by_user': None, - 'primary_integration': 'homewizard', 'serial_number': None, 'suggested_area': None, 'sw_version': '3.06', diff --git a/tests/components/husqvarna_automower/snapshots/test_init.ambr b/tests/components/husqvarna_automower/snapshots/test_init.ambr index 07cab28b24e..c3a7191b4b9 100644 --- a/tests/components/husqvarna_automower/snapshots/test_init.ambr +++ b/tests/components/husqvarna_automower/snapshots/test_init.ambr @@ -23,7 +23,6 @@ 'model': '450XH-TEST', 'name': 'Test Mower 1', 'name_by_user': None, - 'primary_integration': 'husqvarna_automower', 'serial_number': 123, 'suggested_area': 'Garden', 'sw_version': None, diff --git a/tests/components/hyperion/test_camera.py b/tests/components/hyperion/test_camera.py index 0169759f328..41b66f4ad4a 100644 --- a/tests/components/hyperion/test_camera.py +++ b/tests/components/hyperion/test_camera.py @@ -198,7 +198,7 @@ async def test_device_info( device = device_registry.async_get_device(identifiers={(DOMAIN, device_id)}) assert device - assert device.config_entries == {TEST_CONFIG_ENTRY_ID} + assert device.config_entries == [TEST_CONFIG_ENTRY_ID] assert device.identifiers == {(DOMAIN, device_id)} assert device.manufacturer == HYPERION_MANUFACTURER_NAME assert device.model == HYPERION_MODEL_NAME diff --git a/tests/components/hyperion/test_light.py b/tests/components/hyperion/test_light.py index e1e7711e702..b7aef3ac2ac 100644 --- a/tests/components/hyperion/test_light.py +++ b/tests/components/hyperion/test_light.py @@ -803,7 +803,7 @@ async def test_device_info( device = device_registry.async_get_device(identifiers={(DOMAIN, device_id)}) assert device - assert device.config_entries == {TEST_CONFIG_ENTRY_ID} + assert device.config_entries == [TEST_CONFIG_ENTRY_ID] assert device.identifiers == {(DOMAIN, device_id)} assert device.manufacturer == HYPERION_MANUFACTURER_NAME assert device.model == HYPERION_MODEL_NAME diff --git a/tests/components/hyperion/test_sensor.py b/tests/components/hyperion/test_sensor.py index 5ace34eaac0..bc58c07ac7b 100644 --- a/tests/components/hyperion/test_sensor.py +++ b/tests/components/hyperion/test_sensor.py @@ -66,7 +66,7 @@ async def test_device_info( device = device_registry.async_get_device(identifiers={(DOMAIN, device_identifer)}) assert device - assert device.config_entries == {TEST_CONFIG_ENTRY_ID} + assert device.config_entries == [TEST_CONFIG_ENTRY_ID] assert device.identifiers == {(DOMAIN, device_identifer)} assert device.manufacturer == HYPERION_MANUFACTURER_NAME assert device.model == HYPERION_MODEL_NAME diff --git a/tests/components/hyperion/test_switch.py b/tests/components/hyperion/test_switch.py index da458820c81..17a1872f832 100644 --- a/tests/components/hyperion/test_switch.py +++ b/tests/components/hyperion/test_switch.py @@ -170,7 +170,7 @@ async def test_device_info( device = device_registry.async_get_device(identifiers={(DOMAIN, device_identifer)}) assert device - assert device.config_entries == {TEST_CONFIG_ENTRY_ID} + assert device.config_entries == [TEST_CONFIG_ENTRY_ID] assert device.identifiers == {(DOMAIN, device_identifer)} assert device.manufacturer == HYPERION_MANUFACTURER_NAME assert device.model == HYPERION_MODEL_NAME diff --git a/tests/components/ista_ecotrend/snapshots/test_init.ambr b/tests/components/ista_ecotrend/snapshots/test_init.ambr index 7cc44872071..a9d13510b54 100644 --- a/tests/components/ista_ecotrend/snapshots/test_init.ambr +++ b/tests/components/ista_ecotrend/snapshots/test_init.ambr @@ -23,7 +23,6 @@ 'model': 'ista EcoTrend', 'name': 'Luxemburger Str. 1', 'name_by_user': None, - 'primary_integration': 'ista_ecotrend', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -54,7 +53,6 @@ 'model': 'ista EcoTrend', 'name': 'Bahnhofsstr. 1A', 'name_by_user': None, - 'primary_integration': 'ista_ecotrend', 'serial_number': None, 'suggested_area': None, 'sw_version': None, diff --git a/tests/components/kitchen_sink/snapshots/test_switch.ambr b/tests/components/kitchen_sink/snapshots/test_switch.ambr index 2f928ddc430..1cd903a59d6 100644 --- a/tests/components/kitchen_sink/snapshots/test_switch.ambr +++ b/tests/components/kitchen_sink/snapshots/test_switch.ambr @@ -69,7 +69,6 @@ 'model': None, 'name': 'Outlet 1', 'name_by_user': None, - 'primary_integration': 'kitchen_sink', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -100,7 +99,6 @@ 'model': None, 'name': 'Power strip with 2 sockets', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -177,7 +175,6 @@ 'model': None, 'name': 'Outlet 2', 'name_by_user': None, - 'primary_integration': 'kitchen_sink', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -208,7 +205,6 @@ 'model': None, 'name': 'Power strip with 2 sockets', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, diff --git a/tests/components/lamarzocco/snapshots/test_switch.ambr b/tests/components/lamarzocco/snapshots/test_switch.ambr index 162fade77d6..09864be1d5c 100644 --- a/tests/components/lamarzocco/snapshots/test_switch.ambr +++ b/tests/components/lamarzocco/snapshots/test_switch.ambr @@ -115,7 +115,6 @@ 'model': , 'name': 'GS01234', 'name_by_user': None, - 'primary_integration': 'lamarzocco', 'serial_number': 'GS01234', 'suggested_area': None, 'sw_version': '1.40', diff --git a/tests/components/lifx/test_migration.py b/tests/components/lifx/test_migration.py index 0604ee1c8a7..62018790906 100644 --- a/tests/components/lifx/test_migration.py +++ b/tests/components/lifx/test_migration.py @@ -65,7 +65,7 @@ async def test_migration_device_online_end_to_end( assert migrated_entry is not None - assert device.config_entries == {migrated_entry.entry_id} + assert device.config_entries == [migrated_entry.entry_id] assert light_entity_reg.config_entry_id == migrated_entry.entry_id assert er.async_entries_for_config_entry(entity_reg, config_entry) == [] @@ -195,7 +195,7 @@ async def test_migration_device_online_end_to_end_after_downgrade( async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=20)) await hass.async_block_till_done() - assert device.config_entries == {config_entry.entry_id} + assert device.config_entries == [config_entry.entry_id] assert light_entity_reg.config_entry_id == config_entry.entry_id assert er.async_entries_for_config_entry(entity_reg, config_entry) == [] @@ -276,7 +276,7 @@ async def test_migration_device_online_end_to_end_ignores_other_devices( assert new_entry is not None assert legacy_entry is None - assert device.config_entries == {legacy_config_entry.entry_id} + assert device.config_entries == [legacy_config_entry.entry_id] assert light_entity_reg.config_entry_id == legacy_config_entry.entry_id assert ignored_entity_reg.config_entry_id == other_domain_config_entry.entry_id assert garbage_entity_reg.config_entry_id == legacy_config_entry.entry_id diff --git a/tests/components/lutron_caseta/test_logbook.py b/tests/components/lutron_caseta/test_logbook.py index b6e8840c85c..51c96b9d9a9 100644 --- a/tests/components/lutron_caseta/test_logbook.py +++ b/tests/components/lutron_caseta/test_logbook.py @@ -111,7 +111,7 @@ async def test_humanify_lutron_caseta_button_event_integration_not_loaded( await hass.async_block_till_done() for device in device_registry.devices.values(): - if device.config_entries == {config_entry.entry_id}: + if device.config_entries == [config_entry.entry_id]: dr_device_id = device.id break diff --git a/tests/components/motioneye/test_camera.py b/tests/components/motioneye/test_camera.py index 0f3a7d6f904..ccbdc022495 100644 --- a/tests/components/motioneye/test_camera.py +++ b/tests/components/motioneye/test_camera.py @@ -339,7 +339,7 @@ async def test_device_info( device = device_registry.async_get_device(identifiers={device_identifier}) assert device - assert device.config_entries == {TEST_CONFIG_ENTRY_ID} + assert device.config_entries == [TEST_CONFIG_ENTRY_ID] assert device.identifiers == {device_identifier} assert device.manufacturer == MOTIONEYE_MANUFACTURER assert device.model == MOTIONEYE_MANUFACTURER diff --git a/tests/components/mqtt/test_discovery.py b/tests/components/mqtt/test_discovery.py index 020ab4a09a9..911d205269c 100644 --- a/tests/components/mqtt/test_discovery.py +++ b/tests/components/mqtt/test_discovery.py @@ -976,10 +976,10 @@ async def test_cleanup_device_multiple_config_entries( connections={("mac", "12:34:56:AB:CD:EF")} ) assert device_entry is not None - assert device_entry.config_entries == { - mqtt_config_entry.entry_id, + assert device_entry.config_entries == [ config_entry.entry_id, - } + mqtt_config_entry.entry_id, + ] entity_entry = entity_registry.async_get("sensor.none_mqtt_sensor") assert entity_entry is not None @@ -1002,7 +1002,7 @@ async def test_cleanup_device_multiple_config_entries( ) assert device_entry is not None entity_entry = entity_registry.async_get("sensor.none_mqtt_sensor") - assert device_entry.config_entries == {config_entry.entry_id} + assert device_entry.config_entries == [config_entry.entry_id] assert entity_entry is None # Verify state is removed @@ -1070,10 +1070,10 @@ async def test_cleanup_device_multiple_config_entries_mqtt( connections={("mac", "12:34:56:AB:CD:EF")} ) assert device_entry is not None - assert device_entry.config_entries == { - mqtt_config_entry.entry_id, + assert device_entry.config_entries == [ config_entry.entry_id, - } + mqtt_config_entry.entry_id, + ] entity_entry = entity_registry.async_get("sensor.none_mqtt_sensor") assert entity_entry is not None @@ -1094,7 +1094,7 @@ async def test_cleanup_device_multiple_config_entries_mqtt( ) assert device_entry is not None entity_entry = entity_registry.async_get("sensor.none_mqtt_sensor") - assert device_entry.config_entries == {config_entry.entry_id} + assert device_entry.config_entries == [config_entry.entry_id] assert entity_entry is None # Verify state is removed diff --git a/tests/components/mqtt/test_tag.py b/tests/components/mqtt/test_tag.py index 0d0765258f2..e70c06c2c4a 100644 --- a/tests/components/mqtt/test_tag.py +++ b/tests/components/mqtt/test_tag.py @@ -587,7 +587,7 @@ async def test_cleanup_tag( identifiers={("mqtt", "helloworld")} ) assert device_entry1 is not None - assert device_entry1.config_entries == {config_entry.entry_id, mqtt_entry.entry_id} + assert device_entry1.config_entries == [config_entry.entry_id, mqtt_entry.entry_id] device_entry2 = device_registry.async_get_device(identifiers={("mqtt", "hejhopp")}) assert device_entry2 is not None @@ -599,7 +599,7 @@ async def test_cleanup_tag( identifiers={("mqtt", "helloworld")} ) assert device_entry1 is not None - assert device_entry1.config_entries == {mqtt_entry.entry_id} + assert device_entry1.config_entries == [mqtt_entry.entry_id] device_entry2 = device_registry.async_get_device(identifiers={("mqtt", "hejhopp")}) assert device_entry2 is not None mqtt_mock.async_publish.assert_not_called() diff --git a/tests/components/netatmo/snapshots/test_init.ambr b/tests/components/netatmo/snapshots/test_init.ambr index f844e05e94b..8f4b357fc5f 100644 --- a/tests/components/netatmo/snapshots/test_init.ambr +++ b/tests/components/netatmo/snapshots/test_init.ambr @@ -23,7 +23,6 @@ 'model': 'Roller Shutter', 'name': 'Entrance Blinds', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -54,7 +53,6 @@ 'model': 'Orientable Shutter', 'name': 'Bubendorff blind', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -85,7 +83,6 @@ 'model': '2 wire light switch/dimmer', 'name': 'Unknown 00:11:22:33:00:11:45:fe', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -116,7 +113,6 @@ 'model': 'Smarther with Netatmo', 'name': 'Corridor', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': 'Corridor', 'sw_version': None, @@ -147,7 +143,6 @@ 'model': 'Connected Energy Meter', 'name': 'Consumption meter', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -178,7 +173,6 @@ 'model': 'Light switch/dimmer with neutral', 'name': 'Bathroom light', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -209,7 +203,6 @@ 'model': 'Connected Ecometer', 'name': 'Line 1', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -240,7 +233,6 @@ 'model': 'Connected Ecometer', 'name': 'Line 2', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -271,7 +263,6 @@ 'model': 'Connected Ecometer', 'name': 'Line 3', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -302,7 +293,6 @@ 'model': 'Connected Ecometer', 'name': 'Line 4', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -333,7 +323,6 @@ 'model': 'Connected Ecometer', 'name': 'Line 5', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -364,7 +353,6 @@ 'model': 'Connected Ecometer', 'name': 'Total', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -395,7 +383,6 @@ 'model': 'Connected Ecometer', 'name': 'Gas', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -426,7 +413,6 @@ 'model': 'Connected Ecometer', 'name': 'Hot water', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -457,7 +443,6 @@ 'model': 'Connected Ecometer', 'name': 'Cold water', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -488,7 +473,6 @@ 'model': 'Connected Ecometer', 'name': 'Écocompteur', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -519,7 +503,6 @@ 'model': 'Smart Indoor Camera', 'name': 'Hall', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -550,7 +533,6 @@ 'model': 'Smart Anemometer', 'name': 'Villa Garden', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -581,7 +563,6 @@ 'model': 'Smart Outdoor Camera', 'name': 'Front', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -612,7 +593,6 @@ 'model': 'Smart Video Doorbell', 'name': 'Netatmo-Doorbell', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -643,7 +623,6 @@ 'model': 'Smart Indoor Air Quality Monitor', 'name': 'Kitchen', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -674,7 +653,6 @@ 'model': 'Smart Indoor Air Quality Monitor', 'name': 'Livingroom', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -705,7 +683,6 @@ 'model': 'Smart Indoor Air Quality Monitor', 'name': 'Baby Bedroom', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -736,7 +713,6 @@ 'model': 'Smart Indoor Air Quality Monitor', 'name': 'Bedroom', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -767,7 +743,6 @@ 'model': 'Smart Indoor Air Quality Monitor', 'name': 'Parents Bedroom', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -798,7 +773,6 @@ 'model': 'Plug', 'name': 'Prise', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -829,7 +803,6 @@ 'model': 'Smart Outdoor Module', 'name': 'Villa Outdoor', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -860,7 +833,6 @@ 'model': 'Smart Indoor Module', 'name': 'Villa Bedroom', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -891,7 +863,6 @@ 'model': 'Smart Indoor Module', 'name': 'Villa Bathroom', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -922,7 +893,6 @@ 'model': 'Smart Home Weather station', 'name': 'Villa', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -953,7 +923,6 @@ 'model': 'Smart Rain Gauge', 'name': 'Villa Rain', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -984,7 +953,6 @@ 'model': 'OpenTherm Modulating Thermostat', 'name': 'Bureau Modulate', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': 'Bureau', 'sw_version': None, @@ -1015,7 +983,6 @@ 'model': 'Smart Thermostat', 'name': 'Livingroom', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': 'Livingroom', 'sw_version': None, @@ -1046,7 +1013,6 @@ 'model': 'Smart Valve', 'name': 'Valve1', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': 'Entrada', 'sw_version': None, @@ -1077,7 +1043,6 @@ 'model': 'Smart Valve', 'name': 'Valve2', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': 'Cocina', 'sw_version': None, @@ -1108,7 +1073,6 @@ 'model': 'Climate', 'name': 'MYHOME', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -1139,7 +1103,6 @@ 'model': 'Public Weather station', 'name': 'Home avg', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -1170,7 +1133,6 @@ 'model': 'Public Weather station', 'name': 'Home max', 'name_by_user': None, - 'primary_integration': 'netatmo', 'serial_number': None, 'suggested_area': None, 'sw_version': None, diff --git a/tests/components/netgear_lte/snapshots/test_init.ambr b/tests/components/netgear_lte/snapshots/test_init.ambr index e51fc937081..8af22f98e02 100644 --- a/tests/components/netgear_lte/snapshots/test_init.ambr +++ b/tests/components/netgear_lte/snapshots/test_init.ambr @@ -23,7 +23,6 @@ 'model': 'LM1200', 'name': 'Netgear LM1200', 'name_by_user': None, - 'primary_integration': 'netgear_lte', 'serial_number': 'FFFFFFFFFFFFF', 'suggested_area': None, 'sw_version': 'EC25AFFDR07A09M4G', diff --git a/tests/components/ondilo_ico/snapshots/test_init.ambr b/tests/components/ondilo_ico/snapshots/test_init.ambr index 0bf4748cfdd..c488b1e3c15 100644 --- a/tests/components/ondilo_ico/snapshots/test_init.ambr +++ b/tests/components/ondilo_ico/snapshots/test_init.ambr @@ -23,7 +23,6 @@ 'model': 'ICO', 'name': 'Pool 1', 'name_by_user': None, - 'primary_integration': 'ondilo_ico', 'serial_number': None, 'suggested_area': None, 'sw_version': '1.7.1-stable', @@ -54,7 +53,6 @@ 'model': 'ICO', 'name': 'Pool 2', 'name_by_user': None, - 'primary_integration': 'ondilo_ico', 'serial_number': None, 'suggested_area': None, 'sw_version': '1.7.1-stable', diff --git a/tests/components/onewire/snapshots/test_binary_sensor.ambr b/tests/components/onewire/snapshots/test_binary_sensor.ambr index febb0e50355..999794ec20d 100644 --- a/tests/components/onewire/snapshots/test_binary_sensor.ambr +++ b/tests/components/onewire/snapshots/test_binary_sensor.ambr @@ -36,7 +36,6 @@ 'model': 'DS2405', 'name': '05.111111111111', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -77,7 +76,6 @@ 'model': 'DS18S20', 'name': '10.111111111111', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -118,7 +116,6 @@ 'model': 'DS2406', 'name': '12.111111111111', 'name_by_user': None, - 'primary_integration': 'onewire', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -259,7 +256,6 @@ 'model': 'DS2423', 'name': '1D.111111111111', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -300,7 +296,6 @@ 'model': 'DS2409', 'name': '1F.111111111111', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -329,7 +324,6 @@ 'model': 'DS2423', 'name': '1D.111111111111', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -370,7 +364,6 @@ 'model': 'DS1822', 'name': '22.111111111111', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -411,7 +404,6 @@ 'model': 'DS2438', 'name': '26.111111111111', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -452,7 +444,6 @@ 'model': 'DS18B20', 'name': '28.111111111111', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -493,7 +484,6 @@ 'model': 'DS18B20', 'name': '28.222222222222', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -534,7 +524,6 @@ 'model': 'DS18B20', 'name': '28.222222222223', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -575,7 +564,6 @@ 'model': 'DS2408', 'name': '29.111111111111', 'name_by_user': None, - 'primary_integration': 'onewire', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -968,7 +956,6 @@ 'model': 'DS2760', 'name': '30.111111111111', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -1009,7 +996,6 @@ 'model': 'DS2413', 'name': '3A.111111111111', 'name_by_user': None, - 'primary_integration': 'onewire', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -1138,7 +1124,6 @@ 'model': 'DS1825', 'name': '3B.111111111111', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -1179,7 +1164,6 @@ 'model': 'DS28EA00', 'name': '42.111111111111', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -1220,7 +1204,6 @@ 'model': 'EDS0068', 'name': '7E.111111111111', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -1261,7 +1244,6 @@ 'model': 'EDS0066', 'name': '7E.222222222222', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -1302,7 +1284,6 @@ 'model': 'DS2438', 'name': 'A6.111111111111', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -1343,7 +1324,6 @@ 'model': 'HobbyBoards_EF', 'name': 'EF.111111111111', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -1384,7 +1364,6 @@ 'model': 'HB_MOISTURE_METER', 'name': 'EF.111111111112', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -1425,7 +1404,6 @@ 'model': 'HB_HUB', 'name': 'EF.111111111113', 'name_by_user': None, - 'primary_integration': 'onewire', 'serial_number': None, 'suggested_area': None, 'sw_version': None, diff --git a/tests/components/onewire/snapshots/test_sensor.ambr b/tests/components/onewire/snapshots/test_sensor.ambr index ffa7dadb6fe..59ed167197d 100644 --- a/tests/components/onewire/snapshots/test_sensor.ambr +++ b/tests/components/onewire/snapshots/test_sensor.ambr @@ -36,7 +36,6 @@ 'model': 'DS2405', 'name': '05.111111111111', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -77,7 +76,6 @@ 'model': 'DS18S20', 'name': '10.111111111111', 'name_by_user': None, - 'primary_integration': 'onewire', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -167,7 +165,6 @@ 'model': 'DS2406', 'name': '12.111111111111', 'name_by_user': None, - 'primary_integration': 'onewire', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -318,7 +315,6 @@ 'model': 'DS2423', 'name': '1D.111111111111', 'name_by_user': None, - 'primary_integration': 'onewire', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -455,7 +451,6 @@ 'model': 'DS2409', 'name': '1F.111111111111', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -484,7 +479,6 @@ 'model': 'DS2423', 'name': '1D.111111111111', 'name_by_user': None, - 'primary_integration': 'onewire', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -621,7 +615,6 @@ 'model': 'DS1822', 'name': '22.111111111111', 'name_by_user': None, - 'primary_integration': 'onewire', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -711,7 +704,6 @@ 'model': 'DS2438', 'name': '26.111111111111', 'name_by_user': None, - 'primary_integration': 'onewire', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -1291,7 +1283,6 @@ 'model': 'DS18B20', 'name': '28.111111111111', 'name_by_user': None, - 'primary_integration': 'onewire', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -1381,7 +1372,6 @@ 'model': 'DS18B20', 'name': '28.222222222222', 'name_by_user': None, - 'primary_integration': 'onewire', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -1471,7 +1461,6 @@ 'model': 'DS18B20', 'name': '28.222222222223', 'name_by_user': None, - 'primary_integration': 'onewire', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -1561,7 +1550,6 @@ 'model': 'DS2408', 'name': '29.111111111111', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -1602,7 +1590,6 @@ 'model': 'DS2760', 'name': '30.111111111111', 'name_by_user': None, - 'primary_integration': 'onewire', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -1839,7 +1826,6 @@ 'model': 'DS2413', 'name': '3A.111111111111', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -1880,7 +1866,6 @@ 'model': 'DS1825', 'name': '3B.111111111111', 'name_by_user': None, - 'primary_integration': 'onewire', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -1970,7 +1955,6 @@ 'model': 'DS28EA00', 'name': '42.111111111111', 'name_by_user': None, - 'primary_integration': 'onewire', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -2060,7 +2044,6 @@ 'model': 'EDS0068', 'name': '7E.111111111111', 'name_by_user': None, - 'primary_integration': 'onewire', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -2297,7 +2280,6 @@ 'model': 'EDS0066', 'name': '7E.222222222222', 'name_by_user': None, - 'primary_integration': 'onewire', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -2436,7 +2418,6 @@ 'model': 'DS2438', 'name': 'A6.111111111111', 'name_by_user': None, - 'primary_integration': 'onewire', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -3016,7 +2997,6 @@ 'model': 'HobbyBoards_EF', 'name': 'EF.111111111111', 'name_by_user': None, - 'primary_integration': 'onewire', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -3204,7 +3184,6 @@ 'model': 'HB_MOISTURE_METER', 'name': 'EF.111111111112', 'name_by_user': None, - 'primary_integration': 'onewire', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -3441,7 +3420,6 @@ 'model': 'HB_HUB', 'name': 'EF.111111111113', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, diff --git a/tests/components/onewire/snapshots/test_switch.ambr b/tests/components/onewire/snapshots/test_switch.ambr index 5d736bd9c99..8fd1e2aeef6 100644 --- a/tests/components/onewire/snapshots/test_switch.ambr +++ b/tests/components/onewire/snapshots/test_switch.ambr @@ -36,7 +36,6 @@ 'model': 'DS2405', 'name': '05.111111111111', 'name_by_user': None, - 'primary_integration': 'onewire', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -121,7 +120,6 @@ 'model': 'DS18S20', 'name': '10.111111111111', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -162,7 +160,6 @@ 'model': 'DS2406', 'name': '12.111111111111', 'name_by_user': None, - 'primary_integration': 'onewire', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -391,7 +388,6 @@ 'model': 'DS2423', 'name': '1D.111111111111', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -432,7 +428,6 @@ 'model': 'DS2409', 'name': '1F.111111111111', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -461,7 +456,6 @@ 'model': 'DS2423', 'name': '1D.111111111111', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -502,7 +496,6 @@ 'model': 'DS1822', 'name': '22.111111111111', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -543,7 +536,6 @@ 'model': 'DS2438', 'name': '26.111111111111', 'name_by_user': None, - 'primary_integration': 'onewire', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -628,7 +620,6 @@ 'model': 'DS18B20', 'name': '28.111111111111', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -669,7 +660,6 @@ 'model': 'DS18B20', 'name': '28.222222222222', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -710,7 +700,6 @@ 'model': 'DS18B20', 'name': '28.222222222223', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -751,7 +740,6 @@ 'model': 'DS2408', 'name': '29.111111111111', 'name_by_user': None, - 'primary_integration': 'onewire', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -1496,7 +1484,6 @@ 'model': 'DS2760', 'name': '30.111111111111', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -1537,7 +1524,6 @@ 'model': 'DS2413', 'name': '3A.111111111111', 'name_by_user': None, - 'primary_integration': 'onewire', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -1666,7 +1652,6 @@ 'model': 'DS1825', 'name': '3B.111111111111', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -1707,7 +1692,6 @@ 'model': 'DS28EA00', 'name': '42.111111111111', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -1748,7 +1732,6 @@ 'model': 'EDS0068', 'name': '7E.111111111111', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -1789,7 +1772,6 @@ 'model': 'EDS0066', 'name': '7E.222222222222', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -1830,7 +1812,6 @@ 'model': 'DS2438', 'name': 'A6.111111111111', 'name_by_user': None, - 'primary_integration': 'onewire', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -1915,7 +1896,6 @@ 'model': 'HobbyBoards_EF', 'name': 'EF.111111111111', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -1956,7 +1936,6 @@ 'model': 'HB_MOISTURE_METER', 'name': 'EF.111111111112', 'name_by_user': None, - 'primary_integration': 'onewire', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -2349,7 +2328,6 @@ 'model': 'HB_HUB', 'name': 'EF.111111111113', 'name_by_user': None, - 'primary_integration': 'onewire', 'serial_number': None, 'suggested_area': None, 'sw_version': None, diff --git a/tests/components/renault/snapshots/test_binary_sensor.ambr b/tests/components/renault/snapshots/test_binary_sensor.ambr index 50833ab681f..7f30faac38e 100644 --- a/tests/components/renault/snapshots/test_binary_sensor.ambr +++ b/tests/components/renault/snapshots/test_binary_sensor.ambr @@ -24,7 +24,6 @@ 'model': 'Captur ii', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'XJB1SU', @@ -323,7 +322,6 @@ 'model': 'Captur ii', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'XJB1SU', @@ -708,7 +706,6 @@ 'model': 'Zoe', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'X101VE', @@ -877,7 +874,6 @@ 'model': 'Zoe', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'X102VE', @@ -1304,7 +1300,6 @@ 'model': 'Captur ii', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'XJB1SU', @@ -1603,7 +1598,6 @@ 'model': 'Captur ii', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'XJB1SU', @@ -1988,7 +1982,6 @@ 'model': 'Zoe', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'X101VE', @@ -2157,7 +2150,6 @@ 'model': 'Zoe', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'X102VE', diff --git a/tests/components/renault/snapshots/test_button.ambr b/tests/components/renault/snapshots/test_button.ambr index b23cae4eb03..daef84b5c0a 100644 --- a/tests/components/renault/snapshots/test_button.ambr +++ b/tests/components/renault/snapshots/test_button.ambr @@ -24,7 +24,6 @@ 'model': 'Captur ii', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'XJB1SU', @@ -107,7 +106,6 @@ 'model': 'Captur ii', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'XJB1SU', @@ -274,7 +272,6 @@ 'model': 'Zoe', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'X101VE', @@ -441,7 +438,6 @@ 'model': 'Zoe', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'X102VE', @@ -608,7 +604,6 @@ 'model': 'Captur ii', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'XJB1SU', @@ -691,7 +686,6 @@ 'model': 'Captur ii', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'XJB1SU', @@ -858,7 +852,6 @@ 'model': 'Zoe', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'X101VE', @@ -1025,7 +1018,6 @@ 'model': 'Zoe', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'X102VE', diff --git a/tests/components/renault/snapshots/test_device_tracker.ambr b/tests/components/renault/snapshots/test_device_tracker.ambr index df3db275214..8fe1713dc0b 100644 --- a/tests/components/renault/snapshots/test_device_tracker.ambr +++ b/tests/components/renault/snapshots/test_device_tracker.ambr @@ -24,7 +24,6 @@ 'model': 'Captur ii', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'XJB1SU', @@ -108,7 +107,6 @@ 'model': 'Captur ii', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'XJB1SU', @@ -192,7 +190,6 @@ 'model': 'Zoe', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': 'X101VE', @@ -233,7 +230,6 @@ 'model': 'Zoe', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'X102VE', @@ -317,7 +313,6 @@ 'model': 'Captur ii', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'XJB1SU', @@ -404,7 +399,6 @@ 'model': 'Captur ii', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'XJB1SU', @@ -491,7 +485,6 @@ 'model': 'Zoe', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': 'X101VE', @@ -532,7 +525,6 @@ 'model': 'Zoe', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'X102VE', diff --git a/tests/components/renault/snapshots/test_select.ambr b/tests/components/renault/snapshots/test_select.ambr index d597a2b31f0..0722cb5cab3 100644 --- a/tests/components/renault/snapshots/test_select.ambr +++ b/tests/components/renault/snapshots/test_select.ambr @@ -24,7 +24,6 @@ 'model': 'Captur ii', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': 'XJB1SU', @@ -65,7 +64,6 @@ 'model': 'Captur ii', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'XJB1SU', @@ -161,7 +159,6 @@ 'model': 'Zoe', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'X101VE', @@ -257,7 +254,6 @@ 'model': 'Zoe', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'X102VE', @@ -353,7 +349,6 @@ 'model': 'Captur ii', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': 'XJB1SU', @@ -394,7 +389,6 @@ 'model': 'Captur ii', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'XJB1SU', @@ -490,7 +484,6 @@ 'model': 'Zoe', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'X101VE', @@ -586,7 +579,6 @@ 'model': 'Zoe', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'X102VE', diff --git a/tests/components/renault/snapshots/test_sensor.ambr b/tests/components/renault/snapshots/test_sensor.ambr index 6af7d9cd8d3..5909c66bc5c 100644 --- a/tests/components/renault/snapshots/test_sensor.ambr +++ b/tests/components/renault/snapshots/test_sensor.ambr @@ -24,7 +24,6 @@ 'model': 'Captur ii', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'XJB1SU', @@ -333,7 +332,6 @@ 'model': 'Captur ii', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'XJB1SU', @@ -1087,7 +1085,6 @@ 'model': 'Zoe', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'X101VE', @@ -1837,7 +1834,6 @@ 'model': 'Zoe', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'X102VE', @@ -2630,7 +2626,6 @@ 'model': 'Captur ii', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'XJB1SU', @@ -2939,7 +2934,6 @@ 'model': 'Captur ii', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'XJB1SU', @@ -3693,7 +3687,6 @@ 'model': 'Zoe', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'X101VE', @@ -4443,7 +4436,6 @@ 'model': 'Zoe', 'name': 'REG-NUMBER', 'name_by_user': None, - 'primary_integration': 'renault', 'serial_number': None, 'suggested_area': None, 'sw_version': 'X102VE', diff --git a/tests/components/rova/snapshots/test_init.ambr b/tests/components/rova/snapshots/test_init.ambr index 9210027221b..340b0e6d472 100644 --- a/tests/components/rova/snapshots/test_init.ambr +++ b/tests/components/rova/snapshots/test_init.ambr @@ -23,7 +23,6 @@ 'model': None, 'name': '8381BE 13', 'name_by_user': None, - 'primary_integration': 'rova', 'serial_number': None, 'suggested_area': None, 'sw_version': None, diff --git a/tests/components/sfr_box/snapshots/test_binary_sensor.ambr b/tests/components/sfr_box/snapshots/test_binary_sensor.ambr index 62a656f9157..7422c1395c3 100644 --- a/tests/components/sfr_box/snapshots/test_binary_sensor.ambr +++ b/tests/components/sfr_box/snapshots/test_binary_sensor.ambr @@ -24,7 +24,6 @@ 'model': 'NB6VAC-FXC-r0', 'name': 'SFR Box', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': 'NB6VAC-MAIN-R4.0.44k', @@ -151,7 +150,6 @@ 'model': 'NB6VAC-FXC-r0', 'name': 'SFR Box', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': 'NB6VAC-MAIN-R4.0.44k', diff --git a/tests/components/sfr_box/snapshots/test_button.ambr b/tests/components/sfr_box/snapshots/test_button.ambr index b786e75910b..0dfbf187f6d 100644 --- a/tests/components/sfr_box/snapshots/test_button.ambr +++ b/tests/components/sfr_box/snapshots/test_button.ambr @@ -24,7 +24,6 @@ 'model': 'NB6VAC-FXC-r0', 'name': 'SFR Box', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': 'NB6VAC-MAIN-R4.0.44k', diff --git a/tests/components/sfr_box/snapshots/test_sensor.ambr b/tests/components/sfr_box/snapshots/test_sensor.ambr index 662b765ee74..0f39eed9e60 100644 --- a/tests/components/sfr_box/snapshots/test_sensor.ambr +++ b/tests/components/sfr_box/snapshots/test_sensor.ambr @@ -24,7 +24,6 @@ 'model': 'NB6VAC-FXC-r0', 'name': 'SFR Box', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': 'NB6VAC-MAIN-R4.0.44k', diff --git a/tests/components/tailwind/snapshots/test_binary_sensor.ambr b/tests/components/tailwind/snapshots/test_binary_sensor.ambr index f9088e1d5c3..ea2a539363d 100644 --- a/tests/components/tailwind/snapshots/test_binary_sensor.ambr +++ b/tests/components/tailwind/snapshots/test_binary_sensor.ambr @@ -70,7 +70,6 @@ 'model': 'iQ3', 'name': 'Door 1', 'name_by_user': None, - 'primary_integration': 'tailwind', 'serial_number': None, 'suggested_area': None, 'sw_version': '10.10', @@ -148,7 +147,6 @@ 'model': 'iQ3', 'name': 'Door 2', 'name_by_user': None, - 'primary_integration': 'tailwind', 'serial_number': None, 'suggested_area': None, 'sw_version': '10.10', diff --git a/tests/components/tailwind/snapshots/test_button.ambr b/tests/components/tailwind/snapshots/test_button.ambr index f96032630bc..560d3fe692c 100644 --- a/tests/components/tailwind/snapshots/test_button.ambr +++ b/tests/components/tailwind/snapshots/test_button.ambr @@ -74,7 +74,6 @@ 'model': 'iQ3', 'name': 'Tailwind iQ3', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': '10.10', diff --git a/tests/components/tailwind/snapshots/test_cover.ambr b/tests/components/tailwind/snapshots/test_cover.ambr index 98891e649e7..0ecd172b2ca 100644 --- a/tests/components/tailwind/snapshots/test_cover.ambr +++ b/tests/components/tailwind/snapshots/test_cover.ambr @@ -71,7 +71,6 @@ 'model': 'iQ3', 'name': 'Door 1', 'name_by_user': None, - 'primary_integration': 'tailwind', 'serial_number': None, 'suggested_area': None, 'sw_version': '10.10', @@ -150,7 +149,6 @@ 'model': 'iQ3', 'name': 'Door 2', 'name_by_user': None, - 'primary_integration': 'tailwind', 'serial_number': None, 'suggested_area': None, 'sw_version': '10.10', diff --git a/tests/components/tailwind/snapshots/test_number.ambr b/tests/components/tailwind/snapshots/test_number.ambr index 1bd01482c0c..cbd61d31a6c 100644 --- a/tests/components/tailwind/snapshots/test_number.ambr +++ b/tests/components/tailwind/snapshots/test_number.ambr @@ -83,7 +83,6 @@ 'model': 'iQ3', 'name': 'Tailwind iQ3', 'name_by_user': None, - 'primary_integration': None, 'serial_number': None, 'suggested_area': None, 'sw_version': '10.10', diff --git a/tests/components/tasmota/test_discovery.py b/tests/components/tasmota/test_discovery.py index 91832f1f2f0..5405e6c417d 100644 --- a/tests/components/tasmota/test_discovery.py +++ b/tests/components/tasmota/test_discovery.py @@ -340,7 +340,7 @@ async def test_device_remove_multiple_config_entries_1( connections={(dr.CONNECTION_NETWORK_MAC, mac)} ) assert device_entry is not None - assert device_entry.config_entries == {tasmota_entry.entry_id, mock_entry.entry_id} + assert device_entry.config_entries == [tasmota_entry.entry_id, mock_entry.entry_id] async_fire_mqtt_message( hass, @@ -354,7 +354,7 @@ async def test_device_remove_multiple_config_entries_1( connections={(dr.CONNECTION_NETWORK_MAC, mac)} ) assert device_entry is not None - assert device_entry.config_entries == {mock_entry.entry_id} + assert device_entry.config_entries == [mock_entry.entry_id] async def test_device_remove_multiple_config_entries_2( @@ -396,7 +396,7 @@ async def test_device_remove_multiple_config_entries_2( connections={(dr.CONNECTION_NETWORK_MAC, mac)} ) assert device_entry is not None - assert device_entry.config_entries == {tasmota_entry.entry_id, mock_entry.entry_id} + assert device_entry.config_entries == [tasmota_entry.entry_id, mock_entry.entry_id] assert other_device_entry.id != device_entry.id # Remove other config entry from the device @@ -410,7 +410,7 @@ async def test_device_remove_multiple_config_entries_2( connections={(dr.CONNECTION_NETWORK_MAC, mac)} ) assert device_entry is not None - assert device_entry.config_entries == {tasmota_entry.entry_id} + assert device_entry.config_entries == [tasmota_entry.entry_id] mqtt_mock.async_publish.assert_not_called() # Remove other config entry from the other device - Tasmota should not do any cleanup diff --git a/tests/components/tedee/snapshots/test_init.ambr b/tests/components/tedee/snapshots/test_init.ambr index 96284adb338..83ab032dfb4 100644 --- a/tests/components/tedee/snapshots/test_init.ambr +++ b/tests/components/tedee/snapshots/test_init.ambr @@ -23,7 +23,6 @@ 'model': 'Bridge', 'name': 'Bridge-AB1C', 'name_by_user': None, - 'primary_integration': None, 'serial_number': '0000-0000', 'suggested_area': None, 'sw_version': None, diff --git a/tests/components/tedee/snapshots/test_lock.ambr b/tests/components/tedee/snapshots/test_lock.ambr index bf9021b639b..8e4fc464479 100644 --- a/tests/components/tedee/snapshots/test_lock.ambr +++ b/tests/components/tedee/snapshots/test_lock.ambr @@ -70,7 +70,6 @@ 'model': 'Tedee PRO', 'name': 'Lock-1A2B', 'name_by_user': None, - 'primary_integration': 'tedee', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -148,7 +147,6 @@ 'model': 'Tedee GO', 'name': 'Lock-2C3D', 'name_by_user': None, - 'primary_integration': 'tedee', 'serial_number': None, 'suggested_area': None, 'sw_version': None, diff --git a/tests/components/teslemetry/snapshots/test_init.ambr b/tests/components/teslemetry/snapshots/test_init.ambr index d1656c2260e..951e4557bdd 100644 --- a/tests/components/teslemetry/snapshots/test_init.ambr +++ b/tests/components/teslemetry/snapshots/test_init.ambr @@ -23,7 +23,6 @@ 'model': 'Powerwall 2, Tesla Backup Gateway 2', 'name': 'Energy Site', 'name_by_user': None, - 'primary_integration': 'teslemetry', 'serial_number': '123456', 'suggested_area': None, 'sw_version': None, @@ -54,7 +53,6 @@ 'model': 'Model X', 'name': 'Test', 'name_by_user': None, - 'primary_integration': 'teslemetry', 'serial_number': 'LRWXF7EK4KC700000', 'suggested_area': None, 'sw_version': None, @@ -85,7 +83,6 @@ 'model': 'Gen 3 Wall Connector', 'name': 'Wall Connector', 'name_by_user': None, - 'primary_integration': 'teslemetry', 'serial_number': '123', 'suggested_area': None, 'sw_version': None, @@ -116,7 +113,6 @@ 'model': 'Gen 3 Wall Connector', 'name': 'Wall Connector', 'name_by_user': None, - 'primary_integration': 'teslemetry', 'serial_number': '234', 'suggested_area': None, 'sw_version': None, diff --git a/tests/components/twentemilieu/snapshots/test_calendar.ambr b/tests/components/twentemilieu/snapshots/test_calendar.ambr index fa24ad644d2..78b2d56afca 100644 --- a/tests/components/twentemilieu/snapshots/test_calendar.ambr +++ b/tests/components/twentemilieu/snapshots/test_calendar.ambr @@ -101,7 +101,6 @@ 'model': None, 'name': 'Twente Milieu', 'name_by_user': None, - 'primary_integration': 'twentemilieu', 'serial_number': None, 'suggested_area': None, 'sw_version': None, diff --git a/tests/components/twentemilieu/snapshots/test_sensor.ambr b/tests/components/twentemilieu/snapshots/test_sensor.ambr index e943d937fa3..a0f3b75da57 100644 --- a/tests/components/twentemilieu/snapshots/test_sensor.ambr +++ b/tests/components/twentemilieu/snapshots/test_sensor.ambr @@ -70,7 +70,6 @@ 'model': None, 'name': 'Twente Milieu', 'name_by_user': None, - 'primary_integration': 'twentemilieu', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -148,7 +147,6 @@ 'model': None, 'name': 'Twente Milieu', 'name_by_user': None, - 'primary_integration': 'twentemilieu', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -226,7 +224,6 @@ 'model': None, 'name': 'Twente Milieu', 'name_by_user': None, - 'primary_integration': 'twentemilieu', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -304,7 +301,6 @@ 'model': None, 'name': 'Twente Milieu', 'name_by_user': None, - 'primary_integration': 'twentemilieu', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -382,7 +378,6 @@ 'model': None, 'name': 'Twente Milieu', 'name_by_user': None, - 'primary_integration': 'twentemilieu', 'serial_number': None, 'suggested_area': None, 'sw_version': None, diff --git a/tests/components/uptime/snapshots/test_sensor.ambr b/tests/components/uptime/snapshots/test_sensor.ambr index 692bfe53ea2..0e7ae6dceaa 100644 --- a/tests/components/uptime/snapshots/test_sensor.ambr +++ b/tests/components/uptime/snapshots/test_sensor.ambr @@ -63,7 +63,6 @@ 'model': None, 'name': 'Uptime', 'name_by_user': None, - 'primary_integration': 'uptime', 'serial_number': None, 'suggested_area': None, 'sw_version': None, diff --git a/tests/components/vesync/snapshots/test_fan.ambr b/tests/components/vesync/snapshots/test_fan.ambr index 159d872a65b..59304e92d9d 100644 --- a/tests/components/vesync/snapshots/test_fan.ambr +++ b/tests/components/vesync/snapshots/test_fan.ambr @@ -24,7 +24,6 @@ 'model': 'LV-PUR131S', 'name': 'Air Purifier 131s', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -115,7 +114,6 @@ 'model': 'Core200S', 'name': 'Air Purifier 200s', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -211,7 +209,6 @@ 'model': 'LAP-C401S-WJP', 'name': 'Air Purifier 400s', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -309,7 +306,6 @@ 'model': 'LAP-C601S-WUS', 'name': 'Air Purifier 600s', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -407,7 +403,6 @@ 'model': 'ESL100', 'name': 'Dimmable Light', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -444,7 +439,6 @@ 'model': 'ESWD16', 'name': 'Dimmer Switch', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -497,7 +491,6 @@ 'model': 'wifi-switch-1.3', 'name': 'Outlet', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -534,7 +527,6 @@ 'model': 'ESL100CW', 'name': 'Temperature Light', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -571,7 +563,6 @@ 'model': 'ESWL01', 'name': 'Wall Switch', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, diff --git a/tests/components/vesync/snapshots/test_light.ambr b/tests/components/vesync/snapshots/test_light.ambr index c393453e78c..9990395a36c 100644 --- a/tests/components/vesync/snapshots/test_light.ambr +++ b/tests/components/vesync/snapshots/test_light.ambr @@ -24,7 +24,6 @@ 'model': 'LV-PUR131S', 'name': 'Air Purifier 131s', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -61,7 +60,6 @@ 'model': 'Core200S', 'name': 'Air Purifier 200s', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -98,7 +96,6 @@ 'model': 'LAP-C401S-WJP', 'name': 'Air Purifier 400s', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -135,7 +132,6 @@ 'model': 'LAP-C601S-WUS', 'name': 'Air Purifier 600s', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -172,7 +168,6 @@ 'model': 'ESL100', 'name': 'Dimmable Light', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -261,7 +256,6 @@ 'model': 'ESWD16', 'name': 'Dimmer Switch', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -368,7 +362,6 @@ 'model': 'wifi-switch-1.3', 'name': 'Outlet', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -405,7 +398,6 @@ 'model': 'ESL100CW', 'name': 'Temperature Light', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -509,7 +501,6 @@ 'model': 'ESWL01', 'name': 'Wall Switch', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, diff --git a/tests/components/vesync/snapshots/test_sensor.ambr b/tests/components/vesync/snapshots/test_sensor.ambr index 27c52e5580e..268718fb2fe 100644 --- a/tests/components/vesync/snapshots/test_sensor.ambr +++ b/tests/components/vesync/snapshots/test_sensor.ambr @@ -24,7 +24,6 @@ 'model': 'LV-PUR131S', 'name': 'Air Purifier 131s', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -153,7 +152,6 @@ 'model': 'Core200S', 'name': 'Air Purifier 200s', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -238,7 +236,6 @@ 'model': 'LAP-C401S-WJP', 'name': 'Air Purifier 400s', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -416,7 +413,6 @@ 'model': 'LAP-C601S-WUS', 'name': 'Air Purifier 600s', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -594,7 +590,6 @@ 'model': 'ESL100', 'name': 'Dimmable Light', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -631,7 +626,6 @@ 'model': 'ESWD16', 'name': 'Dimmer Switch', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -684,7 +678,6 @@ 'model': 'wifi-switch-1.3', 'name': 'Outlet', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -1015,7 +1008,6 @@ 'model': 'ESL100CW', 'name': 'Temperature Light', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -1052,7 +1044,6 @@ 'model': 'ESWL01', 'name': 'Wall Switch', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, diff --git a/tests/components/vesync/snapshots/test_switch.ambr b/tests/components/vesync/snapshots/test_switch.ambr index 3b816e70bee..3df26f74bcf 100644 --- a/tests/components/vesync/snapshots/test_switch.ambr +++ b/tests/components/vesync/snapshots/test_switch.ambr @@ -24,7 +24,6 @@ 'model': 'LV-PUR131S', 'name': 'Air Purifier 131s', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -61,7 +60,6 @@ 'model': 'Core200S', 'name': 'Air Purifier 200s', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -98,7 +96,6 @@ 'model': 'LAP-C401S-WJP', 'name': 'Air Purifier 400s', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -135,7 +132,6 @@ 'model': 'LAP-C601S-WUS', 'name': 'Air Purifier 600s', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -172,7 +168,6 @@ 'model': 'ESL100', 'name': 'Dimmable Light', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -209,7 +204,6 @@ 'model': 'ESWD16', 'name': 'Dimmer Switch', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -262,7 +256,6 @@ 'model': 'wifi-switch-1.3', 'name': 'Outlet', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -343,7 +336,6 @@ 'model': 'ESL100CW', 'name': 'Temperature Light', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -380,7 +372,6 @@ 'model': 'ESWL01', 'name': 'Wall Switch', 'name_by_user': None, - 'primary_integration': 'vesync', 'serial_number': None, 'suggested_area': None, 'sw_version': None, diff --git a/tests/components/whois/snapshots/test_sensor.ambr b/tests/components/whois/snapshots/test_sensor.ambr index 409541b6322..61762c36e59 100644 --- a/tests/components/whois/snapshots/test_sensor.ambr +++ b/tests/components/whois/snapshots/test_sensor.ambr @@ -69,7 +69,6 @@ 'model': None, 'name': 'home-assistant.io', 'name_by_user': None, - 'primary_integration': 'whois', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -147,7 +146,6 @@ 'model': None, 'name': 'home-assistant.io', 'name_by_user': None, - 'primary_integration': 'whois', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -229,7 +227,6 @@ 'model': None, 'name': 'home-assistant.io', 'name_by_user': None, - 'primary_integration': 'whois', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -307,7 +304,6 @@ 'model': None, 'name': 'home-assistant.io', 'name_by_user': None, - 'primary_integration': 'whois', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -385,7 +381,6 @@ 'model': None, 'name': 'home-assistant.io', 'name_by_user': None, - 'primary_integration': 'whois', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -462,7 +457,6 @@ 'model': None, 'name': 'home-assistant.io', 'name_by_user': None, - 'primary_integration': 'whois', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -539,7 +533,6 @@ 'model': None, 'name': 'home-assistant.io', 'name_by_user': None, - 'primary_integration': 'whois', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -616,7 +609,6 @@ 'model': None, 'name': 'home-assistant.io', 'name_by_user': None, - 'primary_integration': 'whois', 'serial_number': None, 'suggested_area': None, 'sw_version': None, @@ -693,7 +685,6 @@ 'model': None, 'name': 'home-assistant.io', 'name_by_user': None, - 'primary_integration': 'whois', 'serial_number': None, 'suggested_area': None, 'sw_version': None, diff --git a/tests/components/wled/snapshots/test_binary_sensor.ambr b/tests/components/wled/snapshots/test_binary_sensor.ambr index ab30bff1729..b9a083336d2 100644 --- a/tests/components/wled/snapshots/test_binary_sensor.ambr +++ b/tests/components/wled/snapshots/test_binary_sensor.ambr @@ -74,7 +74,6 @@ 'model': 'DIY light', 'name': 'WLED RGB Light', 'name_by_user': None, - 'primary_integration': 'wled', 'serial_number': None, 'suggested_area': None, 'sw_version': '0.8.5', diff --git a/tests/components/wled/snapshots/test_button.ambr b/tests/components/wled/snapshots/test_button.ambr index 5fb2ac08be7..b489bcc0a71 100644 --- a/tests/components/wled/snapshots/test_button.ambr +++ b/tests/components/wled/snapshots/test_button.ambr @@ -74,7 +74,6 @@ 'model': 'DIY light', 'name': 'WLED RGB Light', 'name_by_user': None, - 'primary_integration': 'wled', 'serial_number': None, 'suggested_area': None, 'sw_version': '0.8.5', diff --git a/tests/components/wled/snapshots/test_number.ambr b/tests/components/wled/snapshots/test_number.ambr index 9c3498372bf..c3440108148 100644 --- a/tests/components/wled/snapshots/test_number.ambr +++ b/tests/components/wled/snapshots/test_number.ambr @@ -82,7 +82,6 @@ 'model': 'DIY light', 'name': 'WLED RGB Light', 'name_by_user': None, - 'primary_integration': 'wled', 'serial_number': None, 'suggested_area': None, 'sw_version': '0.8.5', @@ -172,7 +171,6 @@ 'model': 'DIY light', 'name': 'WLED RGB Light', 'name_by_user': None, - 'primary_integration': 'wled', 'serial_number': None, 'suggested_area': None, 'sw_version': '0.8.5', diff --git a/tests/components/wled/snapshots/test_select.ambr b/tests/components/wled/snapshots/test_select.ambr index 41df21c0223..6d64ec43658 100644 --- a/tests/components/wled/snapshots/test_select.ambr +++ b/tests/components/wled/snapshots/test_select.ambr @@ -84,7 +84,6 @@ 'model': 'DIY light', 'name': 'WLED RGB Light', 'name_by_user': None, - 'primary_integration': 'wled', 'serial_number': None, 'suggested_area': None, 'sw_version': '0.8.5', @@ -270,7 +269,6 @@ 'model': 'DIY light', 'name': 'WLED RGB Light', 'name_by_user': None, - 'primary_integration': 'wled', 'serial_number': None, 'suggested_area': None, 'sw_version': '0.8.5', @@ -360,7 +358,6 @@ 'model': 'DIY light', 'name': 'WLED RGBW Light', 'name_by_user': None, - 'primary_integration': 'wled', 'serial_number': None, 'suggested_area': None, 'sw_version': '0.8.6b4', @@ -450,7 +447,6 @@ 'model': 'DIY light', 'name': 'WLED RGBW Light', 'name_by_user': None, - 'primary_integration': 'wled', 'serial_number': None, 'suggested_area': None, 'sw_version': '0.8.6b4', diff --git a/tests/components/wled/snapshots/test_switch.ambr b/tests/components/wled/snapshots/test_switch.ambr index 4d7a7d59798..da69e686f07 100644 --- a/tests/components/wled/snapshots/test_switch.ambr +++ b/tests/components/wled/snapshots/test_switch.ambr @@ -76,7 +76,6 @@ 'model': 'DIY light', 'name': 'WLED RGB Light', 'name_by_user': None, - 'primary_integration': 'wled', 'serial_number': None, 'suggested_area': None, 'sw_version': '0.8.5', @@ -157,7 +156,6 @@ 'model': 'DIY light', 'name': 'WLED RGB Light', 'name_by_user': None, - 'primary_integration': 'wled', 'serial_number': None, 'suggested_area': None, 'sw_version': '0.8.5', @@ -239,7 +237,6 @@ 'model': 'DIY light', 'name': 'WLED RGB Light', 'name_by_user': None, - 'primary_integration': 'wled', 'serial_number': None, 'suggested_area': None, 'sw_version': '0.8.5', @@ -321,7 +318,6 @@ 'model': 'DIY light', 'name': 'WLED RGB Light', 'name_by_user': None, - 'primary_integration': 'wled', 'serial_number': None, 'suggested_area': None, 'sw_version': '0.8.5', diff --git a/tests/helpers/test_device_registry.py b/tests/helpers/test_device_registry.py index ad0df1f9f25..b141e29f678 100644 --- a/tests/helpers/test_device_registry.py +++ b/tests/helpers/test_device_registry.py @@ -90,7 +90,7 @@ async def test_get_or_create_returns_same_entry( await hass.async_block_till_done() # Only 2 update events. The third entry did not generate any changes. - assert len(update_events) == 2 + assert len(update_events) == 2, update_events assert update_events[0].data == { "action": "create", "device_id": entry.id, @@ -170,7 +170,9 @@ async def test_multiple_config_entries( assert len(device_registry.devices) == 1 assert entry.id == entry2.id assert entry.id == entry3.id - assert entry2.config_entries == {config_entry_1.entry_id, config_entry_2.entry_id} + assert entry2.config_entries == [config_entry_2.entry_id, config_entry_1.entry_id] + # the 3rd get_or_create was a primary update, so that's now first config entry + assert entry3.config_entries == [config_entry_1.entry_id, config_entry_2.entry_id] @pytest.mark.parametrize("load_registries", [False]) @@ -231,7 +233,7 @@ async def test_loading_from_storage( ) assert entry == dr.DeviceEntry( area_id="12345A", - config_entries={mock_config_entry.entry_id}, + config_entries=[mock_config_entry.entry_id], configuration_url="https://example.com/config", connections={("Zigbee", "01.23.45.67.89")}, disabled_by=dr.DeviceEntryDisabler.USER, @@ -248,7 +250,7 @@ async def test_loading_from_storage( suggested_area=None, # Not stored sw_version="version", ) - assert isinstance(entry.config_entries, set) + assert isinstance(entry.config_entries, list) assert isinstance(entry.connections, set) assert isinstance(entry.identifiers, set) @@ -261,7 +263,7 @@ async def test_loading_from_storage( model="model", ) assert entry == dr.DeviceEntry( - config_entries={mock_config_entry.entry_id}, + config_entries=[mock_config_entry.entry_id], connections={("Zigbee", "23.45.67.89.01")}, id="bcdefghijklmn", identifiers={("serial", "3456ABCDEF12")}, @@ -269,7 +271,7 @@ async def test_loading_from_storage( model="model", ) assert entry.id == "bcdefghijklmn" - assert isinstance(entry.config_entries, set) + assert isinstance(entry.config_entries, list) assert isinstance(entry.connections, set) assert isinstance(entry.identifiers, set) @@ -816,7 +818,7 @@ async def test_removing_config_entries( assert len(device_registry.devices) == 2 assert entry.id == entry2.id assert entry.id != entry3.id - assert entry2.config_entries == {config_entry_1.entry_id, config_entry_2.entry_id} + assert entry2.config_entries == [config_entry_2.entry_id, config_entry_1.entry_id] device_registry.async_clear_config_entry(config_entry_1.entry_id) entry = device_registry.async_get_device(identifiers={("bridgeid", "0123")}) @@ -824,7 +826,7 @@ async def test_removing_config_entries( identifiers={("bridgeid", "4567")} ) - assert entry.config_entries == {config_entry_2.entry_id} + assert entry.config_entries == [config_entry_2.entry_id] assert entry3_removed is None await hass.async_block_till_done() @@ -837,7 +839,7 @@ async def test_removing_config_entries( assert update_events[1].data == { "action": "update", "device_id": entry.id, - "changes": {"config_entries": {config_entry_1.entry_id}}, + "changes": {"config_entries": [config_entry_1.entry_id]}, } assert update_events[2].data == { "action": "create", @@ -847,7 +849,7 @@ async def test_removing_config_entries( "action": "update", "device_id": entry.id, "changes": { - "config_entries": {config_entry_1.entry_id, config_entry_2.entry_id} + "config_entries": [config_entry_2.entry_id, config_entry_1.entry_id] }, } assert update_events[4].data == { @@ -892,7 +894,7 @@ async def test_deleted_device_removing_config_entries( assert len(device_registry.deleted_devices) == 0 assert entry.id == entry2.id assert entry.id != entry3.id - assert entry2.config_entries == {config_entry_1.entry_id, config_entry_2.entry_id} + assert entry2.config_entries == [config_entry_2.entry_id, config_entry_1.entry_id] device_registry.async_remove_device(entry.id) device_registry.async_remove_device(entry3.id) @@ -909,7 +911,7 @@ async def test_deleted_device_removing_config_entries( assert update_events[1].data == { "action": "update", "device_id": entry2.id, - "changes": {"config_entries": {config_entry_1.entry_id}}, + "changes": {"config_entries": [config_entry_1.entry_id]}, } assert update_events[2].data == { "action": "create", @@ -1288,7 +1290,7 @@ async def test_update( assert updated_entry != entry assert updated_entry == dr.DeviceEntry( area_id="12345A", - config_entries={mock_config_entry.entry_id}, + config_entries=[mock_config_entry.entry_id], configuration_url="https://example.com/config", connections={("mac", "65:43:21:fe:dc:ba")}, disabled_by=dr.DeviceEntryDisabler.USER, @@ -1497,7 +1499,7 @@ async def test_update_remove_config_entries( assert len(device_registry.devices) == 2 assert entry.id == entry2.id assert entry.id != entry3.id - assert entry2.config_entries == {config_entry_1.entry_id, config_entry_2.entry_id} + assert entry2.config_entries == [config_entry_2.entry_id, config_entry_1.entry_id] updated_entry = device_registry.async_update_device( entry2.id, remove_config_entry_id=config_entry_1.entry_id @@ -1506,7 +1508,7 @@ async def test_update_remove_config_entries( entry3.id, remove_config_entry_id=config_entry_1.entry_id ) - assert updated_entry.config_entries == {config_entry_2.entry_id} + assert updated_entry.config_entries == [config_entry_2.entry_id] assert removed_entry is None removed_entry = device_registry.async_get_device(identifiers={("bridgeid", "4567")}) @@ -1523,7 +1525,7 @@ async def test_update_remove_config_entries( assert update_events[1].data == { "action": "update", "device_id": entry2.id, - "changes": {"config_entries": {config_entry_1.entry_id}}, + "changes": {"config_entries": [config_entry_1.entry_id]}, } assert update_events[2].data == { "action": "create", @@ -1533,7 +1535,7 @@ async def test_update_remove_config_entries( "action": "update", "device_id": entry.id, "changes": { - "config_entries": {config_entry_1.entry_id, config_entry_2.entry_id} + "config_entries": [config_entry_2.entry_id, config_entry_1.entry_id] }, } assert update_events[4].data == { @@ -1766,7 +1768,7 @@ async def test_restore_device( assert len(device_registry.devices) == 2 assert len(device_registry.deleted_devices) == 0 - assert isinstance(entry3.config_entries, set) + assert isinstance(entry3.config_entries, list) assert isinstance(entry3.connections, set) assert isinstance(entry3.identifiers, set) @@ -1898,7 +1900,7 @@ async def test_restore_shared_device( assert len(device_registry.devices) == 1 assert len(device_registry.deleted_devices) == 0 - assert isinstance(entry2.config_entries, set) + assert isinstance(entry2.config_entries, list) assert isinstance(entry2.connections, set) assert isinstance(entry2.identifiers, set) @@ -1916,7 +1918,7 @@ async def test_restore_shared_device( assert len(device_registry.devices) == 1 assert len(device_registry.deleted_devices) == 0 - assert isinstance(entry3.config_entries, set) + assert isinstance(entry3.config_entries, list) assert isinstance(entry3.connections, set) assert isinstance(entry3.identifiers, set) @@ -1932,7 +1934,7 @@ async def test_restore_shared_device( assert len(device_registry.devices) == 1 assert len(device_registry.deleted_devices) == 0 - assert isinstance(entry4.config_entries, set) + assert isinstance(entry4.config_entries, list) assert isinstance(entry4.connections, set) assert isinstance(entry4.identifiers, set) @@ -1947,7 +1949,7 @@ async def test_restore_shared_device( "action": "update", "device_id": entry.id, "changes": { - "config_entries": {config_entry_1.entry_id}, + "config_entries": [config_entry_1.entry_id], "identifiers": {("entry_123", "0123")}, }, } @@ -1971,7 +1973,7 @@ async def test_restore_shared_device( "action": "update", "device_id": entry.id, "changes": { - "config_entries": {config_entry_2.entry_id}, + "config_entries": [config_entry_2.entry_id], "identifiers": {("entry_234", "2345")}, }, } @@ -2628,39 +2630,3 @@ async def test_async_remove_device_thread_safety( await hass.async_add_executor_job( device_registry.async_remove_device, device.id ) - - -async def test_primary_integration( - hass: HomeAssistant, - device_registry: dr.DeviceRegistry, - mock_config_entry: MockConfigEntry, -) -> None: - """Test the primary integration field.""" - # Update existing - device = device_registry.async_get_or_create( - config_entry_id=mock_config_entry.entry_id, - connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")}, - identifiers=set(), - manufacturer="manufacturer", - model="model", - ) - assert device.primary_integration is None - - device = device_registry.async_get_or_create( - config_entry_id=mock_config_entry.entry_id, - connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")}, - model="model 2", - domain="test_domain", - ) - assert device.primary_integration == "test_domain" - - # Create new - device = device_registry.async_get_or_create( - config_entry_id=mock_config_entry.entry_id, - connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")}, - identifiers=set(), - manufacturer="manufacturer", - model="model", - domain="test_domain", - ) - assert device.primary_integration == "test_domain" diff --git a/tests/helpers/test_entity_platform.py b/tests/helpers/test_entity_platform.py index c28a88e8df8..56ddcd9a6c9 100644 --- a/tests/helpers/test_entity_platform.py +++ b/tests/helpers/test_entity_platform.py @@ -1191,7 +1191,6 @@ async def test_device_info_called( assert device.sw_version == "test-sw" assert device.hw_version == "test-hw" assert device.via_device_id == via.id - assert device.primary_integration == config_entry.domain async def test_device_info_not_overrides( diff --git a/tests/helpers/test_entity_registry.py b/tests/helpers/test_entity_registry.py index 4dc8d79be3f..1390ef3889d 100644 --- a/tests/helpers/test_entity_registry.py +++ b/tests/helpers/test_entity_registry.py @@ -1106,10 +1106,10 @@ async def test_remove_config_entry_from_device_removes_entities( config_entry_id=config_entry_2.entry_id, connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")}, ) - assert device_entry.config_entries == { + assert device_entry.config_entries == [ config_entry_1.entry_id, config_entry_2.entry_id, - } + ] # Create one entity for each config entry entry_1 = entity_registry.async_get_or_create( @@ -1174,10 +1174,10 @@ async def test_remove_config_entry_from_device_removes_entities_2( config_entry_id=config_entry_2.entry_id, connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")}, ) - assert device_entry.config_entries == { + assert device_entry.config_entries == [ config_entry_1.entry_id, config_entry_2.entry_id, - } + ] # Create one entity for each config entry entry_1 = entity_registry.async_get_or_create(