Skip to content

Commit d624f01

Browse files
bouwewbouwew
committed
Save updated legacy fixtures and test-jsons
1 parent fe2b968 commit d624f01

File tree

6 files changed

+226
-217
lines changed

6 files changed

+226
-217
lines changed

‎fixtures/legacy_anna/all_data.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"devices": {
2+
"device_zones": {
33
"0000aaaa0000aaaa0000aaaa0000aa00": {
44
"dev_class": "gateway",
55
"firmware": "1.8.22",
@@ -70,6 +70,5 @@
7070
"heater_id": "04e4cbfe7f4340f090f85ec3b9e6a950",
7171
"item_count": 41,
7272
"smile_name": "Smile Anna"
73-
},
74-
"zones": {}
73+
}
7574
}

‎fixtures/smile_p1_v2/all_data.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"devices": {
2+
"device_zones": {
33
"938696c4bcdb4b8a9a595cb38ed43913": {
44
"dev_class": "smartmeter",
55
"location": "938696c4bcdb4b8a9a595cb38ed43913",
@@ -37,6 +37,5 @@
3737
"gateway_id": "aaaa0000aaaa0000aaaa0000aaaa00aa",
3838
"item_count": 26,
3939
"smile_name": "Smile P1"
40-
},
41-
"zones": {}
40+
}
4241
}

‎fixtures/stretch_v31/all_data.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"devices": {
2+
"device_zones": {
33
"0000aaaa0000aaaa0000aaaa0000aa00": {
44
"dev_class": "gateway",
55
"firmware": "3.1.11",
@@ -137,6 +137,5 @@
137137
"gateway_id": "0000aaaa0000aaaa0000aaaa0000aa00",
138138
"item_count": 83,
139139
"smile_name": "Stretch"
140-
},
141-
"zones": {}
140+
}
142141
}

‎tests/data/anna/legacy_anna.json‎

Lines changed: 61 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,67 @@
11
{
2-
"0000aaaa0000aaaa0000aaaa0000aa00": {
3-
"dev_class": "gateway",
4-
"firmware": "1.8.22",
5-
"location": "0000aaaa0000aaaa0000aaaa0000aa00",
6-
"mac_address": "01:23:45:67:89:AB",
7-
"model": "Gateway",
8-
"name": "Smile Anna",
9-
"vendor": "Plugwise"
10-
},
11-
"0d266432d64443e283b5d708ae98b455": {
12-
"dev_class": "thermostat",
13-
"firmware": "2017-03-13T11:54:58+01:00",
14-
"hardware": "6539-1301-500",
15-
"location": "0000aaaa0000aaaa0000aaaa0000aa00",
16-
"model": "ThermoTouch",
17-
"name": "Anna",
18-
"vendor": "Plugwise",
19-
"thermostat": {
20-
"setpoint": 20.5,
21-
"lower_bound": 4.0,
22-
"upper_bound": 30.0,
23-
"resolution": 0.1
2+
"device_zones": {
3+
"0000aaaa0000aaaa0000aaaa0000aa00": {
4+
"dev_class": "gateway",
5+
"firmware": "1.8.22",
6+
"location": "0000aaaa0000aaaa0000aaaa0000aa00",
7+
"mac_address": "01:23:45:67:89:AB",
8+
"model": "Gateway",
9+
"name": "Smile Anna",
10+
"vendor": "Plugwise"
2411
},
25-
"preset_modes": ["away", "vacation", "asleep", "home", "no_frost"],
26-
"active_preset": "home",
27-
"climate_mode": "heat",
28-
"sensors": {
29-
"temperature": 20.4,
30-
"illuminance": 150.8,
31-
"setpoint": 20.5
32-
}
33-
},
34-
"04e4cbfe7f4340f090f85ec3b9e6a950": {
35-
"dev_class": "heater_central",
36-
"location": "0000aaaa0000aaaa0000aaaa0000aa00",
37-
"model": "Generic heater",
38-
"name": "OpenTherm",
39-
"vendor": "Bosch Thermotechniek B.V.",
40-
"maximum_boiler_temperature": {
41-
"setpoint": 50.0,
42-
"lower_bound": 50.0,
43-
"upper_bound": 90.0,
44-
"resolution": 1.0
45-
},
46-
"binary_sensors": {
47-
"flame_state": true,
48-
"heating_state": true
12+
"04e4cbfe7f4340f090f85ec3b9e6a950": {
13+
"binary_sensors": {
14+
"flame_state": true,
15+
"heating_state": true
16+
},
17+
"dev_class": "heater_central",
18+
"location": "0000aaaa0000aaaa0000aaaa0000aa00",
19+
"maximum_boiler_temperature": {
20+
"lower_bound": 50.0,
21+
"resolution": 1.0,
22+
"setpoint": 50.0,
23+
"upper_bound": 90.0
24+
},
25+
"model": "Generic heater",
26+
"name": "OpenTherm",
27+
"sensors": {
28+
"dhw_temperature": 51.2,
29+
"intended_boiler_temperature": 17.0,
30+
"modulation_level": 0.0,
31+
"return_temperature": 21.7,
32+
"water_pressure": 1.2,
33+
"water_temperature": 23.6
34+
},
35+
"vendor": "Bosch Thermotechniek B.V."
4936
},
50-
"sensors": {
51-
"water_temperature": 23.6,
52-
"dhw_temperature": 51.2,
53-
"intended_boiler_temperature": 17.0,
54-
"modulation_level": 0,
55-
"return_temperature": 21.7,
56-
"water_pressure": 1.2
37+
"0d266432d64443e283b5d708ae98b455": {
38+
"active_preset": "home",
39+
"climate_mode": "heat",
40+
"dev_class": "thermostat",
41+
"firmware": "2017-03-13T11:54:58+01:00",
42+
"hardware": "6539-1301-500",
43+
"location": "0000aaaa0000aaaa0000aaaa0000aa00",
44+
"model": "ThermoTouch",
45+
"name": "Anna",
46+
"preset_modes": [
47+
"away",
48+
"vacation",
49+
"asleep",
50+
"home",
51+
"no_frost"
52+
],
53+
"sensors": {
54+
"illuminance": 150.8,
55+
"setpoint": 20.5,
56+
"temperature": 20.4
57+
},
58+
"thermostat": {
59+
"lower_bound": 4.0,
60+
"resolution": 0.1,
61+
"setpoint": 20.5,
62+
"upper_bound": 30.0
63+
},
64+
"vendor": "Plugwise"
5765
}
5866
}
5967
}

‎tests/data/p1/smile_p1_v2.json‎

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,36 @@
11
{
2-
"aaaa0000aaaa0000aaaa0000aaaa00aa": {
3-
"dev_class": "gateway",
4-
"firmware": "2.5.9",
5-
"location": "938696c4bcdb4b8a9a595cb38ed43913",
6-
"mac_address": "012345670001",
7-
"model": "Gateway",
8-
"name": "Smile P1",
9-
"vendor": "Plugwise"
10-
},
11-
"938696c4bcdb4b8a9a595cb38ed43913": {
12-
"dev_class": "smartmeter",
13-
"location": "938696c4bcdb4b8a9a595cb38ed43913",
14-
"model": "Ene5\\T210-DESMR5.0",
15-
"name": "P1",
16-
"vendor": "Ene5\\T210-DESMR5.0",
17-
"sensors": {
18-
"net_electricity_point": 458.0,
19-
"electricity_consumed_point": 458.0,
20-
"net_electricity_cumulative": 1019.201,
21-
"electricity_consumed_peak_cumulative": 1155.195,
22-
"electricity_consumed_off_peak_cumulative": 1642.74,
23-
"electricity_consumed_peak_interval": 250.0,
24-
"electricity_consumed_off_peak_interval": 0.0,
25-
"electricity_produced_point": 0.0,
26-
"electricity_produced_peak_cumulative": 1296.136,
27-
"electricity_produced_off_peak_cumulative": 482.598,
28-
"electricity_produced_peak_interval": 0.0,
29-
"electricity_produced_off_peak_interval": 0.0,
30-
"gas_consumed_cumulative": 584.433,
31-
"gas_consumed_interval": 0.016
2+
"device_zones": {
3+
"938696c4bcdb4b8a9a595cb38ed43913": {
4+
"dev_class": "smartmeter",
5+
"location": "938696c4bcdb4b8a9a595cb38ed43913",
6+
"model": "Ene5\\T210-DESMR5.0",
7+
"name": "P1",
8+
"sensors": {
9+
"electricity_consumed_off_peak_cumulative": 1642.74,
10+
"electricity_consumed_off_peak_interval": 0,
11+
"electricity_consumed_peak_cumulative": 1155.195,
12+
"electricity_consumed_peak_interval": 250,
13+
"electricity_consumed_point": 458,
14+
"electricity_produced_off_peak_cumulative": 482.598,
15+
"electricity_produced_off_peak_interval": 0,
16+
"electricity_produced_peak_cumulative": 1296.136,
17+
"electricity_produced_peak_interval": 0,
18+
"electricity_produced_point": 0,
19+
"gas_consumed_cumulative": 584.433,
20+
"gas_consumed_interval": 0.016,
21+
"net_electricity_cumulative": 1019.201,
22+
"net_electricity_point": 458
23+
},
24+
"vendor": "Ene5\\T210-DESMR5.0"
25+
},
26+
"aaaa0000aaaa0000aaaa0000aaaa00aa": {
27+
"dev_class": "gateway",
28+
"firmware": "2.5.9",
29+
"location": "938696c4bcdb4b8a9a595cb38ed43913",
30+
"mac_address": "012345670001",
31+
"model": "Gateway",
32+
"name": "Smile P1",
33+
"vendor": "Plugwise"
3234
}
3335
}
3436
}

0 commit comments

Comments
 (0)