From dacc2b1ab0acadecbd5bac55c01f7b7e5a60bb4f Mon Sep 17 00:00:00 2001 From: Tom <CoMPaTech@users.noreply.github.com> Date: Thu, 17 Feb 2022 20:58:06 +0100 Subject: [PATCH] Plugwise update Zigbee addressing fixture data to 64bits (#66761) --- .../all_data.json | 18 +++++++++--------- .../fixtures/anna_heatpump/all_data.json | 2 +- .../fixtures/p1v3_full_option/all_data.json | 2 +- .../fixtures/stretch_v31/all_data.json | 12 ++++++------ tests/components/plugwise/test_diagnostics.py | 16 ++++++++-------- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/tests/components/plugwise/fixtures/adam_multiple_devices_per_zone/all_data.json b/tests/components/plugwise/fixtures/adam_multiple_devices_per_zone/all_data.json index 3dbe9f5d8a3..925571908c5 100644 --- a/tests/components/plugwise/fixtures/adam_multiple_devices_per_zone/all_data.json +++ b/tests/components/plugwise/fixtures/adam_multiple_devices_per_zone/all_data.json @@ -179,7 +179,7 @@ "model": "Adam", "name": "Adam", "vendor": "Plugwise B.V.", - "zigbee_mac_address": "012345670101", + "zigbee_mac_address": "ABCD012345670101", "binary_sensors": { "plugwise_notification": true }, @@ -216,7 +216,7 @@ "model": "Plug", "name": "Playstation Smart Plug", "vendor": "Plugwise", - "zigbee_mac_address": "012345670A12", + "zigbee_mac_address": "ABCD012345670A12", "sensors": { "electricity_consumed": 82.6, "electricity_consumed_interval": 8.6, @@ -237,7 +237,7 @@ "model": "Plug", "name": "CV Pomp", "vendor": "Plugwise", - "zigbee_mac_address": "012345670A05", + "zigbee_mac_address": "ABCD012345670A05", "sensors": { "electricity_consumed": 35.6, "electricity_consumed_interval": 7.37, @@ -277,7 +277,7 @@ "model": "Plug", "name": "NAS", "vendor": "Plugwise", - "zigbee_mac_address": "012345670A14", + "zigbee_mac_address": "ABCD012345670A14", "sensors": { "electricity_consumed": 16.5, "electricity_consumed_interval": 0.5, @@ -298,7 +298,7 @@ "model": "Plug", "name": "USG Smart Plug", "vendor": "Plugwise", - "zigbee_mac_address": "012345670A16", + "zigbee_mac_address": "ABCD012345670A16", "sensors": { "electricity_consumed": 8.5, "electricity_consumed_interval": 0.0, @@ -319,7 +319,7 @@ "model": "Plug", "name": "NVR", "vendor": "Plugwise", - "zigbee_mac_address": "012345670A15", + "zigbee_mac_address": "ABCD012345670A15", "sensors": { "electricity_consumed": 34.0, "electricity_consumed_interval": 9.15, @@ -340,7 +340,7 @@ "model": "Plug", "name": "Fibaro HC2", "vendor": "Plugwise", - "zigbee_mac_address": "012345670A13", + "zigbee_mac_address": "ABCD012345670A13", "sensors": { "electricity_consumed": 12.5, "electricity_consumed_interval": 3.8, @@ -499,7 +499,7 @@ "model": "Plug", "name": "Ziggo Modem", "vendor": "Plugwise", - "zigbee_mac_address": "012345670A01", + "zigbee_mac_address": "ABCD012345670A01", "sensors": { "electricity_consumed": 12.2, "electricity_consumed_interval": 2.97, @@ -573,4 +573,4 @@ } } } -] +] \ No newline at end of file diff --git a/tests/components/plugwise/fixtures/anna_heatpump/all_data.json b/tests/components/plugwise/fixtures/anna_heatpump/all_data.json index 49b02b87f50..9585c8630af 100644 --- a/tests/components/plugwise/fixtures/anna_heatpump/all_data.json +++ b/tests/components/plugwise/fixtures/anna_heatpump/all_data.json @@ -116,4 +116,4 @@ } } } -] +] \ No newline at end of file diff --git a/tests/components/plugwise/fixtures/p1v3_full_option/all_data.json b/tests/components/plugwise/fixtures/p1v3_full_option/all_data.json index a7ad6140fa7..e65c012da85 100644 --- a/tests/components/plugwise/fixtures/p1v3_full_option/all_data.json +++ b/tests/components/plugwise/fixtures/p1v3_full_option/all_data.json @@ -38,4 +38,4 @@ } } } -] +] \ No newline at end of file diff --git a/tests/components/plugwise/fixtures/stretch_v31/all_data.json b/tests/components/plugwise/fixtures/stretch_v31/all_data.json index b168923b8b2..494ff28b118 100644 --- a/tests/components/plugwise/fixtures/stretch_v31/all_data.json +++ b/tests/components/plugwise/fixtures/stretch_v31/all_data.json @@ -18,7 +18,7 @@ "vendor": "Plugwise B.V.", "model": "Stretch", "name": "Stretch", - "zigbee_mac_address": "012345670101" + "zigbee_mac_address": "ABCD012345670101" }, "5871317346d045bc9f6b987ef25ee638": { "class": "water_heater_vessel", @@ -29,7 +29,7 @@ "model": "Circle type F", "name": "Boiler (1EB31)", "vendor": "Plugwise", - "zigbee_mac_address": "012345670A07", + "zigbee_mac_address": "ABCD012345670A07", "sensors": { "electricity_consumed": 1.19, "electricity_consumed_interval": 0.0, @@ -68,7 +68,7 @@ "model": "Circle type F", "name": "Vaatwasser (2a1ab)", "vendor": "Plugwise", - "zigbee_mac_address": "012345670A02", + "zigbee_mac_address": "ABCD012345670A02", "sensors": { "electricity_consumed": 0.0, "electricity_consumed_interval": 0.71, @@ -88,7 +88,7 @@ "model": "Circle type F", "name": "Droger (52559)", "vendor": "Plugwise", - "zigbee_mac_address": "012345670A04", + "zigbee_mac_address": "ABCD012345670A04", "sensors": { "electricity_consumed": 0.0, "electricity_consumed_interval": 0.0, @@ -108,7 +108,7 @@ "model": "Circle type F", "name": "Wasmachine (52AC1)", "vendor": "Plugwise", - "zigbee_mac_address": "012345670A01", + "zigbee_mac_address": "ABCD012345670A01", "sensors": { "electricity_consumed": 0.0, "electricity_consumed_interval": 0.0, @@ -176,4 +176,4 @@ } } } -] +] \ No newline at end of file diff --git a/tests/components/plugwise/test_diagnostics.py b/tests/components/plugwise/test_diagnostics.py index 5fdef0112a1..6f4e7124d70 100644 --- a/tests/components/plugwise/test_diagnostics.py +++ b/tests/components/plugwise/test_diagnostics.py @@ -149,7 +149,7 @@ async def test_diagnostics( "model": "Adam", "name": "Adam", "vendor": "Plugwise B.V.", - "zigbee_mac_address": "012345670101", + "zigbee_mac_address": "ABCD012345670101", "binary_sensors": {"plugwise_notification": True}, "sensors": {"outdoor_temperature": 7.81}, }, @@ -182,7 +182,7 @@ async def test_diagnostics( "model": "Plug", "name": "Playstation Smart Plug", "vendor": "Plugwise", - "zigbee_mac_address": "012345670A12", + "zigbee_mac_address": "ABCD012345670A12", "sensors": { "electricity_consumed": 82.6, "electricity_consumed_interval": 8.6, @@ -200,7 +200,7 @@ async def test_diagnostics( "model": "Plug", "name": "CV Pomp", "vendor": "Plugwise", - "zigbee_mac_address": "012345670A05", + "zigbee_mac_address": "ABCD012345670A05", "sensors": { "electricity_consumed": 35.6, "electricity_consumed_interval": 7.37, @@ -238,7 +238,7 @@ async def test_diagnostics( "model": "Plug", "name": "NAS", "vendor": "Plugwise", - "zigbee_mac_address": "012345670A14", + "zigbee_mac_address": "ABCD012345670A14", "sensors": { "electricity_consumed": 16.5, "electricity_consumed_interval": 0.5, @@ -256,7 +256,7 @@ async def test_diagnostics( "model": "Plug", "name": "USG Smart Plug", "vendor": "Plugwise", - "zigbee_mac_address": "012345670A16", + "zigbee_mac_address": "ABCD012345670A16", "sensors": { "electricity_consumed": 8.5, "electricity_consumed_interval": 0.0, @@ -274,7 +274,7 @@ async def test_diagnostics( "model": "Plug", "name": "NVR", "vendor": "Plugwise", - "zigbee_mac_address": "012345670A15", + "zigbee_mac_address": "ABCD012345670A15", "sensors": { "electricity_consumed": 34.0, "electricity_consumed_interval": 9.15, @@ -292,7 +292,7 @@ async def test_diagnostics( "model": "Plug", "name": "Fibaro HC2", "vendor": "Plugwise", - "zigbee_mac_address": "012345670A13", + "zigbee_mac_address": "ABCD012345670A13", "sensors": { "electricity_consumed": 12.5, "electricity_consumed_interval": 3.8, @@ -398,7 +398,7 @@ async def test_diagnostics( "model": "Plug", "name": "Ziggo Modem", "vendor": "Plugwise", - "zigbee_mac_address": "012345670A01", + "zigbee_mac_address": "ABCD012345670A01", "sensors": { "electricity_consumed": 12.2, "electricity_consumed_interval": 2.97, -- GitLab