Skip to content

Create tests for vdi_revert on lvm based SRs #631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
klmp200 wants to merge 1 commit into
base: vdi_revert
Choose a base branch
from
Open

Create tests for vdi_revert on lvm based SRs #631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions tests/storage/lvm/test_lvm_sr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@
vdi_is_open,
xva_export_import,
)
from tests.storage.storage import (
check_vdi_revert,
check_vdi_revert_cbt,
check_vdi_revert_journal,
check_vdi_revert_journal_cbt,
)

# Requirements:
# - one XCP-ng host with an additional unused disk for the SR
Expand Down Expand Up @@ -150,6 +156,34 @@ def test_vdi_export_import(self, storage_test_vm: VM, lvm_sr: SR, image_format:
defer: Defer) -> None:
vdi_export_import(storage_test_vm, lvm_sr, image_format, temp_large_dir, defer)

@pytest.mark.small_vm
@pytest.mark.big_vm
def test_revert(self, vm_on_lvm_sr: VM, defer: Defer) -> None:
check_vdi_revert(defer, vm_on_lvm_sr)

@pytest.mark.small_vm
@pytest.mark.big_vm
def test_revert_cbt(self, vm_on_lvm_sr: VM, defer: Defer) -> None:
check_vdi_revert_cbt(defer, vm_on_lvm_sr)

@pytest.mark.small_vm
@pytest.mark.big_vm
def test_revert_journal_cbt(self, vm_on_lvm_sr: VM, defer: Defer, exit_on_fistpoint: None):
check_vdi_revert_journal_cbt(defer, vm_on_lvm_sr, "LVM_revert_create_src")

@pytest.mark.small_vm
@pytest.mark.big_vm
@pytest.mark.parametrize(
"fistpoint",
[
"LVM_revert_create_insert",
"LVM_revert_create_src",
"LVM_revert_create_dest",
]
)
def test_revert_journal(self, vm_on_lvm_sr: VM, defer: Defer, exit_on_fistpoint: None, fistpoint: str):
check_vdi_revert_journal(defer, vm_on_lvm_sr, fistpoint)

# *** tests with reboots (longer tests).

@pytest.mark.reboot
Expand Down
45 changes: 45 additions & 0 deletions tests/storage/lvmohba/test_lvmohba_sr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

from lib.commands import SSHCommandFailed
from lib.common import Defer, vm_image, wait_for
from lib.host import Host
from lib.sr import SR
from lib.vdi import VDI, ImageFormat
from lib.vm import VM
Expand All @@ -16,6 +17,13 @@
vdi_is_open,
xva_export_import,
)
from tests.storage.storage import (
check_critical_journal_revert,
check_vdi_revert,
check_vdi_revert_cbt,
check_vdi_revert_journal,
check_vdi_revert_journal_cbt,
)

# Requirements:
# - one XCP-ng host >= 8.2
Expand Down Expand Up @@ -82,6 +90,43 @@ def test_vdi_export_import(self, storage_test_vm: VM, lvmohba_sr: SR, image_form
temp_large_dir: str, defer: Defer):
vdi_export_import(storage_test_vm, lvmohba_sr, image_format, temp_large_dir, defer)

@pytest.mark.small_vm
@pytest.mark.big_vm
def test_revert(self, vm_on_lvmohba_sr: VM, defer: Defer) -> None:
check_vdi_revert(defer, vm_on_lvmohba_sr)

@pytest.mark.small_vm
@pytest.mark.big_vm
def test_revert_cbt(self, vm_on_lvmohba_sr: VM, defer: Defer) -> None:
check_vdi_revert_cbt(defer, vm_on_lvmohba_sr)

@pytest.mark.small_vm
@pytest.mark.big_vm
def test_revert_journal_cbt(self, vm_on_lvmohba_sr: VM, defer: Defer, exit_on_fistpoint: None):
check_vdi_revert_journal_cbt(
defer, vm_on_lvmohba_sr, "LVM_revert_create_src", vm_on_lvmohba_sr.host.pool.master
)

@pytest.mark.small_vm
@pytest.mark.big_vm
@pytest.mark.parametrize(
"fistpoint",
[
"LVM_revert_create_insert",
"LVM_revert_create_src",
"LVM_revert_create_dest",
]
)
def test_revert_journal(self, vm_on_lvmohba_sr: VM, defer: Defer, exit_on_fistpoint: None, fistpoint: str):
check_vdi_revert_journal(defer, vm_on_lvmohba_sr, fistpoint, vm_on_lvmohba_sr.host.pool.master)

@pytest.mark.small_vm
@pytest.mark.big_vm
def test_critical_journal_revert(
self, vm_on_lvmohba_sr: VM, defer: Defer, exit_on_fistpoint: None, hostA2: Host
) -> None:
check_critical_journal_revert(defer, vm_on_lvmohba_sr, hostA2, "LVM_revert_create_src")

# *** tests with reboots (longer tests).

@pytest.mark.reboot
Expand Down
44 changes: 44 additions & 0 deletions tests/storage/lvmoiscsi/test_lvmoiscsi_sr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@
vdi_is_open,
xva_export_import,
)
from tests.storage.storage import (
check_critical_journal_revert,
check_vdi_revert,
check_vdi_revert_cbt,
check_vdi_revert_journal,
check_vdi_revert_journal_cbt,
)

# Requirements:
# - one XCP-ng host >= 8.2
Expand Down Expand Up @@ -84,6 +91,43 @@ def test_vdi_export_import(self, storage_test_vm: VM, lvmoiscsi_sr: SR, image_fo
temp_large_dir: str, defer: Defer) -> None:
vdi_export_import(storage_test_vm, lvmoiscsi_sr, image_format, temp_large_dir, defer)

@pytest.mark.small_vm
@pytest.mark.big_vm
def test_revert(self, vm_on_lvmoiscsi_sr: VM, defer: Defer) -> None:
check_vdi_revert(defer, vm_on_lvmoiscsi_sr)

@pytest.mark.small_vm
@pytest.mark.big_vm
def test_revert_cbt(self, vm_on_lvmoiscsi_sr: VM, defer: Defer) -> None:
check_vdi_revert_cbt(defer, vm_on_lvmoiscsi_sr)

@pytest.mark.small_vm
@pytest.mark.big_vm
def test_revert_journal_cbt(self, vm_on_lvmoiscsi_sr: VM, defer: Defer, exit_on_fistpoint: None):
check_vdi_revert_journal_cbt(
defer, vm_on_lvmoiscsi_sr, "LVM_revert_create_src", vm_on_lvmoiscsi_sr.host.pool.master
)

@pytest.mark.small_vm
@pytest.mark.big_vm
@pytest.mark.parametrize(
"fistpoint",
[
"LVM_revert_create_insert",
"LVM_revert_create_src",
"LVM_revert_create_dest",
]
)
def test_revert_journal(self, vm_on_lvmoiscsi_sr: VM, defer: Defer, exit_on_fistpoint: None, fistpoint: str):
check_vdi_revert_journal(defer, vm_on_lvmoiscsi_sr, fistpoint, vm_on_lvmoiscsi_sr.host.pool.master)

@pytest.mark.small_vm
@pytest.mark.big_vm
def test_critical_journal_revert(
self, vm_on_lvmoiscsi_sr: VM, defer: Defer, exit_on_fistpoint: None, hostA2: Host
) -> None:
check_critical_journal_revert(defer, vm_on_lvmoiscsi_sr, hostA2, "LVM_revert_create_src")

# *** tests with reboots (longer tests).

@pytest.mark.reboot
Expand Down
Loading