check for migration target by matching ISO file name

Detecting migration target by querying RPMs might not work for all
versions, so we check by matching ISO file name instead.

Author: YoukouTenhouin

suse_migration_services/migration_target.py

@@ -20,9 +20,10 @@
 import yaml
 import os
 import platform
+from glob import glob
+from fnmatch import fnmatch
 
 from suse_migration_services.defaults import Defaults
-from suse_migration_services.command import Command
 
 log = logging.getLogger(Defaults.get_migration_log_name())
 
@@ -55,24 +56,22 @@ def get_migration_target():
                 'version': product[1],
                 'arch': product[2]
             }
-        sles15_migration = Command.run(
-            ['rpm', '-q', 'SLES15-Migration'], raise_on_error=False
-        )
-        if sles15_migration.returncode == 0:
+        migration_iso = glob('/migration-image/*-*Migration.*.iso')
+        if not migration_iso:
+            return {}
+        migration_iso = migration_iso[0]
+
+        if fnmatch(migration_iso, '*SLES16*-*Migration*.iso'):
             # return default migration target
             return {
                 'identifier': 'SLES',
-                'version': '15.3',
+                'version': '16.0',
                 'arch': platform.machine()
             }
-        sles16_migration = Command.run(
-            ['rpm', '-q', 'SLES16-Migration'], raise_on_error=False
-        )
-        if sles16_migration.returncode == 0:
+        else:
             # return default migration target
             return {
                 'identifier': 'SLES',
-                'version': '16.0',
+                'version': '15.4',
                 'arch': platform.machine()
             }
-        return {}

test/unit/migration_target_test.py

@@ -1,5 +1,5 @@
 from unittest.mock import (
-    patch, Mock
+    patch
 )
 
 from suse_migration_services.migration_target import MigrationTarget
@@ -8,35 +8,45 @@
 class TestMigrationTarget(object):
     @patch('platform.machine')
     @patch('os.path.isfile')
-    @patch('suse_migration_services.command.Command.run')
-    def test_get_migration_target(
-        self, mock_Command_run, mock_os_path_isfile,
+    @patch('suse_migration_services.migration_target.glob')
+    def test_get_migration_target_empty(
+        self, mock_glob, mock_os_path_isfile,
         mock_platform_machine
     ):
         mock_platform_machine.return_value = 'x86_64'
-        sles15_migration = Mock()
-        sles15_migration.returncode = 0
-        mock_Command_run.return_value = sles15_migration
+        mock_glob.return_value = []
+        mock_os_path_isfile.return_value = False
+        assert MigrationTarget.get_migration_target() == {}
+
+    @patch('platform.machine')
+    @patch('os.path.isfile')
+    @patch('suse_migration_services.migration_target.glob')
+    def test_get_migration_target_sles15(
+        self, mock_glob, mock_os_path_isfile,
+        mock_platform_machine
+    ):
+        mock_platform_machine.return_value = 'x86_64'
+        mock_glob.return_value = [
+            '/migration-image/SLES15-Migration.x86_64-2.1.9-Build6.64.99.iso'
+        ]
         mock_os_path_isfile.return_value = False
         assert MigrationTarget.get_migration_target() == {
             'identifier': 'SLES',
-            'version': '15.3',
+            'version': '15.4',
             'arch': 'x86_64'
         }
 
     @patch('platform.machine')
     @patch('os.path.isfile')
-    @patch('suse_migration_services.command.Command.run')
+    @patch('suse_migration_services.migration_target.glob')
     def test_get_migration_target_sles16(
-        self, mock_Command_run, mock_os_path_isfile,
+        self, mock_glob, mock_os_path_isfile,
         mock_platform_machine
     ):
+        mock_glob.return_value = [
+            '/migration-image/SLES16-Migration.x86_64-2.1.23-Build2.1.iso'
+        ]
         mock_platform_machine.return_value = 'x86_64'
-        sles15_migration_not_found = Mock()
-        sles15_migration_not_found.returncode = 1  # SLES15-Migration not found
-        sles16_migration_found = Mock()
-        sles16_migration_found.returncode = 0  # SLES16-Migration found
-        mock_Command_run.side_effect = [sles15_migration_not_found, sles16_migration_found]
         mock_os_path_isfile.return_value = False  # No /etc/sle-migration-service.yml
         assert MigrationTarget.get_migration_target() == {
             'identifier': 'SLES',

tools/run_migration

@@ -163,8 +163,8 @@ if ${is_sles16_migration}; then
     # SLE16 image panics on CPUs older than x86_64_v2 (i.e. x86_64) (bsc#1249593), so we need to
     # block migration before getting into the image.
     if [ "$(zypper system-architecture)" == "x86_64" ]; then
-	echo "CPU Architecture too old. Aborting migration."
-	exit 1
+        echo "CPU Architecture too old. Aborting migration."
+        exit 1
     fi
 
     # store snapper pre snapshot if available