tests: refactor test_nv.py to use uvm_any_booted

Use a new uvm_any_booted fixture to make the test simpler.

Signed-off-by: Pablo Barbáchano <[email protected]>

Author: pb8o

tests/conftest.py

@@ -494,3 +494,9 @@ def uvm_ctor(request):
 def uvm_any(microvm_factory, uvm_ctor, guest_kernel, rootfs, cpu_template_any):
     """Return booted and restored uvms"""
     return uvm_ctor(microvm_factory, guest_kernel, rootfs, cpu_template_any)
+
+
+@pytest.fixture
+def uvm_any_booted(microvm_factory, guest_kernel, rootfs, cpu_template_any):
+    """Return booted uvms"""
+    return uvm_booted(microvm_factory, guest_kernel, rootfs, cpu_template_any)

tests/integration_tests/security/test_nv.py

@@ -16,31 +16,7 @@
 start providing the feature by mistake.
 """
 
-import pytest
 
-
-@pytest.fixture
-def uvm_with_cpu_template(microvm_factory, guest_kernel, rootfs, cpu_template_any):
-    """A microvm fixture parametrized with all possible templates"""
-    vm = microvm_factory.build(guest_kernel, rootfs)
-    vm.spawn()
-    cpu_template = None
-    if isinstance(cpu_template_any, str):
-        cpu_template = cpu_template_any
-    vm.basic_config(cpu_template=cpu_template)
-    if isinstance(cpu_template_any, dict):
-        vm.api.cpu_config.put(**cpu_template_any["template"])
-    vm.add_net_iface()
-    vm.start()
-    yield vm
-
-
-def test_no_nv_when_using_cpu_templates(uvm_with_cpu_template):
-    """
-    Double-check that guests using CPU templates don't have Nested Virtualization
-    enabled.
-    """
-
-    vm = uvm_with_cpu_template
-    rc, _, _ = vm.ssh.run("[ ! -e /dev/kvm ]")
-    assert rc == 0, "/dev/kvm exists"
+def test_no_nested_virtualization(uvm_any_booted):
+    """Validate that guests don't have Nested Virtualization enabled."""
+    uvm_any_booted.ssh.check_output("[ ! -e /dev/kvm ]")