From a6ad0962a6d1ebe929d58f29ae078f85cbc2e8cc Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Tue, 20 Oct 2026 00:36:14 +0200 Subject: [PATCH] =?UTF-8?q?f-73:=20metadata:=20network-config=20par=20VM,?= =?UTF-8?q?=20une=20entr=C3=A9e=20ethN=20par=20NIC=20vis=C3=A9e=20par=20sa?= =?UTF-8?q?=20MAC=20#73?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: GnomeZworc --- internal/metadata/metadata_test.go | 22 ++++++++++++++----- internal/metadata/struct.go | 1 + .../metadata/templates/network-config.tmpl | 6 ++++- internal/vm/create.go | 10 +++++++++ internal/vm/create_test.go | 20 +++++++++++++++++ 5 files changed, 53 insertions(+), 6 deletions(-) create mode 100644 internal/vm/create_test.go diff --git a/internal/metadata/metadata_test.go b/internal/metadata/metadata_test.go index 4efff81..2c4b093 100644 --- a/internal/metadata/metadata_test.go +++ b/internal/metadata/metadata_test.go @@ -78,14 +78,26 @@ func TestRenderConfig_VendorData_ContainsSSHKey(t *testing.T) { } } -func TestRenderConfig_NetworkConfig(t *testing.T) { +func TestRenderConfig_NetworkConfigMatchesEveryInterfaceByMAC(t *testing.T) { cfg := newCfg() - out, err := RenderConfig("templates/network-config.tmpl", cfg) + cfg.MACs = []string{"52:54:00:49:01:0c", "52:54:00:49:02:16"} + out, err := renderDocument(DocNetworkConfig, cfg) if err != nil { - t.Fatalf("RenderConfig network-config : %v", err) + t.Fatalf("renderDocument network-config : %v", err) } - if !strings.Contains(out, "dhcp4: true") { - t.Errorf("dhcp4 absent du network-config :\n%s", out) + want := `version: 2 +ethernets: + eth0: + match: + macaddress: "52:54:00:49:01:0c" + dhcp4: true + eth1: + match: + macaddress: "52:54:00:49:02:16" + dhcp4: true +` + if out != want { + t.Errorf("network-config :\n%s\nattendu :\n%s", out, want) } } diff --git a/internal/metadata/struct.go b/internal/metadata/struct.go index 39592ed..d30e7ea 100644 --- a/internal/metadata/struct.go +++ b/internal/metadata/struct.go @@ -27,5 +27,6 @@ type NoCloudConfig struct { Name string Password string SSHKEY string + MACs []string Documents map[string]string } diff --git a/internal/metadata/templates/network-config.tmpl b/internal/metadata/templates/network-config.tmpl index 0f8d052..62af00c 100644 --- a/internal/metadata/templates/network-config.tmpl +++ b/internal/metadata/templates/network-config.tmpl @@ -1,4 +1,8 @@ version: 2 ethernets: - eth0: +{{- range $i, $mac := .MACs }} + eth{{ $i }}: + match: + macaddress: "{{ $mac }}" dhcp4: true +{{- end }} diff --git a/internal/vm/create.go b/internal/vm/create.go index 1318750..fc2bf0c 100644 --- a/internal/vm/create.go +++ b/internal/vm/create.go @@ -6,6 +6,7 @@ import ( "net" "os" "path/filepath" + "strings" configuration "git.g3e.fr/syonad/two/internal/config/agent" "git.g3e.fr/syonad/two/internal/dhcpbackend" @@ -71,6 +72,7 @@ func StartVM(db *badger.DB, name string, cfg *configuration.Config) error { BindPort: d.metadataPort, Password: d.password, SSHKEY: d.sshkey, + MACs: nicMACs(d.nics), Documents: d.documents, }, cfg, false); err != nil { return fmt.Errorf("start metadata: %w", err) @@ -171,3 +173,11 @@ func copyFile(src, dst string) error { } return out.Sync() } + +func nicMACs(nics []nicData) []string { + macs := make([]string, len(nics)) + for i, n := range nics { + macs[i] = strings.ToLower(n.mac) + } + return macs +} diff --git a/internal/vm/create_test.go b/internal/vm/create_test.go new file mode 100644 index 0000000..1ed9bd2 --- /dev/null +++ b/internal/vm/create_test.go @@ -0,0 +1,20 @@ +package vm + +import ( + "reflect" + "testing" +) + +func TestNicMACs_KeepsTheOrderAndLowersTheCase(t *testing.T) { + nics := []nicData{ + {index: 0, mac: "52:54:00:49:01:0C"}, + {index: 1, mac: "52:54:00:49:02:16", primary: true}, + } + + got := nicMACs(nics) + + want := []string{"52:54:00:49:01:0c", "52:54:00:49:02:16"} + if !reflect.DeepEqual(got, want) { + t.Errorf("nicMACs = %v, attendu %v", got, want) + } +}