matthieu/pve-network
1
0
Fork 0
forked from Mirror/pve-network
Code Pull requests Activity

controllers: evpn: bugfix: use prefix-list in route-map instead evpn match

Browse source 
"match evpn" in route-map is broken since 8.5.0
https://github.com/FRRouting/frr/issues/14419

the patch
272c6d5db1
is converting type-2 && type-5 evpn routes to prefix-prefix.
(fixing prefix-list not working previously, but breaking "match evpn")

So, simply use prefix-list now, as "match epvn" was a workaround anyway.

reported on the forum, where user have routing loop between the 2 exit-nodes:
https://forum.proxmox.com/threads/sdn-with-evpn-controller-routing-loop-when-using-multiple-exit-nodes.137362/

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier 2023-12-03 16:46:08 +01:00 committed by Thomas Lamprecht
parent b5471f5a2f
commit e614da43f1
6 changed files with 74 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/PVE/Network/SDN/Controllers/EvpnPlugin.pm
View file

@ -188,22 +188,34 @@ sub generate_controller_zone_config {
if ($is_gateway) {
$config->{frr_prefix_list}->{'only_default'}->{1} = "permit 0.0.0.0/0";
$config->{frr_prefix_list_v6}->{'only_default_v6'}->{1} = "permit ::/0";
if (!$exitnodes_primary || $exitnodes_primary eq $local_node) {
#filter default type5 route coming from other exit nodes on primary node or both nodes if no primary is defined.
#filter default route coming from other exit nodes on primary node or both nodes if no primary is defined.
my $routemap_config_v6 = ();
push @{$routemap_config_v6}, "match ip address prefix-list only_default_v6";
my $routemap_v6 = { rule => $routemap_config_v6, action => "deny" };
unshift(@{$config->{frr_routemap}->{'MAP_VTEP_IN'}}, $routemap_v6);
my $routemap_config = ();
push @{$routemap_config}, "match evpn vni $vrfvxlan";
push @{$routemap_config}, "match evpn route-type prefix";
push @{$routemap_config}, "match ip address prefix-list only_default";
my $routemap = { rule => $routemap_config, action => "deny" };
unshift(@{$config->{frr_routemap}->{'MAP_VTEP_IN'}}, $routemap);
} elsif ($exitnodes_primary ne $local_node) {
my $routemap_config_v6 = ();
push @{$routemap_config_v6}, "match ipv6 address prefix-list only_default_v6";
push @{$routemap_config_v6}, "set metric 200";
my $routemap_v6 = { rule => $routemap_config_v6, action => "permit" };
unshift(@{$config->{frr_routemap}->{'MAP_VTEP_OUT'}}, $routemap_v6);
my $routemap_config = ();
push @{$routemap_config}, "match evpn vni $vrfvxlan";
push @{$routemap_config}, "match evpn route-type prefix";
push @{$routemap_config}, "match ip address prefix-list only_default";
push @{$routemap_config}, "set metric 200";
my $routemap = { rule => $routemap_config, action => "permit" };
unshift(@{$config->{frr_routemap}->{'MAP_VTEP_OUT'}}, $routemap);
}
}
if (!$exitnodes_local_routing) {
@controller_config = ();

13
src/test/zones/evpn/exitnode/expected_controller_config
View file

@ -56,12 +56,19 @@ router bgp 65000 vrf vrf_myzone
exit-address-family
exit
!
ip prefix-list only_default seq 1 permit 0.0.0.0/0
!
ipv6 prefix-list only_default_v6 seq 1 permit ::/0
!
route-map MAP_VTEP_IN deny 1
match evpn vni 1000
match evpn route-type prefix
match ip address prefix-list only_default
exit
!
route-map MAP_VTEP_IN permit 2
route-map MAP_VTEP_IN deny 2
match ip address prefix-list only_default_v6
exit
!
route-map MAP_VTEP_IN permit 3
exit
!
route-map MAP_VTEP_OUT permit 1

13
src/test/zones/evpn/exitnode_local_routing/expected_controller_config
View file

@ -40,12 +40,19 @@ router bgp 65000 vrf vrf_myzone
exit-address-family
exit
!
ip prefix-list only_default seq 1 permit 0.0.0.0/0
!
ipv6 prefix-list only_default_v6 seq 1 permit ::/0
!
route-map MAP_VTEP_IN deny 1
match evpn vni 1000
match evpn route-type prefix
match ip address prefix-list only_default
exit
!
route-map MAP_VTEP_IN permit 2
route-map MAP_VTEP_IN deny 2
match ip address prefix-list only_default_v6
exit
!
route-map MAP_VTEP_IN permit 3
exit
!
route-map MAP_VTEP_OUT permit 1

12
src/test/zones/evpn/exitnode_primary/expected_controller_config
View file

@ -56,16 +56,24 @@ router bgp 65000 vrf vrf_myzone
exit-address-family
exit
!
ip prefix-list only_default seq 1 permit 0.0.0.0/0
!
ipv6 prefix-list only_default_v6 seq 1 permit ::/0
!
route-map MAP_VTEP_IN permit 1
exit
!
route-map MAP_VTEP_OUT permit 1
match evpn vni 1000
match evpn route-type prefix
match ip address prefix-list only_default
set metric 200
exit
!
route-map MAP_VTEP_OUT permit 2
match ipv6 address prefix-list only_default_v6
set metric 200
exit
!
route-map MAP_VTEP_OUT permit 3
exit
!
line vty

13
src/test/zones/evpn/exitnode_snat/expected_controller_config
View file

@ -56,12 +56,19 @@ router bgp 65000 vrf vrf_myzone
exit-address-family
exit
!
ip prefix-list only_default seq 1 permit 0.0.0.0/0
!
ipv6 prefix-list only_default_v6 seq 1 permit ::/0
!
route-map MAP_VTEP_IN deny 1
match evpn vni 1000
match evpn route-type prefix
match ip address prefix-list only_default
exit
!
route-map MAP_VTEP_IN permit 2
route-map MAP_VTEP_IN deny 2
match ip address prefix-list only_default_v6
exit
!
route-map MAP_VTEP_IN permit 3
exit
!
route-map MAP_VTEP_OUT permit 1

20
src/test/zones/evpn/exitnodenullroute/expected_controller_config
View file

@ -84,17 +84,27 @@ router bgp 65000 vrf vrf_myzone2
exit-address-family
exit
!
ip prefix-list only_default seq 1 permit 0.0.0.0/0
!
ipv6 prefix-list only_default_v6 seq 1 permit ::/0
!
route-map MAP_VTEP_IN deny 1
match evpn vni 1001
match evpn route-type prefix
match ip address prefix-list only_default
exit
!
route-map MAP_VTEP_IN deny 2
match evpn vni 1000
match evpn route-type prefix
match ip address prefix-list only_default_v6
exit
!
route-map MAP_VTEP_IN permit 3
route-map MAP_VTEP_IN deny 3
match ip address prefix-list only_default
exit
!
route-map MAP_VTEP_IN deny 4
match ip address prefix-list only_default_v6
exit
!
route-map MAP_VTEP_IN permit 5
exit
!
route-map MAP_VTEP_OUT permit 1