proxmox-mirrors/pve-network
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-network synced 2025-07-27 10:34:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

controllers: evpn: add missing bgp router-id in vrf

Browse Source 
evpn route distinguisher is compute from bgp router-id.
if not defined, it take random ip or 0.0.0.0 and could result collisions between hosts

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier 2022-02-11 10:33:27 +01:00 committed by Thomas Lamprecht
parent 847f514452
commit f34a898e01
13 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PVE/Network/SDN/Controllers/EvpnPlugin.pm
View File

@ -123,6 +123,7 @@ sub generate_controller_zone_config {
my $exitnodes_local_routing = $plugin_config->{'exitnodes-local-routing'}; my $exitnodes_local_routing = $plugin_config->{'exitnodes-local-routing'};
my $asn = $controller->{asn}; my $asn = $controller->{asn};
my @peers = PVE::Tools::split_list($controller->{'peers'}) if $controller->{'peers'};
my $ebgp = undef; my $ebgp = undef;
my $loopback = undef; my $loopback = undef;
my $autortas = undef; my $autortas = undef;
@ -136,6 +137,8 @@ sub generate_controller_zone_config {
return if !$vrf || !$vrfvxlan || !$asn; return if !$vrf || !$vrfvxlan || !$asn;
my ($ifaceip, $interface) = PVE::Network::SDN::Zones::Plugin::find_local_ip_interface_peers(\@peers, $loopback);
# vrf # vrf
my @controller_config = (); my @controller_config = ();
push @controller_config, "vni $vrfvxlan"; push @controller_config, "vni $vrfvxlan";
@ -143,6 +146,7 @@ sub generate_controller_zone_config {
#main vrf router #main vrf router
@controller_config = (); @controller_config = ();
push @controller_config, "bgp router-id $ifaceip";
push @controller_config, "no bgp ebgp-requires-policy" if $ebgp; push @controller_config, "no bgp ebgp-requires-policy" if $ebgp;
# push @controller_config, "!"; # push @controller_config, "!";
push(@{$config->{frr}->{router}->{"bgp $asn vrf $vrf"}->{""}}, @controller_config); push(@{$config->{frr}->{router}->{"bgp $asn vrf $vrf"}->{""}}, @controller_config);

1
test/zones/evpn/advertise_subnets/expected_controller_config
View File

@ -27,6 +27,7 @@ router bgp 65000
exit-address-family exit-address-family
! !
router bgp 65000 vrf vrf_myzone router bgp 65000 vrf vrf_myzone
bgp router-id 192.168.0.1
! !
address-family ipv4 unicast address-family ipv4 unicast
redistribute connected redistribute connected

1
test/zones/evpn/disable_arp_nd_suppression/expected_controller_config
View File

@ -27,6 +27,7 @@ router bgp 65000
exit-address-family exit-address-family
! !
router bgp 65000 vrf vrf_myzone router bgp 65000 vrf vrf_myzone
bgp router-id 192.168.0.1
! !
route-map MAP_VTEP_OUT permit 1 route-map MAP_VTEP_OUT permit 1
! !

1
test/zones/evpn/ebgp/expected_controller_config
View File

@ -40,6 +40,7 @@ router bgp 65001
exit-address-family exit-address-family
! !
router bgp 65001 vrf vrf_myzone router bgp 65001 vrf vrf_myzone
bgp router-id 192.168.0.1
no bgp ebgp-requires-policy no bgp ebgp-requires-policy
! !
address-family l2vpn evpn address-family l2vpn evpn

1
test/zones/evpn/ebgp_loopback/expected_controller_config
View File

@ -45,6 +45,7 @@ router bgp 65001
exit-address-family exit-address-family
! !
router bgp 65001 vrf vrf_myzone router bgp 65001 vrf vrf_myzone
bgp router-id 192.168.0.1
no bgp ebgp-requires-policy no bgp ebgp-requires-policy
! !
address-family l2vpn evpn address-family l2vpn evpn

1
test/zones/evpn/exitnode/expected_controller_config
View File

@ -35,6 +35,7 @@ router bgp 65000
exit-address-family exit-address-family
! !
router bgp 65000 vrf vrf_myzone router bgp 65000 vrf vrf_myzone
bgp router-id 192.168.0.1
! !
address-family ipv4 unicast address-family ipv4 unicast
redistribute connected redistribute connected

1
test/zones/evpn/exitnode_local_routing/expected_controller_config
View File

@ -28,6 +28,7 @@ router bgp 65000
exit-address-family exit-address-family
! !
router bgp 65000 vrf vrf_myzone router bgp 65000 vrf vrf_myzone
bgp router-id 192.168.0.1
! !
address-family l2vpn evpn address-family l2vpn evpn
default-originate ipv4 default-originate ipv4

1
test/zones/evpn/exitnode_snat/expected_controller_config
View File

@ -35,6 +35,7 @@ router bgp 65000
exit-address-family exit-address-family
! !
router bgp 65000 vrf vrf_myzone router bgp 65000 vrf vrf_myzone
bgp router-id 192.168.0.1
! !
address-family ipv4 unicast address-family ipv4 unicast
redistribute connected redistribute connected

1
test/zones/evpn/ipv4/expected_controller_config
View File

@ -27,6 +27,7 @@ router bgp 65000
exit-address-family exit-address-family
! !
router bgp 65000 vrf vrf_myzone router bgp 65000 vrf vrf_myzone
bgp router-id 192.168.0.1
! !
route-map MAP_VTEP_OUT permit 1 route-map MAP_VTEP_OUT permit 1
! !

1
test/zones/evpn/ipv4ipv6/expected_controller_config
View File

@ -27,6 +27,7 @@ router bgp 65000
exit-address-family exit-address-family
! !
router bgp 65000 vrf vrf_myzone router bgp 65000 vrf vrf_myzone
bgp router-id 192.168.0.1
! !
route-map MAP_VTEP_OUT permit 1 route-map MAP_VTEP_OUT permit 1
! !

1
test/zones/evpn/ipv4ipv6nogateway/expected_controller_config
View File

@ -27,6 +27,7 @@ router bgp 65000
exit-address-family exit-address-family
! !
router bgp 65000 vrf vrf_myzone router bgp 65000 vrf vrf_myzone
bgp router-id 192.168.0.1
! !
route-map MAP_VTEP_OUT permit 1 route-map MAP_VTEP_OUT permit 1
! !

1
test/zones/evpn/ipv6/expected_controller_config
View File

@ -27,6 +27,7 @@ router bgp 65000
exit-address-family exit-address-family
! !
router bgp 65000 vrf vrf_myzone router bgp 65000 vrf vrf_myzone
bgp router-id 192.168.0.1
! !
route-map MAP_VTEP_OUT permit 1 route-map MAP_VTEP_OUT permit 1
! !

1
test/zones/evpn/multipath_relax/expected_controller_config
View File

@ -39,6 +39,7 @@ router bgp 65000
exit-address-family exit-address-family
! !
router bgp 65000 vrf vrf_myzone router bgp 65000 vrf vrf_myzone
bgp router-id 192.168.0.1
! !
route-map MAP_VTEP_OUT permit 1 route-map MAP_VTEP_OUT permit 1
! !