Use the DevicePairingStatus enum instead of the name (#27)

zigpy · Apr 1, 2024 · 8c3de51 · 8c3de51
1 parent cb510bc
commit 8c3de51
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/tests/test_gateway.py b/tests/test_gateway.py
@@ -18,6 +18,7 @@
 from tests.conftest import SIG_EP_INPUT, SIG_EP_OUTPUT, SIG_EP_PROFILE, SIG_EP_TYPE
 from zha.application import Platform
 from zha.application.gateway import (
+    DevicePairingStatus,
     Gateway,
     RawDeviceInitializedDeviceInfo,
     RawDeviceInitializedEvent,
@@ -534,7 +535,7 @@ def test_gateway_raw_device_initialized(
             device_info=RawDeviceInitializedDeviceInfo(
                 ieee=zigpy.types.EUI64.convert("00:0d:6f:00:0a:90:69:e7"),
                 nwk=0xB79C,
-                pairing_status="INTERVIEW_COMPLETE",
+                pairing_status=DevicePairingStatus.INTERVIEW_COMPLETE,
                 model="FakeModel",
                 manufacturer="FakeManufacturer",
                 signature={

diff --git a/zha/application/gateway.py b/zha/application/gateway.py
@@ -384,7 +384,7 @@ def device_joined(self, device: zigpy.device.Device) -> None:
                 device_info=DeviceJoinedDeviceInfo(
                     ieee=device.ieee,
                     nwk=device.nwk,
-                    pairing_status=DevicePairingStatus.PAIRED.name,
+                    pairing_status=DevicePairingStatus.PAIRED,
                 )
             ),
         )
@@ -398,7 +398,7 @@ def raw_device_initialized(self, device: zigpy.device.Device) -> None:  # pylint
                 device_info=RawDeviceInitializedDeviceInfo(
                     ieee=device.ieee,
                     nwk=device.nwk,
-                    pairing_status=DevicePairingStatus.INTERVIEW_COMPLETE.name,
+                    pairing_status=DevicePairingStatus.INTERVIEW_COMPLETE,
                     model=device.model if device.model else UNKNOWN_MODEL,
                     manufacturer=device.manufacturer
                     if device.manufacturer
@@ -584,7 +584,7 @@ async def async_device_initialized(self, device: zigpy.device.Device) -> None:
             await self._async_device_joined(zha_device)
 
         device_info = ExtendedDeviceInfoWithPairingStatus(
-            pairing_status=DevicePairingStatus.INITIALIZED.name,
+            pairing_status=DevicePairingStatus.INITIALIZED,
             **zha_device.extended_device_info.__dict__,
         )
         self.emit(
@@ -597,15 +597,15 @@ async def _async_device_joined(self, zha_device: Device) -> None:
         zha_device.on_network = True
         await zha_device.async_configure()
         device_info = ExtendedDeviceInfoWithPairingStatus(
-            pairing_status=DevicePairingStatus.CONFIGURED.name,
+            pairing_status=DevicePairingStatus.CONFIGURED,
             **zha_device.extended_device_info.__dict__,
         )
+        await zha_device.async_initialize(from_cache=False)
+        self.create_platform_entities()
         self.emit(
             ZHA_GW_MSG_DEVICE_FULL_INIT,
             DeviceFullInitEvent(device_info=device_info),
         )
-        await zha_device.async_initialize(from_cache=False)
-        self.create_platform_entities()
 
     async def _async_device_rejoined(self, zha_device: Device) -> None:
         _LOGGER.debug(
@@ -617,7 +617,7 @@ async def _async_device_rejoined(self, zha_device: Device) -> None:
         # but we don't have a way to tell currently
         await zha_device.async_configure()
         device_info = ExtendedDeviceInfoWithPairingStatus(
-            pairing_status=DevicePairingStatus.CONFIGURED.name,
+            pairing_status=DevicePairingStatus.CONFIGURED,
             **zha_device.extended_device_info.__dict__,
         )
         self.emit(