anti
f182c98ffa
GET /api/v1/topologies — paginated list with status filter. Extends
repo.list_topologies() to accept limit/offset and adds count_topologies()
for the total envelope field.
GET /api/v1/topologies/{id} — hydrated TopologyDetail; 404 if missing.
GET /api/v1/topologies/{id}/status-events — audit trail, limit-capped.
Catalog helpers for the phase-4 canvas UI:
* GET /topologies/services — full service catalog.
* GET /topologies/next-subnet?base=172.20 — wraps SubnetAllocator against
reserved_subnets across non-torn-down topologies.
* GET /topologies/{id}/lans/{lan_id}/next-ip — IPAllocator pre-seeded
with existing decky IPs in that LAN.
All read routes are viewer-or-admin. Sub-routers are included in an
order that keeps literal catalog paths (/services, /next-subnet) from
being shadowed by the /{topology_id} trie branch.
105 lines
3.3 KiB
Python
105 lines
3.3 KiB
Python
"""Read-only catalog endpoints — services, next-subnet, next-ip.
|
|
|
|
These wrap fleet/allocator helpers so the phase-4 canvas UI can lean
|
|
on the server for allocation instead of shipping the logic client-side.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
from fastapi import APIRouter, Depends, HTTPException, Query
|
|
|
|
from decnet.fleet import all_service_names
|
|
from decnet.telemetry import traced as _traced
|
|
from decnet.topology.allocator import (
|
|
AllocatorExhausted,
|
|
IPAllocator,
|
|
SubnetAllocator,
|
|
reserved_subnets,
|
|
)
|
|
from decnet.web.db.models import (
|
|
NextIPResponse,
|
|
NextSubnetResponse,
|
|
ServiceCatalogResponse,
|
|
)
|
|
from decnet.web.dependencies import repo, require_viewer
|
|
|
|
router = APIRouter()
|
|
|
|
|
|
@router.get(
|
|
"/services",
|
|
tags=["MazeNET Topologies"],
|
|
response_model=ServiceCatalogResponse,
|
|
responses={
|
|
401: {"description": "Missing or invalid credentials"},
|
|
403: {"description": "Insufficient permissions"},
|
|
},
|
|
)
|
|
@_traced("api.topology.catalog.services")
|
|
async def api_list_services(
|
|
_viewer: dict = Depends(require_viewer),
|
|
) -> ServiceCatalogResponse:
|
|
return ServiceCatalogResponse(services=all_service_names())
|
|
|
|
|
|
@router.get(
|
|
"/next-subnet",
|
|
tags=["MazeNET Topologies"],
|
|
response_model=NextSubnetResponse,
|
|
responses={
|
|
401: {"description": "Missing or invalid credentials"},
|
|
403: {"description": "Insufficient permissions"},
|
|
409: {"description": "Allocator exhausted"},
|
|
},
|
|
)
|
|
@_traced("api.topology.catalog.next_subnet")
|
|
async def api_next_subnet(
|
|
base: str = Query(default="172.20", pattern=r"^\d{1,3}\.\d{1,3}$"),
|
|
_viewer: dict = Depends(require_viewer),
|
|
) -> NextSubnetResponse:
|
|
reserved = await reserved_subnets(repo)
|
|
alloc = SubnetAllocator(base_prefix=base, reserved=reserved)
|
|
try:
|
|
subnet = alloc.next_free()
|
|
except AllocatorExhausted as e:
|
|
raise HTTPException(status_code=409, detail=str(e))
|
|
return NextSubnetResponse(subnet=subnet)
|
|
|
|
|
|
@router.get(
|
|
"/{topology_id}/lans/{lan_id}/next-ip",
|
|
tags=["MazeNET Topologies"],
|
|
response_model=NextIPResponse,
|
|
responses={
|
|
401: {"description": "Missing or invalid credentials"},
|
|
403: {"description": "Insufficient permissions"},
|
|
404: {"description": "Topology or LAN not found"},
|
|
409: {"description": "Allocator exhausted"},
|
|
},
|
|
)
|
|
@_traced("api.topology.catalog.next_ip")
|
|
async def api_next_ip(
|
|
topology_id: str,
|
|
lan_id: str,
|
|
_viewer: dict = Depends(require_viewer),
|
|
) -> NextIPResponse:
|
|
if await repo.get_topology(topology_id) is None:
|
|
raise HTTPException(status_code=404, detail="Topology not found")
|
|
lans = await repo.list_lans_for_topology(topology_id)
|
|
lan = next((ln for ln in lans if ln["id"] == lan_id), None)
|
|
if lan is None:
|
|
raise HTTPException(status_code=404, detail="LAN not found")
|
|
deckies = await repo.list_topology_deckies(topology_id)
|
|
alloc = IPAllocator(subnet=lan["subnet"])
|
|
for d in deckies:
|
|
ip = (d.get("decky_config") or {}).get("ips_by_lan", {}).get(lan["name"])
|
|
if ip:
|
|
try:
|
|
alloc.reserve(ip)
|
|
except ValueError:
|
|
continue
|
|
try:
|
|
ip = alloc.next_free()
|
|
except AllocatorExhausted as e:
|
|
raise HTTPException(status_code=409, detail=str(e))
|
|
return NextIPResponse(subnet=lan["subnet"], ip=ip)
|