From ad9b2ae552b6c36d78a445dbbcfcc179afd1d839 Mon Sep 17 00:00:00 2001 From: Matej Matuska Date: Thu, 21 Aug 2025 14:23:55 +0200 Subject: [PATCH 44/55] scancpu: Remove non-JSON ("txt") lscpu output support This was only used on RHEL 7. - Remove txt test files - Remove empty_field test - IIRC it's not possible to have and empty field in JSON lscpu output, there would be null --- .../actors/scancpu/libraries/scancpu.py | 11 ++--- .../scancpu/tests/files/{json => }/invalid | 0 .../tests/files/{json => }/lscpu_aarch64 | 0 .../tests/files/{json => }/lscpu_ppc64le | 0 .../tests/files/{json => }/lscpu_s390x | 0 .../tests/files/{json => }/lscpu_x86_64 | 0 .../scancpu/tests/files/txt/lscpu_aarch64 | 25 ----------- .../scancpu/tests/files/txt/lscpu_empty_field | 4 -- .../scancpu/tests/files/txt/lscpu_ppc64le | 15 ------- .../scancpu/tests/files/txt/lscpu_s390x | 26 ------------ .../scancpu/tests/files/txt/lscpu_x86_64 | 36 ---------------- .../actors/scancpu/tests/test_scancpu.py | 42 ++----------------- 12 files changed, 7 insertions(+), 152 deletions(-) rename repos/system_upgrade/common/actors/scancpu/tests/files/{json => }/invalid (100%) rename repos/system_upgrade/common/actors/scancpu/tests/files/{json => }/lscpu_aarch64 (100%) rename repos/system_upgrade/common/actors/scancpu/tests/files/{json => }/lscpu_ppc64le (100%) rename repos/system_upgrade/common/actors/scancpu/tests/files/{json => }/lscpu_s390x (100%) rename repos/system_upgrade/common/actors/scancpu/tests/files/{json => }/lscpu_x86_64 (100%) delete mode 100644 repos/system_upgrade/common/actors/scancpu/tests/files/txt/lscpu_aarch64 delete mode 100644 repos/system_upgrade/common/actors/scancpu/tests/files/txt/lscpu_empty_field delete mode 100644 repos/system_upgrade/common/actors/scancpu/tests/files/txt/lscpu_ppc64le delete mode 100644 repos/system_upgrade/common/actors/scancpu/tests/files/txt/lscpu_s390x delete mode 100644 repos/system_upgrade/common/actors/scancpu/tests/files/txt/lscpu_x86_64 diff --git a/repos/system_upgrade/common/actors/scancpu/libraries/scancpu.py b/repos/system_upgrade/common/actors/scancpu/libraries/scancpu.py index db3f92d4..ecc23349 100644 --- a/repos/system_upgrade/common/actors/scancpu/libraries/scancpu.py +++ b/repos/system_upgrade/common/actors/scancpu/libraries/scancpu.py @@ -2,17 +2,15 @@ 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[^:]+):[^\S\n]+(?P.+)\n?', flags=re.MULTILINE) PPC64LE_MODEL = re.compile(r'\d+\.\d+ \(pvr (?P[0-9a-fA-F]+) 0*[0-9a-fA-F]+\)') -def _get_lscpu_output(output_json=False): +def _get_lscpu_output(): try: - result = run(['lscpu'] + (['-J'] if output_json else [])) + result = run(['lscpu', '-J']) return result.get('stdout', '') except (OSError, CalledProcessError): api.current_logger().debug('Executing `lscpu` failed', exc_info=True) @@ -20,10 +18,7 @@ def _get_lscpu_output(output_json=False): def _parse_lscpu_output(): - if get_source_major_version() == '7': - return dict(LSCPU_NAME_VALUE.findall(_get_lscpu_output())) - - lscpu = _get_lscpu_output(output_json=True) + lscpu = _get_lscpu_output() try: parsed_json = json.loads(lscpu) # The json contains one entry "lscpu" which is a list of dictionaries diff --git a/repos/system_upgrade/common/actors/scancpu/tests/files/json/invalid b/repos/system_upgrade/common/actors/scancpu/tests/files/invalid similarity index 100% rename from repos/system_upgrade/common/actors/scancpu/tests/files/json/invalid rename to repos/system_upgrade/common/actors/scancpu/tests/files/invalid diff --git a/repos/system_upgrade/common/actors/scancpu/tests/files/json/lscpu_aarch64 b/repos/system_upgrade/common/actors/scancpu/tests/files/lscpu_aarch64 similarity index 100% rename from repos/system_upgrade/common/actors/scancpu/tests/files/json/lscpu_aarch64 rename to repos/system_upgrade/common/actors/scancpu/tests/files/lscpu_aarch64 diff --git a/repos/system_upgrade/common/actors/scancpu/tests/files/json/lscpu_ppc64le b/repos/system_upgrade/common/actors/scancpu/tests/files/lscpu_ppc64le similarity index 100% rename from repos/system_upgrade/common/actors/scancpu/tests/files/json/lscpu_ppc64le rename to repos/system_upgrade/common/actors/scancpu/tests/files/lscpu_ppc64le diff --git a/repos/system_upgrade/common/actors/scancpu/tests/files/json/lscpu_s390x b/repos/system_upgrade/common/actors/scancpu/tests/files/lscpu_s390x similarity index 100% rename from repos/system_upgrade/common/actors/scancpu/tests/files/json/lscpu_s390x rename to repos/system_upgrade/common/actors/scancpu/tests/files/lscpu_s390x diff --git a/repos/system_upgrade/common/actors/scancpu/tests/files/json/lscpu_x86_64 b/repos/system_upgrade/common/actors/scancpu/tests/files/lscpu_x86_64 similarity index 100% rename from repos/system_upgrade/common/actors/scancpu/tests/files/json/lscpu_x86_64 rename to repos/system_upgrade/common/actors/scancpu/tests/files/lscpu_x86_64 diff --git a/repos/system_upgrade/common/actors/scancpu/tests/files/txt/lscpu_aarch64 b/repos/system_upgrade/common/actors/scancpu/tests/files/txt/lscpu_aarch64 deleted file mode 100644 index 3b9619ef..00000000 --- a/repos/system_upgrade/common/actors/scancpu/tests/files/txt/lscpu_aarch64 +++ /dev/null @@ -1,25 +0,0 @@ -Architecture: aarch64 -Byte Order: Little Endian -CPU(s): 160 -On-line CPU(s) list: 0-159 -Thread(s) per core: 1 -Core(s) per socket: 80 -Socket(s): 2 -NUMA node(s): 4 -Vendor ID: ARM -BIOS Vendor ID: Ampere(R) -Model: 1 -Model name: Neoverse-N1 -BIOS Model name: Ampere(R) Altra(R) Processor -Stepping: r3p1 -CPU max MHz: 3000.0000 -CPU min MHz: 1000.0000 -BogoMIPS: 50.00 -L1d cache: 64K -L1i cache: 64K -L2 cache: 1024K -NUMA node0 CPU(s): 0-79 -NUMA node1 CPU(s): 80-159 -NUMA node2 CPU(s): -NUMA node3 CPU(s): -Flags: fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics fphp asimdhp cpuid asimdrdm lrcpc dcpop asimddp ssbs diff --git a/repos/system_upgrade/common/actors/scancpu/tests/files/txt/lscpu_empty_field b/repos/system_upgrade/common/actors/scancpu/tests/files/txt/lscpu_empty_field deleted file mode 100644 index f830b7fe..00000000 --- a/repos/system_upgrade/common/actors/scancpu/tests/files/txt/lscpu_empty_field +++ /dev/null @@ -1,4 +0,0 @@ -Empyt 1: -Empyt 2: -Empyt 3: -Flags: flag diff --git a/repos/system_upgrade/common/actors/scancpu/tests/files/txt/lscpu_ppc64le b/repos/system_upgrade/common/actors/scancpu/tests/files/txt/lscpu_ppc64le deleted file mode 100644 index 07d2ed65..00000000 --- a/repos/system_upgrade/common/actors/scancpu/tests/files/txt/lscpu_ppc64le +++ /dev/null @@ -1,15 +0,0 @@ -Architecture: ppc64le -Byte Order: Little Endian -CPU(s): 8 -On-line CPU(s) list: 0-7 -Thread(s) per core: 1 -Core(s) per socket: 1 -Socket(s): 8 -NUMA node(s): 1 -Model: 2.1 (pvr 004b 0201) -Model name: POWER8E (raw), altivec supported -Hypervisor vendor: KVM -Virtualization type: para -L1d cache: 64K -L1i cache: 32K -NUMA node0 CPU(s): 0-7 diff --git a/repos/system_upgrade/common/actors/scancpu/tests/files/txt/lscpu_s390x b/repos/system_upgrade/common/actors/scancpu/tests/files/txt/lscpu_s390x deleted file mode 100644 index 2c0de9f9..00000000 --- a/repos/system_upgrade/common/actors/scancpu/tests/files/txt/lscpu_s390x +++ /dev/null @@ -1,26 +0,0 @@ -Architecture: s390x -CPU op-mode(s): 32-bit, 64-bit -Byte Order: Big Endian -CPU(s): 4 -On-line CPU(s) list: 0-3 -Thread(s) per core: 1 -Core(s) per socket: 1 -Socket(s) per book: 1 -Book(s) per drawer: 1 -Drawer(s): 4 -NUMA node(s): 1 -Vendor ID: IBM/S390 -Machine type: 3931 -CPU dynamic MHz: 5200 -CPU static MHz: 5200 -BogoMIPS: 3331.00 -Hypervisor: KVM/Linux -Hypervisor vendor: KVM -Virtualization type: full -Dispatching mode: horizontal -L1d cache: 128K -L1i cache: 128K -L2 cache: 32768K -L3 cache: 262144K -NUMA node0 CPU(s): 0-3 -Flags: esan3 zarch stfle msa ldisp eimm dfp edat etf3eh highgprs te vx vxd vxe gs vxe2 vxp sort dflt vxp2 nnpa sie diff --git a/repos/system_upgrade/common/actors/scancpu/tests/files/txt/lscpu_x86_64 b/repos/system_upgrade/common/actors/scancpu/tests/files/txt/lscpu_x86_64 deleted file mode 100644 index a1dc1035..00000000 --- a/repos/system_upgrade/common/actors/scancpu/tests/files/txt/lscpu_x86_64 +++ /dev/null @@ -1,36 +0,0 @@ -Architecture: x86_64 -CPU op-mode(s): 32-bit, 64-bit -Address sizes: 46 bits physical, 48 bits virtual -Byte Order: Little Endian -CPU(s): 48 -On-line CPU(s) list: 0-47 -Vendor ID: GenuineIntel -Model name: Intel(R) Xeon(R) CPU E5-2670 v3 @ 2.30GHz -CPU family: 6 -Model: 63 -Thread(s) per core: 2 -Core(s) per socket: 12 -Socket(s): 2 -Stepping: 2 -CPU(s) scaling MHz: 44% -CPU max MHz: 3100.0000 -CPU min MHz: 1200.0000 -BogoMIPS: 4599.83 -Flags: 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 -Virtualization: VT-x -L1d cache: 768 KiB (24 instances) -L1i cache: 768 KiB (24 instances) -L2 cache: 6 MiB (24 instances) -L3 cache: 60 MiB (2 instances) -NUMA node(s): 2 -NUMA node0 CPU(s): 0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,42,44,46 -NUMA node1 CPU(s): 1,3,5,7,9,11,13,15,17,19,21,23,25,27,29,31,33,35,37,39,41,43,45,47 -Vulnerability Itlb multihit: KVM: Mitigation: VMX disabled -Vulnerability L1tf: Mitigation; PTE Inversion; VMX conditional cache flushes, SMT vulnerable -Vulnerability Mds: Mitigation; Clear CPU buffers; SMT vulnerable -Vulnerability Meltdown: Mitigation; PTI -Vulnerability Spec store bypass: Mitigation; Speculative Store Bypass disabled via prctl and seccomp -Vulnerability Spectre v1: Mitigation; usercopy/swapgs barriers and __user pointer sanitization -Vulnerability Spectre v2: Mitigation; Full generic retpoline, IBPB conditional, IBRS_FW, STIBP conditional, RSB filling -Vulnerability Srbds: Not affected -Vulnerability Tsx async abort: Not affected diff --git a/repos/system_upgrade/common/actors/scancpu/tests/test_scancpu.py b/repos/system_upgrade/common/actors/scancpu/tests/test_scancpu.py index be0802ba..3605ebe7 100644 --- a/repos/system_upgrade/common/actors/scancpu/tests/test_scancpu.py +++ b/repos/system_upgrade/common/actors/scancpu/tests/test_scancpu.py @@ -61,29 +61,20 @@ class mocked_get_cpuinfo: def __init__(self, filename): self.filename = filename - def __call__(self, output_json=False): + def __call__(self): """ Return lines of the self.filename test file located in the files directory. Those files contain /proc/cpuinfo content from several machines. """ - - 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) + filename = os.path.join(CUR_DIR, 'files', self.filename) with open(filename, 'r') as fp: return '\n'.join(fp.read().splitlines()) @pytest.mark.parametrize("arch", ARCH_SUPPORTED) -@pytest.mark.parametrize("version", ['7', '8']) -def test_scancpu(monkeypatch, arch, version): - - monkeypatch.setattr('leapp.libraries.actor.scancpu.get_source_major_version', lambda: version) +def test_scancpu(monkeypatch, arch): mocked_cpuinfo = mocked_get_cpuinfo('lscpu_' + arch) monkeypatch.setattr(scancpu, '_get_lscpu_output', mocked_cpuinfo) @@ -106,34 +97,9 @@ def test_scancpu(monkeypatch, arch, version): 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', produce_mocked()) - current_actor = 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) - - def test_parse_invalid_json(monkeypatch): - monkeypatch.setattr('leapp.libraries.actor.scancpu.get_source_major_version', lambda: '8') - - def mocked_cpuinfo(*args, **kwargs): - return mocked_get_cpuinfo('invalid')(output_json=True) - + mocked_cpuinfo = mocked_get_cpuinfo('invalid') monkeypatch.setattr(scancpu, '_get_lscpu_output', mocked_cpuinfo) monkeypatch.setattr(api, 'produce', produce_mocked()) monkeypatch.setattr(api, 'current_logger', logger_mocked()) -- 2.51.1