From b454ddc8c2cc0edbdc832bd60ef03a1819a6d8d6 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Mon, 10 Apr 2023 10:57:34 +0200
Subject: T5150: initial VRF support for Kernel/Zebra route-map filtering

---
 data/templates/frr/vrf-vni.frr.j2             |  9 ---------
 data/templates/frr/zebra.route-map.frr.j2     | 26 +++++++-------------------
 data/templates/frr/zebra.vrf.route-map.frr.j2 | 24 ++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 28 deletions(-)
 delete mode 100644 data/templates/frr/vrf-vni.frr.j2
 create mode 100644 data/templates/frr/zebra.vrf.route-map.frr.j2

(limited to 'data/templates')

diff --git a/data/templates/frr/vrf-vni.frr.j2 b/data/templates/frr/vrf-vni.frr.j2
deleted file mode 100644
index e5f4810a1..000000000
--- a/data/templates/frr/vrf-vni.frr.j2
+++ /dev/null
@@ -1,9 +0,0 @@
-{% if name is vyos_defined %}
-{%     for vrf, vrf_config in name.items() %}
-vrf {{ vrf }}
-{%         if vrf_config.vni is vyos_defined %}
- vni {{ vrf_config.vni }}
-{%         endif %}
- exit-vrf
-{%     endfor %}
-{% endif %}
diff --git a/data/templates/frr/zebra.route-map.frr.j2 b/data/templates/frr/zebra.route-map.frr.j2
index bd461d904..8e18abbde 100644
--- a/data/templates/frr/zebra.route-map.frr.j2
+++ b/data/templates/frr/zebra.route-map.frr.j2
@@ -1,21 +1,9 @@
 !
-{% if vrf is vyos_defined %}
-vrf {{ vrf }}
-{%     if protocol is vyos_defined %}
-{%         for prot, prot_config in protocol.items() %}
- {{ afi }} protocol {{ protocol }} route-map {{ prot_config.route_map }}
-{%         endfor %}
-{%     endif %}
- exit-vrf
-!
-{% else %}
-{%     if protocol is vyos_defined %}
-{%         for prot, prot_config in protocol.items() %}
-{%             if prot is vyos_defined('ospfv3') %}
-{%                 set prot = 'ospf6' %}
-{%             endif %}
-{{ afi }} protocol {{ prot }} route-map {{ prot_config.route_map }}
-{%         endfor %}
-{%     endif %}
+{% if protocol is vyos_defined %}
+{%     for protocol_name, protocol_config in protocol.items() %}
+{%         if protocol_name is vyos_defined('ospfv3') %}
+{%             set protocol_name = 'ospf6' %}
+{%         endif %}
+{{ afi }} protocol {{ protocol_name }} route-map {{ protocol_config.route_map }}
+{%     endfor %}
 {% endif %}
-!
diff --git a/data/templates/frr/zebra.vrf.route-map.frr.j2 b/data/templates/frr/zebra.vrf.route-map.frr.j2
new file mode 100644
index 000000000..eb6abd8e7
--- /dev/null
+++ b/data/templates/frr/zebra.vrf.route-map.frr.j2
@@ -0,0 +1,24 @@
+!
+{% if name is vyos_defined %}
+{%     for vrf, vrf_config in name.items() %}
+vrf {{ vrf }}
+{%         if vrf_config.ip.protocol is vyos_defined %}
+{%             for protocol_name, protocol_config in vrf_config.ip.protocol.items() %}
+ ip protocol {{ protocol_name }} route-map {{ protocol_config.route_map }}
+{%             endfor %}
+{%         endif %}
+{%         if vrf_config.ipv6.protocol is vyos_defined %}
+{%             for protocol_name, protocol_config in vrf_config.ipv6.protocol.items() %}
+{%                 if protocol_name is vyos_defined('ospfv3') %}
+{%                     set protocol_name = 'ospf6' %}
+{%                 endif %}
+ ipv6 protocol {{ protocol_name }} route-map {{ protocol_config.route_map }}
+{%             endfor %}
+{%         endif %}
+{%         if vrf_config.vni is vyos_defined %}
+ vni {{ vrf_config.vni }}
+{%         endif %}
+{%     endfor %}
+ exit-vrf
+!
+{% endif %}
-- 
cgit v1.2.3