f-41: lab: FRR après deploy.sh puis redémarrage de l'agent, base BGP par l'agent #41
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
parent
1b80b1c7b6
commit
181fc24d1c
10 changed files with 65 additions and 40 deletions
|
|
@ -312,18 +312,20 @@ func TestRun_RenderShipsTheExampleFRRConfigs(t *testing.T) {
|
||||||
if code != 0 {
|
if code != 0 {
|
||||||
t.Fatalf("code %d, stderr %s", code, stderr)
|
t.Fatalf("code %d, stderr %s", code, stderr)
|
||||||
}
|
}
|
||||||
for node, want := range map[string]string{
|
for node, wants := range map[string][]string{
|
||||||
"sw1": "router bgp 65100",
|
"sw1": {"router bgp 65100"},
|
||||||
"rr1": "bgp listen range 192.168.14.0/24 peer-group fabric",
|
"rr1": {"bgp listen range 192.168.14.0/24 peer-group fabric"},
|
||||||
"hv1": "bgp router-id 192.168.14.11",
|
"hv1": {"hostname hv1", "route_reflectors: [10.255.255.1]"},
|
||||||
"hv2": "bgp router-id 192.168.14.12",
|
"hv2": {"hostname hv2", "route_reflectors: [10.255.255.1]"},
|
||||||
} {
|
} {
|
||||||
data, err := os.ReadFile(filepath.Join(out, node, "user-data"))
|
data, err := os.ReadFile(filepath.Join(out, node, "user-data"))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
if !strings.Contains(string(data), want) {
|
for _, want := range wants {
|
||||||
t.Errorf("%s user-data does not carry %q", node, want)
|
if !strings.Contains(string(data), want) {
|
||||||
|
t.Errorf("%s user-data does not carry %q", node, want)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -147,7 +147,7 @@ func TestRoles_ProvisioningIsOneScriptThatStopsAtTheFirstFailure(t *testing.T) {
|
||||||
nodes := renderRoles(t)
|
nodes := renderRoles(t)
|
||||||
for name, steps := range map[string]string{
|
for name, steps := range map[string]string{
|
||||||
"sw1": "systemctl daemon-reload\nsystemctl enable --now lab-switch.service\n/usr/local/sbin/lab-frr\n",
|
"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",
|
"hv2": "/usr/local/sbin/lab-deploy\n",
|
||||||
} {
|
} {
|
||||||
cfg := user(t, nodeNamed(t, nodes, name))
|
cfg := user(t, nodeNamed(t, nodes, name))
|
||||||
|
|
|
||||||
|
|
@ -133,6 +133,9 @@ func userData(p *topology.Plan, n topology.NodePlan, o Options) ([]byte, error)
|
||||||
writeFile{Path: FRRScript, Permissions: "0755", Content: frrScript(n)},
|
writeFile{Path: FRRScript, Permissions: "0755", Content: frrScript(n)},
|
||||||
)
|
)
|
||||||
steps = append(steps, FRRScript)
|
steps = append(steps, FRRScript)
|
||||||
|
if n.Role == topology.RoleHypervisor {
|
||||||
|
steps = append(steps, "systemctl restart agent.service")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if len(steps) > 0 {
|
if len(steps) > 0 {
|
||||||
cfg.WriteFiles = append(cfg.WriteFiles,
|
cfg.WriteFiles = append(cfg.WriteFiles,
|
||||||
|
|
|
||||||
6
test/e2e/topologies/agent/bgp.yml
Normal file
6
test/e2e/topologies/agent/bgp.yml
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
bgp:
|
||||||
|
asn: 64600
|
||||||
|
route_reflectors: [10.255.255.1]
|
||||||
|
watchdog:
|
||||||
|
enabled: true
|
||||||
|
interval_seconds: 10
|
||||||
|
|
@ -1,2 +1,8 @@
|
||||||
dhcp:
|
dhcp:
|
||||||
backend: two
|
backend: two
|
||||||
|
bgp:
|
||||||
|
asn: 64600
|
||||||
|
route_reflectors: [10.255.255.1]
|
||||||
|
watchdog:
|
||||||
|
enabled: true
|
||||||
|
interval_seconds: 10
|
||||||
|
|
|
||||||
|
|
@ -21,8 +21,9 @@ nodes:
|
||||||
loopback: 10.255.255.1/32, frr: frr/rr1.conf }
|
loopback: 10.255.255.1/32, frr: frr/rr1.conf }
|
||||||
hv1:
|
hv1:
|
||||||
{ role: hypervisor, image: debian12, cpus: 4, memory: 16384, segments: [underlay],
|
{ 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 }
|
agent: agent/two.yml }
|
||||||
hv2:
|
hv2:
|
||||||
{ role: hypervisor, image: debian12, cpus: 4, memory: 16384, segments: [underlay],
|
{ 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 }
|
||||||
|
|
|
||||||
33
test/e2e/topologies/evpn-3hv.yml
Normal file
33
test/e2e/topologies/evpn-3hv.yml
Normal file
|
|
@ -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 }
|
||||||
|
|
@ -2,18 +2,3 @@ frr defaults traditional
|
||||||
hostname hv1
|
hostname hv1
|
||||||
log syslog informational
|
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
|
|
||||||
!
|
|
||||||
|
|
|
||||||
|
|
@ -2,18 +2,3 @@ frr defaults traditional
|
||||||
hostname hv2
|
hostname hv2
|
||||||
log syslog informational
|
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
|
|
||||||
!
|
|
||||||
|
|
|
||||||
4
test/e2e/topologies/frr/hv3.conf
Normal file
4
test/e2e/topologies/frr/hv3.conf
Normal file
|
|
@ -0,0 +1,4 @@
|
||||||
|
frr defaults traditional
|
||||||
|
hostname hv3
|
||||||
|
log syslog informational
|
||||||
|
!
|
||||||
Loading…
Add table
Add a link
Reference in a new issue