@@ -200,6 +200,7 @@ def _map_info(self, device_info: dict) -> dict:
             "mac": basic_info["mac"],
             "hwId": basic_info.get("hw_id"),
             "oem_id": basic_info["oem_id"],
+            "device_id": basic_info["dev_id"],
         }
 
     @property
 
@@ -55,6 +55,11 @@ def _get_subclasses(of_class):
 )
 
 
+async def test_device_id(dev: Device):
+    """Test all devices have a device id."""
+    assert dev.device_id
+
+
 async def test_alias(dev):
     test_alias = "TEST1234"
     original = dev.alias
Original file line number	Diff line number	Diff line change
@@ -200,6 +200,7 @@ def _map_info(self, device_info: dict) -> dict:
200	200	"mac": basic_info["mac"],
201	201	"hwId": basic_info.get("hw_id"),
202	202	"oem_id": basic_info["oem_id"],
	203	+ "device_id": basic_info["dev_id"],
203	204	}
204	205
205	206	@property