refactor(test): add uvm_plain_acpi and _6_1 fixtures

Simplify the test code by introducing two new fixtures that are used in
a few places in the code.
This will also allow these tests to run on PCI.

Signed-off-by: Riccardo Mancini <[email protected]>
Signed-off-by: Babis Chalios <[email protected]>

Author: Manciukic

tests/conftest.py

@@ -514,6 +514,18 @@ def uvm_plain(microvm_factory, guest_kernel_linux_5_10, rootfs, pci_enabled):
     return microvm_factory.build(guest_kernel_linux_5_10, rootfs, pci=pci_enabled)
 
 
+@pytest.fixture
+def uvm_plain_6_1(microvm_factory, guest_kernel_linux_6_1, rootfs, pci_enabled):
+    """Create a vanilla VM, non-parametrized"""
+    return microvm_factory.build(guest_kernel_linux_6_1, rootfs, pci=pci_enabled)
+
+
+@pytest.fixture
+def uvm_plain_acpi(microvm_factory, guest_kernel_acpi, rootfs, pci_enabled):
+    """Create a vanilla VM, non-parametrized"""
+    return microvm_factory.build(guest_kernel_acpi, rootfs, pci=pci_enabled)
+
+
 @pytest.fixture
 def uvm_plain_rw(microvm_factory, guest_kernel_linux_5_10, rootfs_rw):
     """Create a vanilla VM, non-parametrized"""

tests/integration_tests/functional/test_snapshot_basic.py

@@ -482,11 +482,11 @@ def test_snapshot_overwrite_self(uvm_plain_any, microvm_factory):
     # restored, with a new snapshot of this vm, does not break the VM
 
 
-def test_vmgenid(guest_kernel_linux_6_1, rootfs, microvm_factory, snapshot_type):
+def test_vmgenid(uvm_plain_6_1, microvm_factory, snapshot_type):
     """
     Test VMGenID device upon snapshot resume
     """
-    base_vm = microvm_factory.build(guest_kernel_linux_6_1, rootfs)
+    base_vm = uvm_plain_6_1
     base_vm.spawn()
     base_vm.basic_config(track_dirty_pages=True)
     base_vm.add_net_iface()

tests/integration_tests/performance/test_block.py

@@ -161,24 +161,19 @@ def emit_fio_metrics(logs_dir, metrics):
 @pytest.mark.parametrize("fio_block_size", [4096], ids=["bs4096"])
 @pytest.mark.parametrize("fio_engine", ["libaio", "psync"])
 def test_block_performance(
-    microvm_factory,
-    guest_kernel_acpi,
-    rootfs,
+    uvm_any_acpi,
     vcpus,
     fio_mode,
     fio_block_size,
     fio_engine,
-    pci_enabled,
     io_engine,
     metrics,
     results_dir,
 ):
     """
     Execute block device emulation benchmarking scenarios.
     """
-    vm = microvm_factory.build(
-        guest_kernel_acpi, rootfs, monitor_memory=False, pci=pci_enabled
-    )
+    vm = uvm_any_acpi
     vm.spawn(log_level="Info", emit_metrics=True)
     vm.basic_config(vcpu_count=vcpus, mem_size_mib=GUEST_MEM_MIB)
     vm.add_net_iface()
@@ -216,9 +211,7 @@ def test_block_performance(
 @pytest.mark.parametrize("fio_mode", ["randread"])
 @pytest.mark.parametrize("fio_block_size", [4096], ids=["bs4096"])
 def test_block_vhost_user_performance(
-    microvm_factory,
-    guest_kernel_acpi,
-    rootfs,
+    uvm_any_acpi,
     vcpus,
     fio_mode,
     fio_block_size,
@@ -229,7 +222,7 @@ def test_block_vhost_user_performance(
     Execute block device emulation benchmarking scenarios.
     """
 
-    vm = microvm_factory.build(guest_kernel_acpi, rootfs, monitor_memory=False)
+    vm = uvm_any_acpi
     vm.spawn(log_level="Info", emit_metrics=True)
     vm.basic_config(vcpu_count=vcpus, mem_size_mib=GUEST_MEM_MIB)
     vm.add_net_iface()

tests/integration_tests/performance/test_network.py

@@ -38,16 +38,14 @@ def consume_ping_output(ping_putput):
 
 
 @pytest.fixture
-def network_microvm(request, microvm_factory, guest_kernel_acpi, rootfs, pci_enabled):
+def network_microvm(request, uvm_plain_acpi):
     """Creates a microvm with the networking setup used by the performance tests in this file.
     This fixture receives its vcpu count via indirect parameterization"""
 
     guest_mem_mib = 1024
     guest_vcpus = request.param
 
-    vm = microvm_factory.build(
-        guest_kernel_acpi, rootfs, monitor_memory=False, pci=pci_enabled
-    )
+    vm = uvm_plain_acpi
     vm.spawn(log_level="Info", emit_metrics=True)
     vm.basic_config(vcpu_count=guest_vcpus, mem_size_mib=guest_mem_mib)
     vm.add_net_iface()

tests/integration_tests/performance/test_vhost_user_metrics.py

@@ -10,9 +10,7 @@
 
 
 @pytest.mark.parametrize("vcpu_count", [1, 2], ids=["1vcpu", "2vcpu"])
-def test_vhost_user_block_metrics(
-    microvm_factory, guest_kernel_acpi, rootfs, vcpu_count, metrics
-):
+def test_vhost_user_block_metrics(uvm_plain_acpi, vcpu_count, metrics):
     """
     This test tries to boot a VM with vhost-user-block
     as a scratch device, resize the vhost-user scratch drive to have
@@ -28,7 +26,7 @@ def test_vhost_user_block_metrics(
     # low->high->low->high and so the numbers are not in monotonic sequence.
     new_sizes = [20, 10, 30]  # MB
 
-    vm = microvm_factory.build(guest_kernel_acpi, rootfs, monitor_memory=False)
+    vm = uvm_plain_acpi
     vm.spawn(log_level="Info")
     vm.basic_config(vcpu_count=vcpu_count)
     vm.add_net_iface()

tests/integration_tests/performance/test_vsock.py

@@ -75,12 +75,9 @@ def guest_command(self, port_offset):
 @pytest.mark.parametrize("payload_length", ["64K", "1024K"], ids=["p64K", "p1024K"])
 @pytest.mark.parametrize("mode", ["g2h", "h2g", "bd"])
 def test_vsock_throughput(
-    microvm_factory,
-    guest_kernel_acpi,
-    rootfs,
+    uvm_plain_acpi,
     vcpus,
     payload_length,
-    pci_enabled,
     mode,
     metrics,
     results_dir,
@@ -95,9 +92,7 @@ def test_vsock_throughput(
         pytest.skip("bidrectional test only done with at least 2 vcpus")
 
     mem_size_mib = 1024
-    vm = microvm_factory.build(
-        guest_kernel_acpi, rootfs, monitor_memory=False, pci=pci_enabled
-    )
+    vm = uvm_plain_acpi
     vm.spawn(log_level="Info", emit_metrics=True)
     vm.basic_config(vcpu_count=vcpus, mem_size_mib=mem_size_mib)
     vm.add_net_iface()