Implement CR-suggestions

Author: bouwew

plugwise_usb/network/__init__.py

@@ -173,8 +173,11 @@ async def unregister_node(self, mac: str) -> None:
         node_to_remove = self._nodes[mac]
         try:
             await self._register.unregister_node(node_to_remove)
-        except (KeyError, NodeError) as exc:
-            raise MessageError("Mac not registered, already deleted?") from exc
+        except NodeError as exc:
+            # Preserve precise failure cause from registry/reset/remove.
+            raise MessageError(str(exc)) from exc
+        except KeyError as exc:
+            raise MessageError(f"Mac {mac} not registered, already deleted?") from exc
 
         await self._nodes[mac].unload()
         self._nodes.pop(mac)

plugwise_usb/nodes/node.py

@@ -33,7 +33,7 @@
 from ..exceptions import FeatureError, NodeError
 from ..helpers.util import version_to_model
 from ..messages.requests import NodeInfoRequest, NodePingRequest, NodeResetRequest
-from ..messages.responses import NodeInfoResponse, NodePingResponse
+from ..messages.responses import NodeInfoResponse, NodePingResponse, NodeResponseType
 from .helpers import raise_not_loaded
 from .helpers.cache import NodeCache
 from .helpers.firmware import FEATURE_SUPPORTED_AT_FIRMWARE, SupportedVersions
@@ -645,14 +645,17 @@ async def reset_node(self) -> None:
         """Reset node present in the current Plugwise network."""
         timeout = 4
         request = NodeResetRequest(
-            self._send, self._mac_in_bytes, self.node_type, timeout
+            self._send, self._mac_in_bytes, int(self.node_type), timeout
         )
         response = await request.send()
-        if response is None or response.ack_id != NodeType.NODE_RESET_ACK:
+        if response is None or getattr(response, "response_type", None) != NodeResponseType.NODE_RESET_ACK:
+            ack = getattr(response, "ack_id", None)
+            rtype = getattr(response, "response_type", None)
             _LOGGER.warning(
-                "Node %s reset response is None or wrong ack_id %s received",
+                "Node %s reset not acknowledged (ack_id=%s, response_type=%s)",
                 self._mac_in_str,
-                response.ack_id,
+                ack,
+                rtype,
             )
 
     async def unload(self) -> None: