Fix entity-items counting

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Ongoing
 
 - Test/validate for Python 3.14
+- Fix entity_item counting, refresh/complete test-data-json files via [#794](https://github.com/plugwise/python-plugwise/pull/794)
 
 ## v1.7.8
 

plugwise/common.py

@@ -145,8 +145,8 @@ def _create_gw_entities(self, appl: Munch) -> None:
             "model": appl.model,
             "model_id": appl.model_id,
             "name": appl.name,
-            "zigbee_mac_address": appl.zigbee_mac,
             "vendor": appl.vendor_name,
+            "zigbee_mac_address": appl.zigbee_mac,
         }.items():
             if value is not None or key == "location":
                 appl_key = cast(ApplianceType, key)
@@ -205,7 +205,7 @@ def _get_group_switches(self) -> dict[str, GwEntityData]:
                     "members": members,
                     "vendor": "Plugwise",
                 }
-                self._count += 4
+                self._count += 5
 
         return switch_groups
 

plugwise/helper.py

@@ -721,7 +721,7 @@ def _scan_thermostats(self) -> None:
                     },
                     "vendor": "Plugwise",
                 }
-                self._count += 3
+                self._count += 5
 
     def _match_locations(self) -> dict[str, ThermoLoc]:
         """Helper-function for _scan_thermostats().

plugwise/legacy/data.py

@@ -84,6 +84,7 @@ def _climate_data(self, entity: GwEntityData, data: GwEntityData) -> None:
     def _get_anna_control_state(self, data: GwEntityData) -> None:
         """Set the thermostat control_state based on the opentherm/onoff device state."""
         data["control_state"] = "idle"
+        self._count += 1
         for entity in self.gw_entities.values():
             if entity["dev_class"] != "heater_central":
                 continue

tests/data/adam/adam_heatpump_cooling.json

@@ -296,6 +296,7 @@
       "model": "Gateway",
       "model_id": "smile_open_therm",
       "name": "Adam",
+      "notifications": {},
       "regulation_modes": [
         "heating",
         "off",

tests/data/adam/adam_jip.json

@@ -2,11 +2,14 @@
   "devices": {
     "06aecb3d00354375924f50c47af36bd2": {
       "active_preset": "no_frost",
+      "available_schedules": [],
       "climate_mode": "heat",
       "control_state": "idle",
       "dev_class": "climate",
+      "model": "ThermoZone",
       "name": "Slaapkamer",
       "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
+      "select_schedule": null,
       "sensors": {
         "temperature": 24.2
       },
@@ -19,15 +22,19 @@
       "thermostats": {
         "primary": ["1346fbd8498d4dbcab7e18d51b771f3d"],
         "secondary": ["356b65335e274d769c338223e7af9c33"]
-      }
+      },
+      "vendor": "Plugwise"
     },
     "13228dab8ce04617af318a2888b3c548": {
       "active_preset": "home",
+      "available_schedules": [],
       "climate_mode": "heat",
       "control_state": "idle",
       "dev_class": "climate",
+      "model": "ThermoZone",
       "name": "Woonkamer",
       "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
+      "select_schedule": null,
       "sensors": {
         "temperature": 27.4
       },
@@ -40,7 +47,8 @@
       "thermostats": {
         "primary": ["f61f1a2535f54f52ad006a3d18e459ca"],
         "secondary": ["833de10f269c4deab58fb9df69901b4e"]
-      }
+      },
+      "vendor": "Plugwise"
     },
     "1346fbd8498d4dbcab7e18d51b771f3d": {
       "available": true,
@@ -222,6 +230,7 @@
       "model": "Gateway",
       "model_id": "smile_open_therm",
       "name": "Adam",
+      "notifications": {},
       "regulation_modes": ["heating", "off", "bleeding_cold", "bleeding_hot"],
       "select_gateway_mode": "full",
       "select_regulation_mode": "heating",
@@ -233,11 +242,14 @@
     },
     "d27aede973b54be484f6842d1b2802ad": {
       "active_preset": "home",
+      "available_schedules": [],
       "climate_mode": "heat",
       "control_state": "idle",
       "dev_class": "climate",
+      "model": "ThermoZone",
       "name": "Kinderkamer",
       "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
+      "select_schedule": null,
       "sensors": {
         "temperature": 30.0
       },
@@ -250,7 +262,8 @@
       "thermostats": {
         "primary": ["6f3e9d7084214c21b9dfa46f6eeb8700"],
         "secondary": ["d4496250d0e942cfa7aea3476e9070d5"]
-      }
+      },
+      "vendor": "Plugwise"
     },
     "d4496250d0e942cfa7aea3476e9070d5": {
       "available": true,
@@ -278,11 +291,14 @@
     },
     "d58fec52899f4f1c92e4f8fad6d8c48c": {
       "active_preset": "home",
+      "available_schedules": [],
       "climate_mode": "heat",
       "control_state": "idle",
       "dev_class": "climate",
+      "model": "ThermoZone",
       "name": "Logeerkamer",
       "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
+      "select_schedule": null,
       "sensors": {
         "temperature": 30.0
       },
@@ -295,7 +311,8 @@
       "thermostats": {
         "primary": ["a6abc6a129ee499c88a4d420cc413b47"],
         "secondary": ["1da4d325838e4ad8aac12177214505c9"]
-      }
+      },
+      "vendor": "Plugwise"
     },
     "e4684553153b44afbef2200885f379dc": {
       "available": true,

tests/data/adam/adam_multiple_devices_per_zone.json

@@ -541,6 +541,19 @@
       "vendor": "Plugwise",
       "zigbee_mac_address": "ABCD012345670A11"
     },
+    "e8ef2a01ed3b4139a53bf749204fe6b4": {
+      "dev_class": "switching",
+      "members": [
+        "02cf28bfec924855854c544690a609ef",
+        "4a810418d5394b3f82727340b91ba740"
+      ],
+      "model": "Switchgroup",
+      "name": "Test",
+      "switches": {
+        "relay": true
+      },
+      "vendor": "Plugwise"
+    },
     "f1fee6043d3642a9b0a65297455f008e": {
       "available": true,
       "binary_sensors": {
@@ -567,19 +580,6 @@
       "vendor": "Plugwise",
       "zigbee_mac_address": "ABCD012345670A08"
     },
-    "e8ef2a01ed3b4139a53bf749204fe6b4": {
-      "dev_class": "switching",
-      "members": [
-        "02cf28bfec924855854c544690a609ef",
-        "4a810418d5394b3f82727340b91ba740"
-      ],
-      "model": "Switchgroup",
-      "name": "Test",
-      "switches": {
-        "relay": true
-      },
-      "vendor": "Plugwise"
-    },
     "fe799307f1624099878210aa0b9f1475": {
       "binary_sensors": {
         "plugwise_notification": true
@@ -592,6 +592,11 @@
       "model": "Gateway",
       "model_id": "smile_open_therm",
       "name": "Adam",
+      "notifications": {
+        "af82e4ccf9c548528166d38e560662a4": {
+          "warning": "Node Plug (with MAC address 000D6F000D13CB01, in room 'n.a.') has been unreachable since 23:03 2020-01-18. Please check the connection and restart the device."
+        }
+      },
       "sensors": {
         "outdoor_temperature": 7.81
       },

tests/data/adam/adam_onoff_cooling_fake_firmware.json

@@ -50,6 +50,7 @@
       "model": "Gateway",
       "model_id": "smile_open_therm",
       "name": "Adam",
+      "notifications": {},
       "regulation_modes": [
         "heating",
         "off",
@@ -88,6 +89,7 @@
       "climate_mode": "auto",
       "control_state": "idle",
       "dev_class": "climate",
+      "model": "ThermoZone",
       "name": "Woonkamer",
       "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
       "select_schedule": "Werkdag schema",
@@ -105,7 +107,8 @@
       "thermostats": {
         "primary": ["ca79d23ae0094120b877558734cff85c"],
         "secondary": []
-      }
+      },
+      "vendor": "Plugwise"
     }
   }
 }

tests/data/adam/adam_plus_anna.json

@@ -85,6 +85,11 @@
       "model": "Gateway",
       "model_id": "smile_open_therm",
       "name": "Adam",
+      "notifications": {
+        "6fb89e35caeb4b1cb275184895202d84": {
+          "error": "There is no OpenTherm communication with the boiler."
+        }
+      },
       "sensors": {
         "outdoor_temperature": 11.9
       },

tests/data/adam/adam_plus_anna_new.json

@@ -169,6 +169,7 @@
       "model": "Gateway",
       "model_id": "smile_open_therm",
       "name": "Adam",
+      "notifications": {},
       "regulation_modes": ["bleeding_hot", "bleeding_cold", "off", "heating"],
       "select_gateway_mode": "full",
       "select_regulation_mode": "heating",
@@ -214,7 +215,8 @@
       "name": "Test",
       "switches": {
         "relay": true
-      }
+      },
+      "vendor": "Plugwise"
     },
     "f2bf9048bef64cc5b6d5110154e33c81": {
       "active_preset": "home",
@@ -228,6 +230,7 @@
       "climate_mode": "auto",
       "control_state": "heating",
       "dev_class": "climate",
+      "model": "ThermoZone",
       "name": "Living room",
       "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
       "select_schedule": "Weekschema",
@@ -245,7 +248,8 @@
       "thermostats": {
         "primary": ["ad4838d7d35c4d6ea796ee12ae5aedf8"],
         "secondary": []
-      }
+      },
+      "vendor": "Plugwise"
     },
     "f871b8c4d63549319221e294e4f88074": {
       "active_preset": "home",
@@ -259,6 +263,7 @@
       "climate_mode": "auto",
       "control_state": "preheating",
       "dev_class": "climate",
+      "model": "ThermoZone",
       "name": "Bathroom",
       "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
       "select_schedule": "Badkamer",
@@ -276,7 +281,8 @@
       "thermostats": {
         "primary": ["e2f4322d57924fa090fbbc48b3a140dc"],
         "secondary": ["1772a4ea304041adb83f357b751341ff"]
-      }
+      },
+      "vendor": "Plugwise"
     }
   }
 }

tests/data/adam/adam_plus_anna_new_regulation_off.json

@@ -169,6 +169,7 @@
       "model": "Gateway",
       "model_id": "smile_open_therm",
       "name": "Adam",
+      "notifications": {},
       "regulation_modes": ["bleeding_hot", "bleeding_cold", "off", "heating"],
       "select_gateway_mode": "full",
       "select_regulation_mode": "off",
@@ -214,7 +215,8 @@
       "name": "Test",
       "switches": {
         "relay": true
-      }
+      },
+      "vendor": "Plugwise"
     },
     "f2bf9048bef64cc5b6d5110154e33c81": {
       "active_preset": "home",
@@ -228,6 +230,7 @@
       "climate_mode": "off",
       "control_state": "idle",
       "dev_class": "climate",
+      "model": "ThermoZone",
       "name": "Living room",
       "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
       "select_schedule": "off",
@@ -245,7 +248,8 @@
       "thermostats": {
         "primary": ["ad4838d7d35c4d6ea796ee12ae5aedf8"],
         "secondary": []
-      }
+      },
+      "vendor": "Plugwise"
     },
     "f871b8c4d63549319221e294e4f88074": {
       "active_preset": "home",
@@ -259,6 +263,7 @@
       "climate_mode": "off",
       "control_state": "idle",
       "dev_class": "climate",
+      "model": "ThermoZone",
       "name": "Bathroom",
       "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
       "select_schedule": "off",
@@ -276,7 +281,8 @@
       "thermostats": {
         "primary": ["e2f4322d57924fa090fbbc48b3a140dc"],
         "secondary": ["1772a4ea304041adb83f357b751341ff"]
-      }
+      },
+      "vendor": "Plugwise"
     }
   }
 }

tests/data/adam/adam_zone_per_device.json

@@ -576,6 +576,11 @@
       "model": "Gateway",
       "model_id": "smile_open_therm",
       "name": "Adam",
+      "notifications": {
+        "af82e4ccf9c548528166d38e560662a4": {
+          "warning": "Node Plug (with MAC address 000D6F000D13CB01, in room 'n.a.') has been unreachable since 23:03 2020-01-18. Please check the connection and restart the device."
+        }
+      },
       "sensors": {
         "outdoor_temperature": 7.69
       },

tests/data/anna/anna_elga_2.json

@@ -77,6 +77,7 @@
       "model": "Gateway",
       "model_id": "smile_thermo",
       "name": "Smile Anna",
+      "notifications": {},
       "sensors": {
         "outdoor_temperature": 6.38
       },

tests/data/anna/anna_elga_2_cooling.json

@@ -83,6 +83,7 @@
       "model": "Gateway",
       "model_id": "smile_thermo",
       "name": "Smile Anna",
+      "notifications": {},
       "sensors": {
         "outdoor_temperature": 31.0
       },

tests/data/anna/anna_elga_2_schedule_off.json

@@ -83,6 +83,7 @@
       "model": "Gateway",
       "model_id": "smile_thermo",
       "name": "Smile Anna",
+      "notifications": {},
       "sensors": {
         "outdoor_temperature": 13.0
       },

tests/data/anna/anna_elga_no_cooling.json

@@ -12,6 +12,7 @@
       "model": "Gateway",
       "model_id": "smile_thermo",
       "name": "Smile Anna",
+      "notifications": {},
       "sensors": {
         "outdoor_temperature": 20.2
       },