From 6f4f9e7d67e031e6a2b8aad777b7922726b321f1 Mon Sep 17 00:00:00 2001 From: Lili Nie Date: Wed, 15 May 2024 10:15:51 -0400 Subject: [PATCH] squash: modify warning --- spec/hardware/location.fmf | 5 +++-- tmt/steps/provision/mrack.py | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/spec/hardware/location.fmf b/spec/hardware/location.fmf index d08e16ac42..d2d2e3f292 100644 --- a/spec/hardware/location.fmf +++ b/spec/hardware/location.fmf @@ -14,8 +14,9 @@ description: | .. warning:: - `like` operation is not supported by lab-controller, only `!=` and `==` - are allowed. + 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: - | diff --git a/tmt/steps/provision/mrack.py b/tmt/steps/provision/mrack.py index 1dd0756179..25771db892 100644 --- a/tmt/steps/provision/mrack.py +++ b/tmt/steps/provision/mrack.py @@ -57,11 +57,11 @@ class GuestInspectType(TypedDict): 'disk.model_name', 'disk.driver', 'hostname', + 'location.lab_controller', 'memory', 'virtualization.is_virtualized', 'virtualization.hypervisor', 'zcrypt', - 'location.lab_controller', ] @@ -462,6 +462,7 @@ def _transform_location_lab_controller( 'disk.model_name': _transform_disk_model_name, # type: ignore[dict-item] 'disk.size': _transform_disk_size, # type: ignore[dict-item] 'hostname': _transform_hostname, # type: ignore[dict-item] + 'location.lab_controller': _transform_location_lab_controller, # type: ignore[dict-item] 'memory': _transform_memory, # type: ignore[dict-item] 'virtualization.is_virtualized': \ _transform_virtualization_is_virtualized, # type: ignore[dict-item] @@ -469,7 +470,6 @@ def _transform_location_lab_controller( _transform_virtualization_hypervisor, # type: ignore[dict-item] 'zcrypt.adapter': _transform_zcrypt_adapter, # type: ignore[dict-item] 'zcrypt.mode': _transform_zcrypt_mode, # type: ignore[dict-item] - 'location.lab_controller': _transform_location_lab_controller, # type: ignore[dict-item] }