two/internal/dhcpbackend/dnsmasq.go
GnomeZworc 8a04f6f7f6
All checks were successful
Release Pipeline / set-release-target (push) Successful in 39s
Release Pipeline / upload-assets (run-dhcp-in-netns.sh, scripts/run-dhcp-in-netns.sh) (push) Successful in 4s
Release Pipeline / upload-assets (run-dnsmasq-in-netns.sh, scripts/run-dnsmasq-in-netns.sh) (push) Successful in 4s
Release Pipeline / upload-assets (agent.service, systemd/agent.service) (push) Successful in 4s
Release Pipeline / upload-assets (dhcp@.service, systemd/dhcp@.service) (push) Successful in 4s
Release Pipeline / upload-assets (dnsmasq@.service, systemd/dnsmasq@.service) (push) Successful in 4s
Release Pipeline / upload-assets (metadata@.service, systemd/metadata@.service) (push) Successful in 4s
Release Pipeline / build (dhcp, amd64, linux) (push) Successful in 0s
Release Pipeline / build (agent, amd64, linux) (push) Successful in 0s
Release Pipeline / build (metadata, amd64, linux) (push) Successful in 0s
Release Pipeline / checksums (push) Successful in 4s
Release Pipeline / release (push) Successful in 13s
Release Pipeline / publish (push) Successful in 0s
Release Pipeline / build (push) Successful in 1m2s
f-46: dhcpbackend: drive dnsmasq or the built-in server through one interface #46
internal/subnet et internal/vm ne parlent plus à dnsmasq en direct mais à une
interface Backend, choisie au démarrage par dhcp.backend. Le défaut restant
dnsmasq, un agent.yml de 0.1.0 se comporte à l'identique ; ValidBackend refuse
toute autre valeur que dnsmasq ou two.

Les entrées ip→mac sont écrites hors du backend : elles font autorité pour les
deux, internal/vm/data.go les lisant par GetMACForIP quel que soit le serveur.
D'où l'extraction de dhcp.Entries, que GenerateConfig mêlait à l'écriture du
fichier dnsmasq.

Reservation porte Index et DefaultRoute : dnsmasq en dérive ses tags et n'en
pose que sur les interfaces sans route par défaut, le backend two transmet le
drapeau tel quel. La notion de tag ne remonte plus jusqu'à internal/vm.

Two.ConfigureSubnet sonde get-state avant de pousser la configuration : le job
systemd d'une unit Type=simple est done dès le fork, avant que la socket
existe. TeardownSubnet arrête l'unit avant de supprimer le .state.

Le backend two est testé contre un vrai serveur sur une vraie socket. Onze
mutations, toutes détectées.

Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
2026-09-08 21:49:33 +02:00

127 lines
3.1 KiB
Go

package dhcpbackend
import (
"fmt"
"git.g3e.fr/syonad/two/internal/dhcp"
"git.g3e.fr/syonad/two/pkg/systemd"
)
type Dnsmasq struct {
ConfDir string
}
func (b Dnsmasq) confDir() string {
if b.ConfDir == "" {
return dhcp.DefaultConfDir
}
return b.ConfDir
}
func tag(vmName string, index int) string {
return fmt.Sprintf("%s-%d", vmName, index)
}
func (Dnsmasq) Unit(s Subnet) string {
return dhcp.UnitName(s.Instance())
}
func (b Dnsmasq) config(s Subnet) dhcp.Config {
return dhcp.Config{
Network: s.Network,
Name: s.Instance(),
ConfDir: b.confDir(),
InterfaceIP: s.InterfaceIP,
VPCRoute: s.VPCRoute,
DefaultGateway: s.DefaultGateway,
}
}
func (b Dnsmasq) ConfigureSubnet(s Subnet) error {
if _, _, err := dhcp.GenerateConfig(b.config(s)); err != nil {
return fmt.Errorf("generate dhcp config: %w", err)
}
svc, err := systemd.New()
if err != nil {
return fmt.Errorf("connect to systemd: %w", err)
}
defer svc.Close()
if err := svc.Start(b.Unit(s)); err != nil {
return fmt.Errorf("start dnsmasq: %w", err)
}
return nil
}
func (b Dnsmasq) TeardownSubnet(s Subnet) error {
svc, err := systemd.New()
if err != nil {
return fmt.Errorf("connect to systemd: %w", err)
}
defer svc.Close()
unit := b.Unit(s)
if status, err := svc.Status(unit); err == nil && status.ActiveState == "active" {
if err := svc.Stop(unit); err != nil {
return fmt.Errorf("stop dnsmasq: %w", err)
}
}
if err := dhcp.RemoveConfig(b.confDir(), s.Instance()); err != nil {
return err
}
return dhcp.RemoveSubnetDirs(b.confDir(), s.Instance())
}
func (b Dnsmasq) SetVM(s Subnet, vmName string, res []Reservation) error {
instance := s.Instance()
reservations := make([]dhcp.Reservation, 0, len(res))
var tags []string
for _, r := range res {
reservations = append(reservations, dhcp.Reservation{
MAC: r.MAC, IP: r.IP, Tag: tag(vmName, r.Index),
})
if !r.DefaultRoute {
tags = append(tags, tag(vmName, r.Index))
}
}
if err := dhcp.WriteReservations(b.confDir(), instance, vmName, reservations); err != nil {
return fmt.Errorf("write dhcp reservations on %s: %w", instance, err)
}
options := dhcp.Config{InterfaceIP: s.InterfaceIP, VPCRoute: s.VPCRoute}
if err := dhcp.WriteVMOptions(b.confDir(), instance, vmName, tags, options); err != nil {
return fmt.Errorf("write dhcp options on %s: %w", instance, err)
}
return nil
}
func (b Dnsmasq) DelVM(s Subnet, vmName string, _ []Reservation) error {
if err := dhcp.RemoveReservations(b.confDir(), s.Instance(), vmName); err != nil {
return err
}
svc, err := systemd.New()
if err != nil {
return fmt.Errorf("connect to systemd: %w", err)
}
defer svc.Close()
unit := b.Unit(s)
status, err := svc.Status(unit)
if err != nil || status.ActiveState != "active" {
return nil
}
if err := svc.Restart(unit); err != nil {
return fmt.Errorf("restart %s: %w", unit, err)
}
if status, err := svc.Status(unit); err != nil {
return fmt.Errorf("status %s after restart: %w", unit, err)
} else if status.ActiveState != "active" {
return fmt.Errorf("%s is %s after restart", unit, status.ActiveState)
}
return nil
}