From e4c72622600d6cf42eaacf81ef3ab9be5d4236ec Mon Sep 17 00:00:00 2001 From: epenet <6771947+epenet@users.noreply.github.com> Date: Tue, 17 Feb 2026 09:31:42 +0100 Subject: [PATCH] Use unique node_id in matter fixtures (#162779) --- .../nodes/color_temperature_light.json | 2 +- .../matter/fixtures/nodes/eberle_ute3000.json | 2 +- .../fixtures/nodes/eve_contact_sensor.json | 2 +- .../fixtures/nodes/eve_energy_plug.json | 2 +- .../fixtures/nodes/extended_color_light.json | 2 +- .../fixtures/nodes/heiman_smoke_detector.json | 2 +- .../matter/fixtures/nodes/mock_cooktop.json | 2 +- .../fixtures/nodes/mock_dimmable_light.json | 2 +- .../matter/fixtures/nodes/mock_door_lock.json | 2 +- .../nodes/mock_door_lock_with_unbolt.json | 2 +- .../matter/fixtures/nodes/mock_fan.json | 2 +- .../fixtures/nodes/mock_flow_sensor.json | 2 +- .../fixtures/nodes/mock_generic_switch.json | 2 +- .../nodes/mock_generic_switch_multi.json | 2 +- .../fixtures/nodes/mock_humidity_sensor.json | 2 +- .../fixtures/nodes/mock_light_sensor.json | 2 +- .../fixtures/nodes/mock_occupancy_sensor.json | 2 +- .../nodes/mock_on_off_plugin_unit.json | 2 +- .../fixtures/nodes/mock_onoff_light.json | 2 +- .../nodes/mock_onoff_light_alt_name.json | 2 +- .../nodes/mock_onoff_light_no_name.json | 2 +- .../matter/fixtures/nodes/mock_oven.json | 2 +- .../fixtures/nodes/mock_pressure_sensor.json | 2 +- .../matter/fixtures/nodes/mock_pump.json | 2 +- .../nodes/mock_room_airconditioner.json | 2 +- .../fixtures/nodes/mock_solar_inverter.json | 2 +- .../fixtures/nodes/mock_switch_unit.json | 2 +- .../nodes/mock_temperature_sensor.json | 2 +- .../matter/fixtures/nodes/mock_valve.json | 2 +- .../nodes/mock_window_covering_lift.json | 2 +- .../nodes/mock_window_covering_pa_lift.json | 2 +- .../nodes/mock_window_covering_pa_tilt.json | 2 +- .../nodes/mock_window_covering_tilt.json | 2 +- ...onoff_light_with_levelcontrol_present.json | 2 +- .../nodes/resideo_x2s_thermostat.json | 2 +- .../fixtures/nodes/secuyou_smart_lock.json | 2 +- .../fixtures/nodes/silabs_laundrywasher.json | 2 +- .../fixtures/nodes/silabs_water_heater.json | 2 +- .../tado_smart_radiator_thermostat_x.json | 2 +- .../fixtures/nodes/yandex_smart_socket.json | 2 +- .../matter/snapshots/test_binary_sensor.ambr | 52 ++++---- .../matter/snapshots/test_button.ambr | 48 ++++---- .../matter/snapshots/test_climate.ambr | 8 +- .../matter/snapshots/test_cover.ambr | 8 +- .../matter/snapshots/test_event.ambr | 6 +- .../components/matter/snapshots/test_fan.ambr | 4 +- .../matter/snapshots/test_light.ambr | 14 +-- .../matter/snapshots/test_lock.ambr | 6 +- .../matter/snapshots/test_number.ambr | 68 +++++------ .../matter/snapshots/test_select.ambr | 58 ++++----- .../matter/snapshots/test_sensor.ambr | 114 +++++++++--------- .../matter/snapshots/test_switch.ambr | 28 ++--- .../matter/snapshots/test_valve.ambr | 2 +- .../matter/snapshots/test_water_heater.ambr | 2 +- tests/components/matter/test_adapter.py | 13 +- tests/components/matter/test_api.py | 14 +-- tests/components/matter/test_init.py | 11 ++ tests/components/matter/test_light.py | 4 +- 58 files changed, 276 insertions(+), 264 deletions(-) diff --git a/tests/components/matter/fixtures/nodes/color_temperature_light.json b/tests/components/matter/fixtures/nodes/color_temperature_light.json index 370e028e721..8c01319993a 100644 --- a/tests/components/matter/fixtures/nodes/color_temperature_light.json +++ b/tests/components/matter/fixtures/nodes/color_temperature_light.json @@ -1,5 +1,5 @@ { - "node_id": 1, + "node_id": 5, "date_commissioned": "2023-01-31T03:59:47.454727", "last_interview": "2023-01-31T03:59:47.454728", "interview_version": 2, diff --git a/tests/components/matter/fixtures/nodes/eberle_ute3000.json b/tests/components/matter/fixtures/nodes/eberle_ute3000.json index c8fc4390d3e..67f986434fd 100644 --- a/tests/components/matter/fixtures/nodes/eberle_ute3000.json +++ b/tests/components/matter/fixtures/nodes/eberle_ute3000.json @@ -1,5 +1,5 @@ { - "node_id": 20, + "node_id": 7, "date_commissioned": "2025-02-05T17:31:08.969773", "last_interview": "2025-10-17T07:43:55.215739", "interview_version": 6, diff --git a/tests/components/matter/fixtures/nodes/eve_contact_sensor.json b/tests/components/matter/fixtures/nodes/eve_contact_sensor.json index a009796f940..27cc3205cea 100644 --- a/tests/components/matter/fixtures/nodes/eve_contact_sensor.json +++ b/tests/components/matter/fixtures/nodes/eve_contact_sensor.json @@ -1,5 +1,5 @@ { - "node_id": 1, + "node_id": 9, "date_commissioned": "2023-07-02T14:06:45.190550", "last_interview": "2023-07-02T14:06:45.190553", "interview_version": 4, diff --git a/tests/components/matter/fixtures/nodes/eve_energy_plug.json b/tests/components/matter/fixtures/nodes/eve_energy_plug.json index 03ff4ce7dba..0ce56950709 100644 --- a/tests/components/matter/fixtures/nodes/eve_energy_plug.json +++ b/tests/components/matter/fixtures/nodes/eve_energy_plug.json @@ -1,5 +1,5 @@ { - "node_id": 83, + "node_id": 61, "date_commissioned": "2023-11-30T14:39:37.020026", "last_interview": "2023-11-30T14:39:37.020029", "interview_version": 5, diff --git a/tests/components/matter/fixtures/nodes/extended_color_light.json b/tests/components/matter/fixtures/nodes/extended_color_light.json index d18b76768ca..e3ff990b56a 100644 --- a/tests/components/matter/fixtures/nodes/extended_color_light.json +++ b/tests/components/matter/fixtures/nodes/extended_color_light.json @@ -1,5 +1,5 @@ { - "node_id": 1, + "node_id": 10, "date_commissioned": "2023-01-31T03:59:47.454727", "last_interview": "2023-01-31T03:59:47.454728", "interview_version": 2, diff --git a/tests/components/matter/fixtures/nodes/heiman_smoke_detector.json b/tests/components/matter/fixtures/nodes/heiman_smoke_detector.json index 7ba525a7552..e25240610a8 100644 --- a/tests/components/matter/fixtures/nodes/heiman_smoke_detector.json +++ b/tests/components/matter/fixtures/nodes/heiman_smoke_detector.json @@ -1,5 +1,5 @@ { - "node_id": 1, + "node_id": 11, "date_commissioned": "2024-09-13T20:07:21.672257", "last_interview": "2024-09-13T21:10:36.026041", "interview_version": 6, diff --git a/tests/components/matter/fixtures/nodes/mock_cooktop.json b/tests/components/matter/fixtures/nodes/mock_cooktop.json index f32322b6cb7..3681572ec08 100644 --- a/tests/components/matter/fixtures/nodes/mock_cooktop.json +++ b/tests/components/matter/fixtures/nodes/mock_cooktop.json @@ -1,5 +1,5 @@ { - "node_id": 3, + "node_id": 43, "date_commissioned": "2025-04-29T15:54:11.963738", "last_interview": "2025-04-29T15:54:11.963750", "interview_version": 6, diff --git a/tests/components/matter/fixtures/nodes/mock_dimmable_light.json b/tests/components/matter/fixtures/nodes/mock_dimmable_light.json index 867e6963b9d..f779b87e35f 100644 --- a/tests/components/matter/fixtures/nodes/mock_dimmable_light.json +++ b/tests/components/matter/fixtures/nodes/mock_dimmable_light.json @@ -1,5 +1,5 @@ { - "node_id": 1, + "node_id": 13, "date_commissioned": "2022-11-29T21:23:48.485051", "last_interview": "2022-11-29T21:23:48.485057", "interview_version": 2, diff --git a/tests/components/matter/fixtures/nodes/mock_door_lock.json b/tests/components/matter/fixtures/nodes/mock_door_lock.json index 360435605ae..febe8b16dcf 100644 --- a/tests/components/matter/fixtures/nodes/mock_door_lock.json +++ b/tests/components/matter/fixtures/nodes/mock_door_lock.json @@ -1,5 +1,5 @@ { - "node_id": 1, + "node_id": 16, "date_commissioned": "2023-03-07T09:06:06.059454", "last_interview": "2023-03-07T09:06:06.059456", "interview_version": 2, diff --git a/tests/components/matter/fixtures/nodes/mock_door_lock_with_unbolt.json b/tests/components/matter/fixtures/nodes/mock_door_lock_with_unbolt.json index 1c35d855db5..ecf9c0ea5ee 100644 --- a/tests/components/matter/fixtures/nodes/mock_door_lock_with_unbolt.json +++ b/tests/components/matter/fixtures/nodes/mock_door_lock_with_unbolt.json @@ -1,5 +1,5 @@ { - "node_id": 1, + "node_id": 15, "date_commissioned": "2023-03-07T09:06:06.059454", "last_interview": "2023-03-07T09:06:06.059456", "interview_version": 2, diff --git a/tests/components/matter/fixtures/nodes/mock_fan.json b/tests/components/matter/fixtures/nodes/mock_fan.json index e33c29ce66d..221c418e7e0 100644 --- a/tests/components/matter/fixtures/nodes/mock_fan.json +++ b/tests/components/matter/fixtures/nodes/mock_fan.json @@ -1,5 +1,5 @@ { - "node_id": 29, + "node_id": 55, "date_commissioned": "2024-07-25T08:34:23.014310", "last_interview": "2024-07-25T08:34:23.014315", "interview_version": 6, diff --git a/tests/components/matter/fixtures/nodes/mock_flow_sensor.json b/tests/components/matter/fixtures/nodes/mock_flow_sensor.json index a8dad202fa1..0ef981b80f4 100644 --- a/tests/components/matter/fixtures/nodes/mock_flow_sensor.json +++ b/tests/components/matter/fixtures/nodes/mock_flow_sensor.json @@ -1,5 +1,5 @@ { - "node_id": 1, + "node_id": 17, "date_commissioned": "2022-11-29T21:23:48.485051", "last_interview": "2022-11-29T21:23:48.485057", "interview_version": 2, diff --git a/tests/components/matter/fixtures/nodes/mock_generic_switch.json b/tests/components/matter/fixtures/nodes/mock_generic_switch.json index 9b334c5fb54..df4e00306ae 100644 --- a/tests/components/matter/fixtures/nodes/mock_generic_switch.json +++ b/tests/components/matter/fixtures/nodes/mock_generic_switch.json @@ -1,5 +1,5 @@ { - "node_id": 1, + "node_id": 19, "date_commissioned": "2023-07-06T11:13:20.917394", "last_interview": "2023-07-06T11:13:20.917401", "interview_version": 2, diff --git a/tests/components/matter/fixtures/nodes/mock_generic_switch_multi.json b/tests/components/matter/fixtures/nodes/mock_generic_switch_multi.json index 4055c9dc336..39284c67927 100644 --- a/tests/components/matter/fixtures/nodes/mock_generic_switch_multi.json +++ b/tests/components/matter/fixtures/nodes/mock_generic_switch_multi.json @@ -1,5 +1,5 @@ { - "node_id": 1, + "node_id": 18, "date_commissioned": "2023-07-06T11:13:20.917394", "last_interview": "2023-07-06T11:13:20.917401", "interview_version": 2, diff --git a/tests/components/matter/fixtures/nodes/mock_humidity_sensor.json b/tests/components/matter/fixtures/nodes/mock_humidity_sensor.json index 8220c9cf8f8..75f26e77fce 100644 --- a/tests/components/matter/fixtures/nodes/mock_humidity_sensor.json +++ b/tests/components/matter/fixtures/nodes/mock_humidity_sensor.json @@ -1,5 +1,5 @@ { - "node_id": 1, + "node_id": 21, "date_commissioned": "2022-11-29T21:23:48.485051", "last_interview": "2022-11-29T21:23:48.485057", "interview_version": 2, diff --git a/tests/components/matter/fixtures/nodes/mock_light_sensor.json b/tests/components/matter/fixtures/nodes/mock_light_sensor.json index c4d84bc7923..b05dcd61e08 100644 --- a/tests/components/matter/fixtures/nodes/mock_light_sensor.json +++ b/tests/components/matter/fixtures/nodes/mock_light_sensor.json @@ -1,5 +1,5 @@ { - "node_id": 1, + "node_id": 22, "date_commissioned": "2022-11-29T21:23:48.485051", "last_interview": "2022-11-29T21:23:48.485057", "interview_version": 2, diff --git a/tests/components/matter/fixtures/nodes/mock_occupancy_sensor.json b/tests/components/matter/fixtures/nodes/mock_occupancy_sensor.json index f63dd43362b..e9d2575dcd0 100644 --- a/tests/components/matter/fixtures/nodes/mock_occupancy_sensor.json +++ b/tests/components/matter/fixtures/nodes/mock_occupancy_sensor.json @@ -1,5 +1,5 @@ { - "node_id": 1, + "node_id": 24, "date_commissioned": "2022-11-29T21:23:48.485051", "last_interview": "2022-11-29T21:23:48.485057", "interview_version": 2, diff --git a/tests/components/matter/fixtures/nodes/mock_on_off_plugin_unit.json b/tests/components/matter/fixtures/nodes/mock_on_off_plugin_unit.json index 3b4831a7485..f563bcc7489 100644 --- a/tests/components/matter/fixtures/nodes/mock_on_off_plugin_unit.json +++ b/tests/components/matter/fixtures/nodes/mock_on_off_plugin_unit.json @@ -1,5 +1,5 @@ { - "node_id": 1, + "node_id": 26, "date_commissioned": "2022-11-29T21:23:48.485051", "last_interview": "2022-11-29T21:23:48.485057", "interview_version": 2, diff --git a/tests/components/matter/fixtures/nodes/mock_onoff_light.json b/tests/components/matter/fixtures/nodes/mock_onoff_light.json index de3e5d4c357..5199dcb16a0 100644 --- a/tests/components/matter/fixtures/nodes/mock_onoff_light.json +++ b/tests/components/matter/fixtures/nodes/mock_onoff_light.json @@ -1,5 +1,5 @@ { - "node_id": 1, + "node_id": 30, "date_commissioned": "2022-11-29T21:23:48.485051", "last_interview": "2022-11-29T21:23:48.485057", "interview_version": 2, diff --git a/tests/components/matter/fixtures/nodes/mock_onoff_light_alt_name.json b/tests/components/matter/fixtures/nodes/mock_onoff_light_alt_name.json index ad3bb821736..2f3127dc385 100644 --- a/tests/components/matter/fixtures/nodes/mock_onoff_light_alt_name.json +++ b/tests/components/matter/fixtures/nodes/mock_onoff_light_alt_name.json @@ -1,5 +1,5 @@ { - "node_id": 1, + "node_id": 27, "date_commissioned": "2022-11-29T21:23:48.485051", "last_interview": "2022-11-29T21:23:48.485057", "interview_version": 2, diff --git a/tests/components/matter/fixtures/nodes/mock_onoff_light_no_name.json b/tests/components/matter/fixtures/nodes/mock_onoff_light_no_name.json index 2f7abd2bc44..1d84c2ad7b8 100644 --- a/tests/components/matter/fixtures/nodes/mock_onoff_light_no_name.json +++ b/tests/components/matter/fixtures/nodes/mock_onoff_light_no_name.json @@ -1,5 +1,5 @@ { - "node_id": 1, + "node_id": 28, "date_commissioned": "2022-11-29T21:23:48.485051", "last_interview": "2022-11-29T21:23:48.485057", "interview_version": 2, diff --git a/tests/components/matter/fixtures/nodes/mock_oven.json b/tests/components/matter/fixtures/nodes/mock_oven.json index 6e325146f83..80fbf70613b 100644 --- a/tests/components/matter/fixtures/nodes/mock_oven.json +++ b/tests/components/matter/fixtures/nodes/mock_oven.json @@ -1,5 +1,5 @@ { - "node_id": 2, + "node_id": 41, "date_commissioned": "2025-04-29T15:37:55.171819", "last_interview": "2025-04-29T15:37:55.171832", "interview_version": 6, diff --git a/tests/components/matter/fixtures/nodes/mock_pressure_sensor.json b/tests/components/matter/fixtures/nodes/mock_pressure_sensor.json index d38ac560ac5..8cb1adffaf4 100644 --- a/tests/components/matter/fixtures/nodes/mock_pressure_sensor.json +++ b/tests/components/matter/fixtures/nodes/mock_pressure_sensor.json @@ -1,5 +1,5 @@ { - "node_id": 1, + "node_id": 31, "date_commissioned": "2022-11-29T21:23:48.485051", "last_interview": "2022-11-29T21:23:48.485057", "interview_version": 2, diff --git a/tests/components/matter/fixtures/nodes/mock_pump.json b/tests/components/matter/fixtures/nodes/mock_pump.json index 6d74b3d1b89..4a258b0a736 100644 --- a/tests/components/matter/fixtures/nodes/mock_pump.json +++ b/tests/components/matter/fixtures/nodes/mock_pump.json @@ -1,5 +1,5 @@ { - "node_id": 3, + "node_id": 44, "date_commissioned": "2025-05-09T15:45:16.457511", "last_interview": "2025-05-09T15:49:41.414681", "interview_version": 6, diff --git a/tests/components/matter/fixtures/nodes/mock_room_airconditioner.json b/tests/components/matter/fixtures/nodes/mock_room_airconditioner.json index 770e217e68c..8847a992b22 100644 --- a/tests/components/matter/fixtures/nodes/mock_room_airconditioner.json +++ b/tests/components/matter/fixtures/nodes/mock_room_airconditioner.json @@ -1,5 +1,5 @@ { - "node_id": 36, + "node_id": 59, "date_commissioned": "2024-03-27T17:31:23.745932", "last_interview": "2024-03-27T17:31:23.745939", "interview_version": 6, diff --git a/tests/components/matter/fixtures/nodes/mock_solar_inverter.json b/tests/components/matter/fixtures/nodes/mock_solar_inverter.json index 5a4e04eacaf..1cd41093961 100644 --- a/tests/components/matter/fixtures/nodes/mock_solar_inverter.json +++ b/tests/components/matter/fixtures/nodes/mock_solar_inverter.json @@ -1,5 +1,5 @@ { - "node_id": 1, + "node_id": 34, "date_commissioned": "2025-04-26T13:59:01.038380", "last_interview": "2025-04-26T13:59:01.038432", "interview_version": 6, diff --git a/tests/components/matter/fixtures/nodes/mock_switch_unit.json b/tests/components/matter/fixtures/nodes/mock_switch_unit.json index e16f1e406ec..a37988f9682 100644 --- a/tests/components/matter/fixtures/nodes/mock_switch_unit.json +++ b/tests/components/matter/fixtures/nodes/mock_switch_unit.json @@ -1,5 +1,5 @@ { - "node_id": 1, + "node_id": 35, "date_commissioned": "2022-11-29T21:23:48.485051", "last_interview": "2022-11-29T21:23:48.485057", "interview_version": 2, diff --git a/tests/components/matter/fixtures/nodes/mock_temperature_sensor.json b/tests/components/matter/fixtures/nodes/mock_temperature_sensor.json index 0abb366f81b..1dbc2a477ec 100644 --- a/tests/components/matter/fixtures/nodes/mock_temperature_sensor.json +++ b/tests/components/matter/fixtures/nodes/mock_temperature_sensor.json @@ -1,5 +1,5 @@ { - "node_id": 1, + "node_id": 38, "date_commissioned": "2022-11-29T21:23:48.485051", "last_interview": "2022-11-29T21:23:48.485057", "interview_version": 2, diff --git a/tests/components/matter/fixtures/nodes/mock_valve.json b/tests/components/matter/fixtures/nodes/mock_valve.json index 9f0b2078923..fa05e8a0d04 100644 --- a/tests/components/matter/fixtures/nodes/mock_valve.json +++ b/tests/components/matter/fixtures/nodes/mock_valve.json @@ -1,5 +1,5 @@ { - "node_id": 75, + "node_id": 60, "date_commissioned": "2024-09-02T09:32:00.380607", "last_interview": "2024-09-02T09:32:00.380611", "interview_version": 6, diff --git a/tests/components/matter/fixtures/nodes/mock_window_covering_lift.json b/tests/components/matter/fixtures/nodes/mock_window_covering_lift.json index 9c58869e988..00b2ba94c64 100644 --- a/tests/components/matter/fixtures/nodes/mock_window_covering_lift.json +++ b/tests/components/matter/fixtures/nodes/mock_window_covering_lift.json @@ -1,5 +1,5 @@ { - "node_id": 50, + "node_id": 51, "date_commissioned": "2023-04-27T18:47:08.437119", "last_interview": "2023-04-27T18:47:08.437131", "interview_version": 3, diff --git a/tests/components/matter/fixtures/nodes/mock_window_covering_pa_lift.json b/tests/components/matter/fixtures/nodes/mock_window_covering_pa_lift.json index fe970b6ed6b..369cebc062b 100644 --- a/tests/components/matter/fixtures/nodes/mock_window_covering_pa_lift.json +++ b/tests/components/matter/fixtures/nodes/mock_window_covering_pa_lift.json @@ -1,5 +1,5 @@ { - "node_id": 1, + "node_id": 39, "date_commissioned": "2023-03-29T08:23:30.740085", "last_interview": "2023-03-29T08:23:30.740087", "interview_version": 2, diff --git a/tests/components/matter/fixtures/nodes/mock_window_covering_pa_tilt.json b/tests/components/matter/fixtures/nodes/mock_window_covering_pa_tilt.json index 92a1d820d2e..7e52b262dbf 100644 --- a/tests/components/matter/fixtures/nodes/mock_window_covering_pa_tilt.json +++ b/tests/components/matter/fixtures/nodes/mock_window_covering_pa_tilt.json @@ -1,5 +1,5 @@ { - "node_id": 50, + "node_id": 52, "date_commissioned": "2023-04-27T18:47:08.437119", "last_interview": "2023-04-27T18:47:08.437131", "interview_version": 3, diff --git a/tests/components/matter/fixtures/nodes/mock_window_covering_tilt.json b/tests/components/matter/fixtures/nodes/mock_window_covering_tilt.json index 144348b5c76..7e4772cb5c3 100644 --- a/tests/components/matter/fixtures/nodes/mock_window_covering_tilt.json +++ b/tests/components/matter/fixtures/nodes/mock_window_covering_tilt.json @@ -1,5 +1,5 @@ { - "node_id": 50, + "node_id": 53, "date_commissioned": "2023-04-27T18:47:08.437119", "last_interview": "2023-04-27T18:47:08.437131", "interview_version": 3, diff --git a/tests/components/matter/fixtures/nodes/onoff_light_with_levelcontrol_present.json b/tests/components/matter/fixtures/nodes/onoff_light_with_levelcontrol_present.json index c1264f5b7ea..1043fcad959 100644 --- a/tests/components/matter/fixtures/nodes/onoff_light_with_levelcontrol_present.json +++ b/tests/components/matter/fixtures/nodes/onoff_light_with_levelcontrol_present.json @@ -1,5 +1,5 @@ { - "node_id": 8, + "node_id": 48, "date_commissioned": "2024-03-07T01:39:20.590755", "last_interview": "2024-04-02T14:16:31.045880", "interview_version": 6, diff --git a/tests/components/matter/fixtures/nodes/resideo_x2s_thermostat.json b/tests/components/matter/fixtures/nodes/resideo_x2s_thermostat.json index 32a9f3839bb..e82f8c2f6a0 100644 --- a/tests/components/matter/fixtures/nodes/resideo_x2s_thermostat.json +++ b/tests/components/matter/fixtures/nodes/resideo_x2s_thermostat.json @@ -1,5 +1,5 @@ { - "node_id": 4, + "node_id": 45, "date_commissioned": "2026-01-04T01:49:35.244151", "last_interview": "2026-01-04T03:11:54.520702", "interview_version": 6, diff --git a/tests/components/matter/fixtures/nodes/secuyou_smart_lock.json b/tests/components/matter/fixtures/nodes/secuyou_smart_lock.json index 77d524eb605..3c21d4bce7f 100644 --- a/tests/components/matter/fixtures/nodes/secuyou_smart_lock.json +++ b/tests/components/matter/fixtures/nodes/secuyou_smart_lock.json @@ -1,5 +1,5 @@ { - "node_id": 2, + "node_id": 42, "date_commissioned": "2025-06-26T06:42:50.114401", "last_interview": "2025-06-26T06:42:50.114421", "interview_version": 6, diff --git a/tests/components/matter/fixtures/nodes/silabs_laundrywasher.json b/tests/components/matter/fixtures/nodes/silabs_laundrywasher.json index 6bcb5d3d96e..626205a208b 100644 --- a/tests/components/matter/fixtures/nodes/silabs_laundrywasher.json +++ b/tests/components/matter/fixtures/nodes/silabs_laundrywasher.json @@ -1,5 +1,5 @@ { - "node_id": 29, + "node_id": 56, "date_commissioned": "2024-10-19T19:49:36.900186", "last_interview": "2024-10-20T09:26:38.517535", "interview_version": 6, diff --git a/tests/components/matter/fixtures/nodes/silabs_water_heater.json b/tests/components/matter/fixtures/nodes/silabs_water_heater.json index 7b764f3b3f1..2fe9b9e09b6 100644 --- a/tests/components/matter/fixtures/nodes/silabs_water_heater.json +++ b/tests/components/matter/fixtures/nodes/silabs_water_heater.json @@ -1,5 +1,5 @@ { - "node_id": 25, + "node_id": 57, "date_commissioned": "2024-11-21T20:21:44.371473", "last_interview": "2024-11-21T20:21:44.371503", "interview_version": 6, diff --git a/tests/components/matter/fixtures/nodes/tado_smart_radiator_thermostat_x.json b/tests/components/matter/fixtures/nodes/tado_smart_radiator_thermostat_x.json index 9111ffd03fe..1b3824b12af 100644 --- a/tests/components/matter/fixtures/nodes/tado_smart_radiator_thermostat_x.json +++ b/tests/components/matter/fixtures/nodes/tado_smart_radiator_thermostat_x.json @@ -1,5 +1,5 @@ { - "node_id": 12, + "node_id": 49, "date_commissioned": "2024-11-30T14:42:32.255793", "last_interview": "2025-09-02T11:11:02.931246", "interview_version": 6, diff --git a/tests/components/matter/fixtures/nodes/yandex_smart_socket.json b/tests/components/matter/fixtures/nodes/yandex_smart_socket.json index 26cdf38414f..8aab7ff6c2e 100644 --- a/tests/components/matter/fixtures/nodes/yandex_smart_socket.json +++ b/tests/components/matter/fixtures/nodes/yandex_smart_socket.json @@ -1,5 +1,5 @@ { - "node_id": 4, + "node_id": 46, "date_commissioned": "2024-12-05T10:54:31.635203", "last_interview": "2024-12-05T12:16:52.038776", "interview_version": 6, diff --git a/tests/components/matter/snapshots/test_binary_sensor.ambr b/tests/components/matter/snapshots/test_binary_sensor.ambr index 6bc7517097f..a0e5baef7f5 100644 --- a/tests/components/matter/snapshots/test_binary_sensor.ambr +++ b/tests/components/matter/snapshots/test_binary_sensor.ambr @@ -230,7 +230,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-ContactSensor-69-0', + 'unique_id': '00000000000004D2-0000000000000009-MatterNodeDevice-1-ContactSensor-69-0', 'unit_of_measurement': None, }) # --- @@ -777,7 +777,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'battery_alert', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-SmokeCoAlarmBatteryAlertSensor-92-3', + 'unique_id': '00000000000004D2-000000000000000B-MatterNodeDevice-1-SmokeCoAlarmBatteryAlertSensor-92-3', 'unit_of_measurement': None, }) # --- @@ -827,7 +827,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'end_of_service', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-SmokeCoAlarmEndfOfServiceSensor-92-7', + 'unique_id': '00000000000004D2-000000000000000B-MatterNodeDevice-1-SmokeCoAlarmEndfOfServiceSensor-92-7', 'unit_of_measurement': None, }) # --- @@ -877,7 +877,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'hardware_fault', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-SmokeCoAlarmHardwareFaultAlertSensor-92-6', + 'unique_id': '00000000000004D2-000000000000000B-MatterNodeDevice-1-SmokeCoAlarmHardwareFaultAlertSensor-92-6', 'unit_of_measurement': None, }) # --- @@ -927,7 +927,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'muted', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-SmokeCoAlarmDeviceMutedSensor-92-4', + 'unique_id': '00000000000004D2-000000000000000B-MatterNodeDevice-1-SmokeCoAlarmDeviceMutedSensor-92-4', 'unit_of_measurement': None, }) # --- @@ -976,7 +976,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-SmokeCoAlarmSmokeStateSensor-92-1', + 'unique_id': '00000000000004D2-000000000000000B-MatterNodeDevice-1-SmokeCoAlarmSmokeStateSensor-92-1', 'unit_of_measurement': None, }) # --- @@ -1026,7 +1026,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'test_in_progress', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-SmokeCoAlarmTestInProgressSensor-92-5', + 'unique_id': '00000000000004D2-000000000000000B-MatterNodeDevice-1-SmokeCoAlarmTestInProgressSensor-92-5', 'unit_of_measurement': None, }) # --- @@ -1126,7 +1126,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'actuator', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-LockActuatorEnabledSensor-257-2', + 'unique_id': '00000000000004D2-0000000000000010-MatterNodeDevice-1-LockActuatorEnabledSensor-257-2', 'unit_of_measurement': None, }) # --- @@ -1175,7 +1175,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-BatteryChargeLevel-47-14', + 'unique_id': '00000000000004D2-0000000000000010-MatterNodeDevice-1-BatteryChargeLevel-47-14', 'unit_of_measurement': None, }) # --- @@ -1225,7 +1225,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'actuator', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-LockActuatorEnabledSensor-257-2', + 'unique_id': '00000000000004D2-000000000000000F-MatterNodeDevice-1-LockActuatorEnabledSensor-257-2', 'unit_of_measurement': None, }) # --- @@ -1274,7 +1274,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-BatteryChargeLevel-47-14', + 'unique_id': '00000000000004D2-000000000000000F-MatterNodeDevice-1-BatteryChargeLevel-47-14', 'unit_of_measurement': None, }) # --- @@ -1324,7 +1324,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-LockDoorStateSensor-257-3', + 'unique_id': '00000000000004D2-000000000000000F-MatterNodeDevice-1-LockDoorStateSensor-257-3', 'unit_of_measurement': None, }) # --- @@ -1573,7 +1573,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-OccupancySensor-1030-0', + 'unique_id': '00000000000004D2-0000000000000018-MatterNodeDevice-1-OccupancySensor-1030-0', 'unit_of_measurement': None, }) # --- @@ -1623,7 +1623,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-OccupancySensor-1030-0', + 'unique_id': '00000000000004D2-000000000000001B-MatterNodeDevice-1-OccupancySensor-1030-0', 'unit_of_measurement': None, }) # --- @@ -1673,7 +1673,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-OccupancySensor-1030-0', + 'unique_id': '00000000000004D2-000000000000001C-MatterNodeDevice-1-OccupancySensor-1030-0', 'unit_of_measurement': None, }) # --- @@ -1723,7 +1723,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'pump_fault', - 'unique_id': '00000000000004D2-0000000000000003-MatterNodeDevice-1-PumpFault-512-16', + 'unique_id': '00000000000004D2-000000000000002C-MatterNodeDevice-1-PumpFault-512-16', 'unit_of_measurement': None, }) # --- @@ -1773,7 +1773,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'pump_running', - 'unique_id': '00000000000004D2-0000000000000003-MatterNodeDevice-1-PumpStatusRunning-512-16', + 'unique_id': '00000000000004D2-000000000000002C-MatterNodeDevice-1-PumpStatusRunning-512-16', 'unit_of_measurement': None, }) # --- @@ -1970,7 +1970,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'valve_fault_general_fault', - 'unique_id': '00000000000004D2-000000000000004B-MatterNodeDevice-1-ValveConfigurationAndControlValveFault_GeneralFault-129-9', + 'unique_id': '00000000000004D2-000000000000003C-MatterNodeDevice-1-ValveConfigurationAndControlValveFault_GeneralFault-129-9', 'unit_of_measurement': None, }) # --- @@ -2020,7 +2020,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'valve_fault_blocked', - 'unique_id': '00000000000004D2-000000000000004B-MatterNodeDevice-1-ValveConfigurationAndControlValveFault_Blocked-129-9', + 'unique_id': '00000000000004D2-000000000000003C-MatterNodeDevice-1-ValveConfigurationAndControlValveFault_Blocked-129-9', 'unit_of_measurement': None, }) # --- @@ -2070,7 +2070,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'valve_fault_leaking', - 'unique_id': '00000000000004D2-000000000000004B-MatterNodeDevice-1-ValveConfigurationAndControlValveFault_Leaking-129-9', + 'unique_id': '00000000000004D2-000000000000003C-MatterNodeDevice-1-ValveConfigurationAndControlValveFault_Leaking-129-9', 'unit_of_measurement': None, }) # --- @@ -2170,7 +2170,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'config_status_operational', - 'unique_id': '00000000000004D2-0000000000000032-MatterNodeDevice-1-WindowCoveringConfigStatusOperational-258-7', + 'unique_id': '00000000000004D2-0000000000000033-MatterNodeDevice-1-WindowCoveringConfigStatusOperational-258-7', 'unit_of_measurement': None, }) # --- @@ -2220,7 +2220,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'config_status_operational', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-WindowCoveringConfigStatusOperational-258-7', + 'unique_id': '00000000000004D2-0000000000000027-MatterNodeDevice-1-WindowCoveringConfigStatusOperational-258-7', 'unit_of_measurement': None, }) # --- @@ -2270,7 +2270,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'config_status_operational', - 'unique_id': '00000000000004D2-0000000000000032-MatterNodeDevice-1-WindowCoveringConfigStatusOperational-258-7', + 'unique_id': '00000000000004D2-0000000000000034-MatterNodeDevice-1-WindowCoveringConfigStatusOperational-258-7', 'unit_of_measurement': None, }) # --- @@ -2320,7 +2320,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'config_status_operational', - 'unique_id': '00000000000004D2-0000000000000032-MatterNodeDevice-1-WindowCoveringConfigStatusOperational-258-7', + 'unique_id': '00000000000004D2-0000000000000035-MatterNodeDevice-1-WindowCoveringConfigStatusOperational-258-7', 'unit_of_measurement': None, }) # --- @@ -2370,7 +2370,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'actuator', - 'unique_id': '00000000000004D2-0000000000000002-MatterNodeDevice-1-LockActuatorEnabledSensor-257-2', + 'unique_id': '00000000000004D2-000000000000002A-MatterNodeDevice-1-LockActuatorEnabledSensor-257-2', 'unit_of_measurement': None, }) # --- @@ -2719,7 +2719,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'boost_state', - 'unique_id': '00000000000004D2-0000000000000019-MatterNodeDevice-2-WaterHeaterManagementBoostStateSensor-148-5', + 'unique_id': '00000000000004D2-0000000000000039-MatterNodeDevice-2-WaterHeaterManagementBoostStateSensor-148-5', 'unit_of_measurement': None, }) # --- diff --git a/tests/components/matter/snapshots/test_button.ambr b/tests/components/matter/snapshots/test_button.ambr index 847769a7f19..d7a96758253 100644 --- a/tests/components/matter/snapshots/test_button.ambr +++ b/tests/components/matter/snapshots/test_button.ambr @@ -781,7 +781,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-1', + 'unique_id': '00000000000004D2-0000000000000005-MatterNodeDevice-1-IdentifyButton-3-1', 'unit_of_measurement': None, }) # --- @@ -831,7 +831,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000014-MatterNodeDevice-1-IdentifyButton-3-1', + 'unique_id': '00000000000004D2-0000000000000007-MatterNodeDevice-1-IdentifyButton-3-1', 'unit_of_measurement': None, }) # --- @@ -1031,7 +1031,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-1', + 'unique_id': '00000000000004D2-0000000000000009-MatterNodeDevice-1-IdentifyButton-3-1', 'unit_of_measurement': None, }) # --- @@ -1181,7 +1181,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000053-MatterNodeDevice-1-IdentifyButton-3-1', + 'unique_id': '00000000000004D2-000000000000003D-MatterNodeDevice-1-IdentifyButton-3-1', 'unit_of_measurement': None, }) # --- @@ -1531,7 +1531,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-1', + 'unique_id': '00000000000004D2-000000000000000A-MatterNodeDevice-1-IdentifyButton-3-1', 'unit_of_measurement': None, }) # --- @@ -1780,7 +1780,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-1', + 'unique_id': '00000000000004D2-000000000000000B-MatterNodeDevice-1-IdentifyButton-3-1', 'unit_of_measurement': None, }) # --- @@ -1830,7 +1830,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'self_test_request', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-SmokeCoAlarmSelfTestRequest-92-65529', + 'unique_id': '00000000000004D2-000000000000000B-MatterNodeDevice-1-SmokeCoAlarmSelfTestRequest-92-65529', 'unit_of_measurement': None, }) # --- @@ -2575,7 +2575,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-000000000000001D-MatterNodeDevice-1-IdentifyButton-3-1', + 'unique_id': '00000000000004D2-0000000000000037-MatterNodeDevice-1-IdentifyButton-3-1', 'unit_of_measurement': None, }) # --- @@ -3067,7 +3067,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-1', + 'unique_id': '00000000000004D2-0000000000000018-MatterNodeDevice-1-IdentifyButton-3-1', 'unit_of_measurement': None, }) # --- @@ -3117,7 +3117,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-1', + 'unique_id': '00000000000004D2-000000000000001A-MatterNodeDevice-1-IdentifyButton-3-1', 'unit_of_measurement': None, }) # --- @@ -3167,7 +3167,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-1', + 'unique_id': '00000000000004D2-0000000000000023-MatterNodeDevice-1-IdentifyButton-3-1', 'unit_of_measurement': None, }) # --- @@ -3217,7 +3217,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-0-IdentifyButton-3-1', + 'unique_id': '00000000000004D2-0000000000000026-MatterNodeDevice-0-IdentifyButton-3-1', 'unit_of_measurement': None, }) # --- @@ -3367,7 +3367,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-IdentifyButton-3-1', + 'unique_id': '00000000000004D2-0000000000000027-MatterNodeDevice-1-IdentifyButton-3-1', 'unit_of_measurement': None, }) # --- @@ -3417,7 +3417,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000008-MatterNodeDevice-1-IdentifyButton-3-1', + 'unique_id': '00000000000004D2-0000000000000030-MatterNodeDevice-1-IdentifyButton-3-1', 'unit_of_measurement': None, }) # --- @@ -3467,7 +3467,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000004-MatterNodeDevice-1-IdentifyButton-3-1', + 'unique_id': '00000000000004D2-000000000000002D-MatterNodeDevice-1-IdentifyButton-3-1', 'unit_of_measurement': None, }) # --- @@ -3517,7 +3517,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000002-MatterNodeDevice-1-IdentifyButton-3-1', + 'unique_id': '00000000000004D2-000000000000002A-MatterNodeDevice-1-IdentifyButton-3-1', 'unit_of_measurement': None, }) # --- @@ -3764,7 +3764,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-000000000000001D-MatterNodeDevice-1-IdentifyButton-3-1', + 'unique_id': '00000000000004D2-0000000000000038-MatterNodeDevice-1-IdentifyButton-3-1', 'unit_of_measurement': None, }) # --- @@ -3814,7 +3814,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'pause', - 'unique_id': '00000000000004D2-000000000000001D-MatterNodeDevice-1-OperationalStatePauseButton-96-65529', + 'unique_id': '00000000000004D2-0000000000000038-MatterNodeDevice-1-OperationalStatePauseButton-96-65529', 'unit_of_measurement': None, }) # --- @@ -3863,7 +3863,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'resume', - 'unique_id': '00000000000004D2-000000000000001D-MatterNodeDevice-1-OperationalStateResumeButton-96-65529', + 'unique_id': '00000000000004D2-0000000000000038-MatterNodeDevice-1-OperationalStateResumeButton-96-65529', 'unit_of_measurement': None, }) # --- @@ -3912,7 +3912,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'start', - 'unique_id': '00000000000004D2-000000000000001D-MatterNodeDevice-1-OperationalStateStartButton-96-65529', + 'unique_id': '00000000000004D2-0000000000000038-MatterNodeDevice-1-OperationalStateStartButton-96-65529', 'unit_of_measurement': None, }) # --- @@ -3961,7 +3961,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'stop', - 'unique_id': '00000000000004D2-000000000000001D-MatterNodeDevice-1-OperationalStateStopButton-96-65529', + 'unique_id': '00000000000004D2-0000000000000038-MatterNodeDevice-1-OperationalStateStopButton-96-65529', 'unit_of_measurement': None, }) # --- @@ -4110,7 +4110,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'cancel_boost', - 'unique_id': '00000000000004D2-0000000000000019-MatterNodeDevice-2-WaterHeaterManagementCancelBoost-148-65529', + 'unique_id': '00000000000004D2-0000000000000039-MatterNodeDevice-2-WaterHeaterManagementCancelBoost-148-65529', 'unit_of_measurement': None, }) # --- @@ -4159,7 +4159,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-000000000000000C-MatterNodeDevice-1-IdentifyButton-3-1', + 'unique_id': '00000000000004D2-0000000000000031-MatterNodeDevice-1-IdentifyButton-3-1', 'unit_of_measurement': None, }) # --- @@ -4209,7 +4209,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000004-MatterNodeDevice-1-IdentifyButton-3-1', + 'unique_id': '00000000000004D2-000000000000002E-MatterNodeDevice-1-IdentifyButton-3-1', 'unit_of_measurement': None, }) # --- diff --git a/tests/components/matter/snapshots/test_climate.ambr b/tests/components/matter/snapshots/test_climate.ambr index be27ffe9a9e..43b1d92b610 100644 --- a/tests/components/matter/snapshots/test_climate.ambr +++ b/tests/components/matter/snapshots/test_climate.ambr @@ -103,7 +103,7 @@ 'suggested_object_id': None, 'supported_features': , 'translation_key': 'thermostat', - 'unique_id': '00000000000004D2-0000000000000014-MatterNodeDevice-1-MatterThermostat-513-0', + 'unique_id': '00000000000004D2-0000000000000007-MatterNodeDevice-1-MatterThermostat-513-0', 'unit_of_measurement': None, }) # --- @@ -438,7 +438,7 @@ 'suggested_object_id': None, 'supported_features': , 'translation_key': 'thermostat', - 'unique_id': '00000000000004D2-0000000000000024-MatterNodeDevice-1-MatterThermostat-513-0', + 'unique_id': '00000000000004D2-000000000000003B-MatterNodeDevice-1-MatterThermostat-513-0', 'unit_of_measurement': None, }) # --- @@ -581,7 +581,7 @@ 'suggested_object_id': None, 'supported_features': , 'translation_key': 'thermostat', - 'unique_id': '00000000000004D2-0000000000000004-MatterNodeDevice-1-MatterThermostat-513-0', + 'unique_id': '00000000000004D2-000000000000002D-MatterNodeDevice-1-MatterThermostat-513-0', 'unit_of_measurement': None, }) # --- @@ -648,7 +648,7 @@ 'suggested_object_id': None, 'supported_features': , 'translation_key': 'thermostat', - 'unique_id': '00000000000004D2-000000000000000C-MatterNodeDevice-1-MatterThermostat-513-0', + 'unique_id': '00000000000004D2-0000000000000031-MatterNodeDevice-1-MatterThermostat-513-0', 'unit_of_measurement': None, }) # --- diff --git a/tests/components/matter/snapshots/test_cover.ambr b/tests/components/matter/snapshots/test_cover.ambr index 0a29942f2c2..63ae84d352a 100644 --- a/tests/components/matter/snapshots/test_cover.ambr +++ b/tests/components/matter/snapshots/test_cover.ambr @@ -136,7 +136,7 @@ 'suggested_object_id': None, 'supported_features': , 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000032-MatterNodeDevice-1-MatterCover-258-10', + 'unique_id': '00000000000004D2-0000000000000033-MatterNodeDevice-1-MatterCover-258-10', 'unit_of_measurement': None, }) # --- @@ -187,7 +187,7 @@ 'suggested_object_id': None, 'supported_features': , 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterCoverPositionAwareLift-258-10', + 'unique_id': '00000000000004D2-0000000000000027-MatterNodeDevice-1-MatterCoverPositionAwareLift-258-10', 'unit_of_measurement': None, }) # --- @@ -239,7 +239,7 @@ 'suggested_object_id': None, 'supported_features': , 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000032-MatterNodeDevice-1-MatterCoverPositionAwareTilt-258-10', + 'unique_id': '00000000000004D2-0000000000000034-MatterNodeDevice-1-MatterCoverPositionAwareTilt-258-10', 'unit_of_measurement': None, }) # --- @@ -291,7 +291,7 @@ 'suggested_object_id': None, 'supported_features': , 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000032-MatterNodeDevice-1-MatterCover-258-10', + 'unique_id': '00000000000004D2-0000000000000035-MatterNodeDevice-1-MatterCover-258-10', 'unit_of_measurement': None, }) # --- diff --git a/tests/components/matter/snapshots/test_event.ambr b/tests/components/matter/snapshots/test_event.ambr index 6df961d32fe..8b1cf16967c 100644 --- a/tests/components/matter/snapshots/test_event.ambr +++ b/tests/components/matter/snapshots/test_event.ambr @@ -1664,7 +1664,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'button', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-GenericSwitch-59-1', + 'unique_id': '00000000000004D2-0000000000000013-MatterNodeDevice-1-GenericSwitch-59-1', 'unit_of_measurement': None, }) # --- @@ -1728,7 +1728,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'button', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-GenericSwitch-59-1', + 'unique_id': '00000000000004D2-0000000000000012-MatterNodeDevice-1-GenericSwitch-59-1', 'unit_of_measurement': None, }) # --- @@ -1794,7 +1794,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'button', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-2-GenericSwitch-59-1', + 'unique_id': '00000000000004D2-0000000000000012-MatterNodeDevice-2-GenericSwitch-59-1', 'unit_of_measurement': None, }) # --- diff --git a/tests/components/matter/snapshots/test_fan.ambr b/tests/components/matter/snapshots/test_fan.ambr index 52d5dcc5f82..ef2f8cc8cc5 100644 --- a/tests/components/matter/snapshots/test_fan.ambr +++ b/tests/components/matter/snapshots/test_fan.ambr @@ -238,7 +238,7 @@ 'suggested_object_id': None, 'supported_features': , 'translation_key': 'fan', - 'unique_id': '00000000000004D2-000000000000001D-MatterNodeDevice-1-MatterFan-514-0', + 'unique_id': '00000000000004D2-0000000000000037-MatterNodeDevice-1-MatterFan-514-0', 'unit_of_measurement': None, }) # --- @@ -307,7 +307,7 @@ 'suggested_object_id': None, 'supported_features': , 'translation_key': 'fan', - 'unique_id': '00000000000004D2-0000000000000024-MatterNodeDevice-1-MatterFan-514-0', + 'unique_id': '00000000000004D2-000000000000003B-MatterNodeDevice-1-MatterFan-514-0', 'unit_of_measurement': None, }) # --- diff --git a/tests/components/matter/snapshots/test_light.ambr b/tests/components/matter/snapshots/test_light.ambr index da23798ef34..f4d5590b4b9 100644 --- a/tests/components/matter/snapshots/test_light.ambr +++ b/tests/components/matter/snapshots/test_light.ambr @@ -37,7 +37,7 @@ 'suggested_object_id': None, 'supported_features': , 'translation_key': 'light', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterLight-6-0', + 'unique_id': '00000000000004D2-0000000000000005-MatterNodeDevice-1-MatterLight-6-0', 'unit_of_measurement': None, }) # --- @@ -116,7 +116,7 @@ 'suggested_object_id': None, 'supported_features': , 'translation_key': 'light', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterLight-6-0', + 'unique_id': '00000000000004D2-000000000000000A-MatterNodeDevice-1-MatterLight-6-0', 'unit_of_measurement': None, }) # --- @@ -394,7 +394,7 @@ 'suggested_object_id': None, 'supported_features': , 'translation_key': 'light', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterLight-6-0', + 'unique_id': '00000000000004D2-000000000000000D-MatterNodeDevice-1-MatterLight-6-0', 'unit_of_measurement': None, }) # --- @@ -569,7 +569,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'light', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterLight-6-0', + 'unique_id': '00000000000004D2-000000000000001E-MatterNodeDevice-1-MatterLight-6-0', 'unit_of_measurement': None, }) # --- @@ -631,7 +631,7 @@ 'suggested_object_id': None, 'supported_features': , 'translation_key': 'light', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterLight-6-0', + 'unique_id': '00000000000004D2-000000000000001B-MatterNodeDevice-1-MatterLight-6-0', 'unit_of_measurement': None, }) # --- @@ -702,7 +702,7 @@ 'suggested_object_id': None, 'supported_features': , 'translation_key': 'light', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterLight-6-0', + 'unique_id': '00000000000004D2-000000000000001C-MatterNodeDevice-1-MatterLight-6-0', 'unit_of_measurement': None, }) # --- @@ -769,7 +769,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'light', - 'unique_id': '00000000000004D2-0000000000000008-MatterNodeDevice-1-MatterLight-6-0', + 'unique_id': '00000000000004D2-0000000000000030-MatterNodeDevice-1-MatterLight-6-0', 'unit_of_measurement': None, }) # --- diff --git a/tests/components/matter/snapshots/test_lock.ambr b/tests/components/matter/snapshots/test_lock.ambr index b983bb1e2d6..916a42b72dc 100644 --- a/tests/components/matter/snapshots/test_lock.ambr +++ b/tests/components/matter/snapshots/test_lock.ambr @@ -82,7 +82,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'lock', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterLock-257-0', + 'unique_id': '00000000000004D2-0000000000000010-MatterNodeDevice-1-MatterLock-257-0', 'unit_of_measurement': None, }) # --- @@ -133,7 +133,7 @@ 'suggested_object_id': None, 'supported_features': , 'translation_key': 'lock', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterLock-257-0', + 'unique_id': '00000000000004D2-000000000000000F-MatterNodeDevice-1-MatterLock-257-0', 'unit_of_measurement': None, }) # --- @@ -235,7 +235,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'lock', - 'unique_id': '00000000000004D2-0000000000000002-MatterNodeDevice-1-MatterLock-257-0', + 'unique_id': '00000000000004D2-000000000000002A-MatterNodeDevice-1-MatterLock-257-0', 'unit_of_measurement': None, }) # --- diff --git a/tests/components/matter/snapshots/test_number.ambr b/tests/components/matter/snapshots/test_number.ambr index 41fc8a7a991..efbe4bcdf7f 100644 --- a/tests/components/matter/snapshots/test_number.ambr +++ b/tests/components/matter/snapshots/test_number.ambr @@ -390,7 +390,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'on_level', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-on_level-8-17', + 'unique_id': '00000000000004D2-0000000000000005-MatterNodeDevice-1-on_level-8-17', 'unit_of_measurement': None, }) # --- @@ -628,7 +628,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'on_level', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-on_level-8-17', + 'unique_id': '00000000000004D2-000000000000000A-MatterNodeDevice-1-on_level-8-17', 'unit_of_measurement': None, }) # --- @@ -1622,7 +1622,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'off_transition_time', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-off_transition_time-8-19', + 'unique_id': '00000000000004D2-000000000000000D-MatterNodeDevice-1-off_transition_time-8-19', 'unit_of_measurement': , }) # --- @@ -1681,7 +1681,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'on_level', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-on_level-8-17', + 'unique_id': '00000000000004D2-000000000000000D-MatterNodeDevice-1-on_level-8-17', 'unit_of_measurement': None, }) # --- @@ -1739,7 +1739,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'on_off_transition_time', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-on_off_transition_time-8-16', + 'unique_id': '00000000000004D2-000000000000000D-MatterNodeDevice-1-on_off_transition_time-8-16', 'unit_of_measurement': , }) # --- @@ -1798,7 +1798,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'on_transition_time', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-on_transition_time-8-18', + 'unique_id': '00000000000004D2-000000000000000D-MatterNodeDevice-1-on_transition_time-8-18', 'unit_of_measurement': , }) # --- @@ -1974,7 +1974,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'auto_relock_timer', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-AutoRelockTimer-257-35', + 'unique_id': '00000000000004D2-0000000000000010-MatterNodeDevice-1-AutoRelockTimer-257-35', 'unit_of_measurement': , }) # --- @@ -2033,7 +2033,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'user_code_temporary_disable_time', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-DoorLockUserCodeTemporaryDisableTime-257-49', + 'unique_id': '00000000000004D2-0000000000000010-MatterNodeDevice-1-DoorLockUserCodeTemporaryDisableTime-257-49', 'unit_of_measurement': , }) # --- @@ -2092,7 +2092,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'wrong_code_entry_limit', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-DoorLockWrongCodeEntryLimit-257-48', + 'unique_id': '00000000000004D2-0000000000000010-MatterNodeDevice-1-DoorLockWrongCodeEntryLimit-257-48', 'unit_of_measurement': None, }) # --- @@ -2150,7 +2150,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'auto_relock_timer', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-AutoRelockTimer-257-35', + 'unique_id': '00000000000004D2-000000000000000F-MatterNodeDevice-1-AutoRelockTimer-257-35', 'unit_of_measurement': , }) # --- @@ -2209,7 +2209,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'user_code_temporary_disable_time', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-DoorLockUserCodeTemporaryDisableTime-257-49', + 'unique_id': '00000000000004D2-000000000000000F-MatterNodeDevice-1-DoorLockUserCodeTemporaryDisableTime-257-49', 'unit_of_measurement': , }) # --- @@ -2268,7 +2268,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'wrong_code_entry_limit', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-DoorLockWrongCodeEntryLimit-257-48', + 'unique_id': '00000000000004D2-000000000000000F-MatterNodeDevice-1-DoorLockWrongCodeEntryLimit-257-48', 'unit_of_measurement': None, }) # --- @@ -2620,7 +2620,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'off_transition_time', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-off_transition_time-8-19', + 'unique_id': '00000000000004D2-000000000000001A-MatterNodeDevice-1-off_transition_time-8-19', 'unit_of_measurement': , }) # --- @@ -2679,7 +2679,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'on_level', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-on_level-8-17', + 'unique_id': '00000000000004D2-000000000000001A-MatterNodeDevice-1-on_level-8-17', 'unit_of_measurement': None, }) # --- @@ -2737,7 +2737,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'on_off_transition_time', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-on_off_transition_time-8-16', + 'unique_id': '00000000000004D2-000000000000001A-MatterNodeDevice-1-on_off_transition_time-8-16', 'unit_of_measurement': , }) # --- @@ -2796,7 +2796,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'on_transition_time', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-on_transition_time-8-18', + 'unique_id': '00000000000004D2-000000000000001A-MatterNodeDevice-1-on_transition_time-8-18', 'unit_of_measurement': , }) # --- @@ -2855,7 +2855,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'off_transition_time', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-off_transition_time-8-19', + 'unique_id': '00000000000004D2-000000000000001B-MatterNodeDevice-1-off_transition_time-8-19', 'unit_of_measurement': , }) # --- @@ -2914,7 +2914,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'on_level', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-on_level-8-17', + 'unique_id': '00000000000004D2-000000000000001B-MatterNodeDevice-1-on_level-8-17', 'unit_of_measurement': None, }) # --- @@ -2972,7 +2972,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'on_off_transition_time', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-on_off_transition_time-8-16', + 'unique_id': '00000000000004D2-000000000000001B-MatterNodeDevice-1-on_off_transition_time-8-16', 'unit_of_measurement': , }) # --- @@ -3031,7 +3031,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'on_transition_time', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-on_transition_time-8-18', + 'unique_id': '00000000000004D2-000000000000001B-MatterNodeDevice-1-on_transition_time-8-18', 'unit_of_measurement': , }) # --- @@ -3090,7 +3090,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'off_transition_time', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-off_transition_time-8-19', + 'unique_id': '00000000000004D2-000000000000001C-MatterNodeDevice-1-off_transition_time-8-19', 'unit_of_measurement': , }) # --- @@ -3149,7 +3149,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'on_level', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-on_level-8-17', + 'unique_id': '00000000000004D2-000000000000001C-MatterNodeDevice-1-on_level-8-17', 'unit_of_measurement': None, }) # --- @@ -3207,7 +3207,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'on_off_transition_time', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-on_off_transition_time-8-16', + 'unique_id': '00000000000004D2-000000000000001C-MatterNodeDevice-1-on_off_transition_time-8-16', 'unit_of_measurement': , }) # --- @@ -3266,7 +3266,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'on_transition_time', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-on_transition_time-8-18', + 'unique_id': '00000000000004D2-000000000000001C-MatterNodeDevice-1-on_transition_time-8-18', 'unit_of_measurement': , }) # --- @@ -3325,7 +3325,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'temperature_setpoint', - 'unique_id': '00000000000004D2-0000000000000002-MatterNodeDevice-2-TemperatureControlTemperatureSetpoint-86-0', + 'unique_id': '00000000000004D2-0000000000000029-MatterNodeDevice-2-TemperatureControlTemperatureSetpoint-86-0', 'unit_of_measurement': , }) # --- @@ -3384,7 +3384,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'on_level', - 'unique_id': '00000000000004D2-0000000000000003-MatterNodeDevice-1-on_level-8-17', + 'unique_id': '00000000000004D2-000000000000002C-MatterNodeDevice-1-on_level-8-17', 'unit_of_measurement': None, }) # --- @@ -3442,7 +3442,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'pump_setpoint', - 'unique_id': '00000000000004D2-0000000000000003-MatterNodeDevice-1-pump_setpoint-8-0', + 'unique_id': '00000000000004D2-000000000000002C-MatterNodeDevice-1-pump_setpoint-8-0', 'unit_of_measurement': '%', }) # --- @@ -3620,7 +3620,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'valve_configuration_and_control_default_open_duration', - 'unique_id': '00000000000004D2-000000000000004B-MatterNodeDevice-1-ValveConfigurationAndControlDefaultOpenDuration-129-1', + 'unique_id': '00000000000004D2-000000000000003C-MatterNodeDevice-1-ValveConfigurationAndControlDefaultOpenDuration-129-1', 'unit_of_measurement': , }) # --- @@ -3679,7 +3679,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'on_level', - 'unique_id': '00000000000004D2-0000000000000008-MatterNodeDevice-1-on_level-8-17', + 'unique_id': '00000000000004D2-0000000000000030-MatterNodeDevice-1-on_level-8-17', 'unit_of_measurement': None, }) # --- @@ -3737,7 +3737,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'on_off_transition_time', - 'unique_id': '00000000000004D2-0000000000000008-MatterNodeDevice-1-on_off_transition_time-8-16', + 'unique_id': '00000000000004D2-0000000000000030-MatterNodeDevice-1-on_off_transition_time-8-16', 'unit_of_measurement': , }) # --- @@ -3796,7 +3796,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'auto_relock_timer', - 'unique_id': '00000000000004D2-0000000000000002-MatterNodeDevice-1-AutoRelockTimer-257-35', + 'unique_id': '00000000000004D2-000000000000002A-MatterNodeDevice-1-AutoRelockTimer-257-35', 'unit_of_measurement': , }) # --- @@ -3855,7 +3855,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'user_code_temporary_disable_time', - 'unique_id': '00000000000004D2-0000000000000002-MatterNodeDevice-1-DoorLockUserCodeTemporaryDisableTime-257-49', + 'unique_id': '00000000000004D2-000000000000002A-MatterNodeDevice-1-DoorLockUserCodeTemporaryDisableTime-257-49', 'unit_of_measurement': , }) # --- @@ -3914,7 +3914,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'wrong_code_entry_limit', - 'unique_id': '00000000000004D2-0000000000000002-MatterNodeDevice-1-DoorLockWrongCodeEntryLimit-257-48', + 'unique_id': '00000000000004D2-000000000000002A-MatterNodeDevice-1-DoorLockWrongCodeEntryLimit-257-48', 'unit_of_measurement': None, }) # --- @@ -3972,7 +3972,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'temperature_setpoint', - 'unique_id': '00000000000004D2-000000000000001D-MatterNodeDevice-1-TemperatureControlTemperatureSetpoint-86-0', + 'unique_id': '00000000000004D2-0000000000000038-MatterNodeDevice-1-TemperatureControlTemperatureSetpoint-86-0', 'unit_of_measurement': , }) # --- diff --git a/tests/components/matter/snapshots/test_select.ambr b/tests/components/matter/snapshots/test_select.ambr index 628968423cb..01d41bb15d6 100644 --- a/tests/components/matter/snapshots/test_select.ambr +++ b/tests/components/matter/snapshots/test_select.ambr @@ -333,7 +333,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'mode', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterModeSelect-80-3', + 'unique_id': '00000000000004D2-0000000000000005-MatterNodeDevice-1-MatterModeSelect-80-3', 'unit_of_measurement': None, }) # --- @@ -394,7 +394,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'startup_on_off', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterStartUpOnOff-6-16387', + 'unique_id': '00000000000004D2-0000000000000005-MatterNodeDevice-1-MatterStartUpOnOff-6-16387', 'unit_of_measurement': None, }) # --- @@ -710,7 +710,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'startup_on_off', - 'unique_id': '00000000000004D2-0000000000000053-MatterNodeDevice-1-MatterStartUpOnOff-6-16387', + 'unique_id': '00000000000004D2-000000000000003D-MatterNodeDevice-1-MatterStartUpOnOff-6-16387', 'unit_of_measurement': None, }) # --- @@ -949,7 +949,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'mode', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterModeSelect-80-3', + 'unique_id': '00000000000004D2-000000000000000A-MatterNodeDevice-1-MatterModeSelect-80-3', 'unit_of_measurement': None, }) # --- @@ -1010,7 +1010,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'startup_on_off', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterStartUpOnOff-6-16387', + 'unique_id': '00000000000004D2-000000000000000A-MatterNodeDevice-1-MatterStartUpOnOff-6-16387', 'unit_of_measurement': None, }) # --- @@ -2401,7 +2401,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'temperature_level', - 'unique_id': '00000000000004D2-0000000000000003-MatterNodeDevice-2-TemperatureControlSelectedTemperatureLevel-86-4', + 'unique_id': '00000000000004D2-000000000000002B-MatterNodeDevice-2-TemperatureControlSelectedTemperatureLevel-86-4', 'unit_of_measurement': None, }) # --- @@ -2471,7 +2471,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'mode', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-6-MatterModeSelect-80-3', + 'unique_id': '00000000000004D2-000000000000000D-MatterNodeDevice-6-MatterModeSelect-80-3', 'unit_of_measurement': None, }) # --- @@ -2542,7 +2542,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'startup_on_off', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterStartUpOnOff-6-16387', + 'unique_id': '00000000000004D2-000000000000000D-MatterNodeDevice-1-MatterStartUpOnOff-6-16387', 'unit_of_measurement': None, }) # --- @@ -2664,7 +2664,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'door_lock_operating_mode', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-DoorLockOperatingMode-257-37', + 'unique_id': '00000000000004D2-0000000000000010-MatterNodeDevice-1-DoorLockOperatingMode-257-37', 'unit_of_measurement': None, }) # --- @@ -2724,7 +2724,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'startup_on_off', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterStartUpOnOff-6-16387', + 'unique_id': '00000000000004D2-0000000000000010-MatterNodeDevice-1-MatterStartUpOnOff-6-16387', 'unit_of_measurement': None, }) # --- @@ -2786,7 +2786,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'door_lock_sound_volume', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-DoorLockSoundVolume-257-36', + 'unique_id': '00000000000004D2-0000000000000010-MatterNodeDevice-1-DoorLockSoundVolume-257-36', 'unit_of_measurement': None, }) # --- @@ -2846,7 +2846,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'door_lock_operating_mode', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-DoorLockOperatingMode-257-37', + 'unique_id': '00000000000004D2-000000000000000F-MatterNodeDevice-1-DoorLockOperatingMode-257-37', 'unit_of_measurement': None, }) # --- @@ -2906,7 +2906,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'startup_on_off', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterStartUpOnOff-6-16387', + 'unique_id': '00000000000004D2-000000000000000F-MatterNodeDevice-1-MatterStartUpOnOff-6-16387', 'unit_of_measurement': None, }) # --- @@ -2968,7 +2968,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'door_lock_sound_volume', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-DoorLockSoundVolume-257-36', + 'unique_id': '00000000000004D2-000000000000000F-MatterNodeDevice-1-DoorLockSoundVolume-257-36', 'unit_of_measurement': None, }) # --- @@ -3346,7 +3346,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'startup_on_off', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterStartUpOnOff-6-16387', + 'unique_id': '00000000000004D2-000000000000001A-MatterNodeDevice-1-MatterStartUpOnOff-6-16387', 'unit_of_measurement': None, }) # --- @@ -3408,7 +3408,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'startup_on_off', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterStartUpOnOff-6-16387', + 'unique_id': '00000000000004D2-000000000000001E-MatterNodeDevice-1-MatterStartUpOnOff-6-16387', 'unit_of_measurement': None, }) # --- @@ -3470,7 +3470,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'startup_on_off', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterStartUpOnOff-6-16387', + 'unique_id': '00000000000004D2-000000000000001B-MatterNodeDevice-1-MatterStartUpOnOff-6-16387', 'unit_of_measurement': None, }) # --- @@ -3532,7 +3532,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'startup_on_off', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterStartUpOnOff-6-16387', + 'unique_id': '00000000000004D2-000000000000001C-MatterNodeDevice-1-MatterStartUpOnOff-6-16387', 'unit_of_measurement': None, }) # --- @@ -3599,7 +3599,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'mode', - 'unique_id': '00000000000004D2-0000000000000002-MatterNodeDevice-2-MatterOvenMode-73-1', + 'unique_id': '00000000000004D2-0000000000000029-MatterNodeDevice-2-MatterOvenMode-73-1', 'unit_of_measurement': None, }) # --- @@ -3665,7 +3665,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'temperature_level', - 'unique_id': '00000000000004D2-0000000000000002-MatterNodeDevice-4-TemperatureControlSelectedTemperatureLevel-86-4', + 'unique_id': '00000000000004D2-0000000000000029-MatterNodeDevice-4-TemperatureControlSelectedTemperatureLevel-86-4', 'unit_of_measurement': None, }) # --- @@ -3726,7 +3726,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'pump_operation_mode', - 'unique_id': '00000000000004D2-0000000000000003-MatterNodeDevice-1-PumpConfigurationAndControlOperationMode-512-32', + 'unique_id': '00000000000004D2-000000000000002C-MatterNodeDevice-1-PumpConfigurationAndControlOperationMode-512-32', 'unit_of_measurement': None, }) # --- @@ -3788,7 +3788,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'startup_on_off', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterStartUpOnOff-6-16387', + 'unique_id': '00000000000004D2-0000000000000023-MatterNodeDevice-1-MatterStartUpOnOff-6-16387', 'unit_of_measurement': None, }) # --- @@ -3972,7 +3972,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'startup_on_off', - 'unique_id': '00000000000004D2-0000000000000008-MatterNodeDevice-1-MatterStartUpOnOff-6-16387', + 'unique_id': '00000000000004D2-0000000000000030-MatterNodeDevice-1-MatterStartUpOnOff-6-16387', 'unit_of_measurement': None, }) # --- @@ -4033,7 +4033,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'door_lock_operating_mode', - 'unique_id': '00000000000004D2-0000000000000002-MatterNodeDevice-1-DoorLockOperatingMode-257-37', + 'unique_id': '00000000000004D2-000000000000002A-MatterNodeDevice-1-DoorLockOperatingMode-257-37', 'unit_of_measurement': None, }) # --- @@ -4218,7 +4218,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'laundry_washer_number_of_rinses', - 'unique_id': '00000000000004D2-000000000000001D-MatterNodeDevice-1-MatterLaundryWasherNumberOfRinses-83-2', + 'unique_id': '00000000000004D2-0000000000000038-MatterNodeDevice-1-MatterLaundryWasherNumberOfRinses-83-2', 'unit_of_measurement': None, }) # --- @@ -4278,7 +4278,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'laundry_washer_spin_speed', - 'unique_id': '00000000000004D2-000000000000001D-MatterNodeDevice-1-LaundryWasherControlsSpinSpeed-83-1', + 'unique_id': '00000000000004D2-0000000000000038-MatterNodeDevice-1-LaundryWasherControlsSpinSpeed-83-1', 'unit_of_measurement': None, }) # --- @@ -4339,7 +4339,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'temperature_level', - 'unique_id': '00000000000004D2-000000000000001D-MatterNodeDevice-1-TemperatureControlSelectedTemperatureLevel-86-4', + 'unique_id': '00000000000004D2-0000000000000038-MatterNodeDevice-1-TemperatureControlSelectedTemperatureLevel-86-4', 'unit_of_measurement': None, }) # --- @@ -4461,7 +4461,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'device_energy_management_mode', - 'unique_id': '00000000000004D2-0000000000000019-MatterNodeDevice-2-MatterDeviceEnergyManagementMode-159-1', + 'unique_id': '00000000000004D2-0000000000000039-MatterNodeDevice-2-MatterDeviceEnergyManagementMode-159-1', 'unit_of_measurement': None, }) # --- @@ -4588,7 +4588,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'startup_on_off', - 'unique_id': '00000000000004D2-0000000000000004-MatterNodeDevice-1-MatterStartUpOnOff-6-16387', + 'unique_id': '00000000000004D2-000000000000002E-MatterNodeDevice-1-MatterStartUpOnOff-6-16387', 'unit_of_measurement': None, }) # --- diff --git a/tests/components/matter/snapshots/test_sensor.ambr b/tests/components/matter/snapshots/test_sensor.ambr index c1a47bf30a1..33a6ae39b66 100644 --- a/tests/components/matter/snapshots/test_sensor.ambr +++ b/tests/components/matter/snapshots/test_sensor.ambr @@ -1956,7 +1956,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'pi_heating_demand', - 'unique_id': '00000000000004D2-0000000000000014-MatterNodeDevice-1-ThermostatPIHeatingDemand-513-8', + 'unique_id': '00000000000004D2-0000000000000007-MatterNodeDevice-1-ThermostatPIHeatingDemand-513-8', 'unit_of_measurement': '%', }) # --- @@ -2011,7 +2011,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000014-MatterNodeDevice-1-ThermostatLocalTemperature-513-0', + 'unique_id': '00000000000004D2-0000000000000007-MatterNodeDevice-1-ThermostatLocalTemperature-513-0', 'unit_of_measurement': , }) # --- @@ -2794,7 +2794,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-PowerSource-47-12', + 'unique_id': '00000000000004D2-0000000000000009-MatterNodeDevice-1-PowerSource-47-12', 'unit_of_measurement': '%', }) # --- @@ -2854,7 +2854,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'battery_voltage', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-PowerSourceBatVoltage-47-11', + 'unique_id': '00000000000004D2-0000000000000009-MatterNodeDevice-1-PowerSourceBatVoltage-47-11', 'unit_of_measurement': , }) # --- @@ -3139,7 +3139,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000053-MatterNodeDevice-1-EveEnergySensorWattCurrent-319486977-319422473', + 'unique_id': '00000000000004D2-000000000000003D-MatterNodeDevice-1-EveEnergySensorWattCurrent-319486977-319422473', 'unit_of_measurement': , }) # --- @@ -3196,7 +3196,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000053-MatterNodeDevice-1-EveEnergySensorWattAccumulated-319486977-319422475', + 'unique_id': '00000000000004D2-000000000000003D-MatterNodeDevice-1-EveEnergySensorWattAccumulated-319486977-319422475', 'unit_of_measurement': , }) # --- @@ -3253,7 +3253,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000053-MatterNodeDevice-1-EveEnergySensorWatt-319486977-319422474', + 'unique_id': '00000000000004D2-000000000000003D-MatterNodeDevice-1-EveEnergySensorWatt-319486977-319422474', 'unit_of_measurement': , }) # --- @@ -3310,7 +3310,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000053-MatterNodeDevice-1-EveEnergySensorVoltage-319486977-319422472', + 'unique_id': '00000000000004D2-000000000000003D-MatterNodeDevice-1-EveEnergySensorVoltage-319486977-319422472', 'unit_of_measurement': , }) # --- @@ -5361,7 +5361,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-PowerSource-47-12', + 'unique_id': '00000000000004D2-000000000000000B-MatterNodeDevice-1-PowerSource-47-12', 'unit_of_measurement': '%', }) # --- @@ -5413,7 +5413,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'battery_replacement_description', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-PowerSourceBatReplacementDescription-47-19', + 'unique_id': '00000000000004D2-000000000000000B-MatterNodeDevice-1-PowerSourceBatReplacementDescription-47-19', 'unit_of_measurement': None, }) # --- @@ -5470,7 +5470,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'battery_voltage', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-PowerSourceBatVoltage-47-11', + 'unique_id': '00000000000004D2-000000000000000B-MatterNodeDevice-1-PowerSourceBatVoltage-47-11', 'unit_of_measurement': , }) # --- @@ -8599,7 +8599,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000003-MatterNodeDevice-2-TemperatureSensor-1026-0', + 'unique_id': '00000000000004D2-000000000000002B-MatterNodeDevice-2-TemperatureSensor-1026-0', 'unit_of_measurement': , }) # --- @@ -8759,7 +8759,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'flow', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-FlowSensor-1028-0', + 'unique_id': '00000000000004D2-0000000000000011-MatterNodeDevice-1-FlowSensor-1028-0', 'unit_of_measurement': , }) # --- @@ -8812,7 +8812,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'switch_current_position', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-SwitchCurrentPosition-59-1', + 'unique_id': '00000000000004D2-0000000000000013-MatterNodeDevice-1-SwitchCurrentPosition-59-1', 'unit_of_measurement': None, }) # --- @@ -8864,7 +8864,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'switch_current_position', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-SwitchCurrentPosition-59-1', + 'unique_id': '00000000000004D2-0000000000000012-MatterNodeDevice-1-SwitchCurrentPosition-59-1', 'unit_of_measurement': None, }) # --- @@ -8916,7 +8916,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'switch_current_position', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-2-SwitchCurrentPosition-59-1', + 'unique_id': '00000000000004D2-0000000000000012-MatterNodeDevice-2-SwitchCurrentPosition-59-1', 'unit_of_measurement': None, }) # --- @@ -8968,7 +8968,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-HumiditySensor-1029-0', + 'unique_id': '00000000000004D2-0000000000000015-MatterNodeDevice-1-HumiditySensor-1029-0', 'unit_of_measurement': '%', }) # --- @@ -9209,7 +9209,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-LightSensor-1024-0', + 'unique_id': '00000000000004D2-0000000000000016-MatterNodeDevice-1-LightSensor-1024-0', 'unit_of_measurement': 'lx', }) # --- @@ -9547,7 +9547,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'current_phase', - 'unique_id': '00000000000004D2-0000000000000002-MatterNodeDevice-2-OvenCavityOperationalStateCurrentPhase-72-1', + 'unique_id': '00000000000004D2-0000000000000029-MatterNodeDevice-2-OvenCavityOperationalStateCurrentPhase-72-1', 'unit_of_measurement': None, }) # --- @@ -9608,7 +9608,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'operational_state', - 'unique_id': '00000000000004D2-0000000000000002-MatterNodeDevice-2-OvenCavityOperationalState-72-4', + 'unique_id': '00000000000004D2-0000000000000029-MatterNodeDevice-2-OvenCavityOperationalState-72-4', 'unit_of_measurement': None, }) # --- @@ -9668,7 +9668,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000002-MatterNodeDevice-2-TemperatureSensor-1026-0', + 'unique_id': '00000000000004D2-0000000000000029-MatterNodeDevice-2-TemperatureSensor-1026-0', 'unit_of_measurement': , }) # --- @@ -9725,7 +9725,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000002-MatterNodeDevice-4-TemperatureSensor-1026-0', + 'unique_id': '00000000000004D2-0000000000000029-MatterNodeDevice-4-TemperatureSensor-1026-0', 'unit_of_measurement': , }) # --- @@ -9782,7 +9782,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-PressureSensor-1027-0', + 'unique_id': '00000000000004D2-000000000000001F-MatterNodeDevice-1-PressureSensor-1027-0', 'unit_of_measurement': , }) # --- @@ -9843,7 +9843,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'pump_control_mode', - 'unique_id': '00000000000004D2-0000000000000003-MatterNodeDevice-1-PumpControlMode-512-33', + 'unique_id': '00000000000004D2-000000000000002C-MatterNodeDevice-1-PumpControlMode-512-33', 'unit_of_measurement': None, }) # --- @@ -9903,7 +9903,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'flow', - 'unique_id': '00000000000004D2-0000000000000003-MatterNodeDevice-1-FlowSensor-1028-0', + 'unique_id': '00000000000004D2-000000000000002C-MatterNodeDevice-1-FlowSensor-1028-0', 'unit_of_measurement': , }) # --- @@ -9959,7 +9959,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000003-MatterNodeDevice-1-PressureSensor-1027-0', + 'unique_id': '00000000000004D2-000000000000002C-MatterNodeDevice-1-PressureSensor-1027-0', 'unit_of_measurement': , }) # --- @@ -10013,7 +10013,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'pump_speed', - 'unique_id': '00000000000004D2-0000000000000003-MatterNodeDevice-1-PumpSpeed-512-20', + 'unique_id': '00000000000004D2-000000000000002C-MatterNodeDevice-1-PumpSpeed-512-20', 'unit_of_measurement': 'rpm', }) # --- @@ -10069,7 +10069,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000003-MatterNodeDevice-1-TemperatureSensor-1026-0', + 'unique_id': '00000000000004D2-000000000000002C-MatterNodeDevice-1-TemperatureSensor-1026-0', 'unit_of_measurement': , }) # --- @@ -10126,7 +10126,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000024-MatterNodeDevice-2-TemperatureSensor-1026-0', + 'unique_id': '00000000000004D2-000000000000003B-MatterNodeDevice-2-TemperatureSensor-1026-0', 'unit_of_measurement': , }) # --- @@ -10186,7 +10186,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'active_current', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-ElectricalPowerMeasurementActiveCurrent-144-5', + 'unique_id': '00000000000004D2-0000000000000022-MatterNodeDevice-1-ElectricalPowerMeasurementActiveCurrent-144-5', 'unit_of_measurement': , }) # --- @@ -10246,7 +10246,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'energy_exported', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-ElectricalEnergyMeasurementCumulativeEnergyExported-145-2', + 'unique_id': '00000000000004D2-0000000000000022-MatterNodeDevice-1-ElectricalEnergyMeasurementCumulativeEnergyExported-145-2', 'unit_of_measurement': , }) # --- @@ -10306,7 +10306,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-ElectricalPowerMeasurementWatt-144-8', + 'unique_id': '00000000000004D2-0000000000000022-MatterNodeDevice-1-ElectricalPowerMeasurementWatt-144-8', 'unit_of_measurement': , }) # --- @@ -10366,7 +10366,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'voltage', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-ElectricalPowerMeasurementVoltage-144-4', + 'unique_id': '00000000000004D2-0000000000000022-MatterNodeDevice-1-ElectricalPowerMeasurementVoltage-144-4', 'unit_of_measurement': , }) # --- @@ -10423,7 +10423,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-TemperatureSensor-1026-0', + 'unique_id': '00000000000004D2-0000000000000026-MatterNodeDevice-1-TemperatureSensor-1026-0', 'unit_of_measurement': , }) # --- @@ -10851,7 +10851,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'auto_close_time', - 'unique_id': '00000000000004D2-000000000000004B-MatterNodeDevice-1-ValveConfigurationAndControlAutoCloseTime-129-2', + 'unique_id': '00000000000004D2-000000000000003C-MatterNodeDevice-1-ValveConfigurationAndControlAutoCloseTime-129-2', 'unit_of_measurement': None, }) # --- @@ -10951,7 +10951,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'window_covering_target_position', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-TargetPositionLiftPercent100ths-258-11', + 'unique_id': '00000000000004D2-0000000000000027-MatterNodeDevice-1-TargetPositionLiftPercent100ths-258-11', 'unit_of_measurement': '%', }) # --- @@ -11006,7 +11006,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000004-MatterNodeDevice-1-ThermostatLocalTemperature-513-0', + 'unique_id': '00000000000004D2-000000000000002D-MatterNodeDevice-1-ThermostatLocalTemperature-513-0', 'unit_of_measurement': , }) # --- @@ -11941,7 +11941,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'current_phase', - 'unique_id': '00000000000004D2-000000000000001D-MatterNodeDevice-1-OperationalStateCurrentPhase-96-1', + 'unique_id': '00000000000004D2-0000000000000038-MatterNodeDevice-1-OperationalStateCurrentPhase-96-1', 'unit_of_measurement': None, }) # --- @@ -12004,7 +12004,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'rms_current', - 'unique_id': '00000000000004D2-000000000000001D-MatterNodeDevice-2-ElectricalPowerMeasurementRMSCurrent-144-12', + 'unique_id': '00000000000004D2-0000000000000038-MatterNodeDevice-2-ElectricalPowerMeasurementRMSCurrent-144-12', 'unit_of_measurement': , }) # --- @@ -12064,7 +12064,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'rms_voltage', - 'unique_id': '00000000000004D2-000000000000001D-MatterNodeDevice-2-ElectricalPowerMeasurementRMSVoltage-144-11', + 'unique_id': '00000000000004D2-0000000000000038-MatterNodeDevice-2-ElectricalPowerMeasurementRMSVoltage-144-11', 'unit_of_measurement': , }) # --- @@ -12124,7 +12124,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-000000000000001D-MatterNodeDevice-2-ElectricalEnergyMeasurementCumulativeEnergyImported-145-1', + 'unique_id': '00000000000004D2-0000000000000038-MatterNodeDevice-2-ElectricalEnergyMeasurementCumulativeEnergyImported-145-1', 'unit_of_measurement': , }) # --- @@ -12183,7 +12183,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'operational_error', - 'unique_id': '00000000000004D2-000000000000001D-MatterNodeDevice-1-OperationalStateOperationalError-96-5', + 'unique_id': '00000000000004D2-0000000000000038-MatterNodeDevice-1-OperationalStateOperationalError-96-5', 'unit_of_measurement': None, }) # --- @@ -12246,7 +12246,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'operational_state', - 'unique_id': '00000000000004D2-000000000000001D-MatterNodeDevice-1-OperationalState-96-4', + 'unique_id': '00000000000004D2-0000000000000038-MatterNodeDevice-1-OperationalState-96-4', 'unit_of_measurement': None, }) # --- @@ -12310,7 +12310,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-000000000000001D-MatterNodeDevice-2-ElectricalPowerMeasurementWatt-144-8', + 'unique_id': '00000000000004D2-0000000000000038-MatterNodeDevice-2-ElectricalPowerMeasurementWatt-144-8', 'unit_of_measurement': , }) # --- @@ -12422,7 +12422,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'active_current', - 'unique_id': '00000000000004D2-0000000000000019-MatterNodeDevice-2-ElectricalPowerMeasurementActiveCurrent-144-5', + 'unique_id': '00000000000004D2-0000000000000039-MatterNodeDevice-2-ElectricalPowerMeasurementActiveCurrent-144-5', 'unit_of_measurement': , }) # --- @@ -12482,7 +12482,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'esa_state', - 'unique_id': '00000000000004D2-0000000000000019-MatterNodeDevice-2-ESAState-152-2', + 'unique_id': '00000000000004D2-0000000000000039-MatterNodeDevice-2-ESAState-152-2', 'unit_of_measurement': None, }) # --- @@ -12546,7 +12546,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'esa_opt_out_state', - 'unique_id': '00000000000004D2-0000000000000019-MatterNodeDevice-2-ESAOptOutState-152-7', + 'unique_id': '00000000000004D2-0000000000000039-MatterNodeDevice-2-ESAOptOutState-152-7', 'unit_of_measurement': None, }) # --- @@ -12604,7 +12604,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'tank_percentage', - 'unique_id': '00000000000004D2-0000000000000019-MatterNodeDevice-2-WaterHeaterManagementTankPercentage-148-4', + 'unique_id': '00000000000004D2-0000000000000039-MatterNodeDevice-2-WaterHeaterManagementTankPercentage-148-4', 'unit_of_measurement': '%', }) # --- @@ -12663,7 +12663,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000019-MatterNodeDevice-2-ElectricalPowerMeasurementWatt-144-8', + 'unique_id': '00000000000004D2-0000000000000039-MatterNodeDevice-2-ElectricalPowerMeasurementWatt-144-8', 'unit_of_measurement': , }) # --- @@ -12723,7 +12723,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'estimated_heat_required', - 'unique_id': '00000000000004D2-0000000000000019-MatterNodeDevice-2-WaterHeaterManagementEstimatedHeatRequired-148-3', + 'unique_id': '00000000000004D2-0000000000000039-MatterNodeDevice-2-WaterHeaterManagementEstimatedHeatRequired-148-3', 'unit_of_measurement': , }) # --- @@ -12780,7 +12780,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'tank_volume', - 'unique_id': '00000000000004D2-0000000000000019-MatterNodeDevice-2-WaterHeaterManagementTankVolume-148-2', + 'unique_id': '00000000000004D2-0000000000000039-MatterNodeDevice-2-WaterHeaterManagementTankVolume-148-2', 'unit_of_measurement': , }) # --- @@ -12840,7 +12840,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'voltage', - 'unique_id': '00000000000004D2-0000000000000019-MatterNodeDevice-2-ElectricalPowerMeasurementVoltage-144-4', + 'unique_id': '00000000000004D2-0000000000000039-MatterNodeDevice-2-ElectricalPowerMeasurementVoltage-144-4', 'unit_of_measurement': , }) # --- @@ -13056,7 +13056,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-000000000000000C-MatterNodeDevice-1-HumiditySensor-1029-0', + 'unique_id': '00000000000004D2-0000000000000031-MatterNodeDevice-1-HumiditySensor-1029-0', 'unit_of_measurement': '%', }) # --- @@ -13113,7 +13113,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-000000000000000C-MatterNodeDevice-1-ThermostatLocalTemperature-513-0', + 'unique_id': '00000000000004D2-0000000000000031-MatterNodeDevice-1-ThermostatLocalTemperature-513-0', 'unit_of_measurement': , }) # --- @@ -13170,7 +13170,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000004-MatterNodeDevice-1-ElectricalMeasurementRmsCurrent-2820-1288', + 'unique_id': '00000000000004D2-000000000000002E-MatterNodeDevice-1-ElectricalMeasurementRmsCurrent-2820-1288', 'unit_of_measurement': , }) # --- @@ -13227,7 +13227,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000004-MatterNodeDevice-1-ElectricalMeasurementActivePower-2820-1291', + 'unique_id': '00000000000004D2-000000000000002E-MatterNodeDevice-1-ElectricalMeasurementActivePower-2820-1291', 'unit_of_measurement': , }) # --- @@ -13284,7 +13284,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': None, - 'unique_id': '00000000000004D2-0000000000000004-MatterNodeDevice-1-ElectricalMeasurementRmsVoltage-2820-1285', + 'unique_id': '00000000000004D2-000000000000002E-MatterNodeDevice-1-ElectricalMeasurementRmsVoltage-2820-1285', 'unit_of_measurement': , }) # --- diff --git a/tests/components/matter/snapshots/test_switch.ambr b/tests/components/matter/snapshots/test_switch.ambr index 25e04f62cb1..7175296a9c0 100644 --- a/tests/components/matter/snapshots/test_switch.ambr +++ b/tests/components/matter/snapshots/test_switch.ambr @@ -131,7 +131,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'switch', - 'unique_id': '00000000000004D2-0000000000000053-MatterNodeDevice-1-MatterPlug-6-0', + 'unique_id': '00000000000004D2-000000000000003D-MatterNodeDevice-1-MatterPlug-6-0', 'unit_of_measurement': None, }) # --- @@ -479,7 +479,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'power', - 'unique_id': '00000000000004D2-0000000000000003-MatterNodeDevice-1-MatterPowerToggle-6-0', + 'unique_id': '00000000000004D2-000000000000002B-MatterNodeDevice-1-MatterPowerToggle-6-0', 'unit_of_measurement': None, }) # --- @@ -529,7 +529,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'power', - 'unique_id': '00000000000004D2-0000000000000003-MatterNodeDevice-2-MatterPowerToggle-6-0', + 'unique_id': '00000000000004D2-000000000000002B-MatterNodeDevice-2-MatterPowerToggle-6-0', 'unit_of_measurement': None, }) # --- @@ -579,7 +579,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'switch', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterSwitch-6-0', + 'unique_id': '00000000000004D2-0000000000000010-MatterNodeDevice-1-MatterSwitch-6-0', 'unit_of_measurement': None, }) # --- @@ -629,7 +629,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'privacy_mode_button', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-DoorLockEnablePrivacyModeButton-257-43', + 'unique_id': '00000000000004D2-0000000000000010-MatterNodeDevice-1-DoorLockEnablePrivacyModeButton-257-43', 'unit_of_measurement': None, }) # --- @@ -678,7 +678,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'switch', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterSwitch-6-0', + 'unique_id': '00000000000004D2-000000000000000F-MatterNodeDevice-1-MatterSwitch-6-0', 'unit_of_measurement': None, }) # --- @@ -728,7 +728,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'privacy_mode_button', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-DoorLockEnablePrivacyModeButton-257-43', + 'unique_id': '00000000000004D2-000000000000000F-MatterNodeDevice-1-DoorLockEnablePrivacyModeButton-257-43', 'unit_of_measurement': None, }) # --- @@ -876,7 +876,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'switch', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterPlug-6-0', + 'unique_id': '00000000000004D2-000000000000001A-MatterNodeDevice-1-MatterPlug-6-0', 'unit_of_measurement': None, }) # --- @@ -926,7 +926,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'power', - 'unique_id': '00000000000004D2-0000000000000002-MatterNodeDevice-3-MatterPowerToggle-6-0', + 'unique_id': '00000000000004D2-0000000000000029-MatterNodeDevice-3-MatterPowerToggle-6-0', 'unit_of_measurement': None, }) # --- @@ -976,7 +976,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'power', - 'unique_id': '00000000000004D2-0000000000000002-MatterNodeDevice-4-MatterPowerToggle-6-0', + 'unique_id': '00000000000004D2-0000000000000029-MatterNodeDevice-4-MatterPowerToggle-6-0', 'unit_of_measurement': None, }) # --- @@ -1026,7 +1026,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'power', - 'unique_id': '00000000000004D2-0000000000000003-MatterNodeDevice-1-MatterPowerToggle-6-0', + 'unique_id': '00000000000004D2-000000000000002C-MatterNodeDevice-1-MatterPowerToggle-6-0', 'unit_of_measurement': None, }) # --- @@ -1076,7 +1076,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'power', - 'unique_id': '00000000000004D2-0000000000000024-MatterNodeDevice-1-MatterPowerToggle-6-0', + 'unique_id': '00000000000004D2-000000000000003B-MatterNodeDevice-1-MatterPowerToggle-6-0', 'unit_of_measurement': None, }) # --- @@ -1175,7 +1175,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'switch', - 'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-MatterSwitch-6-0', + 'unique_id': '00000000000004D2-0000000000000023-MatterNodeDevice-1-MatterSwitch-6-0', 'unit_of_measurement': None, }) # --- @@ -1324,7 +1324,7 @@ 'suggested_object_id': None, 'supported_features': 0, 'translation_key': 'switch', - 'unique_id': '00000000000004D2-0000000000000004-MatterNodeDevice-1-MatterPlug-6-0', + 'unique_id': '00000000000004D2-000000000000002E-MatterNodeDevice-1-MatterPlug-6-0', 'unit_of_measurement': None, }) # --- diff --git a/tests/components/matter/snapshots/test_valve.ambr b/tests/components/matter/snapshots/test_valve.ambr index edb5fe95d96..c0a6b8e6e5c 100644 --- a/tests/components/matter/snapshots/test_valve.ambr +++ b/tests/components/matter/snapshots/test_valve.ambr @@ -31,7 +31,7 @@ 'suggested_object_id': None, 'supported_features': , 'translation_key': 'valve', - 'unique_id': '00000000000004D2-000000000000004B-MatterNodeDevice-1-MatterValve-129-4', + 'unique_id': '00000000000004D2-000000000000003C-MatterNodeDevice-1-MatterValve-129-4', 'unit_of_measurement': None, }) # --- diff --git a/tests/components/matter/snapshots/test_water_heater.ambr b/tests/components/matter/snapshots/test_water_heater.ambr index b6887097149..be80bb1c509 100644 --- a/tests/components/matter/snapshots/test_water_heater.ambr +++ b/tests/components/matter/snapshots/test_water_heater.ambr @@ -39,7 +39,7 @@ 'suggested_object_id': None, 'supported_features': , 'translation_key': 'water_heater', - 'unique_id': '00000000000004D2-0000000000000019-MatterNodeDevice-2-MatterWaterHeater-513-18', + 'unique_id': '00000000000004D2-0000000000000039-MatterNodeDevice-2-MatterWaterHeater-513-18', 'unit_of_measurement': None, }) # --- diff --git a/tests/components/matter/test_adapter.py b/tests/components/matter/test_adapter.py index 6cc967b0566..65cf28d6231 100644 --- a/tests/components/matter/test_adapter.py +++ b/tests/components/matter/test_adapter.py @@ -19,22 +19,23 @@ from tests.common import MockConfigEntry @pytest.mark.usefixtures("matter_node") @pytest.mark.parametrize( - ("node_fixture", "name"), + ("node_fixture", "unique_id", "name"), [ - ("mock_onoff_light", "Mock OnOff Light"), - ("mock_onoff_light_alt_name", "Mock OnOff Light"), - ("mock_onoff_light_no_name", "Mock Light"), + ("mock_onoff_light", "000000000000001E", "Mock OnOff Light"), + ("mock_onoff_light_alt_name", "000000000000001B", "Mock OnOff Light"), + ("mock_onoff_light_no_name", "000000000000001C", "Mock Light"), ], ) async def test_device_registry_single_node_device( hass: HomeAssistant, device_registry: dr.DeviceRegistry, + unique_id: str, name: str, ) -> None: """Test bridge devices are set up correctly with via_device.""" entry = device_registry.async_get_device( identifiers={ - (DOMAIN, "deviceid_00000000000004D2-0000000000000001-MatterNodeDevice") + (DOMAIN, f"deviceid_00000000000004D2-{unique_id}-MatterNodeDevice") } ) assert entry is not None @@ -60,7 +61,7 @@ async def test_device_registry_single_node_device_alt( """Test additional device with different attribute values.""" entry = device_registry.async_get_device( identifiers={ - (DOMAIN, "deviceid_00000000000004D2-0000000000000001-MatterNodeDevice") + (DOMAIN, "deviceid_00000000000004D2-000000000000001A-MatterNodeDevice") } ) assert entry is not None diff --git a/tests/components/matter/test_api.py b/tests/components/matter/test_api.py index b68ead9eab3..df1450ecd1f 100644 --- a/tests/components/matter/test_api.py +++ b/tests/components/matter/test_api.py @@ -200,7 +200,7 @@ async def test_node_diagnostics( # get the device registry entry for the mocked node entry = device_registry.async_get_device( identifiers={ - (DOMAIN, "deviceid_00000000000004D2-0000000000000001-MatterNodeDevice") + (DOMAIN, "deviceid_00000000000004D2-000000000000001E-MatterNodeDevice") } ) assert entry is not None @@ -269,7 +269,7 @@ async def test_ping_node( # get the device registry entry for the mocked node entry = device_registry.async_get_device( identifiers={ - (DOMAIN, "deviceid_00000000000004D2-0000000000000001-MatterNodeDevice") + (DOMAIN, "deviceid_00000000000004D2-000000000000001E-MatterNodeDevice") } ) assert entry is not None @@ -324,7 +324,7 @@ async def test_open_commissioning_window( # get the device registry entry for the mocked node entry = device_registry.async_get_device( identifiers={ - (DOMAIN, "deviceid_00000000000004D2-0000000000000001-MatterNodeDevice") + (DOMAIN, "deviceid_00000000000004D2-000000000000001E-MatterNodeDevice") } ) assert entry is not None @@ -385,7 +385,7 @@ async def test_remove_matter_fabric( # get the device registry entry for the mocked node entry = device_registry.async_get_device( identifiers={ - (DOMAIN, "deviceid_00000000000004D2-0000000000000001-MatterNodeDevice") + (DOMAIN, "deviceid_00000000000004D2-000000000000001E-MatterNodeDevice") } ) assert entry is not None @@ -402,7 +402,7 @@ async def test_remove_matter_fabric( ) msg = await ws_client.receive_json() assert msg["success"] - matter_client.remove_matter_fabric.assert_called_once_with(1, 3) + matter_client.remove_matter_fabric.assert_called_once_with(30, 3) # repeat test with a device id that does not have a node attached new_entry = device_registry.async_get_or_create( @@ -436,7 +436,7 @@ async def test_interview_node( # get the device registry entry for the mocked node entry = device_registry.async_get_device( identifiers={ - (DOMAIN, "deviceid_00000000000004D2-0000000000000001-MatterNodeDevice") + (DOMAIN, "deviceid_00000000000004D2-000000000000001E-MatterNodeDevice") } ) assert entry is not None @@ -447,7 +447,7 @@ async def test_interview_node( ) msg = await ws_client.receive_json() assert msg["success"] - matter_client.interview_node.assert_called_once_with(1) + matter_client.interview_node.assert_called_once_with(30) # repeat test with a device id that does not have a node attached new_entry = device_registry.async_get_or_create( diff --git a/tests/components/matter/test_init.py b/tests/components/matter/test_init.py index 48704337330..35908dfee3f 100644 --- a/tests/components/matter/test_init.py +++ b/tests/components/matter/test_init.py @@ -31,6 +31,7 @@ from homeassistant.setup import async_setup_component from .common import ( FIXTURES, create_node_from_fixture, + load_and_parse_node_fixture, setup_integration_with_node_fixture, ) @@ -59,6 +60,16 @@ def test_fixture_list() -> None: # Ensure it is sorted - makes it easier to identify duplicate entries or # locate specific fixtures assert sorted(FIXTURES) == FIXTURES, "Fixture list is not sorted" + # Ensure all fixtures have a unique node id + node_ids = set() + for fixture in FIXTURES: + node_data = load_and_parse_node_fixture(fixture) + if (node_id := node_data["node_id"]) in node_ids: + pytest.fail( + f"Duplicate node ID {node_id} found in fixture {fixture}, " + f"please use: {next(i for i in range(1, 1000) if i not in node_ids)}" + ) + node_ids.add(node_id) async def test_entry_setup_unload( diff --git a/tests/components/matter/test_light.py b/tests/components/matter/test_light.py index b87c0fbc81d..f547fe4d494 100644 --- a/tests/components/matter/test_light.py +++ b/tests/components/matter/test_light.py @@ -398,7 +398,7 @@ async def test_extended_color_light( matter_client.send_device_command.assert_has_calls( [ call( - node_id=1, + node_id=matter_node.node_id, endpoint_id=1, command=clusters.ColorControl.Commands.MoveToHueAndSaturation( hue=167, @@ -433,7 +433,7 @@ async def test_extended_color_light( matter_client.send_device_command.assert_has_calls( [ call( - node_id=1, + node_id=matter_node.node_id, endpoint_id=1, command=clusters.ColorControl.Commands.MoveToHueAndSaturation( hue=167,