unifi-network-maps 1.4.13__tar.gz → 1.4.14__tar.gz

{unifi_network_maps-1.4.13 → unifi_network_maps-1.4.14}/CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.4.14] - 2026-02-01
+### Added
+- JSON output with VLAN inventory
+
+### Changed
+- Added log message when /tmp can't be resolved
+
 ## [1.4.13] - 2026-01-25
 ### Fixed
 - Path Traversal Vulnerability in File Operations
@@ -192,7 +199,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Introduced SVG renderer and tree layout fixes.
 - Increased test coverage and added coverage tooling.
 
-[Unreleased]: https://github.com/merlijntishauser/unifi-network-maps/compare/v1.4.13...HEAD
+[Unreleased]: https://github.com/merlijntishauser/unifi-network-maps/compare/v1.4.14...HEAD
+[1.4.14]:https://github.com/merlijntishauser/unifi-network-maps/compare/v1.4.11...v1.4.14
 [1.4.13]:https://github.com/merlijntishauser/unifi-network-maps/compare/v1.4.11...v1.4.13
 [1.4.12]:https://github.com/merlijntishauser/unifi-network-maps/compare/v1.4.11...v1.4.12
 [1.4.11]:https://github.com/merlijntishauser/unifi-network-maps/compare/v1.4.10...v1.4.11

{unifi_network_maps-1.4.13 → unifi_network_maps-1.4.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unifi-network-maps
-Version: 1.4.13
+Version: 1.4.14
 Summary: Dynamic UniFi -> network maps in mermaid or svg
 Author: Merlijn
 License-Expression: MIT
@@ -147,6 +147,12 @@ Legend only:
 unifi-network-maps --legend-only --stdout
 ```
 
+JSON payload (devices + clients + VLAN inventory):
+
+```bash
+unifi-network-maps --format json --output ./payload.json
+```
+
 ## Home Assistant integration
 
 The live Home Assistant integration (Config Flow + coordinator + custom card) lives in a separate repo:
@@ -238,7 +244,7 @@ SVG:
 - `--theme-file`: load a YAML theme for Mermaid + SVG colors (see `examples/theme.yaml` and `examples/theme-dark.yaml`).
 
 Output:
-- `--format mermaid|svg|svg-iso|lldp-md|mkdocs`: output format (default mermaid).
+- `--format mermaid|svg|svg-iso|lldp-md|mkdocs|json`: output format (default mermaid).
 - `--stdout`: write output to stdout.
 - `--markdown`: wrap Mermaid output in a code fence.
 - `--mkdocs-sidebar-legend`: write assets to place the compact legend in the MkDocs right sidebar.

{unifi_network_maps-1.4.13 → unifi_network_maps-1.4.14}/README.md

@@ -110,6 +110,12 @@ Legend only:
 unifi-network-maps --legend-only --stdout
 ```
 
+JSON payload (devices + clients + VLAN inventory):
+
+```bash
+unifi-network-maps --format json --output ./payload.json
+```
+
 ## Home Assistant integration
 
 The live Home Assistant integration (Config Flow + coordinator + custom card) lives in a separate repo:
@@ -201,7 +207,7 @@ SVG:
 - `--theme-file`: load a YAML theme for Mermaid + SVG colors (see `examples/theme.yaml` and `examples/theme-dark.yaml`).
 
 Output:
-- `--format mermaid|svg|svg-iso|lldp-md|mkdocs`: output format (default mermaid).
+- `--format mermaid|svg|svg-iso|lldp-md|mkdocs|json`: output format (default mermaid).
 - `--stdout`: write output to stdout.
 - `--markdown`: wrap Mermaid output in a code fence.
 - `--mkdocs-sidebar-legend`: write assets to place the compact legend in the MkDocs right sidebar.

{unifi_network_maps-1.4.13 → unifi_network_maps-1.4.14}/pyproject.toml

@@ -1,10 +1,10 @@
 [build-system]
-requires = ["setuptools==80.10.1", "wheel==0.46.3"]
+requires = ["setuptools==80.10.2", "wheel==0.46.3"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "unifi-network-maps"
-version = "1.4.13"
+version = "1.4.14"
 description = "Dynamic UniFi -> network maps in mermaid or svg"
 readme = "README.md"
 requires-python = ">=3.12"

unifi_network_maps-1.4.14/src/unifi_network_maps/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.4.14"

{unifi_network_maps-1.4.13 → unifi_network_maps-1.4.14}/src/unifi_network_maps/adapters/unifi.py

@@ -17,6 +17,7 @@ from pathlib import Path
 from typing import IO, TYPE_CHECKING
 
 from ..io.paths import resolve_cache_dir
+from ..model.vlans import build_vlan_info, normalize_networks
 from .config import Config
 
 if TYPE_CHECKING:
@@ -170,6 +171,19 @@ def _serialize_devices_for_cache(devices: Sequence[object]) -> list[dict[str, ob
     return [_serialize_device_for_cache(device) for device in devices]
 
 
+def _serialize_network_for_cache(network: object) -> dict[str, object]:
+    return {
+        "name": _first_attr(network, "name", "network_name", "networkName"),
+        "vlan": _first_attr(network, "vlan", "vlan_id", "vlanId", "vlanid"),
+        "vlan_enabled": _first_attr(network, "vlan_enabled", "vlanEnabled"),
+        "purpose": _first_attr(network, "purpose"),
+    }
+
+
+def _serialize_networks_for_cache(networks: Sequence[object]) -> list[dict[str, object]]:
+    return [_serialize_network_for_cache(network) for network in networks]
+
+
 def _cache_lock_path(path: Path) -> Path:
     return path.with_suffix(path.suffix + ".lock")
 
@@ -465,3 +479,96 @@ def fetch_clients(
         _save_cache(cache_path, clients)
     logger.debug("Fetched %d clients", len(clients))
     return clients
+
+
+def fetch_networks(
+    config: Config,
+    *,
+    site: str | None = None,
+    use_cache: bool = True,
+) -> Sequence[object]:
+    """Fetch network inventory from UniFi Controller."""
+    try:
+        from unifi_controller_api import UnifiAuthenticationError
+    except ImportError as exc:
+        raise RuntimeError("Missing dependency: unifi-controller-api") from exc
+
+    site_name = site or config.site
+    ttl_seconds = _cache_ttl_seconds()
+    cache_path = _cache_dir() / f"networks_{_cache_key(config.url, site_name)}.json"
+    if use_cache and _is_cache_dir_safe(cache_path.parent):
+        cached = _load_cache(cache_path, ttl_seconds)
+        stale_cached, cache_age = _load_cache_with_age(cache_path)
+    else:
+        cached = None
+        stale_cached, cache_age = None, None
+    if cached is not None:
+        logger.debug("Using cached networks (%d)", len(cached))
+        return cached
+
+    try:
+        controller = _init_controller(config, is_udm_pro=True)
+    except UnifiAuthenticationError:
+        logger.debug("UDM Pro authentication failed, retrying legacy auth")
+        controller = _init_controller(config, is_udm_pro=False)
+
+    def _fetch() -> Sequence[object]:
+        try:
+            return controller.get_unifi_site_networkconf(site_name=site_name, raw=False)
+        except Exception as exc:  # noqa: BLE001 - fallback to raw network data
+            logger.warning("Networkconf model parse failed; retrying raw fetch: %s", exc)
+            return controller.get_unifi_site_networkconf(site_name=site_name, raw=True)
+
+    try:
+        networks = _call_with_retries("network fetch", _fetch)
+    except Exception as exc:  # noqa: BLE001 - fallback to cache
+        if stale_cached is not None:
+            logger.warning(
+                "Network fetch failed; using stale cache (%ds old): %s",
+                int(cache_age or 0),
+                exc,
+            )
+            return stale_cached
+        raise
+    if use_cache:
+        _save_cache(cache_path, _serialize_networks_for_cache(networks))
+    logger.debug("Fetched %d networks", len(networks))
+    return networks
+
+
+def fetch_payload(
+    config: Config,
+    *,
+    site: str | None = None,
+    include_clients: bool = True,
+    use_cache: bool = True,
+) -> dict[str, list[object] | list[dict[str, object]]]:
+    """Fetch devices, clients, and VLAN inventory for payload output."""
+    devices = list(fetch_devices(config, site=site, detailed=True, use_cache=use_cache))
+    clients = _fetch_payload_clients(
+        config,
+        site=site,
+        include_clients=include_clients,
+        use_cache=use_cache,
+    )
+    networks = list(fetch_networks(config, site=site, use_cache=use_cache))
+    normalized_networks = normalize_networks(networks)
+    vlan_info = build_vlan_info(clients, normalized_networks)
+    return {
+        "devices": devices,
+        "clients": clients,
+        "networks": normalized_networks,
+        "vlan_info": vlan_info,
+    }
+
+
+def _fetch_payload_clients(
+    config: Config,
+    *,
+    site: str | None,
+    include_clients: bool,
+    use_cache: bool,
+) -> list[object]:
+    if not include_clients:
+        return []
+    return list(fetch_clients(config, site=site, use_cache=use_cache))

{unifi_network_maps-1.4.13 → unifi_network_maps-1.4.14}/src/unifi_network_maps/cli/args.py

@@ -125,7 +125,7 @@ def add_general_render_args(parser: argparse._ArgumentGroup) -> None:
     parser.add_argument(
         "--format",
         default="mermaid",
-        choices=["mermaid", "svg", "svg-iso", "lldp-md", "mkdocs"],
+        choices=["mermaid", "svg", "svg-iso", "lldp-md", "mkdocs", "json"],
         help="Output format",
     )
     parser.add_argument(

{unifi_network_maps-1.4.13 → unifi_network_maps-1.4.14}/src/unifi_network_maps/cli/main.py

@@ -3,18 +3,21 @@
 from __future__ import annotations
 
 import argparse
+import json
 import logging
 from pathlib import Path
 
 from ..adapters.config import Config
+from ..adapters.unifi import fetch_payload
 from ..io.export import write_output
-from ..io.mock_data import load_mock_data
+from ..io.mock_data import load_mock_data, load_mock_payload
 from ..io.paths import (
     resolve_env_file,
     resolve_mock_data_path,
     resolve_output_path,
     resolve_theme_path,
 )
+from ..model.vlans import build_vlan_info, normalize_networks
 from ..render.legend import render_legend_only, resolve_legend_style
 from ..render.theme import resolve_themes
 from .args import build_parser
@@ -117,6 +120,38 @@ def _load_runtime_context(
     return config, site, None, None
 
 
+def _handle_json_format(
+    args: argparse.Namespace,
+    *,
+    config: Config | None,
+    site: str,
+) -> int | None:
+    if args.format != "json":
+        return None
+    payload: dict[str, list[object] | list[dict[str, object]]]
+    if args.mock_data:
+        payload = load_mock_payload(args.mock_data)
+        if not args.include_clients:
+            payload["clients"] = []
+        networks = normalize_networks(payload.get("networks", []))
+        payload["networks"] = networks
+        payload["vlan_info"] = build_vlan_info(payload.get("clients", []), networks)
+    else:
+        if config is None:
+            logging.error("Config required to run")
+            return 2
+        payload = fetch_payload(
+            config,
+            site=site,
+            include_clients=args.include_clients,
+            use_cache=not args.no_cache,
+        )
+    content = json.dumps(payload, indent=2, sort_keys=True)
+    output_kwargs = {"format_name": args.format} if args.output else {}
+    write_output(content, output_path=args.output, stdout=args.stdout, **output_kwargs)
+    return 0
+
+
 def main(argv: list[str] | None = None) -> int:
     logging.basicConfig(level=logging.INFO, format="%(levelname)s %(name)s: %(message)s")
     for handler in logging.getLogger().handlers:
@@ -132,6 +167,9 @@ def main(argv: list[str] | None = None) -> int:
     except ValueError as exc:
         logging.error(str(exc))
         return 2
+    payload_result = _handle_json_format(args, config=config, site=site)
+    if payload_result is not None:
+        return payload_result
     try:
         mermaid_theme, svg_theme = resolve_themes(args.theme_file)
     except Exception as exc:  # noqa: BLE001

{unifi_network_maps-1.4.13 → unifi_network_maps-1.4.14}/src/unifi_network_maps/io/mock_data.py

@@ -23,3 +23,20 @@ def load_mock_data(path: str) -> tuple[list[object], list[object]]:
     devices = _as_list(payload.get("devices"), "devices")
     clients = _as_list(payload.get("clients"), "clients")
     return devices, clients
+
+
+def load_mock_payload(path: str) -> dict[str, list[object] | list[dict[str, object]]]:
+    resolved = resolve_mock_data_path(path)
+    payload = json.loads(resolved.read_text(encoding="utf-8"))
+    if not isinstance(payload, dict):
+        raise ValueError("Mock data must be a JSON object")
+    devices = _as_list(payload.get("devices"), "devices")
+    clients = _as_list(payload.get("clients"), "clients")
+    networks = _as_list(payload.get("networks"), "networks")
+    vlan_info = _as_list(payload.get("vlan_info"), "vlan_info")
+    return {
+        "devices": devices,
+        "clients": clients,
+        "networks": networks,
+        "vlan_info": vlan_info,
+    }

{unifi_network_maps-1.4.13 → unifi_network_maps-1.4.14}/src/unifi_network_maps/io/paths.py

@@ -2,11 +2,14 @@
 
 from __future__ import annotations
 
+import logging
 import os
 import tempfile
 from collections.abc import Iterable
 from pathlib import Path
 
+logger = logging.getLogger(__name__)
+
 
 def _safe_home_dir() -> Path | None:
     try:
@@ -22,8 +25,9 @@ def _base_roots() -> list[Path]:
         roots.append(home)
     try:
         roots.append(Path(tempfile.gettempdir()).resolve())
-    except Exception:
-        pass
+    except OSError as exc:
+        # Best-effort temp dir; resolution can fail in restricted environments.
+        logger.debug("Failed to resolve temp directory: %s", exc)
     return roots
 
 
@@ -176,7 +180,7 @@ def resolve_output_path(path: str | Path, *, format_name: str | None) -> Path:
     extensions: set[str] | None
     if format_name == "svg" or format_name == "svg-iso":
         extensions = {".svg"}
-    elif format_name == "mock":
+    elif format_name in {"mock", "json"}:
         extensions = {".json"}
     elif format_name == "mermaid":
         extensions = {".md", ".mermaid", ".mmd"}

{unifi_network_maps-1.4.13 → unifi_network_maps-1.4.14}/src/unifi_network_maps/model/mock.py

@@ -9,6 +9,8 @@ from typing import Any
 
 from faker import Faker
 
+from .vlans import build_vlan_info, normalize_networks
+
 
 @dataclass(frozen=True)
 class MockOptions:
@@ -34,7 +36,14 @@ def generate_mock_payload(options: MockOptions) -> dict[str, list[dict[str, Any]
     state = _build_state(options.seed)
     devices, core_switch, aps = _build_devices(options, state)
     clients = _build_clients(options, state, core_switch, aps)
-    return {"devices": devices, "clients": clients}
+    networks = _build_networks()
+    vlan_info = build_vlan_info(clients, networks)
+    return {
+        "devices": devices,
+        "clients": clients,
+        "networks": normalize_networks(networks),
+        "vlan_info": vlan_info,
+    }
 
 
 def mock_payload_json(options: MockOptions) -> str:
@@ -108,6 +117,13 @@ def _build_clients(
     return clients
 
 
+def _build_networks() -> list[dict[str, Any]]:
+    return [
+        {"name": "LAN", "vlan_enabled": False, "purpose": "corporate"},
+        {"name": "Guest", "vlan": 20, "vlan_enabled": True, "purpose": "guest"},
+    ]
+
+
 def _build_wired_clients(
     count: int, state: _MockState, core_switch: dict[str, Any]
 ) -> list[dict[str, Any]]:

unifi_network_maps-1.4.14/src/unifi_network_maps/model/vlans.py

@@ -0,0 +1,119 @@
+"""VLAN inventory helpers."""
+
+from __future__ import annotations
+
+from collections.abc import Iterable
+
+
+def _as_list(value: object | None) -> list[object]:
+    if value is None:
+        return []
+    if isinstance(value, list):
+        return value
+    if isinstance(value, dict):
+        return [value]
+    if isinstance(value, str | bytes):
+        return []
+    if isinstance(value, Iterable):
+        return list(value)
+    return []
+
+
+def _get_attr(obj: object, name: str) -> object | None:
+    if isinstance(obj, dict):
+        return obj.get(name)
+    return getattr(obj, name, None)
+
+
+def _first_attr(obj: object, *names: str) -> object | None:
+    for name in names:
+        value = _get_attr(obj, name)
+        if value is not None:
+            return value
+    return None
+
+
+def _as_bool(value: object | None) -> bool:
+    if isinstance(value, bool):
+        return value
+    if isinstance(value, int | float):
+        return value != 0
+    if isinstance(value, str):
+        return value.strip().lower() in {"1", "true", "yes", "y", "on"}
+    return False
+
+
+def _as_vlan_id(value: object | None) -> int | None:
+    if isinstance(value, int):
+        return value if value > 0 else None
+    if isinstance(value, str):
+        return int(value) if value.isdigit() and int(value) > 0 else None
+    return None
+
+
+def _network_vlan_id(network: object) -> int | None:
+    vlan_value = _first_attr(network, "vlan", "vlan_id", "vlanId", "vlanid")
+    vlan_enabled = _as_bool(_first_attr(network, "vlan_enabled", "vlanEnabled"))
+    vlan_id = _as_vlan_id(vlan_value)
+    if vlan_id is not None:
+        return vlan_id
+    if not vlan_enabled:
+        return 1
+    return None
+
+
+def normalize_networks(networks: Iterable[object]) -> list[dict[str, object]]:
+    normalized: list[dict[str, object]] = []
+    for network in _as_list(networks):
+        if network is None:
+            continue
+        normalized.append(
+            {
+                "network_id": _first_attr(network, "_id", "id", "network_id", "networkId"),
+                "name": _first_attr(network, "name", "network_name", "networkName"),
+                "vlan_id": _network_vlan_id(network),
+                "vlan_enabled": _as_bool(_first_attr(network, "vlan_enabled", "vlanEnabled")),
+                "purpose": _first_attr(network, "purpose"),
+            }
+        )
+    return normalized
+
+
+def build_vlan_info(
+    clients: Iterable[object], networks: Iterable[object]
+) -> list[dict[str, object]]:
+    vlan_counts = _client_vlan_counts(clients)
+    vlan_entries = _network_vlan_entries(networks)
+    for vlan_id, count in vlan_counts.items():
+        entry = vlan_entries.setdefault(
+            vlan_id,
+            {"id": vlan_id, "name": None, "client_count": 0},
+        )
+        entry["client_count"] = count
+    return [vlan_entries[key] for key in sorted(vlan_entries)]
+
+
+def _client_vlan_counts(clients: Iterable[object]) -> dict[int, int]:
+    vlan_counts: dict[int, int] = {}
+    for client in _as_list(clients):
+        vlan_id = _as_vlan_id(_first_attr(client, "vlan", "vlan_id", "vlanId", "vlanid"))
+        if vlan_id is None:
+            continue
+        vlan_counts[vlan_id] = vlan_counts.get(vlan_id, 0) + 1
+    return vlan_counts
+
+
+def _network_vlan_entries(networks: Iterable[object]) -> dict[int, dict[str, object]]:
+    vlan_entries: dict[int, dict[str, object]] = {}
+    for network in normalize_networks(networks):
+        vlan_id = network.get("vlan_id")
+        if not isinstance(vlan_id, int):
+            continue
+        entry = vlan_entries.setdefault(
+            vlan_id,
+            {"id": vlan_id, "name": None, "client_count": 0},
+        )
+        name = network.get("name")
+        if name and not entry["name"]:
+            entry["name"] = name
+    return vlan_entries

{unifi_network_maps-1.4.13 → unifi_network_maps-1.4.14}/src/unifi_network_maps.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unifi-network-maps
-Version: 1.4.13
+Version: 1.4.14
 Summary: Dynamic UniFi -> network maps in mermaid or svg
 Author: Merlijn
 License-Expression: MIT
@@ -147,6 +147,12 @@ Legend only:
 unifi-network-maps --legend-only --stdout
 ```
 
+JSON payload (devices + clients + VLAN inventory):
+
+```bash
+unifi-network-maps --format json --output ./payload.json
+```
+
 ## Home Assistant integration
 
 The live Home Assistant integration (Config Flow + coordinator + custom card) lives in a separate repo:
@@ -238,7 +244,7 @@ SVG:
 - `--theme-file`: load a YAML theme for Mermaid + SVG colors (see `examples/theme.yaml` and `examples/theme-dark.yaml`).
 
 Output:
-- `--format mermaid|svg|svg-iso|lldp-md|mkdocs`: output format (default mermaid).
+- `--format mermaid|svg|svg-iso|lldp-md|mkdocs|json`: output format (default mermaid).
 - `--stdout`: write output to stdout.
 - `--markdown`: wrap Mermaid output in a code fence.
 - `--mkdocs-sidebar-legend`: write assets to place the compact legend in the MkDocs right sidebar.

{unifi_network_maps-1.4.13 → unifi_network_maps-1.4.14}/src/unifi_network_maps.egg-info/SOURCES.txt

@@ -84,6 +84,7 @@ src/unifi_network_maps/model/lldp.py
 src/unifi_network_maps/model/mock.py
 src/unifi_network_maps/model/ports.py
 src/unifi_network_maps/model/topology.py
+src/unifi_network_maps/model/vlans.py
 src/unifi_network_maps/render/__init__.py
 src/unifi_network_maps/render/device_ports_md.py
 src/unifi_network_maps/render/legend.py
@@ -126,4 +127,5 @@ tests/test_svg.py
 tests/test_svg_iso.py
 tests/test_theme.py
 tests/test_topology.py
-tests/test_unifi.py
+tests/test_unifi.py
+tests/test_vlan_info.py

{unifi_network_maps-1.4.13 → unifi_network_maps-1.4.14}/tests/test_cli.py

@@ -155,6 +155,92 @@ def test_main_mermaid_includes_wired_clients(monkeypatch):
     assert captured["node_types"]["Client"] == "client"
 
 
+def test_main_payload_from_mock_includes_vlan_info(monkeypatch, tmp_path):
+    captured = {}
+    payload = {
+        "devices": [
+            {
+                "name": "Gateway",
+                "model_name": "",
+                "model": "",
+                "mac": "aa:bb",
+                "ip": "",
+                "type": "udm",
+                "lldp_info": [],
+            }
+        ],
+        "clients": [{"name": "Client A", "is_wired": True, "sw_mac": "aa:bb", "vlan": 20}],
+        "networks": [
+            {"name": "LAN", "vlan_enabled": False},
+            {"name": "Guest", "vlan": 20, "vlan_enabled": True},
+        ],
+    }
+    mock_path = tmp_path / "mock.json"
+    mock_path.write_text(json.dumps(payload), encoding="utf-8")
+
+    def write_output(content, *, output_path, stdout, **_kwargs):
+        captured["content"] = content
+
+    monkeypatch.setattr(cli_module.Config, "from_env", lambda **_kwargs: _dummy_config())
+    monkeypatch.setattr(cli_module, "write_output", write_output)
+
+    assert (
+        main(
+            [
+                "--mock-data",
+                str(mock_path),
+                "--format",
+                "json",
+                "--include-clients",
+                "--stdout",
+            ]
+        )
+        == 0
+    )
+    output = json.loads(captured["content"])
+    assert "networks" in output
+    assert "vlan_info" in output
+    vlan_map = {entry["id"]: entry for entry in output["vlan_info"]}
+    assert vlan_map[1]["client_count"] == 0
+    assert vlan_map[20]["client_count"] == 1
+
+
+def test_main_payload_from_mock_excludes_clients_by_default(monkeypatch, tmp_path):
+    captured = {}
+    payload = {
+        "devices": [
+            {
+                "name": "Gateway",
+                "model_name": "",
+                "model": "",
+                "mac": "aa:bb",
+                "ip": "",
+                "type": "udm",
+                "lldp_info": [],
+            }
+        ],
+        "clients": [{"name": "Client A", "is_wired": True, "sw_mac": "aa:bb", "vlan": 20}],
+        "networks": [
+            {"name": "LAN", "vlan_enabled": False},
+            {"name": "Guest", "vlan": 20, "vlan_enabled": True},
+        ],
+    }
+    mock_path = tmp_path / "mock.json"
+    mock_path.write_text(json.dumps(payload), encoding="utf-8")
+
+    def write_output(content, *, output_path, stdout, **_kwargs):
+        captured["content"] = content
+
+    monkeypatch.setattr(cli_module.Config, "from_env", lambda **_kwargs: _dummy_config())
+    monkeypatch.setattr(cli_module, "write_output", write_output)
+
+    assert main(["--mock-data", str(mock_path), "--format", "json", "--stdout"]) == 0
+    output = json.loads(captured["content"])
+    vlan_map = {entry["id"]: entry for entry in output["vlan_info"]}
+    assert vlan_map[1]["client_count"] == 0
+    assert vlan_map[20]["client_count"] == 0
+
+
 def test_main_logs_topology_errors(monkeypatch, caplog):
     monkeypatch.setattr(cli_module.Config, "from_env", lambda **_kwargs: _dummy_config())
     monkeypatch.setattr(runtime_module, "fetch_devices", lambda *args, **kwargs: [])

{unifi_network_maps-1.4.13 → unifi_network_maps-1.4.14}/tests/test_mock_generate.py

@@ -26,3 +26,5 @@ def test_mock_payload_json_is_valid():
     payload = json.loads(mock_payload_json(options))
     assert "devices" in payload
     assert "clients" in payload
+    assert "networks" in payload
+    assert "vlan_info" in payload

unifi_network_maps-1.4.14/tests/test_vlan_info.py

@@ -0,0 +1,30 @@
+from unifi_network_maps.model.vlans import build_vlan_info
+
+
+def _vlan_map(entries: list[dict[str, object]]) -> dict[int, dict[str, object]]:
+    mapped: dict[int, dict[str, object]] = {}
+    for entry in entries:
+        vlan_id = entry.get("id")
+        if isinstance(vlan_id, int):
+            mapped[vlan_id] = entry
+    return mapped
+
+
+def test_build_vlan_info_includes_networks_and_clients():
+    networks = [
+        {"name": "LAN", "vlan_enabled": False},
+        {"name": "Guest", "vlan": 20, "vlan_enabled": True},
+    ]
+    clients = [
+        {"name": "Client A", "is_wired": True, "vlan": 20},
+        {"name": "Client B", "is_wired": True, "vlan": 30},
+    ]
+
+    vlan_info = build_vlan_info(clients, networks)
+    vlan_map = _vlan_map(vlan_info)
+
+    assert vlan_map[1]["name"] == "LAN"
+    assert vlan_map[1]["client_count"] == 0
+    assert vlan_map[20]["name"] == "Guest"
+    assert vlan_map[20]["client_count"] == 1
+    assert vlan_map[30]["client_count"] == 1

unifi_network_maps-1.4.13/src/unifi_network_maps/__init__.py

@@ -1 +0,0 @@
-__version__ = "1.4.13"