Merge pull request #221 from xcp-ng/nfs4-test

Test both NFS3 and 4+

data.py-dist

@@ -59,6 +59,13 @@ DEFAULT_NFS_DEVICE_CONFIG = {
 #    'serverpath': '/path/to/shared/mount' # Path to shared mountpoint
 }
 
+# Default NFS4+ only device config:
+DEFAULT_NFS4_DEVICE_CONFIG = {
+#    'server': '10.0.0.2', # URL/Hostname of NFS server
+#    'serverpath': '/path_to_shared_mount' # Path to shared mountpoint
+#    'nfsversion': '4.1'
+}
+
 # Default NFS ISO device config:
 DEFAULT_NFS_ISO_DEVICE_CONFIG = {
 #    'location': '10.0.0.2:/path/to/shared/mount' # URL/Hostname of NFS server and path to shared mountpoint

tests/storage/cephfs/test_cephfs_sr_crosspool_migration.py

@@ -14,8 +14,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_cephfs_sr, cephfs_sr, local_sr_on_hostB1):
-        cold_migration_then_come_back(vm_on_cephfs_sr, host, cephfs_sr, hostB1, local_sr_on_hostB1)
+    def test_cold_crosspool_migration(self, host, hostB1, vm_on_cephfs_sr, local_sr_on_hostB1):
+        cold_migration_then_come_back(vm_on_cephfs_sr, host, hostB1, local_sr_on_hostB1)
 
-    def test_live_crosspool_migration(self, host, hostB1, vm_on_cephfs_sr, cephfs_sr, local_sr_on_hostB1):
-        live_storage_migration_then_come_back(vm_on_cephfs_sr, host, cephfs_sr, hostB1, local_sr_on_hostB1)
+    def test_live_crosspool_migration(self, host, hostB1, vm_on_cephfs_sr, local_sr_on_hostB1):
+        live_storage_migration_then_come_back(vm_on_cephfs_sr, host, hostB1, local_sr_on_hostB1)

tests/storage/cephfs/test_cephfs_sr_intrapool_migration.py

@@ -14,11 +14,12 @@
 @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_live_intrapool_shared_migration(self, host, hostA2, vm_on_cephfs_sr, cephfs_sr):
-        live_storage_migration_then_come_back(vm_on_cephfs_sr, host, cephfs_sr, hostA2, cephfs_sr)
+    def test_live_intrapool_shared_migration(self, host, hostA2, vm_on_cephfs_sr):
+        sr = vm_on_cephfs_sr.get_sr()
+        live_storage_migration_then_come_back(vm_on_cephfs_sr, host, hostA2, sr)
 
-    def test_cold_intrapool_migration(self, host, hostA2, vm_on_cephfs_sr, cephfs_sr, local_sr_on_hostA2):
-        cold_migration_then_come_back(vm_on_cephfs_sr, host, cephfs_sr, hostA2, local_sr_on_hostA2)
+    def test_cold_intrapool_migration(self, host, hostA2, vm_on_cephfs_sr, local_sr_on_hostA2):
+        cold_migration_then_come_back(vm_on_cephfs_sr, host, hostA2, local_sr_on_hostA2)
 
-    def test_live_intrapool_migration(self, host, hostA2, vm_on_cephfs_sr, cephfs_sr, local_sr_on_hostA2):
-        live_storage_migration_then_come_back(vm_on_cephfs_sr, host, cephfs_sr, hostA2, local_sr_on_hostA2)
+    def test_live_intrapool_migration(self, host, hostA2, vm_on_cephfs_sr, local_sr_on_hostA2):
+        live_storage_migration_then_come_back(vm_on_cephfs_sr, host, hostA2, local_sr_on_hostA2)

tests/storage/ext/test_ext_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, ext_sr, local_sr_on_hostB1):
-        cold_migration_then_come_back(vm_on_ext_sr, host, ext_sr, hostB1, local_sr_on_hostB1)
+    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_live_crosspool_migration(self, host, hostB1, vm_on_ext_sr, ext_sr, local_sr_on_hostB1):
-        live_storage_migration_then_come_back(vm_on_ext_sr, host, ext_sr, 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)

tests/storage/ext/test_ext_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, ext_sr, local_sr_on_hostA2):
-        cold_migration_then_come_back(vm_on_ext_sr, host, ext_sr, hostA2, local_sr_on_hostA2)
+    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_live_intrapool_migration(self, host, hostA2, vm_on_ext_sr, ext_sr, local_sr_on_hostA2):
-        live_storage_migration_then_come_back(vm_on_ext_sr, host, ext_sr, 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)

tests/storage/glusterfs/test_glusterfs_sr_crosspool_migration.py

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

tests/storage/glusterfs/test_glusterfs_sr_intrapool_migration.py

@@ -14,11 +14,12 @@
 @pytest.mark.big_vm # and ideally with a big VM to test it scales
 @pytest.mark.usefixtures("hostA2", "local_sr_on_hostA2", "sr_disk_for_all_hosts")
 class Test:
-    def test_live_intrapool_shared_migration(self, host, hostA2, vm_on_glusterfs_sr, glusterfs_sr):
-        live_storage_migration_then_come_back(vm_on_glusterfs_sr, host, glusterfs_sr, hostA2, glusterfs_sr)
+    def test_live_intrapool_shared_migration(self, host, hostA2, vm_on_glusterfs_sr):
+        sr = vm_on_glusterfs_sr.get_sr()
+        live_storage_migration_then_come_back(vm_on_glusterfs_sr, host, hostA2, sr)
 
-    def test_cold_intrapool_migration(self, host, hostA2, vm_on_glusterfs_sr, glusterfs_sr, local_sr_on_hostA2):
-        cold_migration_then_come_back(vm_on_glusterfs_sr, host, glusterfs_sr, hostA2, local_sr_on_hostA2)
+    def test_cold_intrapool_migration(self, host, hostA2, vm_on_glusterfs_sr, local_sr_on_hostA2):
+        cold_migration_then_come_back(vm_on_glusterfs_sr, host, hostA2, local_sr_on_hostA2)
 
-    def test_live_intrapool_migration(self, host, hostA2, vm_on_glusterfs_sr, glusterfs_sr, local_sr_on_hostA2):
-        live_storage_migration_then_come_back(vm_on_glusterfs_sr, host, glusterfs_sr, hostA2, local_sr_on_hostA2)
+    def test_live_intrapool_migration(self, host, hostA2, vm_on_glusterfs_sr, local_sr_on_hostA2):
+        live_storage_migration_then_come_back(vm_on_glusterfs_sr, host, hostA2, local_sr_on_hostA2)

tests/storage/linstor/test_linstor_sr_crosspool_migration.py

@@ -14,8 +14,8 @@
 @pytest.mark.big_vm # and ideally on 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_linstor_sr, linstor_sr, local_sr_on_hostB1):
-        cold_migration_then_come_back(vm_on_linstor_sr, host, linstor_sr, hostB1, local_sr_on_hostB1)
+    def test_cold_crosspool_migration(self, host, hostB1, vm_on_linstor_sr, local_sr_on_hostB1):
+        cold_migration_then_come_back(vm_on_linstor_sr, host, hostB1, local_sr_on_hostB1)
 
-    def test_live_crosspool_migration(self, host, hostB1, vm_on_linstor_sr, linstor_sr, local_sr_on_hostB1):
-        live_storage_migration_then_come_back(vm_on_linstor_sr, host, linstor_sr, hostB1, local_sr_on_hostB1)
+    def test_live_crosspool_migration(self, host, hostB1, vm_on_linstor_sr, local_sr_on_hostB1):
+        live_storage_migration_then_come_back(vm_on_linstor_sr, host, hostB1, local_sr_on_hostB1)

tests/storage/linstor/test_linstor_sr_intrapool_migration.py

@@ -14,11 +14,12 @@
 @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_live_intrapool_shared_migration(self, host, hostA2, vm_on_linstor_sr, linstor_sr):
-        live_storage_migration_then_come_back(vm_on_linstor_sr, host, linstor_sr, hostA2, linstor_sr)
+    def test_live_intrapool_shared_migration(self, host, hostA2, vm_on_linstor_sr):
+        sr = vm_on_linstor_sr.get_sr()
+        live_storage_migration_then_come_back(vm_on_linstor_sr, host, hostA2, sr)
 
-    def test_cold_intrapool_migration(self, host, hostA2, vm_on_linstor_sr, linstor_sr, local_sr_on_hostA2):
-        cold_migration_then_come_back(vm_on_linstor_sr, host, linstor_sr, hostA2, local_sr_on_hostA2)
+    def test_cold_intrapool_migration(self, host, hostA2, vm_on_linstor_sr, local_sr_on_hostA2):
+        cold_migration_then_come_back(vm_on_linstor_sr, host, hostA2, local_sr_on_hostA2)
 
-    def test_live_intrapool_migration(self, host, hostA2, vm_on_linstor_sr, linstor_sr, local_sr_on_hostA2):
-        live_storage_migration_then_come_back(vm_on_linstor_sr, host, linstor_sr, hostA2, local_sr_on_hostA2)
+    def test_live_intrapool_migration(self, host, hostA2, vm_on_linstor_sr, local_sr_on_hostA2):
+        live_storage_migration_then_come_back(vm_on_linstor_sr, host, hostA2, local_sr_on_hostA2)

tests/storage/lvm/test_lvm_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_lvm_sr, lvm_sr, local_sr_on_hostB1):
-        cold_migration_then_come_back(vm_on_lvm_sr, host, lvm_sr, hostB1, local_sr_on_hostB1)
+    def test_cold_crosspool_migration(self, host, hostB1, vm_on_lvm_sr, local_sr_on_hostB1):
+        cold_migration_then_come_back(vm_on_lvm_sr, host, hostB1, local_sr_on_hostB1)
 
-    def test_live_crosspool_migration(self, host, hostB1, vm_on_lvm_sr, lvm_sr, local_sr_on_hostB1):
-        live_storage_migration_then_come_back(vm_on_lvm_sr, host, lvm_sr, hostB1, local_sr_on_hostB1)
+    def test_live_crosspool_migration(self, host, hostB1, vm_on_lvm_sr, local_sr_on_hostB1):
+        live_storage_migration_then_come_back(vm_on_lvm_sr, host, hostB1, local_sr_on_hostB1)

tests/storage/lvm/test_lvm_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_lvm_sr, lvm_sr, local_sr_on_hostA2):
-        cold_migration_then_come_back(vm_on_lvm_sr, host, lvm_sr, hostA2, local_sr_on_hostA2)
+    def test_cold_intrapool_migration(self, host, hostA2, vm_on_lvm_sr, local_sr_on_hostA2):
+        cold_migration_then_come_back(vm_on_lvm_sr, host, hostA2, local_sr_on_hostA2)
 
-    def test_live_intrapool_migration(self, host, hostA2, vm_on_lvm_sr, lvm_sr, local_sr_on_hostA2):
-        live_storage_migration_then_come_back(vm_on_lvm_sr, host, lvm_sr, hostA2, local_sr_on_hostA2)
+    def test_live_intrapool_migration(self, host, hostA2, vm_on_lvm_sr, local_sr_on_hostA2):
+        live_storage_migration_then_come_back(vm_on_lvm_sr, host, hostA2, local_sr_on_hostA2)

tests/storage/lvmoiscsi/test_lvmoiscsi_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_lvmoiscsi_sr, lvmoiscsi_sr, local_sr_on_hostB1):
-        cold_migration_then_come_back(vm_on_lvmoiscsi_sr, host, lvmoiscsi_sr, hostB1, local_sr_on_hostB1)
+    def test_cold_crosspool_migration(self, host, hostB1, vm_on_lvmoiscsi_sr, local_sr_on_hostB1):
+        cold_migration_then_come_back(vm_on_lvmoiscsi_sr, host, hostB1, local_sr_on_hostB1)
 
-    def test_live_crosspool_migration(self, host, hostB1, vm_on_lvmoiscsi_sr, lvmoiscsi_sr, local_sr_on_hostB1):
-        live_storage_migration_then_come_back(vm_on_lvmoiscsi_sr, host, lvmoiscsi_sr, hostB1, local_sr_on_hostB1)
+    def test_live_crosspool_migration(self, host, hostB1, vm_on_lvmoiscsi_sr, local_sr_on_hostB1):
+        live_storage_migration_then_come_back(vm_on_lvmoiscsi_sr, host, hostB1, local_sr_on_hostB1)

tests/storage/lvmoiscsi/test_lvmoiscsi_sr_intrapool_migration.py

@@ -12,11 +12,12 @@
 @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_live_intrapool_shared_migration(self, host, hostA2, vm_on_lvmoiscsi_sr, lvmoiscsi_sr):
-        live_storage_migration_then_come_back(vm_on_lvmoiscsi_sr, host, lvmoiscsi_sr, hostA2, lvmoiscsi_sr)
+    def test_live_intrapool_shared_migration(self, host, hostA2, vm_on_lvmoiscsi_sr):
+        sr = vm_on_lvmoiscsi_sr.get_sr()
+        live_storage_migration_then_come_back(vm_on_lvmoiscsi_sr, host, hostA2, sr)
 
-    def test_cold_intrapool_migration(self, host, hostA2, vm_on_lvmoiscsi_sr, lvmoiscsi_sr, local_sr_on_hostA2):
-        cold_migration_then_come_back(vm_on_lvmoiscsi_sr, host, lvmoiscsi_sr, hostA2, local_sr_on_hostA2)
+    def test_cold_intrapool_migration(self, host, hostA2, vm_on_lvmoiscsi_sr, local_sr_on_hostA2):
+        cold_migration_then_come_back(vm_on_lvmoiscsi_sr, host, hostA2, local_sr_on_hostA2)
 
-    def test_live_intrapool_migration(self, host, hostA2, vm_on_lvmoiscsi_sr, lvmoiscsi_sr, local_sr_on_hostA2):
-        live_storage_migration_then_come_back(vm_on_lvmoiscsi_sr, host, lvmoiscsi_sr, hostA2, local_sr_on_hostA2)
+    def test_live_intrapool_migration(self, host, hostA2, vm_on_lvmoiscsi_sr, local_sr_on_hostA2):
+        live_storage_migration_then_come_back(vm_on_lvmoiscsi_sr, host, hostA2, local_sr_on_hostA2)

tests/storage/moosefs/test_moosefs_sr_crosspool_migration.py

@@ -14,8 +14,8 @@
 @pytest.mark.big_vm # and ideally on a big VM to test it scales
 @pytest.mark.usefixtures("hostB1", "local_sr_on_hostB1", "host_no_ipv6") # MooseFS doesn't support IPv6
 class Test:
-    def test_cold_crosspool_migration(self, host, hostB1, vm_on_moosefs_sr, moosefs_sr, local_sr_on_hostB1):
-        cold_migration_then_come_back(vm_on_moosefs_sr, host, moosefs_sr, hostB1, local_sr_on_hostB1)
+    def test_cold_crosspool_migration(self, host, hostB1, vm_on_moosefs_sr, local_sr_on_hostB1):
+        cold_migration_then_come_back(vm_on_moosefs_sr, host, hostB1, local_sr_on_hostB1)
 
-    def test_live_crosspool_migration(self, host, hostB1, vm_on_moosefs_sr, moosefs_sr, local_sr_on_hostB1):
-        live_storage_migration_then_come_back(vm_on_moosefs_sr, host, moosefs_sr, hostB1, local_sr_on_hostB1)
+    def test_live_crosspool_migration(self, host, hostB1, vm_on_moosefs_sr, local_sr_on_hostB1):
+        live_storage_migration_then_come_back(vm_on_moosefs_sr, host, hostB1, local_sr_on_hostB1)

tests/storage/moosefs/test_moosefs_sr_intrapool_migration.py

@@ -14,11 +14,12 @@
 @pytest.mark.big_vm # and ideally on a big VM to test it scales
 @pytest.mark.usefixtures("hostA2", "local_sr_on_hostA2", "host_no_ipv6") # MooseFS doesn't support IPv6
 class Test:
-    def test_live_intrapool_shared_migration(self, host, hostA2, vm_on_moosefs_sr, moosefs_sr):
-        live_storage_migration_then_come_back(vm_on_moosefs_sr, host, moosefs_sr, hostA2, moosefs_sr)
+    def test_live_intrapool_shared_migration(self, host, hostA2, vm_on_moosefs_sr):
+        sr = vm_on_moosefs_sr.get_sr()
+        live_storage_migration_then_come_back(vm_on_moosefs_sr, host, hostA2, sr)
 
-    def test_cold_intrapool_migration(self, host, hostA2, vm_on_moosefs_sr, moosefs_sr, local_sr_on_hostA2):
-        cold_migration_then_come_back(vm_on_moosefs_sr, host, moosefs_sr, hostA2, local_sr_on_hostA2)
+    def test_cold_intrapool_migration(self, host, hostA2, vm_on_moosefs_sr, local_sr_on_hostA2):
+        cold_migration_then_come_back(vm_on_moosefs_sr, host, hostA2, local_sr_on_hostA2)
 
-    def test_live_intrapool_migration(self, host, hostA2, vm_on_moosefs_sr, moosefs_sr, local_sr_on_hostA2):
-        live_storage_migration_then_come_back(vm_on_moosefs_sr, host, moosefs_sr, hostA2, local_sr_on_hostA2)
+    def test_live_intrapool_migration(self, host, hostA2, vm_on_moosefs_sr, local_sr_on_hostA2):
+        live_storage_migration_then_come_back(vm_on_moosefs_sr, host, hostA2, local_sr_on_hostA2)

tests/storage/nfs/conftest.py

@@ -1,6 +1,14 @@
 import logging
 import pytest
 
+# --- Dispatch fixture for NFS versions ----------------------------------------
+
+@pytest.fixture
+def dispatch_nfs(request):
+    yield request.getfixturevalue(request.param)
+
+# --- NFS3 fixtures ------------------------------------------------------------
+
 @pytest.fixture(scope='package')
 def nfs_device_config(sr_device_config):
     if sr_device_config is not None:
@@ -39,3 +47,44 @@ def vm_on_nfs_sr(host, nfs_sr, vm_ref):
     # teardown
     logging.info("<< Destroy VM")
     vm.destroy(verify=True)
+
+# --- NFS4+ only fixtures ------------------------------------------------------
+
+@pytest.fixture(scope='package')
+def nfs4_device_config(sr_device_config):
+    if sr_device_config is not None:
+        # SR device config from CLI param
+        config = sr_device_config
+    else:
+        # SR device config from data.py defaults
+        try:
+            from data import DEFAULT_NFS4_DEVICE_CONFIG
+        except ImportError:
+            DEFAULT_NFS4_DEVICE_CONFIG = {}
+        if DEFAULT_NFS4_DEVICE_CONFIG:
+            config = DEFAULT_NFS4_DEVICE_CONFIG
+        else:
+            raise Exception("No default NFS4+ device-config found, neither in CLI nor in data.py defaults")
+    return config
+
+@pytest.fixture(scope='package')
+def nfs4_sr(host, nfs4_device_config):
+    """ A NFS4+ SR on first host. """
+    sr = host.sr_create('nfs', "NFS4-SR-test", nfs4_device_config, shared=True)
+    yield sr
+    # teardown
+    sr.destroy()
+
+@pytest.fixture(scope='module')
+def vdi_on_nfs4_sr(nfs4_sr):
+    vdi = nfs4_sr.create_vdi('NFS4-VDI-test')
+    yield vdi
+    vdi.destroy()
+
+@pytest.fixture(scope='module')
+def vm_on_nfs4_sr(host, nfs4_sr, vm_ref):
+    vm = host.import_vm(vm_ref, sr_uuid=nfs4_sr.uuid)
+    yield vm
+    # teardown
+    logging.info("<< Destroy VM")
+    vm.destroy(verify=True)