From 474e8b7a439e262a2b668f8260ec89159f05fd5c Mon Sep 17 00:00:00 2001
From: Duco Sebel <74970928+DCSBL@users.noreply.github.com>
Date: Fri, 19 Jul 2024 08:22:06 +0200
Subject: [PATCH] Implement model_id in HomeWizard (#122130)

* Add model_id and use hardcoded model names for HomeWizard

* Update names
---
 homeassistant/components/homewizard/entity.py |  17 +-
 .../homewizard/snapshots/test_button.ambr     |   4 +-
 .../homewizard/snapshots/test_number.ambr     |   8 +-
 .../homewizard/snapshots/test_sensor.ambr     | 832 +++++++++---------
 .../homewizard/snapshots/test_switch.ambr     |  44 +-
 5 files changed, 459 insertions(+), 446 deletions(-)

diff --git a/homeassistant/components/homewizard/entity.py b/homeassistant/components/homewizard/entity.py
index 9ba54c8218c..51559984fea 100644
--- a/homeassistant/components/homewizard/entity.py
+++ b/homeassistant/components/homewizard/entity.py
@@ -2,13 +2,23 @@
 
 from __future__ import annotations
 
-from homeassistant.const import ATTR_CONNECTIONS, ATTR_IDENTIFIERS
+from homeassistant.const import ATTR_CONNECTIONS, ATTR_IDENTIFIERS, ATTR_MODEL
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
 from .coordinator import HWEnergyDeviceUpdateCoordinator
 
+TYPE_MODEL_MAP = {
+    "HWE-P1": "Wi-Fi P1 Meter",
+    "HWE-SKT": "Wi-Fi Energy Socket",
+    "HWE-WTR": "Wi-Fi Water Meter",
+    "HWE-KWH1": "Wi-Fi kWh Meter",
+    "HWE-KWH3": "Wi-Fi kWh Meter",
+    "SDM230-wifi": "Wi-Fi kWh Meter",
+    "SDM630-wifi": "Wi-Fi kWh Meter",
+}
+
 
 class HomeWizardEntity(CoordinatorEntity[HWEnergyDeviceUpdateCoordinator]):
     """Defines a HomeWizard entity."""
@@ -21,9 +31,12 @@ class HomeWizardEntity(CoordinatorEntity[HWEnergyDeviceUpdateCoordinator]):
         self._attr_device_info = DeviceInfo(
             manufacturer="HomeWizard",
             sw_version=coordinator.data.device.firmware_version,
-            model=coordinator.data.device.product_type,
+            model_id=coordinator.data.device.product_type,
         )
 
+        if product_type := coordinator.data.device.product_type:
+            self._attr_device_info[ATTR_MODEL] = TYPE_MODEL_MAP.get(product_type)
+
         if (serial_number := coordinator.data.device.serial) is not None:
             self._attr_device_info[ATTR_CONNECTIONS] = {
                 (CONNECTION_NETWORK_MAC, serial_number)
diff --git a/tests/components/homewizard/snapshots/test_button.ambr b/tests/components/homewizard/snapshots/test_button.ambr
index a4b52902af5..d5ad9770478 100644
--- a/tests/components/homewizard/snapshots/test_button.ambr
+++ b/tests/components/homewizard/snapshots/test_button.ambr
@@ -71,8 +71,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
diff --git a/tests/components/homewizard/snapshots/test_number.ambr b/tests/components/homewizard/snapshots/test_number.ambr
index 05b8382166b..768255c7508 100644
--- a/tests/components/homewizard/snapshots/test_number.ambr
+++ b/tests/components/homewizard/snapshots/test_number.ambr
@@ -80,8 +80,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-SKT',
-    'model_id': None,
+    'model': 'Wi-Fi Energy Socket',
+    'model_id': 'HWE-SKT',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -172,8 +172,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-SKT',
-    'model_id': None,
+    'model': 'Wi-Fi Energy Socket',
+    'model_id': 'HWE-SKT',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
diff --git a/tests/components/homewizard/snapshots/test_sensor.ambr b/tests/components/homewizard/snapshots/test_sensor.ambr
index 93bab64bb3a..6750da5bb8b 100644
--- a/tests/components/homewizard/snapshots/test_sensor.ambr
+++ b/tests/components/homewizard/snapshots/test_sensor.ambr
@@ -57,8 +57,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH1',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -144,8 +144,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH1',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -231,8 +231,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH1',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -318,8 +318,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH1',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -405,8 +405,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH1',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -492,8 +492,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH1',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -582,8 +582,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH1',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -669,8 +669,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH1',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -756,8 +756,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH1',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -843,8 +843,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH1',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -925,8 +925,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH1',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -1011,8 +1011,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH3',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH3',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -1098,8 +1098,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH3',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH3',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -1185,8 +1185,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH3',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH3',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -1272,8 +1272,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH3',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH3',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -1359,8 +1359,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH3',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH3',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -1446,8 +1446,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH3',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH3',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -1533,8 +1533,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH3',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH3',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -1620,8 +1620,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH3',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH3',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -1707,8 +1707,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH3',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH3',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -1794,8 +1794,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH3',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH3',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -1881,8 +1881,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH3',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH3',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -1968,8 +1968,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH3',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH3',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -2058,8 +2058,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH3',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH3',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -2145,8 +2145,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH3',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH3',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -2232,8 +2232,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH3',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH3',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -2319,8 +2319,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH3',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH3',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -2409,8 +2409,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH3',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH3',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -2499,8 +2499,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH3',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH3',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -2589,8 +2589,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH3',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH3',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -2676,8 +2676,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH3',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH3',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -2763,8 +2763,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH3',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH3',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -2850,8 +2850,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH3',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH3',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -2937,8 +2937,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH3',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH3',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -3024,8 +3024,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH3',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH3',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -3111,8 +3111,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH3',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH3',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -3198,8 +3198,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH3',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH3',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -3280,8 +3280,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH3',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH3',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -3366,8 +3366,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -3450,8 +3450,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -3537,8 +3537,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -3624,8 +3624,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -3711,8 +3711,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -3793,8 +3793,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -3880,8 +3880,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -3967,8 +3967,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -4054,8 +4054,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -4141,8 +4141,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -4228,8 +4228,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -4315,8 +4315,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -4402,8 +4402,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -4489,8 +4489,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -4576,8 +4576,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -4663,8 +4663,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -4750,8 +4750,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -4832,8 +4832,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -4916,8 +4916,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -5006,8 +5006,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -5088,8 +5088,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -5178,8 +5178,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -5268,8 +5268,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -5358,8 +5358,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -5440,8 +5440,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -5522,8 +5522,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -5618,8 +5618,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -5705,8 +5705,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -5792,8 +5792,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -5879,8 +5879,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -5966,8 +5966,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -6048,8 +6048,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -6130,8 +6130,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -6212,8 +6212,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -6294,8 +6294,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -6376,8 +6376,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -6458,8 +6458,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -6544,8 +6544,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -6626,8 +6626,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -7126,8 +7126,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -7210,8 +7210,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -7297,8 +7297,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -7384,8 +7384,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -7471,8 +7471,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -7553,8 +7553,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -7640,8 +7640,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -7727,8 +7727,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -7814,8 +7814,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -7901,8 +7901,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -7988,8 +7988,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -8075,8 +8075,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -8162,8 +8162,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -8249,8 +8249,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -8336,8 +8336,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -8423,8 +8423,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -8510,8 +8510,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -8592,8 +8592,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -8676,8 +8676,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -8766,8 +8766,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -8848,8 +8848,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -8938,8 +8938,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -9028,8 +9028,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -9118,8 +9118,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -9200,8 +9200,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -9282,8 +9282,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -9378,8 +9378,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -9465,8 +9465,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -9552,8 +9552,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -9639,8 +9639,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -9726,8 +9726,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -9808,8 +9808,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -9890,8 +9890,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -9972,8 +9972,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -10054,8 +10054,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -10136,8 +10136,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -10218,8 +10218,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -10304,8 +10304,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -10386,8 +10386,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -10886,8 +10886,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -10970,8 +10970,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -11057,8 +11057,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -11144,8 +11144,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -11231,8 +11231,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -11318,8 +11318,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -11405,8 +11405,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -11492,8 +11492,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -11579,8 +11579,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -11666,8 +11666,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -11753,8 +11753,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -11840,8 +11840,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -11927,8 +11927,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -12014,8 +12014,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -12101,8 +12101,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -12188,8 +12188,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -12270,8 +12270,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -12360,8 +12360,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -12442,8 +12442,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -12532,8 +12532,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -12622,8 +12622,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -12712,8 +12712,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -12799,8 +12799,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -12886,8 +12886,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -12973,8 +12973,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -13060,8 +13060,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -13142,8 +13142,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -13224,8 +13224,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -13306,8 +13306,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -13388,8 +13388,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -13470,8 +13470,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -13552,8 +13552,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-P1',
-    'model_id': None,
+    'model': 'Wi-Fi P1 Meter',
+    'model_id': 'HWE-P1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -13638,8 +13638,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-SKT',
-    'model_id': None,
+    'model': 'Wi-Fi Energy Socket',
+    'model_id': 'HWE-SKT',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -13725,8 +13725,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-SKT',
-    'model_id': None,
+    'model': 'Wi-Fi Energy Socket',
+    'model_id': 'HWE-SKT',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -13812,8 +13812,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-SKT',
-    'model_id': None,
+    'model': 'Wi-Fi Energy Socket',
+    'model_id': 'HWE-SKT',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -13902,8 +13902,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-SKT',
-    'model_id': None,
+    'model': 'Wi-Fi Energy Socket',
+    'model_id': 'HWE-SKT',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -13992,8 +13992,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-SKT',
-    'model_id': None,
+    'model': 'Wi-Fi Energy Socket',
+    'model_id': 'HWE-SKT',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -14074,8 +14074,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-SKT',
-    'model_id': None,
+    'model': 'Wi-Fi Energy Socket',
+    'model_id': 'HWE-SKT',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -14160,8 +14160,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-SKT',
-    'model_id': None,
+    'model': 'Wi-Fi Energy Socket',
+    'model_id': 'HWE-SKT',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -14247,8 +14247,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-SKT',
-    'model_id': None,
+    'model': 'Wi-Fi Energy Socket',
+    'model_id': 'HWE-SKT',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -14334,8 +14334,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-SKT',
-    'model_id': None,
+    'model': 'Wi-Fi Energy Socket',
+    'model_id': 'HWE-SKT',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -14421,8 +14421,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-SKT',
-    'model_id': None,
+    'model': 'Wi-Fi Energy Socket',
+    'model_id': 'HWE-SKT',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -14508,8 +14508,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-SKT',
-    'model_id': None,
+    'model': 'Wi-Fi Energy Socket',
+    'model_id': 'HWE-SKT',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -14595,8 +14595,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-SKT',
-    'model_id': None,
+    'model': 'Wi-Fi Energy Socket',
+    'model_id': 'HWE-SKT',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -14685,8 +14685,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-SKT',
-    'model_id': None,
+    'model': 'Wi-Fi Energy Socket',
+    'model_id': 'HWE-SKT',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -14772,8 +14772,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-SKT',
-    'model_id': None,
+    'model': 'Wi-Fi Energy Socket',
+    'model_id': 'HWE-SKT',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -14862,8 +14862,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-SKT',
-    'model_id': None,
+    'model': 'Wi-Fi Energy Socket',
+    'model_id': 'HWE-SKT',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -14949,8 +14949,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-SKT',
-    'model_id': None,
+    'model': 'Wi-Fi Energy Socket',
+    'model_id': 'HWE-SKT',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -15036,8 +15036,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-SKT',
-    'model_id': None,
+    'model': 'Wi-Fi Energy Socket',
+    'model_id': 'HWE-SKT',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -15118,8 +15118,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-SKT',
-    'model_id': None,
+    'model': 'Wi-Fi Energy Socket',
+    'model_id': 'HWE-SKT',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -15204,8 +15204,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-WTR',
-    'model_id': None,
+    'model': 'Wi-Fi Water Meter',
+    'model_id': 'HWE-WTR',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -15291,8 +15291,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-WTR',
-    'model_id': None,
+    'model': 'Wi-Fi Water Meter',
+    'model_id': 'HWE-WTR',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -15377,8 +15377,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-WTR',
-    'model_id': None,
+    'model': 'Wi-Fi Water Meter',
+    'model_id': 'HWE-WTR',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -15459,8 +15459,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-WTR',
-    'model_id': None,
+    'model': 'Wi-Fi Water Meter',
+    'model_id': 'HWE-WTR',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -15545,8 +15545,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM230-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM230-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -15632,8 +15632,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM230-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM230-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -15719,8 +15719,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM230-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM230-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -15806,8 +15806,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM230-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM230-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -15893,8 +15893,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM230-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM230-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -15980,8 +15980,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM230-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM230-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -16070,8 +16070,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM230-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM230-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -16157,8 +16157,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM230-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM230-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -16244,8 +16244,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM230-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM230-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -16331,8 +16331,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM230-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM230-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -16413,8 +16413,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM230-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM230-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -16499,8 +16499,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM630-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM630-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -16586,8 +16586,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM630-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM630-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -16673,8 +16673,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM630-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM630-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -16760,8 +16760,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM630-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM630-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -16847,8 +16847,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM630-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM630-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -16934,8 +16934,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM630-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM630-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -17021,8 +17021,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM630-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM630-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -17108,8 +17108,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM630-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM630-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -17195,8 +17195,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM630-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM630-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -17282,8 +17282,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM630-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM630-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -17369,8 +17369,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM630-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM630-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -17456,8 +17456,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM630-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM630-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -17546,8 +17546,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM630-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM630-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -17633,8 +17633,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM630-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM630-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -17720,8 +17720,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM630-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM630-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -17807,8 +17807,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM630-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM630-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -17897,8 +17897,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM630-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM630-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -17987,8 +17987,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM630-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM630-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -18077,8 +18077,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM630-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM630-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -18164,8 +18164,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM630-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM630-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -18251,8 +18251,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM630-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM630-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -18338,8 +18338,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM630-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM630-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -18425,8 +18425,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM630-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM630-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -18512,8 +18512,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM630-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM630-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -18599,8 +18599,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM630-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM630-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -18686,8 +18686,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM630-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM630-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -18768,8 +18768,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM630-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM630-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
diff --git a/tests/components/homewizard/snapshots/test_switch.ambr b/tests/components/homewizard/snapshots/test_switch.ambr
index b4a5b87f8d6..11dea4453b5 100644
--- a/tests/components/homewizard/snapshots/test_switch.ambr
+++ b/tests/components/homewizard/snapshots/test_switch.ambr
@@ -70,8 +70,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH1',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH1',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -152,8 +152,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-KWH3',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'HWE-KWH3',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -235,8 +235,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-SKT',
-    'model_id': None,
+    'model': 'Wi-Fi Energy Socket',
+    'model_id': 'HWE-SKT',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -317,8 +317,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-SKT',
-    'model_id': None,
+    'model': 'Wi-Fi Energy Socket',
+    'model_id': 'HWE-SKT',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -399,8 +399,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-SKT',
-    'model_id': None,
+    'model': 'Wi-Fi Energy Socket',
+    'model_id': 'HWE-SKT',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -482,8 +482,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-SKT',
-    'model_id': None,
+    'model': 'Wi-Fi Energy Socket',
+    'model_id': 'HWE-SKT',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -564,8 +564,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-SKT',
-    'model_id': None,
+    'model': 'Wi-Fi Energy Socket',
+    'model_id': 'HWE-SKT',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -646,8 +646,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-SKT',
-    'model_id': None,
+    'model': 'Wi-Fi Energy Socket',
+    'model_id': 'HWE-SKT',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -728,8 +728,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'HWE-WTR',
-    'model_id': None,
+    'model': 'Wi-Fi Water Meter',
+    'model_id': 'HWE-WTR',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -810,8 +810,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM230-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM230-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,
@@ -892,8 +892,8 @@
     'labels': set({
     }),
     'manufacturer': 'HomeWizard',
-    'model': 'SDM630-wifi',
-    'model_id': None,
+    'model': 'Wi-Fi kWh Meter',
+    'model_id': 'SDM630-wifi',
     'name': 'Device',
     'name_by_user': None,
     'primary_config_entry': <ANY>,