Rewrite generic storage tests to deduplicate

Signed-off-by: Damien Thenot <damien.thenot@vates.tech>

conftest.py

@@ -75,6 +75,13 @@ def pytest_addoption(parser):
              "4KiB blocksize to be formatted and used in storage tests. "
              "Set it to 'auto' to let the fixtures auto-detect available disks."
     )
+    parser.addoption(
+        "--sr-type",
+        action="append",
+        default=[],
+        help="Name of SR type to run on generic SR tests. "
+        "Set it to 'all' to run on all generic SR types."
+    )
 
 def pytest_configure(config):
     global_config.ignore_ssh_banner = config.getoption('--ignore-ssh-banner')

tests/storage/generic/conftest.py

@@ -0,0 +1,35 @@
+import logging
+import pytest
+
+SR_TYPES = ["ext", "lvm"]
+
+def pytest_generate_tests(metafunc):
+        if "sr_type" in metafunc.fixturenames:
+            cmdline_sr_type = metafunc.config.getoption("sr_type")
+            if "all" in cmdline_sr_type:
+                metafunc.parametrize("sr_type", SR_TYPES, scope="package")
+            else:
+                metafunc.parametrize("sr_type", cmdline_sr_type, scope="package")
+
+@pytest.fixture(scope='package')
+def generic_sr(host, sr_disk, sr_type):
+    """ A sr_type SR on first host. """
+    sr_name = "{}-local-SR-test".format(sr_type.upper())
+    sr = host.sr_create(sr_type, sr_name, {'device': '/dev/' + sr_disk})
+    yield sr
+    # teardown
+    sr.destroy()
+
+@pytest.fixture(scope='module')
+def vdi_on_generic_sr(generic_sr):
+    vdi = generic_sr.create_vdi('GEN-local-VDI-test')
+    yield vdi
+    vdi.destroy()
+
+@pytest.fixture(scope='module')
+def vm_on_generic_sr(host, generic_sr, vm_ref):
+    vm = host.import_vm(vm_ref, sr_uuid=generic_sr.uuid)
+    yield vm
+    # teardown
+    logging.info("<< Destroy VM")
+    vm.destroy(verify=True)

tests/storage/lvm/test_lvm_sr.py → tests/storage/generic/test_generic_sr.py

@@ -5,46 +5,48 @@
 # Requirements:
 # - one XCP-ng host with an additional unused disk for the SR
 
-class TestLVMSRCreateDestroy:
+class TestGENSRCreateDestroy:
     """
     Tests that do not use fixtures that setup the SR or import VMs,
     because they precisely need to test SR creation and destruction,
     and VM import.
     """
 
-    def test_create_sr_with_missing_device(self, host):
-        try_to_create_sr_with_missing_device('lvm', 'LVM-local-SR-test', host)
+    def test_create_sr_with_missing_device(self, host, sr_type):
+        sr_name = "{}-local-SR-test".format(sr_type.upper())
+        try_to_create_sr_with_missing_device(sr_type, sr_name, host)
 
-    def test_create_and_destroy_sr(self, host, sr_disk):
+    def test_create_and_destroy_sr(self, host, sr_disk, sr_type):
         # Create and destroy tested in the same test to leave the host as unchanged as possible
-        sr = host.sr_create('lvm', "LVM-local-SR-test", {'device': '/dev/' + sr_disk}, verify=True)
+        sr_name = "{}-local-SR-test".format(sr_type.upper())
+        sr = host.sr_create(sr_type, sr_name, {'device': '/dev/' + sr_disk}, verify=True)
         # import a VM in order to detect vm import issues here rather than in the vm_on_xfs_fixture used in
         # the next tests, because errors in fixtures break teardown
         vm = host.import_vm(vm_image('mini-linux-x86_64-bios'), sr_uuid=sr.uuid)
         vm.destroy(verify=True)
         sr.destroy(verify=True)
 
-@pytest.mark.usefixtures("lvm_sr")
-class TestLVMSR:
+@pytest.mark.usefixtures("generic_sr")
+class TestGENSR:
     @pytest.mark.quicktest
-    def test_quicktest(self, lvm_sr):
-        lvm_sr.run_quicktest()
+    def test_quicktest(self, generic_sr):
+        generic_sr.run_quicktest()
 
-    def test_vdi_is_not_open(self, vdi_on_lvm_sr):
-        assert not vdi_is_open(vdi_on_lvm_sr)
+    def test_vdi_is_not_open(self, vdi_on_generic_sr):
+        assert not vdi_is_open(vdi_on_generic_sr)
 
     @pytest.mark.small_vm # run with a small VM to test the features
     @pytest.mark.big_vm # and ideally with a big VM to test it scales
-    def test_start_and_shutdown_VM(self, vm_on_lvm_sr):
-        vm = vm_on_lvm_sr
+    def test_start_and_shutdown_VM(self, vm_on_generic_sr):
+        vm = vm_on_generic_sr
         vm.start()
         vm.wait_for_os_booted()
         vm.shutdown(verify=True)
 
     @pytest.mark.small_vm
     @pytest.mark.big_vm
-    def test_snapshot(self, vm_on_lvm_sr):
-        vm = vm_on_lvm_sr
+    def test_snapshot(self, vm_on_generic_sr):
+        vm = vm_on_generic_sr
         vm.start()
         try:
             vm.wait_for_os_booted()
@@ -56,9 +58,9 @@ def test_snapshot(self, vm_on_lvm_sr):
 
     @pytest.mark.reboot
     @pytest.mark.small_vm
-    def test_reboot(self, host, lvm_sr, vm_on_lvm_sr):
-        sr = lvm_sr
-        vm = vm_on_lvm_sr
+    def test_reboot(self, host, generic_sr, vm_on_generic_sr):
+        sr = generic_sr
+        vm = vm_on_generic_sr
         host.reboot(verify=True)
         wait_for(sr.all_pbds_attached, "Wait for PBD attached")
         # start the VM as a way to check that the underlying SR is operational

tests/storage/ext/test_ext_sr_crosspool_migration.py → tests/storage/generic/test_generic_sr_crosspool_migration.py

@@ -12,8 +12,8 @@
 @pytest.mark.big_vm # and ideally with a big VM to test it scales
 @pytest.mark.usefixtures("hostB1", "local_sr_on_hostB1")
 class Test:
-    def test_cold_crosspool_migration(self, host, hostB1, vm_on_ext_sr, local_sr_on_hostB1):
-        cold_migration_then_come_back(vm_on_ext_sr, host, hostB1, local_sr_on_hostB1)
+    def test_cold_crosspool_migration(self, host, hostB1, vm_on_generic_sr, local_sr_on_hostB1):
+        cold_migration_then_come_back(vm_on_generic_sr, host, hostB1, local_sr_on_hostB1)
 
-    def test_live_crosspool_migration(self, host, hostB1, vm_on_ext_sr, local_sr_on_hostB1):
-        live_storage_migration_then_come_back(vm_on_ext_sr, host, hostB1, local_sr_on_hostB1)
+    def test_live_crosspool_migration(self, host, hostB1, vm_on_generic_sr, local_sr_on_hostB1):
+        live_storage_migration_then_come_back(vm_on_generic_sr, host, hostB1, local_sr_on_hostB1)

tests/storage/ext/test_ext_sr_intrapool_migration.py → tests/storage/generic/test_generic_sr_intrapool_migration.py

@@ -12,8 +12,8 @@
 @pytest.mark.big_vm # and ideally with a big VM to test it scales
 @pytest.mark.usefixtures("hostA2", "local_sr_on_hostA2")
 class Test:
-    def test_cold_intrapool_migration(self, host, hostA2, vm_on_ext_sr, local_sr_on_hostA2):
-        cold_migration_then_come_back(vm_on_ext_sr, host, hostA2, local_sr_on_hostA2)
+    def test_cold_intrapool_migration(self, host, hostA2, vm_on_generic_sr, local_sr_on_hostA2):
+        cold_migration_then_come_back(vm_on_generic_sr, host, hostA2, local_sr_on_hostA2)
 
-    def test_live_intrapool_migration(self, host, hostA2, vm_on_ext_sr, local_sr_on_hostA2):
-        live_storage_migration_then_come_back(vm_on_ext_sr, host, hostA2, local_sr_on_hostA2)
+    def test_live_intrapool_migration(self, host, hostA2, vm_on_generic_sr, local_sr_on_hostA2):
+        live_storage_migration_then_come_back(vm_on_generi_sr, host, hostA2, local_sr_on_hostA2)