Extend feature: extent/improve Plugwise groups

CHANGELOG.md

@@ -4,13 +4,14 @@ Versions from 0.40 and up
 
 ## Ongoing
 
+- Extended feature: extent/improve Plugwise groups, via PR[#976](https://github.com/plugwise/plugwise-beta/pull/976) and plugwise [v1.11.0](https://github.com/plugwise/python-plugwise/releases/tag/v1.11.0)
 - DeviceInfo: show configuration_url on gateway only, via PR [#975](https://github.com/plugwise/plugwise-beta/pull/975)
 
 ## v0.61.0
 
 - Final revisit of diagnostics category assignments as accepted in Core Plugwise, via PR [#965](https://github.com/plugwise/plugwise-beta/pull/965)
 - Revisit diagnostics category assignments based on [#810](https://github.com/plugwise/python-plugwise/issues/810) via PR [#952](https://github.com/plugwise/plugwise-beta/pull/952)
-- New feature: implement setting Adam zone profile via PR [#958](https://github.com/plugwise/plugwise-beta/pull/958)
+- New feature: implement setting Adam zone profile via PR [#958](https://github.com/plugwise/plugwise-beta/pull/958) and plugwise [v1.10.0](https://github.com/plugwise/python-plugwise/releases/tag/v1.10.0)
 - Implement translation for added homeassistantError raise message via PR [#948](https://github.com/plugwise/plugwise-beta/pull/948)
 - Line up strings with Core Plugwise strings via PR [#954](https://github.com/plugwise/plugwise-beta/pull/954)
 

custom_components/plugwise/manifest.json

@@ -7,7 +7,7 @@
   "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["plugwise"],
-  "requirements": ["plugwise==1.10.0"],
+  "requirements": ["plugwise==1.11.0"],
   "version": "0.61.0",
   "zeroconf": ["_plugwise._tcp.local."]
 }

tests/components/plugwise/fixtures/adam_plus_anna_new/data.json

@@ -181,6 +181,21 @@
     },
     "vendor": "Plugwise"
   },
+  "c9293d1d68ee48fc8843c6f0dee2b6be": {
+    "dev_class": "pumping",
+    "members": [
+      "854f8a9b0e7e425db97f1f110e1ce4b3",
+      "ad4838d7d35c4d6ea796ee12ae5aedf8"
+    ],
+    "model": "Group",
+    "name": "Vloerverwarming",
+    "sensors": {
+      "electricity_consumed": 45.0,
+      "electricity_produced": 0.0,
+      "temperature": 20.1
+    },
+    "vendor": "Plugwise"
+  },
   "da224107914542988a88561b4452b0f6": {
     "binary_sensors": {
       "plugwise_notification": false
@@ -257,8 +272,12 @@
       "2568cc4b9c1e401495d4741a5f89bee1",
       "29542b2b6a6a4169acecc15c72a599b8"
     ],
-    "model": "Switchgroup",
+    "model": "Group",
     "name": "Test",
+    "sensors": {
+      "electricity_consumed": 16.5,
+      "electricity_produced": 0.0
+    },
     "switches": {
       "relay": true
     },

tests/components/plugwise/fixtures/m_adam_cooling/data.json

@@ -91,6 +91,21 @@
     },
     "vendor": "Plugwise"
   },
+  "c9293d1d68ee48fc8843c6f0dee2b6be": {
+    "dev_class": "pumping",
+    "members": [
+      "854f8a9b0e7e425db97f1f110e1ce4b3",
+      "ad4838d7d35c4d6ea796ee12ae5aedf8"
+    ],
+    "model": "Group",
+    "name": "Vloerverwarming",
+    "sensors": {
+      "electricity_consumed": 45.0,
+      "electricity_produced": 0.0,
+      "temperature": 20.1
+    },
+    "vendor": "Plugwise"
+  },
   "da224107914542988a88561b4452b0f6": {
     "binary_sensors": {
       "plugwise_notification": false
@@ -173,8 +188,12 @@
       "2568cc4b9c1e401495d4741a5f89bee1",
       "29542b2b6a6a4169acecc15c72a599b8"
     ],
-    "model": "Switchgroup",
+    "model": "Group",
     "name": "Test",
+    "sensors": {
+      "electricity_consumed": 16.5,
+      "electricity_produced": 0.0
+    },
     "switches": {
       "relay": true
     },

tests/components/plugwise/fixtures/m_adam_heating/data.json

@@ -96,6 +96,21 @@
     },
     "vendor": "Plugwise"
   },
+  "c9293d1d68ee48fc8843c6f0dee2b6be": {
+    "dev_class": "pumping",
+    "members": [
+      "854f8a9b0e7e425db97f1f110e1ce4b3",
+      "ad4838d7d35c4d6ea796ee12ae5aedf8"
+    ],
+    "model": "Group",
+    "name": "Vloerverwarming",
+    "sensors": {
+      "electricity_consumed": 45.0,
+      "electricity_produced": 0.0,
+      "temperature": 20.1
+    },
+    "vendor": "Plugwise"
+  },
   "da224107914542988a88561b4452b0f6": {
     "binary_sensors": {
       "plugwise_notification": false
@@ -172,8 +187,12 @@
       "2568cc4b9c1e401495d4741a5f89bee1",
       "29542b2b6a6a4169acecc15c72a599b8"
     ],
-    "model": "Switchgroup",
+    "model": "Group",
     "name": "Test",
+    "sensors": {
+      "electricity_consumed": 16.5,
+      "electricity_produced": 0.0
+    },
     "switches": {
       "relay": true
     },

tests/components/plugwise/fixtures/m_adam_multiple_devices_per_zone/data.json

@@ -505,6 +505,20 @@
     "vendor": "Plugwise",
     "zigbee_mac_address": "ABCD012345670A06"
   },
+  "e117db6848394c8cb70d9c28e63d92d2": {
+    "dev_class": "pumping",
+    "members": [
+      "78d1126fc4c743db81b61c20e88342a7",
+      "b59bcebaf94b499ea7d46e4a66fb62d8"
+    ],
+    "model": "Group",
+    "name": "Vloerverwarming Woonkamer",
+    "sensors": {
+      "electricity_consumed": 35.6,
+      "temperature": 20.9
+    },
+    "vendor": "Plugwise"
+  },
   "e7693eb9582644e5b865dba8d4447cf1": {
     "available": true,
     "binary_sensors": {
@@ -539,8 +553,12 @@
       "02cf28bfec924855854c544690a609ef",
       "4a810418d5394b3f82727340b91ba740"
     ],
-    "model": "Switchgroup",
+    "model": "Group",
     "name": "Test",
+    "sensors": {
+      "electricity_consumed": 14.8,
+      "electricity_produced": 0.0
+    },
     "switches": {
       "relay": true
     },

tests/components/plugwise/fixtures/stretch_v31/data.json

@@ -91,7 +91,7 @@
       "059e4d03c7a34d278add5c7a4a781d19",
       "cfe95cf3de1948c0b8955125bf754614"
     ],
-    "model": "Switchgroup",
+    "model": "Group",
     "name": "Schakel",
     "switches": {
       "relay": true
@@ -107,7 +107,7 @@
       "cfe95cf3de1948c0b8955125bf754614",
       "e1c884e7dede431dadee09506ec4f859"
     ],
-    "model": "Switchgroup",
+    "model": "Group",
     "name": "Stroomvreters",
     "switches": {
       "relay": true

tests/components/plugwise/snapshots/test_diagnostics.ambr

@@ -554,6 +554,20 @@
       'vendor': 'Plugwise',
       'zigbee_mac_address': 'ABCD012345670A06',
     }),
+    'e117db6848394c8cb70d9c28e63d92d2': dict({
+      'dev_class': 'pumping',
+      'members': list([
+        '78d1126fc4c743db81b61c20e88342a7',
+        'b59bcebaf94b499ea7d46e4a66fb62d8',
+      ]),
+      'model': 'Group',
+      'name': 'Vloerverwarming Woonkamer',
+      'sensors': dict({
+        'electricity_consumed': 35.6,
+        'temperature': 20.9,
+      }),
+      'vendor': 'Plugwise',
+    }),
     'e7693eb9582644e5b865dba8d4447cf1': dict({
       'available': True,
       'binary_sensors': dict({
@@ -588,8 +602,12 @@
         '02cf28bfec924855854c544690a609ef',
         '4a810418d5394b3f82727340b91ba740',
       ]),
-      'model': 'Switchgroup',
+      'model': 'Group',
       'name': 'Test',
+      'sensors': dict({
+        'electricity_consumed': 14.8,
+        'electricity_produced': 0.0,
+      }),
       'switches': dict({
         'relay': True,
       }),