Mirror/pve-network
1
0
Fork 1
mirror of git://git.proxmox.com/git/pve-network.git synced 2025-05-01 11:36:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #5319: frr.local: add support for bgp-community

Browse source 
Need to be inserted after ip prefix-list and before route map

Signed-off-by: Alexandre Derumier <alexandre.derumier@groupe-cyllene.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Alexandre Derumier via pve-devel 2024-04-16 18:25:04 +02:00 committed by Thomas Lamprecht
parent 00bf3203a1
commit 51c766f8a0
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -421,17 +421,16 @@ sub generate_frr_vrf {
push @{$final_config}, @config; push @{$final_config}, @config;
} }
sub generate_frr_ip_protocol { sub generate_frr_simple_list {
my ($final_config, $ips) = @_; my ($final_config, $rules) = @_;
return if !$ips; return if !$rules;
my @config = (); my @config = ();
push @{$final_config}, "!"; push @{$final_config}, "!";
foreach my $rule (sort @$ips) { foreach my $rule (sort @$rules) {
push @{$final_config}, $rule; push @{$final_config}, $rule;
} }
} }
sub generate_frr_interfaces { sub generate_frr_interfaces {
@ -517,8 +516,9 @@ sub generate_controller_rawconfig {
generate_frr_list($final_config, $config->{frr_access_list}, "access-list"); generate_frr_list($final_config, $config->{frr_access_list}, "access-list");
generate_frr_list($final_config, $config->{frr_prefix_list}, "ip prefix-list"); generate_frr_list($final_config, $config->{frr_prefix_list}, "ip prefix-list");
generate_frr_list($final_config, $config->{frr_prefix_list_v6}, "ipv6 prefix-list"); generate_frr_list($final_config, $config->{frr_prefix_list_v6}, "ipv6 prefix-list");
generate_frr_simple_list($final_config, $config->{frr_bgp_community_list});
generate_frr_routemap($final_config, $config->{frr_routemap}); generate_frr_routemap($final_config, $config->{frr_routemap});
generate_frr_ip_protocol($final_config, $config->{frr_ip_protocol}); generate_frr_simple_list($final_config, $config->{frr_ip_protocol});
push @{$final_config}, "!"; push @{$final_config}, "!";
push @{$final_config}, "line vty"; push @{$final_config}, "line vty";
@ -553,6 +553,9 @@ sub parse_merge_frr_local_config {
} elsif ($line =~ m/^interface (.+)$/) { } elsif ($line =~ m/^interface (.+)$/) {
$section = \$config->{'frr_interfaces'}->{$1}; $section = \$config->{'frr_interfaces'}->{$1};
next; next;
} elsif ($line =~ m/^bgp community-list (.+)$/) {
push(@{$config->{'frr_bgp_community_list'}}, $line);
next;
} elsif ($line =~ m/address-family (.+)$/) { } elsif ($line =~ m/address-family (.+)$/) {
$section = \$config->{'frr'}->{'router'}->{$router}->{'address-family'}->{$1}; $section = \$config->{'frr'}->{'router'}->{$router}->{'address-family'}->{$1};
next; next;