Remove dependancy to XO in migration tests

Signed-off-by: Benjamin Reis <[email protected]>

tests/storage/cephfs/test_cephfs_sr_crosspool_migration.py

@@ -12,7 +12,7 @@
 
 @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
-@pytest.mark.usefixtures("hostB1", "hosts_with_xo", "local_sr_on_hostB1")
+@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)

tests/storage/cephfs/test_cephfs_sr_intrapool_migration.py

@@ -12,7 +12,7 @@
 
 @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
-@pytest.mark.usefixtures("hostA2", "hosts_with_xo", "local_sr_on_hostA2")
+@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)

tests/storage/ext/test_ext_sr_crosspool_migration.py

@@ -10,7 +10,7 @@
 
 @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
-@pytest.mark.usefixtures("hostB1", "hosts_with_xo", "local_sr_on_hostB1")
+@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)

tests/storage/ext/test_ext_sr_intrapool_migration.py

@@ -10,7 +10,7 @@
 
 @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
-@pytest.mark.usefixtures("hostA2", "hosts_with_xo", "local_sr_on_hostA2")
+@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)

tests/storage/glusterfs/test_glusterfs_sr_crosspool_migration.py

@@ -12,7 +12,7 @@
 
 @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
-@pytest.mark.usefixtures("hostB1", "hosts_with_xo", "local_sr_on_hostB1", "sr_disk_for_all_hosts")
+@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)

tests/storage/glusterfs/test_glusterfs_sr_intrapool_migration.py

@@ -12,7 +12,7 @@
 
 @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
-@pytest.mark.usefixtures("hostA2", "hosts_with_xo", "local_sr_on_hostA2", "sr_disk_for_all_hosts")
+@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)

tests/storage/linstor/test_linstor_sr_crosspool_migration.py

@@ -12,7 +12,7 @@
 
 @pytest.mark.small_vm # run with a small VM to test the features
 @pytest.mark.big_vm # and ideally on a big VM to test it scales
-@pytest.mark.usefixtures("hostB1", "hosts_with_xo", "local_sr_on_hostB1")
+@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)

tests/storage/linstor/test_linstor_sr_intrapool_migration.py

@@ -12,7 +12,7 @@
 
 @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
-@pytest.mark.usefixtures("hostA2", "hosts_with_xo", "local_sr_on_hostA2")
+@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)

tests/storage/lvm/test_lvm_sr_crosspool_migration.py

@@ -10,7 +10,7 @@
 
 @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
-@pytest.mark.usefixtures("hostB1", "hosts_with_xo", "local_sr_on_hostB1")
+@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)

tests/storage/lvm/test_lvm_sr_intrapool_migration.py

@@ -10,7 +10,7 @@
 
 @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
-@pytest.mark.usefixtures("hostA2", "hosts_with_xo", "local_sr_on_hostA2")
+@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)

tests/storage/lvmoiscsi/test_lvmoiscsi_sr_crosspool_migration.py

@@ -10,7 +10,7 @@
 
 @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
-@pytest.mark.usefixtures("hostB1", "hosts_with_xo", "local_sr_on_hostB1")
+@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)

tests/storage/lvmoiscsi/test_lvmoiscsi_sr_intrapool_migration.py

@@ -10,7 +10,7 @@
 
 @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
-@pytest.mark.usefixtures("hostA2", "hosts_with_xo", "local_sr_on_hostA2")
+@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)

tests/storage/moosefs/test_moosefs_sr_crosspool_migration.py

@@ -12,7 +12,7 @@
 
 @pytest.mark.small_vm # run with a small VM to test the features
 @pytest.mark.big_vm # and ideally on a big VM to test it scales
-@pytest.mark.usefixtures("hostB1", "hosts_with_xo", "local_sr_on_hostB1")
+@pytest.mark.usefixtures("hostB1", "local_sr_on_hostB1")
 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)

tests/storage/moosefs/test_moosefs_sr_intrapool_migration.py

@@ -12,7 +12,7 @@
 
 @pytest.mark.small_vm # run with a small VM to test the features
 @pytest.mark.big_vm # and ideally on a big VM to test it scales
-@pytest.mark.usefixtures("hostA2", "hosts_with_xo", "local_sr_on_hostA2")
+@pytest.mark.usefixtures("hostA2", "local_sr_on_hostA2")
 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)

tests/storage/nfs/test_nfs_sr_crosspool_migration.py

@@ -10,7 +10,7 @@
 
 @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
-@pytest.mark.usefixtures("hostB1", "hosts_with_xo", "local_sr_on_hostB1")
+@pytest.mark.usefixtures("hostB1", "local_sr_on_hostB1")
 class Test:
     def test_cold_crosspool_migration(self, host, hostB1, vm_on_nfs_sr, nfs_sr, local_sr_on_hostB1):
         cold_migration_then_come_back(vm_on_nfs_sr, host, nfs_sr, hostB1, local_sr_on_hostB1)

tests/storage/nfs/test_nfs_sr_intrapool_migration.py

@@ -10,7 +10,7 @@
 
 @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
-@pytest.mark.usefixtures("hostA2", "hosts_with_xo", "local_sr_on_hostA2")
+@pytest.mark.usefixtures("hostA2", "local_sr_on_hostA2")
 class Test:
     def test_live_intrapool_shared_migration(self, host, hostA2, vm_on_nfs_sr, nfs_sr):
         live_storage_migration_then_come_back(vm_on_nfs_sr, host, nfs_sr, hostA2, nfs_sr)

tests/storage/xfs/test_xfs_sr_crosspool_migration.py

@@ -12,7 +12,7 @@
 
 @pytest.mark.small_vm # run with a small VM to test the features
 @pytest.mark.big_vm # and ideally on a big VM to test it scales
-@pytest.mark.usefixtures("hostB1", "hosts_with_xo", "local_sr_on_hostB1")
+@pytest.mark.usefixtures("hostB1", "local_sr_on_hostB1")
 class Test:
     def test_cold_crosspool_migration(self, host, hostB1, vm_on_xfs_sr, xfs_sr, local_sr_on_hostB1):
         cold_migration_then_come_back(vm_on_xfs_sr, host, xfs_sr, hostB1, local_sr_on_hostB1)

tests/storage/xfs/test_xfs_sr_intrapool_migration.py

@@ -12,7 +12,7 @@
 
 @pytest.mark.small_vm # run with a small VM to test the features
 @pytest.mark.big_vm # and ideally on a big VM to test it scales
-@pytest.mark.usefixtures("hostA2", "hosts_with_xo", "local_sr_on_hostA2")
+@pytest.mark.usefixtures("hostA2", "local_sr_on_hostA2")
 class Test:
     def test_cold_intrapool_migration(self, host, hostA2, vm_on_xfs_sr, xfs_sr, local_sr_on_hostA2):
         cold_migration_then_come_back(vm_on_xfs_sr, host, xfs_sr, hostA2, local_sr_on_hostA2)

tests/storage/zfs/test_zfs_sr_crosspool_migration.py

@@ -12,7 +12,7 @@
 
 @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
-@pytest.mark.usefixtures("hostB1", "hosts_with_xo", "local_sr_on_hostB1")
+@pytest.mark.usefixtures("hostB1", "local_sr_on_hostB1")
 class Test:
     def test_cold_crosspool_migration(self, host, hostB1, vm_on_zfs_sr, zfs_sr, local_sr_on_hostB1):
         cold_migration_then_come_back(vm_on_zfs_sr, host, zfs_sr, hostB1, local_sr_on_hostB1)

tests/storage/zfs/test_zfs_sr_intrapool_migration.py

@@ -12,7 +12,7 @@
 
 @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
-@pytest.mark.usefixtures("hostA2", "hosts_with_xo", "local_sr_on_hostA2")
+@pytest.mark.usefixtures("hostA2", "local_sr_on_hostA2")
 class Test:
     def test_cold_intrapool_migration(self, host, hostA2, vm_on_zfs_sr, zfs_sr, local_sr_on_hostA2):
         cold_migration_then_come_back(vm_on_zfs_sr, host, zfs_sr, hostA2, local_sr_on_hostA2)