From 9cde173dcfab281b0b3ab9f5d55c19d4c6d35d45 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 3 Apr 2022 11:34:44 +0200
Subject: bfd: T4333: migrate to new vyos_defined Jinja2 test

---
 data/templates/frr/bfdd.frr.tmpl | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'data/templates')

diff --git a/data/templates/frr/bfdd.frr.tmpl b/data/templates/frr/bfdd.frr.tmpl
index 439f79d67..ac55d4634 100644
--- a/data/templates/frr/bfdd.frr.tmpl
+++ b/data/templates/frr/bfdd.frr.tmpl
@@ -1,22 +1,22 @@
-{% if profile is defined or peer is defined %}
+{% if profile is vyos_defined or peer is vyos_defined %}
 bfd
-{% if profile is defined and profile is not none %}
+{% if profile is vyos_defined %}
 {%   for profile_name, profile_config in profile.items() %}
  profile {{ profile_name }}
   detect-multiplier {{ profile_config.interval.multiplier }}
   receive-interval {{ profile_config.interval.receive }}
   transmit-interval {{ profile_config.interval.transmit }}
-{%     if profile_config.interval.echo_interval is defined and profile_config.interval.echo_interval is not none %}
+{%     if profile_config.interval.echo_interval is vyos_defined %}
   echo transmit-interval {{ profile_config.interval.echo_interval }}
   echo receive-interval {{ profile_config.interval.echo_interval }}
 {%     endif %}
-{%     if profile_config.echo_mode is defined %}
+{%     if profile_config.echo_mode is vyos_defined %}
   echo-mode
 {%     endif %}
-{%     if profile_config.passive is defined %}
+{%     if profile_config.passive is vyos_defined %}
   passive-mode
 {%     endif %}
-{%     if profile_config.shutdown is defined %}
+{%     if profile_config.shutdown is vyos_defined %}
   shutdown
 {%     else %}
   no shutdown
@@ -25,26 +25,26 @@ bfd
  !
 {%   endfor %}
 {% endif %}
-{% if peer is defined and peer is not none %}
+{% if peer is vyos_defined %}
 {%   for peer_name, peer_config in peer.items() %}
- peer {{ peer_name }}{{ ' multihop' if peer_config.multihop is defined }}{{ ' local-address ' + peer_config.source.address if peer_config.source is defined and peer_config.source.address is defined }}{{ ' interface ' + peer_config.source.interface if peer_config.source is defined and peer_config.source.interface is defined }} {{ ' vrf ' + peer_config.vrf if peer_config.vrf is defined and peer_config.vrf is not none }}
+ peer {{ peer_name }}{{ ' multihop' if peer_config.multihop is vyos_defined }}{{ ' local-address ' + peer_config.source.address if peer_config.source.address is vyos_defined }}{{ ' interface ' + peer_config.source.interface if peer_config.source.interface is vyos_defined }} {{ ' vrf ' + peer_config.vrf if peer_config.vrf is vyos_defined }}
   detect-multiplier {{ peer_config.interval.multiplier }}
   receive-interval {{ peer_config.interval.receive }}
   transmit-interval {{ peer_config.interval.transmit }}
-{%     if peer_config.interval.echo_interval is defined and peer_config.interval.echo_interval is not none %}
+{%     if peer_config.interval.echo_interval is vyos_defined %}
   echo transmit-interval {{ peer_config.interval.echo_interval }}
   echo receive-interval {{ peer_config.interval.echo_interval }}
 {%     endif %}
-{%     if peer_config.echo_mode is defined %}
+{%     if peer_config.echo_mode is vyos_defined %}
   echo-mode
 {%     endif %}
-{%     if peer_config.passive is defined %}
+{%     if peer_config.passive is vyos_defined %}
   passive-mode
 {%     endif %}
-{%     if peer_config.profile is defined and peer_config.profile is not none %}
+{%     if peer_config.profile is vyos_defined %}
   profile {{ peer_config.profile }}
 {%     endif %}
-{%     if peer_config.shutdown is defined %}
+{%     if peer_config.shutdown is vyos_defined %}
   shutdown
 {%     else %}
   no shutdown
-- 
cgit v1.2.3