anti
b57269f68a
MACVLAN assigns unique MACs per container; WiFi APs typically reject frames from unregistered MACs, making deckies unreachable from other LAN devices. IPvlan L2 shares the host's MAC, so all traffic passes through the AP normally. - network.py: add create_ipvlan_network, setup_host_ipvlan, teardown_host_ipvlan, HOST_IPVLAN_IFACE - config.py: add ipvlan: bool = False to DecnetConfig (persisted to state so teardown uses the right driver) - deployer.py: branch on config.ipvlan for create/setup/teardown - cli.py: add --ipvlan flag, wire into DecnetConfig - tests/test_network.py: new test module covering ips_to_range, create_macvlan/ipvlan, setup/teardown for both drivers Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
78 lines
2.3 KiB
Python
78 lines
2.3 KiB
Python
"""
|
|
Pydantic models for DECNET configuration and runtime state.
|
|
State is persisted to decnet-state.json in the working directory.
|
|
"""
|
|
|
|
import json
|
|
from pathlib import Path
|
|
from typing import Literal
|
|
|
|
from pydantic import BaseModel, field_validator
|
|
|
|
from decnet.distros import random_hostname as _random_hostname
|
|
|
|
STATE_FILE = Path("decnet-state.json")
|
|
|
|
|
|
def random_hostname(distro_slug: str = "debian") -> str:
|
|
return _random_hostname(distro_slug)
|
|
|
|
|
|
class DeckyConfig(BaseModel):
|
|
name: str
|
|
ip: str
|
|
services: list[str]
|
|
distro: str # slug from distros.DISTROS, e.g. "debian", "ubuntu22"
|
|
base_image: str # Docker image for the base/IP-holder container
|
|
build_base: str = "debian:bookworm-slim" # apt-compatible image for service Dockerfiles
|
|
hostname: str
|
|
service_config: dict[str, dict] = {} # optional per-service persona config
|
|
|
|
@field_validator("services")
|
|
@classmethod
|
|
def services_not_empty(cls, v: list[str]) -> list[str]:
|
|
if not v:
|
|
raise ValueError("A decky must have at least one service.")
|
|
return v
|
|
|
|
|
|
class DecnetConfig(BaseModel):
|
|
mode: Literal["unihost", "swarm"]
|
|
interface: str
|
|
subnet: str
|
|
gateway: str
|
|
deckies: list[DeckyConfig]
|
|
log_target: str | None = None # "ip:port" or None
|
|
log_file: str | None = None # path for RFC 5424 syslog file output
|
|
ipvlan: bool = False # use IPvlan L2 instead of MACVLAN (WiFi-friendly)
|
|
|
|
@field_validator("log_target")
|
|
@classmethod
|
|
def validate_log_target(cls, v: str | None) -> str | None:
|
|
if v is None:
|
|
return v
|
|
parts = v.rsplit(":", 1)
|
|
if len(parts) != 2 or not parts[1].isdigit():
|
|
raise ValueError("log_target must be in ip:port format, e.g. 192.168.1.5:5140")
|
|
return v
|
|
|
|
|
|
def save_state(config: DecnetConfig, compose_path: Path) -> None:
|
|
payload = {
|
|
"config": config.model_dump(),
|
|
"compose_path": str(compose_path),
|
|
}
|
|
STATE_FILE.write_text(json.dumps(payload, indent=2))
|
|
|
|
|
|
def load_state() -> tuple[DecnetConfig, Path] | None:
|
|
if not STATE_FILE.exists():
|
|
return None
|
|
data = json.loads(STATE_FILE.read_text())
|
|
return DecnetConfig(**data["config"]), Path(data["compose_path"])
|
|
|
|
|
|
def clear_state() -> None:
|
|
if STATE_FILE.exists():
|
|
STATE_FILE.unlink()
|