Skip to content

Commit 7fe4264

Browse files
bouwewbouwew
authored
Merge pull request #129 from plugwise/anna42_stretch27_II
Support Stretch with fw 2.7.18
2 parents d91f6d5 + 74b414a commit 7fe4264

File tree

10 files changed

+2385
-0
lines changed

10 files changed

+2385
-0
lines changed

‎plugwise/smile.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,11 @@ async def connect(self):
315315
dsmrmain = result.find(".//module/protocols/dsmrmain")
316316

317317
vendor_names = result.findall(".//module/vendor_name")
318+
if not vendor_names:
319+
# Work-around for Stretch fv 2.7.18
320+
result = await self._request(MODULES)
321+
vendor_names = result.findall(".//module/vendor_name")
322+
318323
for name in vendor_names:
319324
names.append(name.text)
320325

‎tests/test_smile.py‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2789,6 +2789,46 @@ async def test_connect_stretch_v23(self):
27892789
await smile.close_connection()
27902790
await self.disconnect(server, client)
27912791

2792+
@pytest.mark.asyncio
2793+
async def test_connect_stretch_v27_no_domain(self):
2794+
"""Test erroneous domain_objects file from user."""
2795+
# testdata dictionary with key ctrl_id_dev_id => keys:values
2796+
testdata = {
2797+
# 76BF93
2798+
"8b8d14b242e24cd789743c828b9a2ea9": {
2799+
"sensors": {"electricity_consumed": 1.69},
2800+
"switches": {"lock": False, "relay": True},
2801+
},
2802+
# 25F66AD
2803+
"d0122ac66eba47b99d8e5fbd1e2f5932": {
2804+
"sensors": {"electricity_consumed_interval": 2.21}
2805+
},
2806+
}
2807+
2808+
self.smile_setup = "stretch_v27_no_domain"
2809+
server, smile, client = await self.connect_wrapper(stretch=True)
2810+
assert smile.smile_hostname == "stretch000000"
2811+
2812+
_LOGGER.info("Basics:")
2813+
_LOGGER.info(" # Assert type = thermostat")
2814+
assert smile.smile_type == "stretch"
2815+
_LOGGER.info(" # Assert version")
2816+
assert smile.smile_version[0] == "2.7.18"
2817+
_LOGGER.info(" # Assert legacy")
2818+
assert smile._smile_legacy # pylint: disable=protected-access
2819+
2820+
await self.device_test(smile, testdata)
2821+
_LOGGER.info(" # Assert no master thermostat")
2822+
assert smile._sm_thermostat is None # it's not a thermostat :)
2823+
2824+
switch_change = await self.tinker_switch(
2825+
smile, "8b8d14b242e24cd789743c828b9a2ea9"
2826+
)
2827+
assert switch_change
2828+
2829+
await smile.close_connection()
2830+
await self.disconnect(server, client)
2831+
27922832
@pytest.mark.asyncio
27932833
async def test_connect_p1v4(self):
27942834
"""Test a P1 firmware 4 setup."""

‎userdata/stretch_v27_no_domain/core.appliances.xml‎

Lines changed: 900 additions & 0 deletions
Large diffs are not rendered by default.

‎userdata/stretch_v27_no_domain/core.direct_objects.xml‎

Lines changed: 900 additions & 0 deletions
Large diffs are not rendered by default.

‎userdata/stretch_v27_no_domain/core.domain_objects.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<domain_objects/>

‎userdata/stretch_v27_no_domain/core.groups.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<groups/>

‎userdata/stretch_v27_no_domain/core.locations.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<locations/>

‎userdata/stretch_v27_no_domain/core.modules.xml‎

Lines changed: 356 additions & 0 deletions
Large diffs are not rendered by default.

‎userdata/stretch_v27_no_domain/core.rules.xml‎

Lines changed: 158 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,158 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<rules>
3+
<schedule_rule id='58ecba5db3694bcfb1e2ba026a63e4ed'>
4+
<name></name>
5+
<description></description>
6+
<schedule>
7+
</schedule>
8+
<created_date>2022-01-24T14:55:04.604+01:00</created_date>
9+
<modified_date>2022-01-24T14:55:04.688+01:00</modified_date>
10+
<deleted_date></deleted_date>
11+
<services>
12+
<relay id='af8f12921bc64e1a8eded649345aa8e3'/>
13+
</services>
14+
</schedule_rule>
15+
<schedule_rule id='d8d3c0279e6c44ea98eeda60d3b04a24'>
16+
<name></name>
17+
<description></description>
18+
<schedule>
19+
</schedule>
20+
<created_date>2022-01-24T13:34:23.904+01:00</created_date>
21+
<modified_date>2022-01-24T13:34:23.947+01:00</modified_date>
22+
<deleted_date></deleted_date>
23+
<services>
24+
<relay id='ee8eb9fbb8464ac7b87d692a44773e82'/>
25+
</services>
26+
</schedule_rule>
27+
<schedule_rule id='32736b9879fa481abbcf3f4fc46de575'>
28+
<name></name>
29+
<description></description>
30+
<schedule>
31+
</schedule>
32+
<created_date>2022-01-24T14:57:37.031+01:00</created_date>
33+
<modified_date>2022-01-24T14:57:37.114+01:00</modified_date>
34+
<deleted_date></deleted_date>
35+
<services>
36+
<relay id='3d8c9e75e51e49b0897d92093fc01a83'/>
37+
</services>
38+
</schedule_rule>
39+
<schedule_rule id='000b1c3e6354407190baaf0b81de01e9'>
40+
<name></name>
41+
<description></description>
42+
<schedule>
43+
</schedule>
44+
<created_date>2022-01-24T13:33:01.968+01:00</created_date>
45+
<modified_date>2022-01-24T14:45:27.222+01:00</modified_date>
46+
<deleted_date></deleted_date>
47+
<services>
48+
</services>
49+
</schedule_rule>
50+
<schedule_rule id='1013e323611b4f68951ab8e622885e56'>
51+
<name></name>
52+
<description></description>
53+
<schedule>
54+
</schedule>
55+
<created_date>2022-01-24T14:59:39.444+01:00</created_date>
56+
<modified_date>2022-01-24T14:59:39.528+01:00</modified_date>
57+
<deleted_date></deleted_date>
58+
<services>
59+
<relay id='a071d54bf9fc4ff6951f7e7f190d78b1'/>
60+
</services>
61+
</schedule_rule>
62+
<schedule_rule id='a83d4b881c3c4716b28d88f79a7d6249'>
63+
<name></name>
64+
<description></description>
65+
<schedule>
66+
</schedule>
67+
<created_date>2022-01-24T14:58:07.442+01:00</created_date>
68+
<modified_date>2022-01-24T14:58:07.526+01:00</modified_date>
69+
<deleted_date></deleted_date>
70+
<services>
71+
<relay id='68305706bad0448a91226d5d276311dd'/>
72+
</services>
73+
</schedule_rule>
74+
<schedule_rule id='068bd7a7e9814bda897b3f457379e18c'>
75+
<name></name>
76+
<description></description>
77+
<schedule>
78+
</schedule>
79+
<created_date>2022-01-24T20:44:31.953+01:00</created_date>
80+
<modified_date>2022-01-24T20:44:32.050+01:00</modified_date>
81+
<deleted_date></deleted_date>
82+
<services>
83+
<relay id='4daac40a9de34b238acfd294efb52aff'/>
84+
</services>
85+
</schedule_rule>
86+
<schedule_rule id='53c6b6b3f16f49a3bab3f0ea15e323a7'>
87+
<name></name>
88+
<description></description>
89+
<schedule>
90+
</schedule>
91+
<created_date>2022-01-24T20:44:42.875+01:00</created_date>
92+
<modified_date>2022-01-24T20:44:42.973+01:00</modified_date>
93+
<deleted_date></deleted_date>
94+
<services>
95+
<relay id='4821ddc45b8741958736a6a83a1344b1'/>
96+
</services>
97+
</schedule_rule>
98+
<schedule_rule id='359cc67a685743e1a954f5d1c0931dd9'>
99+
<name></name>
100+
<description></description>
101+
<schedule>
102+
</schedule>
103+
<created_date>2022-01-24T14:54:34.555+01:00</created_date>
104+
<modified_date>2022-01-24T14:54:34.651+01:00</modified_date>
105+
<deleted_date></deleted_date>
106+
<services>
107+
<relay id='3b74c07cce3544f9bde4766737043a25'/>
108+
</services>
109+
</schedule_rule>
110+
<schedule_rule id='9f1c6f2007e14a01ab4c8dc4339081ce'>
111+
<name></name>
112+
<description></description>
113+
<schedule>
114+
</schedule>
115+
<created_date>2022-01-24T14:56:06.225+01:00</created_date>
116+
<modified_date>2022-01-24T14:56:06.320+01:00</modified_date>
117+
<deleted_date></deleted_date>
118+
<services>
119+
<relay id='11061e9c711e430c90b7bd8feb4d9ce6'/>
120+
</services>
121+
</schedule_rule>
122+
<schedule_rule id='9b193f7529964c7b82bd3b3259d09956'>
123+
<name></name>
124+
<description></description>
125+
<schedule>
126+
</schedule>
127+
<created_date>2022-01-24T19:36:22.430+01:00</created_date>
128+
<modified_date>2022-01-24T19:36:22.515+01:00</modified_date>
129+
<deleted_date></deleted_date>
130+
<services>
131+
<relay id='799fcd6ead1f4b469364ffa7a32b3e55'/>
132+
</services>
133+
</schedule_rule>
134+
<schedule_rule id='6636fa27fcc44c7ebf55ba6cfcc7ad46'>
135+
<name></name>
136+
<description></description>
137+
<schedule>
138+
</schedule>
139+
<created_date>2022-01-24T20:20:53.063+01:00</created_date>
140+
<modified_date>2022-01-24T20:20:53.147+01:00</modified_date>
141+
<deleted_date></deleted_date>
142+
<services>
143+
<relay id='a42e1574270e4144a043e53f00b78d46'/>
144+
</services>
145+
</schedule_rule>
146+
<schedule_rule id='9ed5c81599ec4b79a9c03f6604035707'>
147+
<name></name>
148+
<description></description>
149+
<schedule>
150+
</schedule>
151+
<created_date>2022-01-24T20:40:59.555+01:00</created_date>
152+
<modified_date>2022-01-24T20:40:59.638+01:00</modified_date>
153+
<deleted_date></deleted_date>
154+
<services>
155+
<relay id='927cdb20439f48fbbc815c72948a8a02'/>
156+
</services>
157+
</schedule_rule>
158+
</rules>

‎userdata/stretch_v27_no_domain/system_status_xml.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<system>
3+
<gateway>
4+
<product>stretch</product>
5+
<hostname>stretch000000</hostname>
6+
<firmware>2.7.18</firmware>
7+
<upgrade/>
8+
</gateway>
9+
<wlan0/>
10+
<eth0>
11+
<mac>01:23:45:67:89:AB</mac>
12+
<ip>127.0.0.1</ip>
13+
<bcast>127.0.0.1</bcast>
14+
<mask>127.0.0.1</mask>
15+
<proto>dhcp</proto>
16+
<gateway>127.0.0.1</gateway>
17+
</eth0>
18+
<time>2022-01-26T13:18:08.675+01:00</time>
19+
<timezone><![CDATA[Europe/Amsterdam]]></timezone>
20+
</system>

0 commit comments

Comments
 (0)