Skip to content
This repository was archived by the owner on Apr 7, 2022. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions cfme/fixtures/templates.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ class Templates(NamedConstant):
RHEL69_TEMPLATE = "rhel69_template"
RHEL7_MINIMAL = "rhel7_minimal"
RHEL7_MINIMAL_MODSCOPE = "rhel7_minimal_modscope"
RHEL8_TEMPLATE = "rhel81_template"
UBUNTU16_TEMPLATE = "ubuntu16_template"
WIN7_TEMPLATE = "win7_template"
WIN10_TEMPLATE = "win10_template"
Expand Down Expand Up @@ -157,6 +158,16 @@ def rhel74_template_modscope(provider):
return _get_template(provider, 'rhel74_template')


@pytest.fixture(scope="function")
def rhel81_template(provider):
return _get_template(provider, 'rhel81_template')


@pytest.fixture(scope="module")
def rhel81_template_modscope(provider):
return _get_template(provider, 'rhel81_template')


@pytest.fixture(scope="function")
def win7_template(provider):
return _get_template(provider, 'win7_template')
Expand Down
4 changes: 3 additions & 1 deletion cfme/tests/v2v/test_v2v_migrations.py
Original file line number Diff line number Diff line change
Expand Up @@ -286,9 +286,11 @@ def _cleanup():
["nfs", "nfs", [Templates.RHEL69_TEMPLATE]],
["nfs", "nfs", [Templates.WIN2012_TEMPLATE]],
["nfs", "nfs", [Templates.UBUNTU16_TEMPLATE]],
["nfs", "nfs", [Templates.RHEL8_TEMPLATE]],
],
ids=[Templates.WIN7_TEMPLATE, Templates.WIN10_TEMPLATE, Templates.WIN2016_TEMPLATE,
Templates.RHEL69_TEMPLATE, Templates.WIN2012_TEMPLATE, Templates.UBUNTU16_TEMPLATE]
Templates.RHEL69_TEMPLATE, Templates.WIN2012_TEMPLATE, Templates.UBUNTU16_TEMPLATE,
Templates.RHEL8_TEMPLATE]
)
def test_migrations_different_os_templates(request, appliance, provider,
source_type, dest_type, template_type,
Expand Down