squash: update

spec/hardware/cpu.fmf

@@ -41,8 +41,8 @@ description: |
           # Number or string, an ID of CPU vendor.
           vendor: 1234|"> 1234"
 
-          # Integer or string, CPU speed.
-          speed: 2300|">= 2300"
+          # Float or string, CPU frequency.
+          frequency: 2300.0|">= 2300.0"
 
           # Integer or string, CPU stepping.
           stepping: 10|">= 10"

tests/unit/test_hardware.py

@@ -192,7 +192,7 @@ def test_normalize_invalid_hardware(
             - "= avx2"
             - "!= smep"
         hyper-threading: true
-        speed: ">= 2300"
+        frequency: ">= 2300.0"
     device:
       device-name: '~ .*Thunderbolt.*'
       device: 79
@@ -261,7 +261,7 @@ def test_parse_maximal_constraint() -> None:
               - cpu.family: < 6
               - cpu.vendor: == 32902
               - cpu.stepping: '!= 10'
-              - cpu.speed: '>= 2300'
+              - cpu.frequency: '>= 2300.0 megahertz'
               - cpu.family-name: == Skylake
               - cpu.model-name: '!~ Haswell'
               - cpu.vendor-name: ~ Intel.*

tmt/hardware.py

@@ -701,8 +701,8 @@ def from_specification(
             )
 
 
-class NumberConstraint(Constraint[int]):
-    """ A constraint representing a dimension-less number """
+class IntegerConstraint(Constraint[int]):
+    """ A constraint representing a dimension-less int number """
 
     @classmethod
     def from_specification(
@@ -713,7 +713,7 @@ def from_specification(
             allowed_operators: Optional[list[Operator]] = None
             ) -> T:
 
-        def _cast_number(raw_value: Any) -> int:
+        def _cast_int(raw_value: Any) -> int:
             if isinstance(raw_value, int):
                 return raw_value
 
@@ -731,12 +731,50 @@ def _cast_number(raw_value: Any) -> int:
             name,
             raw_value,
             as_quantity=False,
-            as_cast=_cast_number,
+            as_cast=_cast_int,
             original_constraint=original_constraint,
             allowed_operators=allowed_operators
             )
 
 
+class NumberConstraint(Constraint[float]):
+    """ A constraint representing a dimension-less float number """
+
+    @classmethod
+    def from_specification(
+            cls: type[T],
+            name: str,
+            raw_value: str,
+            original_constraint: Optional['Constraint[Any]'] = None,
+            allowed_operators: Optional[list[Operator]] = None,
+            default_unit: Optional[Any] = 'MHz'
+            ) -> T:
+
+        def _cast_number(raw_value: Any) -> float:
+            if isinstance(raw_value, float):
+                return raw_value
+
+            if isinstance(raw_value, str):
+                raw_value = raw_value.strip()
+
+                if raw_value.startswith('0x'):
+                    return float(raw_value, base=16)
+
+                return float(raw_value)
+
+            raise SpecificationError(f"Could not convert '{raw_value}' to a number.")
+
+        return cls._from_specification(
+            name,
+            raw_value,
+            as_quantity=True,
+            as_cast=_cast_number,
+            original_constraint=original_constraint,
+            allowed_operators=allowed_operators,
+            default_unit=default_unit
+            )
+
+
 class TextConstraint(Constraint[str]):
     """ A constraint representing a string, e.g. a name """
 
@@ -904,11 +942,28 @@ def wrapper(spec: Spec, index: int) -> BaseConstraint:
     return wrapper
 
 
-def _parse_number_constraints(
+def _parse_int_constraints(
+        spec: Spec,
+        prefix: str,
+        constraint_keys: tuple[str, ...]) -> list[BaseConstraint]:
+    """ Parse number-like constraints defined by a given set of keys, to int """
+
+    return [
+        IntegerConstraint.from_specification(
+            f'{prefix}.{constraint_name.replace("-", "_")}',
+            str(spec[constraint_name]),
+            allowed_operators=[
+                Operator.EQ, Operator.NEQ, Operator.LT, Operator.LTE, Operator.GT, Operator.GTE])
+        for constraint_name in constraint_keys
+        if constraint_name in spec
+        ]
+
+
+def _parse_float_constraints(
         spec: Spec,
         prefix: str,
         constraint_keys: tuple[str, ...]) -> list[BaseConstraint]:
-    """ Parse number-like constraints defined by a given set of keys """
+    """ Parse number-like constraints defined by a given set of keys, to float """
 
     return [
         NumberConstraint.from_specification(
@@ -998,7 +1053,7 @@ def _parse_device_core(
     if include_driver:
         text_constraints = (*text_constraints, 'driver')
 
-    group.constraints += _parse_number_constraints(spec, device_prefix, number_constraints)
+    group.constraints += _parse_int_constraints(spec, device_prefix, number_constraints)
     group.constraints += _parse_text_constraints(spec, device_prefix, text_constraints)
 
     return group
@@ -1084,7 +1139,7 @@ def _parse_cpu(spec: Spec) -> BaseConstraint:
 
     group = And()
 
-    group.constraints += _parse_number_constraints(
+    group.constraints += _parse_int_constraints(
         spec,
         'cpu',
         (
@@ -1098,7 +1153,14 @@ def _parse_cpu(spec: Spec) -> BaseConstraint:
             'family',
             'vendor',
             'stepping',
-            'speed'
+            )
+        )
+
+    group.constraints += _parse_float_constraints(
+        spec,
+        'cpu',
+        (
+            'frequency',
             )
         )
 
@@ -1259,7 +1321,7 @@ def _parse_system(spec: Spec) -> BaseConstraint:
         include_driver=False,
         include_device=False)
 
-    group.constraints += _parse_number_constraints(spec, 'system', ('model', 'numa-nodes'))
+    group.constraints += _parse_int_constraints(spec, 'system', ('model', 'numa-nodes'))
     group.constraints += _parse_text_constraints(spec, 'system', ('model-name',))
 
     return group

tmt/schemas/provision/hardware.yaml

@@ -96,6 +96,10 @@ definitions:
           - type: integer
       model-name:
         type: string
+      frequency:
+        anyOf:
+          - type: string
+          - type: number
       stepping:
         anyOf:
           - type: string

tmt/steps/provision/mrack.py

@@ -244,7 +244,7 @@ def _transform_cpu_flag(
 
 
 def _transform_cpu_model(
-        constraint: tmt.hardware.NumberConstraint,
+        constraint: tmt.hardware.IntegerConstraint,
         logger: tmt.log.Logger) -> MrackBaseHWElement:
     beaker_operator, actual_value, _ = operator_to_beaker_op(
         constraint.operator,
@@ -256,7 +256,7 @@ def _transform_cpu_model(
 
 
 def _transform_cpu_processors(
-        constraint: tmt.hardware.NumberConstraint,
+        constraint: tmt.hardware.IntegerConstraint,
         logger: tmt.log.Logger) -> MrackBaseHWElement:
     beaker_operator, actual_value, _ = operator_to_beaker_op(
         constraint.operator,
@@ -268,7 +268,7 @@ def _transform_cpu_processors(
 
 
 def _transform_cpu_cores(
-        constraint: tmt.hardware.NumberConstraint,
+        constraint: tmt.hardware.IntegerConstraint,
         logger: tmt.log.Logger) -> MrackBaseHWElement:
     beaker_operator, actual_value, _ = operator_to_beaker_op(
         constraint.operator,
@@ -298,7 +298,7 @@ def _transform_cpu_model_name(
 
 
 def _transform_cpu_stepping(
-        constraint: tmt.hardware.NumberConstraint,
+        constraint: tmt.hardware.IntegerConstraint,
         logger: tmt.log.Logger) -> MrackBaseHWElement:
     beaker_operator, actual_value, _ = operator_to_beaker_op(
         constraint.operator,
@@ -568,7 +568,7 @@ def _transform_location_lab_controller(
 
 
 def _transform_system_numa_nodes(
-        constraint: tmt.hardware.NumberConstraint,
+        constraint: tmt.hardware.IntegerConstraint,
         logger: tmt.log.Logger) -> MrackBaseHWElement:
     beaker_operator, actual_value, _ = operator_to_beaker_op(
         constraint.operator,

tmt/steps/provision/testcloud.py

@@ -556,7 +556,7 @@ def _apply_hw_cpu_processors(
     cpu_processors_constraints = [
         constraint
         for constraint in variant
-        if isinstance(constraint, tmt.hardware.NumberConstraint)
+        if isinstance(constraint, tmt.hardware.IntegerConstraint)
         and constraint.expand_name().name == 'cpu'
         and constraint.expand_name().child_name == 'processors']