From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id AACBD1FF165 for ; Thu, 22 May 2025 18:26:14 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8298CBAE7; Thu, 22 May 2025 18:25:53 +0200 (CEST) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Date: Thu, 22 May 2025 18:17:10 +0200 Message-Id: <20250522161731.537011-55-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250522161731.537011-1-s.hanreich@proxmox.com> References: <20250522161731.537011-1-s.hanreich@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.215 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 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 RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS 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 Subject: [pve-devel] [PATCH pve-network v3 21/21] frr: bump frr config version to 10.2.2 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" With the package bumped to 10.2.2 we need to generate the configuration with the matching version, otherwise frr-reload.py fails to create a delta of the configuration because of the version mismatch. Reloading still works, but there is an ugly warning in the reload log, that might throw off users. Signed-off-by: Stefan Hanreich --- src/PVE/Network/SDN/Frr.pm | 2 +- .../zones/evpn/advertise_subnets/expected_controller_config | 2 +- .../evpn/disable_arp_nd_suppression/expected_controller_config | 2 +- src/test/zones/evpn/ebgp/expected_controller_config | 2 +- src/test/zones/evpn/ebgp_loopback/expected_controller_config | 2 +- src/test/zones/evpn/exitnode/expected_controller_config | 2 +- .../evpn/exitnode_local_routing/expected_controller_config | 2 +- src/test/zones/evpn/exitnode_primary/expected_controller_config | 2 +- src/test/zones/evpn/exitnode_snat/expected_controller_config | 2 +- .../zones/evpn/exitnodenullroute/expected_controller_config | 2 +- src/test/zones/evpn/ipv4/expected_controller_config | 2 +- src/test/zones/evpn/ipv4ipv6/expected_controller_config | 2 +- .../zones/evpn/ipv4ipv6nogateway/expected_controller_config | 2 +- src/test/zones/evpn/ipv6/expected_controller_config | 2 +- src/test/zones/evpn/ipv6underlay/expected_controller_config | 2 +- src/test/zones/evpn/isis/expected_controller_config | 2 +- src/test/zones/evpn/isis_loopback/expected_controller_config | 2 +- src/test/zones/evpn/isis_standalone/expected_controller_config | 2 +- src/test/zones/evpn/multipath_relax/expected_controller_config | 2 +- src/test/zones/evpn/multiplezones/expected_controller_config | 2 +- .../zones/evpn/openfabric_fabric/expected_controller_config | 2 +- src/test/zones/evpn/ospf_fabric/expected_controller_config | 2 +- src/test/zones/evpn/rt_import/expected_controller_config | 2 +- src/test/zones/evpn/vxlanport/expected_controller_config | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/PVE/Network/SDN/Frr.pm b/src/PVE/Network/SDN/Frr.pm index 4950bf5..f98a0e8 100644 --- a/src/PVE/Network/SDN/Frr.pm +++ b/src/PVE/Network/SDN/Frr.pm @@ -211,7 +211,7 @@ sub raw_config_to_string { my $nodename = PVE::INotify::nodename(); my @final_config = ( - "frr version 8.5.2", + "frr version 10.2.2", "frr defaults datacenter", "hostname $nodename", "log syslog informational", diff --git a/src/test/zones/evpn/advertise_subnets/expected_controller_config b/src/test/zones/evpn/advertise_subnets/expected_controller_config index 473a470..ff2f530 100644 --- a/src/test/zones/evpn/advertise_subnets/expected_controller_config +++ b/src/test/zones/evpn/advertise_subnets/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.5.2 +frr version 10.2.2 frr defaults datacenter hostname localhost log syslog informational diff --git a/src/test/zones/evpn/disable_arp_nd_suppression/expected_controller_config b/src/test/zones/evpn/disable_arp_nd_suppression/expected_controller_config index 9d8ec60..f4057fd 100644 --- a/src/test/zones/evpn/disable_arp_nd_suppression/expected_controller_config +++ b/src/test/zones/evpn/disable_arp_nd_suppression/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.5.2 +frr version 10.2.2 frr defaults datacenter hostname localhost log syslog informational diff --git a/src/test/zones/evpn/ebgp/expected_controller_config b/src/test/zones/evpn/ebgp/expected_controller_config index 8dfb6de..c4b1521 100644 --- a/src/test/zones/evpn/ebgp/expected_controller_config +++ b/src/test/zones/evpn/ebgp/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.5.2 +frr version 10.2.2 frr defaults datacenter hostname localhost log syslog informational diff --git a/src/test/zones/evpn/ebgp_loopback/expected_controller_config b/src/test/zones/evpn/ebgp_loopback/expected_controller_config index 82eef11..3e00954 100644 --- a/src/test/zones/evpn/ebgp_loopback/expected_controller_config +++ b/src/test/zones/evpn/ebgp_loopback/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.5.2 +frr version 10.2.2 frr defaults datacenter hostname localhost log syslog informational diff --git a/src/test/zones/evpn/exitnode/expected_controller_config b/src/test/zones/evpn/exitnode/expected_controller_config index 99e933a..2c0fa74 100644 --- a/src/test/zones/evpn/exitnode/expected_controller_config +++ b/src/test/zones/evpn/exitnode/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.5.2 +frr version 10.2.2 frr defaults datacenter hostname localhost log syslog informational diff --git a/src/test/zones/evpn/exitnode_local_routing/expected_controller_config b/src/test/zones/evpn/exitnode_local_routing/expected_controller_config index 2bc5572..4eaec10 100644 --- a/src/test/zones/evpn/exitnode_local_routing/expected_controller_config +++ b/src/test/zones/evpn/exitnode_local_routing/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.5.2 +frr version 10.2.2 frr defaults datacenter hostname localhost log syslog informational diff --git a/src/test/zones/evpn/exitnode_primary/expected_controller_config b/src/test/zones/evpn/exitnode_primary/expected_controller_config index 28c91a5..8542a7b 100644 --- a/src/test/zones/evpn/exitnode_primary/expected_controller_config +++ b/src/test/zones/evpn/exitnode_primary/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.5.2 +frr version 10.2.2 frr defaults datacenter hostname localhost log syslog informational diff --git a/src/test/zones/evpn/exitnode_snat/expected_controller_config b/src/test/zones/evpn/exitnode_snat/expected_controller_config index 99e933a..2c0fa74 100644 --- a/src/test/zones/evpn/exitnode_snat/expected_controller_config +++ b/src/test/zones/evpn/exitnode_snat/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.5.2 +frr version 10.2.2 frr defaults datacenter hostname localhost log syslog informational diff --git a/src/test/zones/evpn/exitnodenullroute/expected_controller_config b/src/test/zones/evpn/exitnodenullroute/expected_controller_config index fc8ae67..aaa9400 100644 --- a/src/test/zones/evpn/exitnodenullroute/expected_controller_config +++ b/src/test/zones/evpn/exitnodenullroute/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.5.2 +frr version 10.2.2 frr defaults datacenter hostname localhost log syslog informational diff --git a/src/test/zones/evpn/ipv4/expected_controller_config b/src/test/zones/evpn/ipv4/expected_controller_config index 9d8ec60..f4057fd 100644 --- a/src/test/zones/evpn/ipv4/expected_controller_config +++ b/src/test/zones/evpn/ipv4/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.5.2 +frr version 10.2.2 frr defaults datacenter hostname localhost log syslog informational diff --git a/src/test/zones/evpn/ipv4ipv6/expected_controller_config b/src/test/zones/evpn/ipv4ipv6/expected_controller_config index 9d8ec60..f4057fd 100644 --- a/src/test/zones/evpn/ipv4ipv6/expected_controller_config +++ b/src/test/zones/evpn/ipv4ipv6/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.5.2 +frr version 10.2.2 frr defaults datacenter hostname localhost log syslog informational diff --git a/src/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config b/src/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config index 9d8ec60..f4057fd 100644 --- a/src/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config +++ b/src/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.5.2 +frr version 10.2.2 frr defaults datacenter hostname localhost log syslog informational diff --git a/src/test/zones/evpn/ipv6/expected_controller_config b/src/test/zones/evpn/ipv6/expected_controller_config index 9d8ec60..f4057fd 100644 --- a/src/test/zones/evpn/ipv6/expected_controller_config +++ b/src/test/zones/evpn/ipv6/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.5.2 +frr version 10.2.2 frr defaults datacenter hostname localhost log syslog informational diff --git a/src/test/zones/evpn/ipv6underlay/expected_controller_config b/src/test/zones/evpn/ipv6underlay/expected_controller_config index fffd415..8dfb720 100644 --- a/src/test/zones/evpn/ipv6underlay/expected_controller_config +++ b/src/test/zones/evpn/ipv6underlay/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.5.2 +frr version 10.2.2 frr defaults datacenter hostname localhost log syslog informational diff --git a/src/test/zones/evpn/isis/expected_controller_config b/src/test/zones/evpn/isis/expected_controller_config index 9ec8c01..4778e70 100644 --- a/src/test/zones/evpn/isis/expected_controller_config +++ b/src/test/zones/evpn/isis/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.5.2 +frr version 10.2.2 frr defaults datacenter hostname localhost log syslog informational diff --git a/src/test/zones/evpn/isis_loopback/expected_controller_config b/src/test/zones/evpn/isis_loopback/expected_controller_config index 5a7f5c9..795c9df 100644 --- a/src/test/zones/evpn/isis_loopback/expected_controller_config +++ b/src/test/zones/evpn/isis_loopback/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.5.2 +frr version 10.2.2 frr defaults datacenter hostname localhost log syslog informational diff --git a/src/test/zones/evpn/isis_standalone/expected_controller_config b/src/test/zones/evpn/isis_standalone/expected_controller_config index 5c9bf1a..b95746b 100644 --- a/src/test/zones/evpn/isis_standalone/expected_controller_config +++ b/src/test/zones/evpn/isis_standalone/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.5.2 +frr version 10.2.2 frr defaults datacenter hostname localhost log syslog informational diff --git a/src/test/zones/evpn/multipath_relax/expected_controller_config b/src/test/zones/evpn/multipath_relax/expected_controller_config index a87cdc4..d83b5d0 100644 --- a/src/test/zones/evpn/multipath_relax/expected_controller_config +++ b/src/test/zones/evpn/multipath_relax/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.5.2 +frr version 10.2.2 frr defaults datacenter hostname localhost log syslog informational diff --git a/src/test/zones/evpn/multiplezones/expected_controller_config b/src/test/zones/evpn/multiplezones/expected_controller_config index 37f663a..c95c3db 100644 --- a/src/test/zones/evpn/multiplezones/expected_controller_config +++ b/src/test/zones/evpn/multiplezones/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.5.2 +frr version 10.2.2 frr defaults datacenter hostname localhost log syslog informational diff --git a/src/test/zones/evpn/openfabric_fabric/expected_controller_config b/src/test/zones/evpn/openfabric_fabric/expected_controller_config index 749713a..1b0b420 100644 --- a/src/test/zones/evpn/openfabric_fabric/expected_controller_config +++ b/src/test/zones/evpn/openfabric_fabric/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.5.2 +frr version 10.2.2 frr defaults datacenter hostname localhost log syslog informational diff --git a/src/test/zones/evpn/ospf_fabric/expected_controller_config b/src/test/zones/evpn/ospf_fabric/expected_controller_config index c7b2358..8701b76 100644 --- a/src/test/zones/evpn/ospf_fabric/expected_controller_config +++ b/src/test/zones/evpn/ospf_fabric/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.5.2 +frr version 10.2.2 frr defaults datacenter hostname localhost log syslog informational diff --git a/src/test/zones/evpn/rt_import/expected_controller_config b/src/test/zones/evpn/rt_import/expected_controller_config index 5bdb148..6b19797 100644 --- a/src/test/zones/evpn/rt_import/expected_controller_config +++ b/src/test/zones/evpn/rt_import/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.5.2 +frr version 10.2.2 frr defaults datacenter hostname localhost log syslog informational diff --git a/src/test/zones/evpn/vxlanport/expected_controller_config b/src/test/zones/evpn/vxlanport/expected_controller_config index 9d8ec60..f4057fd 100644 --- a/src/test/zones/evpn/vxlanport/expected_controller_config +++ b/src/test/zones/evpn/vxlanport/expected_controller_config @@ -1,4 +1,4 @@ -frr version 8.5.2 +frr version 10.2.2 frr defaults datacenter hostname localhost log syslog informational -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel