1 files changed, 15 insertions, 8 deletions
diff --git a/data/templates/frr/ospf6d.frr.tmpl b/data/templates/frr/ospf6d.frr.tmpl
index a8c53738f..8279e5abb 100644
--- a/data/templates/frr/ospf6d.frr.tmpl
+++ b/data/templates/frr/ospf6d.frr.tmpl
@@ -1,7 +1,10 @@
 !
 {% if interface is defined and interface is not none %}
 {%   for iface, iface_config in interface.items() %}
-interface {{ iface }}
+interface {{ iface }} {{ 'vrf ' + vrf if vrf is defined and vrf is not none }}
+{%     if iface_config.area is defined and iface_config.area is not none %}
+ ipv6 ospf6 area {{ iface_config.area }}
+{%     endif %}
 {%     if iface_config.cost is defined and iface_config.cost is not none %}
  ipv6 ospf6 cost {{ iface_config.cost }}
 {%     endif %}
@@ -22,6 +25,9 @@ interface {{ iface }}
 {%     endif %}
 {%     if iface_config.bfd is defined %}
  ipv6 ospf6 bfd
+{%       if iface_config.bfd.profile is defined and iface_config.bfd.profile is not none %}
+ ipv6 ospf6 bfd profile {{ iface_config.bfd.profile }}
+{%       endif %}
 {%     endif %}
 {%     if iface_config.mtu_ignore is defined %}
  ipv6 ospf6 mtu-ignore
@@ -38,21 +44,17 @@ interface {{ iface }}
 {%     if iface_config.passive is defined %}
  ipv6 ospf6 passive
 {%     endif %}
+exit
 !
 {%   endfor %}
 {% endif %}
 !
-router ospf6
+router ospf6 {{ 'vrf ' + vrf if vrf is defined and vrf is not none }}
 {% if area is defined and area is not none %}
 {%   for area_id, area_config in area.items() %}
-{%     if area_config.interface is defined and area_config.interface is not none %}
-{%       for interface in area_config.interface %}
- interface {{ interface }} area {{ area_id }}
-{%       endfor %}
-{%     endif %}
 {%     if area_config.area_type is defined and area_config.area_type is not none %}
 {%       for type, type_config in area_config.area_type.items() %}
- area {{ area_id }} {{ type }} {{ 'no-summary' if type_config.no_summary is defined }}
+ area {{ area_id }} {{ type }} {{ 'default-information-originate' if type_config.default_information_originate is defined }} {{ 'no-summary' if type_config.no_summary is defined }}
 {%       endfor %}
 {%     endif %}
 {%     if area_config.range is defined and area_config.range is not none %}
@@ -68,6 +70,10 @@ router ospf6
 {%     endif %}
 {%   endfor %}
 {% endif %}
+ auto-cost reference-bandwidth {{ auto_cost.reference_bandwidth }}
+{% if default_information is defined and default_information.originate is defined and default_information.originate is not none %}
+ default-information originate {{ 'always' if default_information.originate.always is defined }} {{ 'metric ' + default_information.originate.metric if default_information.originate.metric is defined }} {{ 'metric-type ' + default_information.originate.metric_type if default_information.originate.metric_type is defined }} {{ 'route-map ' + default_information.originate.route_map if default_information.originate.route_map is defined }}
+{% endif %}
 {% if distance is defined and distance is not none %}
 {%   if distance.global is defined and distance.global is not none %}
  distance {{ distance.global }}
@@ -89,4 +95,5 @@ router ospf6
  redistribute {{ protocol }} {{ 'route-map ' + options.route_map if options.route_map is defined }}
 {%   endfor %}
 {% endif %}
+exit
 !