Include device_list in manual-created fixtures

Author: bouwew

scripts/manual_fixtures.py

@@ -40,9 +40,12 @@ def json_writer(manual_name: str, all_data: dict, notifications: dict):
 base_adam_manual = "adam_jip"
 basefile = f"./fixtures/{base_adam_manual}/all_data.json"
 basefile_n = f"./fixtures/{base_adam_manual}/notifications.json"
+basefile_d = f"./fixtures/{base_adam_manual}/device_list.json"
 
 io = open(basefile)
 base = json.load(io)
+io_d = open(basefile_d)
+base_d = json.load(io_d)
 io_n = open(basefile_n)
 base_n = json.load(io_n)
 
@@ -51,16 +54,19 @@ def json_writer(manual_name: str, all_data: dict, notifications: dict):
 # Change mode to off for "1346fbd8498d4dbcab7e18d51b771f3d"
 adam_jip["devices"]["1346fbd8498d4dbcab7e18d51b771f3d"]["mode"] = "off"
 
-json_writer("adam_jip", adam_jip, base_n)
+json_writer("adam_jip", adam_jip, base_d, base_n)
 
 ### Manual Adam fixtures
 
 base_adam_manual = "adam_plus_anna_new"
 basefile = f"./fixtures/{base_adam_manual}/all_data.json"
+basefile_d = f"./fixtures/{base_adam_manual}/device_list.json"
 basefile_n = f"./fixtures/{base_adam_manual}/notifications.json"
 
 io = open(basefile)
 base = json.load(io)
+io_d = open(basefile_d)
+base_d = json.load(io_d)
 io_n = open(basefile_n)
 base_n = json.load(io_n)
 
@@ -148,7 +154,7 @@ def json_writer(manual_name: str, all_data: dict, notifications: dict):
     "intended_boiler_temperature"
 ] = 17.5
 
-json_writer("m_adam_cooling", m_adam_cooling, base_n)
+json_writer("m_adam_cooling", m_adam_cooling, base_d, base_n)
 
 ### FROM ABOVE
 
@@ -223,19 +229,21 @@ def json_writer(manual_name: str, all_data: dict, notifications: dict):
     "resolution": 0.01,
 }
 
-json_writer("m_adam_heating", m_adam_heating, base_n)
+json_writer("m_adam_heating", m_adam_heating, base_d, base_n)
 
 ### ANNA
 
 base_anna_manual = "anna_heatpump_heating"
 basefile = f"./fixtures/{base_anna_manual}/all_data.json"
+basefile_d = f"./fixtures/{base_anna_manual}/device_list.json"
 basefile_n = f"./fixtures/{base_anna_manual}/notifications.json"
 
 io = open(basefile)
 base = json.load(io)
+io_d = open(basefile_d)
+base_d = json.load(io_d)
 io_n = open(basefile_n)
 base_n = json.load(io_n)
-
 m_anna_heatpump_cooling = base.copy()
 
 # Set cooling_present to true
@@ -299,7 +307,7 @@ def json_writer(manual_name: str, all_data: dict, notifications: dict):
     "setpoint_high"
 ] = 30.0
 
-json_writer("m_anna_heatpump_cooling", m_anna_heatpump_cooling, base_n)
+json_writer("m_anna_heatpump_cooling", m_anna_heatpump_cooling, base_d, base_n)
 
 ### FROM ABOVE
 
@@ -342,4 +350,4 @@ def json_writer(manual_name: str, all_data: dict, notifications: dict):
     "cooling_activation_outdoor_temperature"
 ] = 25.0
 
-json_writer("m_anna_heatpump_idle", m_anna_heatpump_idle, base_n)
+json_writer("m_anna_heatpump_idle", m_anna_heatpump_idle, base_d, base_n)