Merge pull request #134 from riley206-pnnl/develop

Added network discovery, and small fixes to reflect changes to the bacnet proxy.

Author: craigpnnl

requirements.txt

@@ -4,4 +4,4 @@ pydantic
 pydantic-settings
 loguru
 aiofiles
--e git+https://github.com/riley206-pnnl/bacnet-scan-tool.git@feature/bacnet-tests#egg=bacnet_scan_tool
+-e git+https://github.com/riley206-pnnl/bacnet-scan-tool.git@feature/bacnet-tests#egg=bacnet_scan_tool

volttron_installer/backend/endpoints.py

@@ -573,6 +573,23 @@ async def bacnet_scan_get_host_ip() -> dict:
         return data
     except ApiError as e:
         raise HTTPException(status_code=e.status_code, detail=e.detail)
+
+@bacnet_scan_tool_router.get("/discover_networks", response_model=dict)
+async def bacnet_discover_networks(verbose: bool = False) -> dict:
+    """Discover available networks for BACnet scanning using comprehensive network analysis."""
+    from .tool_proxy_factory import ApiError
+
+    url = get_api_url.get_api_url("/api/tool_proxy/bacnet_scan_tool/discover_networks")
+    try:
+        response = await ToolProxyFactory.request(
+            url,
+            "GET",
+            params={"verbose": verbose}
+        )
+        data = response.json()
+        return data
+    except ApiError as e:
+        raise HTTPException(status_code=e.status_code, detail=e.detail)
 
 @bacnet_scan_tool_router.post("/bacnet/scan_subnet", response_model=ScanResponse)
 async def bacnet_scan_subnet(network_str: str | None = None) -> dict[str, str]:

volttron_installer/backend/models.py

@@ -823,3 +823,4 @@ class BACnetReadObjectListRequest(BaseModel):
     device_object_identifier: str
     page: int | None = None
     page_size: int | None = None
+    force_fresh_read: bool = True

volttron_installer/models.py

@@ -96,6 +96,13 @@ class LocalIPModel(rx.Base):
     subnet_mask: str = ""
     cidr: str = ""
 
+class NetworkDiscoveryModel(rx.Base):
+    status: str = ""
+    networks: list[str] = []
+    summary: dict = {}
+    message: str = ""
+    error: str | None = None
+
 class BACnetPointTableFilter(rx.Base):
     volttron_point_name: str = ""
     units: str = ""

volttron_installer/pages/bacnet_scan.py

@@ -6,7 +6,7 @@
     PlatformDeploymentStatus, CreateAgentRequest, ToolRequest, ToolStatusResponse, \
     BACnetReadDeviceAllRequest, BACnetDevice, BACnetReadPropertyRequest, BACnetScanResults, \
     BACnetWritePropertyRequest, BACnetReadObjectListRequest
-from ..models import WindowsHostIPModel, LocalIPModel
+from ..models import WindowsHostIPModel, LocalIPModel, NetworkDiscoveryModel
 from rxconfig import config
 
 from bacnet_scan_tool.models import ScanResponse, ObjectListNamesResponse
@@ -216,6 +216,12 @@ async def get_bacnet_host_ip() -> WindowsHostIPModel:
     """Get Windows host IP address for WSL2 users."""
     return await proxy_request(f"{API_BASE_URL}{BACNET_SCAN_TOOL_PREFIX}/get_host_ip", "GET")
 
+@with_model(NetworkDiscoveryModel)
+async def discover_networks(verbose: bool = False) -> NetworkDiscoveryModel:
+    """Discover available networks for BACnet scanning using comprehensive network analysis."""
+    params = {"verbose": verbose}
+    return await proxy_request(f"{API_BASE_URL}{BACNET_SCAN_TOOL_PREFIX}/discover_networks", "GET", params=params)
+
 async def get_tool_proxy(tool_name: str, path: str, **kwargs) -> httpx.Response:
     return await proxy_request(f"{API_BASE_URL}{TOOL_PROXY_PREFIX}/{tool_name}/{path}", "GET", **kwargs)