With the package bumped to 10.3.1 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: Gabriel Goller <g.gol...@proxmox.com>
---
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 62a71e50d9bf..52fa456e2181 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.3.1",
"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 473a47080f6e..6bf36f6ed331 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.3.1
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 9d8ec609b307..8a133a506b52 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.3.1
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 8dfb6de774fe..5cf695c97cab 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.3.1
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 82eef1158982..4b44a0702d01 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.3.1
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 99e933a8c4dc..9310d51d61bb 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.3.1
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 2bc55727fb58..6735d4d83698 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.3.1
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 28c91a550f2e..b2f3b332529b 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.3.1
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 99e933a8c4dc..9310d51d61bb 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.3.1
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 fc8ae67b2a35..b99c1a1da71a 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.3.1
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 9d8ec609b307..8a133a506b52 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.3.1
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 9d8ec609b307..8a133a506b52 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.3.1
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 9d8ec609b307..8a133a506b52 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.3.1
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 9d8ec609b307..8a133a506b52 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.3.1
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 fffd4157a8bf..b07791434489 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.3.1
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 9ec8c018f97f..068b08a09f77 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.3.1
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 5a7f5c9fd5e5..9b3dc449b120 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.3.1
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 5c9bf1adfbae..ce62d74c0d60 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.3.1
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 a87cdc44d54e..bf2289093b6f 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.3.1
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 37f663a32572..e1e6df5562e0 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.3.1
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 749713a425ee..2c29f3cc4a5f 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.3.1
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 c7b23583baa6..712fc2a9fd4f 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.3.1
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 5bdb148f94a4..4de7f89f82c8 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.3.1
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 9d8ec609b307..8a133a506b52 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.3.1
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
