6 files changed, 96 insertions, 38 deletions

diff --git a/data/templates/frr/bgp.frr.tmpl b/data/templates/frr/bgp.frr.tmpl
index f7aeaeb9d..dafe45f59 100644
--- a/data/templates/frr/bgp.frr.tmpl
+++ b/data/templates/frr/bgp.frr.tmpl
@@ -90,8 +90,24 @@
 {%     for afi, afi_config in config.address_family.items() %}
 {%       if afi == 'ipv4_unicast' %}
  address-family ipv4 unicast
+{%       elif afi == 'ipv4_multicast' %}
+ address-family ipv4 multicast
+{%       elif afi == 'ipv4_labeled_unicast' %}
+ address-family ipv4 labeled-unicast
+{%       elif afi == 'ipv4_vpn' %}
+ address-family ipv4 vpn
+{%       elif afi == 'ipv4_flowspec' %}
+ address-family ipv4 flowspec
 {%       elif afi == 'ipv6_unicast' %}
  address-family ipv6 unicast
+{%       elif afi == 'ipv6_multicast' %}
+ address-family ipv6 multicast
+{%       elif afi == 'ipv6_labeled_unicast' %}
+ address-family ipv6 labeled-unicast
+{%       elif afi == 'ipv6_vpn' %}
+ address-family ipv6 vpn
+{%       elif afi == 'ipv6_flowspec' %}
+ address-family ipv6 flowspec
 {%       elif afi == 'l2vpn_evpn' %}
  address-family l2vpn evpn
 {%       endif %}
@@ -104,6 +120,9 @@
 {%       if afi_config.allowas_in is defined and afi_config.allowas_in is not none %}
   neighbor {{ neighbor }} allowas-in {{ afi_config.allowas_in.number if afi_config.allowas_in.number is defined }}
 {%       endif %}
+{%       if afi_config.as_override is defined %}
+  neighbor {{ neighbor }} as-override
+{%       endif %}
 {%       if afi_config.remove_private_as is defined %}
   neighbor {{ neighbor }} remove-private-AS
 {%       endif %}
@@ -185,12 +204,16 @@
 {%   endif %}
 {% endmacro %}
 !
-router bgp {{ asn }}
+router bgp {{ local_as }} {{ 'vrf ' + vrf if vrf is defined and vrf is not none }}
 {% if parameters is defined and parameters.ebgp_requires_policy is defined %}
  bgp ebgp-requires-policy
 {% else %}
  no bgp ebgp-requires-policy
 {% endif %}
+{% if parameters is defined and parameters.default is defined and parameters.default.no_ipv4_unicast is defined %}
+{#   Option must be set before any neighbor - see https://phabricator.vyos.net/T3463 #}
+ no bgp default ipv4-unicast
+{% endif %}
 {# Workaround for T2100 until we have decided about a migration script #}
  no bgp network import-check
 {% if address_family is defined and address_family is not none %}
@@ -198,8 +221,24 @@ router bgp {{ asn }}
  !
 {%     if afi == 'ipv4_unicast' %}
  address-family ipv4 unicast
+{%     elif afi == 'ipv4_multicast' %}
+ address-family ipv4 multicast
+{%     elif afi == 'ipv4_labeled_unicast' %}
+ address-family ipv4 labeled-unicast
+{%     elif afi == 'ipv4_vpn' %}
+ address-family ipv4 vpn
+{%     elif afi == 'ipv4_flowspec' %}
+ address-family ipv4 flowspec
 {%     elif afi == 'ipv6_unicast' %}
  address-family ipv6 unicast
+{%     elif afi == 'ipv6_multicast' %}
+ address-family ipv6 multicast
+{%     elif afi == 'ipv6_labeled_unicast' %}
+ address-family ipv6 labeled-unicast
+{%     elif afi == 'ipv6_vpn' %}
+ address-family ipv6 vpn
+{%     elif afi == 'ipv6_flowspec' %}
+ address-family ipv6 flowspec
 {%     elif afi == 'l2vpn_evpn' %}
  address-family l2vpn evpn
 {%     endif %}
@@ -231,11 +270,33 @@ router bgp {{ asn }}
 {%     endif %}
 {%     if afi_config.network is defined and afi_config.network is not none %}
 {%       for network in afi_config.network %}
-  network {{ network }}{% if afi_config.network[network].route_map is defined %} route-map {{ afi_config.network[network].route_map }}{% endif %}{% if afi_config.network[network].backdoor is defined %} backdoor{% endif %}
+  network {{ network }}{% if afi_config.network[network].route_map is defined %} route-map {{ afi_config.network[network].route_map }}{% endif %}{% if afi_config.network[network].backdoor is defined %} backdoor{% endif %}{% if afi_config.network[network].rd is defined and afi_config.network[network].label is defined%} rd {{ afi_config.network[network].rd }} label {{ afi_config.network[network].label }}{% endif %}
 {#######   we need this blank line!! #######}
 
 {%       endfor %}
 {%     endif %}
+{%     if afi_config.advertise is defined and afi_config.advertise is not none %}
+{%       for adv_afi, adv_afi_config in afi_config.advertise.items() %}
+{%         if adv_afi_config.unicast is defined and adv_afi_config.unicast is not none %}
+ advertise {{ adv_afi }} unicast {{ 'route-map ' + adv_afi_config.unicast.route_map if adv_afi_config.unicast.route_map is defined }}
+{%         endif %}
+{%       endfor %}
+{%     endif %}
+{%     if afi_config.distance is defined and afi_config.distance is not none %}
+{%       if afi_config.distance is defined and afi_config.distance.external is defined and afi_config.distance.internal is defined and afi_config.distance.local is defined %}
+ distance bgp {{ afi_config.distance.external }} {{ afi_config.distance.internal }} {{ afi_config.distance.local }}
+{%       endif %}
+{%       if afi_config.distance.prefix is defined and afi_config.distance.prefix is not none %}
+{%         for prefix in afi_config.distance.prefix %}
+ distance {{ afi_config.distance.prefix[prefix].distance }} {{ prefix }}
+{%         endfor %}
+{%       endif %}
+{%     endif %}
+{%     if afi_config.local_install is defined and afi_config.local_install is not none %}
+{%       for interface in afi_config.local_install.interface %}
+ local-install {{ interface }}
+{%       endfor %}
+{%     endif %}
 {%     if afi_config.advertise_all_vni is defined %}
   advertise-all-vni
 {%     endif %}
@@ -359,16 +420,11 @@ router bgp {{ asn }}
 {%     if parameters.default.local_pref is defined and parameters.default.local_pref is not none %}
  bgp default local-preference {{ parameters.default.local_pref }}
 {%     endif %}
-{%     if parameters.default.no_ipv4_unicast is defined %}
- no bgp default ipv4-unicast
-{%     endif %}
 {%   endif %}
 {%   if parameters.deterministic_med is defined %}
  bgp deterministic-med
 {%   endif %}
 {%   if parameters.distance is defined and parameters.distance is not none %}
- !
- address-family ipv4 unicast
 {%     if parameters.distance.global is defined and parameters.distance.global.external is defined and parameters.distance.global.internal is defined and parameters.distance.global.local is defined %}
   distance bgp {{ parameters.distance.global.external }} {{ parameters.distance.global.internal }} {{ parameters.distance.global.local }}
 {%     endif %}
@@ -377,8 +433,6 @@ router bgp {{ asn }}
   distance {{ parameters.distance.prefix[prefix].distance }} {{ prefix }}
 {%       endfor %}
 {%     endif %}
- exit-address-family
- !
 {%   endif %}
 {%   if parameters.graceful_restart is defined %}
  bgp graceful-restart {{ 'stalepath-time ' + parameters.graceful_restart.stalepath_time if parameters.graceful_restart.stalepath_time is defined }}
@@ -409,4 +463,4 @@ router bgp {{ asn }}
 {% if route_map is defined and route_map is not none %}
 ip protocol bgp route-map {{ route_map }}
 {% endif %}
-!
+!
\ No newline at end of file
diff --git a/data/templates/frr/isis.frr.tmpl b/data/templates/frr/isis.frr.tmpl
index 4460ab3b5..c8e11399e 100644
--- a/data/templates/frr/isis.frr.tmpl
+++ b/data/templates/frr/isis.frr.tmpl
@@ -1,5 +1,5 @@
 !
-router isis {{ process }}
+router isis VyOS {{ 'vrf ' + vrf if vrf is defined and vrf is not none }}
  net {{ net }}
 {% if dynamic_hostname is defined %}
  hostname dynamic
@@ -133,8 +133,8 @@ router isis {{ process }}
 !
 {% if interface is defined and interface is not none %}
 {%   for iface, iface_config in interface.items() %}
-interface {{ iface }}
- ip router isis {{ process }}
+interface {{ iface }} {{ 'vrf ' + vrf if vrf is defined and vrf is not none }}
+ ip router isis VyOS
 {%     if iface_config.bfd is defined %}
  isis bfd
 {%     endif %}
@@ -173,3 +173,8 @@ interface {{ iface }}
 {%     endif %}
 {%   endfor %}
 {% endif %}
+!
+{% if route_map is defined and route_map is not none %}
+ip protocol isis route-map {{ route_map }}
+{% endif %}
+!
diff --git a/data/templates/frr/ospf.frr.tmpl b/data/templates/frr/ospf.frr.tmpl
index 140b6b406..a47c64c89 100644
--- a/data/templates/frr/ospf.frr.tmpl
+++ b/data/templates/frr/ospf.frr.tmpl
@@ -1,7 +1,7 @@
 !
 {% 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.authentication is defined and iface_config.authentication is not none %}
 {%       if iface_config.authentication.plaintext_password is defined and iface_config.authentication.plaintext_password is not none %}
  ip ospf authentication-key {{ iface_config.authentication.plaintext_password }}
@@ -50,7 +50,7 @@ interface {{ iface }}
 {%   endfor %}
 {% endif %}
 !
-router ospf
+router ospf {{ 'vrf ' + vrf if vrf is defined and vrf is not none }}
 {% if access_list is defined and access_list is not none %}
 {%   for acl, acl_config in access_list.items() %}
 {%     for protocol in acl_config.export if acl_config.export is defined %}
diff --git a/data/templates/frr/rip.frr.tmpl b/data/templates/frr/rip.frr.tmpl
index bc92bddf9..cabc236f0 100644
--- a/data/templates/frr/rip.frr.tmpl
+++ b/data/templates/frr/rip.frr.tmpl
@@ -90,3 +90,7 @@ router rip
 {% endif %}
 {% include 'frr/rip_ripng.frr.j2' %}
 !
+{% if route_map is defined and route_map is not none %}
+ip protocol rip route-map {{ route_map }}
+{% endif %}
+!
diff --git a/data/templates/frr/static.frr.tmpl b/data/templates/frr/static.frr.tmpl
index bb0ec80a5..db59a44c2 100644
--- a/data/templates/frr/static.frr.tmpl
+++ b/data/templates/frr/static.frr.tmpl
@@ -1,18 +1,29 @@
 {% from 'frr/static_routes_macro.j2' import static_routes %}
 !
+{% set ip_prefix = 'ip' %}
+{% set ipv6_prefix = 'ipv6' %}
+{% if vrf is defined and vrf is not none %}
+{#   We need to add an additional whitespace in front of the prefix #}
+{#   when VRFs are in use, thus we use a variable for prefix handling #}
+{%   set ip_prefix = ' ip' %}
+{%   set ipv6_prefix = ' ipv6' %}
+vrf {{ vrf }}
+{% endif %}
 {# IPv4 routing #}
 {% if route is defined and route is not none %}
 {%   for prefix, prefix_config in route.items() %}
-{{ static_routes('ip', prefix, prefix_config) }}
+{{ static_routes(ip_prefix, prefix, prefix_config) }}
 {%-   endfor -%}
 {% endif %}
-!
 {# IPv6 routing #}
 {% if route6 is defined and route6 is not none %}
 {%   for prefix, prefix_config in route6.items() %}
-{{ static_routes('ipv6', prefix, prefix_config) }}
+{{ static_routes(ipv6_prefix, prefix, prefix_config) }}
 {%-   endfor -%}
 {% endif %}
+{% if vrf is defined and vrf is not none %}
+ exit-vrf
+{% endif %}
 !
 {# Policy route tables #}
 {% if table is defined and table is not none %}
diff --git a/data/templates/frr/vrf.frr.tmpl b/data/templates/frr/vrf.frr.tmpl
index 8d3d8e9dd..299c9719e 100644
--- a/data/templates/frr/vrf.frr.tmpl
+++ b/data/templates/frr/vrf.frr.tmpl
@@ -1,25 +1,9 @@
-{% from 'frr/static_routes_macro.j2' import static_routes %}
-!
-{% if vrf is defined and vrf is not none %}
-{%   for vrf_name, vrf_config in vrf.items() %}
-vrf {{ vrf_name }}
+{% if name is defined and name is not none %}
+{%   for vrf, vrf_config in name.items() %}
+vrf {{ vrf }}
 {%     if vrf_config.vni is defined and vrf_config.vni is not none %}
  vni {{ vrf_config.vni }}
 {%     endif %}
-{%     if vrf_config.static is defined and vrf_config.static is not none %}
-{#       IPv4 routes #}
-{%       if vrf_config.static.route is defined and vrf_config.static.route is not none %}
-{%         for prefix, prefix_config in vrf_config.static.route.items() %}
- {{ static_routes('ip', prefix, prefix_config) }}
-{%-        endfor -%}
-{%       endif %}
-{#       IPv6 routes #}
-{%       if vrf_config.static.route6 is defined and vrf_config.static.route6 is not none %}
-{%         for prefix, prefix_config in vrf_config.static.route6.items() %}
- {{ static_routes('ipv6', prefix, prefix_config) }}
-{%-        endfor -%}
-{%       endif %}
-{%     endif %}
+ exit-vrf
 {%   endfor %}
 {% endif %}
-!