From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 72DB66220A for ; Fri, 11 Feb 2022 10:34:15 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 60CB3266F7 for ; Fri, 11 Feb 2022 10:33:45 +0100 (CET) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [185.151.191.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id F2D0126651 for ; Fri, 11 Feb 2022 10:33:40 +0100 (CET) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 2CCC216ACB0; Fri, 11 Feb 2022 10:33:34 +0100 (CET) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 21E7312989A; Fri, 11 Feb 2022 10:33:34 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Fri, 11 Feb 2022 10:33:29 +0100 Message-Id: <20220211093331.609127-9-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220211093331.609127-1-aderumier@odiso.com> References: <20220211093331.609127-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.163 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% HEADER_FROM_DIFFERENT_DOMAINS 0.248 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.001 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH pve-network 08/10] controllers: evpn : remove "no bgp ebgp-requires-policy" X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Feb 2022 09:34:15 -0000 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.30.2