Make the frr generated files compatible with 8.0+

Changing the bfd echo interval to echo intervals and declaring the format of the file as 8.0 version. Signed-off-by: Federico Paolinelli <[email protected]>
metallb · Jul 11, 2024 · aae1186 · aae1186
1 parent 73a5c59
commit aae1186
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 8 deletions.
diff --git a/charts/frr-k8s/templates/controller.yaml b/charts/frr-k8s/templates/controller.yaml
@@ -95,7 +95,7 @@ data:
   frr.conf: |+
     ! This file gets overriden the first time the speaker renders a config.
     ! So anything configured here is only temporary.
-    frr version 7.5.1
+    frr version 8.0
     frr defaults traditional
     hostname Router
     line vty

diff --git a/config/all-in-one/frr-k8s-prometheus.yaml b/config/all-in-one/frr-k8s-prometheus.yaml
@@ -849,7 +849,7 @@ data:
   frr.conf: |
     ! This file gets overriden the first time the speaker renders a config.
     ! So anything configured here is only temporary.
-    frr version 7.5.1
+    frr version 8.0
     frr defaults traditional
     hostname Router
     line vty

diff --git a/config/all-in-one/frr-k8s.yaml b/config/all-in-one/frr-k8s.yaml
@@ -818,7 +818,7 @@ data:
   frr.conf: |
     ! This file gets overriden the first time the speaker renders a config.
     ! So anything configured here is only temporary.
-    frr version 7.5.1
+    frr version 8.0
     frr defaults traditional
     hostname Router
     line vty

diff --git a/config/frr-k8s/frr-cm.yaml b/config/frr-k8s/frr-cm.yaml
@@ -91,7 +91,7 @@ data:
   frr.conf: |+
     ! This file gets overriden the first time the speaker renders a config.
     ! So anything configured here is only temporary.
-    frr version 7.5.1
+    frr version 8.0
     frr defaults traditional
     hostname Router
     line vty

diff --git a/internal/frr/templates/bfdprofile.tmpl b/internal/frr/templates/bfdprofile.tmpl
@@ -13,12 +13,13 @@
     echo-mode
     {{end -}}
     {{ if .profile.EchoInterval -}}
-    echo-interval {{.profile.EchoInterval}}
+    echo transmit-interval {{.profile.EchoInterval}}
+    echo receive-interval {{.profile.EchoInterval}}
     {{end -}}
     {{ if .profile.PassiveMode -}}
     passive-mode
     {{end -}}
     {{ if .profile.MinimumTTL -}}
     minimum-ttl {{ .profile.MinimumTTL }}
     {{end -}}
-{{- end -}}
+{{- end -}}
diff --git a/internal/frr/testdata/TestSingleSessionBFD.golden b/internal/frr/testdata/TestSingleSessionBFD.golden
@@ -57,7 +57,8 @@ bfd
     transmit-interval 200
     detect-multiplier 3
     echo-mode
-    echo-interval 25
+    echo transmit-interval 25
+    echo receive-interval 25
     passive-mode
     minimum-ttl 20
 

diff --git a/internal/frr/testdata/TestTwoRoutersTwoNeighborsBFD.golden b/internal/frr/testdata/TestTwoRoutersTwoNeighborsBFD.golden
@@ -102,7 +102,8 @@ bfd
     transmit-interval 200
     detect-multiplier 3
     echo-mode
-    echo-interval 25
+    echo transmit-interval 25
+    echo receive-interval 25
     passive-mode
     minimum-ttl 20