Support cpu.hyper-threading hw requirement for mrack (teemtee#2953)

The-Mule · Oct 14, 2024 · 480634b · 480634b
1 parent 71b1582
commit 480634b
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/tests/unit/provision/mrack/test_hw.py b/tests/unit/provision/mrack/test_hw.py
@@ -132,9 +132,17 @@ def test_maximal_constraint(root_logger: Logger) -> None:
  '_value': 'smep'
  }
  }
- }
+ },
  ]
- }
+ },
+ {
+ 'cpu': {
+ 'hyper': {
+ '_op': '==',
+ '_value': 'True'
+ }
+ }
+ },
  ]
  },
  {

diff --git a/tests/unit/test_hardware.py b/tests/unit/test_hardware.py
@@ -189,6 +189,7 @@ def test_normalize_invalid_hardware(
  - avx
  - "= avx2"
  - "!= smep"
+ hyper-threading: true
  device:
  device-name: '~ .*Thunderbolt.*'
  device: 79
@@ -263,6 +264,7 @@ def test_parse_maximal_constraint() -> None:
  - cpu.flag: contains avx
  - cpu.flag: contains avx2
  - cpu.flag: not contains smep
+ - cpu.hyper-threading: == True
  - and:
  - device.vendor: '> 97'
  - device.device: == 79

diff --git a/tmt/steps/provision/mrack.py b/tmt/steps/provision/mrack.py
@@ -277,6 +277,18 @@ def _transform_cpu_model_name(
  children=[MrackHWBinOp('model_name', beaker_operator, actual_value)])
 
 
+def _transform_cpu_hyper_threading(
+ constraint: tmt.hardware.FlagConstraint,
+ logger: tmt.log.Logger) -> MrackBaseHWElement:
+ beaker_operator, actual_value, _ = operator_to_beaker_op(
+ constraint.operator,
+ str(constraint.value))
+
+ return MrackHWGroup(
+ 'cpu',
+ children=[MrackHWBinOp('hyper', beaker_operator, actual_value)])
+
+
 def _transform_disk_driver(
  constraint: tmt.hardware.TextConstraint,
  logger: tmt.log.Logger) -> MrackBaseHWElement:
@@ -471,6 +483,7 @@ def _transform_system_numa_nodes(
 
 _CONSTRAINT_TRANSFORMERS: Mapping[str, ConstraintTransformer] = {
  'cpu.flag': _transform_cpu_flag, # type: ignore[dict-item]
+ 'cpu.hyper_threading': _transform_cpu_hyper_threading, # type: ignore[dict-item]
  'cpu.model': _transform_cpu_model, # type: ignore[dict-item]
  'cpu.processors': _transform_cpu_processors, # type: ignore[dict-item]
  'cpu.cores': _transform_cpu_cores, # type: ignore[dict-item]