summaryrefslogtreecommitdiff
path: root/src/helpers/vyos-merge-config.py
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@sentrium.io>2019-06-12 12:04:34 -0500
committerJohn Estabrook <jestabro@sentrium.io>2019-06-12 12:04:34 -0500
commit441f95d499f42f57b3a15d78aec826f794fab59f (patch)
treec002cf0c7aadb312d7539bd7394c67850fcbcace /src/helpers/vyos-merge-config.py
parentaa88d5192338e2263516de791665f819a00b5c36 (diff)
downloadvyos-1x-441f95d499f42f57b3a15d78aec826f794fab59f.tar.gz
vyos-1x-441f95d499f42f57b3a15d78aec826f794fab59f.zip
T1397: use revised migration method
Diffstat (limited to 'src/helpers/vyos-merge-config.py')
-rwxr-xr-xsrc/helpers/vyos-merge-config.py12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/helpers/vyos-merge-config.py b/src/helpers/vyos-merge-config.py
index bb2919de2..e97a1c08d 100755
--- a/src/helpers/vyos-merge-config.py
+++ b/src/helpers/vyos-merge-config.py
@@ -18,8 +18,10 @@
import sys
import os
import subprocess
+import tempfile
import vyos.defaults
import vyos.remote
+import vyos.migrator
from vyos.config import Config
from vyos.configtree import ConfigTree
@@ -59,6 +61,16 @@ path = None
if (len(sys.argv) > 2):
path = " ".join(sys.argv[2:])
+with tempfile.NamedTemporaryFile() as file_to_migrate:
+ with open(file_to_migrate.name, 'w') as fd:
+ fd.write(config_file)
+
+ migration = vyos.migrator.Migrator(file_to_migrate.name)
+ migration.run()
+ if migration.config_changed():
+ with open(file_to_migrate.name, 'r') as fd:
+ config_file = fd.read()
+
merge_config_tree = ConfigTree(config_file)
effective_config = Config()