Parse the disk.sector-size hardware requirement

spec/hardware/disk.fmf

@@ -16,6 +16,14 @@ description: |
            # String, disk driver requested.
          - driver: "well-known disk driver"
 
+           # Number or string, logical sector size.
+           # Bytes are assumed when no unit is specified.
+         - logical-sector-size: 512|">= 512"
+
+           # Number or string, physical sector size.
+           # Bytes are assumed when no unit is specified.
+         - physical-sector-size: 4096|">= 4096"
+
     The :ref:`/spec/plans/guest-topology` may include the following
     fields in its description of the actual guest hardware:
 
@@ -60,11 +68,13 @@ example:
         model-name: PERC H310
         driver: megaraid_sas
         block-device: /dev/sda
+        logical-sector-size: "512 byte"
 
       - size: 21474836480
         model-name: PERC H310
         driver: megaraid_sas
         block-device: /dev/sdb
+        physical-sector-size: "4096 byte"
 
 link:
   - implemented-by: /tmt/steps/provision/artemis.py

tests/unit/provision/mrack/test_hw.py

@@ -175,6 +175,7 @@ def test_maximal_constraint(root_logger: Logger) -> None:
                                         }
                                     }
                                 },
+                            {'or': []},
                             {
                                 'disk': {
                                     'model': {
@@ -195,6 +196,7 @@ def test_maximal_constraint(root_logger: Logger) -> None:
                                         }
                                     }
                                 },
+                            {'or': []},
                             {
                                 'key_value': {
                                     '_key': 'BOOTDISK',

tests/unit/test_hardware.py

@@ -198,8 +198,10 @@ def test_normalize_invalid_hardware(
     disk:
         - size: 40 GiB
           model-name: "~ WD 100G.*"
+          physical-sector-size: "4096 byte"
         - size: 120 GiB
           driver: virtblk
+          logical-sector-size: "512 byte"
     gpu:
         device-name: G86 [Quadro NVS 290]
         device: "97"
@@ -277,9 +279,11 @@ def test_parse_maximal_constraint() -> None:
           - and:
               - and:
                   - disk[0].size: == 40 GiB
+                  - disk[0].physical-sector-size: == 4096 B
                   - disk[0].model-name: ~ WD 100G.*
               - and:
                   - disk[1].size: == 120 GiB
+                  - disk[1].logical-sector-size: == 512 B
                   - disk[1].driver: == virtblk
           - and:
               - and:

tmt/hardware.py

@@ -936,7 +936,7 @@ def _parse_size_constraints(
 
     return [
         SizeConstraint.from_specification(
-            f'{prefix}.{constraint_name}',
+            f'{prefix}.{constraint_name.replace("-", "_")}',
             str(spec[constraint_name]),
             allowed_operators=[
                 Operator.EQ, Operator.NEQ, Operator.LT, Operator.LTE, Operator.GT, Operator.GTE])
@@ -1169,7 +1169,11 @@ def _parse_disk(spec: Spec, disk_index: int) -> BaseConstraint:
 
     group = And()
 
-    group.constraints += _parse_size_constraints(spec, f'disk[{disk_index}]', ('size',))
+    group.constraints += _parse_size_constraints(spec,
+                                                 f'disk[{disk_index}]',
+                                                 ('size',
+                                                  'physical-sector-size',
+                                                  'logical-sector-size'))
     group.constraints += _parse_text_constraints(spec,
                                                  f'disk[{disk_index}]', ('model-name', 'driver'))
 

tmt/schemas/provision/hardware.yaml

@@ -156,6 +156,15 @@ definitions:
       driver:
         type: string
 
+      logical-sector-size:
+        anyOf:
+          - type: string
+          - type: integer
+
+      physical-sector-size:
+        anyOf:
+          - type: string
+          - type: integer
     additionalProperties: false
 
     # enforce at least one property - we don't care which one, but we don't want