From 86df16c3b3055b82f3e0a9e705794302fa2df257 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 4 Dec 2021 07:21:24 +0100
Subject: bfd: T3310: add key_mangling option when calling get_config_dict()

---
 data/templates/frr/bfdd.frr.tmpl | 17 +++++++++--------
 src/conf_mode/protocols_bfd.py   |  3 ++-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/data/templates/frr/bfdd.frr.tmpl b/data/templates/frr/bfdd.frr.tmpl
index c14939677..dd26b930a 100644
--- a/data/templates/frr/bfdd.frr.tmpl
+++ b/data/templates/frr/bfdd.frr.tmpl
@@ -6,11 +6,11 @@ bfd
   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 %}
-  echo transmit-interval {{ profile_config.interval['echo-interval'] }}
-  echo receive-interval {{ profile_config.interval['echo-interval'] }}
+{%     if profile_config.interval.echo_interval is defined and profile_config.interval.echo_interval is not none %}
+  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 defined %}
   echo-mode
 {%     endif %}
 {%     if profile_config.shutdown is defined %}
@@ -24,14 +24,15 @@ bfd
 {% endif %}
 {% if peer is defined and peer is not none %}
 {%   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 }}
+ 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 }}
   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 %}
-  echo-interval {{ peer_config.interval['echo-interval'] }}
+{%     if peer_config.interval.echo_interval is defined and peer_config.interval.echo_interval is not none %}
+  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 defined %}
   echo-mode
 {%     endif %}
 {%     if peer_config.shutdown is defined %}
diff --git a/src/conf_mode/protocols_bfd.py b/src/conf_mode/protocols_bfd.py
index 94825ba10..1f8e4ddc6 100755
--- a/src/conf_mode/protocols_bfd.py
+++ b/src/conf_mode/protocols_bfd.py
@@ -33,7 +33,8 @@ def get_config(config=None):
     else:
         conf = Config()
     base = ['protocols', 'bfd']
-    bfd = conf.get_config_dict(base, get_first_key=True)
+    bfd = conf.get_config_dict(base, key_mangling=('-', '_'),
+                               get_first_key=True)
     # Bail out early if configuration tree does not exist
     if not conf.exists(base):
         return bfd
-- 
cgit v1.2.3