A 30-LAN generate request already fits in 172.20.0.0/16, but trees
with depth/branching that multiply past 256 (e.g. depth=6,
branching=4 ≈ 5k LANs) hit AllocatorExhausted before the first
write.
SubnetAllocator now accepts a full CIDR base ("172.16.0.0/12" →
4096 /24s) in addition to the legacy two-octet shorthand ("172.20",
auto-lifted to /16). The parent must be ≤/24; a /24 base yields
exactly one slot. Iteration order is preserved for /16 bases so
existing topologies keep their third-octet sweep; /12 adds a
second-octet dimension underneath.
Defaults bumped to 172.16.0.0/12: TopologyConfig.subnet_base_prefix,
/next-subnet query param, and the mutator's add-LAN fallback. The
field pattern widens to accept CIDR. create-blank and manual LAN
CRUD still use "10.0" (lifts to /16) — one DMZ LAN per topology,
256 is plenty.
199 lines
5.9 KiB
Python
199 lines
5.9 KiB
Python
"""Allocator unit + integration tests."""
|
|
from __future__ import annotations
|
|
|
|
import pytest
|
|
|
|
from decnet.topology.allocator import (
|
|
AllocatorExhausted,
|
|
IPAllocator,
|
|
SubnetAllocator,
|
|
reserved_subnets,
|
|
)
|
|
from decnet.topology.config import TopologyConfig
|
|
from decnet.topology.generator import generate
|
|
from decnet.topology.persistence import persist, transition_status
|
|
from decnet.topology.status import TopologyStatus
|
|
from decnet.web.db.factory import get_repository
|
|
|
|
|
|
# --------------------------------------------------------------------- IPAllocator
|
|
|
|
|
|
def test_ip_allocator_sequential_skips_gateway():
|
|
a = IPAllocator("10.0.0.0/29") # hosts: .1 .. .6; .1 is gateway
|
|
got = [a.next_free() for _ in range(5)]
|
|
assert got == ["10.0.0.2", "10.0.0.3", "10.0.0.4", "10.0.0.5", "10.0.0.6"]
|
|
|
|
|
|
def test_ip_allocator_reserve_release_roundtrip():
|
|
a = IPAllocator("10.0.0.0/29")
|
|
a.reserve("10.0.0.3")
|
|
assert not a.is_free("10.0.0.3")
|
|
a.release("10.0.0.3")
|
|
assert a.is_free("10.0.0.3")
|
|
|
|
|
|
def test_ip_allocator_reserve_rejects_gateway():
|
|
a = IPAllocator("10.0.0.0/29")
|
|
with pytest.raises(ValueError):
|
|
a.reserve("10.0.0.1")
|
|
|
|
|
|
def test_ip_allocator_reserve_rejects_out_of_subnet():
|
|
a = IPAllocator("10.0.0.0/29")
|
|
with pytest.raises(ValueError):
|
|
a.reserve("10.0.0.100")
|
|
|
|
|
|
def test_ip_allocator_next_free_after_reserve_skips():
|
|
a = IPAllocator("10.0.0.0/29")
|
|
a.reserve("10.0.0.2")
|
|
assert a.next_free() == "10.0.0.3"
|
|
|
|
|
|
def test_ip_allocator_exhaustion_raises():
|
|
a = IPAllocator("10.0.0.0/30") # hosts: .1 .. .2; .1 gateway → only .2 usable
|
|
assert a.next_free() == "10.0.0.2"
|
|
with pytest.raises(AllocatorExhausted):
|
|
a.next_free()
|
|
|
|
|
|
# --------------------------------------------------------------------- SubnetAllocator
|
|
|
|
|
|
def test_subnet_allocator_sequential():
|
|
s = SubnetAllocator("172.20")
|
|
assert s.next_free() == "172.20.0.0/24"
|
|
assert s.next_free() == "172.20.1.0/24"
|
|
assert s.next_free() == "172.20.2.0/24"
|
|
|
|
|
|
def test_subnet_allocator_skips_reserved():
|
|
s = SubnetAllocator("172.20", reserved={"172.20.0.0/24", "172.20.1.0/24"})
|
|
assert s.next_free() == "172.20.2.0/24"
|
|
|
|
|
|
def test_subnet_allocator_reserve_is_idempotent():
|
|
s = SubnetAllocator("172.20")
|
|
s.reserve("172.20.0.0/24")
|
|
assert s.next_free() == "172.20.1.0/24"
|
|
|
|
|
|
def test_subnet_allocator_exhaustion_raises():
|
|
reserved = {f"10.0.{i}.0/24" for i in range(256)}
|
|
s = SubnetAllocator("10.0", reserved=reserved)
|
|
with pytest.raises(AllocatorExhausted):
|
|
s.next_free()
|
|
|
|
|
|
def test_subnet_allocator_accepts_cidr_base():
|
|
"""Full-CIDR base form is equivalent to the legacy two-octet form."""
|
|
s = SubnetAllocator("172.20.0.0/16")
|
|
assert s.next_free() == "172.20.0.0/24"
|
|
assert s.next_free() == "172.20.1.0/24"
|
|
|
|
|
|
def test_subnet_allocator_slash12_yields_more_than_256_slots():
|
|
"""The whole point of widening: a /12 base must outlast a single /16."""
|
|
s = SubnetAllocator("172.16.0.0/12")
|
|
# Burn the first 256 /24s. With a /16 base this is exhaustion; with
|
|
# /12 we should roll into 172.17.x.x without raising.
|
|
for _ in range(256):
|
|
s.next_free()
|
|
nxt = s.next_free()
|
|
assert nxt.startswith("172.17.")
|
|
assert nxt.endswith(".0/24")
|
|
|
|
|
|
def test_subnet_allocator_slash12_total_capacity_is_4096():
|
|
s = SubnetAllocator("172.16.0.0/12")
|
|
count = 0
|
|
try:
|
|
while True:
|
|
s.next_free()
|
|
count += 1
|
|
except AllocatorExhausted:
|
|
pass
|
|
assert count == 4096
|
|
|
|
|
|
def test_subnet_allocator_rejects_narrower_than_slash24():
|
|
with pytest.raises(ValueError, match="narrower than /24"):
|
|
SubnetAllocator("192.168.1.0/25")
|
|
|
|
|
|
def test_subnet_allocator_exhausted_message_uses_parent_cidr():
|
|
s = SubnetAllocator("172.20.0.0/24") # exactly one slot
|
|
s.next_free()
|
|
with pytest.raises(AllocatorExhausted, match="172.20.0.0/24"):
|
|
s.next_free()
|
|
|
|
|
|
# --------------------------------------------------------------------- reserved_subnets
|
|
|
|
|
|
def _cfg(**kw) -> TopologyConfig:
|
|
base = dict(
|
|
name="alloc",
|
|
depth=1,
|
|
branching_factor=1,
|
|
deckies_per_lan_min=1,
|
|
deckies_per_lan_max=1,
|
|
cross_edge_probability=0.0,
|
|
randomize_services=False,
|
|
services_explicit=["ssh"],
|
|
seed=3,
|
|
)
|
|
base.update(kw)
|
|
return TopologyConfig(**base)
|
|
|
|
|
|
@pytest.fixture
|
|
async def repo(tmp_path):
|
|
r = get_repository(db_path=str(tmp_path / "alloc.db"))
|
|
await r.initialize()
|
|
return r
|
|
|
|
|
|
@pytest.mark.anyio
|
|
async def test_reserved_subnets_includes_pending_and_active(repo):
|
|
plan_a = generate(_cfg(name="a"))
|
|
tid_a = await persist(repo, plan_a) # pending
|
|
|
|
plan_b = generate(_cfg(name="b", subnet_base_prefix="172.21"))
|
|
tid_b = await persist(repo, plan_b)
|
|
await transition_status(repo, tid_b, TopologyStatus.DEPLOYING)
|
|
# DEPLOYING → ACTIVE
|
|
await transition_status(repo, tid_b, TopologyStatus.ACTIVE)
|
|
|
|
claimed = await reserved_subnets(repo)
|
|
for lan in plan_a.lans:
|
|
assert lan.subnet in claimed
|
|
for lan in plan_b.lans:
|
|
assert lan.subnet in claimed
|
|
|
|
|
|
@pytest.mark.anyio
|
|
async def test_reserved_subnets_excludes_torn_down(repo):
|
|
plan = generate(_cfg(name="gone"))
|
|
tid = await persist(repo, plan)
|
|
# pending → torn_down is legal
|
|
await transition_status(repo, tid, TopologyStatus.TORN_DOWN)
|
|
|
|
claimed = await reserved_subnets(repo)
|
|
for lan in plan.lans:
|
|
assert lan.subnet not in claimed
|
|
|
|
|
|
@pytest.mark.anyio
|
|
async def test_generate_respects_reserved(repo):
|
|
plan_a = generate(_cfg(name="a"))
|
|
await persist(repo, plan_a)
|
|
claimed = await reserved_subnets(repo)
|
|
# Second topology on the same base, told about reservations: must
|
|
# pick subnets not in the first one's set.
|
|
plan_b = generate(_cfg(name="b"), reserved_subnets=claimed)
|
|
b_subnets = {lan.subnet for lan in plan_b.lans}
|
|
a_subnets = {lan.subnet for lan in plan_a.lans}
|
|
assert b_subnets.isdisjoint(a_subnets)
|