♻️ remove 'data' requirement for leave command

- Update leave function to only require ieee parameter
- Update service.yaml to remove command_data field
- Update zdo.py to use ieee parameter for device lookup
- Update debug logging to reflect changes

Author: mdeweerd

custom_components/zha_toolkit/__init__.py

@@ -386,9 +386,6 @@
             vol.Required(ATTR_IEEE): vol.Any(
                 cv.entity_id_or_uuid, t.EUI64.convert
             ),
-            vol.Required(ATTR_COMMAND_DATA): vol.Any(
-                cv.entity_id_or_uuid, t.EUI64.convert
-            ),
         },
         extra=vol.ALLOW_EXTRA,
     ),

custom_components/zha_toolkit/services.yaml

@@ -1753,16 +1753,6 @@ leave:
       selector:
         entity:
           integration: zha
-    command_data:
-      name: Node to send the Rejoin
-      description: >-
-        (Parent) Node (router) that removes the device
-        of the node)
-      example: 00:0d:6f:00:05:7d:2d:34
-      required: true
-      selector:
-        entity:
-          integration: zha
     tries:
       name: Tries
       description: Number of times the zigbee packet should be attempted

custom_components/zha_toolkit/zdo.py

@@ -17,30 +17,29 @@ def add_task_info(event_data, task):
 
 
 async def leave(app, listener, ieee, cmd, data, service, params, event_data):
-    if ieee is None or not data:
-        raise ValueError("Need 'ieee' and command_data'")
+    if ieee is None:
+        raise ValueError("Need 'ieee'")
 
     LOGGER.debug(
-        "running 'leave' command. Telling 0x%s to remove %s: %s",
-        data,
+        "running 'leave' command. Telling 0x%s to leave %s",
         ieee,
         service,
     )
 
-    parent = await u.get_device(app, listener, data)
+    dev = await u.get_device(app, listener, ieee)
 
     # Get tries
     tries = params[p.TRIES]
 
     res = await u.retry_wrapper(
-        parent.zdo.request,
+        dev.zdo.request,
         zdo_t.ZDOCmd.Mgmt_Leave_req,
         ieee,
         0x02,
         tries=tries,
     )
     event_data["result_leave"] = res
-    LOGGER.debug("0x%04x: Mgmt_Leave_req: %s", parent.nwk, res)
+    LOGGER.debug("0x%04x: Mgmt_Leave_req: %s", dev.nwk, res)
 
 
 async def ieee_ping(