From 5310713bf116b8ad65f9e86346a7c02b2922212e Mon Sep 17 00:00:00 2001 From: Kyrylo Yatsenko Date: Thu, 8 Jan 2026 14:50:51 +0200 Subject: isis: T8158: fix lsp-timers There are three configuration values in VyOS isis XML: * lsp-gen-interval * lsp-refresh-interval * max-lsp-lifetime In FRR they have the following restrictions in yang model: * refresh-interval, default 900 * maximum-lifetime >= refresh-interval + 300 (350-65535), default 1200 * generation-interval < refresh-interval (1..120), default 30 When setting these values in separate steps we can get error e.g.: libyang: Must condition ". >= ../refresh-interval + 300" not satisfied. even when all restrictions are satisfied. To fix the issue: 1. Write default values in our XML. 2. Check these restrictions in protocol_isis.py 3. Use FRR command `lsp-timers` that sets all these values in one go --- data/templates/frr/isisd.frr.j2 | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'data') diff --git a/data/templates/frr/isisd.frr.j2 b/data/templates/frr/isisd.frr.j2 index 6691517b4..f43dc887d 100644 --- a/data/templates/frr/isisd.frr.j2 +++ b/data/templates/frr/isisd.frr.j2 @@ -114,18 +114,10 @@ advertise-passive-only {% if log_adjacency_changes is vyos_defined %} log-adjacency-changes {% endif %} -{% if lsp_gen_interval is vyos_defined %} - lsp-gen-interval {{ lsp_gen_interval }} -{% endif %} + lsp-timers gen-interval {{ lsp_gen_interval }} refresh-interval {{ lsp_refresh_interval }} max-lifetime {{ max_lsp_lifetime }} {% if lsp_mtu is vyos_defined %} lsp-mtu {{ lsp_mtu }} {% endif %} -{% if lsp_refresh_interval is vyos_defined %} - lsp-refresh-interval {{ lsp_refresh_interval }} -{% endif %} -{% if max_lsp_lifetime is vyos_defined %} - max-lsp-lifetime {{ max_lsp_lifetime }} -{% endif %} {% if ldp_sync.holddown is vyos_defined %} mpls ldp-sync holddown {{ ldp_sync.holddown }} {% elif ldp_sync is vyos_defined %} -- cgit v1.2.3