trying different bacnet config

Author: gtfierro

buildingmotif/bin/cli.py

@@ -156,10 +156,17 @@ def app():
 @subcommand(
     arg("-o", "--output_file", help="Output file for BACnet scan", required=True),
     arg("-ip", help="ip address of BACnet network to scan", default=None),
+    arg(
+        "--local-broadcast",
+        action="store_false",
+        dest="global_broadcast",
+        help="Limit discovery to local broadcast; defaults to global broadcast",
+        default=True,
+    ),
 )
 def scan(args):
     """Scans a BACnet network and generates a JSON file for later processing"""
-    bacnet_network = BACnetNetwork(args.ip)
+    bacnet_network = BACnetNetwork(args.ip, global_broadcast=args.global_broadcast)
     bacnet_network.dump(Path(args.output_file))
 
 

buildingmotif/ingresses/bacnet.py

@@ -28,6 +28,7 @@ def __init__(
         ip: Optional[str] = None,
         *,
         discover_kwargs: Optional[Dict[str, Any]] = None,
+        global_broadcast: bool = True,
         ping: bool = False,
         device_kwargs: Optional[Dict[str, Any]] = None,
     ):
@@ -39,16 +40,20 @@ def __init__(
         :type ip: Optional[str], optional
         :param discover_kwargs: Optional kwargs forwarded to BAC0._discover.
         :type discover_kwargs: Optional[Dict[str, Any]]
+        :param global_broadcast: Whether to issue global broadcast Who-Is requests.
+        :type global_broadcast: bool
         :param ping: Whether to ping devices during connect; defaults to False.
         :type ping: bool
         :param device_kwargs: Optional kwargs forwarded to BAC0.device.
         :type device_kwargs: Optional[Dict[str, Any]]
         """
         self.objects: Dict[Tuple[str, int], List[Dict[str, Any]]] = {}
+        discover_kwargs = dict(discover_kwargs or {})
+        discover_kwargs.setdefault("global_broadcast", global_broadcast)
         self._run_async(
             self._collect_objects(
                 ip=ip,
-                discover_kwargs=discover_kwargs or {},
+                discover_kwargs=discover_kwargs,
                 ping=ping,
                 device_kwargs=device_kwargs or {},
             )

docs/guides/docker-compose-bacnet.yml

@@ -12,4 +12,4 @@ networks:
       driver: default
       config:
         - subnet: "172.24.0.0/16"
-          gateway: "172.24.0.1"
+          gateway: "172.24.0.1"

tests/integration/fixtures/bacnet/virtual_bacnet.py

@@ -1,3 +1,4 @@
+import logging
 import random
 import sys
 
@@ -27,8 +28,33 @@ class VirtualDevice:
     def __init__(self, host: str = "0.0.0.0"):
         parser = ConfigArgumentParser(description=__doc__)
         args = parser.parse_args()
+        logging.basicConfig(level=logging.INFO)
+
+        _log.info("Starting Virtual BACnet device")
+        _log.debug("Parsed arguments: %s", args)
+        if not getattr(args, "ini", None):
+            raise ValueError("BACpypes configuration file (--ini) is required")
+        _log.info("Using configuration ini: %s", args.ini)
+
         self.device = LocalDeviceObject(ini=args.ini)
+        _log.info(
+            "Created LocalDeviceObject name=%s identifier=%s",
+            self.device.objectName,
+            getattr(self.device, "objectIdentifier", None),
+        )
         self.application = VirtualBACnetApp(self.device, host)
+        # ensure protocol services advertised match application capabilities
+        # try:
+        #    self.device.protocolServicesSupported = (
+        #        self.application.get_services_supported()
+        #    )
+        # except AttributeError:
+        #    _log.warning("Unable to set protocolServicesSupported on LocalDeviceObject")
+        # else:
+        #    _log.debug(
+        #        "protocolServicesSupported: %s",
+        #        self.device.protocolServicesSupported,
+        #    )
 
         # setup points
         self.points = {
@@ -54,9 +80,16 @@ def __init__(self, host: str = "0.0.0.0"):
             ),
         }
 
-        for p in self.points.values():
-            self.application.add_object(p)
+        for name, point in self.points.items():
+            self.application.add_object(point)
+            _log.info(
+                "Registered BACnet object %s identifier=%s value=%s",
+                name,
+                point.objectIdentifier,
+                getattr(point, "presentValue", None),
+            )
 
+        _log.info("Virtual device listening on host %s", host)
         run()
 
 

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/32")
+    bacnet = BACnetNetwork("172.24.0.2/24")
     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/32')
+        shlex.split(f'buildingmotif scan -o "{str(output_file)}" -ip 172.24.0.2/24')
     )
     assert output_file.exists()
     bacnet = BACnetNetwork.load(output_file)