Handle None node descriptor (#119)

Author: puddly

tests/test_application.py

@@ -404,15 +404,20 @@ async def _test_request(
     expect_reply=True,
     send_success=True,
     send_timeout=False,
-    is_end_device=None,
+    is_end_device=True,
+    node_desc=True,
     **kwargs
 ):
     seq = 123
     nwk = 0x2345
     ieee = t.EUI64(b"\x01\x02\x03\x04\x05\x06\x07\x08")
     dev = app.add_device(ieee, nwk)
-    dev.node_desc = mock.MagicMock()
-    dev.node_desc.is_end_device = is_end_device
+
+    if node_desc:
+        dev.node_desc = mock.MagicMock()
+        dev.node_desc.is_end_device = is_end_device
+    else:
+        dev.node_desc = None
 
     def _mock_command(
         cmdname, ieee, nwk, src_ep, dst_ep, cluster, profile, radius, options, data
@@ -445,6 +450,12 @@ async def test_request_with_reply(app):
     assert r[0] == 0
 
 
+@pytest.mark.asyncio
+async def test_request_without_node_desc(app):
+    r = await _test_request(app, expect_reply=True, send_success=True, node_desc=False)
+    assert r[0] == 0
+
+
 @pytest.mark.asyncio
 async def test_request_send_timeout(app):
     r = await _test_request(app, send_timeout=True)
@@ -466,8 +477,7 @@ async def test_request_extended_timeout(app):
     assert app._api._command.call_args[0][8] & 0x40 == 0x00
     app._api._command.reset_mock()
 
-    is_end_device = None
-    r = await _test_request(app, True, True, is_end_device=is_end_device)
+    r = await _test_request(app, True, True, node_desc=False)
     assert r[0] == xbee_t.TXStatus.SUCCESS
     assert app._api._command.call_count == 1
     assert app._api._command.call_args[0][8] & 0x40 == 0x40

zigpy_xbee/zigbee/application.py

@@ -222,7 +222,9 @@ async def request(
         LOGGER.debug("Zigbee request tsn #%s: %s", sequence, binascii.hexlify(data))
 
         tx_opts = 0x00
-        if expect_reply and device.node_desc.is_end_device in (True, None):
+        if expect_reply and (
+            device.node_desc is None or device.node_desc.is_end_device
+        ):
             tx_opts |= 0x40
         send_req = self._api.tx_explicit(
             device.ieee,