diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-03-28 12:06:41 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-03-28 12:06:41 +0100 |
| commit | 792c00a018d0b237996e60845edf8ad970c4afbb (patch) | |
| tree | 15bea8859399c540db517c46bd78e75a5e005e78 /src/helpers/vyos-merge-config.py | |
| parent | a0424f9c6a4cf813934d5a3bc877fddae6eb99de (diff) | |
| parent | 822e171a0023c3f8f335cda08bcbf70b2d6d4070 (diff) | |
| download | vyos-1x-792c00a018d0b237996e60845edf8ad970c4afbb.tar.gz vyos-1x-792c00a018d0b237996e60845edf8ad970c4afbb.zip | |
Merge branch 't1831-ipv6' into current
* t1831-ipv6:
ipv6: T1831: migrate eui64 addressing to XML and python
vyos.util: import cleanup
ipv6: T1831: migrate autoconf node
ipv6: T1831: use integers over bool in interface configuration
ipv6: T1831: migrate forwarding and dup-addr-detect-transmits nodes
ipv6: T1831: Makefile: remove node.def files in ipv6 folder
ifconfig: T2057: explicity name state functions
ifconfig: T2167: get_mac was not returning
ifconfig: T2057: add get_alias function
ifconfig: T2057: option forcing
merge config: T2169: remove redundant use of show_config
Diffstat (limited to 'src/helpers/vyos-merge-config.py')
| -rwxr-xr-x | src/helpers/vyos-merge-config.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/helpers/vyos-merge-config.py b/src/helpers/vyos-merge-config.py index 7ae62cfb3..c5216daa6 100755 --- a/src/helpers/vyos-merge-config.py +++ b/src/helpers/vyos-merge-config.py @@ -70,10 +70,7 @@ with tempfile.NamedTemporaryFile() as file_to_migrate: merge_config_tree = ConfigTree(config_file) effective_config = Config() - -output_effective_config = effective_config.show_config() - -effective_config_tree = ConfigTree(output_effective_config) +effective_config_tree = effective_config._running_config effective_cmds = effective_config_tree.to_commands() merge_cmds = merge_config_tree.to_commands() |