Fix incorrect lscpu parsing

Fixes #1182

repos/system_upgrade/common/actors/scancpu/libraries/scancpu.py

@@ -1,22 +1,33 @@
+import json
 import re
 
 from leapp.libraries.common.config import architecture
+from leapp.libraries.common.config.version import get_source_major_version
 from leapp.libraries.stdlib import api, CalledProcessError, run
 from leapp.models import CPUInfo, DetectedDeviceOrDriver, DeviceDriverDeprecationData
 
-LSCPU_NAME_VALUE = re.compile(r'(?P<name>[^:]+):\s+(?P<value>.+)\n?')
+LSCPU_NAME_VALUE = re.compile(r'(?P<name>[^:]+):[^\S\n]+(?P<value>.+)\n?')
 PPC64LE_MODEL = re.compile(r'\d+\.\d+ \(pvr (?P<family>[0-9a-fA-F]+) 0*[0-9a-fA-F]+\)')
 
 
-def _get_lscpu_output():
+def _get_lscpu_output(output_json=False):
     try:
-        result = run(['lscpu'])
+        result = run(['lscpu', '-J' if output_json else ''])
         return result.get('stdout', '')
     except (OSError, CalledProcessError):
         api.current_logger().debug('Executing `lscpu` failed', exc_info=True)
     return ''
 
 
+def _parse_lscpu_output():
+    if get_source_major_version() == '7':
+        return dict(LSCPU_NAME_VALUE.findall(_get_lscpu_output()))
+
+    parsed_json = json.loads(_get_lscpu_output(output_json=True))
+    ans = dict((entry['field'].rstrip(':'), entry['data']) for entry in parsed_json['lscpu'])
+    return ans
+
+
 def _get_cpu_flags(lscpu):
     flags = lscpu.get('Flags', '')
     return flags.split()
@@ -138,7 +149,8 @@ def _find_deprecation_data_entries(lscpu):
 
 
 def process():
-    lscpu = dict(LSCPU_NAME_VALUE.findall(_get_lscpu_output()))
+
+    lscpu = _parse_lscpu_output()
     api.produce(*_find_deprecation_data_entries(lscpu))
     # Backwards compatibility
     machine_type = lscpu.get('Machine type')

repos/system_upgrade/common/actors/scancpu/tests/files/json/lscpu_aarch64

@@ -0,0 +1,31 @@
+{
+   "lscpu": [
+      {"field": "Architecture:", "data": "x86_64"},
+      {"field": "CPU op-mode(s):", "data": "32-bit, 64-bit"},
+      {"field": "Byte Order:", "data": "Little Endian"},
+      {"field": "CPU(s):", "data": "2"},
+      {"field": "On-line CPU(s) list:", "data": "0,1"},
+      {"field": "Thread(s) per core:", "data": "1"},
+      {"field": "Core(s) per socket:", "data": "1"},
+      {"field": "Socket(s):", "data": "2"},
+      {"field": "NUMA node(s):", "data": "1"},
+      {"field": "Vendor ID:", "data": "GenuineIntel"},
+      {"field": "BIOS Vendor ID:", "data": "QEMU"},
+      {"field": "CPU family:", "data": "6"},
+      {"field": "Model:", "data": "165"},
+      {"field": "Model name:", "data": "Intel(R) Core(TM) i7-10850H CPU @ 2.70GHz"},
+      {"field": "BIOS Model name:", "data": "pc-i440fx-7.2"},
+      {"field": "Stepping:", "data": "2"},
+      {"field": "CPU MHz:", "data": "2712.006"},
+      {"field": "BogoMIPS:", "data": "5424.01"},
+      {"field": "Virtualization:", "data": "VT-x"},
+      {"field": "Hypervisor vendor:", "data": "KVM"},
+      {"field": "Virtualization type:", "data": "full"},
+      {"field": "L1d cache:", "data": "32K"},
+      {"field": "L1i cache:", "data": "32K"},
+      {"field": "L2 cache:", "data": "4096K"},
+      {"field": "L3 cache:", "data": "16384K"},
+      {"field": "NUMA node0 CPU(s):", "data": "0,1"},
+      {"field": "Flags:", "data": "fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ss syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon rep_good nopl xtopology cpuid tsc_known_freq pni pclmulqdq vmx ssse3 fma cx16 pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand hypervisor lahf_lm abm 3dnowprefetch cpuid_fault invpcid_single ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves arat umip pku ospke md_clear arch_capabilities"}
+   ]
+}

repos/system_upgrade/common/actors/scancpu/tests/files/json/lscpu_ppc64le

@@ -0,0 +1,31 @@
+{
+   "lscpu": [
+      {"field": "Architecture:", "data": "x86_64"},
+      {"field": "CPU op-mode(s):", "data": "32-bit, 64-bit"},
+      {"field": "Byte Order:", "data": "Little Endian"},
+      {"field": "CPU(s):", "data": "2"},
+      {"field": "On-line CPU(s) list:", "data": "0,1"},
+      {"field": "Thread(s) per core:", "data": "1"},
+      {"field": "Core(s) per socket:", "data": "1"},
+      {"field": "Socket(s):", "data": "2"},
+      {"field": "NUMA node(s):", "data": "1"},
+      {"field": "Vendor ID:", "data": "GenuineIntel"},
+      {"field": "BIOS Vendor ID:", "data": "QEMU"},
+      {"field": "CPU family:", "data": "6"},
+      {"field": "Model:", "data": "165"},
+      {"field": "Model name:", "data": "Intel(R) Core(TM) i7-10850H CPU @ 2.70GHz"},
+      {"field": "BIOS Model name:", "data": "pc-i440fx-7.2"},
+      {"field": "Stepping:", "data": "2"},
+      {"field": "CPU MHz:", "data": "2712.006"},
+      {"field": "BogoMIPS:", "data": "5424.01"},
+      {"field": "Virtualization:", "data": "VT-x"},
+      {"field": "Hypervisor vendor:", "data": "KVM"},
+      {"field": "Virtualization type:", "data": "full"},
+      {"field": "L1d cache:", "data": "32K"},
+      {"field": "L1i cache:", "data": "32K"},
+      {"field": "L2 cache:", "data": "4096K"},
+      {"field": "L3 cache:", "data": "16384K"},
+      {"field": "NUMA node0 CPU(s):", "data": "0,1"},
+      {"field": "Flags:", "data": "fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ss syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon rep_good nopl xtopology cpuid tsc_known_freq pni pclmulqdq vmx ssse3 fma cx16 pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand hypervisor lahf_lm abm 3dnowprefetch cpuid_fault invpcid_single ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves arat umip pku ospke md_clear arch_capabilities"}
+   ]
+}

repos/system_upgrade/common/actors/scancpu/tests/files/json/lscpu_s390x

@@ -0,0 +1,31 @@
+{
+   "lscpu": [
+      {"field": "Architecture:", "data": "x86_64"},
+      {"field": "CPU op-mode(s):", "data": "32-bit, 64-bit"},
+      {"field": "Byte Order:", "data": "Little Endian"},
+      {"field": "CPU(s):", "data": "2"},
+      {"field": "On-line CPU(s) list:", "data": "0,1"},
+      {"field": "Thread(s) per core:", "data": "1"},
+      {"field": "Core(s) per socket:", "data": "1"},
+      {"field": "Socket(s):", "data": "2"},
+      {"field": "NUMA node(s):", "data": "1"},
+      {"field": "Vendor ID:", "data": "GenuineIntel"},
+      {"field": "BIOS Vendor ID:", "data": "QEMU"},
+      {"field": "CPU family:", "data": "6"},
+      {"field": "Model:", "data": "165"},
+      {"field": "Model name:", "data": "Intel(R) Core(TM) i7-10850H CPU @ 2.70GHz"},
+      {"field": "BIOS Model name:", "data": "pc-i440fx-7.2"},
+      {"field": "Stepping:", "data": "2"},
+      {"field": "CPU MHz:", "data": "2712.006"},
+      {"field": "BogoMIPS:", "data": "5424.01"},
+      {"field": "Virtualization:", "data": "VT-x"},
+      {"field": "Hypervisor vendor:", "data": "KVM"},
+      {"field": "Virtualization type:", "data": "full"},
+      {"field": "L1d cache:", "data": "32K"},
+      {"field": "L1i cache:", "data": "32K"},
+      {"field": "L2 cache:", "data": "4096K"},
+      {"field": "L3 cache:", "data": "16384K"},
+      {"field": "NUMA node0 CPU(s):", "data": "0,1"},
+      {"field": "Flags:", "data": "fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ss syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon rep_good nopl xtopology cpuid tsc_known_freq pni pclmulqdq vmx ssse3 fma cx16 pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand hypervisor lahf_lm abm 3dnowprefetch cpuid_fault invpcid_single ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves arat umip pku ospke md_clear arch_capabilities"}
+   ]
+}

repos/system_upgrade/common/actors/scancpu/tests/files/json/lscpu_x86_64

@@ -0,0 +1,31 @@
+{
+   "lscpu": [
+      {"field": "Architecture:", "data": "x86_64"},
+      {"field": "CPU op-mode(s):", "data": "32-bit, 64-bit"},
+      {"field": "Byte Order:", "data": "Little Endian"},
+      {"field": "CPU(s):", "data": "2"},
+      {"field": "On-line CPU(s) list:", "data": "0,1"},
+      {"field": "Thread(s) per core:", "data": "1"},
+      {"field": "Core(s) per socket:", "data": "1"},
+      {"field": "Socket(s):", "data": "2"},
+      {"field": "NUMA node(s):", "data": "1"},
+      {"field": "Vendor ID:", "data": "GenuineIntel"},
+      {"field": "BIOS Vendor ID:", "data": "QEMU"},
+      {"field": "CPU family:", "data": "6"},
+      {"field": "Model:", "data": "165"},
+      {"field": "Model name:", "data": "Intel(R) Core(TM) i7-10850H CPU @ 2.70GHz"},
+      {"field": "BIOS Model name:", "data": "pc-i440fx-7.2"},
+      {"field": "Stepping:", "data": "2"},
+      {"field": "CPU MHz:", "data": "2712.006"},
+      {"field": "BogoMIPS:", "data": "5424.01"},
+      {"field": "Virtualization:", "data": "VT-x"},
+      {"field": "Hypervisor vendor:", "data": "KVM"},
+      {"field": "Virtualization type:", "data": "full"},
+      {"field": "L1d cache:", "data": "32K"},
+      {"field": "L1i cache:", "data": "32K"},
+      {"field": "L2 cache:", "data": "4096K"},
+      {"field": "L3 cache:", "data": "16384K"},
+      {"field": "NUMA node0 CPU(s):", "data": "0,1"},
+      {"field": "Flags:", "data": "fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid dca sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid cqm xsaveopt cqm_llc cqm_occup_llc dtherm ida arat pln pts md_clear flush_l1d"}
+   ]
+}

repos/system_upgrade/common/actors/scancpu/tests/files/txt/lscpu_empty_field

@@ -0,0 +1,2 @@
+Architecture:                    
+Flags:                           flag

repos/system_upgrade/common/actors/scancpu/tests/test_scancpu.py

@@ -1,5 +1,4 @@
 import os
-
 import pytest
 
 from leapp.libraries.actor import scancpu
@@ -57,18 +56,28 @@ class mocked_get_cpuinfo(object):
     def __init__(self, filename):
         self.filename = filename
 
-    def __call__(self):
+    def __call__(self, output_json=False):
         """
         Return lines of the self.filename test file located in the files directory.
 
         Those files contain /proc/cpuinfo content from several machines.
         """
-        with open(os.path.join(CUR_DIR, 'files', self.filename), 'r') as fp:
+
+        filename = self.filename
+        if output_json:
+            filename = os.path.join('json', filename)
+        else:
+            filename = os.path.join('txt', filename)
+        filename = os.path.join(CUR_DIR, 'files', filename)
+
+        with open(filename, 'r') as fp:
             return '\n'.join(fp.read().splitlines())
 
 
-@pytest.mark.parametrize("arch", ARCH_SUPPORTED)
-def test_scancpu(monkeypatch, arch):
+@pytest.mark.parametrize("arch, version", [(arch, '7') for arch in ARCH_SUPPORTED] + [(ARCH_X86_64, '8')])
+def test_scancpu(monkeypatch, arch, version):
+
+    monkeypatch.setattr('leapp.libraries.actor.scancpu.get_source_major_version', lambda: version)
 
     mocked_cpuinfo = mocked_get_cpuinfo('lscpu_' + arch)
     monkeypatch.setattr(scancpu, '_get_lscpu_output', mocked_cpuinfo)
@@ -89,3 +98,24 @@ def test_scancpu(monkeypatch, arch):
 
     # Did not produce anything extra
     assert expected == produced
+
+
+def test_lscpu_with_empty_field(monkeypatch):
+
+    def mocked_cpuinfo(*args, **kwargs):
+        return mocked_get_cpuinfo('lscpu_empty_field')(output_json=False)
+
+    monkeypatch.setattr(scancpu, '_get_lscpu_output', mocked_cpuinfo)
+    monkeypatch.setattr(api, 'produce', testutils.produce_mocked())
+    current_actor = testutils.CurrentActorMocked()
+    monkeypatch.setattr(api, 'current_actor', current_actor)
+
+    scancpu.process()
+
+    expected = CPUInfo(machine_type=None, flags=['flag'])
+    produced = api.produce.model_instances[0]
+
+    assert api.produce.called == 1
+
+    assert expected.machine_type == produced.machine_type
+    assert sorted(expected.flags) == sorted(produced.flags)

repos/system_upgrade/el7toel8/actors/mytestdialog/actor.py

@@ -0,0 +1,44 @@
+import time
+from leapp.actors import Actor
+from leapp.dialogs import Dialog
+from leapp.dialogs.components import BooleanComponent
+from leapp.tags import ChecksPhaseTag, IPUWorkflowTag
+from leapp.libraries.stdlib import api
+
+
+class MyCustomQuestion(Actor):
+    """
+    Confirm suggested authselect call from AuthselectScanner.
+
+    AuthselectScanner produces an Authselect model that contains changes
+    that are suggested based on current configuration. This actor will
+    ask administrator for confirmation and will report the result.
+    """
+
+    name = 'time_check'
+    consumes = ()
+    produces = ()
+    tags = (IPUWorkflowTag, ChecksPhaseTag)
+    dialogs = (Dialog(scope='time_check',
+                      reason='Confirmation',
+                      components=(BooleanComponent(key='confirm',
+                                                   label='Is it lunchtime yet?',
+                                                   default=True,
+                                                   description='',
+                                                   reason='I am hungry.'),)),)
+
+    def process(self):
+        dialog = self.dialogs[0]
+
+        dialog.components[0].label += " {}".format(time.ctime())
+
+        result = self.get_answers(dialog).get('confirm')
+
+        api.current_logger().debug('Answer to whether there is lunch: {}'.format(result))
+
+        if result:
+            api.current_logger().warning('LUNCHTIME!')
+        elif result is False:
+            api.current_logger().warning('No lunch yet.')
+        else:
+            api.current_logger().warning('WHAT EVEN IS LUNCH? {}'.format(result))