ospf: T3757: support to configure area at an interface level

FRR supports configuring either network prefixes per area, or assign an
interface to an area to participate in the routing process. This is already well
known from other venders and supported by FRR.

A valid VyOS OSPF configuration would then look like:

vyos@vyos# show protocols
 ospf {
     interface dum0 {
         area 0
     }
     interface eth0.201 {
         area 0
         authentication {
             md5 {
                 key-id 10 {
                     md5-key vyos
                 }
             }
         }
         dead-interval 40
         hello-interval 10
         priority 1
         retransmit-interval 5
         transmit-delay 1
     }
     log-adjacency-changes {
         detail
     }
     parameters {
         abr-type cisco
         router-id 172.18.254.201
     }
     passive-interface default
     passive-interface-exclude eth0.201
 }

1 files changed, 6 insertions, 3 deletions

diff --git a/data/templates/frr/ospfd.frr.tmpl b/data/templates/frr/ospfd.frr.tmpl
index 763d0666c..67b679d66 100644
--- a/data/templates/frr/ospfd.frr.tmpl
+++ b/data/templates/frr/ospfd.frr.tmpl
@@ -14,6 +14,12 @@ interface {{ iface }} {{ 'vrf ' + vrf if vrf is defined and vrf is not none }}
 {%         endif %}
 {%       endif %}
 {%     endif %}
+{%     if iface_config.area is defined and iface_config.area is not none %}
+ ip ospf area {{ iface_config.area }}
+{%     endif %}
+{%     if iface_config.bandwidth is defined and iface_config.bandwidth is not none %}
+ bandwidth {{ iface_config.bandwidth }}
+{%     endif %}
 {%     if iface_config.cost is defined and iface_config.cost is not none %}
  ip ospf cost {{ iface_config.cost }}
 {%     endif %}
@@ -43,9 +49,6 @@ interface {{ iface }} {{ 'vrf ' + vrf if vrf is defined and vrf is not none }}
 {%     if iface_config.network is defined and iface_config.network is not none %}
  ip ospf network {{ iface_config.network }}
 {%     endif %}
-{%     if iface_config.bandwidth is defined and iface_config.bandwidth is not none %}
- bandwidth {{ iface_config.bandwidth }}
-{%     endif %}
 !
 {%   endfor %}
 {% endif %}