f-42: l3vni: route par défaut du netns, export de la passerelle en type 5 #42
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
parent
00617d6e0c
commit
10c388ce65
12 changed files with 171 additions and 5 deletions
|
|
@ -124,6 +124,8 @@ func TestWithdrawVRFRunsEachStepInOrderThenSaves(t *testing.T) {
|
|||
{"configure terminal", "no router bgp 64600 vrf vrf-a1b2"},
|
||||
{"configure terminal", "no route-map EXPORT-a1b2"},
|
||||
{"configure terminal", "no ip prefix-list PL-a1b2"},
|
||||
{"configure terminal", "no ip prefix-list PL-a1b2-default"},
|
||||
{"configure terminal", "no ip prefix-list PL-a1b2-transit"},
|
||||
{"write memory"},
|
||||
{"show running-config"},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ type VRF struct {
|
|||
L3VNI uint32
|
||||
VTEP net.IP
|
||||
Supernet *net.IPNet
|
||||
Transit net.IP
|
||||
}
|
||||
|
||||
func (b Base) validate() error {
|
||||
|
|
@ -94,6 +95,14 @@ func (v VRF) prefixList() string {
|
|||
return "PL-" + v.ID
|
||||
}
|
||||
|
||||
func (v VRF) defaultPrefixList() string {
|
||||
return "PL-" + v.ID + "-default"
|
||||
}
|
||||
|
||||
func (v VRF) transitPrefixList() string {
|
||||
return "PL-" + v.ID + "-transit"
|
||||
}
|
||||
|
||||
func (v VRF) routeMap() string {
|
||||
return "EXPORT-" + v.ID
|
||||
}
|
||||
|
|
@ -125,15 +134,24 @@ func (v VRF) validate() error {
|
|||
if v.Supernet == nil || v.Supernet.IP.To4() == nil {
|
||||
return fmt.Errorf("frr: supernet %v is not an IPv4 prefix", v.Supernet)
|
||||
}
|
||||
if v.Transit.To4() == nil {
|
||||
return fmt.Errorf("frr: transit %v is not an IPv4 address", v.Transit)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (v VRF) commands() []string {
|
||||
return []string{
|
||||
fmt.Sprintf("ip prefix-list %s seq 10 permit %s le 32", v.prefixList(), v.Supernet),
|
||||
fmt.Sprintf("ip prefix-list %s seq 10 permit 0.0.0.0/0", v.defaultPrefixList()),
|
||||
fmt.Sprintf("ip prefix-list %s seq 10 permit %s/32", v.transitPrefixList(), v.Transit.To4()),
|
||||
fmt.Sprintf("route-map %s permit 10", v.routeMap()),
|
||||
fmt.Sprintf("match ip address prefix-list %s", v.prefixList()),
|
||||
"exit",
|
||||
fmt.Sprintf("route-map %s permit 15", v.routeMap()),
|
||||
fmt.Sprintf("match ip address prefix-list %s", v.defaultPrefixList()),
|
||||
fmt.Sprintf("match ip next-hop prefix-list %s", v.transitPrefixList()),
|
||||
"exit",
|
||||
fmt.Sprintf("route-map %s deny 20", v.routeMap()),
|
||||
"exit",
|
||||
fmt.Sprintf("vrf %s", v.Name()),
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ func labVRF(t *testing.T) VRF {
|
|||
L3VNI: 4001,
|
||||
VTEP: net.ParseIP("192.168.14.11"),
|
||||
Supernet: mustCIDR(t, "10.10.0.0/16"),
|
||||
Transit: net.ParseIP("169.254.0.2"),
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -55,9 +56,15 @@ func TestBaseCommands(t *testing.T) {
|
|||
func TestVRFCommands(t *testing.T) {
|
||||
want := []string{
|
||||
"ip prefix-list PL-a1b2 seq 10 permit 10.10.0.0/16 le 32",
|
||||
"ip prefix-list PL-a1b2-default seq 10 permit 0.0.0.0/0",
|
||||
"ip prefix-list PL-a1b2-transit seq 10 permit 169.254.0.2/32",
|
||||
"route-map EXPORT-a1b2 permit 10",
|
||||
"match ip address prefix-list PL-a1b2",
|
||||
"exit",
|
||||
"route-map EXPORT-a1b2 permit 15",
|
||||
"match ip address prefix-list PL-a1b2-default",
|
||||
"match ip next-hop prefix-list PL-a1b2-transit",
|
||||
"exit",
|
||||
"route-map EXPORT-a1b2 deny 20",
|
||||
"exit",
|
||||
"vrf vrf-a1b2",
|
||||
|
|
@ -124,6 +131,8 @@ func TestVRFValidateRejects(t *testing.T) {
|
|||
"vtep IPv6": {func(v *VRF) { v.VTEP = net.ParseIP("fd00::1") }, "vtep fd00::1 is not an IPv4 address"},
|
||||
"supernet absent": {func(v *VRF) { v.Supernet = nil }, "supernet <nil> is not an IPv4 prefix"},
|
||||
"supernet IPv6": {func(v *VRF) { v.Supernet = mustCIDR(t, "fd00::/48") }, "supernet fd00::/48 is not an IPv4 prefix"},
|
||||
"transit absent": {func(v *VRF) { v.Transit = nil }, "transit <nil> is not an IPv4 address"},
|
||||
"transit IPv6": {func(v *VRF) { v.Transit = net.ParseIP("fd00::2") }, "transit fd00::2 is not an IPv4 address"},
|
||||
}
|
||||
for name, c := range cases {
|
||||
v := labVRF(t)
|
||||
|
|
|
|||
|
|
@ -25,8 +25,10 @@ func routingTeardown(v VRF, running string) []step {
|
|||
if hasPrefix(lines, "route-map "+v.routeMap()+" ") {
|
||||
steps = append(steps, step{"no route-map " + v.routeMap()})
|
||||
}
|
||||
if hasPrefix(lines, "ip prefix-list "+v.prefixList()+" ") {
|
||||
steps = append(steps, step{"no ip prefix-list " + v.prefixList()})
|
||||
for _, list := range []string{v.prefixList(), v.defaultPrefixList(), v.transitPrefixList()} {
|
||||
if hasPrefix(lines, "ip prefix-list "+list+" ") {
|
||||
steps = append(steps, step{"no ip prefix-list " + list})
|
||||
}
|
||||
}
|
||||
return steps
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,12 +51,19 @@ router bgp 64600 vrf vrf-a1b2c
|
|||
exit
|
||||
!
|
||||
ip prefix-list PL-a1b2 seq 10 permit 10.10.0.0/16 le 32
|
||||
ip prefix-list PL-a1b2-default seq 10 permit 0.0.0.0/0
|
||||
ip prefix-list PL-a1b2-transit seq 10 permit 169.254.0.2/32
|
||||
ip prefix-list PL-a1b2c seq 10 permit 10.20.0.0/16 le 32
|
||||
!
|
||||
route-map EXPORT-a1b2 permit 10
|
||||
match ip address prefix-list PL-a1b2
|
||||
exit
|
||||
!
|
||||
route-map EXPORT-a1b2 permit 15
|
||||
match ip address prefix-list PL-a1b2-default
|
||||
match ip next-hop prefix-list PL-a1b2-transit
|
||||
exit
|
||||
!
|
||||
route-map EXPORT-a1b2 deny 20
|
||||
exit
|
||||
!
|
||||
|
|
@ -91,6 +98,8 @@ func TestRoutingTeardownFollowsTheOrderFRRRequires(t *testing.T) {
|
|||
{"no router bgp 64600 vrf vrf-a1b2"},
|
||||
{"no route-map EXPORT-a1b2"},
|
||||
{"no ip prefix-list PL-a1b2"},
|
||||
{"no ip prefix-list PL-a1b2-default"},
|
||||
{"no ip prefix-list PL-a1b2-transit"},
|
||||
}
|
||||
if got := routingTeardown(labVRF(t), fullRunning); !reflect.DeepEqual(got, want) {
|
||||
t.Errorf("démontage :\n%q\nattendu :\n%q", got, want)
|
||||
|
|
@ -104,6 +113,8 @@ func TestRoutingTeardownTakesTheASNOfTheInstanceFromFRR(t *testing.T) {
|
|||
{"no router bgp 64600 vrf vrf-a1b2"},
|
||||
{"no route-map EXPORT-a1b2"},
|
||||
{"no ip prefix-list PL-a1b2"},
|
||||
{"no ip prefix-list PL-a1b2-default"},
|
||||
{"no ip prefix-list PL-a1b2-transit"},
|
||||
}
|
||||
for _, asn := range []uint32{0, 64601} {
|
||||
v := labVRF(t)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue