From 450d0c801ac5d10f34ddaad86c45c9e2b71036f1 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,=20m=C3=A9trique=20croissante=20des=20NIC=20secondaires?= =?UTF-8?q?=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 | 26 +++++++++++--- internal/metadata/struct.go | 6 ++++ .../metadata/templates/network-config.tmpl | 8 ++++- internal/vm/create.go | 15 ++++++++ internal/vm/create_test.go | 36 +++++++++++++++++++ 5 files changed, 85 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..89f9bbf 100644 --- a/internal/metadata/metadata_test.go +++ b/internal/metadata/metadata_test.go @@ -78,14 +78,30 @@ 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.NICs = []NIC{{MAC: "52:54:00:49:01:0c", RouteMetric: 100}, {MAC: "52:54:00:49:02:16", RouteMetric: 200}} + 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 + dhcp4-overrides: + route-metric: 100 + eth1: + match: + macaddress: "52:54:00:49:02:16" + dhcp4: true + dhcp4-overrides: + route-metric: 200 +` + 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..1a8a39f 100644 --- a/internal/metadata/struct.go +++ b/internal/metadata/struct.go @@ -27,5 +27,11 @@ type NoCloudConfig struct { Name string Password string SSHKEY string + NICs []NIC Documents map[string]string } + +type NIC struct { + MAC string + RouteMetric int +} diff --git a/internal/metadata/templates/network-config.tmpl b/internal/metadata/templates/network-config.tmpl index 0f8d052..16d6b2b 100644 --- a/internal/metadata/templates/network-config.tmpl +++ b/internal/metadata/templates/network-config.tmpl @@ -1,4 +1,10 @@ version: 2 ethernets: - eth0: +{{- range $i, $nic := .NICs }} + eth{{ $i }}: + match: + macaddress: "{{ $nic.MAC }}" dhcp4: true + dhcp4-overrides: + route-metric: {{ $nic.RouteMetric }} +{{- end }} diff --git a/internal/vm/create.go b/internal/vm/create.go index 1318750..51111f4 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, + NICs: metadataNICs(d.nics), Documents: d.documents, }, cfg, false); err != nil { return fmt.Errorf("start metadata: %w", err) @@ -171,3 +173,16 @@ func copyFile(src, dst string) error { } return out.Sync() } + +func metadataNICs(nics []nicData) []metadata.NIC { + out := make([]metadata.NIC, len(nics)) + next := 200 + for i, n := range nics { + out[i] = metadata.NIC{MAC: strings.ToLower(n.mac), RouteMetric: 100} + if !n.primary { + out[i].RouteMetric = next + next += 100 + } + } + return out +} diff --git a/internal/vm/create_test.go b/internal/vm/create_test.go new file mode 100644 index 0000000..a5e616b --- /dev/null +++ b/internal/vm/create_test.go @@ -0,0 +1,36 @@ +package vm + +import ( + "reflect" + "testing" + + "git.g3e.fr/syonad/two/internal/metadata" +) + +func TestMetadataNICs_PrimaryKeepsTheLowestMetricWhateverItsPosition(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}, + {index: 2, mac: "52:54:00:49:03:20"}, + } + + got := metadataNICs(nics) + + want := []metadata.NIC{ + {MAC: "52:54:00:49:01:0c", RouteMetric: 200}, + {MAC: "52:54:00:49:02:16", RouteMetric: 100}, + {MAC: "52:54:00:49:03:20", RouteMetric: 300}, + } + if !reflect.DeepEqual(got, want) { + t.Errorf("metadataNICs = %+v, attendu %+v", got, want) + } +} + +func TestMetadataNICs_SingleInterface(t *testing.T) { + got := metadataNICs([]nicData{{mac: "52:54:00:00:00:05", primary: true}}) + + want := []metadata.NIC{{MAC: "52:54:00:00:00:05", RouteMetric: 100}} + if !reflect.DeepEqual(got, want) { + t.Errorf("metadataNICs = %+v, attendu %+v", got, want) + } +}