vyos.configdict: T2653: add new reusable helper node_changed()

This can be used to see if a tagNode has been changed. It will return a list
of changed nodes.

2 files changed, 17 insertions, 12 deletions

diff --git a/python/vyos/configdict.py b/python/vyos/configdict.py
index 4fca426cd..7f05a15ed 100644
--- a/python/vyos/configdict.py
+++ b/python/vyos/configdict.py
@@ -133,17 +133,16 @@ def T2665_default_dict_cleanup(dict):
 
     return dict
 
-def leaf_node_changed(conf, key):
+def leaf_node_changed(conf, path):
     """
     Check if a leaf node was altered. If it has been altered - values has been
     changed, or it was added/removed, we will return the old value. If nothing
     has been changed, None is returned
     """
     from vyos.configdiff import get_config_diff
-
     D = get_config_diff(conf, key_mangling=('-', '_'))
     D.set_level(conf.get_level())
-    (new, old) = D.get_value_diff(key)
+    (new, old) = D.get_value_diff(path)
     if new != old:
         if isinstance(old, str):
             return old
@@ -156,6 +155,19 @@ def leaf_node_changed(conf, key):
 
     return None
 
+def node_changed(conf, path):
+    """
+    Check if a leaf node was altered. If it has been altered - values has been
+    changed, or it was added/removed, we will return the old value. If nothing
+    has been changed, None is returned
+    """
+    from vyos.configdiff import get_config_diff, Diff
+    D = get_config_diff(conf, key_mangling=('-', '_'))
+    D.set_level(conf.get_level())
+    # get_child_nodes() will return dict_keys(), mangle this into a list with PEP448
+    keys = D.get_child_nodes_diff(path, expand_nodes=Diff.DELETE)['delete'].keys()
+    return list(keys)
+
 def get_interface_dict(config, base, ifname):
     """
     Common utility function to retrieve and mandgle the interfaces available
diff --git a/src/conf_mode/interfaces-bridge.py b/src/conf_mode/interfaces-bridge.py
index 7998a251a..9c43d1983 100755
--- a/src/conf_mode/interfaces-bridge.py
+++ b/src/conf_mode/interfaces-bridge.py
@@ -21,7 +21,7 @@ from netifaces import interfaces
 
 from vyos.config import Config
 from vyos.configdict import get_interface_dict
-from vyos.configdiff import get_config_diff, Diff
+from vyos.configdict import node_changed
 from vyos.configverify import verify_dhcpv6
 from vyos.configverify import verify_vrf
 from vyos.ifconfig import BridgeIf
@@ -34,13 +34,6 @@ from vyos import ConfigError
 from vyos import airbag
 airbag.enable()
 
-def get_removed_members(conf):
-    D = get_config_diff(conf, key_mangling=('-', '_'))
-    D.set_level(conf.get_level())
-    # get_child_nodes() will return dict_keys(), mangle this into a list with PEP448
-    keys = D.get_child_nodes_diff(['member', 'interface'], expand_nodes=Diff.DELETE)['delete'].keys()
-    return list(keys)
-
 def get_config():
     """
     Retrive CLI config as dictionary. Dictionary can never be empty, as at least the
@@ -57,7 +50,7 @@ def get_config():
     bridge = get_interface_dict(conf, base, ifname)
 
     # determine which members have been removed
-    tmp = get_removed_members(conf)
+    tmp = node_changed(conf, ['member', 'interface'])
     if tmp:
         if 'member' in bridge:
             bridge['member'].update({'interface_remove': tmp })