Update manual_fixtures script

Author: bouwew

scripts/manual_fixtures.py

@@ -35,9 +35,9 @@ def json_writer(manual_name: str, all_data: dict) -> None:
 
 adam_multiple_devices_per_zone = base.copy()
 
-# Change schedule to not present for "e7693eb9582644e5b865dba8d4447cf1"
-adam_multiple_devices_per_zone["device_zones"]["e7693eb9582644e5b865dba8d4447cf1"].pop("available_schedules")
-adam_multiple_devices_per_zone["device_zones"]["e7693eb9582644e5b865dba8d4447cf1"].pop("select_schedule")
+# Change schedule to not present for "446ac08dd04d4eff8ac57489757b7314"
+adam_multiple_devices_per_zone["entities"]["446ac08dd04d4eff8ac57489757b7314"].pop("available_schedules")
+adam_multiple_devices_per_zone["entities"]["446ac08dd04d4eff8ac57489757b7314"].pop("select_schedule")
 
 json_writer("m_adam_multiple_devices_per_zone", adam_multiple_devices_per_zone)
 
@@ -49,8 +49,8 @@ def json_writer(manual_name: str, all_data: dict) -> None:
 
 adam_jip = base.copy()
 
-# Change mode to off for "1346fbd8498d4dbcab7e18d51b771f3d"
-adam_jip["device_zones"]["1346fbd8498d4dbcab7e18d51b771f3d"]["climate_mode"] = "off"
+# Change mode to off for "06aecb3d00354375924f50c47af36bd2"
+adam_jip["entities"]["06aecb3d00354375924f50c47af36bd2"]["climate_mode"] = "off"
 
 json_writer("m_adam_jip", adam_jip)
 
@@ -70,86 +70,86 @@ def json_writer(manual_name: str, all_data: dict) -> None:
 m_adam_cooling["gateway"]["item_count"] = 89
 
 # Remove devices "67d73d0bd469422db25a618a5fb8eeb0" and "10016900610d4c7481df78c89606ef22" from anywhere
-m_adam_cooling["device_zones"].pop("67d73d0bd469422db25a618a5fb8eeb0")
-m_adam_cooling["device_zones"].pop("10016900610d4c7481df78c89606ef22")
+m_adam_cooling["entities"].pop("67d73d0bd469422db25a618a5fb8eeb0")
+m_adam_cooling["entities"].pop("10016900610d4c7481df78c89606ef22")
 
-# Correct setpoint for "ad4838d7d35c4d6ea796ee12ae5aedf8"
-m_adam_cooling["device_zones"]["f2bf9048bef64cc5b6d5110154e33c81"]["thermostat"][
+# Correct setpoint for device "ad4838d7d35c4d6ea796ee12ae5aedf8" and zone "f2bf9048bef64cc5b6d5110154e33c81"
+m_adam_cooling["entities"]["ad4838d7d35c4d6ea796ee12ae5aedf8"]["sensors"][
     "setpoint"
 ] = 23.5
-
-# Add new key available
-m_adam_cooling["device_zones"]["ad4838d7d35c4d6ea796ee12ae5aedf8"]["available"] = True
-
-m_adam_cooling["device_zones"]["f2bf9048bef64cc5b6d5110154e33c81"][
+m_adam_cooling["entities"]["f2bf9048bef64cc5b6d5110154e33c81"]["thermostat"][
+    "setpoint"
+] = 23.5
+m_adam_cooling["entities"]["ad4838d7d35c4d6ea796ee12ae5aedf8"]["sensors"][
+    "temperature"
+] = 25.8
+m_adam_cooling["entities"]["f2bf9048bef64cc5b6d5110154e33c81"]["sensors"][
+    "temperature"
+] = 25.8
+m_adam_cooling["entities"]["f2bf9048bef64cc5b6d5110154e33c81"][
     "select_schedule"
 ] = "off"
-m_adam_cooling["device_zones"]["f2bf9048bef64cc5b6d5110154e33c81"][
+m_adam_cooling["entities"]["f2bf9048bef64cc5b6d5110154e33c81"][
     "control_state"
 ] = "cooling"
-m_adam_cooling["device_zones"]["f2bf9048bef64cc5b6d5110154e33c81"]["climate_mode"] = "cool"
+m_adam_cooling["entities"]["f2bf9048bef64cc5b6d5110154e33c81"]["climate_mode"] = "cool"
 
-# (following diff, now 2954 is removed)
-# Remove device "29542b2b6a6a4169acecc15c72a599b8" from anywhere
-m_adam_cooling["device_zones"].pop("29542b2b6a6a4169acecc15c72a599b8")
+# Add new key available
+m_adam_cooling["entities"]["ad4838d7d35c4d6ea796ee12ae5aedf8"]["available"] = True
 
-# Back at ad48
-m_adam_cooling["device_zones"]["ad4838d7d35c4d6ea796ee12ae5aedf8"]["sensors"][
-    "temperature"
-] = 25.8
-m_adam_cooling["device_zones"]["ad4838d7d35c4d6ea796ee12ae5aedf8"]["sensors"][
-    "setpoint"
-] = 23.5
 
 # (again, following diff)
 # Remove device "2568cc4b9c1e401495d4741a5f89bee1" from anywhere
-m_adam_cooling["device_zones"].pop("2568cc4b9c1e401495d4741a5f89bee1")
+m_adam_cooling["entities"].pop("2568cc4b9c1e401495d4741a5f89bee1")
 
 # Remove device "854f8a9b0e7e425db97f1f110e1ce4b3" from anywhere
-m_adam_cooling["device_zones"].pop("854f8a9b0e7e425db97f1f110e1ce4b3")
+m_adam_cooling["entities"].pop("854f8a9b0e7e425db97f1f110e1ce4b3")
 
 # Go for 1772
-m_adam_cooling["device_zones"]["1772a4ea304041adb83f357b751341ff"]["sensors"].pop("setpoint")
-m_adam_cooling["device_zones"]["1772a4ea304041adb83f357b751341ff"]["sensors"][
+m_adam_cooling["entities"]["1772a4ea304041adb83f357b751341ff"]["sensors"].pop("setpoint")
+m_adam_cooling["entities"]["1772a4ea304041adb83f357b751341ff"]["sensors"][
     "temperature"
 ] = 21.6
 
 # Go for e2f4
-m_adam_cooling["device_zones"]["f871b8c4d63549319221e294e4f88074"]["thermostat"][
+m_adam_cooling["entities"]["f871b8c4d63549319221e294e4f88074"]["thermostat"][
+    "setpoint"
+] = 25.0
+m_adam_cooling["entities"]["e2f4322d57924fa090fbbc48b3a140dc"]["sensors"][
     "setpoint"
 ] = 25.0
-m_adam_cooling["device_zones"]["e2f4322d57924fa090fbbc48b3a140dc"]["sensors"][
+m_adam_cooling["entities"]["f871b8c4d63549319221e294e4f88074"]["sensors"][
+    "temperature"
+] = 23.9
+m_adam_cooling["entities"]["e2f4322d57924fa090fbbc48b3a140dc"]["sensors"][
     "temperature"
 ] = 23.9
-m_adam_cooling["device_zones"]["e2f4322d57924fa090fbbc48b3a140dc"]["sensors"][
-    "setpoint"
-] = 23.5
 
 # Go for da22
-m_adam_cooling["device_zones"]["da224107914542988a88561b4452b0f6"][
+m_adam_cooling["entities"]["da224107914542988a88561b4452b0f6"][
     "select_regulation_mode"
 ] = "cooling"
-m_adam_cooling["device_zones"]["da224107914542988a88561b4452b0f6"][
+m_adam_cooling["entities"]["da224107914542988a88561b4452b0f6"][
     "regulation_modes"
 ].append("cooling")
-m_adam_cooling["device_zones"]["da224107914542988a88561b4452b0f6"]["sensors"][
+m_adam_cooling["entities"]["da224107914542988a88561b4452b0f6"]["sensors"][
     "outdoor_temperature"
 ] = 29.65
 
 # Go for 056e
-m_adam_cooling["device_zones"]["056ee145a816487eaa69243c3280f8bf"]["binary_sensors"][
+m_adam_cooling["entities"]["056ee145a816487eaa69243c3280f8bf"]["binary_sensors"][
     "cooling_state"
 ] = True
-m_adam_cooling["device_zones"]["056ee145a816487eaa69243c3280f8bf"]["binary_sensors"][
+m_adam_cooling["entities"]["056ee145a816487eaa69243c3280f8bf"]["binary_sensors"][
     "heating_state"
 ] = False
-m_adam_cooling["device_zones"]["056ee145a816487eaa69243c3280f8bf"]["binary_sensors"][
+m_adam_cooling["entities"]["056ee145a816487eaa69243c3280f8bf"]["binary_sensors"][
     "flame_state"
 ] = False
-m_adam_cooling["device_zones"]["056ee145a816487eaa69243c3280f8bf"]["sensors"][
+m_adam_cooling["entities"]["056ee145a816487eaa69243c3280f8bf"]["sensors"][
     "water_temperature"
 ] = 19.0
-m_adam_cooling["device_zones"]["056ee145a816487eaa69243c3280f8bf"]["sensors"][
+m_adam_cooling["entities"]["056ee145a816487eaa69243c3280f8bf"]["sensors"][
     "intended_boiler_temperature"
 ] = 17.5
 
@@ -163,73 +163,78 @@ def json_writer(manual_name: str, all_data: dict) -> None:
 m_adam_heating["gateway"]["cooling_present"] = False
 
 # Correct setpoint for "ad4838d7d35c4d6ea796ee12ae5aedf8"
-m_adam_heating["device_zones"]["f2bf9048bef64cc5b6d5110154e33c81"]["thermostat"][
+m_adam_heating["entities"]["f2bf9048bef64cc5b6d5110154e33c81"]["thermostat"][
     "setpoint"
 ] = 20.0
-
-m_adam_heating["device_zones"]["f2bf9048bef64cc5b6d5110154e33c81"][
-    "control_state"
-] = "preheating"
-
-m_adam_heating["device_zones"]["f2bf9048bef64cc5b6d5110154e33c81"]["climate_mode"] = "heat"
-
-# Back at ad48
-m_adam_heating["device_zones"]["ad4838d7d35c4d6ea796ee12ae5aedf8"]["sensors"][
+m_adam_heating["entities"]["ad4838d7d35c4d6ea796ee12ae5aedf8"]["sensors"][
     "setpoint"
 ] = 20.0
-m_adam_heating["device_zones"]["ad4838d7d35c4d6ea796ee12ae5aedf8"]["sensors"][
+m_adam_heating["entities"]["f2bf9048bef64cc5b6d5110154e33c81"]["sensors"][
+    "temperature"
+] = 19.1
+m_adam_heating["entities"]["ad4838d7d35c4d6ea796ee12ae5aedf8"]["sensors"][
     "temperature"
 ] = 19.1
 
+m_adam_heating["entities"]["f2bf9048bef64cc5b6d5110154e33c81"][
+    "control_state"
+] = "preheating"
+m_adam_heating["entities"]["f2bf9048bef64cc5b6d5110154e33c81"]["climate_mode"] = "heat"
+
 # Go for 1772
-m_adam_heating["device_zones"]["1772a4ea304041adb83f357b751341ff"]["sensors"][
+m_adam_heating["entities"]["f871b8c4d63549319221e294e4f88074"]["sensors"][
+    "temperature"
+] = 18.6
+m_adam_heating["entities"]["1772a4ea304041adb83f357b751341ff"]["sensors"][
     "temperature"
 ] = 18.6
 
 # Go for e2f4
-m_adam_heating["device_zones"]["f871b8c4d63549319221e294e4f88074"]["thermostat"][
+m_adam_heating["entities"]["f871b8c4d63549319221e294e4f88074"]["thermostat"][
     "setpoint"
 ] = 15.0
-
-m_adam_heating["device_zones"]["e2f4322d57924fa090fbbc48b3a140dc"][
-    "control_state"
-] = "off"
-
-m_adam_heating["device_zones"]["e2f4322d57924fa090fbbc48b3a140dc"]["sensors"][
+m_adam_heating["entities"]["e2f4322d57924fa090fbbc48b3a140dc"]["sensors"][
     "setpoint"
 ] = 15.0
-m_adam_heating["device_zones"]["e2f4322d57924fa090fbbc48b3a140dc"]["sensors"][
+m_adam_heating["entities"]["f871b8c4d63549319221e294e4f88074"]["sensors"][
+    "temperature"
+] = 17.9
+m_adam_heating["entities"]["e2f4322d57924fa090fbbc48b3a140dc"]["sensors"][
     "temperature"
 ] = 17.9
 
+m_adam_heating["entities"]["f871b8c4d63549319221e294e4f88074"][
+    "control_state"
+] = "off"
+
 # Go for da22
-m_adam_heating["device_zones"]["da224107914542988a88561b4452b0f6"][
+m_adam_heating["entities"]["da224107914542988a88561b4452b0f6"][
     "select_regulation_mode"
 ] = "heating"
-m_adam_heating["device_zones"]["da224107914542988a88561b4452b0f6"][
+m_adam_heating["entities"]["da224107914542988a88561b4452b0f6"][
     "regulation_modes"
 ].remove("cooling")
-m_adam_heating["device_zones"]["da224107914542988a88561b4452b0f6"]["sensors"][
+m_adam_heating["entities"]["da224107914542988a88561b4452b0f6"]["sensors"][
     "outdoor_temperature"
 ] = -1.25
 
 # Go for 056e
-m_adam_heating["device_zones"]["056ee145a816487eaa69243c3280f8bf"]["binary_sensors"].pop(
+m_adam_heating["entities"]["056ee145a816487eaa69243c3280f8bf"]["binary_sensors"].pop(
     "cooling_state"
 )
-m_adam_heating["device_zones"]["056ee145a816487eaa69243c3280f8bf"]["binary_sensors"][
+m_adam_heating["entities"]["056ee145a816487eaa69243c3280f8bf"]["binary_sensors"][
     "heating_state"
 ] = True
-m_adam_cooling["device_zones"]["056ee145a816487eaa69243c3280f8bf"]["binary_sensors"][
+m_adam_cooling["entities"]["056ee145a816487eaa69243c3280f8bf"]["binary_sensors"][
     "flame_state"
 ] = False
-m_adam_heating["device_zones"]["056ee145a816487eaa69243c3280f8bf"]["sensors"][
+m_adam_heating["entities"]["056ee145a816487eaa69243c3280f8bf"]["sensors"][
     "water_temperature"
 ] = 37.0
-m_adam_heating["device_zones"]["056ee145a816487eaa69243c3280f8bf"]["sensors"][
+m_adam_heating["entities"]["056ee145a816487eaa69243c3280f8bf"]["sensors"][
     "intended_boiler_temperature"
 ] = 38.1
-m_adam_heating["device_zones"]["056ee145a816487eaa69243c3280f8bf"]["max_dhw_temperature"] = {
+m_adam_heating["entities"]["056ee145a816487eaa69243c3280f8bf"]["max_dhw_temperature"] = {
     "setpoint": 60.0,
     "lower_bound": 40.0,
     "upper_bound": 60.0,
@@ -251,60 +256,58 @@ def json_writer(manual_name: str, all_data: dict) -> None:
 m_anna_heatpump_cooling["gateway"]["cooling_present"] = True
 
 # Go for 1cbf
-m_anna_heatpump_cooling["device_zones"]["1cbf783bb11e4a7c8a6843dee3a86927"][
+m_anna_heatpump_cooling["entities"]["1cbf783bb11e4a7c8a6843dee3a86927"][
     "model"
 ] = "Generic heater/cooler"
-
-m_anna_heatpump_cooling["device_zones"]["1cbf783bb11e4a7c8a6843dee3a86927"][
+m_anna_heatpump_cooling["entities"]["1cbf783bb11e4a7c8a6843dee3a86927"][
     "binary_sensors"
 ]["cooling_enabled"] = True
-m_anna_heatpump_cooling["device_zones"]["1cbf783bb11e4a7c8a6843dee3a86927"][
+m_anna_heatpump_cooling["entities"]["1cbf783bb11e4a7c8a6843dee3a86927"][
     "binary_sensors"
 ]["heating_state"] = False
-m_anna_heatpump_cooling["device_zones"]["1cbf783bb11e4a7c8a6843dee3a86927"][
+m_anna_heatpump_cooling["entities"]["1cbf783bb11e4a7c8a6843dee3a86927"][
     "binary_sensors"
 ]["cooling_state"] = True
 
-m_anna_heatpump_cooling["device_zones"]["1cbf783bb11e4a7c8a6843dee3a86927"]["sensors"][
+m_anna_heatpump_cooling["entities"]["1cbf783bb11e4a7c8a6843dee3a86927"]["sensors"][
     "water_temperature"
 ] = 22.7
-m_anna_heatpump_cooling["device_zones"]["1cbf783bb11e4a7c8a6843dee3a86927"]["sensors"][
+m_anna_heatpump_cooling["entities"]["1cbf783bb11e4a7c8a6843dee3a86927"]["sensors"][
     "dhw_temperature"
 ] = 41.5
-m_anna_heatpump_cooling["device_zones"]["1cbf783bb11e4a7c8a6843dee3a86927"]["sensors"][
+m_anna_heatpump_cooling["entities"]["1cbf783bb11e4a7c8a6843dee3a86927"]["sensors"][
     "intended_boiler_temperature"
 ] = 0.0
-m_anna_heatpump_cooling["device_zones"]["1cbf783bb11e4a7c8a6843dee3a86927"]["sensors"][
+m_anna_heatpump_cooling["entities"]["1cbf783bb11e4a7c8a6843dee3a86927"]["sensors"][
     "modulation_level"
 ] = 40
-m_anna_heatpump_cooling["device_zones"]["1cbf783bb11e4a7c8a6843dee3a86927"]["sensors"][
+m_anna_heatpump_cooling["entities"]["1cbf783bb11e4a7c8a6843dee3a86927"]["sensors"][
     "return_temperature"
 ] = 23.8
-m_anna_heatpump_cooling["device_zones"]["1cbf783bb11e4a7c8a6843dee3a86927"]["sensors"][
+m_anna_heatpump_cooling["entities"]["1cbf783bb11e4a7c8a6843dee3a86927"]["sensors"][
     "outdoor_air_temperature"
 ] = 28.0
 
-
 # Go for 015a
-m_anna_heatpump_cooling["device_zones"]["015ae9ea3f964e668e490fa39da3870b"]["sensors"][
+m_anna_heatpump_cooling["entities"]["015ae9ea3f964e668e490fa39da3870b"]["sensors"][
     "outdoor_temperature"
 ] = 28.2
 
 # Go for 3cb7
-m_anna_heatpump_cooling["device_zones"]["3cb70739631c4d17a86b8b12e8a5161b"]["thermostat"][
+m_anna_heatpump_cooling["entities"]["3cb70739631c4d17a86b8b12e8a5161b"]["thermostat"][
     "setpoint_low"
 ] = 20.5
-m_anna_heatpump_cooling["device_zones"]["3cb70739631c4d17a86b8b12e8a5161b"]["thermostat"][
+m_anna_heatpump_cooling["entities"]["3cb70739631c4d17a86b8b12e8a5161b"]["thermostat"][
     "setpoint_high"
 ] = 30.0
 
-m_anna_heatpump_cooling["device_zones"]["3cb70739631c4d17a86b8b12e8a5161b"]["sensors"][
+m_anna_heatpump_cooling["entities"]["3cb70739631c4d17a86b8b12e8a5161b"]["sensors"][
     "temperature"
 ] = 26.3
-m_anna_heatpump_cooling["device_zones"]["3cb70739631c4d17a86b8b12e8a5161b"]["sensors"][
+m_anna_heatpump_cooling["entities"]["3cb70739631c4d17a86b8b12e8a5161b"]["sensors"][
     "setpoint_low"
 ] = 20.5
-m_anna_heatpump_cooling["device_zones"]["3cb70739631c4d17a86b8b12e8a5161b"]["sensors"][
+m_anna_heatpump_cooling["entities"]["3cb70739631c4d17a86b8b12e8a5161b"]["sensors"][
     "setpoint_high"
 ] = 30.0
 
@@ -315,39 +318,39 @@ def json_writer(manual_name: str, all_data: dict) -> None:
 m_anna_heatpump_idle = m_anna_heatpump_cooling.copy()
 
 # Go for 1cbf
-m_anna_heatpump_idle["device_zones"]["1cbf783bb11e4a7c8a6843dee3a86927"]["binary_sensors"][
+m_anna_heatpump_idle["entities"]["1cbf783bb11e4a7c8a6843dee3a86927"]["binary_sensors"][
     "compressor_state"
 ] = False
-m_anna_heatpump_idle["device_zones"]["1cbf783bb11e4a7c8a6843dee3a86927"]["binary_sensors"][
+m_anna_heatpump_idle["entities"]["1cbf783bb11e4a7c8a6843dee3a86927"]["binary_sensors"][
     "cooling_state"
 ] = False
 
-m_anna_heatpump_idle["device_zones"]["1cbf783bb11e4a7c8a6843dee3a86927"]["sensors"][
+m_anna_heatpump_idle["entities"]["1cbf783bb11e4a7c8a6843dee3a86927"]["sensors"][
     "water_temperature"
 ] = 19.1
-m_anna_heatpump_idle["device_zones"]["1cbf783bb11e4a7c8a6843dee3a86927"]["sensors"][
+m_anna_heatpump_idle["entities"]["1cbf783bb11e4a7c8a6843dee3a86927"]["sensors"][
     "dhw_temperature"
 ] = 46.3
-m_anna_heatpump_idle["device_zones"]["1cbf783bb11e4a7c8a6843dee3a86927"]["sensors"][
+m_anna_heatpump_idle["entities"]["1cbf783bb11e4a7c8a6843dee3a86927"]["sensors"][
     "intended_boiler_temperature"
 ] = 18.0
-m_anna_heatpump_idle["device_zones"]["1cbf783bb11e4a7c8a6843dee3a86927"]["sensors"][
+m_anna_heatpump_idle["entities"]["1cbf783bb11e4a7c8a6843dee3a86927"]["sensors"][
     "modulation_level"
 ] = 0
-m_anna_heatpump_idle["device_zones"]["1cbf783bb11e4a7c8a6843dee3a86927"]["sensors"][
+m_anna_heatpump_idle["entities"]["1cbf783bb11e4a7c8a6843dee3a86927"]["sensors"][
     "return_temperature"
 ] = 22.0
-m_anna_heatpump_idle["device_zones"]["1cbf783bb11e4a7c8a6843dee3a86927"]["sensors"][
+m_anna_heatpump_idle["entities"]["1cbf783bb11e4a7c8a6843dee3a86927"]["sensors"][
     "outdoor_air_temperature"
 ] = 28.2
 
 
 # Go for 3cb7
 
-m_anna_heatpump_idle["device_zones"]["3cb70739631c4d17a86b8b12e8a5161b"]["sensors"][
+m_anna_heatpump_idle["entities"]["3cb70739631c4d17a86b8b12e8a5161b"]["sensors"][
     "temperature"
 ] = 23.0
-m_anna_heatpump_idle["device_zones"]["3cb70739631c4d17a86b8b12e8a5161b"]["sensors"][
+m_anna_heatpump_idle["entities"]["3cb70739631c4d17a86b8b12e8a5161b"]["sensors"][
     "cooling_activation_outdoor_temperature"
 ] = 25.0