diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-06-27 12:54:13 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-06-27 13:51:28 +0200 |
| commit | e0bd74e399cc2693b6d442af52c9345e279db059 (patch) | |
| tree | de854e2d5b10153dfc427b7cdb5849a40d830b7f /python | |
| parent | cbc293c31709af86af07f03a60818136eeef84fb (diff) | |
| download | vyos-1x-e0bd74e399cc2693b6d442af52c9345e279db059.tar.gz vyos-1x-e0bd74e399cc2693b6d442af52c9345e279db059.zip | |
ifconfig: T2653: move macsec interface to get_config_dict()
Diffstat (limited to 'python')
| -rw-r--r-- | python/vyos/configdict.py | 2 | ||||
| -rw-r--r-- | python/vyos/ifconfig/interface.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/python/vyos/configdict.py b/python/vyos/configdict.py index 074dc0131..0dc7578d8 100644 --- a/python/vyos/configdict.py +++ b/python/vyos/configdict.py @@ -96,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 diff --git a/python/vyos/ifconfig/interface.py b/python/vyos/ifconfig/interface.py index a9af6ffdf..1819ffc82 100644 --- a/python/vyos/ifconfig/interface.py +++ b/python/vyos/ifconfig/interface.py @@ -796,6 +796,3 @@ class Interface(Control): # Interface administrative state state = 'down' if 'disable' in config.keys() else 'up' self.set_admin_state(state) - - import pprint - pprint.pprint(config) |