storage: Parametrize xva_export_import over the new with_snapshot parameter

Signed-off-by: Andrii Sultanov <andriy.sultanov@vates.tech>

Author: last-genius

tests/storage/ext/test_ext_sr.py

@@ -92,8 +92,9 @@ def test_coalesce(self, storage_test_vm: VM, vdi_on_ext_sr: VDI, vdi_op: Coalesc
 
     @pytest.mark.small_vm
     @pytest.mark.parametrize("compression", ["none", "gzip", "zstd"])
-    def test_xva_export_import(self, vm_on_ext_sr: VM, compression: XVACompression):
-        xva_export_import(vm_on_ext_sr, compression)
+    @pytest.mark.parametrize("with_snapshot", [True, False])
+    def test_xva_export_import(self, vm_on_ext_sr: VM, compression: XVACompression, with_snapshot: bool):
+        xva_export_import(vm_on_ext_sr, compression, with_snapshot)
 
     @pytest.mark.small_vm
     def test_vdi_export_import(self, storage_test_vm: VM, ext_sr: SR, image_format: ImageFormat):

tests/storage/lvm/test_lvm_sr.py

@@ -145,8 +145,9 @@ def test_coalesce(self, storage_test_vm: VM, vdi_on_lvm_sr: VDI, vdi_op: Coalesc
 
     @pytest.mark.small_vm
     @pytest.mark.parametrize("compression", ["none", "gzip", "zstd"])
-    def test_xva_export_import(self, vm_on_lvm_sr: VM, compression: XVACompression):
-        xva_export_import(vm_on_lvm_sr, compression)
+    @pytest.mark.parametrize("with_snapshot", [True, False])
+    def test_xva_export_import(self, vm_on_lvm_sr: VM, compression: XVACompression, with_snapshot: bool):
+        xva_export_import(vm_on_lvm_sr, compression, with_snapshot)
 
     @pytest.mark.small_vm
     def test_vdi_export_import(self, storage_test_vm: VM, lvm_sr: SR, image_format: ImageFormat):

tests/storage/lvmoiscsi/test_lvmoiscsi_sr.py

@@ -69,8 +69,9 @@ def test_coalesce(self, storage_test_vm: 'VM', vdi_on_lvmoiscsi_sr: 'VDI', vdi_o
 
     @pytest.mark.small_vm
     @pytest.mark.parametrize("compression", ["none", "gzip", "zstd"])
-    def test_xva_export_import(self, vm_on_lvmoiscsi_sr: VM, compression: XVACompression):
-        xva_export_import(vm_on_lvmoiscsi_sr, compression)
+    @pytest.mark.parametrize("with_snapshot", [True, False])
+    def test_xva_export_import(self, vm_on_lvmoiscsi_sr: VM, compression: XVACompression, with_snapshot: bool):
+        xva_export_import(vm_on_lvmoiscsi_sr, compression, with_snapshot)
 
     @pytest.mark.small_vm
     def test_vdi_export_import(self, storage_test_vm: VM, lvmoiscsi_sr: SR, image_format: ImageFormat):

tests/storage/nfs/test_nfs_sr.py

@@ -123,8 +123,9 @@ def test_coalesce(self, storage_test_vm: VM, dispatch_nfs: VDI, vdi_op: Coalesce
     @pytest.mark.usefixtures('vm_ref')
     @pytest.mark.parametrize('dispatch_nfs', ['vm_on_nfs_sr', 'vm_on_nfs4_sr'], indirect=True)
     @pytest.mark.parametrize("compression", ["none", "gzip", "zstd"])
-    def test_xva_export_import(self, dispatch_nfs: VM, compression: XVACompression):
-        xva_export_import(dispatch_nfs, compression)
+    @pytest.mark.parametrize("with_snapshot", [True, False])
+    def test_xva_export_import(self, dispatch_nfs: VM, compression: XVACompression, with_snapshot: bool):
+        xva_export_import(dispatch_nfs, compression, with_snapshot)
 
     @pytest.mark.small_vm
     @pytest.mark.parametrize('dispatch_nfs', ['nfs_sr', 'nfs4_sr'], indirect=True)

tests/storage/xfs/test_xfs_sr.py

@@ -109,8 +109,9 @@ def test_coalesce(self, storage_test_vm: VM, vdi_on_xfs_sr: VDI, vdi_op: Coalesc
 
     @pytest.mark.small_vm
     @pytest.mark.parametrize("compression", ["none", "gzip", "zstd"])
-    def test_xva_export_import(self, vm_on_xfs_sr: VM, compression: XVACompression):
-        xva_export_import(vm_on_xfs_sr, compression)
+    @pytest.mark.parametrize("with_snapshot", [True, False])
+    def test_xva_export_import(self, vm_on_xfs_sr: VM, compression: XVACompression, with_snapshot: bool):
+        xva_export_import(vm_on_xfs_sr, compression, with_snapshot)
 
     @pytest.mark.small_vm
     def test_vdi_export_import(self, storage_test_vm: VM, xfs_sr: SR, image_format: ImageFormat):

tests/storage/zfs/test_zfs_sr.py

@@ -111,8 +111,9 @@ def test_coalesce(self, storage_test_vm: VM, vdi_on_zfs_sr: VDI, vdi_op: Coalesc
 
     @pytest.mark.small_vm
     @pytest.mark.parametrize("compression", ["none", "gzip", "zstd"])
-    def test_xva_export_import(self, vm_on_zfs_sr: VM, compression: XVACompression):
-        xva_export_import(vm_on_zfs_sr, compression)
+    @pytest.mark.parametrize("with_snapshot", [True, False])
+    def test_xva_export_import(self, vm_on_zfs_sr: VM, compression: XVACompression, with_snapshot: bool):
+        xva_export_import(vm_on_zfs_sr, compression, with_snapshot)
 
     @pytest.mark.small_vm
     def test_vdi_export_import(self, storage_test_vm: VM, zfs_sr: SR, image_format: ImageFormat):

tests/storage/zfsvol/test_zfsvol_sr.py

@@ -68,8 +68,9 @@ def test_coalesce(self, storage_test_vm: VM, vdi_on_zfsvol_sr: VDI, vdi_op: Coal
 
     @pytest.mark.small_vm
     @pytest.mark.parametrize("compression", ["none", "gzip", "zstd"])
-    def test_xva_export_import(self, vm_on_zfsvol_sr: VM, compression: XVACompression):
-        xva_export_import(vm_on_zfsvol_sr, compression)
+    @pytest.mark.parametrize("with_snapshot", [True, False])
+    def test_xva_export_import(self, vm_on_zfsvol_sr: VM, compression: XVACompression, with_snapshot: bool):
+        xva_export_import(vm_on_zfsvol_sr, compression, with_snapshot)
 
     @pytest.mark.small_vm
     def test_vdi_export_import(self, storage_test_vm: VM, zfsvol_sr: SR, image_format: ImageFormat):