Merge pull request #462 from SUSE/fix_offline_migrations_pre_check

Fix offline migrations pre check

Author: schaefi

suse_migration_services/migration_target.py

@@ -19,6 +19,7 @@
 import platform
 from glob import glob
 from fnmatch import fnmatch
+from textwrap import dedent
 
 from suse_migration_services.migration_config import MigrationConfig
 from suse_migration_services.defaults import Defaults
@@ -41,9 +42,29 @@ def get_migration_target():
         migration_iso = glob('/migration-image/*-*Migration.*.iso')
         migration_iso = migration_iso[0] if migration_iso else ''
 
-        if fnmatch(migration_iso, '*SLES16*-*Migration*.iso'):
-            # return default migration target
+        if fnmatch(migration_iso, '*SLES15-SAP*Migration*.iso'):
+            return {'identifier': 'SLES_SAP', 'version': '15.4', 'arch': platform.machine()}
+        elif fnmatch(migration_iso, '*SLES16-SAP*Migration*.iso'):
+            return {'identifier': 'SLES_SAP', 'version': '16.0', 'arch': platform.machine()}
+        elif fnmatch(migration_iso, '*SLES16*-*Migration*.iso'):
             return {'identifier': 'SLES', 'version': '16.0', 'arch': platform.machine()}
         else:
-            # return default migration target
-            return {'identifier': 'SLES', 'version': '15.4', 'arch': platform.machine()}
+            message = dedent(
+                '''\n
+                Migration target cannot be detected, fallback to SLES 15.7
+
+                Please make sure to install one of the following Migration packages
+
+                - SLES15-Migration
+                - SLES15-SAP-Migration
+                - SLES16-Migration
+                - SLES16-SAP-Migration
+
+                Only with an installed Migration package, the DMS knows which migration
+                target to use and can ask the registration server for an upgrade path.
+                The following request to the registration server might provide incorrect
+                information due to an assumption of the migration target:
+            '''
+            )
+            log.warning(message)
+            return {'identifier': 'SLES', 'version': '15.7', 'arch': platform.machine()}

suse_migration_services/prechecks/scc.py

@@ -103,6 +103,8 @@ def get_scc_credentials():
 
 def get_registration_server_url():
     suseconnect_config = '/etc/SUSEConnect'
+    if not os.path.isfile(suseconnect_config):
+        return 'https://scc.suse.com'
     if os.path.isfile(suseconnect_config):
         try:
             with open(suseconnect_config, 'r') as config:

test/unit/migration_config_test.py

@@ -332,7 +332,11 @@ def test_get_migration_config_merge(
 
         # Check no other key's exists
         assert list(self.config.config_data.keys()) == [
-            'preserve', 'soft_reboot', 'network', 'debug', 'migration_product'
+            'preserve',
+            'soft_reboot',
+            'network',
+            'debug',
+            'migration_product',
         ]
 
     def test_merge_config_dicts(self):

test/unit/migration_target_test.py

@@ -30,7 +30,7 @@ def test_get_migration_target_no_migration_image_found(
         mock_os_path_isfile.return_value = False
         assert MigrationTarget.get_migration_target() == {
             'identifier': 'SLES',
-            'version': '15.4',
+            'version': '15.7',
             'arch': 'x86_64',
         }
 
@@ -49,10 +49,52 @@ def test_get_migration_target_sles15(
         mock_os_path_isfile.return_value = False
         assert MigrationTarget.get_migration_target() == {
             'identifier': 'SLES',
+            'version': '15.7',
+            'arch': 'x86_64',
+        }
+
+    @patch('platform.machine')
+    @patch('os.path.isfile')
+    @patch('suse_migration_services.migration_target.glob')
+    @patch('suse_migration_services.migration_target.MigrationConfig')
+    def test_get_migration_target_sles_sap15(
+        self, mock_MigrationConfig, mock_glob, mock_os_path_isfile, mock_platform_machine
+    ):
+        migration_config = Mock()
+        migration_config.config_data = {}
+        mock_MigrationConfig.return_value = migration_config
+        mock_platform_machine.return_value = 'x86_64'
+        mock_glob.return_value = [
+            '/migration-image/SLES15-SAP_Migration.x86_64-2.1.9-Build6.64.99.iso'
+        ]
+        mock_os_path_isfile.return_value = False
+        assert MigrationTarget.get_migration_target() == {
+            'identifier': 'SLES_SAP',
             'version': '15.4',
             'arch': 'x86_64',
         }
 
+    @patch('platform.machine')
+    @patch('os.path.isfile')
+    @patch('suse_migration_services.migration_target.glob')
+    @patch('suse_migration_services.migration_target.MigrationConfig')
+    def test_get_migration_target_sles_sap16(
+        self, mock_MigrationConfig, mock_glob, mock_os_path_isfile, mock_platform_machine
+    ):
+        migration_config = Mock()
+        migration_config.config_data = {}
+        mock_MigrationConfig.return_value = migration_config
+        mock_platform_machine.return_value = 'x86_64'
+        mock_glob.return_value = [
+            '/migration-image/SLES16-SAP_Migration.x86_64-2.1.9-Build6.64.99.iso'
+        ]
+        mock_os_path_isfile.return_value = False
+        assert MigrationTarget.get_migration_target() == {
+            'identifier': 'SLES_SAP',
+            'version': '16.0',
+            'arch': 'x86_64',
+        }
+
     @patch('platform.machine')
     @patch('os.path.isfile')
     @patch('suse_migration_services.migration_target.glob')

test/unit/pre_checks_test.py

@@ -21,6 +21,7 @@
 from suse_migration_services.exceptions import DistMigrationCommandException
 from suse_migration_services.defaults import Defaults
 from suse_migration_services.migration_target import MigrationTarget
+from suse_migration_services.prechecks.scc import get_registration_server_url
 
 
 @patch('suse_migration_services.logger.Logger.setup')
@@ -632,6 +633,13 @@ def test_check_lsm_migration_apparmor_disabled(
             check_lsm.check_lsm(migration_system=False)
             assert 'AppArmor disabled' in self._caplog.text
 
+    @patch('os.path.isfile')
+    def test_check_scc_migration_default_registration_server_url(
+        self, mock_os_path_isfile, mock_os_geteuid, mock_log
+    ):
+        mock_os_path_isfile.return_value = False
+        assert get_registration_server_url() == 'https://scc.suse.com'
+
     @patch('yaml.safe_load')
     @patch('glob.glob')
     @patch('os.path.isfile')

test/unit/units/reboot_test.py

@@ -58,7 +58,9 @@ def skip_device(device):
         fstab_mock.get_devices.return_value = fstab.get_devices()
         mock_Fstab.return_value = fstab_mock
         mock_get_migration_config_file.return_value = '../data/migration-config.yml'
-        mock_get_system_migration_custom_config_file.return_value = '../data/migration-config-soft-reboot.yml'
+        mock_get_system_migration_custom_config_file.return_value = (
+            '../data/migration-config-soft-reboot.yml'
+        )
         main()
         assert mock_Command_run.call_args_list == [
             call(['systemctl', 'stop', 'suse-migration-console-log'], raise_on_error=False),