f-46: dhcpbackend: drive dnsmasq or the built-in server through one interface #46
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
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
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>
This commit is contained in:
parent
e00f456610
commit
8a04f6f7f6
16 changed files with 1021 additions and 147 deletions
139
internal/dhcpbackend/two.go
Normal file
139
internal/dhcpbackend/two.go
Normal file
|
|
@ -0,0 +1,139 @@
|
|||
package dhcpbackend
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
dhcpapi "git.g3e.fr/syonad/two/internal/api/dhcp"
|
||||
dhcpclient "git.g3e.fr/syonad/two/internal/client/dhcp"
|
||||
"git.g3e.fr/syonad/two/pkg/db/statefile"
|
||||
"git.g3e.fr/syonad/two/pkg/systemd"
|
||||
)
|
||||
|
||||
const (
|
||||
readyTimeout = 5 * time.Second
|
||||
readyPoll = 50 * time.Millisecond
|
||||
)
|
||||
|
||||
type Two struct {
|
||||
RunDir string
|
||||
}
|
||||
|
||||
func (b Two) runDir() string {
|
||||
if b.RunDir == "" {
|
||||
return dhcpapi.DefaultRunDir
|
||||
}
|
||||
return b.RunDir
|
||||
}
|
||||
|
||||
func (b Two) Unit(s Subnet) string {
|
||||
return dhcpapi.Unit(s.Instance())
|
||||
}
|
||||
|
||||
func (b Two) client(s Subnet) *dhcpclient.Client {
|
||||
return dhcpclient.New(dhcpapi.SocketPath(b.runDir(), s.Instance()))
|
||||
}
|
||||
|
||||
func (b Two) statePath(s Subnet) string {
|
||||
return dhcpapi.StatePath(b.runDir(), s.Instance())
|
||||
}
|
||||
|
||||
func (b Two) waitReady(s Subnet, timeout, poll time.Duration) error {
|
||||
client := b.client(s)
|
||||
deadline := time.Now().Add(timeout)
|
||||
|
||||
var err error
|
||||
for {
|
||||
if _, _, err = client.GetState(); err == nil {
|
||||
return nil
|
||||
}
|
||||
if time.Now().After(deadline) {
|
||||
return fmt.Errorf("dhcp server for %s did not answer within %s: %w", s.Instance(), timeout, err)
|
||||
}
|
||||
time.Sleep(poll)
|
||||
}
|
||||
}
|
||||
|
||||
func (b Two) ConfigureSubnet(s Subnet) error {
|
||||
if err := statefile.Remove(b.statePath(s)); err != nil {
|
||||
return fmt.Errorf("remove residual state: %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 dhcp: %w", err)
|
||||
}
|
||||
if err := b.waitReady(s, readyTimeout, readyPoll); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return b.pushSubnet(s)
|
||||
}
|
||||
|
||||
func (b Two) pushSubnet(s Subnet) error {
|
||||
subnet := dhcpapi.Subnet{
|
||||
Network: s.Network.String(),
|
||||
InterfaceIP: s.InterfaceIP.String(),
|
||||
}
|
||||
if s.VPCRoute != nil {
|
||||
subnet.VPCRoute = s.VPCRoute.String()
|
||||
}
|
||||
if s.DefaultGateway != nil {
|
||||
subnet.DefaultGateway = s.DefaultGateway.String()
|
||||
}
|
||||
|
||||
if err := b.client(s).SetSubnet(subnet); err != nil {
|
||||
return fmt.Errorf("configure dhcp for %s: %w", s.Instance(), err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (b Two) 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 dhcp: %w", err)
|
||||
}
|
||||
}
|
||||
|
||||
return statefile.Remove(b.statePath(s))
|
||||
}
|
||||
|
||||
func (b Two) SetVM(s Subnet, vmName string, res []Reservation) error {
|
||||
client := b.client(s)
|
||||
|
||||
for _, r := range res {
|
||||
host := dhcpapi.Host{
|
||||
MAC: r.MAC,
|
||||
IP: r.IP,
|
||||
VM: vmName,
|
||||
DefaultRoute: r.DefaultRoute,
|
||||
}
|
||||
if err := client.SetHost(host); err != nil {
|
||||
return fmt.Errorf("reserve %s for vm %s on %s: %w", r.MAC, vmName, s.Instance(), err)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (b Two) DelVM(s Subnet, vmName string, res []Reservation) error {
|
||||
client := b.client(s)
|
||||
|
||||
for _, r := range res {
|
||||
if err := client.DelHost(r.MAC); err != nil {
|
||||
return fmt.Errorf("release %s of vm %s on %s: %w", r.MAC, vmName, s.Instance(), err)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue