Update unregister_node functions

Author: bouwew

plugwise_usb/network/__init__.py

@@ -166,8 +166,12 @@ async def clear_cache(self) -> None:
 
     async def unregister_node(self, mac: str) -> None:
         """Unregister node from current Plugwise network."""
+        if not validate_mac(mac):
+            raise NodeError(f"MAC {mac} invalid")
+
+        node_to_remove = self._nodes[mac]
         try:
-            await self._register.unregister_node(mac)
+            await self._register.unregister_node(node_to_remove)
         except (KeyError, NodeError) as exc:
             raise MessageError("Mac not registered, already deleted?") from exc
 

plugwise_usb/network/registry.py

@@ -8,7 +8,7 @@
 import logging
 from typing import Final
 
-from ..api import NodeType
+from ..api import NodeType, PlugwiseNode
 from ..constants import UTF8
 from ..exceptions import CacheError, NodeError, StickError
 from ..helpers.util import validate_mac
@@ -266,27 +266,26 @@ async def register_node(self, mac: str) -> None:
         if self.update_network_registration(mac):
             await self._exec_node_discover_callback(mac, None, False)
 
-    async def unregister_node(self, mac: str) -> None:
+    async def unregister_node(self, node: PlugwiseNode) -> None:
         """Unregister node from current Plugwise network."""
-        if not validate_mac(mac):
-            raise NodeError(f"MAC {mac} invalid")
-
-        if mac not in self._registry:
-            raise NodeError(f"No existing Node ({mac}) found to unregister")
+        if node.mac not in self._registry:
+            raise NodeError(f"No existing Node ({node.mac}) found to unregister")
 
-        request = NodeRemoveRequest(self._send_to_controller, self._mac_nc, mac)
+        # First reset the node, then remove it from the network.
+        node.reset_node()
+        request = NodeRemoveRequest(self._send_to_controller, self._mac_nc, node.mac)
         if (response := await request.send()) is None:
             raise NodeError(
                 f"The Zigbee network coordinator '{self._mac_nc!r}'"
-                + f" did not respond to unregister node '{mac}'"
+                + f" did not respond to unregister node '{node.mac}'"
             )
         if response.status.value != 1:
             raise NodeError(
                 f"The Zigbee network coordinator '{self._mac_nc!r}'"
-                + f" failed to unregister node '{mac}'"
+                + f" failed to unregister node '{node.mac}'"
             )
 
-        await self.remove_network_registration(mac)
+        await self.remove_network_registration(node.mac)
 
     async def clear_register_cache(self) -> None:
         """Clear current cache."""