From 36acd7da0675f8a9e924c33c0179ed5bf6105b2c Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Sat, 17 Oct 2026 19:19:24 +0200 Subject: [PATCH] f-70: lab: segment lan et br-lan pour le mode bridge, backend dnsmasq explicite #70 Signed-off-by: GnomeZworc --- test/e2e/topologies/agent/dnsmasq.yml | 4 ++++ test/e2e/topologies/agent/two.yml | 2 ++ test/e2e/topologies/evpn-2hv.yml | 15 ++++++++++----- test/e2e/topologies/evpn-3hv.yml | 17 +++++++++++------ test/e2e/topologies/provision/hypervisor.sh | 11 +++++++++++ 5 files changed, 38 insertions(+), 11 deletions(-) diff --git a/test/e2e/topologies/agent/dnsmasq.yml b/test/e2e/topologies/agent/dnsmasq.yml index 9c2fa98..85473f1 100644 --- a/test/e2e/topologies/agent/dnsmasq.yml +++ b/test/e2e/topologies/agent/dnsmasq.yml @@ -4,3 +4,7 @@ bgp: watchdog: enabled: true interval_seconds: 10 +dhcp: + backend: dnsmasq +interfaces: + lan: br-lan diff --git a/test/e2e/topologies/agent/two.yml b/test/e2e/topologies/agent/two.yml index 77bea87..0abf0b4 100644 --- a/test/e2e/topologies/agent/two.yml +++ b/test/e2e/topologies/agent/two.yml @@ -6,3 +6,5 @@ bgp: watchdog: enabled: true interval_seconds: 10 +interfaces: + lan: br-lan diff --git a/test/e2e/topologies/evpn-2hv.yml b/test/e2e/topologies/evpn-2hv.yml index b7b192c..8041ab3 100644 --- a/test/e2e/topologies/evpn-2hv.yml +++ b/test/e2e/topologies/evpn-2hv.yml @@ -10,6 +10,9 @@ segments: routers: [sw1, sw2] cidr: 192.168.14.0/24 mtu: 9000 + lan: + cidr: 10.33.0.0/24 + mtu: 1500 nodes: sw1: @@ -29,12 +32,14 @@ nodes: addresses: { underlay: 192.168.14.5 }, secondary: { underlay: [169.254.0.4/28] }, loopback: 10.255.255.2/32, frr: frr/rr2.conf } hv1: - { role: host, image: debian12, cpus: 4, memory: 16384, segments: [underlay], - addresses: { underlay: 192.168.14.11 }, frr: frr/hv1.conf, provision: provision/hypervisor.sh, + { role: host, image: debian12, cpus: 4, memory: 16384, + segments: [underlay, lan], addresses: { underlay: 192.168.14.11, lan: 10.33.0.11 }, + frr: frr/hv1.conf, provision: provision/hypervisor.sh, post_provision: provision/hypervisor-post.sh, files: { agent.yml: agent/two.yml, bin: bin }, services: [agent.service] } hv2: - { role: host, image: debian12, cpus: 4, memory: 16384, segments: [underlay], - addresses: { underlay: 192.168.14.12 }, frr: frr/hv2.conf, provision: provision/hypervisor.sh, - post_provision: provision/hypervisor-post.sh, files: { agent.yml: agent/bgp.yml, bin: bin }, + { role: host, image: debian12, cpus: 4, memory: 16384, + segments: [underlay, lan], addresses: { underlay: 192.168.14.12, lan: 10.33.0.12 }, + frr: frr/hv2.conf, provision: provision/hypervisor.sh, + post_provision: provision/hypervisor-post.sh, files: { agent.yml: agent/dnsmasq.yml, bin: bin }, services: [agent.service] } diff --git a/test/e2e/topologies/evpn-3hv.yml b/test/e2e/topologies/evpn-3hv.yml index c2b6cbf..58c38d5 100644 --- a/test/e2e/topologies/evpn-3hv.yml +++ b/test/e2e/topologies/evpn-3hv.yml @@ -10,6 +10,9 @@ segments: routers: [sw1, sw2] cidr: 192.168.14.0/24 mtu: 9000 + lan: + cidr: 10.33.0.0/24 + mtu: 1500 nodes: sw1: @@ -29,17 +32,19 @@ nodes: addresses: { underlay: 192.168.14.5 }, secondary: { underlay: [169.254.0.4/28] }, loopback: 10.255.255.2/32, frr: frr/rr2.conf } hv1: - { role: host, image: debian12, cpus: 4, memory: 16384, segments: [underlay], - addresses: { underlay: 192.168.14.11 }, frr: frr/hv1.conf, provision: provision/hypervisor.sh, + { role: host, image: debian12, cpus: 4, memory: 16384, + segments: [underlay, lan], addresses: { underlay: 192.168.14.11, lan: 10.33.0.11 }, + frr: frr/hv1.conf, provision: provision/hypervisor.sh, post_provision: provision/hypervisor-post.sh, files: { agent.yml: agent/two.yml, bin: bin }, services: [agent.service] } hv2: - { role: host, image: debian12, cpus: 4, memory: 16384, segments: [underlay], - addresses: { underlay: 192.168.14.12 }, frr: frr/hv2.conf, provision: provision/hypervisor.sh, - post_provision: provision/hypervisor-post.sh, files: { agent.yml: agent/bgp.yml, bin: bin }, + { role: host, image: debian12, cpus: 4, memory: 16384, + segments: [underlay, lan], addresses: { underlay: 192.168.14.12, lan: 10.33.0.12 }, + frr: frr/hv2.conf, provision: provision/hypervisor.sh, + post_provision: provision/hypervisor-post.sh, files: { agent.yml: agent/dnsmasq.yml, bin: bin }, services: [agent.service] } hv3: { role: host, image: debian12, cpus: 4, memory: 16384, segments: [underlay], addresses: { underlay: 192.168.14.13 }, frr: frr/hv3.conf, provision: provision/hypervisor.sh, - post_provision: provision/hypervisor-post.sh, files: { agent.yml: agent/bgp.yml, bin: bin }, + post_provision: provision/hypervisor-post.sh, files: { agent.yml: agent/dnsmasq.yml, bin: bin }, services: [agent.service] } diff --git a/test/e2e/topologies/provision/hypervisor.sh b/test/e2e/topologies/provision/hypervisor.sh index 20b10e5..40e22af 100755 --- a/test/e2e/topologies/provision/hypervisor.sh +++ b/test/e2e/topologies/provision/hypervisor.sh @@ -10,6 +10,17 @@ until curl -fsS -o /dev/null "${GIT_SERVER}"; do sleep 10 done install -D -m 0640 "${LAB_FILES}/agent.yml" /etc/two/agent.yml +if [ -e /sys/class/net/lan ]; then + addr=$(ip -4 -o addr show dev lan | awk '{print $4}' | head -n 1) + ip link show br-lan >/dev/null 2>&1 || ip link add name br-lan type bridge stp_state 0 + ip link set dev br-lan mtu "$(cat /sys/class/net/lan/mtu)" + ip link set dev lan master br-lan + ip link set dev br-lan up + if [ -n "${addr}" ]; then + ip addr del "${addr}" dev lan + ip addr replace "${addr}" dev br-lan + fi +fi mkdir -p /opt/two/scripts cd /opt/two/scripts for script in deploy.sh bootstrap_kvm.sh; do