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 129D59AD84 for ; Tue, 23 May 2023 08:47:31 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E85DA37975 for ; Tue, 23 May 2023 08:47:30 +0200 (CEST) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [IPv6:2a0a:1580:2000::2d]) (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 for ; Tue, 23 May 2023 08:47:27 +0200 (CEST) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 7C09D8B5D; Tue, 23 May 2023 08:47:27 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 6784D2C15AB; Tue, 23 May 2023 08:47:27 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Tue, 23 May 2023 08:47:26 +0200 Message-Id: <20230523064726.2298476-2-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230523064726.2298476-1-aderumier@odiso.com> References: <20230523064726.2298476-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.255 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy HEADER_FROM_DIFFERENT_DOMAINS 0.25 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 KAM_NUMSUBJECT 0.5 Subject ends in numbers excluding current years 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [evpnplugin.pm] Subject: [pve-devel] [PATCH pve-network 1/1] evpn: update config to frr 8.5.1 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: Tue, 23 May 2023 06:47:31 -0000 add default values: "no bgp hard-administrative-reset" "no bgp graceful-restart notification" to avoid frr-reload warning Signed-off-by: Alexandre Derumier --- PVE/Network/SDN/Controllers/EvpnPlugin.pm | 7 ++++++- .../evpn/advertise_subnets/expected_controller_config | 6 +++++- .../disable_arp_nd_suppression/expected_controller_config | 6 +++++- test/zones/evpn/ebgp/expected_controller_config | 6 +++++- test/zones/evpn/ebgp_loopback/expected_controller_config | 6 +++++- test/zones/evpn/exitnode/expected_controller_config | 6 +++++- .../exitnode_local_routing/expected_controller_config | 6 +++++- .../evpn/exitnode_primary/expected_controller_config | 6 +++++- test/zones/evpn/exitnode_snat/expected_controller_config | 6 +++++- .../evpn/exitnodenullroute/expected_controller_config | 8 +++++++- test/zones/evpn/ipv4/expected_controller_config | 6 +++++- test/zones/evpn/ipv4ipv6/expected_controller_config | 6 +++++- .../evpn/ipv4ipv6nogateway/expected_controller_config | 6 +++++- test/zones/evpn/ipv6/expected_controller_config | 6 +++++- .../zones/evpn/multipath_relax/expected_controller_config | 6 +++++- test/zones/evpn/multiplezones/expected_controller_config | 8 +++++++- test/zones/evpn/rt_import/expected_controller_config | 6 +++++- test/zones/evpn/vxlanport/expected_controller_config | 6 +++++- 18 files changed, 95 insertions(+), 18 deletions(-) diff --git a/PVE/Network/SDN/Controllers/EvpnPlugin.pm b/PVE/Network/SDN/Controllers/EvpnPlugin.pm index b1eb845..6da9c40 100644 --- a/PVE/Network/SDN/Controllers/EvpnPlugin.pm +++ b/PVE/Network/SDN/Controllers/EvpnPlugin.pm @@ -71,6 +71,8 @@ sub generate_controller_config { #global options my @controller_config = ( "bgp router-id $ifaceip", + "no bgp hard-administrative-reset", + "no bgp graceful-restart notification", "no bgp default ipv4-unicast", "coalesce-time 1000", ); @@ -166,6 +168,9 @@ sub generate_controller_zone_config { #main vrf router @controller_config = (); push @controller_config, "bgp router-id $ifaceip"; + push @controller_config, "no bgp hard-administrative-reset"; + push @controller_config, "no bgp graceful-restart notification"; + # push @controller_config, "!"; push(@{$config->{frr}->{router}->{"bgp $asn vrf $vrf"}->{""}}, @controller_config); @@ -428,7 +433,7 @@ sub generate_controller_rawconfig { my $nodename = PVE::INotify::nodename(); my $final_config = []; - push @{$final_config}, "frr version 8.2.2"; + push @{$final_config}, "frr version 8.5.1"; push @{$final_config}, "frr defaults datacenter"; push @{$final_config}, "hostname $nodename"; push @{$final_config}, "log syslog informational"; diff --git a/test/zones/evpn/advertise_subnets/expected_controller_config b/test/zones/evpn/advertise_subnets/expected_controller_config index 82b06b4..15f4581 100644 --- a/test/zones/evpn/advertise_subnets/expected_controller_config +++ b/test/zones/evpn/advertise_subnets/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.2.2 +frr version 8.5.1 frr defaults datacenter hostname localhost log syslog informational @@ -11,6 +11,8 @@ exit-vrf ! router bgp 65000 bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification no bgp default ipv4-unicast coalesce-time 1000 neighbor VTEP peer-group @@ -29,6 +31,8 @@ exit ! router bgp 65000 vrf vrf_myzone bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification ! address-family ipv4 unicast redistribute connected diff --git a/test/zones/evpn/disable_arp_nd_suppression/expected_controller_config b/test/zones/evpn/disable_arp_nd_suppression/expected_controller_config index bd7830a..d5d310d 100644 --- a/test/zones/evpn/disable_arp_nd_suppression/expected_controller_config +++ b/test/zones/evpn/disable_arp_nd_suppression/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.2.2 +frr version 8.5.1 frr defaults datacenter hostname localhost log syslog informational @@ -11,6 +11,8 @@ exit-vrf ! router bgp 65000 bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification no bgp default ipv4-unicast coalesce-time 1000 neighbor VTEP peer-group @@ -29,6 +31,8 @@ exit ! router bgp 65000 vrf vrf_myzone bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification exit ! route-map MAP_VTEP_IN permit 1 diff --git a/test/zones/evpn/ebgp/expected_controller_config b/test/zones/evpn/ebgp/expected_controller_config index ccc0b28..1f14b80 100644 --- a/test/zones/evpn/ebgp/expected_controller_config +++ b/test/zones/evpn/ebgp/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.2.2 +frr version 8.5.1 frr defaults datacenter hostname localhost log syslog informational @@ -11,6 +11,8 @@ exit-vrf ! router bgp 65001 bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification no bgp default ipv4-unicast coalesce-time 1000 neighbor VTEP peer-group @@ -41,6 +43,8 @@ exit ! router bgp 65001 vrf vrf_myzone bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification ! 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 47836f8..1add7f5 100644 --- a/test/zones/evpn/ebgp_loopback/expected_controller_config +++ b/test/zones/evpn/ebgp_loopback/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.2.2 +frr version 8.5.1 frr defaults datacenter hostname localhost log syslog informational @@ -11,6 +11,8 @@ exit-vrf ! router bgp 65001 bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification no bgp default ipv4-unicast coalesce-time 1000 neighbor VTEP peer-group @@ -44,6 +46,8 @@ exit ! router bgp 65001 vrf vrf_myzone bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification ! address-family l2vpn evpn route-target import 65000:1000 diff --git a/test/zones/evpn/exitnode/expected_controller_config b/test/zones/evpn/exitnode/expected_controller_config index 2c3f19e..598233f 100644 --- a/test/zones/evpn/exitnode/expected_controller_config +++ b/test/zones/evpn/exitnode/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.2.2 +frr version 8.5.1 frr defaults datacenter hostname localhost log syslog informational @@ -11,6 +11,8 @@ exit-vrf ! router bgp 65000 bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification no bgp default ipv4-unicast coalesce-time 1000 neighbor VTEP peer-group @@ -37,6 +39,8 @@ exit ! router bgp 65000 vrf vrf_myzone bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification ! address-family ipv4 unicast redistribute connected diff --git a/test/zones/evpn/exitnode_local_routing/expected_controller_config b/test/zones/evpn/exitnode_local_routing/expected_controller_config index ef3948d..8c8e485 100644 --- a/test/zones/evpn/exitnode_local_routing/expected_controller_config +++ b/test/zones/evpn/exitnode_local_routing/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.2.2 +frr version 8.5.1 frr defaults datacenter hostname localhost log syslog informational @@ -11,6 +11,8 @@ exit-vrf ! router bgp 65000 bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification no bgp default ipv4-unicast coalesce-time 1000 neighbor VTEP peer-group @@ -29,6 +31,8 @@ exit ! router bgp 65000 vrf vrf_myzone bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification ! address-family l2vpn evpn default-originate ipv4 diff --git a/test/zones/evpn/exitnode_primary/expected_controller_config b/test/zones/evpn/exitnode_primary/expected_controller_config index e45b22c..ec73a38 100644 --- a/test/zones/evpn/exitnode_primary/expected_controller_config +++ b/test/zones/evpn/exitnode_primary/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.2.2 +frr version 8.5.1 frr defaults datacenter hostname localhost log syslog informational @@ -11,6 +11,8 @@ exit-vrf ! router bgp 65000 bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification no bgp default ipv4-unicast coalesce-time 1000 neighbor VTEP peer-group @@ -37,6 +39,8 @@ exit ! router bgp 65000 vrf vrf_myzone bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification ! address-family ipv4 unicast redistribute connected diff --git a/test/zones/evpn/exitnode_snat/expected_controller_config b/test/zones/evpn/exitnode_snat/expected_controller_config index 2c3f19e..598233f 100644 --- a/test/zones/evpn/exitnode_snat/expected_controller_config +++ b/test/zones/evpn/exitnode_snat/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.2.2 +frr version 8.5.1 frr defaults datacenter hostname localhost log syslog informational @@ -11,6 +11,8 @@ exit-vrf ! router bgp 65000 bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification no bgp default ipv4-unicast coalesce-time 1000 neighbor VTEP peer-group @@ -37,6 +39,8 @@ exit ! router bgp 65000 vrf vrf_myzone bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification ! address-family ipv4 unicast redistribute connected diff --git a/test/zones/evpn/exitnodenullroute/expected_controller_config b/test/zones/evpn/exitnodenullroute/expected_controller_config index f461f1e..7dc8517 100644 --- a/test/zones/evpn/exitnodenullroute/expected_controller_config +++ b/test/zones/evpn/exitnodenullroute/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.2.2 +frr version 8.5.1 frr defaults datacenter hostname localhost log syslog informational @@ -18,6 +18,8 @@ exit-vrf ! router bgp 65000 bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification no bgp default ipv4-unicast coalesce-time 1000 neighbor VTEP peer-group @@ -46,6 +48,8 @@ exit ! router bgp 65000 vrf vrf_myzone bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification ! address-family ipv4 unicast redistribute connected @@ -63,6 +67,8 @@ exit ! router bgp 65000 vrf vrf_myzone2 bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification ! address-family ipv4 unicast redistribute connected diff --git a/test/zones/evpn/ipv4/expected_controller_config b/test/zones/evpn/ipv4/expected_controller_config index bd7830a..d5d310d 100644 --- a/test/zones/evpn/ipv4/expected_controller_config +++ b/test/zones/evpn/ipv4/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.2.2 +frr version 8.5.1 frr defaults datacenter hostname localhost log syslog informational @@ -11,6 +11,8 @@ exit-vrf ! router bgp 65000 bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification no bgp default ipv4-unicast coalesce-time 1000 neighbor VTEP peer-group @@ -29,6 +31,8 @@ exit ! router bgp 65000 vrf vrf_myzone bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification exit ! route-map MAP_VTEP_IN permit 1 diff --git a/test/zones/evpn/ipv4ipv6/expected_controller_config b/test/zones/evpn/ipv4ipv6/expected_controller_config index bd7830a..d5d310d 100644 --- a/test/zones/evpn/ipv4ipv6/expected_controller_config +++ b/test/zones/evpn/ipv4ipv6/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.2.2 +frr version 8.5.1 frr defaults datacenter hostname localhost log syslog informational @@ -11,6 +11,8 @@ exit-vrf ! router bgp 65000 bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification no bgp default ipv4-unicast coalesce-time 1000 neighbor VTEP peer-group @@ -29,6 +31,8 @@ exit ! router bgp 65000 vrf vrf_myzone bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification exit ! route-map MAP_VTEP_IN permit 1 diff --git a/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config b/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config index bd7830a..d5d310d 100644 --- a/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config +++ b/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.2.2 +frr version 8.5.1 frr defaults datacenter hostname localhost log syslog informational @@ -11,6 +11,8 @@ exit-vrf ! router bgp 65000 bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification no bgp default ipv4-unicast coalesce-time 1000 neighbor VTEP peer-group @@ -29,6 +31,8 @@ exit ! router bgp 65000 vrf vrf_myzone bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification exit ! route-map MAP_VTEP_IN permit 1 diff --git a/test/zones/evpn/ipv6/expected_controller_config b/test/zones/evpn/ipv6/expected_controller_config index bd7830a..d5d310d 100644 --- a/test/zones/evpn/ipv6/expected_controller_config +++ b/test/zones/evpn/ipv6/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.2.2 +frr version 8.5.1 frr defaults datacenter hostname localhost log syslog informational @@ -11,6 +11,8 @@ exit-vrf ! router bgp 65000 bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification no bgp default ipv4-unicast coalesce-time 1000 neighbor VTEP peer-group @@ -29,6 +31,8 @@ exit ! router bgp 65000 vrf vrf_myzone bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification exit ! route-map MAP_VTEP_IN permit 1 diff --git a/test/zones/evpn/multipath_relax/expected_controller_config b/test/zones/evpn/multipath_relax/expected_controller_config index 2d1ad44..f0316cc 100644 --- a/test/zones/evpn/multipath_relax/expected_controller_config +++ b/test/zones/evpn/multipath_relax/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.2.2 +frr version 8.5.1 frr defaults datacenter hostname localhost log syslog informational @@ -11,6 +11,8 @@ exit-vrf ! router bgp 65000 bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification no bgp default ipv4-unicast coalesce-time 1000 neighbor VTEP peer-group @@ -41,6 +43,8 @@ exit ! router bgp 65000 vrf vrf_myzone bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification exit ! route-map MAP_VTEP_IN permit 1 diff --git a/test/zones/evpn/multiplezones/expected_controller_config b/test/zones/evpn/multiplezones/expected_controller_config index d6dfa73..8d578f7 100644 --- a/test/zones/evpn/multiplezones/expected_controller_config +++ b/test/zones/evpn/multiplezones/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.2.2 +frr version 8.5.1 frr defaults datacenter hostname localhost log syslog informational @@ -15,6 +15,8 @@ exit-vrf ! router bgp 65000 bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification no bgp default ipv4-unicast coalesce-time 1000 neighbor VTEP peer-group @@ -33,10 +35,14 @@ exit ! router bgp 65000 vrf vrf_myzone bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification exit ! router bgp 65000 vrf vrf_myzone2 bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification exit ! route-map MAP_VTEP_IN permit 1 diff --git a/test/zones/evpn/rt_import/expected_controller_config b/test/zones/evpn/rt_import/expected_controller_config index f4f28dd..f394b84 100644 --- a/test/zones/evpn/rt_import/expected_controller_config +++ b/test/zones/evpn/rt_import/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.2.2 +frr version 8.5.1 frr defaults datacenter hostname localhost log syslog informational @@ -11,6 +11,8 @@ exit-vrf ! router bgp 65000 bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification no bgp default ipv4-unicast coalesce-time 1000 neighbor VTEP peer-group @@ -29,6 +31,8 @@ exit ! router bgp 65000 vrf vrf_myzone bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification ! address-family l2vpn evpn route-target import 65001:1000 diff --git a/test/zones/evpn/vxlanport/expected_controller_config b/test/zones/evpn/vxlanport/expected_controller_config index bd7830a..d5d310d 100644 --- a/test/zones/evpn/vxlanport/expected_controller_config +++ b/test/zones/evpn/vxlanport/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.2.2 +frr version 8.5.1 frr defaults datacenter hostname localhost log syslog informational @@ -11,6 +11,8 @@ exit-vrf ! router bgp 65000 bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification no bgp default ipv4-unicast coalesce-time 1000 neighbor VTEP peer-group @@ -29,6 +31,8 @@ exit ! router bgp 65000 vrf vrf_myzone bgp router-id 192.168.0.1 + no bgp hard-administrative-reset + no bgp graceful-restart notification exit ! route-map MAP_VTEP_IN permit 1 -- 2.30.2