refactor: move validate_metrics_value to utilities/monitoring

Signed-off-by: Harel Meir <hmeir@redhat.com>
Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>

Author: hmeir

conftest.py

@@ -33,6 +33,7 @@
 from utilities.bitwarden import get_cnv_tests_secret_by_name
 from utilities.constants import (
     AMD_64,
+    MULTIARCH,
     QUARANTINED,
     SETUP_ERROR,
     TIMEOUT_5MIN,
@@ -558,6 +559,15 @@ def filter_sno_only_tests(items: list[Item], config: Config) -> list[Item]:
     return items
 
 
+def filter_multiarch_tests(items: list[Item], config: Config) -> list[Item]:
+    if py_config.get("cluster_type") == MULTIARCH:
+        return items
+    discard_tests, items_to_return = remove_tests_from_list(items=items, filter_str="multiarch")
+    if discard_tests:
+        config.hook.pytest_deselected(items=discard_tests)
+    return items_to_return
+
+
 def remove_tests_from_list(items: list[Item], filter_str: str) -> tuple[list[Item], list[Item]]:
     discard_tests: list[Item] = []
     items_to_return: list[Item] = []
@@ -635,6 +645,7 @@ def pytest_collection_modifyitems(session, config, items):
         config.hook.pytest_deselected(items=discard)
     items[:] = filter_deprecated_api_tests(items=items, config=config)
     items[:] = filter_sno_only_tests(items=items, config=config)
+    items[:] = filter_multiarch_tests(items=items, config=config)
     items[:] = mark_nmstate_dependent_tests(items=items)
 
 

tests/install_upgrade_operators/hco_enablement_golden_image_updates/conftest.py

@@ -19,6 +19,7 @@
     COMMON_TEMPLATES_KEY_NAME,
     FEATURE_GATES,
     HCO_OPERATOR,
+    KUBERNETES_ARCH_LABEL,
     SSP_CR_COMMON_TEMPLATES_LIST_KEY_NAME,
 )
 from utilities.ssp import get_ssp_resource
@@ -121,6 +122,11 @@ def common_templates_scope_session(hyperconverged_status_scope_session):
     return hyperconverged_status_scope_session[SSP_CR_COMMON_TEMPLATES_LIST_KEY_NAME]
 
 
+@pytest.fixture(scope="session")
+def worker_architectures(schedulable_nodes):
+    return {node.labels[KUBERNETES_ARCH_LABEL] for node in schedulable_nodes}
+
+
 @pytest.fixture(scope="class")
 def default_common_template_hco_status(hyperconverged_status_templates_scope_class):
     return get_templates_by_type_from_hco_status(

tests/install_upgrade_operators/hco_enablement_golden_image_updates/multiarch/conftest.py

@@ -56,11 +56,6 @@ def enabled_multiarch_feature_gate(hyperconverged_resource_scope_class):
             yield
 
 
-@pytest.fixture(scope="session")
-def worker_architectures(schedulable_nodes):
-    return {node.labels[KUBERNETES_ARCH_LABEL] for node in schedulable_nodes}
-
-
 @pytest.fixture(scope="class")
 def control_plane_architecture(control_plane_nodes):
     return get_control_plane_architecture(control_plane_nodes=control_plane_nodes)

tests/install_upgrade_operators/hco_enablement_golden_image_updates/multiarch/utils.py

@@ -45,6 +45,17 @@ def get_modified_data_import_cron_template(
     managed_data_source: str,
     annotations: dict[str, str] | None = None,
 ) -> dict[str, Any]:
+    """Clone the first common template and customize it for testing.
+
+    Args:
+        common_templates: HCO status templates; first entry is used as base.
+        name: New template name.
+        managed_data_source: DataSource name to associate with this cron.
+        annotations: Optional annotations to merge into metadata.
+
+    Returns:
+        dict[str, Any]: Modified template with status removed, name and datasource updated.
+    """
     template = deepcopy(common_templates[0])
     del template["status"]
     template["metadata"]["name"] = name
@@ -55,6 +66,7 @@ def get_modified_data_import_cron_template(
 
 
 def get_unsupported_arch_template(common_templates: list[dict[str, Any]]) -> dict[str, Any]:
+    """Return a template annotated with an unsupported architecture (arm42)."""
     return get_modified_data_import_cron_template(
         common_templates=common_templates,
         name=CUSTOM_UNSUPPORTED_ARCH_CRON_NAME,
@@ -64,6 +76,7 @@ def get_unsupported_arch_template(common_templates: list[dict[str, Any]]) -> dic
 
 
 def get_no_arch_annotation_template(common_templates: list[dict[str, Any]]) -> dict[str, Any]:
+    """Return a template with the architecture annotation removed."""
     template = get_modified_data_import_cron_template(
         common_templates=common_templates,
         name=CUSTOM_NO_ARCH_ANNOTATION_CRON_NAME,

tests/observability/metrics/conftest.py

@@ -36,7 +36,6 @@
     network_packets_received,
     vnic_info_from_vm_or_vmi,
 )
-from tests.observability.utils import validate_metrics_value
 from tests.utils import create_vms, start_stress_on_vm
 from utilities import console
 from utilities.constants import (
@@ -72,7 +71,7 @@
     get_pod_by_name_prefix,
     unique_name,
 )
-from utilities.monitoring import get_metrics_value
+from utilities.monitoring import get_metrics_value, validate_metrics_value
 from utilities.network import assert_ping_successful, get_ip_from_vm_or_virt_handler_pod, ping
 from utilities.ssp import verify_ssp_pod_is_running
 from utilities.storage import (

tests/observability/metrics/test_aaq_metrics.py

@@ -4,7 +4,7 @@
     timestamp_to_seconds,
     validate_values_from_kube_application_aware_resourcequota_metric,
 )
-from tests.observability.utils import validate_metrics_value
+from utilities.monitoring import validate_metrics_value
 
 pytestmark = [
     pytest.mark.usefixtures(

tests/observability/metrics/test_general_metrics.py

@@ -7,7 +7,7 @@
 from libs.net.cluster import is_ipv6_single_stack_cluster
 from tests.observability.metrics.constants import KUBEVIRT_VMI_NODE_CPU_AFFINITY
 from tests.observability.metrics.utils import validate_vmi_node_cpu_affinity_with_prometheus
-from tests.observability.utils import validate_metrics_value
+from utilities.monitoring import validate_metrics_value
 from utilities.virt import VirtualMachineForTests, fedora_vm_body, running_vm
 
 KUBEVIRT_VM_TAG = f"{Resource.ApiGroup.KUBEVIRT_IO}/vm"

tests/observability/metrics/test_metrics.py

@@ -9,10 +9,10 @@
     assert_vm_metric_virt_handler_pod,
     compare_kubevirt_vmi_info_metric_with_vm_info,
 )
-from tests.observability.utils import validate_metrics_value
 from utilities.constants import (
     KUBEVIRT_HCO_HYPERCONVERGED_CR_EXISTS,
 )
+from utilities.monitoring import validate_metrics_value
 
 pytestmark = [pytest.mark.post_upgrade, pytest.mark.sno]
 

tests/observability/metrics/test_migration_metrics.py

@@ -13,7 +13,7 @@
     timestamp_to_seconds,
     wait_for_non_empty_metrics_value,
 )
-from tests.observability.utils import validate_metrics_value
+from utilities.monitoring import validate_metrics_value
 
 LOGGER = logging.getLogger(__name__)
 

tests/observability/metrics/test_ssp_metrics.py

@@ -7,12 +7,12 @@
     validate_metric_value_with_round_down,
     validate_metric_value_within_range,
 )
-from tests.observability.utils import validate_metrics_value
 from utilities.constants import (
     SSP_OPERATOR,
     VIRT_TEMPLATE_VALIDATOR,
 )
 from utilities.hco import ResourceEditorValidateHCOReconcile
+from utilities.monitoring import validate_metrics_value
 from utilities.virt import VirtualMachineForTests
 
 KUBEVIRT_SSP_OPERATOR_UP = "kubevirt_ssp_operator_up"