From 6c0e05e1e76b1977e4239bd0994aa848170c63d5 Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Sun, 11 Oct 2026 23:41:49 +0200 Subject: [PATCH] =?UTF-8?q?f-41:=20lab:=20FRR=20apr=C3=A8s=20deploy.sh=20p?= =?UTF-8?q?uis=20red=C3=A9marrage=20de=20l'agent,=20base=20BGP=20par=20l'a?= =?UTF-8?q?gent=20#41?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: GnomeZworc --- cmd/labctl/main_test.go | 16 +++++++++------- internal/render/roles_test.go | 2 +- internal/render/seed.go | 3 +++ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/cmd/labctl/main_test.go b/cmd/labctl/main_test.go index 733fd3c..4b4ac5e 100644 --- a/cmd/labctl/main_test.go +++ b/cmd/labctl/main_test.go @@ -312,18 +312,20 @@ func TestRun_RenderShipsTheExampleFRRConfigs(t *testing.T) { if code != 0 { t.Fatalf("code %d, stderr %s", code, stderr) } - for node, want := range map[string]string{ - "sw1": "router bgp 65100", - "rr1": "bgp listen range 192.168.14.0/24 peer-group fabric", - "hv1": "bgp router-id 192.168.14.11", - "hv2": "bgp router-id 192.168.14.12", + for node, wants := range map[string][]string{ + "sw1": {"router bgp 65100"}, + "rr1": {"bgp listen range 192.168.14.0/24 peer-group fabric"}, + "hv1": {"hostname hv1", "route_reflectors: [10.255.255.1]"}, + "hv2": {"hostname hv2", "route_reflectors: [10.255.255.1]"}, } { data, err := os.ReadFile(filepath.Join(out, node, "user-data")) if err != nil { t.Fatal(err) } - if !strings.Contains(string(data), want) { - t.Errorf("%s user-data does not carry %q", node, want) + for _, want := range wants { + if !strings.Contains(string(data), want) { + t.Errorf("%s user-data does not carry %q", node, want) + } } } } diff --git a/internal/render/roles_test.go b/internal/render/roles_test.go index fd0e0de..c62a805 100644 --- a/internal/render/roles_test.go +++ b/internal/render/roles_test.go @@ -147,7 +147,7 @@ func TestRoles_ProvisioningIsOneScriptThatStopsAtTheFirstFailure(t *testing.T) { nodes := renderRoles(t) for name, steps := range map[string]string{ "sw1": "systemctl daemon-reload\nsystemctl enable --now lab-switch.service\n/usr/local/sbin/lab-frr\n", - "hv1": "/usr/local/sbin/lab-deploy\n/usr/local/sbin/lab-frr\n", + "hv1": "/usr/local/sbin/lab-deploy\n/usr/local/sbin/lab-frr\nsystemctl restart agent.service\n", "hv2": "/usr/local/sbin/lab-deploy\n", } { cfg := user(t, nodeNamed(t, nodes, name)) diff --git a/internal/render/seed.go b/internal/render/seed.go index 0255140..34ef572 100644 --- a/internal/render/seed.go +++ b/internal/render/seed.go @@ -133,6 +133,9 @@ func userData(p *topology.Plan, n topology.NodePlan, o Options) ([]byte, error) writeFile{Path: FRRScript, Permissions: "0755", Content: frrScript(n)}, ) steps = append(steps, FRRScript) + if n.Role == topology.RoleHypervisor { + steps = append(steps, "systemctl restart agent.service") + } } if len(steps) > 0 { cfg.WriteFiles = append(cfg.WriteFiles,