summaryrefslogtreecommitdiff
path: root/data/templates/frr
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-12-08 09:11:35 +0100
committerChristian Breunig <christian@breunig.cc>2024-12-16 22:24:50 +0100
commit13baad691410009d1e5f7e6f6bf5afe72afd2f73 (patch)
tree90cdf1e9e95debfb0717122b23b8cfaaffa19487 /data/templates/frr
parent3c79477adf3cd4f4efb302b58542ddd668b562ac (diff)
downloadvyos-1x-13baad691410009d1e5f7e6f6bf5afe72afd2f73.tar.gz
vyos-1x-13baad691410009d1e5f7e6f6bf5afe72afd2f73.zip
multicast: T6746: flatten CLI by merging "multicast route" to "mroute" CLI tagNode
This will save an entire level for the configuration and there is no need for a parent "multicast" node, as it will only have "route" as tagNode below. Move set protocols static multicast route <x.x.x.x/y> to: * set protocols static mroute <x.x.x.x/y>
Diffstat (limited to 'data/templates/frr')
-rw-r--r--data/templates/frr/staticd.frr.j28
1 files changed, 3 insertions, 5 deletions
diff --git a/data/templates/frr/staticd.frr.j2 b/data/templates/frr/staticd.frr.j2
index c662b7650..227807c62 100644
--- a/data/templates/frr/staticd.frr.j2
+++ b/data/templates/frr/staticd.frr.j2
@@ -128,15 +128,13 @@ exit-vrf
{% endif %}
!
{# Multicast route #}
-{% if multicast is vyos_defined %}
+{% if mroute is vyos_defined %}
{% set ip_prefix = 'ip m' %}
{# IPv4 multicast routing #}
-{% if multicast.route is vyos_defined %}
-{% for prefix, prefix_config in multicast.route.items() %}
+{% for prefix, prefix_config in mroute.items() %}
{{ static_routes(ip_prefix, prefix, prefix_config) }}
{# j2lint: disable=jinja-statements-delimeter #}
-{%- endfor %}
-{% endif %}
+{%- endfor %}
{% endif %}
!
{% if route_map is vyos_defined %}