public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
* [pve-devel] [PATCH network] frr: update frr version in config file
@ 2025-12-09 10:57 Gabriel Goller
  2025-12-10 19:32 ` [pve-devel] applied: " Thomas Lamprecht
  0 siblings, 1 reply; 2+ messages in thread
From: Gabriel Goller @ 2025-12-09 10:57 UTC (permalink / raw)
  To: pve-devel

Frr recently got updated to 10.4.1. Update the config generation so that
the config file correctly reads "frr version 10.4.1". Also updated the
tests.

Signed-off-by: Gabriel Goller <g.goller@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 6e97b560df5c..221e562fcecc 100644
--- a/src/PVE/Network/SDN/Frr.pm
+++ b/src/PVE/Network/SDN/Frr.pm
@@ -225,7 +225,7 @@ sub raw_config_to_string {
     my $nodename = PVE::INotify::nodename();
 
     my @final_config = (
-        "frr version 10.3.1",
+        "frr version 10.4.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 6bf36f6ed331..93dd23cdbf44 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 10.3.1
+frr version 10.4.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 8a133a506b52..8d265c83f2c0 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 10.3.1
+frr version 10.4.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 5cf695c97cab..8e2becc474a7 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 10.3.1
+frr version 10.4.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 4b44a0702d01..4a17a97a02b2 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 10.3.1
+frr version 10.4.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 9310d51d61bb..99aca6520c00 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 10.3.1
+frr version 10.4.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 6735d4d83698..af4be8c7b7f8 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 10.3.1
+frr version 10.4.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 b2f3b332529b..586327b219b8 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 10.3.1
+frr version 10.4.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 9310d51d61bb..99aca6520c00 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 10.3.1
+frr version 10.4.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 b99c1a1da71a..458688114bdd 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 10.3.1
+frr version 10.4.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 8a133a506b52..8d265c83f2c0 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 10.3.1
+frr version 10.4.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 8a133a506b52..8d265c83f2c0 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 10.3.1
+frr version 10.4.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 8a133a506b52..8d265c83f2c0 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 10.3.1
+frr version 10.4.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 8a133a506b52..8d265c83f2c0 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 10.3.1
+frr version 10.4.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 b07791434489..123964e22a78 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 10.3.1
+frr version 10.4.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 068b08a09f77..913fb2b00c12 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 10.3.1
+frr version 10.4.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 9b3dc449b120..4f77b4dd0cce 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 10.3.1
+frr version 10.4.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 ce62d74c0d60..7e99517c859b 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 10.3.1
+frr version 10.4.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 bf2289093b6f..1f6ff556973c 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 10.3.1
+frr version 10.4.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 e1e6df5562e0..fcba2737520c 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 10.3.1
+frr version 10.4.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 2c29f3cc4a5f..caaa225c2734 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 10.3.1
+frr version 10.4.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 712fc2a9fd4f..1930eef8f3c0 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 10.3.1
+frr version 10.4.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 4de7f89f82c8..ab1471f26b81 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 10.3.1
+frr version 10.4.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 8a133a506b52..8d265c83f2c0 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 10.3.1
+frr version 10.4.1
 frr defaults datacenter
 hostname localhost
 log syslog informational
-- 
2.47.3



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel


^ permalink raw reply	[flat|nested] 2+ messages in thread
* [pve-devel] applied: [PATCH network] frr: update frr version in config file
  2025-12-09 10:57 [pve-devel] [PATCH network] frr: update frr version in config file Gabriel Goller
@ 2025-12-10 19:32 ` Thomas Lamprecht
  0 siblings, 0 replies; 2+ messages in thread
From: Thomas Lamprecht @ 2025-12-10 19:32 UTC (permalink / raw)
  To: Proxmox VE development discussion, Gabriel Goller

Am 09.12.25 um 11:57 schrieb Gabriel Goller:
> Frr recently got updated to 10.4.1. Update the config generation so that
> the config file correctly reads "frr version 10.4.1". Also updated the
> tests.
> 
> Signed-off-by: Gabriel Goller <g.goller@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(-)
> 
>

applied, thanks!


_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel


^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-12-10 19:32 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-12-09 10:57 [pve-devel] [PATCH network] frr: update frr version in config file Gabriel Goller
2025-12-10 19:32 ` [pve-devel] applied: " Thomas Lamprecht

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal