Merge branch 'cnv-4.20' into testGuestLoadMetrics-cnv-4.20

Author: OhadRevah

tests/conftest.py

@@ -2350,22 +2350,6 @@ def rhel_vm_with_instance_type_and_preference(
             yield vm
 
 
-@pytest.fixture(scope="class")
-def vm_from_template_scope_class(
-    request,
-    unprivileged_client,
-    namespace,
-    golden_image_data_source_scope_class,
-):
-    with vm_instance_from_template(
-        request=request,
-        unprivileged_client=unprivileged_client,
-        namespace=namespace,
-        data_source=golden_image_data_source_scope_class,
-    ) as vm:
-        yield vm
-
-
 @pytest.fixture(scope="session")
 def is_disconnected_cluster():
     # To enable disconnected_cluster pass --tc=disconnected_cluster:True to pytest commandline.

tests/observability/metrics/conftest.py

@@ -646,3 +646,13 @@ def stressed_vm_cpu_fedora(fedora_vm_with_stress_ng):
         vm=fedora_vm_with_stress_ng,
         stress_command=STRESS_CPU_MEM_IO_COMMAND.format(workers="2", memory="50%", timeout="30m"),
     )
+def expected_cpu_affinity_metric_value(vm_with_cpu_spec):
+    """Calculate expected kubevirt_vmi_node_cpu_affinity metric value."""
+    # Calculate VM CPU count
+    vm_cpu = vm_with_cpu_spec.vmi.instance.spec.domain.cpu
+    cpu_count_from_vm = (vm_cpu.threads or 1) * (vm_cpu.cores or 1) * (vm_cpu.sockets or 1)
+    # Get node CPU capacity
+    cpu_count_from_vm_node = int(vm_with_cpu_spec.privileged_vmi.node.instance.status.capacity.cpu)
+
+    # return multiplication for multi-CPU VMs
+    return str(cpu_count_from_vm_node * cpu_count_from_vm)

tests/observability/metrics/constants.py

@@ -36,3 +36,5 @@
     f"{KUBEVIRT_VMI_GUEST_LOAD_METRIC}_5m",
     f"{KUBEVIRT_VMI_GUEST_LOAD_METRIC}_15m",
 ]
+
+KUBEVIRT_VMI_NODE_CPU_AFFINITY = "kubevirt_vmi_node_cpu_affinity{{kubernetes_vmi_label_kubevirt_io_domain='{vm_name}'}}"

tests/observability/metrics/test_general_metrics.py

@@ -3,13 +3,12 @@
 import pytest
 from ocp_resources.resource import Resource
 from ocp_resources.virtual_machine import VirtualMachine
-from pytest_testconfig import config as py_config
 
+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 tests.os_params import RHEL_LATEST, RHEL_LATEST_LABELS, RHEL_LATEST_OS
 from utilities.virt import VirtualMachineForTests, fedora_vm_body, running_vm
 
 KUBEVIRT_VM_TAG = f"{Resource.ApiGroup.KUBEVIRT_IO}/vm"
@@ -41,37 +40,23 @@ def fedora_vm_without_name_in_label(
         client=unprivileged_client,
         run_strategy=VirtualMachine.RunStrategy.ALWAYS,
     ) as vm:
-        running_vm(vm=vm, check_ssh_connectivity=False)
+        running_vm(vm=vm, wait_for_interfaces=False, check_ssh_connectivity=False)
         yield vm
 
 
 class TestVmiNodeCpuAffinityLinux:
-    @pytest.mark.parametrize(
-        "golden_image_data_volume_scope_class, vm_from_template_scope_class",
-        [
-            pytest.param(
-                {
-                    "dv_name": RHEL_LATEST_OS,
-                    "image": RHEL_LATEST["image_path"],
-                    "storage_class": py_config["default_storage_class"],
-                    "dv_size": RHEL_LATEST["dv_size"],
-                },
-                {
-                    "vm_name": "rhel-latest",
-                    "template_labels": RHEL_LATEST_LABELS,
-                    "guest_agent": False,
-                    "ssh": False,
-                },
-            ),
-        ],
-        indirect=True,
-    )
     @pytest.mark.polarion("CNV-7295")
     @pytest.mark.s390x
-    def test_kubevirt_vmi_node_cpu_affinity(self, prometheus, vm_from_template_scope_class):
-        validate_vmi_node_cpu_affinity_with_prometheus(
-            vm=vm_from_template_scope_class,
+    def test_kubevirt_vmi_node_cpu_affinity(
+        self,
+        prometheus,
+        vm_with_cpu_spec,
+        expected_cpu_affinity_metric_value,
+    ):
+        validate_metrics_value(
             prometheus=prometheus,
+            metric_name=KUBEVIRT_VMI_NODE_CPU_AFFINITY.format(vm_name=vm_with_cpu_spec.name),
+            expected_value=expected_cpu_affinity_metric_value,
         )