summaryrefslogtreecommitdiff
path: root/data/templates/frr
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-04-03 12:43:30 +0200
committerChristian Poessinger <christian@poessinger.com>2022-04-03 12:49:31 +0200
commit537f0b9e0543e776e405053bc82d119a2edaa7ae (patch)
tree8be28c05c9d85de456ba32e3c686e9f00411191e /data/templates/frr
parentadda3d86080bb3b8fe26424c7d829e40eb9e2b23 (diff)
downloadvyos-1x-537f0b9e0543e776e405053bc82d119a2edaa7ae.tar.gz
vyos-1x-537f0b9e0543e776e405053bc82d119a2edaa7ae.zip
isis: T4337: IETF SPF delay algorithm can not be configured
To reproduce: set protocols isis interface eth1 set protocols isis net '49.0001.1921.6800.1002.00' Now enable SPF: set protocols isis spf-delay-ietf holddown '20' set protocols isis spf-delay-ietf init-delay '31' set protocols isis spf-delay-ietf long-delay '30' set protocols isis spf-delay-ietf short-delay '32' set protocols isis spf-delay-ietf time-to-learn '44' This will only render the FRR config line: spf-delay-ietf init-delay 31 which is incomplete: frr-reload output: 2 2022-04-03 12:35:24,764 ERROR: vtysh failed to process new configuration: vtysh (mark file) exited with status 4: frr-reload output: 3 b'line 15: % Command incomplete: spf-delay-ietf init-delay 31\n\n'
Diffstat (limited to 'data/templates/frr')
-rw-r--r--data/templates/frr/isisd.frr.tmpl4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/templates/frr/isisd.frr.tmpl b/data/templates/frr/isisd.frr.tmpl
index 6cfa076d0..40c7f8aa1 100644
--- a/data/templates/frr/isisd.frr.tmpl
+++ b/data/templates/frr/isisd.frr.tmpl
@@ -99,8 +99,8 @@ router isis VyOS {{ 'vrf ' + vrf if vrf is defined and vrf is not none }}
{% endfor %}
{% endif %}
{% endif %}
-{% if spf_delay_ietf is defined and spf_delay_ietf.init_delay is defined and spf_delay_ietf.init_delay is not none %}
- spf-delay-ietf init-delay {{ spf_delay_ietf.init_delay }}
+{% if spf_delay_ietf is defined and spf_delay_ietf.init_delay is defined and spf_delay_ietf.short_delay is defined and spf_delay_ietf.long_delay is defined and spf_delay_ietf.holddown is defined and spf_delay_ietf.time_to_learn is defined %}
+ spf-delay-ietf init-delay {{ spf_delay_ietf.init_delay }} short-delay {{ spf_delay_ietf.short_delay }} long-delay {{ spf_delay_ietf.long_delay }} holddown {{ spf_delay_ietf.holddown }} time-to-learn {{ spf_delay_ietf.time_to_learn }}
{% endif %}
{% if area_password is defined and area_password is not none %}
{% if area_password.md5 is defined and area_password.md5 is not none %}