Better names, better comments.

bellows/zigbee/application.py

@@ -31,7 +31,7 @@
 import bellows.multicast
 import bellows.types as t
 from bellows.zigbee import repairs
-from bellows.zigbee.device import EZSPEndpoint, EZSPTestEndpoint
+from bellows.zigbee.device import EZSPComplexEndpoint, EZSPSimpleEndpoint
 import bellows.zigbee.util as util
 
 APS_ACK_TIMEOUT = 120
@@ -215,13 +215,16 @@ async def start_network(self):
         )
         self.devices[self.state.node_info.ieee] = ezsp_device
 
-        # The coordinator device does not respond to attribute reads
+        # The coordinator device does not respond to attribute reads, so we
+        # have to divine the internal NCP state. If endpoints were explicitly
+        # given, create complex endpoints from the ZDO descriptors, otherwise
+        # assume a single endpoint at index 1
         if len(self._created_device_endpoints) > 0:
             for zdo_desc in self._created_device_endpoints:
-                ep = EZSPEndpoint(ezsp_device, zdo_desc)
+                ep = EZSPComplexEndpoint(ezsp_device, zdo_desc)
                 ezsp_device.endpoints[zdo_desc.endpoint] = ep
         else:
-            ezsp_device.endpoints[1] = EZSPTestEndpoint(ezsp_device, 1)
+            ezsp_device.endpoints[1] = EZSPSimpleEndpoint(ezsp_device, 1)
 
         ezsp_device.model = ezsp_device.endpoints[1].model
         ezsp_device.manufacturer = ezsp_device.endpoints[1].manufacturer

bellows/zigbee/device.py

@@ -20,7 +20,7 @@
 LOGGER = logging.getLogger(__name__)
 
 
-class BaseEZSPEndpoint(zigpy.endpoint.Endpoint):
+class EZSPSimpleEndpoint(zigpy.endpoint.Endpoint):
     @property
     def manufacturer(self) -> str:
         """Manufacturer."""
@@ -59,7 +59,7 @@ async def remove_from_group(self, grp_id: int) -> t.EmberStatus:
         return status
 
 
-class EZSPEndpoint(BaseEZSPEndpoint):
+class EZSPComplexEndpoint(EZSPSimpleEndpoint):
     def __init__(self, device, descriptor: zdo_t.SimpleDescriptor) -> None:
         self._desc = descriptor
         super().__init__(device, descriptor.endpoint)
@@ -90,7 +90,3 @@ async def initialize(self) -> None:
                 self.add_output_cluster(cluster)
 
         self.status = zigpy.endpoint.Status.ENDPOINT_INACTIVE
-
-
-class EZSPTestEndpoint(BaseEZSPEndpoint):
-    pass

tests/test_application.py

@@ -1208,7 +1208,7 @@ async def test_shutdown(app):
 @pytest.fixture
 def coordinator(app, ieee):
     dev = zigpy.device.Device(app, ieee, 0x0000)
-    dev.endpoints[1] = bellows.zigbee.device.EZSPTestEndpoint(dev, 1)
+    dev.endpoints[1] = bellows.zigbee.device.EZSPSimpleEndpoint(dev, 1)
     dev.model = dev.endpoints[1].model
     dev.manufacturer = dev.endpoints[1].manufacturer