f-41: l3vni: suppression d'une VPC routée sans section bgp #41
All checks were successful
Documentation / publish (push) Successful in 1m28s
Release Pipeline / set-release-target (push) Successful in 2s
Release Pipeline / upload-assets (agent.service, systemd/agent.service) (push) Successful in 7s
Release Pipeline / upload-assets (dhcp@.service, systemd/dhcp@.service) (push) Successful in 7s
Release Pipeline / upload-assets (dnsmasq@.service, systemd/dnsmasq@.service) (push) Successful in 7s
Release Pipeline / upload-assets (metadata@.service, systemd/metadata@.service) (push) Successful in 7s
Release Pipeline / upload-assets (run-dhcp-in-netns.sh, scripts/run-dhcp-in-netns.sh) (push) Successful in 7s
Release Pipeline / upload-assets (run-dnsmasq-in-netns.sh, scripts/run-dnsmasq-in-netns.sh) (push) Successful in 7s
Release Pipeline / build (agent, amd64, linux) (push) Successful in 0s
Release Pipeline / build (dhcp, amd64, linux) (push) Successful in 0s
Release Pipeline / build (metadata, amd64, linux) (push) Successful in 0s
Release Pipeline / checksums (push) Successful in 8s
Release Pipeline / build (push) Successful in 2m21s
Release Pipeline / release (push) Successful in 31s
Release Pipeline / publish (push) Successful in 0s
All checks were successful
Documentation / publish (push) Successful in 1m28s
Release Pipeline / set-release-target (push) Successful in 2s
Release Pipeline / upload-assets (agent.service, systemd/agent.service) (push) Successful in 7s
Release Pipeline / upload-assets (dhcp@.service, systemd/dhcp@.service) (push) Successful in 7s
Release Pipeline / upload-assets (dnsmasq@.service, systemd/dnsmasq@.service) (push) Successful in 7s
Release Pipeline / upload-assets (metadata@.service, systemd/metadata@.service) (push) Successful in 7s
Release Pipeline / upload-assets (run-dhcp-in-netns.sh, scripts/run-dhcp-in-netns.sh) (push) Successful in 7s
Release Pipeline / upload-assets (run-dnsmasq-in-netns.sh, scripts/run-dnsmasq-in-netns.sh) (push) Successful in 7s
Release Pipeline / build (agent, amd64, linux) (push) Successful in 0s
Release Pipeline / build (dhcp, amd64, linux) (push) Successful in 0s
Release Pipeline / build (metadata, amd64, linux) (push) Successful in 0s
Release Pipeline / checksums (push) Successful in 8s
Release Pipeline / build (push) Successful in 2m21s
Release Pipeline / release (push) Successful in 31s
Release Pipeline / publish (push) Successful in 0s
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
parent
b530428de2
commit
eb89a2220c
9 changed files with 56 additions and 28 deletions
|
|
@ -2,6 +2,7 @@ package frr
|
|||
|
||||
import (
|
||||
"fmt"
|
||||
"strconv"
|
||||
"strings"
|
||||
)
|
||||
|
||||
|
|
@ -9,16 +10,17 @@ type step []string
|
|||
|
||||
func routingTeardown(v VRF, running string) []step {
|
||||
lines := strings.Split(running, "\n")
|
||||
bgp := hasLine(lines, v.bgpInstance())
|
||||
instance := vrfInstance(lines, v.Name())
|
||||
bgp := instance != ""
|
||||
var steps []step
|
||||
if bgp {
|
||||
steps = append(steps, step{v.bgpInstance(), "address-family ipv4 unicast", "no redistribute kernel"})
|
||||
steps = append(steps, step{instance, "address-family ipv4 unicast", "no redistribute kernel"})
|
||||
}
|
||||
if vni := vrfVNI(lines, v.Name()); vni != "" {
|
||||
steps = append(steps, step{"vrf " + v.Name(), "no vni " + vni})
|
||||
}
|
||||
if bgp {
|
||||
steps = append(steps, step{"no " + v.bgpInstance()})
|
||||
steps = append(steps, step{"no " + instance})
|
||||
}
|
||||
if hasPrefix(lines, "route-map "+v.routeMap()+" ") {
|
||||
steps = append(steps, step{"no route-map " + v.routeMap()})
|
||||
|
|
@ -36,6 +38,19 @@ func vrfTeardown(v VRF, running string) []step {
|
|||
return nil
|
||||
}
|
||||
|
||||
func vrfInstance(lines []string, name string) string {
|
||||
for _, l := range lines {
|
||||
f := strings.Fields(l)
|
||||
if len(f) != 5 || f[0] != "router" || f[1] != "bgp" || f[3] != "vrf" || f[4] != name {
|
||||
continue
|
||||
}
|
||||
if _, err := strconv.ParseUint(f[2], 10, 32); err == nil {
|
||||
return strings.Join(f, " ")
|
||||
}
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func hasLine(lines []string, want string) bool {
|
||||
for _, l := range lines {
|
||||
if strings.TrimRight(l, " \r") == want {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue