From e743f5a9f1d9ea2f3071f6d057c3ca2b1af60932 Mon Sep 17 00:00:00 2001 From: Bouwe Westerdijk Date: Tue, 31 Dec 2024 12:22:46 +0100 Subject: [PATCH] Line up json-headers --- tests/data/adam/adam_jip.json | 2 +- .../adam_onoff_cooling_fake_firmware.json | 2 +- tests/data/adam/adam_plus_anna_new.json | 2 +- .../adam/adam_plus_anna_new_UPDATED_DATA.json | 2 +- .../adam_plus_anna_new_regulation_off.json | 2 +- tests/data/anna/anna_elga_2_cooling.json | 2 +- .../anna_elga_2_cooling_UPDATED_DATA.json | 2 +- tests/data/anna/anna_elga_2_schedule_off.json | 2 +- tests/data/anna/anna_elga_no_cooling.json | 2 +- tests/data/anna/anna_heatpump_cooling.json | 2 +- .../anna_heatpump_cooling_fake_firmware.json | 2 +- tests/data/anna/anna_heatpump_heating.json | 2 +- .../anna_heatpump_heating_UPDATED_DATA.json | 2 +- .../data/anna/anna_loria_cooling_active.json | 2 +- tests/data/anna/anna_loria_driessens.json | 2 +- tests/data/anna/anna_loria_heating_idle.json | 2 +- tests/data/anna/anna_v4.json | 2 +- tests/data/anna/anna_v4_UPDATED_DATA.json | 2 +- tests/data/anna/anna_v4_dhw.json | 2 +- tests/data/anna/anna_v4_no_tag.json | 2 +- .../data/anna/anna_without_boiler_fw441.json | 2 +- tests/data/anna/legacy_anna.json | 2 +- tests/data/anna/legacy_anna_2.json | 2 +- tests/data/p1/p1v4.json | 74 ++++++++++--------- tests/data/p1/p1v4_442_single.json | 2 +- .../data/p1/p1v4_442_single_UPDATED_DATA.json | 2 +- tests/data/p1/p1v4_442_triple.json | 2 +- tests/data/p1/smile_p1_v2.json | 2 +- tests/data/p1/smile_p1_v2_2.json | 2 +- tests/data/p1/smile_p1_v2_2_UPDATED_DATA.json | 2 +- tests/data/stretch/stretch_v23.json | 2 +- tests/data/stretch/stretch_v27_no_domain.json | 2 +- tests/data/stretch/stretch_v31.json | 2 +- .../stretch/stretch_v31_UPDATED_DATA.json | 2 +- 34 files changed, 71 insertions(+), 69 deletions(-) diff --git a/tests/data/adam/adam_jip.json b/tests/data/adam/adam_jip.json index 6d021a276..a0fd4ebc2 100644 --- a/tests/data/adam/adam_jip.json +++ b/tests/data/adam/adam_jip.json @@ -1,5 +1,5 @@ { - "entities": { + "devices": { "06aecb3d00354375924f50c47af36bd2": { "active_preset": "no_frost", "climate_mode": "heat", diff --git a/tests/data/adam/adam_onoff_cooling_fake_firmware.json b/tests/data/adam/adam_onoff_cooling_fake_firmware.json index 612e5caa5..6b0a11666 100644 --- a/tests/data/adam/adam_onoff_cooling_fake_firmware.json +++ b/tests/data/adam/adam_onoff_cooling_fake_firmware.json @@ -1,5 +1,5 @@ { - "entities": { + "devices": { "0ca13e8176204ca7bf6f09de59f81c83": { "binary_sensors": { "cooling_enabled": true, diff --git a/tests/data/adam/adam_plus_anna_new.json b/tests/data/adam/adam_plus_anna_new.json index 22146d9f7..4d1bd7dc5 100644 --- a/tests/data/adam/adam_plus_anna_new.json +++ b/tests/data/adam/adam_plus_anna_new.json @@ -1,5 +1,5 @@ { - "device_zones": { + "devices": { "056ee145a816487eaa69243c3280f8bf": { "available": true, "binary_sensors": { diff --git a/tests/data/adam/adam_plus_anna_new_UPDATED_DATA.json b/tests/data/adam/adam_plus_anna_new_UPDATED_DATA.json index 0fe9f13be..beb2b9057 100644 --- a/tests/data/adam/adam_plus_anna_new_UPDATED_DATA.json +++ b/tests/data/adam/adam_plus_anna_new_UPDATED_DATA.json @@ -1,5 +1,5 @@ { - "entities": { + "devices": { "67d73d0bd469422db25a618a5fb8eeb0": { "switches": { "lock": true diff --git a/tests/data/adam/adam_plus_anna_new_regulation_off.json b/tests/data/adam/adam_plus_anna_new_regulation_off.json index c27d1e58d..c4437c190 100644 --- a/tests/data/adam/adam_plus_anna_new_regulation_off.json +++ b/tests/data/adam/adam_plus_anna_new_regulation_off.json @@ -1,5 +1,5 @@ { - "device_zones": { + "devices": { "056ee145a816487eaa69243c3280f8bf": { "available": true, "binary_sensors": { diff --git a/tests/data/anna/anna_elga_2_cooling.json b/tests/data/anna/anna_elga_2_cooling.json index 07ab576ef..064248808 100644 --- a/tests/data/anna/anna_elga_2_cooling.json +++ b/tests/data/anna/anna_elga_2_cooling.json @@ -1,5 +1,5 @@ { - "entities": { + "devices": { "573c152e7d4f4720878222bd75638f5b": { "available": true, "binary_sensors": { diff --git a/tests/data/anna/anna_elga_2_cooling_UPDATED_DATA.json b/tests/data/anna/anna_elga_2_cooling_UPDATED_DATA.json index cddbcd352..a3088586b 100644 --- a/tests/data/anna/anna_elga_2_cooling_UPDATED_DATA.json +++ b/tests/data/anna/anna_elga_2_cooling_UPDATED_DATA.json @@ -1,5 +1,5 @@ { - "entities": { + "devices": { "573c152e7d4f4720878222bd75638f5b": { "available": true, "binary_sensors": { diff --git a/tests/data/anna/anna_elga_2_schedule_off.json b/tests/data/anna/anna_elga_2_schedule_off.json index 94afaa3ff..132c3bcb0 100644 --- a/tests/data/anna/anna_elga_2_schedule_off.json +++ b/tests/data/anna/anna_elga_2_schedule_off.json @@ -1,5 +1,5 @@ { - "entities": { + "devices": { "573c152e7d4f4720878222bd75638f5b": { "available": true, "binary_sensors": { diff --git a/tests/data/anna/anna_elga_no_cooling.json b/tests/data/anna/anna_elga_no_cooling.json index 5653798f3..2abfc6c21 100644 --- a/tests/data/anna/anna_elga_no_cooling.json +++ b/tests/data/anna/anna_elga_no_cooling.json @@ -1,5 +1,5 @@ { - "entities": { + "devices": { "015ae9ea3f964e668e490fa39da3870b": { "binary_sensors": { "plugwise_notification": false diff --git a/tests/data/anna/anna_heatpump_cooling.json b/tests/data/anna/anna_heatpump_cooling.json index fdca784f0..1cb97ff31 100644 --- a/tests/data/anna/anna_heatpump_cooling.json +++ b/tests/data/anna/anna_heatpump_cooling.json @@ -1,5 +1,5 @@ { - "entities": { + "devices": { "015ae9ea3f964e668e490fa39da3870b": { "binary_sensors": { "plugwise_notification": false diff --git a/tests/data/anna/anna_heatpump_cooling_fake_firmware.json b/tests/data/anna/anna_heatpump_cooling_fake_firmware.json index cbc7e0a85..ecbb51ef3 100644 --- a/tests/data/anna/anna_heatpump_cooling_fake_firmware.json +++ b/tests/data/anna/anna_heatpump_cooling_fake_firmware.json @@ -1,5 +1,5 @@ { - "entities": { + "devices": { "015ae9ea3f964e668e490fa39da3870b": { "binary_sensors": { "plugwise_notification": false diff --git a/tests/data/anna/anna_heatpump_heating.json b/tests/data/anna/anna_heatpump_heating.json index c1a6526ce..283ad7c98 100644 --- a/tests/data/anna/anna_heatpump_heating.json +++ b/tests/data/anna/anna_heatpump_heating.json @@ -1,5 +1,5 @@ { - "entities": { + "devices": { "015ae9ea3f964e668e490fa39da3870b": { "binary_sensors": { "plugwise_notification": false diff --git a/tests/data/anna/anna_heatpump_heating_UPDATED_DATA.json b/tests/data/anna/anna_heatpump_heating_UPDATED_DATA.json index aa1e3dc4d..0999059bf 100644 --- a/tests/data/anna/anna_heatpump_heating_UPDATED_DATA.json +++ b/tests/data/anna/anna_heatpump_heating_UPDATED_DATA.json @@ -1,5 +1,5 @@ { - "entities": { + "devices": { "1cbf783bb11e4a7c8a6843dee3a86927": { "dev_class": "heater_central", "location": "a57efe5f145f498c9be62a9b63626fbf", diff --git a/tests/data/anna/anna_loria_cooling_active.json b/tests/data/anna/anna_loria_cooling_active.json index 4c104d005..aabfa8f80 100644 --- a/tests/data/anna/anna_loria_cooling_active.json +++ b/tests/data/anna/anna_loria_cooling_active.json @@ -1,5 +1,5 @@ { - "entities": { + "devices": { "582dfbdace4d4aeb832923ce7d1ddda0": { "active_preset": "home", "available_schedules": ["Winter", "Test ", "off"], diff --git a/tests/data/anna/anna_loria_driessens.json b/tests/data/anna/anna_loria_driessens.json index dd265e086..34cf37733 100644 --- a/tests/data/anna/anna_loria_driessens.json +++ b/tests/data/anna/anna_loria_driessens.json @@ -1,5 +1,5 @@ { - "entities": { + "devices": { "5c118b1842e943c0a5b6ef88a60bb17a": { "binary_sensors": { "plugwise_notification": false diff --git a/tests/data/anna/anna_loria_heating_idle.json b/tests/data/anna/anna_loria_heating_idle.json index 5bd6afbc1..2790624f6 100644 --- a/tests/data/anna/anna_loria_heating_idle.json +++ b/tests/data/anna/anna_loria_heating_idle.json @@ -1,5 +1,5 @@ { - "entities": { + "devices": { "582dfbdace4d4aeb832923ce7d1ddda0": { "active_preset": "home", "available_schedules": ["Winter", "Test ", "off"], diff --git a/tests/data/anna/anna_v4.json b/tests/data/anna/anna_v4.json index 060168bc2..bcda4c000 100644 --- a/tests/data/anna/anna_v4.json +++ b/tests/data/anna/anna_v4.json @@ -1,5 +1,5 @@ { - "device_zones": { + "devices": { "01b85360fdd243d0aaad4d6ac2a5ba7e": { "active_preset": "home", "available_schedules": ["Standaard", "Thuiswerken", "off"], diff --git a/tests/data/anna/anna_v4_UPDATED_DATA.json b/tests/data/anna/anna_v4_UPDATED_DATA.json index e3c4c1382..331a4b623 100644 --- a/tests/data/anna/anna_v4_UPDATED_DATA.json +++ b/tests/data/anna/anna_v4_UPDATED_DATA.json @@ -1,5 +1,5 @@ { - "entities": { + "devices": { "cd0e6156b1f04d5f952349ffbe397481": { "maximum_boiler_temperature": { "setpoint": 69.0, diff --git a/tests/data/anna/anna_v4_dhw.json b/tests/data/anna/anna_v4_dhw.json index 8019a7bf5..783fdf1f8 100644 --- a/tests/data/anna/anna_v4_dhw.json +++ b/tests/data/anna/anna_v4_dhw.json @@ -1,5 +1,5 @@ { - "entities": { + "devices": { "01b85360fdd243d0aaad4d6ac2a5ba7e": { "active_preset": "home", "available_schedules": ["Standaard", "Thuiswerken", "off"], diff --git a/tests/data/anna/anna_v4_no_tag.json b/tests/data/anna/anna_v4_no_tag.json index 914cb889d..37da0174e 100644 --- a/tests/data/anna/anna_v4_no_tag.json +++ b/tests/data/anna/anna_v4_no_tag.json @@ -1,5 +1,5 @@ { - "entities": { + "devices": { "01b85360fdd243d0aaad4d6ac2a5ba7e": { "active_preset": "home", "available_schedules": ["Standaard", "Thuiswerken", "off"], diff --git a/tests/data/anna/anna_without_boiler_fw441.json b/tests/data/anna/anna_without_boiler_fw441.json index d8b883551..ebd3a07ad 100644 --- a/tests/data/anna/anna_without_boiler_fw441.json +++ b/tests/data/anna/anna_without_boiler_fw441.json @@ -1,5 +1,5 @@ { - "entities": { + "devices": { "7ffbb3ab4b6c4ab2915d7510f7bf8fe9": { "active_preset": "home", "available_schedules": ["Test", "Normaal", "off"], diff --git a/tests/data/anna/legacy_anna.json b/tests/data/anna/legacy_anna.json index c024666ef..b8162f896 100644 --- a/tests/data/anna/legacy_anna.json +++ b/tests/data/anna/legacy_anna.json @@ -1,5 +1,5 @@ { - "device_zones": { + "devices": { "0000aaaa0000aaaa0000aaaa0000aa00": { "dev_class": "gateway", "firmware": "1.8.22", diff --git a/tests/data/anna/legacy_anna_2.json b/tests/data/anna/legacy_anna_2.json index 22efa322d..0b60d7b4a 100644 --- a/tests/data/anna/legacy_anna_2.json +++ b/tests/data/anna/legacy_anna_2.json @@ -1,5 +1,5 @@ { - "entities": { + "devices": { "9e7377867dc24e51b8098a5ba02bd89d": { "active_preset": null, "available_schedules": ["Thermostat schedule", "off"], diff --git a/tests/data/p1/p1v4.json b/tests/data/p1/p1v4.json index 79010398d..c2674029d 100644 --- a/tests/data/p1/p1v4.json +++ b/tests/data/p1/p1v4.json @@ -1,40 +1,42 @@ { - "a455b61e52394b2db5081ce025a430f3": { - "dev_class": "gateway", - "firmware": "4.1.1", - "hardware": "AME Smile 2.0 board", - "location": "a455b61e52394b2db5081ce025a430f3", - "mac_address": "012345670001", - "model": "Gateway", - "model_id": "smile", - "name": "Smile P1", - "vendor": "Plugwise", - "binary_sensors": { - "plugwise_notification": true - } - }, - "ba4de7613517478da82dd9b6abea36af": { - "dev_class": "smartmeter", - "location": "a455b61e52394b2db5081ce025a430f3", - "model": "KFM5KAIFA-METER", - "name": "P1", - "vendor": "SHENZHEN KAIFA TECHNOLOGY CHENGDU CO.", - "available": false, - "sensors": { - "net_electricity_point": 571.0, - "electricity_consumed_peak_point": 571.0, - "electricity_consumed_off_peak_point": 0.0, - "net_electricity_cumulative": 20983.453, - "electricity_consumed_peak_cumulative": 9067.554, - "electricity_consumed_off_peak_cumulative": 11915.899, - "electricity_consumed_peak_interval": 335.0, - "electricity_consumed_off_peak_interval": 0.0, - "electricity_produced_peak_point": 0.0, - "electricity_produced_off_peak_point": 0.0, - "electricity_produced_peak_cumulative": 0.0, - "electricity_produced_off_peak_cumulative": 0.0, - "electricity_produced_peak_interval": 0.0, - "electricity_produced_off_peak_interval": 0.0 + "devices": { + "a455b61e52394b2db5081ce025a430f3": { + "dev_class": "gateway", + "firmware": "4.1.1", + "hardware": "AME Smile 2.0 board", + "location": "a455b61e52394b2db5081ce025a430f3", + "mac_address": "012345670001", + "model": "Gateway", + "model_id": "smile", + "name": "Smile P1", + "vendor": "Plugwise", + "binary_sensors": { + "plugwise_notification": true + } + }, + "ba4de7613517478da82dd9b6abea36af": { + "dev_class": "smartmeter", + "location": "a455b61e52394b2db5081ce025a430f3", + "model": "KFM5KAIFA-METER", + "name": "P1", + "vendor": "SHENZHEN KAIFA TECHNOLOGY CHENGDU CO.", + "available": false, + "sensors": { + "net_electricity_point": 571.0, + "electricity_consumed_peak_point": 571.0, + "electricity_consumed_off_peak_point": 0.0, + "net_electricity_cumulative": 20983.453, + "electricity_consumed_peak_cumulative": 9067.554, + "electricity_consumed_off_peak_cumulative": 11915.899, + "electricity_consumed_peak_interval": 335.0, + "electricity_consumed_off_peak_interval": 0.0, + "electricity_produced_peak_point": 0.0, + "electricity_produced_off_peak_point": 0.0, + "electricity_produced_peak_cumulative": 0.0, + "electricity_produced_off_peak_cumulative": 0.0, + "electricity_produced_peak_interval": 0.0, + "electricity_produced_off_peak_interval": 0.0 + } } } } diff --git a/tests/data/p1/p1v4_442_single.json b/tests/data/p1/p1v4_442_single.json index 387ee92f5..bd4397c85 100644 --- a/tests/data/p1/p1v4_442_single.json +++ b/tests/data/p1/p1v4_442_single.json @@ -1,5 +1,5 @@ { - "entities": { + "devices": { "a455b61e52394b2db5081ce025a430f3": { "binary_sensors": { "plugwise_notification": false diff --git a/tests/data/p1/p1v4_442_single_UPDATED_DATA.json b/tests/data/p1/p1v4_442_single_UPDATED_DATA.json index f7c54c9f6..3051bf287 100644 --- a/tests/data/p1/p1v4_442_single_UPDATED_DATA.json +++ b/tests/data/p1/p1v4_442_single_UPDATED_DATA.json @@ -1,5 +1,5 @@ { - "entities": { + "devices": { "ba4de7613517478da82dd9b6abea36af": { "sensors": { "net_electricity_point": -2248.0, diff --git a/tests/data/p1/p1v4_442_triple.json b/tests/data/p1/p1v4_442_triple.json index 5e8c38bc6..f455c5bad 100644 --- a/tests/data/p1/p1v4_442_triple.json +++ b/tests/data/p1/p1v4_442_triple.json @@ -1,5 +1,5 @@ { - "entities": { + "devices": { "03e65b16e4b247a29ae0d75a78cb492e": { "binary_sensors": { "plugwise_notification": true diff --git a/tests/data/p1/smile_p1_v2.json b/tests/data/p1/smile_p1_v2.json index 10c129e47..bc37c8f01 100644 --- a/tests/data/p1/smile_p1_v2.json +++ b/tests/data/p1/smile_p1_v2.json @@ -1,5 +1,5 @@ { - "device_zones": { + "devices": { "938696c4bcdb4b8a9a595cb38ed43913": { "dev_class": "smartmeter", "location": "938696c4bcdb4b8a9a595cb38ed43913", diff --git a/tests/data/p1/smile_p1_v2_2.json b/tests/data/p1/smile_p1_v2_2.json index 30734158e..c38f15f81 100644 --- a/tests/data/p1/smile_p1_v2_2.json +++ b/tests/data/p1/smile_p1_v2_2.json @@ -1,5 +1,5 @@ { - "entities": { + "devices": { "199aa40f126840f392983d171374ab0b": { "dev_class": "smartmeter", "location": "199aa40f126840f392983d171374ab0b", diff --git a/tests/data/p1/smile_p1_v2_2_UPDATED_DATA.json b/tests/data/p1/smile_p1_v2_2_UPDATED_DATA.json index 237826b33..c99e99e26 100644 --- a/tests/data/p1/smile_p1_v2_2_UPDATED_DATA.json +++ b/tests/data/p1/smile_p1_v2_2_UPDATED_DATA.json @@ -1,5 +1,5 @@ { - "entities": { + "devices": { "199aa40f126840f392983d171374ab0b": { "sensors": { "net_electricity_point": -2248.0, diff --git a/tests/data/stretch/stretch_v23.json b/tests/data/stretch/stretch_v23.json index 15fb4d4df..f0b951d7f 100644 --- a/tests/data/stretch/stretch_v23.json +++ b/tests/data/stretch/stretch_v23.json @@ -1,5 +1,5 @@ { - "entities": { + "devices": { "0000aaaa0000aaaa0000aaaa0000aa00": { "dev_class": "gateway", "firmware": "2.3.12", diff --git a/tests/data/stretch/stretch_v27_no_domain.json b/tests/data/stretch/stretch_v27_no_domain.json index b11b88814..d615ae1d2 100644 --- a/tests/data/stretch/stretch_v27_no_domain.json +++ b/tests/data/stretch/stretch_v27_no_domain.json @@ -1,5 +1,5 @@ { - "entities": { + "devices": { "0000aaaa0000aaaa0000aaaa0000aa00": { "dev_class": "gateway", "firmware": "2.7.18", diff --git a/tests/data/stretch/stretch_v31.json b/tests/data/stretch/stretch_v31.json index 43f925648..a1228049c 100644 --- a/tests/data/stretch/stretch_v31.json +++ b/tests/data/stretch/stretch_v31.json @@ -1,5 +1,5 @@ { - "device_zones": { + "devices": { "0000aaaa0000aaaa0000aaaa0000aa00": { "dev_class": "gateway", "firmware": "3.1.11", diff --git a/tests/data/stretch/stretch_v31_UPDATED_DATA.json b/tests/data/stretch/stretch_v31_UPDATED_DATA.json index 0eff7c2ef..87a43e897 100644 --- a/tests/data/stretch/stretch_v31_UPDATED_DATA.json +++ b/tests/data/stretch/stretch_v31_UPDATED_DATA.json @@ -1,5 +1,5 @@ { - "device_zones": { + "devices": { "aac7b735042c4832ac9ff33aae4f453b": { "sensors": { "electricity_consumed": 1000.0,