Move `templates` and `ethernet_nmconnection_file` to base.py

Signed-off-by: Mihaela Balutoiu <mbalutoiu@cloudbasesolutions.com>

coriolis/osmorphing/base.py

@@ -18,6 +18,39 @@ from coriolis import utils
 GRUB2_SERIAL = "serial --word=8 --stop=1 --speed=%d --parity=%s --unit=0"
 LOG = logging.getLogger(__name__)
 
+IFCFG_TEMPLATE = """
+TYPE=Ethernet
+BOOTPROTO=dhcp
+DEFROUTE=yes
+IPV4_FAILURE_FATAL=no
+IPV6INIT=yes
+IPV6_AUTOCONF=yes
+IPV6_DEFROUTE=yes
+IPV6_FAILURE_FATAL=no
+NAME=%(device_name)s
+DEVICE=%(device_name)s
+ONBOOT=yes
+NM_CONTROLLED=%(nm_controlled)s
+"""
+
+NMCONNECTION_TEMPLATE = """[connection]
+id=%(device_name)s
+uuid=%(connection_uuid)s
+type=ethernet
+interface-name=%(device_name)s
+autoconnect=true
+
+[ethernet]
+
+[ipv4]
+method=auto
+may-fail=false
+
+[ipv6]
+method=auto
+addr-gen-mode=default
+"""
+
 
 # Required OS release fields which are expected from the OSDetect tools.
 # 'schemas.CORIOLIS_DETECTED_OS_MORPHING_INFO_SCHEMA' schema:
@@ -222,6 +255,12 @@ class BaseLinuxOSMorphingTools(BaseOSMorphingTools):
     _packages = {}
     _NETWORK_SCRIPTS_PATH = "etc/sysconfig/network-scripts"
     _NM_CONNECTIONS_PATH = "etc/NetworkManager/system-connections"
+    # ifcfg profile template written for DHCP NICs. Subclasses may override it
+    # when the target uses a different ifcfg format (e.g. wicked-based SUSE).
+    _IFCFG_TEMPLATE = IFCFG_TEMPLATE
+    # Minimum OS major version at which ifcfg profiles should be marked as
+    # NetworkManager-controlled (NM_CONTROLLED=yes).
+    _IFCFG_NM_CONTROLLED_MIN_VERSION = None
 
     def __init__(self, conn, os_root_dir, os_root_dev, hypervisor,
                  event_manager, detected_os_info, osmorphing_parameters,
@@ -467,6 +506,75 @@ class BaseLinuxOSMorphingTools(BaseOSMorphingTools):
                 keyfiles.append((file, keyfile))
         return keyfiles
 
+    def _get_existing_ethernet_nmconnection_files(self):
+        if not self._test_path(self._NM_CONNECTIONS_PATH):
+            return []
+        return [cfg_path for cfg_path, _ in self._get_keyfiles_by_type(
+            "ethernet", self._NM_CONNECTIONS_PATH)]
+
+    def _get_ifcfg_nm_controlled(self):
+        min_version = self._IFCFG_NM_CONTROLLED_MIN_VERSION
+        if min_version is not None and self._version_supported_util(
+                self._version, minimum=min_version):
+            return "yes"
+        return "no"
+
+    def _backup_nmconnection_files(self, nmconnection_files=None,
+                                   backup_file_suffix=".bak"):
+        if nmconnection_files is None:
+            nmconnection_files = (
+                self._get_existing_ethernet_nmconnection_files())
+        for cfg_path in nmconnection_files:
+            self._exec_cmd_chroot(
+                'mv "%s" "%s%s"' % (cfg_path, cfg_path, backup_file_suffix))
+            LOG.debug("Backed up nmconnection profile '%s'", cfg_path)
+
+    def _backup_ethernet_ifcfg_configs(self, backup_file_suffix=".bak"):
+        if not self._test_path(self._NETWORK_SCRIPTS_PATH):
+            return
+        for cfg_path, _ in self._get_ifcfgs_by_type(
+                "Ethernet", self._NETWORK_SCRIPTS_PATH):
+            if os.path.basename(cfg_path) == "ifcfg-lo":
+                continue
+            self._exec_cmd_chroot(
+                'mv "%s" "%s%s"' % (cfg_path, cfg_path, backup_file_suffix))
+            LOG.debug("Backed up ifcfg profile '%s'", cfg_path)
+
+    def _write_nic_configs(self, nics_info):
+        self._backup_ethernet_ifcfg_configs()
+        for idx, _ in enumerate(nics_info or []):
+            dev_name = "eth%d" % idx
+            cfg_path = "%s/ifcfg-%s" % (self._NETWORK_SCRIPTS_PATH, dev_name)
+            self._write_file_sudo(
+                cfg_path,
+                self._IFCFG_TEMPLATE % {
+                    "device_name": dev_name,
+                    "nm_controlled": self._get_ifcfg_nm_controlled(),
+                })
+
+    def _write_nmconnection_configs(self, nics_info, nmconnection_files=None):
+        nics_info = nics_info or []
+        if not nics_info:
+            return
+
+        # Systems may have both nmconnection keyfiles and legacy ifcfg
+        # profiles; back up Ethernet profiles from both so stale source configs
+        # cannot override the freshly written DHCP profiles.
+        self._backup_nmconnection_files(nmconnection_files)
+        self._backup_ethernet_ifcfg_configs()
+
+        for idx, _ in enumerate(nics_info):
+            dev_name = "eth%d" % idx
+            cfg_path = "%s/%s.nmconnection" % (
+                self._NM_CONNECTIONS_PATH, dev_name)
+            self._write_file_sudo(
+                cfg_path,
+                NMCONNECTION_TEMPLATE % {
+                    "device_name": dev_name,
+                    "connection_uuid": str(uuid.uuid4()),
+                })
+            self._exec_cmd_chroot("chmod 600 /%s" % cfg_path)
+
     def _copy_resolv_conf(self):
         resolv_conf = "etc/resolv.conf"
         resolv_conf_path = os.path.join(self._os_root_dir, resolv_conf)

coriolis/osmorphing/redhat.py

@@ -23,43 +23,10 @@ RELEASE_CENTOS = centos_detect.CENTOS_DISTRO_IDENTIFIER
 RELEASE_FEDORA = "Fedora"
 
 
-IFCFG_TEMPLATE = """
-TYPE=Ethernet
-BOOTPROTO=dhcp
-DEFROUTE=yes
-IPV4_FAILURE_FATAL=no
-IPV6INIT=yes
-IPV6_AUTOCONF=yes
-IPV6_DEFROUTE=yes
-IPV6_FAILURE_FATAL=no
-NAME=%(device_name)s
-DEVICE=%(device_name)s
-ONBOOT=yes
-NM_CONTROLLED=%(nm_controlled)s
-"""
-
-NMCONNECTION_TEMPLATE = """[connection]
-id=%(device_name)s
-uuid=%(connection_uuid)s
-type=ethernet
-interface-name=%(device_name)s
-autoconnect=true
-
-[ethernet]
-
-[ipv4]
-method=auto
-may-fail=false
-
-[ipv6]
-method=auto
-addr-gen-mode=default
-"""
-
-
 class BaseRedHatMorphingTools(base.BaseLinuxOSMorphingTools):
     BIOS_GRUB_LOCATION = "/boot/grub2"
     UEFI_GRUB_LOCATION = "/boot/efi/EFI/redhat"
+    _IFCFG_NM_CONTROLLED_MIN_VERSION = 8
 
     @classmethod
     def check_os_supported(cls, detected_os_info):
@@ -112,11 +79,6 @@ class BaseRedHatMorphingTools(base.BaseLinuxOSMorphingTools):
         except Exception:
             return False
 
-    def _get_ifcfg_nm_controlled(self):
-        if self._version_supported_util(self._version, minimum=8):
-            return "yes"
-        return "no"
-
     def _set_dhcp_net_config(self, ifcfgs_ethernet):
         for ifcfg_file, iface_cfg in ifcfgs_ethernet:
             if iface_cfg.get("BOOTPROTO") == "none":
@@ -141,68 +103,6 @@ class BaseRedHatMorphingTools(base.BaseLinuxOSMorphingTools):
             del network_cfg["GATEWAY"]
             self._write_config_file(network_cfg_file, network_cfg)
 
-    def _get_existing_ethernet_nmconnection_files(self):
-        if not self._test_path(self._NM_CONNECTIONS_PATH):
-            return []
-        return [cfg_path for cfg_path, _ in self._get_keyfiles_by_type(
-            "ethernet", self._NM_CONNECTIONS_PATH)]
-
-    def _backup_nmconnection_files(self, nmconnection_files=None,
-                                   backup_file_suffix=".bak"):
-        if nmconnection_files is None:
-            nmconnection_files = (
-                self._get_existing_ethernet_nmconnection_files())
-        for cfg_path in nmconnection_files:
-            self._exec_cmd_chroot(
-                'mv "%s" "%s%s"' % (cfg_path, cfg_path, backup_file_suffix))
-            LOG.debug("Backed up nmconnection profile '%s'", cfg_path)
-
-    def _backup_all_ifcfg_configs(self, backup_file_suffix=".bak"):
-        if not self._test_path(self._NETWORK_SCRIPTS_PATH):
-            return
-        for cfg_path, _ in self._get_ifcfgs_by_type(
-                "Ethernet", self._NETWORK_SCRIPTS_PATH):
-            if os.path.basename(cfg_path) == "ifcfg-lo":
-                continue
-            self._exec_cmd_chroot(
-                'mv "%s" "%s%s"' % (cfg_path, cfg_path, backup_file_suffix))
-            LOG.debug("Backed up ifcfg profile '%s'", cfg_path)
-
-    def _write_nic_configs(self, nics_info):
-        self._backup_all_ifcfg_configs()
-        for idx, _ in enumerate(nics_info or []):
-            dev_name = "eth%d" % idx
-            cfg_path = "%s/ifcfg-%s" % (self._NETWORK_SCRIPTS_PATH, dev_name)
-            self._write_file_sudo(
-                cfg_path,
-                IFCFG_TEMPLATE % {
-                    "device_name": dev_name,
-                    "nm_controlled": self._get_ifcfg_nm_controlled(),
-                })
-
-    def _write_nmconnection_configs(self, nics_info, nmconnection_files):
-        nics_info = nics_info or []
-        if not nics_info:
-            return
-
-        # Red Hat-based systems may have both nmconnection keyfiles and legacy
-        # ifcfg profiles; back up Ethernet profiles from both so stale source
-        # configs cannot override the freshly written DHCP profiles.
-        self._backup_nmconnection_files(nmconnection_files)
-        self._backup_all_ifcfg_configs()
-
-        for idx, _ in enumerate(nics_info):
-            dev_name = "eth%d" % idx
-            cfg_path = "%s/%s.nmconnection" % (
-                self._NM_CONNECTIONS_PATH, dev_name)
-            self._write_file_sudo(
-                cfg_path,
-                NMCONNECTION_TEMPLATE % {
-                    "device_name": dev_name,
-                    "connection_uuid": str(uuid.uuid4()),
-                })
-            self._exec_cmd_chroot("chmod 600 /%s" % cfg_path)
-
     def _comment_keys_from_ifcfg_files(
             self, keys, interfaces=None, backup_file_suffix=".bak"):
         """ Comments the provided list of keys from all 'ifcfg-*' files.

coriolis/tests/osmorphing/test_base.py

@@ -588,6 +588,169 @@ class BaseLinuxOSMorphingToolsTestBase(test_base.CoriolisBaseTestCase):
         self.assertEqual(
             result, [(mock.sentinel.nmconn_file, {"type": "ethernet"})])
 
+    def test__get_ifcfg_nm_controlled_default(self):
+        # No minimum version configured -> never NetworkManager-controlled.
+        self.assertIsNone(
+            self.os_morphing_tools._IFCFG_NM_CONTROLLED_MIN_VERSION)
+
+        self.assertEqual(
+            "no", self.os_morphing_tools._get_ifcfg_nm_controlled())
+
+    def test__get_ifcfg_nm_controlled_below_minimum(self):
+        self.os_morphing_tools._IFCFG_NM_CONTROLLED_MIN_VERSION = 8
+        self.os_morphing_tools._version = "7"
+
+        self.assertEqual(
+            "no", self.os_morphing_tools._get_ifcfg_nm_controlled())
+
+    def test__get_ifcfg_nm_controlled_at_or_above_minimum(self):
+        self.os_morphing_tools._IFCFG_NM_CONTROLLED_MIN_VERSION = 8
+        self.os_morphing_tools._version = "9"
+
+        self.assertEqual(
+            "yes", self.os_morphing_tools._get_ifcfg_nm_controlled())
+
+    @mock.patch.object(base.BaseLinuxOSMorphingTools, '_exec_cmd_chroot')
+    def test__backup_nmconnection_files_explicit_list(
+            self, mock_exec_cmd_chroot):
+        nmconnection_files = [
+            'etc/NetworkManager/system-connections/eth0.nmconnection',
+            'etc/NetworkManager/system-connections/eth1.nmconnection']
+
+        with self.assertLogs('coriolis.osmorphing.base', level=logging.DEBUG):
+            self.os_morphing_tools._backup_nmconnection_files(
+                nmconnection_files)
+
+        mock_exec_cmd_chroot.assert_has_calls([
+            mock.call(
+                'mv "etc/NetworkManager/system-connections/eth0.nmconnection" '
+                '"etc/NetworkManager/system-connections/eth0.nmconnection.bak"'
+            ),
+            mock.call(
+                'mv "etc/NetworkManager/system-connections/eth1.nmconnection" '
+                '"etc/NetworkManager/system-connections/eth1.nmconnection.bak"'
+            ),
+        ])
+
+    @mock.patch.object(
+        base.BaseLinuxOSMorphingTools,
+        '_get_existing_ethernet_nmconnection_files')
+    @mock.patch.object(base.BaseLinuxOSMorphingTools, '_exec_cmd_chroot')
+    def test__backup_nmconnection_files_fetches_files(
+            self, mock_exec_cmd_chroot,
+            mock_get_existing_ethernet_nmconnection_files):
+        mock_get_existing_ethernet_nmconnection_files.return_value = [
+            'etc/NetworkManager/system-connections/eth0.nmconnection']
+
+        with self.assertLogs('coriolis.osmorphing.base', level=logging.DEBUG):
+            self.os_morphing_tools._backup_nmconnection_files()
+
+        mock_get_existing_ethernet_nmconnection_files.assert_called_once_with()
+        mock_exec_cmd_chroot.assert_called_once_with(
+            'mv "etc/NetworkManager/system-connections/eth0.nmconnection" '
+            '"etc/NetworkManager/system-connections/eth0.nmconnection.bak"')
+
+    @mock.patch.object(base.BaseLinuxOSMorphingTools, '_get_ifcfgs_by_type')
+    @mock.patch.object(base.BaseLinuxOSMorphingTools, '_exec_cmd_chroot')
+    @mock.patch.object(base.BaseLinuxOSMorphingTools, '_test_path')
+    def test__backup_ethernet_ifcfg_configs(
+            self, mock_test_path, mock_exec_cmd_chroot,
+            mock_get_ifcfgs_by_type):
+        mock_test_path.return_value = True
+        mock_get_ifcfgs_by_type.return_value = [
+            ("etc/sysconfig/network-scripts/ifcfg-eth0", {}),
+            # ifcfg-lo must be skipped.
+            ("etc/sysconfig/network-scripts/ifcfg-lo", {}),
+        ]
+
+        with self.assertLogs('coriolis.osmorphing.base', level=logging.DEBUG):
+            self.os_morphing_tools._backup_ethernet_ifcfg_configs()
+
+        mock_exec_cmd_chroot.assert_called_once_with(
+            'mv "etc/sysconfig/network-scripts/ifcfg-eth0" '
+            '"etc/sysconfig/network-scripts/ifcfg-eth0.bak"')
+
+    @mock.patch.object(base.BaseLinuxOSMorphingTools, '_get_ifcfgs_by_type')
+    @mock.patch.object(base.BaseLinuxOSMorphingTools, '_exec_cmd_chroot')
+    @mock.patch.object(base.BaseLinuxOSMorphingTools, '_test_path')
+    def test__backup_ethernet_ifcfg_configs_no_dir(
+            self, mock_test_path, mock_exec_cmd_chroot,
+            mock_get_ifcfgs_by_type):
+        mock_test_path.return_value = False
+
+        self.os_morphing_tools._backup_ethernet_ifcfg_configs()
+
+        mock_get_ifcfgs_by_type.assert_not_called()
+        mock_exec_cmd_chroot.assert_not_called()
+
+    @mock.patch.object(base.BaseLinuxOSMorphingTools, '_write_file_sudo')
+    @mock.patch.object(
+        base.BaseLinuxOSMorphingTools, '_backup_ethernet_ifcfg_configs')
+    def test__write_nic_configs(
+            self, mock_backup_ethernet_ifcfg_configs, mock_write_file_sudo):
+        nics_info = [{'name': 'eth0'}, {'name': 'eth1'}]
+
+        self.os_morphing_tools._write_nic_configs(nics_info)
+
+        mock_backup_ethernet_ifcfg_configs.assert_called_once_with()
+        mock_write_file_sudo.assert_has_calls([
+            mock.call(
+                "etc/sysconfig/network-scripts/ifcfg-eth0",
+                base.IFCFG_TEMPLATE % {
+                    "device_name": "eth0",
+                    "nm_controlled": "no",
+                }),
+            mock.call(
+                "etc/sysconfig/network-scripts/ifcfg-eth1",
+                base.IFCFG_TEMPLATE % {
+                    "device_name": "eth1",
+                    "nm_controlled": "no",
+                }),
+        ])
+
+    @mock.patch.object(base.BaseLinuxOSMorphingTools, '_exec_cmd_chroot')
+    @mock.patch.object(base.BaseLinuxOSMorphingTools, '_write_file_sudo')
+    @mock.patch.object(
+        base.BaseLinuxOSMorphingTools, '_backup_ethernet_ifcfg_configs')
+    @mock.patch.object(
+        base.BaseLinuxOSMorphingTools, '_backup_nmconnection_files')
+    def test__write_nmconnection_configs(
+            self, mock_backup_nmconnection_files,
+            mock_backup_ethernet_ifcfg_configs, mock_write_file_sudo,
+            mock_exec_cmd_chroot):
+        nics_info = [{'name': 'eth0'}]
+        nmconnection_files = [
+            'etc/NetworkManager/system-connections/eth0.nmconnection']
+
+        self.os_morphing_tools._write_nmconnection_configs(
+            nics_info, nmconnection_files)
+
+        mock_backup_nmconnection_files.assert_called_once_with(
+            nmconnection_files)
+        mock_backup_ethernet_ifcfg_configs.assert_called_once_with()
+        mock_write_file_sudo.assert_called_once()
+        args, _ = mock_write_file_sudo.call_args
+        self.assertEqual(
+            args[0],
+            "etc/NetworkManager/system-connections/eth0.nmconnection")
+        self.assertIn("[connection]", args[1])
+        self.assertIn("interface-name=eth0", args[1])
+        mock_exec_cmd_chroot.assert_called_once_with(
+            "chmod 600 /etc/NetworkManager/system-connections/"
+            "eth0.nmconnection")
+
+    @mock.patch.object(
+        base.BaseLinuxOSMorphingTools, '_backup_nmconnection_files')
+    @mock.patch.object(
+        base.BaseLinuxOSMorphingTools, '_backup_ethernet_ifcfg_configs')
+    def test__write_nmconnection_configs_no_nics(
+            self, mock_backup_ethernet_ifcfg_configs,
+            mock_backup_nmconnection_files):
+        self.os_morphing_tools._write_nmconnection_configs(None, None)
+
+        mock_backup_nmconnection_files.assert_not_called()
+        mock_backup_ethernet_ifcfg_configs.assert_not_called()
+
     @mock.patch.object(base.BaseLinuxOSMorphingTools, '_test_path')
     @mock.patch.object(base.BaseLinuxOSMorphingTools, '_exec_cmd')
     def test__copy_resolv_conf(self, mock_exec_cmd, mock_test_path):

coriolis/tests/osmorphing/test_redhat.py

@@ -150,26 +150,26 @@ class BaseRedHatMorphingToolsTestCase(test_base.CoriolisBaseTestCase):
         ])
 
     @mock.patch.object(
-        redhat.BaseRedHatMorphingTools, '_backup_all_ifcfg_configs')
+        redhat.BaseRedHatMorphingTools, '_backup_ethernet_ifcfg_configs')
     @mock.patch.object(base.BaseLinuxOSMorphingTools, '_write_file_sudo')
     def test_write_nic_configs(
-            self, mock_write_file_sudo, mock_backup_all_ifcfg_configs):
+            self, mock_write_file_sudo, mock_backup_ethernet_ifcfg_configs):
         nics_info = [{'name': 'eth0'}, {'name': 'eth1'}]
 
         self.morphing_tools._write_nic_configs(nics_info)
 
-        mock_backup_all_ifcfg_configs.assert_called_once_with()
+        mock_backup_ethernet_ifcfg_configs.assert_called_once_with()
         mock_write_file_sudo.assert_has_calls([
             mock.call(
                 "etc/sysconfig/network-scripts/ifcfg-eth0",
-                redhat.IFCFG_TEMPLATE % {
+                base.IFCFG_TEMPLATE % {
                     "device_name": "eth0",
                     "nm_controlled": "no",
                 },
             ),
             mock.call(
                 "etc/sysconfig/network-scripts/ifcfg-eth1",
-                redhat.IFCFG_TEMPLATE % {
+                base.IFCFG_TEMPLATE % {
                     "device_name": "eth1",
                     "nm_controlled": "no",
                 },
@@ -177,19 +177,19 @@ class BaseRedHatMorphingToolsTestCase(test_base.CoriolisBaseTestCase):
         ])
 
     @mock.patch.object(
-        redhat.BaseRedHatMorphingTools, '_backup_all_ifcfg_configs')
+        redhat.BaseRedHatMorphingTools, '_backup_ethernet_ifcfg_configs')
     @mock.patch.object(base.BaseLinuxOSMorphingTools, '_write_file_sudo')
     def test_write_nic_configs_rhel8(
-            self, mock_write_file_sudo, mock_backup_all_ifcfg_configs):
+            self, mock_write_file_sudo, mock_backup_ethernet_ifcfg_configs):
         self.morphing_tools._version = '8.10'
         nics_info = [{'name': 'eth0'}]
 
         self.morphing_tools._write_nic_configs(nics_info)
 
-        mock_backup_all_ifcfg_configs.assert_called_once_with()
+        mock_backup_ethernet_ifcfg_configs.assert_called_once_with()
         mock_write_file_sudo.assert_called_once_with(
             "etc/sysconfig/network-scripts/ifcfg-eth0",
-            redhat.IFCFG_TEMPLATE % {
+            base.IFCFG_TEMPLATE % {
                 "device_name": "eth0",
                 "nm_controlled": "yes",
             },
@@ -205,7 +205,7 @@ class BaseRedHatMorphingToolsTestCase(test_base.CoriolisBaseTestCase):
         self.assertEqual(expected, result)
 
     @mock.patch.object(
-        redhat.BaseRedHatMorphingTools, '_backup_all_ifcfg_configs'
+        redhat.BaseRedHatMorphingTools, '_backup_ethernet_ifcfg_configs'
     )
     @mock.patch.object(
         redhat.BaseRedHatMorphingTools, '_backup_nmconnection_files'
@@ -215,7 +215,7 @@ class BaseRedHatMorphingToolsTestCase(test_base.CoriolisBaseTestCase):
     def test_write_nmconnection_configs(
             self, mock_exec_cmd_chroot, mock_write_file_sudo,
             mock_backup_nmconnection_files,
-            mock_backup_all_ifcfg_configs):
+            mock_backup_ethernet_ifcfg_configs):
         nics_info = [{'name': 'eth0'}]
         nmconnection_files = [
             'etc/NetworkManager/system-connections/eth0.nmconnection']
@@ -225,7 +225,7 @@ class BaseRedHatMorphingToolsTestCase(test_base.CoriolisBaseTestCase):
 
         mock_backup_nmconnection_files.assert_called_once_with(
             nmconnection_files)
-        mock_backup_all_ifcfg_configs.assert_called_once_with()
+        mock_backup_ethernet_ifcfg_configs.assert_called_once_with()
         mock_write_file_sudo.assert_called_once()
         args, _ = mock_write_file_sudo.call_args
         self.assertEqual(
@@ -241,7 +241,7 @@ class BaseRedHatMorphingToolsTestCase(test_base.CoriolisBaseTestCase):
         )
 
     @mock.patch.object(
-        redhat.BaseRedHatMorphingTools, '_backup_all_ifcfg_configs'
+        redhat.BaseRedHatMorphingTools, '_backup_ethernet_ifcfg_configs'
     )
     @mock.patch.object(
         redhat.BaseRedHatMorphingTools, '_backup_nmconnection_files'
@@ -251,12 +251,12 @@ class BaseRedHatMorphingToolsTestCase(test_base.CoriolisBaseTestCase):
     def test_write_nmconnection_configs_no_nics(
             self, mock_exec_cmd_chroot, mock_write_file_sudo,
             mock_backup_nmconnection_files,
-            mock_backup_all_ifcfg_configs):
+            mock_backup_ethernet_ifcfg_configs):
         self.morphing_tools._write_nmconnection_configs(
             None, ['etc/NetworkManager/system-connections/eth0.nmconnection'])
 
         mock_backup_nmconnection_files.assert_not_called()
-        mock_backup_all_ifcfg_configs.assert_not_called()
+        mock_backup_ethernet_ifcfg_configs.assert_not_called()
         mock_write_file_sudo.assert_not_called()
         mock_exec_cmd_chroot.assert_not_called()
 
@@ -276,7 +276,7 @@ class BaseRedHatMorphingToolsTestCase(test_base.CoriolisBaseTestCase):
         )
 
     @mock.patch.object(
-        redhat.BaseRedHatMorphingTools,
+        base.BaseLinuxOSMorphingTools,
         '_get_existing_ethernet_nmconnection_files')
     @mock.patch.object(base.BaseLinuxOSMorphingTools, '_exec_cmd_chroot')
     def test__backup_nmconnection_files_fetches_files(
@@ -291,7 +291,7 @@ class BaseRedHatMorphingToolsTestCase(test_base.CoriolisBaseTestCase):
         mock_exec_cmd_chroot.assert_called_once()
 
     @mock.patch.object(
-        redhat.BaseRedHatMorphingTools,
+        base.BaseLinuxOSMorphingTools,
         '_get_existing_ethernet_nmconnection_files')
     @mock.patch.object(base.BaseLinuxOSMorphingTools, '_exec_cmd_chroot')
     def test__backup_nmconnection_files_no_files(
@@ -306,9 +306,9 @@ class BaseRedHatMorphingToolsTestCase(test_base.CoriolisBaseTestCase):
     @mock.patch.object(base.BaseLinuxOSMorphingTools, '_exec_cmd_chroot')
     @mock.patch.object(base.BaseLinuxOSMorphingTools, '_get_ifcfgs_by_type')
     @mock.patch.object(base.BaseLinuxOSMorphingTools, '_test_path')
-    def test__backup_all_ifcfg_configs(self, mock_test_path,
-                                       mock_get_ifcfgs_by_type,
-                                       mock_exec_cmd_chroot):
+    def test__backup_ethernet_ifcfg_configs(self, mock_test_path,
+                                            mock_get_ifcfgs_by_type,
+                                            mock_exec_cmd_chroot):
         mock_test_path.return_value = True
         mock_get_ifcfgs_by_type.return_value = [
             ("etc/sysconfig/network-scripts/ifcfg-ens33",
@@ -317,7 +317,7 @@ class BaseRedHatMorphingToolsTestCase(test_base.CoriolisBaseTestCase):
              {"TYPE": "Ethernet"}),
         ]
 
-        self.morphing_tools._backup_all_ifcfg_configs()
+        self.morphing_tools._backup_ethernet_ifcfg_configs()
 
         mock_get_ifcfgs_by_type.assert_called_once_with(
             "Ethernet", self.morphing_tools._NETWORK_SCRIPTS_PATH)
@@ -336,12 +336,12 @@ class BaseRedHatMorphingToolsTestCase(test_base.CoriolisBaseTestCase):
     @mock.patch.object(base.BaseLinuxOSMorphingTools, '_exec_cmd_chroot')
     @mock.patch.object(base.BaseLinuxOSMorphingTools, '_get_ifcfgs_by_type')
     @mock.patch.object(base.BaseLinuxOSMorphingTools, '_test_path')
-    def test__backup_all_ifcfg_configs_no_dir(self, mock_test_path,
-                                              mock_get_ifcfgs_by_type,
-                                              mock_exec_cmd_chroot):
+    def test__backup_ethernet_ifcfg_configs_no_dir(self, mock_test_path,
+                                                   mock_get_ifcfgs_by_type,
+                                                   mock_exec_cmd_chroot):
         mock_test_path.return_value = False
 
-        self.morphing_tools._backup_all_ifcfg_configs()
+        self.morphing_tools._backup_ethernet_ifcfg_configs()
 
         mock_get_ifcfgs_by_type.assert_not_called()
         mock_exec_cmd_chroot.assert_not_called()
@@ -383,7 +383,7 @@ class BaseRedHatMorphingToolsTestCase(test_base.CoriolisBaseTestCase):
         redhat.BaseRedHatMorphingTools, '_write_nmconnection_configs'
     )
     @mock.patch.object(
-        redhat.BaseRedHatMorphingTools,
+        base.BaseLinuxOSMorphingTools,
         '_get_existing_ethernet_nmconnection_files',
     )
     def test_set_net_config_dhcp(
@@ -412,7 +412,7 @@ class BaseRedHatMorphingToolsTestCase(test_base.CoriolisBaseTestCase):
     )
     @mock.patch.object(redhat.BaseRedHatMorphingTools, '_write_nic_configs')
     @mock.patch.object(
-        redhat.BaseRedHatMorphingTools,
+        base.BaseLinuxOSMorphingTools,
         '_get_existing_ethernet_nmconnection_files',
     )
     def test_set_net_config_dhcp_nmconnection(
@@ -443,7 +443,7 @@ class BaseRedHatMorphingToolsTestCase(test_base.CoriolisBaseTestCase):
     )
     @mock.patch.object(redhat.BaseRedHatMorphingTools, '_write_nic_configs')
     @mock.patch.object(
-        redhat.BaseRedHatMorphingTools,
+        base.BaseLinuxOSMorphingTools,
         '_get_existing_ethernet_nmconnection_files',
     )
     def test_set_net_config_dhcp_nmconnection_no_nics(