Skip to content

Commit d705414

Browse files
CoMPaTechCoMPaTech
authored
Merge pull request #141 from plugwise/zigbeefix
Fix zigbee mac addresses in testdata
2 parents be8ede1 + 7506548 commit d705414

File tree

28 files changed

+292
-290
lines changed

28 files changed

+292
-290
lines changed

‎plugwise/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""Plugwise module."""
22

3-
__version__ = "0.16.6a0"
3+
__version__ = "0.16.6a1"
44

55
from plugwise.smile import Smile
66
from plugwise.stick import Stick

‎tests/test_smile.py‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ def _write_json(self, call, data):
5151
fixture_file.write(
5252
json.dumps(
5353
data,
54+
indent=2,
5455
default=lambda x: list(x) if isinstance(x, set) else x,
5556
)
5657
)
@@ -1202,7 +1203,7 @@ async def test_connect_adam_plus_anna(self):
12021203
"b128b4bbbd1f47e9bf4d756e8fb5ee94": {
12031204
"hw": "AME Smile 2.0 board",
12041205
"mac_address": "012345670001",
1205-
"zigbee_mac_address": "012345670101",
1206+
"zigbee_mac_address": "ABCD012345670101",
12061207
"sensors": {
12071208
"outdoor_temperature": 11.9,
12081209
},
@@ -1505,7 +1506,7 @@ async def test_connect_adam_zone_per_device(self):
15051506
"binary_sensors": {"plugwise_notification": True},
15061507
"sensors": {"outdoor_temperature": 7.69},
15071508
"mac_address": "012345670001",
1508-
"zigbee_mac_address": "012345670101",
1509+
"zigbee_mac_address": "ABCD012345670101",
15091510
},
15101511
# Modem
15111512
"675416a629f343c495449970e2ca37b5": {
@@ -1745,7 +1746,7 @@ async def test_connect_adam_multiple_devices_per_zone(self):
17451746
"electricity_produced_interval": 0.0,
17461747
},
17471748
"switches": {"relay": True, "lock": True},
1748-
"zigbee_mac_address": "012345670A14",
1749+
"zigbee_mac_address": "ABCD012345670A14",
17491750
},
17501751
"4a810418d5394b3f82727340b91ba740": {
17511752
"class": "router",
@@ -2268,7 +2269,7 @@ async def test_connect_stretch_v31(self):
22682269
"model": "Stretch",
22692270
"name": "Stretch",
22702271
"vendor": "Plugwise B.V.",
2271-
"zigbee_mac_address": "012345670101",
2272+
"zigbee_mac_address": "ABCD012345670101",
22722273
},
22732274
"5871317346d045bc9f6b987ef25ee638": {
22742275
"class": "water_heater_vessel",
@@ -2413,7 +2414,7 @@ async def test_connect_stretch_v23(self):
24132414
"name": "Stretch",
24142415
"vendor": "Plugwise B.V.",
24152416
"mac_address": "01:23:45:67:89:AB",
2416-
"zigbee_mac_address": "012345670101",
2417+
"zigbee_mac_address": "ABCD012345670101",
24172418
},
24182419
"09c8ce93d7064fa6a233c0e4c2449bfe": {
24192420
"class": "lamp",
@@ -2428,7 +2429,7 @@ async def test_connect_stretch_v23(self):
24282429
"electricity_produced": 0.0,
24292430
},
24302431
"switches": {"relay": False, "lock": False},
2431-
"zigbee_mac_address": "012345670A01",
2432+
"zigbee_mac_address": "ABCD012345670A01",
24322433
},
24332434
"33a1c784a9ff4c2d8766a0212714be09": {
24342435
"class": "lighting",

‎userdata/README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,11 @@ See 'pre-commit.sh' for details
6464

6565
We used to obfuscate them as they weren't used within our module nor HomeAssistant.
6666
With 0.16.4 this was changed as such we recommend leaving them in, if you do wish to obfuscate
67+
Note: Zigbee mac addresses are 64bit (not 48bit like Ethernet mac addresses)
6768

6869
Prefix:
6970

70-
- `01234567`
71+
- `ABCD01234567`
7172

7273
Postfix:
7374

‎userdata/adam_heatpump/domain_objects.xml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
</services>
147147
<protocols>
148148
<zig_bee_node id='138298657dbd44ca9b8393b6a3cd86a8'>
149-
<mac_address>012345670A01</mac_address>
149+
<mac_address>ABCD012345670A01</mac_address>
150150
<type>router</type>
151151
<reachable>true</reachable>
152152
<power_source>mains</power_source>
@@ -386,7 +386,7 @@
386386
</services>
387387
<protocols>
388388
<zig_bee_node id='9a0d6157588a43c9ae492a362cb71168'>
389-
<mac_address>012345670A02</mac_address>
389+
<mac_address>ABCD012345670A02</mac_address>
390390
<type>end_device</type>
391391
<reachable>true</reachable>
392392
<power_source>battery</power_source>
@@ -729,7 +729,7 @@
729729
</services>
730730
<protocols>
731731
<zig_bee_node id='33e54459fdd54c22b3b99ae70a94d1c5'>
732-
<mac_address>012345670A03</mac_address>
732+
<mac_address>ABCD012345670A03</mac_address>
733733
<type>router</type>
734734
<reachable>true</reachable>
735735
<power_source>mains</power_source>
@@ -931,7 +931,7 @@
931931
</services>
932932
<protocols>
933933
<zig_bee_node id='4ac495040ae2462d832b15d00b245c0b'>
934-
<mac_address>012345670A04</mac_address>
934+
<mac_address>ABCD012345670A04</mac_address>
935935
<type>router</type>
936936
<reachable>true</reachable>
937937
<power_source>mains</power_source>
@@ -1266,7 +1266,7 @@
12661266
</services>
12671267
<protocols>
12681268
<zig_bee_node id='8dbb5981239a41d1b7c39c6a85276c61'>
1269-
<mac_address>012345670A05</mac_address>
1269+
<mac_address>ABCD012345670A05</mac_address>
12701270
<type>router</type>
12711271
<reachable>true</reachable>
12721272
<power_source>mains</power_source>
@@ -1347,7 +1347,7 @@
13471347
</services>
13481348
<protocols>
13491349
<zig_bee_node id='a64db02a2fa243e0a9c00126ad1b1f7e'>
1350-
<mac_address>012345670A06</mac_address>
1350+
<mac_address>ABCD012345670A06</mac_address>
13511351
<type>router</type>
13521352
<reachable>true</reachable>
13531353
<power_source>mains</power_source>
@@ -1378,7 +1378,7 @@
13781378
</services>
13791379
<protocols>
13801380
<zig_bee_node id='972269fa494440d393dbdb8e5b0643b7'>
1381-
<mac_address>012345670A07</mac_address>
1381+
<mac_address>ABCD012345670A07</mac_address>
13821382
<type>router</type>
13831383
<reachable>true</reachable>
13841384
<power_source>mains</power_source>
@@ -2347,7 +2347,7 @@
23472347
</services>
23482348
<protocols>
23492349
<zig_bee_node id='ede18329ad24437d8d37222733789c7c'>
2350-
<mac_address>012345670A08</mac_address>
2350+
<mac_address>ABCD012345670A08</mac_address>
23512351
<type>router</type>
23522352
<reachable>true</reachable>
23532353
<power_source>mains</power_source>
@@ -3355,7 +3355,7 @@
33553355
</services>
33563356
<protocols>
33573357
<zig_bee_node id='b1d09b4fa20c4f1a98278709b3363eea'>
3358-
<mac_address>012345670A09</mac_address>
3358+
<mac_address>ABCD012345670A09</mac_address>
33593359
<type>router</type>
33603360
<reachable>true</reachable>
33613361
<power_source>mains</power_source>
@@ -3386,7 +3386,7 @@
33863386
</services>
33873387
<protocols>
33883388
<zig_bee_node id='5cf439ab62eb48c3977ca41ac1d986ee'>
3389-
<mac_address>012345670A10</mac_address>
3389+
<mac_address>ABCD012345670A10</mac_address>
33903390
<type>router</type>
33913391
<reachable>true</reachable>
33923392
<power_source>mains</power_source>
@@ -3567,7 +3567,7 @@
35673567
</services>
35683568
<protocols>
35693569
<zig_bee_node id='91af9b4eb6b247909afab2b09cca821a'>
3570-
<mac_address>012345670A11</mac_address>
3570+
<mac_address>ABCD012345670A11</mac_address>
35713571
<type>router</type>
35723572
<reachable>true</reachable>
35733573
<power_source>mains</power_source>
@@ -3598,7 +3598,7 @@
35983598
</services>
35993599
<protocols>
36003600
<zig_bee_node id='59277b278b4c48a3889cd70378299ebb'>
3601-
<mac_address>012345670A12</mac_address>
3601+
<mac_address>ABCD012345670A12</mac_address>
36023602
<type>router</type>
36033603
<reachable>true</reachable>
36043604
<power_source>mains</power_source>
@@ -3629,7 +3629,7 @@
36293629
</services>
36303630
<protocols>
36313631
<zig_bee_node id='08ceb19506ee4546998f62381e867a8e'>
3632-
<mac_address>012345670A13</mac_address>
3632+
<mac_address>ABCD012345670A13</mac_address>
36333633
<type>router</type>
36343634
<reachable>true</reachable>
36353635
<power_source>mains</power_source>
@@ -3660,7 +3660,7 @@
36603660
</services>
36613661
<protocols>
36623662
<zig_bee_node id='954e187dd4924e6a92a109f41d844712'>
3663-
<mac_address>012345670A14</mac_address>
3663+
<mac_address>ABCD012345670A14</mac_address>
36643664
<type>router</type>
36653665
<reachable>true</reachable>
36663666
<power_source>mains</power_source>
@@ -3691,7 +3691,7 @@
36913691
</services>
36923692
<protocols>
36933693
<zig_bee_node id='e116d86377504e69bc8efb73988f11f8'>
3694-
<mac_address>012345670A15</mac_address>
3694+
<mac_address>ABCD012345670A15</mac_address>
36953695
<type>router</type>
36963696
<reachable>true</reachable>
36973697
<power_source>mains</power_source>
@@ -3805,7 +3805,7 @@
38053805
</services>
38063806
<protocols>
38073807
<zig_bee_node id='8f06059e0cdc44038e9201fd8bfbea97'>
3808-
<mac_address>012345670A16</mac_address>
3808+
<mac_address>ABCD012345670A16</mac_address>
38093809
<type>router</type>
38103810
<reachable>true</reachable>
38113811
<power_source>mains</power_source>
@@ -3881,7 +3881,7 @@
38813881
</services>
38823882
<protocols>
38833883
<zig_bee_node id='96ce5e59e0474853bda4ee2794ed0da0'>
3884-
<mac_address>012345670A17</mac_address>
3884+
<mac_address>ABCD012345670A17</mac_address>
38853885
<type>end_device</type>
38863886
<reachable>true</reachable>
38873887
<power_source>battery</power_source>
@@ -3912,7 +3912,7 @@
39123912
</services>
39133913
<protocols>
39143914
<zig_bee_node id='29f51d5cde66420facb975744d59f09c'>
3915-
<mac_address>012345670A18</mac_address>
3915+
<mac_address>ABCD012345670A18</mac_address>
39163916
<type>router</type>
39173917
<reachable>true</reachable>
39183918
<power_source>mains</power_source>
@@ -3932,7 +3932,7 @@
39323932
<services/>
39333933
<protocols>
39343934
<zig_bee_coordinator id='d55765aedfdf47baa1e3cc6d2b2d6000'>
3935-
<mac_address>012345670101</mac_address>
3935+
<mac_address>ABCD012345670101</mac_address>
39363936
<permit_joining>false</permit_joining>
39373937
<neighbors><zig_bee_node id='4ac495040ae2462d832b15d00b245c0b'/><zig_bee_node id='8dbb5981239a41d1b7c39c6a85276c61'/><zig_bee_node id='91af9b4eb6b247909afab2b09cca821a'/><zig_bee_node id='972269fa494440d393dbdb8e5b0643b7'/><zig_bee_node id='c2f3ab78380a4ff3a1fbdd7638a67099'/><zig_bee_node id='ede18329ad24437d8d37222733789c7c'/></neighbors>
39383938
<zig_bee_nodes><zig_bee_node id='08ceb19506ee4546998f62381e867a8e'/><zig_bee_node id='0a85fd64b82246fbaac0a5c6e77ae958'/><zig_bee_node id='138298657dbd44ca9b8393b6a3cd86a8'/><zig_bee_node id='29f51d5cde66420facb975744d59f09c'/><zig_bee_node id='33e54459fdd54c22b3b99ae70a94d1c5'/><zig_bee_node id='4ac495040ae2462d832b15d00b245c0b'/><zig_bee_node id='59277b278b4c48a3889cd70378299ebb'/><zig_bee_node id='5cf439ab62eb48c3977ca41ac1d986ee'/><zig_bee_node id='8dbb5981239a41d1b7c39c6a85276c61'/><zig_bee_node id='8f06059e0cdc44038e9201fd8bfbea97'/><zig_bee_node id='91af9b4eb6b247909afab2b09cca821a'/><zig_bee_node id='954e187dd4924e6a92a109f41d844712'/><zig_bee_node id='96ce5e59e0474853bda4ee2794ed0da0'/><zig_bee_node id='972269fa494440d393dbdb8e5b0643b7'/><zig_bee_node id='9a0d6157588a43c9ae492a362cb71168'/><zig_bee_node id='a64db02a2fa243e0a9c00126ad1b1f7e'/><zig_bee_node id='b1d09b4fa20c4f1a98278709b3363eea'/><zig_bee_node id='c2f3ab78380a4ff3a1fbdd7638a67099'/><zig_bee_node id='e116d86377504e69bc8efb73988f11f8'/><zig_bee_node id='ede18329ad24437d8d37222733789c7c'/></zig_bee_nodes>
@@ -4108,7 +4108,7 @@
41084108
</services>
41094109
<protocols>
41104110
<zig_bee_node id='0a85fd64b82246fbaac0a5c6e77ae958'>
4111-
<mac_address>012345670A19</mac_address>
4111+
<mac_address>ABCD012345670A19</mac_address>
41124112
<type>router</type>
41134113
<reachable>false</reachable>
41144114
<power_source>mains</power_source>
@@ -4139,7 +4139,7 @@
41394139
</services>
41404140
<protocols>
41414141
<zig_bee_node id='c2f3ab78380a4ff3a1fbdd7638a67099'>
4142-
<mac_address>012345670A20</mac_address>
4142+
<mac_address>ABCD012345670A20</mac_address>
41434143
<type>router</type>
41444144
<reachable>true</reachable>
41454145
<power_source>mains</power_source>

0 commit comments

Comments
 (0)