1 files changed, 22 insertions, 11 deletions
diff --git a/src/helpers/vyos_net_name b/src/helpers/vyos_net_name
index 13fb9e31f..1798e92db 100755
--- a/src/helpers/vyos_net_name
+++ b/src/helpers/vyos_net_name
@@ -20,19 +20,20 @@ import os
 import re
 import time
 import logging
+import tempfile
 import threading
 from sys import argv
 
 from vyos.configtree import ConfigTree
 from vyos.defaults import directories
-from vyos.util import cmd
+from vyos.util import cmd, boot_configuration_complete
+from vyos.migrator import VirtualMigrator
 
 vyos_udev_dir = directories['vyos_udev_dir']
 vyos_log_dir = '/run/udev/log'
 vyos_log_file = os.path.join(vyos_log_dir, 'vyos-net-name')
 
 config_path = '/opt/vyatta/etc/config/config.boot'
-config_status = '/tmp/vyos-config-status'
 
 lock = threading.Lock()
 
@@ -43,13 +44,6 @@ except FileExistsError:
 
 logging.basicConfig(filename=vyos_log_file, level=logging.DEBUG)
 
-def boot_configuration_complete() -> bool:
-    """ Check if vyos-router has completed, hence hotplug event
-    """
-    if os.path.isfile(config_status):
-        return True
-    return False
-
 def is_available(intfs: dict, intf_name: str) -> bool:
     """ Check if interface name is already assigned
     """
@@ -144,7 +138,25 @@ def get_configfile_interfaces() -> dict:
         logging.critical(f"OSError {e}")
         exit(1)
 
-    config = ConfigTree(config_file)
+    try:
+        config = ConfigTree(config_file)
+    except Exception:
+        try:
+            logging.debug(f"updating component version string syntax")
+            # this will update the component version string syntax,
+            # required for updates 1.2 --> 1.3/1.4
+            with tempfile.NamedTemporaryFile() as fp:
+                with open(fp.name, 'w') as fd:
+                    fd.write(config_file)
+                virtual_migration = VirtualMigrator(fp.name)
+                virtual_migration.run()
+                with open(fp.name) as fd:
+                    config_file = fd.read()
+
+            config = ConfigTree(config_file)
+
+        except Exception as e:
+            logging.critical(f"ConfigTree error: {e}")
 
     base = ['interfaces', 'ethernet']
     if config.exists(base):
@@ -242,4 +254,3 @@ if not boot_configuration_complete():
 else:
     logging.debug("boot configuration complete")
 lock.release()
-