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

evpn controller: style fixes

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2022-08-31 10:56:01 +02:00
parent 32870bdc2f
commit 359796b052
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,7 @@ sub generate_controller_config {
my $loopback = undef; my $loopback = undef;
my $autortas = undef; my $autortas = undef;
my $bgprouter = find_bgp_controller($local_node, $controller_cfg); my $bgprouter = find_bgp_controller($local_node, $controller_cfg);
if($bgprouter) { if ($bgprouter) {
$ebgp = 1 if $plugin_config->{'asn'} ne $bgprouter->{asn}; $ebgp = 1 if $plugin_config->{'asn'} ne $bgprouter->{asn};
$loopback = $bgprouter->{loopback} if $bgprouter->{loopback}; $loopback = $bgprouter->{loopback} if $bgprouter->{loopback};
$asn = $bgprouter->{asn} if $bgprouter->{asn}; $asn = $bgprouter->{asn} if $bgprouter->{asn};
@ -163,7 +163,7 @@ sub generate_controller_zone_config {
if ($is_gateway) { if ($is_gateway) {
if(!$exitnodes_primary || $exitnodes_primary eq $local_node) { 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 type5 route coming from other exit nodes on primary node or both nodes if no primary is defined.
my $routemap_config = (); my $routemap_config = ();
push @{$routemap_config}, "match evpn route-type prefix"; push @{$routemap_config}, "match evpn route-type prefix";
@ -213,7 +213,7 @@ sub generate_controller_zone_config {
push(@{$config->{frr}->{router}->{"bgp $asn vrf $vrf"}->{"address-family"}->{"l2vpn evpn"}}, @controller_config); push(@{$config->{frr}->{router}->{"bgp $asn vrf $vrf"}->{"address-family"}->{"l2vpn evpn"}}, @controller_config);
} }
if($rt_import) { if ($rt_import) {
@controller_config = (); @controller_config = ();
foreach my $rt (sort @{$rt_import}) { foreach my $rt (sort @{$rt_import}) {
push @controller_config, "route-target import $rt"; push @controller_config, "route-target import $rt";
@ -385,21 +385,19 @@ sub generate_frr_routemap {
sub generate_frr_accesslist { sub generate_frr_accesslist {
my ($final_config, $accesslists) = @_; my ($final_config, $accesslists) = @_;
my @config = (); my $config = [];
for my $id (sort keys %$accesslists) { for my $id (sort keys %$accesslists) {
my $accesslist = $accesslists->{$id}; my $accesslist = $accesslists->{$id};
for my $seq (sort keys %$accesslist) { for my $seq (sort keys %$accesslist) {
my $rule = $accesslist->{$seq}; my $rule = $accesslist->{$seq};
push @config, "access-list $id seq $seq $rule"; push @$config, "access-list $id seq $seq $rule";
} }
} }
if(@config > 0) { if (@$config > 0) {
push @{$final_config}, "!"; push @{$final_config}, "!", @$config;
push @{$final_config}, @config;
} }
} }