|
43 | 43 | from utilities.constants import ( |
44 | 44 | DEFAULT_FEDORA_REGISTRY_URL, |
45 | 45 | IPV4_STR, |
46 | | - KUBEVIRT_VMI_MEMORY_PGMAJFAULT_TOTAL, |
47 | | - KUBEVIRT_VMI_MEMORY_PGMINFAULT_TOTAL, |
48 | | - KUBEVIRT_VMI_MEMORY_SWAP_IN_TRAFFIC_BYTES, |
49 | | - KUBEVIRT_VMI_MEMORY_SWAP_OUT_TRAFFIC_BYTES, |
50 | | - KUBEVIRT_VMI_MEMORY_UNUSED_BYTES, |
51 | | - KUBEVIRT_VMI_MEMORY_USABLE_BYTES, |
52 | 46 | MIGRATION_POLICY_VM_LABEL, |
53 | 47 | ONE_CPU_CORE, |
54 | 48 | ONE_CPU_THREAD, |
|
74 | 68 | get_linux_guest_agent_version, |
75 | 69 | get_node_selector_dict, |
76 | 70 | get_pod_by_name_prefix, |
77 | | - is_jira_open, |
78 | 71 | unique_name, |
79 | 72 | ) |
80 | 73 | from utilities.monitoring import get_metrics_value |
|
97 | 90 | IP_RE_PATTERN_FROM_INTERFACE = r"eth0.*?inet (\d+\.\d+\.\d+\.\d+)/\d+" |
98 | 91 | IP_ADDR_SHOW_COMMAND = shlex.split("ip addr show") |
99 | 92 | LOGGER = logging.getLogger(__name__) |
100 | | -METRICS_WITH_WINDOWS_VM_BUGS = [ |
101 | | - KUBEVIRT_VMI_MEMORY_UNUSED_BYTES, |
102 | | - KUBEVIRT_VMI_MEMORY_SWAP_OUT_TRAFFIC_BYTES, |
103 | | - KUBEVIRT_VMI_MEMORY_SWAP_IN_TRAFFIC_BYTES, |
104 | | - KUBEVIRT_VMI_MEMORY_PGMAJFAULT_TOTAL, |
105 | | - KUBEVIRT_VMI_MEMORY_USABLE_BYTES, |
106 | | - KUBEVIRT_VMI_MEMORY_PGMINFAULT_TOTAL, |
107 | | -] |
108 | 93 | MINIMUM_QEMU_GUEST_AGENT_VERSION_FOR_GUEST_LOAD_METRICS = "9.6" |
109 | 94 |
|
110 | 95 |
|
@@ -474,20 +459,6 @@ def windows_vm_for_test(namespace, unprivileged_client): |
474 | 459 | yield vm |
475 | 460 |
|
476 | 461 |
|
477 | | -@pytest.fixture(scope="session") |
478 | | -def memory_metric_has_bug(): |
479 | | - return is_jira_open(jira_id="CNV-59679") |
480 | | - |
481 | | - |
482 | | -@pytest.fixture() |
483 | | -def xfail_if_memory_metric_has_bug(memory_metric_has_bug, cnv_vmi_monitoring_metrics_matrix__function__): |
484 | | - if cnv_vmi_monitoring_metrics_matrix__function__ in METRICS_WITH_WINDOWS_VM_BUGS and memory_metric_has_bug: |
485 | | - pytest.xfail( |
486 | | - f"Bug (CNV-59679), Metric: {cnv_vmi_monitoring_metrics_matrix__function__} not showing " |
487 | | - "any value for windows vm" |
488 | | - ) |
489 | | - |
490 | | - |
491 | 462 | @pytest.fixture() |
492 | 463 | def initial_migration_metrics_values(prometheus): |
493 | 464 | yield { |
|
0 commit comments