bacnet updates

Author: gtfierro

buildingmotif/ingresses/bacnet.py

@@ -79,15 +79,45 @@ async def _collect_objects(
     ):
         device_kwargs.setdefault("poll", 0)
 
+        logger.error(f"starting with {ip=} {ping=}")
         async with BAC0.start(ip=ip, ping=ping) as bacnet:
+            await asyncio.sleep(2)
             await bacnet._discover(**discover_kwargs)
+            await asyncio.sleep(2)
 
             discovered = getattr(bacnet, "discoveredDevices", None)
             if not discovered:
                 warnings.warn("BACnet ingress could not find any BACnet devices")
                 return
 
-            for (address, device_id) in discovered:
+            discovered_entries: List[Tuple[Any, Any, Dict[str, Any]]] = []
+            if isinstance(discovered, dict):
+                for info in discovered.values():
+                    address = info.get("address")
+                    obj_instance = info.get("object_instance")
+                    device_id = None
+                    if isinstance(obj_instance, tuple) and len(obj_instance) >= 2:
+                        device_id = obj_instance[1]
+                    else:
+                        device_id = info.get("device_id")
+
+                    if address is None or device_id is None:
+                        logger.warning(
+                            "Skipping discovered device with missing address/device_id: %s",
+                            info,
+                        )
+                        continue
+
+                    if hasattr(address, "addr"):
+                        address = address.addr
+                    address = str(address)
+                    discovered_entries.append((address, device_id, info))
+
+            if not discovered_entries:
+                warnings.warn("BACnet ingress could not find any BACnet devices")
+                return
+
+            for (address, device_id, _) in discovered_entries:
                 device = await BAC0.device(address, device_id, bacnet, **device_kwargs)
                 objects: List[Dict[str, Any]] = []
 

tests/integration/fixtures/bacnet/BACpypes.ini

@@ -1,6 +1,6 @@
 [BACpypes]
 objectName: VirtualBACnet
-#address: 172.17.0.1/24
+#address: 172.17.0.30/32
 objectIdentifier: 599
 maxApduLengthAccepted: 1024
 segmentationSupported: segmentedBoth

tests/integration/fixtures/bacnet/docker-compose.yml

@@ -5,15 +5,15 @@ services:
       dockerfile: Dockerfile
     networks:
       bacnet:
-        ipv4_address: 172.24.0.3
+        ipv4_address: 172.24.0.30
     command: "python3 virtual_bacnet.py"
   buildingmotif:
     build:
       context: ../../../../
       dockerfile: tests/integration/fixtures/buildingmotif/Dockerfile
     networks:
       bacnet:
-        ipv4_address: 172.24.0.2
+        ipv4_address: 172.24.0.20
 networks:
   bacnet:
     ipam:

tests/integration/test_bacnet_ingress.py

@@ -13,7 +13,7 @@
 def test_bacnet_ingress(bm):
     BLDG = Namespace("urn:building/")
     m = Model.create(BLDG, "test building for bacnet scan")
-    bacnet = BACnetNetwork("172.24.0.2/24")
+    bacnet = BACnetNetwork("172.24.0.20/16")
     tobrick = BACnetToBrickIngress(bm, bacnet)
     m.add_graph(tobrick.graph(BLDG))
 
@@ -35,7 +35,7 @@ def test_bacnet_scan_cli(bm, tmp_path):
     d.mkdir()
     output_file = d / "output.json"
     subprocess.run(
-        shlex.split(f'buildingmotif scan -o "{str(output_file)}" -ip 172.24.0.2/24')
+        shlex.split(f'buildingmotif scan -o "{str(output_file)}" -ip 172.24.0.20/16')
     )
     assert output_file.exists()
     bacnet = BACnetNetwork.load(output_file)