From 181fc24d1c396c384301b6fa91a81f45cf40f4e2 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/lab/main_test.go | 16 ++++++++------- internal/lab/render/roles_test.go | 2 +- internal/lab/render/seed.go | 3 +++ test/e2e/topologies/agent/bgp.yml | 6 ++++++ test/e2e/topologies/agent/two.yml | 6 ++++++ test/e2e/topologies/evpn-2hv.yml | 5 +++-- test/e2e/topologies/evpn-3hv.yml | 33 +++++++++++++++++++++++++++++++ test/e2e/topologies/frr/hv1.conf | 15 -------------- test/e2e/topologies/frr/hv2.conf | 15 -------------- test/e2e/topologies/frr/hv3.conf | 4 ++++ 10 files changed, 65 insertions(+), 40 deletions(-) create mode 100644 test/e2e/topologies/agent/bgp.yml create mode 100644 test/e2e/topologies/evpn-3hv.yml create mode 100644 test/e2e/topologies/frr/hv3.conf diff --git a/cmd/lab/main_test.go b/cmd/lab/main_test.go index 733fd3c..4b4ac5e 100644 --- a/cmd/lab/main_test.go +++ b/cmd/lab/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/lab/render/roles_test.go b/internal/lab/render/roles_test.go index fd0e0de..c62a805 100644 --- a/internal/lab/render/roles_test.go +++ b/internal/lab/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/lab/render/seed.go b/internal/lab/render/seed.go index 0255140..34ef572 100644 --- a/internal/lab/render/seed.go +++ b/internal/lab/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, diff --git a/test/e2e/topologies/agent/bgp.yml b/test/e2e/topologies/agent/bgp.yml new file mode 100644 index 0000000..0ee09a4 --- /dev/null +++ b/test/e2e/topologies/agent/bgp.yml @@ -0,0 +1,6 @@ +bgp: + asn: 64600 + route_reflectors: [10.255.255.1] +watchdog: + enabled: true + interval_seconds: 10 diff --git a/test/e2e/topologies/agent/two.yml b/test/e2e/topologies/agent/two.yml index 6334d32..47d7f5e 100644 --- a/test/e2e/topologies/agent/two.yml +++ b/test/e2e/topologies/agent/two.yml @@ -1,2 +1,8 @@ dhcp: backend: two +bgp: + asn: 64600 + route_reflectors: [10.255.255.1] +watchdog: + enabled: true + interval_seconds: 10 diff --git a/test/e2e/topologies/evpn-2hv.yml b/test/e2e/topologies/evpn-2hv.yml index 0176ef1..3faa984 100644 --- a/test/e2e/topologies/evpn-2hv.yml +++ b/test/e2e/topologies/evpn-2hv.yml @@ -21,8 +21,9 @@ nodes: loopback: 10.255.255.1/32, frr: frr/rr1.conf } hv1: { role: hypervisor, image: debian12, cpus: 4, memory: 16384, segments: [underlay], - addresses: { underlay: 192.168.14.11 }, frr: frr/hv1.conf, release: 0.2.0rc003, + addresses: { underlay: 192.168.14.11 }, frr: frr/hv1.conf, release: 0.2.0rc005, agent: agent/two.yml } hv2: { role: hypervisor, image: debian12, cpus: 4, memory: 16384, segments: [underlay], - addresses: { underlay: 192.168.14.12 }, frr: frr/hv2.conf, release: 0.2.0rc003 } + addresses: { underlay: 192.168.14.12 }, frr: frr/hv2.conf, release: 0.2.0rc005, + agent: agent/bgp.yml } diff --git a/test/e2e/topologies/evpn-3hv.yml b/test/e2e/topologies/evpn-3hv.yml new file mode 100644 index 0000000..b0e794d --- /dev/null +++ b/test/e2e/topologies/evpn-3hv.yml @@ -0,0 +1,33 @@ +name: evpn-3hv + +images: + debian12: + url: https://cloud.debian.org/images/cloud/bookworm/latest/debian-12-generic-amd64.qcow2 + sums: https://cloud.debian.org/images/cloud/bookworm/latest/SHA512SUMS + +segments: + underlay: + switch: sw1 + cidr: 192.168.14.0/24 + mtu: 9000 + +nodes: + sw1: + { role: switch, image: debian12, cpus: 2, memory: 1024, + secondary: { underlay: [169.254.0.1/28] }, frr: frr/sw1.conf } + rr1: + { role: rr, image: debian12, cpus: 1, memory: 1024, segments: [underlay], + addresses: { underlay: 192.168.14.2 }, secondary: { underlay: [169.254.0.3/28] }, + loopback: 10.255.255.1/32, frr: frr/rr1.conf } + hv1: + { role: hypervisor, image: debian12, cpus: 4, memory: 16384, segments: [underlay], + addresses: { underlay: 192.168.14.11 }, frr: frr/hv1.conf, release: 0.2.0rc005, + agent: agent/two.yml } + hv2: + { role: hypervisor, image: debian12, cpus: 4, memory: 16384, segments: [underlay], + addresses: { underlay: 192.168.14.12 }, frr: frr/hv2.conf, release: 0.2.0rc005, + agent: agent/bgp.yml } + hv3: + { role: hypervisor, image: debian12, cpus: 4, memory: 16384, segments: [underlay], + addresses: { underlay: 192.168.14.13 }, frr: frr/hv3.conf, release: 0.2.0rc005, + agent: agent/bgp.yml } diff --git a/test/e2e/topologies/frr/hv1.conf b/test/e2e/topologies/frr/hv1.conf index ecf9e12..fd12d21 100644 --- a/test/e2e/topologies/frr/hv1.conf +++ b/test/e2e/topologies/frr/hv1.conf @@ -2,18 +2,3 @@ frr defaults traditional hostname hv1 log syslog informational ! -router bgp 64600 - bgp router-id 192.168.14.11 - no bgp default ipv4-unicast - neighbor fabric peer-group - neighbor fabric remote-as 64600 - neighbor fabric capability extended-nexthop - neighbor 10.255.255.1 peer-group fabric - ! - address-family l2vpn evpn - neighbor fabric activate - advertise-all-vni - exit-address-family - ! -exit -! diff --git a/test/e2e/topologies/frr/hv2.conf b/test/e2e/topologies/frr/hv2.conf index 5d0e0d9..e6eb488 100644 --- a/test/e2e/topologies/frr/hv2.conf +++ b/test/e2e/topologies/frr/hv2.conf @@ -2,18 +2,3 @@ frr defaults traditional hostname hv2 log syslog informational ! -router bgp 64600 - bgp router-id 192.168.14.12 - no bgp default ipv4-unicast - neighbor fabric peer-group - neighbor fabric remote-as 64600 - neighbor fabric capability extended-nexthop - neighbor 10.255.255.1 peer-group fabric - ! - address-family l2vpn evpn - neighbor fabric activate - advertise-all-vni - exit-address-family - ! -exit -! diff --git a/test/e2e/topologies/frr/hv3.conf b/test/e2e/topologies/frr/hv3.conf new file mode 100644 index 0000000..f79906e --- /dev/null +++ b/test/e2e/topologies/frr/hv3.conf @@ -0,0 +1,4 @@ +frr defaults traditional +hostname hv3 +log syslog informational +!