Line up json-headers

bouwew · bouwew · commit e743f5a9f1d9 · 2024-12-31T12:29:29.000+01:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,5 @@
 {
-  "device_zones": {
+  "devices": {
     "aac7b735042c4832ac9ff33aae4f453b": {
       "sensors": {
         "electricity_consumed": 1000.0,

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "entities": {`
	`2`	`+ "devices": {`
`3`	`3`	`"06aecb3d00354375924f50c47af36bd2": {`
`4`	`4`	`"active_preset": "no_frost",`
`5`	`5`	`"climate_mode": "heat",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "device_zones": {`
	`2`	`+ "devices": {`
`3`	`3`	`"056ee145a816487eaa69243c3280f8bf": {`
`4`	`4`	`"available": true,`
`5`	`5`	`"binary_sensors": {`