squash: rebase, remove warning

teemtee · Jul 1, 2024 · 0294a54 · 0294a54
1 parent bf40427
commit 0294a54
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 18 deletions.
diff --git a/spec/hardware/location.fmf b/spec/hardware/location.fmf
@@ -12,14 +12,12 @@ description: |
     .. versionchanged:: 1.33
        Added ``location.lab-controller`` into specification.
 
-    .. warning::
-
-       Because of Beaker limitation, ``~`` and ``!~`` operators commonly used with text-like
-       HW requirements cannot be used with ``lab-controller``. Only ``==`` and ``!=``
-       operators are supported.
-
 example:
   - |
     # Select a system that is not managed lab-01.foo.bar.com lab controller
     location:
         lab-controller: "!= lab-01.foo.bar.com"
+
+link:
+  - implemented-by: /tmt/steps/provision/mrack.py
+    note: "``==`` and ``!=`` operators only"
diff --git a/tests/unit/provision/mrack/test_hw.py b/tests/unit/provision/mrack/test_hw.py
@@ -229,10 +229,9 @@ def test_maximal_constraint(root_logger: Logger) -> None:
             {
                 'labcontroller': {
                     '_op': '!=',
-                    '_value': 'lab-01.rhts.eng.pek2.redhat.com'
+                    '_value': 'lab-1.bar.redhat.com'
                     }
                 },
-            {'or': []},
             {
                 'and': [
                     {'or': []},
@@ -688,21 +687,21 @@ def test_zcrypt_mode(root_logger: Logger) -> None:
 def test_location_lab_controller(root_logger: Logger) -> None:
 
     result = _CONSTRAINT_TRANSFORMERS['location.lab_controller'](
-        _parse_location({"lab-controller": "lab-01.rhts.eng.pek2.redhat.com"}), root_logger)
+        _parse_location({"lab-controller": "lab-01.bar.redhat.com"}), root_logger)
 
     assert result.to_mrack() == {
         'labcontroller': {
             '_op': '==',
-            '_value': 'lab-01.rhts.eng.pek2.redhat.com'
+            '_value': 'lab-01.bar.redhat.com'
             }
         }
 
     result = _CONSTRAINT_TRANSFORMERS['location.lab_controller'](
-        _parse_location({"lab-controller": "!= lab-01.rhts.eng.pek2.redhat.com"}), root_logger)
+        _parse_location({"lab-controller": "!= lab-01.bar.redhat.com"}), root_logger)
 
     assert result.to_mrack() == {
         'labcontroller': {
             '_op': '!=',
-            '_value': 'lab-01.rhts.eng.pek2.redhat.com'
+            '_value': 'lab-01.bar.redhat.com'
             }
         }
diff --git a/tmt/hardware.py b/tmt/hardware.py
@@ -1335,12 +1335,7 @@ def _parse_location(spec: Spec) -> BaseConstraint:
 
     group = And()
 
-    group.constraints += _parse_text_constraints(spec,
-                                                 'location',
-                                                 ('lab-controller',
-                                                  ),
-                                                 [Operator.EQ,
-                                                  Operator.NEQ])
+    group.constraints += _parse_text_constraints(spec, 'location', ('lab-controller',))
 
     return group
 

diff --git a/tmt/steps/provision/mrack.py b/tmt/steps/provision/mrack.py
@@ -436,6 +436,9 @@ def _transform_zcrypt_mode(
 def _transform_location_lab_controller(
         constraint: tmt.hardware.TextConstraint,
         logger: tmt.log.Logger) -> MrackBaseHWElement:
+    if constraint.operator not in [tmt.hardware.Operator.EQ, tmt.hardware.Operator.NEQ]:
+        raise ProvisionError(
+            f"Cannot apply hardware requirement '{constraint}', operator not supported.")
     beaker_operator, actual_value, negate = operator_to_beaker_op(
         constraint.operator,
         constraint.value)