feature-25 #26

Manually merged
nicolas.boufideline merged 21 commits from feature-25 into main 2026-05-18 17:44:48 +00:00
Showing only changes of commit f005d9dde7 - Show all commits

f-25: vm: use db data to find mac address

Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
GnomeZworc 2026-04-26 18:08:50 +02:00
Signed by: nicolas.boufideline
GPG key ID: 4406BBBF8845D632

View file

@ -6,6 +6,7 @@ import (
"strconv"
"strings"
"git.g3e.fr/syonad/two/internal/dhcp"
"git.g3e.fr/syonad/two/pkg/db/kv"
"github.com/dgraph-io/badger/v4"
)
@ -74,9 +75,9 @@ func loadVM(db *badger.DB, name string) (vmData, error) {
}
d.metadataPort = metadataPort
mac, err := kv.GetFromDB(db, "vm/"+name+"/mac")
mac, err := dhcp.GetMACForIP(db, d.subnetName, d.ip)
if err != nil {
return d, fmt.Errorf("get mac: %w", err)
return d, fmt.Errorf("get mac for ip %s: %w", d.ip, err)
}
d.mac = mac