2 files changed, 8 insertions, 6 deletions
diff --git a/data/templates/frr/bgp.frr.tmpl b/data/templates/frr/bgp.frr.tmpl
index 16355a1e5..74a9b8c30 100644
--- a/data/templates/frr/bgp.frr.tmpl
+++ b/data/templates/frr/bgp.frr.tmpl
@@ -24,7 +24,7 @@
  neighbor {{ neighbor }} description {{ config.description }}
 {%   endif %}
 {%   if config.disable_capability_negotiation is defined %}
- neighbor {{ neighbor }} disable-capability-negotiation
+ neighbor {{ neighbor }} dont-capability-negotiate
 {%   endif %}
 {%   if config.ebgp_multihop is defined and config.ebgp_multihop is not none %}
  neighbor {{ neighbor }} ebgp-multihop {{ config.ebgp_multihop }}
@@ -133,7 +133,6 @@
 {% endmacro %}
 !
 router bgp {{ asn }}
- no bgp default ipv4-unicast
 {% if address_family is defined and address_family is not none %}
 {%   for af in address_family %}
  !
@@ -152,7 +151,11 @@ router bgp {{ asn }}
 {%         if protocol == 'table' %}
   redistribute table {{ address_family[af].redistribute[protocol].table }}
 {%         else %}
-  redistribute {{ protocol }}{% if address_family[af].redistribute[protocol].metric is defined %} metric {{ address_family[af].redistribute[protocol].metric }}{% endif %}{% if address_family[af].redistribute[protocol].route_map is defined %} route-map {{ address_family[af].redistribute[protocol].route_map }}{% endif %}
+{%           set redistribution_protocol = protocol %}
+{%             if protocol == 'ospfv3' %}
+{%               set redistribution_protocol = 'ospf6' %}
+{%             endif %}
+  redistribute {{ redistribution_protocol }}{% if address_family[af].redistribute[protocol].metric is defined %} metric {{ address_family[af].redistribute[protocol].metric }}{% endif %}{% if address_family[af].redistribute[protocol].route_map is defined %} route-map {{ address_family[af].redistribute[protocol].route_map }}{% endif %}
 {#######   we need this blank line!! #######}
 
 {%         endif %}
@@ -237,7 +240,6 @@ router bgp {{ asn }}
  bgp default local-preference {{ parameters.default.local_pref }}
 {%     endif %}
 {%     if parameters.default.no_ipv4_unicast is defined %}
-{#     We use this is parameter as default in template (5-th string) #}
  no bgp default ipv4-unicast
 {%     endif %}
 {%   endif %}
diff --git a/data/templates/frr/isis.frr.tmpl b/data/templates/frr/isis.frr.tmpl
index 0477f2599..4460ab3b5 100644
--- a/data/templates/frr/isis.frr.tmpl
+++ b/data/templates/frr/isis.frr.tmpl
@@ -168,8 +168,8 @@ interface {{ iface }}
 {%     if iface_config.psnp_interval is defined and iface_config.psnp_interval is not none %}
  isis psnp-interval {{ iface_config.psnp_interval }}
 {%     endif %}
-{%     if iface_config.three_way_handshake is defined %}
- isis three-way-handshake
+{%     if iface_config.no_three_way_handshake is defined %}
+ no isis three-way-handshake
 {%     endif %}
 {%   endfor %}
 {% endif %}