From 57e463046e03c97e52b5e876a101b563f2cfddc9 Mon Sep 17 00:00:00 2001 From: Alexandre Derumier Date: Fri, 11 Feb 2022 10:33:29 +0100 Subject: [PATCH] controllers: evpn : remove "no bgp ebgp-requires-policy" It's already disabled in the default datacenter profile since frr 7.4 Signed-off-by: Alexandre Derumier --- PVE/Network/SDN/Controllers/BgpPlugin.pm | 1 - PVE/Network/SDN/Controllers/EvpnPlugin.pm | 1 - test/zones/evpn/ebgp/expected_controller_config | 2 -- test/zones/evpn/ebgp_loopback/expected_controller_config | 2 -- 4 files changed, 6 deletions(-) diff --git a/PVE/Network/SDN/Controllers/BgpPlugin.pm b/PVE/Network/SDN/Controllers/BgpPlugin.pm index 70c7264..bfeda0c 100644 --- a/PVE/Network/SDN/Controllers/BgpPlugin.pm +++ b/PVE/Network/SDN/Controllers/BgpPlugin.pm @@ -89,7 +89,6 @@ sub generate_controller_config { @controller_config = (); if($ebgp) { - push @controller_config, "no bgp ebgp-requires-policy"; push @controller_config, "bgp disable-ebgp-connected-route-check" if $loopback; } diff --git a/PVE/Network/SDN/Controllers/EvpnPlugin.pm b/PVE/Network/SDN/Controllers/EvpnPlugin.pm index 6d9b059..c4aac91 100644 --- a/PVE/Network/SDN/Controllers/EvpnPlugin.pm +++ b/PVE/Network/SDN/Controllers/EvpnPlugin.pm @@ -148,7 +148,6 @@ sub generate_controller_zone_config { #main vrf router @controller_config = (); push @controller_config, "bgp router-id $ifaceip"; - push @controller_config, "no bgp ebgp-requires-policy" if $ebgp; # push @controller_config, "!"; push(@{$config->{frr}->{router}->{"bgp $asn vrf $vrf"}->{""}}, @controller_config); diff --git a/test/zones/evpn/ebgp/expected_controller_config b/test/zones/evpn/ebgp/expected_controller_config index ae35a35..50d01c1 100644 --- a/test/zones/evpn/ebgp/expected_controller_config +++ b/test/zones/evpn/ebgp/expected_controller_config @@ -19,7 +19,6 @@ router bgp 65001 neighbor VTEP bfd neighbor 192.168.0.2 peer-group VTEP neighbor 192.168.0.3 peer-group VTEP - no bgp ebgp-requires-policy neighbor BGP peer-group neighbor BGP remote-as external neighbor BGP bfd @@ -41,7 +40,6 @@ router bgp 65001 ! router bgp 65001 vrf vrf_myzone bgp router-id 192.168.0.1 - no bgp ebgp-requires-policy ! address-family l2vpn evpn route-target import 65000:1000 diff --git a/test/zones/evpn/ebgp_loopback/expected_controller_config b/test/zones/evpn/ebgp_loopback/expected_controller_config index 55141b2..5b246c6 100644 --- a/test/zones/evpn/ebgp_loopback/expected_controller_config +++ b/test/zones/evpn/ebgp_loopback/expected_controller_config @@ -23,7 +23,6 @@ router bgp 65001 neighbor VTEP update-source dummy1 neighbor 192.168.0.2 peer-group VTEP neighbor 192.168.0.3 peer-group VTEP - no bgp ebgp-requires-policy bgp disable-ebgp-connected-route-check neighbor BGP peer-group neighbor BGP remote-as external @@ -46,7 +45,6 @@ router bgp 65001 ! router bgp 65001 vrf vrf_myzone bgp router-id 192.168.0.1 - no bgp ebgp-requires-policy ! address-family l2vpn evpn route-target import 65000:1000 -- 2.39.2