2 files changed, 21 insertions, 21 deletions
diff --git a/data/templates/frr/static_routes_macro.j2 b/data/templates/frr/static_routes_macro.j2
index 8359357b7..0b242a868 100644
--- a/data/templates/frr/static_routes_macro.j2
+++ b/data/templates/frr/static_routes_macro.j2
@@ -1,24 +1,24 @@
 {% macro static_routes(ip_ipv6, prefix, prefix_config, table=None) %}
-{%   if prefix_config.blackhole is defined %}
-{{ ip_ipv6 }} route {{ prefix }} blackhole {{ prefix_config.blackhole.distance if prefix_config.blackhole.distance is defined }} {{ 'tag ' + prefix_config.blackhole.tag if prefix_config.blackhole.tag is defined }} {{ 'table ' + table if table is defined and table is not none }}
+{%   if prefix_config.blackhole is vyos_defined %}
+{{ ip_ipv6 }} route {{ prefix }} blackhole {{ prefix_config.blackhole.distance if prefix_config.blackhole.distance is vyos_defined }} {{ 'tag ' ~ prefix_config.blackhole.tag if prefix_config.blackhole.tag is vyos_defined }} {{ 'table ' ~ table if table is vyos_defined and table is not none }}
 {%   endif %}
-{%   if prefix_config.reject is defined %}
-{{ ip_ipv6 }} route {{ prefix }} reject {{ prefix_config.reject.distance if prefix_config.reject.distance is defined }} {{ 'tag ' + prefix_config.reject.tag if prefix_config.reject.tag is defined }} {{ 'table ' + table if table is defined and table is not none }}
+{%   if prefix_config.reject is vyos_defined %}
+{{ ip_ipv6 }} route {{ prefix }} reject {{ prefix_config.reject.distance if prefix_config.reject.distance is vyos_defined }} {{ 'tag ' ~ prefix_config.reject.tag if prefix_config.reject.tag is vyos_defined }} {{ 'table ' ~ table if table is vyos_defined }}
 {%   endif %}
-{%   if prefix_config.dhcp_interface is defined and prefix_config.dhcp_interface is not none %}
+{%   if prefix_config.dhcp_interface is vyos_defined %}
 {%     set next_hop = prefix_config.dhcp_interface | get_dhcp_router %}
-{%     if next_hop is defined and next_hop is not none %}
-{{ ip_ipv6 }} route {{ prefix }} {{ next_hop }} {{ prefix_config.dhcp_interface }} {{ 'table ' + table if table is defined and table is not none }}
+{%     if next_hop is vyos_defined %}
+{{ ip_ipv6 }} route {{ prefix }} {{ next_hop }} {{ prefix_config.dhcp_interface }} {{ 'table ' ~ table if table is vyos_defined }}
 {%     endif %}
 {%   endif %}
-{%   if prefix_config.interface is defined and prefix_config.interface is not none %}
+{%   if prefix_config.interface is vyos_defined %}
 {%     for interface, interface_config in prefix_config.interface.items() if interface_config.disable is not defined %}
-{{ ip_ipv6 }} route {{ prefix }} {{ interface }} {{ interface_config.distance if interface_config.distance is defined }} {{ 'nexthop-vrf ' + interface_config.vrf if interface_config.vrf is defined }} {{ 'table ' + table if table is defined and table is not none }}
+{{ ip_ipv6 }} route {{ prefix }} {{ interface }} {{ interface_config.distance if interface_config.distance is vyos_defined }} {{ 'nexthop-vrf ' ~ interface_config.vrf if interface_config.vrf is vyos_defined }} {{ 'table ' ~ table if table is vyos_defined }}
 {%     endfor %}
 {%   endif %}
-{%   if prefix_config.next_hop is defined and prefix_config.next_hop is not none %}
+{%   if prefix_config.next_hop is vyos_defined and prefix_config.next_hop is not none %}
 {%     for next_hop, next_hop_config in prefix_config.next_hop.items() if next_hop_config.disable is not defined %}
-{{ ip_ipv6 }} route {{ prefix }} {{ next_hop }} {{ next_hop_config.interface if next_hop_config.interface is defined }} {{ next_hop_config.distance if next_hop_config.distance is defined }} {{ 'nexthop-vrf ' + next_hop_config.vrf if next_hop_config.vrf is defined }} {{ 'table ' + table if table is defined and table is not none }}
+{{ ip_ipv6 }} route {{ prefix }} {{ next_hop }} {{ next_hop_config.interface if next_hop_config.interface is vyos_defined }} {{ next_hop_config.distance if next_hop_config.distance is vyos_defined }} {{ 'nexthop-vrf ' ~ next_hop_config.vrf if next_hop_config.vrf is vyos_defined }} {{ 'table ' ~ table if table is vyos_defined}}
 {%     endfor %}
 {%   endif %}
 {% endmacro %}
diff --git a/data/templates/frr/staticd.frr.tmpl b/data/templates/frr/staticd.frr.tmpl
index 5d833228a..c7138b12b 100644
--- a/data/templates/frr/staticd.frr.tmpl
+++ b/data/templates/frr/staticd.frr.tmpl
@@ -2,7 +2,7 @@
 !
 {% set ip_prefix = 'ip' %}
 {% set ipv6_prefix = 'ipv6' %}
-{% if vrf is defined and vrf is not none %}
+{% if vrf is vyos_defined %}
 {#   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' %}
@@ -10,40 +10,40 @@
 vrf {{ vrf }}
 {% endif %}
 {# IPv4 routing #}
-{% if route is defined and route is not none %}
+{% if route is vyos_defined %}
 {%   for prefix, prefix_config in route.items() %}
 {{ static_routes(ip_prefix, prefix, prefix_config) }}
 {%-   endfor -%}
 {% endif %}
 {# IPv4 default routes from DHCP interfaces #}
-{% if dhcp is defined and dhcp is not none %}
+{% if dhcp is vyos_defined %}
 {%   for interface, interface_config in dhcp.items() %}
 {%     set next_hop = interface | get_dhcp_router %}
-{%     if next_hop is defined and next_hop is not none %}
+{%     if next_hop is vyos_defined %}
 {{ ip_prefix }} route 0.0.0.0/0 {{ next_hop }} {{ interface }} tag 210 {{ interface_config.distance }}
 {%     endif %}
 {%   endfor %}
 {% endif %}
 {# IPv6 routing #}
-{% if route6 is defined and route6 is not none %}
+{% if route6 is vyos_defined %}
 {%   for prefix, prefix_config in route6.items() %}
 {{ static_routes(ipv6_prefix, prefix, prefix_config) }}
 {%-   endfor -%}
 {% endif %}
-{% if vrf is defined and vrf is not none %}
+{% if vrf is vyos_defined %}
  exit-vrf
 {% endif %}
 !
 {# Policy route tables #}
-{% if table is defined and table is not none %}
+{% if table is vyos_defined %}
 {%   for table_id, table_config in table.items() %}
-{%     if table_config.route is defined and table_config.route is not none %}
+{%     if table_config.route is vyos_defined %}
 {%       for prefix, prefix_config in table_config.route.items() %}
 {{ static_routes('ip', prefix, prefix_config, table_id) }}
 {%-       endfor -%}
 {%     endif %}
 !
-{%     if table_config.route6 is defined and table_config.route6 is not none %}
+{%     if table_config.route6 is vyos_defined %}
 {%       for prefix, prefix_config in table_config.route6.items() %}
 {{ static_routes('ipv6', prefix, prefix_config, table_id) }}
 {%-       endfor -%}
@@ -52,7 +52,7 @@ vrf {{ vrf }}
 {%   endfor %}
 {% endif %}
 !
-{% if route_map is defined and route_map is not none %}
+{% if route_map is vyos_defined %}
 ip protocol static route-map {{ route_map }}
 !
 {% endif %}