1 files changed, 4 insertions, 1 deletions
diff --git a/python/vyos/configdict.py b/python/vyos/configdict.py
index ce086872e..0dc7578d8 100644
--- a/python/vyos/configdict.py
+++ b/python/vyos/configdict.py
@@ -22,7 +22,6 @@ from enum import Enum
 from copy import deepcopy
 
 from vyos import ConfigError
-from vyos.ifconfig import Interface
 from vyos.validate import is_member
 from vyos.util import ifname_from_config
 
@@ -97,6 +96,8 @@ def dict_merge(source, destination):
     for key, value in source.items():
         if key not in tmp.keys():
             tmp[key] = value
+        elif isinstance(source[key], dict):
+            tmp[key] = dict_merge(source[key], tmp[key])
 
     return tmp
 
@@ -214,6 +215,8 @@ def disable_state(conf, check=[3,5,7]):
 
 
 def intf_to_dict(conf, default):
+    from vyos.ifconfig import Interface
+
     """
     Common used function which will extract VLAN related information from config
     and represent the result as Python dictionary.