From f2a5b57223c607dea615cc09f9cb24e0910c8a08 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 3 Apr 2022 21:42:37 +0200
Subject: vrf/vni: T4333: migrate to new vyos_defined Jinja2 test

---
 data/templates/frr/vrf-vni.frr.tmpl       | 4 ++--
 data/templates/frr/vrf.route-map.frr.tmpl | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/templates/frr/vrf-vni.frr.tmpl b/data/templates/frr/vrf-vni.frr.tmpl
index 299c9719e..916b5d05d 100644
--- a/data/templates/frr/vrf-vni.frr.tmpl
+++ b/data/templates/frr/vrf-vni.frr.tmpl
@@ -1,7 +1,7 @@
-{% if name is defined and name is not none %}
+{% if name is vyos_defined %}
 {%   for vrf, vrf_config in name.items() %}
 vrf {{ vrf }}
-{%     if vrf_config.vni is defined and vrf_config.vni is not none %}
+{%     if vrf_config.vni is vyos_defined %}
  vni {{ vrf_config.vni }}
 {%     endif %}
  exit-vrf
diff --git a/data/templates/frr/vrf.route-map.frr.tmpl b/data/templates/frr/vrf.route-map.frr.tmpl
index cb0e07616..5e0c56a7b 100644
--- a/data/templates/frr/vrf.route-map.frr.tmpl
+++ b/data/templates/frr/vrf.route-map.frr.tmpl
@@ -1,10 +1,10 @@
 !
-{% if vrf is defined and vrf is not none and route_map is defined and route_map is not none %}
+{% if vrf is vyos_defined and route_map is vyos_defined %}
 vrf {{ vrf }}
  ip protocol {{ protocol }} route-map {{ route_map }}
  exit-vrf
 !
-{% elif route_map is defined and route_map is not none %}
+{% elif route_map is vyos_defined %}
 ip protocol {{ protocol }} route-map {{ route_map }}
 {% endif %}
 !
-- 
cgit v1.2.3