Merge pull request #3692 from jestabro/revise-migration

T6007: revise migration system

1 files changed, 7 insertions, 10 deletions

diff --git a/src/helpers/vyos-merge-config.py b/src/helpers/vyos-merge-config.py
index 35424626e..5ef845ac2 100755
--- a/src/helpers/vyos-merge-config.py
+++ b/src/helpers/vyos-merge-config.py
@@ -22,7 +22,8 @@ import vyos.remote
 
 from vyos.config import Config
 from vyos.configtree import ConfigTree
-from vyos.migrator import Migrator, VirtualMigrator
+from vyos.migrate import ConfigMigrate
+from vyos.migrate import ConfigMigrateError
 from vyos.utils.process import cmd
 from vyos.utils.process import DEVNULL
 
@@ -61,15 +62,11 @@ with tempfile.NamedTemporaryFile() as file_to_migrate:
     with open(file_to_migrate.name, 'w') as fd:
         fd.write(config_file)
 
-    virtual_migration = VirtualMigrator(file_to_migrate.name)
-    virtual_migration.run()
-
-    migration = Migrator(file_to_migrate.name)
-    migration.run()
-
-    if virtual_migration.config_changed() or migration.config_changed():
-        with open(file_to_migrate.name, 'r') as fd:
-            config_file = fd.read()
+    config_migrate = ConfigMigrate(file_to_migrate.name)
+    try:
+        config_migrate.run()
+    except ConfigMigrateError as e:
+        sys.exit(e)
 
 merge_config_tree = ConfigTree(config_file)