Refactor request() method. (#70)

* Refactor request() method.

Sync to zigpy API changes. Use device instance for destination
addressing in request method.

* Bump zigpy dependency.

Author: Adminiuga

setup.py

@@ -15,7 +15,7 @@
     packages=find_packages(exclude=['*.tests']),
     install_requires=[
         'pyserial-asyncio',
-        'zigpy-homeassistant>=0.9.a0',
+        'zigpy-homeassistant>=0.9.0a3',
     ],
     tests_require=[
         'pytest',

tests/test_application.py

@@ -190,7 +190,6 @@ async def test_permit(app, nwk):
 async def _test_request(app, send_success=True, aps_data_error=False,
                         **kwargs):
     seq = 123
-    nwk = 0x2345
 
     async def req_mock(req_id, dst_addr_ep, profile, cluster, src_ep, data):
         if aps_data_error:
@@ -201,12 +200,10 @@ async def req_mock(req_id, dst_addr_ep, profile, cluster, src_ep, data):
             app._pending[req_id].result.set_result(1)
 
     app._api.aps_data_request = mock.MagicMock(side_effect=req_mock)
-    app.get_device = mock.MagicMock(
-        return_value=zigpy.device.Device(app,
-                                         mock.sentinel.ieee,
-                                         nwk))
+    device = zigpy.device.Device(app, mock.sentinel.ieee, 0x1122)
+    app.get_device = mock.MagicMock(return_value=device)
 
-    return await app.request(nwk, 0x0260, 1, 2, 3, seq, b'\x01\x02\x03', **kwargs)
+    return await app.request(device, 0x0260, 1, 2, 3, seq, b'\x01\x02\x03', **kwargs)
 
 
 @pytest.mark.asyncio
@@ -216,6 +213,9 @@ async def test_request_send_success(app):
     r = await _test_request(app, True)
     assert r[0] == 0
 
+    r = await _test_request(app, True, use_ieee=True)
+    assert r[0] == 0
+
 
 @pytest.mark.asyncio
 async def test_request_send_fail(app):

zigpy_deconz/zigbee/application.py

@@ -84,15 +84,19 @@ async def form_network(self, channel=15, pan_id=None, extended_pan_id=None):
         raise Exception("Could not form network.")
 
     @zigpy.util.retryable_request
-    async def request(self, nwk, profile, cluster, src_ep, dst_ep, sequence, data,
-                      timeout=SEND_CONFIRM_TIMEOUT):
+    async def request(self, device, profile, cluster, src_ep, dst_ep, sequence, data,
+                      expect_reply=True, use_ieee=False):
         req_id = self.get_sequence()
         LOGGER.debug("Sending Zigbee request with tsn %s under %s request id, data: %s",
                      sequence, req_id, binascii.hexlify(data))
         dst_addr_ep = t.DeconzAddressEndpoint()
-        dst_addr_ep.address_mode = t.uint8_t(t.ADDRESS_MODE.NWK.value)
-        dst_addr_ep.address = t.uint16_t(nwk)
         dst_addr_ep.endpoint = t.uint8_t(dst_ep)
+        if use_ieee:
+            dst_addr_ep.address_mode = t.uint8_t(t.ADDRESS_MODE.IEEE)
+            dst_addr_ep.address = device.ieee
+        else:
+            dst_addr_ep.address_mode = t.uint8_t(t.ADDRESS_MODE.NWK)
+            dst_addr_ep.address = device.nwk
 
         with self._pending.new(req_id) as req:
             try:
@@ -107,7 +111,7 @@ async def request(self, nwk, profile, cluster, src_ep, dst_ep, sequence, data,
             except zigpy_deconz.exception.CommandError as ex:
                 return ex.status, "Couldn't enqueue send data request: {}".format(ex)
 
-            r = await asyncio.wait_for(req.result, timeout)
+            r = await asyncio.wait_for(req.result, SEND_CONFIRM_TIMEOUT)
 
             if r:
                 LOGGER.warning("Error while sending %s req id frame: 0x%02x", req_id, r)