f-33: net: add multi net in dispatch et vms #33
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
parent
1ec1d44c1a
commit
0237acba81
GPG key ID:
4406BBBF8845D632
15 changed files with 753 additions and 146 deletions
76
internal/migration/nic.go
Normal file
76
internal/migration/nic.go
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
package migration
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"strings"
|
||||
|
||||
"git.g3e.fr/syonad/two/pkg/db/kv"
|
||||
|
||||
"github.com/dgraph-io/badger/v4"
|
||||
)
|
||||
|
||||
// legacyNICKeys sont les clés d'interface d'avant le multi-subnet, portées
|
||||
// directement par la VM.
|
||||
var legacyNICKeys = []string{"subnet", "ip", "tap_id"}
|
||||
|
||||
// MigrateVMNICs déplace les clés d'interface de vm/<name>/<clé> vers
|
||||
// vm/<name>/nic/0/<clé> et marque cette interface comme primaire.
|
||||
//
|
||||
// Idempotente : une VM possédant déjà des clés nic/ est laissée telle quelle.
|
||||
// Sans cette migration, toute VM créée avant le passage au multi-subnet
|
||||
// deviendrait illisible par loadVM.
|
||||
func MigrateVMNICs(db *badger.DB, log *slog.Logger) error {
|
||||
entries, err := kv.ListByPrefix(db, "vm/")
|
||||
if err != nil {
|
||||
return fmt.Errorf("list vm/: %w", err)
|
||||
}
|
||||
|
||||
for _, name := range vmsToMigrate(entries) {
|
||||
for _, key := range legacyNICKeys {
|
||||
value, ok := entries["vm/"+name+"/"+key]
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
if err := kv.AddInDB(db, "vm/"+name+"/nic/0/"+key, value); err != nil {
|
||||
return fmt.Errorf("migrate %s of vm %s: %w", key, name, err)
|
||||
}
|
||||
if err := kv.DeleteInDB(db, "vm/"+name+"/"+key); err != nil {
|
||||
return fmt.Errorf("delete legacy %s of vm %s: %w", key, name, err)
|
||||
}
|
||||
}
|
||||
if err := kv.AddInDB(db, "vm/"+name+"/nic/0/primary", "true"); err != nil {
|
||||
return fmt.Errorf("mark nic 0 primary for vm %s: %w", name, err)
|
||||
}
|
||||
log.Info("vm nics migrated", "resource", "vm/"+name, "reason", "legacy single interface")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// vmsToMigrate retourne les VM portant l'ancien schéma et aucune clé nic/.
|
||||
func vmsToMigrate(entries map[string]string) []string {
|
||||
legacy := make(map[string]bool)
|
||||
migrated := make(map[string]bool)
|
||||
|
||||
for key := range entries {
|
||||
parts := strings.Split(key, "/")
|
||||
if len(parts) < 3 || parts[0] != "vm" {
|
||||
continue
|
||||
}
|
||||
name := parts[1]
|
||||
switch {
|
||||
case len(parts) == 3 && (parts[2] == "subnet" || parts[2] == "ip" || parts[2] == "tap_id"):
|
||||
legacy[name] = true
|
||||
case parts[2] == "nic":
|
||||
migrated[name] = true
|
||||
}
|
||||
}
|
||||
|
||||
var names []string
|
||||
for name := range legacy {
|
||||
if !migrated[name] {
|
||||
names = append(names, name)
|
||||
}
|
||||
}
|
||||
return names
|
||||
}
|
||||
136
internal/migration/nic_test.go
Normal file
136
internal/migration/nic_test.go
Normal file
|
|
@ -0,0 +1,136 @@
|
|||
package migration
|
||||
|
||||
import (
|
||||
"io"
|
||||
"log/slog"
|
||||
"testing"
|
||||
|
||||
"git.g3e.fr/syonad/two/pkg/db/kv"
|
||||
"github.com/dgraph-io/badger/v4"
|
||||
)
|
||||
|
||||
func newNICDB(t *testing.T) *badger.DB {
|
||||
t.Helper()
|
||||
db := kv.InitDB(kv.Config{Path: t.TempDir()}, false)
|
||||
t.Cleanup(func() { db.Close() })
|
||||
return db
|
||||
}
|
||||
|
||||
func quietLog() *slog.Logger {
|
||||
return slog.New(slog.NewTextHandler(io.Discard, nil))
|
||||
}
|
||||
|
||||
func seedLegacyVM(t *testing.T, db *badger.DB, name string) {
|
||||
t.Helper()
|
||||
kv.AddInDB(db, "vm/"+name+"/state", "running")
|
||||
kv.AddInDB(db, "vm/"+name+"/subnet", "sn-000001")
|
||||
kv.AddInDB(db, "vm/"+name+"/ip", "10.1.1.2")
|
||||
kv.AddInDB(db, "vm/"+name+"/tap_id", "12345678")
|
||||
}
|
||||
|
||||
func TestMigrateVMNICs_MovesLegacyKeys(t *testing.T) {
|
||||
db := newNICDB(t)
|
||||
seedLegacyVM(t, db, "i-test1")
|
||||
|
||||
if err := MigrateVMNICs(db, quietLog()); err != nil {
|
||||
t.Fatalf("MigrateVMNICs : %v", err)
|
||||
}
|
||||
|
||||
want := map[string]string{
|
||||
"vm/i-test1/nic/0/subnet": "sn-000001",
|
||||
"vm/i-test1/nic/0/ip": "10.1.1.2",
|
||||
"vm/i-test1/nic/0/tap_id": "12345678",
|
||||
"vm/i-test1/nic/0/primary": "true",
|
||||
}
|
||||
for key, expected := range want {
|
||||
got, err := kv.GetFromDB(db, key)
|
||||
if err != nil {
|
||||
t.Errorf("clé %s absente : %v", key, err)
|
||||
continue
|
||||
}
|
||||
if got != expected {
|
||||
t.Errorf("%s = %q, attendu %q", key, got, expected)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestMigrateVMNICs_RemovesLegacyKeys(t *testing.T) {
|
||||
db := newNICDB(t)
|
||||
seedLegacyVM(t, db, "i-test1")
|
||||
|
||||
if err := MigrateVMNICs(db, quietLog()); err != nil {
|
||||
t.Fatalf("MigrateVMNICs : %v", err)
|
||||
}
|
||||
|
||||
for _, key := range []string{"vm/i-test1/subnet", "vm/i-test1/ip", "vm/i-test1/tap_id"} {
|
||||
if _, err := kv.GetFromDB(db, key); err == nil {
|
||||
t.Errorf("clé héritée %s toujours présente", key)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestMigrateVMNICs_PreservesOtherKeys(t *testing.T) {
|
||||
db := newNICDB(t)
|
||||
seedLegacyVM(t, db, "i-test1")
|
||||
kv.AddInDB(db, "vm/i-test1/memory", "2048")
|
||||
kv.AddInDB(db, "vm/i-test1/disk/vda", "/data/root.qcow2")
|
||||
|
||||
if err := MigrateVMNICs(db, quietLog()); err != nil {
|
||||
t.Fatalf("MigrateVMNICs : %v", err)
|
||||
}
|
||||
|
||||
if got, _ := kv.GetFromDB(db, "vm/i-test1/memory"); got != "2048" {
|
||||
t.Errorf("memory altérée : %q", got)
|
||||
}
|
||||
if got, _ := kv.GetFromDB(db, "vm/i-test1/disk/vda"); got != "/data/root.qcow2" {
|
||||
t.Errorf("disque altéré : %q", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestMigrateVMNICs_Idempotent(t *testing.T) {
|
||||
db := newNICDB(t)
|
||||
seedLegacyVM(t, db, "i-test1")
|
||||
|
||||
if err := MigrateVMNICs(db, quietLog()); err != nil {
|
||||
t.Fatalf("premier passage : %v", err)
|
||||
}
|
||||
before, _ := kv.ListByPrefix(db, "vm/i-test1/")
|
||||
if err := MigrateVMNICs(db, quietLog()); err != nil {
|
||||
t.Fatalf("second passage : %v", err)
|
||||
}
|
||||
after, _ := kv.ListByPrefix(db, "vm/i-test1/")
|
||||
|
||||
if len(before) != len(after) {
|
||||
t.Errorf("le second passage a modifié la base : %d clés puis %d", len(before), len(after))
|
||||
}
|
||||
for key, value := range before {
|
||||
if after[key] != value {
|
||||
t.Errorf("%s : %q devenu %q", key, value, after[key])
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestMigrateVMNICs_LeavesMigratedVMsAlone(t *testing.T) {
|
||||
db := newNICDB(t)
|
||||
kv.AddInDB(db, "vm/i-multi/state", "running")
|
||||
kv.AddInDB(db, "vm/i-multi/nic/0/subnet", "sn-000001")
|
||||
kv.AddInDB(db, "vm/i-multi/nic/0/primary", "true")
|
||||
kv.AddInDB(db, "vm/i-multi/nic/1/subnet", "sn-000002")
|
||||
|
||||
if err := MigrateVMNICs(db, quietLog()); err != nil {
|
||||
t.Fatalf("MigrateVMNICs : %v", err)
|
||||
}
|
||||
|
||||
if got, _ := kv.GetFromDB(db, "vm/i-multi/nic/1/subnet"); got != "sn-000002" {
|
||||
t.Errorf("la seconde interface a été perdue : %q", got)
|
||||
}
|
||||
if _, err := kv.GetFromDB(db, "vm/i-multi/nic/0/primary"); err != nil {
|
||||
t.Error("la primaire existante a été perdue")
|
||||
}
|
||||
}
|
||||
|
||||
func TestMigrateVMNICs_EmptyDB(t *testing.T) {
|
||||
if err := MigrateVMNICs(newNICDB(t), quietLog()); err != nil {
|
||||
t.Errorf("une base vide ne doit pas échouer : %v", err)
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue