More legacy fixes

Author: bouwew

plugwise/__init__.py

@@ -304,7 +304,7 @@ async def full_update_device(self) -> None:
 
     def get_all_device_zones(self) -> None:
         """Helper-function used for testing."""
-        self._smile_api.get_all_devices()
+        self._smile_api.get_all_device_zones()
 
     async def async_update(self) -> PlugwiseData:
         """Perform an incremental update for updating the various device states."""

plugwise/legacy/smile.py

@@ -91,8 +91,8 @@ async def full_update_device(self) -> None:
         if self.smile_type != "power":
             self._appliances = await self.request(APPLIANCES)
 
-    def get_all_devices(self) -> None:
-        """Determine the evices present from the obtained XML-data.
+    def get_all_device_zones(self) -> None:
+        """Determine the devices present from the obtained XML-data.
 
         Run this functions once to gather the initial device configuration,
         then regularly run async_update() to refresh the device data.
@@ -121,7 +121,7 @@ async def async_update(self) -> PlugwiseData:
             self.gw_data: GatewayData = {}
             self.gw_device_zones: dict[str, DeviceZoneData] = {}
             await self.full_update_device()
-            self.get_all_devices()
+            self.get_all_device_zones()
         # Otherwise perform an incremental update
         else:
             self._domain_objects = await self.request(DOMAIN_OBJECTS)

tests/data/stretch/stretch_v31_UPDATED_DATA.json

@@ -1,44 +1,46 @@
 {
-  "aac7b735042c4832ac9ff33aae4f453b": {
-    "sensors": {
-      "electricity_consumed": 1000.0,
-      "electricity_consumed_interval": 20.7,
-      "electricity_produced": 0.0
+  "device_zones": {
+    "aac7b735042c4832ac9ff33aae4f453b": {
+      "sensors": {
+        "electricity_consumed": 1000.0,
+        "electricity_consumed_interval": 20.7,
+        "electricity_produced": 0.0
+      },
+      "switches": {
+        "relay": true,
+        "lock": true
+      }
     },
-    "switches": {
-      "relay": true,
-      "lock": true
-    }
-  },
-  "cfe95cf3de1948c0b8955125bf754614": {
-    "sensors": {
-      "electricity_consumed": 0.0,
-      "electricity_consumed_interval": 0.0,
-      "electricity_produced": 0.0
+    "cfe95cf3de1948c0b8955125bf754614": {
+      "sensors": {
+        "electricity_consumed": 0.0,
+        "electricity_consumed_interval": 0.0,
+        "electricity_produced": 0.0
+      },
+      "switches": {
+        "relay": false,
+        "lock": false
+      }
     },
-    "switches": {
-      "relay": false,
-      "lock": false
-    }
-  },
-  "059e4d03c7a34d278add5c7a4a781d19": {
-    "sensors": {
-      "electricity_consumed": 0.0,
-      "electricity_consumed_interval": 0.0,
-      "electricity_produced": 0.0
+    "059e4d03c7a34d278add5c7a4a781d19": {
+      "sensors": {
+        "electricity_consumed": 0.0,
+        "electricity_consumed_interval": 0.0,
+        "electricity_produced": 0.0
+      },
+      "switches": {
+        "relay": false,
+        "lock": false
+      }
     },
-    "switches": {
-      "relay": false,
-      "lock": false
-    }
-  },
-  "d03738edfcc947f7b8f4573571d90d2d": {
-    "members": [
-      "059e4d03c7a34d278add5c7a4a781d19",
-      "cfe95cf3de1948c0b8955125bf754614"
-    ],
-    "switches": {
-      "relay": false
+    "d03738edfcc947f7b8f4573571d90d2d": {
+      "members": [
+        "059e4d03c7a34d278add5c7a4a781d19",
+        "cfe95cf3de1948c0b8955125bf754614"
+      ],
+      "switches": {
+        "relay": false
+      }
     }
   }
 }