From 452a9c504f472dcaee8c93947a889dab4f8259ce Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 16 Jan 2021 15:10:13 +0100
Subject: vyos.configdict: node_changed() now accepts key mangling parameter

---
 src/conf_mode/interfaces-bridge.py    | 6 +++---
 src/conf_mode/interfaces-wireguard.py | 2 +-
 src/conf_mode/policy-local-route.py   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/conf_mode')

diff --git a/src/conf_mode/interfaces-bridge.py b/src/conf_mode/interfaces-bridge.py
index ca2718423..fd4ffed9a 100755
--- a/src/conf_mode/interfaces-bridge.py
+++ b/src/conf_mode/interfaces-bridge.py
@@ -54,7 +54,7 @@ def get_config(config=None):
     bridge = get_interface_dict(conf, base)
 
     # determine which members have been removed
-    tmp = node_changed(conf, ['member', 'interface'])
+    tmp = node_changed(conf, ['member', 'interface'], key_mangling=('-', '_'))
     if tmp:
         if 'member' in bridge:
             bridge['member'].update({'interface_remove': tmp })
@@ -107,7 +107,7 @@ def verify(bridge):
 
     verify_dhcpv6(bridge)
     verify_vrf(bridge)
-    
+
     ifname = bridge['ifname']
 
     if dict_search('member.interface', bridge):
@@ -142,7 +142,7 @@ def verify(bridge):
                 for option in ['allowed_vlan', 'native_vlan']:
                     if option in interface_config:
                         raise ConfigError('Can not use VLAN options on non VLAN aware bridge')
-    
+
     if 'enable_vlan' in bridge:
         if dict_search('vif.1', bridge):
             raise ConfigError(f'VLAN 1 sub interface cannot be set for VLAN aware bridge {ifname}, and VLAN 1 is always the parent interface')
diff --git a/src/conf_mode/interfaces-wireguard.py b/src/conf_mode/interfaces-wireguard.py
index 7cfc76aa0..3e6320f02 100755
--- a/src/conf_mode/interfaces-wireguard.py
+++ b/src/conf_mode/interfaces-wireguard.py
@@ -58,7 +58,7 @@ def get_config(config=None):
     # Determine which Wireguard peer has been removed.
     # Peers can only be removed with their public key!
     dict = {}
-    tmp = node_changed(conf, ['peer'])
+    tmp = node_changed(conf, ['peer'], key_mangling=('-', '_'))
     for peer in (tmp or []):
         pubkey = leaf_node_changed(conf, ['peer', peer, 'pubkey'])
         if pubkey:
diff --git a/src/conf_mode/policy-local-route.py b/src/conf_mode/policy-local-route.py
index c4024dce4..013f22665 100755
--- a/src/conf_mode/policy-local-route.py
+++ b/src/conf_mode/policy-local-route.py
@@ -40,7 +40,7 @@ def get_config(config=None):
 
     # delete policy local-route
     dict = {}
-    tmp = node_changed(conf, ['policy', 'local-route', 'rule'])
+    tmp = node_changed(conf, ['policy', 'local-route', 'rule'], key_mangling=('-', '_'))
     if tmp:
         for rule in (tmp or []):
             src = leaf_node_changed(conf, ['policy', 'local-route', 'rule', rule, 'source'])
-- 
cgit v1.2.3