Merge branch 'current' into dhcpd

1 files changed, 27 insertions, 35 deletions

diff --git a/data/templates/frr/ripd.frr.tmpl b/data/templates/frr/ripd.frr.tmpl
index c44bb6d27..2dbb93052 100644
--- a/data/templates/frr/ripd.frr.tmpl
+++ b/data/templates/frr/ripd.frr.tmpl
@@ -1,11 +1,11 @@
 {# RIP key-chain definition #}
-{% if interface is defined and interface is not none %}
+{% if interface is vyos_defined %}
 {%   for iface, iface_config in interface.items() %}
-{%     if iface_config.authentication is defined and iface_config.authentication.md5 is defined and iface_config.authentication.md5 is not none %}
+{%     if iface_config.authentication.md5 is vyos_defined %}
 key chain {{ iface }}-rip
 {%       for key_id, key_options in iface_config.authentication.md5.items() %}
  key {{ key_id }}
-{%         if key_options.password is defined and key_options.password is not none %}
+{%         if key_options.password is vyos_defined %}
   key-string {{ key_options.password }}
 {%         endif %}
  exit
@@ -16,20 +16,20 @@ exit
 {% endif %}
 !
 {# Interface specific configuration #}
-{% if interface is defined and interface is not none %}
+{% if interface is vyos_defined %}
 {%   for iface, iface_config in interface.items() %}
 interface {{ iface }}
-{%     if iface_config.authentication is defined and iface_config.authentication.plaintext_password is defined and iface_config.authentication.plaintext_password is not none %}
+{%     if iface_config.authentication.plaintext_password is vyos_defined %}
  ip rip authentication mode text
  ip rip authentication string {{ iface_config.authentication.plaintext_password }}
-{%     elif iface_config.authentication is defined and iface_config.authentication.md5 is defined and iface_config.authentication.md5 is not none %}
+{%     elif iface_config.authentication.md5 is vyos_defined %}
  ip rip authentication key-chain {{ iface }}-rip
  ip rip authentication mode md5
 {%     endif %}
-{%     if iface_config.split_horizon is defined and iface_config.split_horizon.disable is defined %}
+{%     if iface_config.split_horizon.disable is vyos_defined %}
  no ip rip split-horizon
 {%     endif %}
-{%     if iface_config.split_horizon is defined and iface_config.split_horizon.poison_reverse is defined %}
+{%     if iface_config.split_horizon.poison_reverse is vyos_defined %}
  ip rip split-horizon poisoned-reverse
 {%     endif %}
 exit
@@ -38,63 +38,55 @@ exit
 {% endif %}
 !
 router rip
-{% if default_distance is defined and default_distance is not none %}
+{% if default_distance is vyos_defined %}
  distance {{ default_distance }}
 {% endif %}
-{% if network_distance is defined and network_distance is not none %}
+{% if network_distance is vyos_defined %}
 {%   for network, network_config in network_distance.items() %}
-{%     if network_config.distance is defined and network_config.distance is not none %}
+{%     if network_config.distance is vyos_defined %}
  distance {{ network_config.distance }} {{ network }}
 {%     endif %}
 {%   endfor %}
 {% endif %}
-{% if neighbor is defined and neighbor is not none %}
+{% if neighbor is vyos_defined %}
 {%   for address in neighbor %}
  neighbor {{ address }}
 {%   endfor %}
 {% endif %}
-{% if distribute_list is defined and distribute_list is not none %}
-{%   if distribute_list.access_list is defined and distribute_list.access_list is not none %}
-{%     if distribute_list.access_list.in is defined and distribute_list.access_list.in is not none %}
+{% if distribute_list is vyos_defined %}
+{%   if distribute_list.access_list.in is vyos_defined %}
  distribute-list {{ distribute_list.access_list.in }} in
-{%     endif %}
-{%     if distribute_list.access_list.out is defined and distribute_list.access_list.out is not none %}
+{%   endif %}
+{%   if distribute_list.access_list.out is vyos_defined %}
  distribute-list {{ distribute_list.access_list.out }} out
-{%     endif %}
 {%   endif %}
-{%   if distribute_list.interface is defined and distribute_list.interface is not none %}
+{%   if distribute_list.interface is vyos_defined %}
 {%     for interface, interface_config in distribute_list.interface.items() %}
-{%       if interface_config.access_list is defined and interface_config.access_list is not none %}
-{%         if interface_config.access_list.in is defined and interface_config.access_list.in is not none %}
+{%       if interface_config.access_list.in is vyos_defined %}
  distribute-list {{ interface_config.access_list.in }} in {{ interface }}
-{%         endif %}
-{%         if interface_config.access_list.out is defined and interface_config.access_list.out is not none %}
+{%       endif %}
+{%       if interface_config.access_list.out is vyos_defined %}
  distribute-list {{ interface_config.access_list.out }} out {{ interface }}
-{%         endif %}
 {%       endif %}
-{%       if interface_config.prefix_list is defined and interface_config.prefix_list is not none %}
-{%         if interface_config.prefix_list.in is defined and interface_config.prefix_list.in is not none %}
+{%       if interface_config.prefix_list.in is vyos_defined %}
  distribute-list prefix {{ interface_config.prefix_list.in }} in {{ interface }}
-{%         endif %}
-{%         if interface_config.prefix_list.out is defined and interface_config.prefix_list.out is not none %}
+{%       endif %}
+{%       if interface_config.prefix_list.out is vyos_defined %}
  distribute-list prefix {{ interface_config.prefix_list.out }} out {{ interface }}
-{%         endif %}
 {%       endif %}
 {%     endfor %}
 {%   endif %}
-{%   if distribute_list.prefix_list is defined and distribute_list.prefix_list is not none %}
-{%     if distribute_list.prefix_list.in is defined and distribute_list.prefix_list.in is not none %}
+{%   if distribute_list.prefix_list.in is vyos_defined %}
  distribute-list prefix {{ distribute_list.prefix_list.in }} in
-{%     endif %}
-{%     if distribute_list.prefix_list.out is defined and distribute_list.prefix_list.out is not none %}
+{%   endif %}
+{%   if distribute_list.prefix_list.out is vyos_defined %}
  distribute-list prefix {{ distribute_list.prefix_list.out }} out
-{%     endif %}
 {%   endif %}
 {% endif %}
 {% include 'frr/rip_ripng.frr.j2' %}
 exit
 !
-{% if route_map is defined and route_map is not none %}
+{% if route_map is vyos_defined %}
 ip protocol rip route-map {{ route_map }}
 {% endif %}
 !