Support disk.driver hw requirement for mrack

docs/releases.rst

@@ -9,8 +9,8 @@ tmt-1.32
 
 The hardware specification for :ref:`/spec/hardware/disk` has been
 extended with the new keys ``driver`` and ``model-name``. Users
-can provision Beaker guests with a given disk model using the
-:ref:`/spec/plans/provision/beaker` plugin.
+can provision Beaker guests with a given disk model or driver using
+the :ref:`/spec/plans/provision/beaker` plugin.
 
 The :ref:`/spec/plans/provision/virtual` provision plugin gains support
 for :ref:`TPM hardware requirement</spec/hardware/tpm>`. It is limited

spec/hardware/disk.fmf

@@ -46,6 +46,5 @@ link:
  - implemented-by: /tmt/steps/provision/artemis.py
  note: "``size`` only"
  - implemented-by: /tmt/steps/provision/mrack.py
- note: "``size`` and ``model-name`` only"
  - implemented-by: /tmt/steps/provision/testcloud.py
  note: "``size`` only with ``=``, ``>=`` and ``<=`` operators only"

tmt/steps/provision/mrack.py

@@ -49,6 +49,7 @@ class GuestInspectType(TypedDict):
  'cpu.model',
  'disk.size',
  'disk.model_name',
+ 'disk.driver',
  'hostname',
  'memory',
  'virtualization.is_virtualized'
@@ -146,6 +147,20 @@ def __init__(self, name: str, operator: str, value: str) -> None:
  }
 
 
+@dataclasses.dataclass(init=False)
+class MrackHWKeyValue(MrackHWElement):
+ """ A key-value element """
+
+ def __init__(self, name: str, operator: str, value: str) -> None:
+ super().__init__('key_value')
+
+ self.attributes = {
+ '_key': name,
+ '_op': operator,
+ '_value': value
+ }
+
+
 @dataclasses.dataclass
 class MrackHWGroup(MrackBaseHWElement):
  """
@@ -288,6 +303,21 @@ def constraint_to_beaker_filter(
  'disk',
  children=[MrackHWBinOp('model', beaker_operator, actual_value)])
 
+ if name == "disk" and child_name == 'driver':
+ beaker_operator, actual_value, negate = operator_to_beaker_op(
+ constraint.operator,
+ constraint.value)
+
+ if negate:
+ return MrackHWNotGroup(children=[
+ MrackHWKeyValue('BOOTDISK', beaker_operator, actual_value)
+ ])
+
+ return MrackHWKeyValue(
+ 'BOOTDISK',
+ beaker_operator,
+ actual_value)
+
  if name == "cpu":
  if child_name == 'flag':
  beaker_operator = OPERATOR_SIGN_TO_OPERATOR[tmt.hardware.Operator.EQ] \