Page MenuHomeVyOS Platform
Create Task
Maniphest T3135

BFD configurations fail to be applied
Closed, ResolvedPublicBUG
Actions

Description

Since changing to trim blocks the output of the bfd code no longer matches what is required by FRR.
And example is removing peers it makes this configuration file:
no peer 172.31.50.1 interface vtun0 no peer 172.31.51.1 interface vtun1 no peer 172.31.52.1 interface vtun2

It should output each on their own line:
no peer 172.31.50.1 interface vtun0
no peer 172.31.51.1 interface vtun1
no peer 172.31.52.1 interface vtun2

The template bfd.frr.tmpl could be changed to:
!
bfd
{% for peer in old_peers %}
no peer {{ peer.remote }}{% if peer.multihop %} multihop{% endif %}{% if peer.src_addr %} local-address {{ peer.src_addr }}{% endif %}{% if peer.src_if %} interface {{ peer.src_if }}{% endif %}

{% endfor %}
!
{% for peer in new_peers %}
peer {{ peer.remote }}{% if peer.multihop %} multihop{% endif %}{% if peer.src_addr %} local-address {{ peer.src_addr }}{% endif %}{% if peer.src_if %} interface {{ peer.src_if }}{% endif %}

detect-multiplier {{ peer.multiplier }}
receive-interval {{ peer.rx_interval }}
transmit-interval {{ peer.tx_interval }}
{% if peer.echo_mode %}
echo-mode
{% endif %}
{% if peer.echo_interval != '' %}
echo-interval {{ peer.echo_interval }}
{% endif %}
{% if not peer.shutdown %}no {% endif %}shutdown
{% endfor %}
!

Details

Difficulty level
Easy (less than an hour)
Version
1.3-rolling-202012171749
Why the issue appeared?
Will be filled on close
Is it a breaking change?
Perfectly compatible
Issue type
Bug (incorrect behavior)

Event Timeline

bedmisten created this task.Dec 17 2020, 8:37 PM
bedmisten added a comment.Dec 17 2020, 10:12 PM

Created PR #648 in vyos-1x

From 2dc688ded0215c9d322307407452971402c0fba2 Mon Sep 17 00:00:00 2001
From: bedmisten <[email protected]>
Date: Thu, 17 Dec 2020 14:01:19 -0800
Subject: [PATCH] T3135: bfd template missing newlines

trim blocks removes newlines after {% endif %} blocks.  Added the required newlines.
---
 data/templates/frr/bfd.frr.tmpl | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/data/templates/frr/bfd.frr.tmpl b/data/templates/frr/bfd.frr.tmpl
index 95a29e06a..9e5ad3379 100644
--- a/data/templates/frr/bfd.frr.tmpl
+++ b/data/templates/frr/bfd.frr.tmpl
@@ -2,15 +2,21 @@
 bfd
 {% for peer in old_peers %}
  no peer {{ peer.remote }}{% if peer.multihop %} multihop{% endif %}{% if peer.src_addr %} local-address {{ peer.src_addr }}{% endif %}{% if peer.src_if %} interface {{ peer.src_if }}{% endif %}
+
 {% endfor %}
 !
 {% for peer in new_peers %}
  peer {{ peer.remote }}{% if peer.multihop %} multihop{% endif %}{% if peer.src_addr %} local-address {{ peer.src_addr }}{% endif %}{% if peer.src_if %} interface {{ peer.src_if }}{% endif %}
+
  detect-multiplier {{ peer.multiplier }}
  receive-interval {{ peer.rx_interval }}
  transmit-interval {{ peer.tx_interval }}
- {% if peer.echo_mode %}echo-mode{% endif %}
- {% if peer.echo_interval != '' %}echo-interval {{ peer.echo_interval }}{% endif %}
+{% if peer.echo_mode %}
+ echo-mode
+{% endif %}
+{% if peer.echo_interval != '' %}
+ echo-interval {{ peer.echo_interval }}
+{% endif %}
  {% if not peer.shutdown %}no {% endif %}shutdown
 {% endfor %}
 !
pasik added a subscriber: pasik.Dec 18 2020, 12:17 PM
dmbaturin closed this task as Resolved.May 29 2021, 8:02 AM
dmbaturin claimed this task.
dmbaturin added a subscriber: dmbaturin.

https://github.com/vyos/vyos-1x/pull/648 was merged.

dmbaturin added a project: VyOS 1.3 Equuleus.May 29 2021, 8:03 AM
c-po moved this task from Need Triage to Finished on the VyOS 1.3 Equuleus board.Jun 13 2021, 11:21 AM
erkin set Issue type to Bug (incorrect behavior).Aug 29 2021, 11:59 AM
erkin removed a subscriber: Active contributors.
syncer edited projects, added VyOS 1.3 Equuleus (1.3.0); removed VyOS 1.3 Equuleus.Aug 29 2022, 12:17 PM
syncer moved this task from Need Triage to Finished on the VyOS 1.3 Equuleus (1.3.0) board.