Test joins through a specific device and fix addressing bug

Author: puddly

.pre-commit-config.yaml

@@ -5,7 +5,7 @@ repos:
       - id: debug-statements
 
   - repo: https://github.com/psf/black
-    rev: 22.1.0
+    rev: 22.3.0
     hooks:
       - id: black
 

tests/application/test_joining.py

@@ -101,6 +101,41 @@ async def test_join_coordinator(device, make_application):
     await app.shutdown()
 
 
+@pytest.mark.parametrize("device", FORMED_DEVICES)
+async def test_join_device(device, make_application):
+    ieee = t.EUI64.convert("EC:1B:BD:FF:FE:54:4F:40")
+    nwk = 0x1234
+
+    app, znp_server = await make_application(server_cls=device)
+    device = app.add_initialized_device(ieee=ieee, nwk=nwk)
+
+    permit_join = znp_server.reply_once_to(
+        request=c.ZDO.MgmtPermitJoinReq.Req(
+            AddrMode=t.AddrMode.NWK, Dst=nwk, Duration=60, partial=True
+        ),
+        responses=[
+            c.ZDO.MgmtPermitJoinReq.Rsp(Status=t.Status.SUCCESS),
+            c.ZDO.MgmtPermitJoinRsp.Callback(Src=nwk, Status=t.ZDOStatus.SUCCESS),
+            c.ZDO.MsgCbIncoming.Callback(
+                Src=nwk,
+                IsBroadcast=t.Bool.false,
+                ClusterId=32822,
+                SecurityUse=0,
+                TSN=7,
+                MacDst=0x0000,
+                Data=b"\x00",
+            ),
+        ],
+    )
+
+    await app.startup(auto_form=False)
+    await app.permit(node=ieee)
+
+    await permit_join
+
+    await app.shutdown()
+
+
 @pytest.mark.parametrize("device", FORMED_ZSTACK3_DEVICES)
 @pytest.mark.parametrize("permit_result", [None, asyncio.TimeoutError()])
 async def test_permit_join_with_key(device, permit_result, make_application, mocker):

tests/conftest.py

@@ -1111,7 +1111,7 @@ def connection_made(self):
 class BaseLaunchpadCC26X2R1(BaseZStack3Device):
     version = 3.30
     align_structs = True
-    code_revision = 20200805
+    code_revision = 20220219
 
     def _create_network_nvram(self):
         super()._create_network_nvram()

zigpy_znp/types/commands.py

@@ -345,7 +345,7 @@ def __init__(self, *, partial=False, **params):
                     and not issubclass(param.type, enum.Enum),
 
                     isinstance(value, bytes)
-                    and issubclass(param.type, (t.ShortBytes, t.LongBytes)),
+                    and issubclass(param.type, (t.ShortBytes, t.LongBytes, t.Bytes)),
 
                     isinstance(value, list) and issubclass(param.type, list),
                     isinstance(value, bool) and issubclass(param.type, t.Bool),

zigpy_znp/zigbee/application.py

@@ -1236,6 +1236,13 @@ async def _send_request_raw(
             # addressing another device. The router will receive the ZDO request and a
             # device will try to join, but Z-Stack will never send the network key.
             if cluster == zdo_t.ZDOCmd.Mgmt_Permit_Joining_req:
+                if dst_addr.mode == t.AddrMode.Broadcast:
+                    # The coordinator responds to broadcasts
+                    permit_addr = 0x0000
+                else:
+                    # Otherwise, the destination device responds
+                    permit_addr = dst_addr.address
+
                 await self._znp.request_callback_rsp(
                     request=c.ZDO.MgmtPermitJoinReq.Req(
                         AddrMode=dst_addr.mode,
@@ -1244,7 +1251,9 @@ async def _send_request_raw(
                         TCSignificance=data[2],
                     ),
                     RspStatus=t.Status.SUCCESS,
-                    callback=c.ZDO.MgmtPermitJoinRsp.Callback(Src=0x0000, partial=True),
+                    callback=c.ZDO.MgmtPermitJoinRsp.Callback(
+                        Src=permit_addr, partial=True
+                    ),
                 )
             # Internally forward ZDO requests destined for the coordinator back to zigpy
             # so we can send internal Z-Stack requests when necessary