2 files changed, 50 insertions, 1 deletions
diff --git a/src/helpers/vyos-check-wwan.py b/src/helpers/vyos-check-wwan.py
new file mode 100755
index 000000000..c6e6c54b7
--- /dev/null
+++ b/src/helpers/vyos-check-wwan.py
@@ -0,0 +1,37 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2021 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from vyos.configquery import VbashOpRun
+from vyos.configquery import ConfigTreeQuery
+
+from vyos.util import is_wwan_connected
+from vyos.util import call
+
+conf = ConfigTreeQuery()
+dict = conf.get_config_dict(['interfaces', 'wwan'], key_mangling=('-', '_'),
+                            get_first_key=True)
+
+for interface, interface_config in dict.items():
+    if not is_wwan_connected(interface):
+        if 'disable' in interface_config:
+            # do not restart this interface as it's disabled by the user
+            continue
+
+        #op = VbashOpRun()
+        #op.run(['connect', 'interface', interface])
+        call(f'VYOS_TAGNODE_VALUE={interface} /usr/libexec/vyos/conf_mode/interfaces-wwan.py')
+
+exit(0)
diff --git a/src/helpers/vyos_net_name b/src/helpers/vyos_net_name
index 13fb9e31f..e21d8c9ff 100755
--- a/src/helpers/vyos_net_name
+++ b/src/helpers/vyos_net_name
@@ -144,7 +144,19 @@ def get_configfile_interfaces() -> dict:
         logging.critical(f"OSError {e}")
         exit(1)
 
-    config = ConfigTree(config_file)
+    try:
+        config = ConfigTree(config_file)
+    except Exception:
+        logging.debug(f"updating component version string syntax")
+        try:
+            # this will update the component version string in place, for
+            # updates 1.2 --> 1.3/1.4
+            os.system(f'/usr/libexec/vyos/run-config-migration.py {config_path} --virtual --set-vintage=vyos')
+            with open(config_path) as f:
+                config_file = f.read()
+            config = ConfigTree(config_file)
+        except Exception as e:
+            logging.critical(f"ConfigTree error: {e}")
 
     base = ['interfaces', 'ethernet']
     if config.exists(base):