frr: update config frrversion to 8.2.2

[pve-network.git] / PVE / Network / SDN / Controllers / EvpnPlugin.pm

diff --git a/PVE/Network/SDN/Controllers/EvpnPlugin.pm b/PVE/Network/SDN/Controllers/EvpnPlugin.pm
index 2b48e9a10c62baafede6052e48e735cec07ad825..15b268bb22f483c3e489c16122ccd50ac480fd5a 100644 (file)
--- a/PVE/Network/SDN/Controllers/EvpnPlugin.pm
+++ b/PVE/Network/SDN/Controllers/EvpnPlugin.pm
@@ -99,13 +99,16 @@ sub generate_controller_config {
 
     # address-family l2vpn
     @controller_config = ();
+    push @controller_config, "neighbor VTEP route-map MAP_VTEP_IN in";
     push @controller_config, "neighbor VTEP route-map MAP_VTEP_OUT out";
     push @controller_config, "neighbor VTEP activate";
     push @controller_config, "advertise-all-vni";
     push @controller_config, "autort as $autortas" if $autortas;
     push(@{$bgp->{"address-family"}->{"l2vpn evpn"}}, @controller_config);
 
-    push(@{$config->{frr_routemap}->{'MAP_VTEP_OUT'}}, []);
+    my $routemap = { rule => undef, action => "permit" };
+    push(@{$config->{frr_routemap}->{'MAP_VTEP_IN'}}, $routemap );
+    push(@{$config->{frr_routemap}->{'MAP_VTEP_OUT'}}, $routemap );
 
     return $config;
 }
@@ -121,8 +124,10 @@ sub generate_controller_zone_config {
     my $exitnodes_primary = $plugin_config->{'exitnodes-primary'};
     my $advertisesubnets = $plugin_config->{'advertise-subnets'};
     my $exitnodes_local_routing = $plugin_config->{'exitnodes-local-routing'};
+    my $rt_import = [PVE::Tools::split_list($plugin_config->{'rt-import'})] if $plugin_config->{'rt-import'};
 
     my $asn = $controller->{asn};
+    my @peers = PVE::Tools::split_list($controller->{'peers'}) if $controller->{'peers'};
     my $ebgp = undef;
     my $loopback = undef;
     my $autortas = undef;
@@ -136,6 +141,8 @@ sub generate_controller_zone_config {
 
     return if !$vrf || !$vrfvxlan || !$asn;
 
+    my ($ifaceip, $interface) = PVE::Network::SDN::Zones::Plugin::find_local_ip_interface_peers(\@peers, $loopback);
+
     # vrf
     my @controller_config = ();
     push @controller_config, "vni $vrfvxlan";
@@ -143,7 +150,7 @@ sub generate_controller_zone_config {
 
     #main vrf router
     @controller_config = ();
-    push @controller_config, "no bgp ebgp-requires-policy" if $ebgp;
+    push @controller_config, "bgp router-id $ifaceip";
 #    push @controller_config, "!";
     push(@{$config->{frr}->{router}->{"bgp $asn vrf $vrf"}->{""}}, @controller_config);
 
@@ -156,14 +163,22 @@ sub generate_controller_zone_config {
 
     if ($is_gateway) {
 
-        if($exitnodes_primary && $exitnodes_primary ne $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.
+           my $routemap_config = ();
+           push @{$routemap_config}, "match evpn route-type prefix";
+           my $routemap = { rule => $routemap_config, action => "deny" };
+           unshift(@{$config->{frr_routemap}->{'MAP_VTEP_IN'}}, $routemap);
+       } elsif ($exitnodes_primary ne $local_node) {
            my $routemap_config = ();
            push @{$routemap_config}, "match evpn vni $vrfvxlan";
            push @{$routemap_config}, "match evpn route-type prefix";
            push @{$routemap_config}, "set metric 200";
-           unshift(@{$config->{frr_routemap}->{'MAP_VTEP_OUT'}}, $routemap_config);
+           my $routemap = { rule => $routemap_config, action => "permit" };
+           unshift(@{$config->{frr_routemap}->{'MAP_VTEP_OUT'}}, $routemap);
         }
 
+
        if (!$exitnodes_local_routing) {
            @controller_config = ();
            #import /32 routes of evpn network from vrf1 to default vrf (for packet return)
@@ -198,6 +213,14 @@ sub generate_controller_zone_config {
        push(@{$config->{frr}->{router}->{"bgp $asn vrf $vrf"}->{"address-family"}->{"l2vpn evpn"}}, @controller_config);
     }
 
+    if($rt_import) {
+       @controller_config = ();
+       foreach my $rt (sort @{$rt_import}) {
+           push @controller_config, "route-target import $rt";
+       }
+       push(@{$config->{frr}->{router}->{"bgp $asn vrf $vrf"}->{"address-family"}->{"l2vpn evpn"}}, @controller_config);
+    }
+
     return $config;
 }
 
@@ -343,10 +366,12 @@ sub generate_frr_routemap {
        my $order = 0;
        foreach my $seq (@$routemap) {
                $order++;
+               next if !defined($seq->{action});
                my @config = ();
                push @config, "!";
-               push @config, "route-map $id permit $order";
-               push @config, map { " $_" } @$seq;
+               push @config, "route-map $id $seq->{action} $order";
+               my $rule = $seq->{rule};
+               push @config, map { " $_" } @$rule;
                push @{$final_config}, @config;
        }
    }
@@ -357,12 +382,11 @@ sub generate_controller_rawconfig {
     my $nodename = PVE::INotify::nodename();
 
     my $final_config = [];
-    push @{$final_config}, "log syslog informational";
-    push @{$final_config}, "ip forwarding";
-    push @{$final_config}, "ipv6 forwarding";
+    push @{$final_config}, "frr version 8.2.2";
     push @{$final_config}, "frr defaults datacenter";
-    push @{$final_config}, "service integrated-vtysh-config";
     push @{$final_config}, "hostname $nodename";
+    push @{$final_config}, "log syslog informational";
+    push @{$final_config}, "service integrated-vtysh-config";
     push @{$final_config}, "!";
 
     if (-e "/etc/frr/frr.conf.local") {
@@ -417,7 +441,13 @@ sub reload_controller {
     };
 
     if (-e $conf_file && -e $bin_path) {
-       run_command([$bin_path, '--stdout', '--reload', $conf_file], outfunc => {}, errfunc => $err);
+       eval {
+           run_command([$bin_path, '--stdout', '--reload', $conf_file], outfunc => {}, errfunc => $err);
+       };
+       if ($@) {
+           warn "frr reload command fail. Restarting frr.";
+           eval { run_command(['systemctl', 'restart', 'frr']); };
+       }
     }
 }