f-85: config: dhcp.backend vaut two par défaut, dnsmasq sur déclaration explicite, mise à jour depuis la 0.1.0 documentée #85

Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
GnomeZworc 2026-10-24 17:30:38 +02:00
commit 2c1279c5af
Signed by: nicolas.boufideline
GPG key ID: 4406BBBF8845D632
6 changed files with 27 additions and 21 deletions

View file

@ -31,27 +31,27 @@ func TestValidBackend_RejectsAnythingElse(t *testing.T) {
}
}
func TestLoadConfig_DefaultsToDnsmasq(t *testing.T) {
func TestLoadConfig_DefaultsToTwo(t *testing.T) {
path := writeConfig(t, "database:\n path: /tmp/two\n")
cfg, err := LoadConfig(path)
if err != nil {
t.Fatalf("LoadConfig: %v", err)
}
if cfg.DHCP.Backend != BackendDnsmasq {
t.Errorf("backend = %q, want %q: a 0.1.0 config must keep behaving as before", cfg.DHCP.Backend, BackendDnsmasq)
if cfg.DHCP.Backend != "two" {
t.Errorf("backend = %q, want two: the built-in server is the default since 0.2.0", cfg.DHCP.Backend)
}
}
func TestLoadConfig_ReadsTheTwoBackend(t *testing.T) {
path := writeConfig(t, "dhcp:\n backend: two\n")
func TestLoadConfig_ReadsTheDnsmasqBackend(t *testing.T) {
path := writeConfig(t, "dhcp:\n backend: dnsmasq\n")
cfg, err := LoadConfig(path)
if err != nil {
t.Fatalf("LoadConfig: %v", err)
}
if cfg.DHCP.Backend != BackendTwo {
t.Errorf("backend = %q, want two", cfg.DHCP.Backend)
if cfg.DHCP.Backend != "dnsmasq" {
t.Errorf("backend = %q, want dnsmasq: an explicit dnsmasq must survive the new default", cfg.DHCP.Backend)
}
}
@ -76,7 +76,7 @@ func TestLoadConfig_MissingFileStillFallsBackToDefaults(t *testing.T) {
if err != nil {
t.Fatalf("an absent file remains valid, only an unreadable one is an error: %v", err)
}
if cfg.DHCP.Backend != BackendDnsmasq {
t.Errorf("backend = %q, want %q", cfg.DHCP.Backend, BackendDnsmasq)
if cfg.DHCP.Backend != "two" {
t.Errorf("backend = %q, want two", cfg.DHCP.Backend)
}
}

View file

@ -76,7 +76,7 @@ func LoadConfig(path string) (*Config, error) {
v.SetDefault("dispatcher.timeout_seconds", 300)
v.SetDefault("dispatcher.poll_seconds", 2)
v.SetDefault("metadata.run_dir", "/run/two/metadata")
v.SetDefault("dhcp.backend", BackendDnsmasq)
v.SetDefault("dhcp.backend", BackendTwo)
v.SetDefault("qemu.ovmf_code_path", "/usr/share/OVMF/OVMF_CODE.fd")
v.SetDefault("qemu.ovmf_vars_template", "/usr/share/OVMF/OVMF_VARS.fd")
v.SetDefault("qemu.uefi_vars_dir", "/run/two/vms/uefi")