Merge branch 'cnv-4.19' into rename_disk_transfer_rate_bytes_metric419

Author: OhadRevah

tests/network/OWNERS

@@ -6,3 +6,4 @@ reviewers:
   - Anatw
   - EdDev
   - servolkov
+  - azhivovk

tests/network/connectivity/test_ovs_linux_bridge.py

@@ -50,7 +50,6 @@ def test_ipv4_linux_bridge(
     @pytest.mark.post_upgrade
     @pytest.mark.polarion("CNV-11125")
     @pytest.mark.ipv6
-    @pytest.mark.single_nic
     def test_ipv6_linux_bridge(
         self,
         fail_if_not_ipv6_supported_cluster,

tests/network/localnet/conftest.py

@@ -272,8 +272,9 @@ def localnet_vms_have_connectivity(localnet_running_vms: tuple[BaseVirtualMachin
 
 
 @pytest.fixture()
-@pytest.mark.usefixtures("localnet_vms_have_connectivity")
-def migrated_localnet_vm(localnet_running_vms: tuple[BaseVirtualMachine, BaseVirtualMachine]) -> BaseVirtualMachine:
+def migrated_localnet_vm(
+    localnet_vms_have_connectivity: None, localnet_running_vms: tuple[BaseVirtualMachine, BaseVirtualMachine]
+) -> BaseVirtualMachine:
     vm, _ = localnet_running_vms
     migrate_vm_and_verify(vm=vm)
     return vm

tests/observability/metrics/test_migration_metrics.py

@@ -8,7 +8,7 @@
     KUBEVIRT_VMI_MIGRATION_DATA_REMAINING_BYTES,
     KUBEVIRT_VMI_MIGRATION_DATA_TOTAL_BYTES,
     KUBEVIRT_VMI_MIGRATION_DIRTY_MEMORY_RATE_BYTES,
-    KUBEVIRT_VMI_MIGRATION_DISK_TRANSFER_RATE_BYTES,
+    KUBEVIRT_VMI_MIGRATION_MEMORY_TRANSFER_RATE_BYTES,
     KUBEVIRT_VMI_MIGRATIONS_IN_RUNNING_PHASE,
     KUBEVIRT_VMI_MIGRATIONS_IN_SCHEDULING_PHASE,
 )
@@ -67,7 +67,7 @@ class TestKubevirtVmiMigrationMetrics:
                 marks=(pytest.mark.polarion("CNV-11600")),
             ),
             pytest.param(
-                KUBEVIRT_VMI_MIGRATION_DISK_TRANSFER_RATE_BYTES,
+                KUBEVIRT_VMI_MIGRATION_MEMORY_TRANSFER_RATE_BYTES,
                 marks=(pytest.mark.polarion("CNV-11598")),
             ),
             pytest.param(