implement cbt tests on XFSSR

Signed-off-by: Goulven Riou <goulven.riou@vates.tech>

Author: Lankou66

tests/storage/nfs/test_nfs_sr.py

@@ -11,9 +11,12 @@
 from lib.vm import VM
 from tests.storage import (
     MAX_VDI_SIZE,
+    CBTTest,
     CoalesceOperation,
     ImageFormat,
     XVACompression,
+    assert_cbt_log_does_not_exist_file_sr,
+    assert_cbt_log_exists_file_sr,
     coalesce_integrity,
     full_vdi_write,
     vdi_export_import,
@@ -24,6 +27,7 @@
 # Requirements:
 # - one XCP-ng host >= 8.0 with an additional unused disk for the SR
 
+
 class TestNFSSRCreateDestroy:
     @pytest.mark.parametrize('dispatch_nfs', ['nfs_device_config', 'nfs4_device_config'], indirect=True)
     def test_create_and_destroy_sr(self, host: Host, dispatch_nfs: dict[str, str]) -> None:
@@ -37,6 +41,8 @@ def test_create_and_destroy_sr(self, host: Host, dispatch_nfs: dict[str, str]) -
         sr.destroy(verify=True)
 
 # Make sure this fixture is called before the parametrized one
+
+
 @pytest.mark.usefixtures('image_format')
 class TestNFSSR:
     @pytest.mark.quicktest
@@ -172,3 +178,59 @@ def test_reboot(self, host: Host, dispatch_nfs: VM) -> None:
         vm.shutdown(verify=True)
 
     # *** End of tests with reboots
+
+
+class TestNFSCBT(CBTTest):
+    """Test CBT functionality on NFS SR"""
+
+    @staticmethod
+    def assert_cbt_log_exists(host: Host, sr: SR, vdi: VDI) -> None:
+        assert_cbt_log_exists_file_sr(host, sr, vdi)
+
+    @staticmethod
+    def assert_cbt_log_does_not_exist(host: Host, sr: SR, vdi: VDI) -> None:
+        assert_cbt_log_does_not_exist_file_sr(host, sr, vdi)
+
+    def test_enable_disable_cbt(self, host: Host, nfs_sr: SR, vdi_on_nfs_sr: VDI) -> None:
+        self._test_enable_disable_cbt(host, nfs_sr, vdi_on_nfs_sr)
+
+    def test_cbt_log_creation(self, host: Host, nfs_sr: SR, vdi_on_nfs_sr: VDI) -> None:
+        self._test_cbt_log_creation(host, nfs_sr, vdi_on_nfs_sr)
+
+    def test_snapshot_with_cbt(self, host: Host, nfs_sr: SR, vdi_on_nfs_sr: VDI) -> None:
+        self._test_snapshot_with_cbt(host, nfs_sr, vdi_on_nfs_sr)
+
+    @pytest.mark.small_vm
+    def test_changed_blocks_tracking(self, host: Host, nfs_sr: SR, vdi_on_nfs_sr: VDI, vm_on_nfs_sr: VM) -> None:
+        self._test_changed_blocks_tracking(host, nfs_sr, vdi_on_nfs_sr, vm_on_nfs_sr)
+
+    @pytest.mark.small_vm
+    def test_cbt_after_coalesce(self, host: Host, nfs_sr: SR, vdi_on_nfs_sr: VDI, vm_on_nfs_sr: VM) -> None:
+        self._test_cbt_after_coalesce(host, nfs_sr, vdi_on_nfs_sr, vm_on_nfs_sr)
+
+    @pytest.mark.small_vm
+    def test_incremental_snap_scenario(self, host: Host, nfs_sr: SR, vdi_on_nfs_sr: VDI, vm_on_nfs_sr: VM) -> None:
+        self._test_incremental_snap_scenario(host, nfs_sr, vdi_on_nfs_sr, vm_on_nfs_sr)
+
+    def test_disable_cbt_removes_log(self, host: Host, nfs_sr: SR, vdi_on_nfs_sr: VDI) -> None:
+        self._test_disable_cbt_removes_log(host, nfs_sr, vdi_on_nfs_sr)
+
+    def test_destroy_vdi_removes_cbt_log(self, host: Host, nfs_sr: SR, vdi_on_nfs_sr: VDI) -> None:
+        self._test_destroy_vdi_removes_cbt_log(host, nfs_sr, vdi_on_nfs_sr)
+
+    def test_cbt_persist_after_sr_reboot(self, host: Host, nfs_sr: SR, vdi_on_nfs_sr: VDI) -> None:
+        self._test_cbt_persist_after_sr_reboot(host, nfs_sr, vdi_on_nfs_sr)
+
+    def test_cbt_on_snapshot_chain(self, host: Host, nfs_sr: SR, vdi_on_nfs_sr: VDI) -> None:
+        self._test_cbt_on_snapshot_chain(host, nfs_sr, vdi_on_nfs_sr)
+
+    def test_cbt_parent_disable_does_not_affect_snapshot(self, host: Host, nfs_sr: SR, vdi_on_nfs_sr: VDI) -> None:
+        self._test_cbt_parent_disable_does_not_affect_snapshot(host, nfs_sr, vdi_on_nfs_sr)
+
+    @pytest.mark.small_vm
+    def test_cbt_bitmap_non_zero_after_write(self, host: Host, nfs_sr: SR, vdi_on_nfs_sr: VDI,
+                                             vm_on_nfs_sr: VM) -> None:
+        self._test_cbt_bitmap_non_zero_after_write(host, nfs_sr, vdi_on_nfs_sr, vm_on_nfs_sr)
+
+    def test_cbt_data_destroy(self, host: Host, nfs_sr: SR, vdi_on_nfs_sr: VDI) -> None:
+        self._test_cbt_data_destroy(host, nfs_sr, vdi_on_nfs_sr)

tests/storage/xfs/test_xfs_sr.py

@@ -13,9 +13,12 @@
 from lib.vm import VM
 from tests.storage import (
     MAX_VDI_SIZE,
+    CBTTest,
     CoalesceOperation,
     ImageFormat,
     XVACompression,
+    assert_cbt_log_does_not_exist_file_sr,
+    assert_cbt_log_exists_file_sr,
     coalesce_integrity,
     full_vdi_write,
     vdi_export_import,
@@ -27,6 +30,7 @@
 # - one XCP-ng host >= 8.2 with an additional unused disk for the SR
 # - access to XCP-ng RPM repository from the host
 
+
 class TestXFSSRCreateDestroy:
     """
     Tests that do not use fixtures that setup the SR or import VMs,
@@ -69,6 +73,7 @@ def test_create_and_destroy_sr(self,
         vm.destroy(verify=True)
         sr.destroy(verify=True)
 
+
 @pytest.mark.usefixtures("xfs_sr")
 class TestXFSSR:
     @pytest.mark.quicktest
@@ -171,3 +176,59 @@ def test_xfsprogs_missing(self, host: Host, xfs_sr: SR) -> None:
                 host.yum_install(['xfsprogs'])
 
     # *** End of tests with reboots
+
+
+class TestXFSCBT(CBTTest):
+    """Test CBT functionality on XFS SR"""
+
+    @staticmethod
+    def assert_cbt_log_exists(host: Host, sr: SR, vdi: VDI) -> None:
+        assert_cbt_log_exists_file_sr(host, sr, vdi)
+
+    @staticmethod
+    def assert_cbt_log_does_not_exist(host: Host, sr: SR, vdi: VDI) -> None:
+        assert_cbt_log_does_not_exist_file_sr(host, sr, vdi)
+
+    def test_enable_disable_cbt(self, host: Host, xfs_sr: SR, vdi_on_xfs_sr: VDI) -> None:
+        self._test_enable_disable_cbt(host, xfs_sr, vdi_on_xfs_sr)
+
+    def test_cbt_log_creation(self, host: Host, xfs_sr: SR, vdi_on_xfs_sr: VDI) -> None:
+        self._test_cbt_log_creation(host, xfs_sr, vdi_on_xfs_sr)
+
+    def test_snapshot_with_cbt(self, host: Host, xfs_sr: SR, vdi_on_xfs_sr: VDI) -> None:
+        self._test_snapshot_with_cbt(host, xfs_sr, vdi_on_xfs_sr)
+
+    @pytest.mark.small_vm
+    def test_changed_blocks_tracking(self, host: Host, xfs_sr: SR, vdi_on_xfs_sr: VDI, vm_on_xfs_sr: VM) -> None:
+        self._test_changed_blocks_tracking(host, xfs_sr, vdi_on_xfs_sr, vm_on_xfs_sr)
+
+    @pytest.mark.small_vm
+    def test_cbt_after_coalesce(self, host: Host, xfs_sr: SR, vdi_on_xfs_sr: VDI, vm_on_xfs_sr: VM) -> None:
+        self._test_cbt_after_coalesce(host, xfs_sr, vdi_on_xfs_sr, vm_on_xfs_sr)
+
+    @pytest.mark.small_vm
+    def test_incremental_snap_scenario(self, host: Host, xfs_sr: SR, vdi_on_xfs_sr: VDI, vm_on_xfs_sr: VM) -> None:
+        self._test_incremental_snap_scenario(host, xfs_sr, vdi_on_xfs_sr, vm_on_xfs_sr)
+
+    def test_disable_cbt_removes_log(self, host: Host, xfs_sr: SR, vdi_on_xfs_sr: VDI) -> None:
+        self._test_disable_cbt_removes_log(host, xfs_sr, vdi_on_xfs_sr)
+
+    def test_destroy_vdi_removes_cbt_log(self, host: Host, xfs_sr: SR, vdi_on_xfs_sr: VDI) -> None:
+        self._test_destroy_vdi_removes_cbt_log(host, xfs_sr, vdi_on_xfs_sr)
+
+    def test_cbt_persist_after_sr_reboot(self, host: Host, xfs_sr: SR, vdi_on_xfs_sr: VDI) -> None:
+        self._test_cbt_persist_after_sr_reboot(host, xfs_sr, vdi_on_xfs_sr)
+
+    def test_cbt_on_snapshot_chain(self, host: Host, xfs_sr: SR, vdi_on_xfs_sr: VDI) -> None:
+        self._test_cbt_on_snapshot_chain(host, xfs_sr, vdi_on_xfs_sr)
+
+    def test_cbt_parent_disable_does_not_affect_snapshot(self, host: Host, xfs_sr: SR, vdi_on_xfs_sr: VDI) -> None:
+        self._test_cbt_parent_disable_does_not_affect_snapshot(host, xfs_sr, vdi_on_xfs_sr)
+
+    @pytest.mark.small_vm
+    def test_cbt_bitmap_non_zero_after_write(self, host: Host, xfs_sr: SR, vdi_on_xfs_sr: VDI,
+                                             vm_on_xfs_sr: VM) -> None:
+        self._test_cbt_bitmap_non_zero_after_write(host, xfs_sr, vdi_on_xfs_sr, vm_on_xfs_sr)
+
+    def test_cbt_data_destroy(self, host: Host, xfs_sr: SR, vdi_on_xfs_sr: VDI) -> None:
+        self._test_cbt_data_destroy(host, xfs_sr, vdi_on_xfs_sr)