Merge branch 'master' into Fx-VPN-templates-conflict

Author: nemesifier

openwisp_controller/connection/connectors/openwrt/ssh.py

@@ -10,9 +10,12 @@
 class OpenWrt(Ssh):
     def update_config(self):
         try:
-            output, exit_code = self.exec_command('openwisp_config --version')
+            output, exit_code = self.exec_command(
+                # "openwisp_config" for backword compatibility
+                '(openwisp-config --version || openwisp_config --version) 2>/dev/null'
+            )
         except Exception as error:
-            logger.error('Unable to get version of openwisp_config')
+            logger.error('Unable to get version of openwisp-config')
             raise error
         else:
             ow_config_version = output.split(' ')[-1]

openwisp_controller/connection/tests/test_models.py

@@ -933,7 +933,10 @@ def test_device_config_created(self, mocked_sleep, mocked_connect):
     def test_device_config_update(self, mocked_sleep, mocked_connect):
         def _assert_version_check_command(mocked_exec):
             args, _ = mocked_exec.call_args_list[0]
-            self.assertEqual(args[0], 'openwisp_config --version')
+            self.assertEqual(
+                args[0],
+                '(openwisp-config --version || openwisp_config --version) 2>/dev/null',
+            )
 
         def _assert_applying_conf_test_command(mocked_exec):
             args, _ = mocked_exec_command.call_args_list[1]
@@ -944,7 +947,7 @@ def _assert_applying_conf_test_command(mocked_exec):
 
         conf = self._prepare_conf_object()
 
-        with self.subTest('Unable to get openwisp_config version'):
+        with self.subTest('Unable to get openwisp-config version'):
             with mock.patch(_exec_command_path) as mocked_exec_command:
                 mocked_exec_command.return_value = self._exec_command_return_value(
                     exit_code=1