Skip to content

smoke tests: Fix cluster DRS & non-strict host affinity smoke test failures on XenServer / XCP-ng #10761

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

Merged
DaanHoogland merged 4 commits into from
Apr 26, 2025
Merged

smoke tests: Fix cluster DRS & non-strict host affinity smoke test failures on XenServer / XCP-ng #10761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f83508c
smoke test: Fix cluster DRS smoke test failure on XenServer / XCP-ng
Pearl1594 Apr 22, 2025
4841969
Update test_cluster_drs.py
Pearl1594 Apr 22, 2025
eb90db1
fix non-strict affinity group tests on Xenserver due to missing PV dr…
Pearl1594 Apr 23, 2025
39d6d88
address comment
Pearl1594 Apr 24, 2025
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
13 changes: 11 additions & 2 deletions test/integration/smoke/test_cluster_drs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@
import time
from collections.abc import Iterable

from marvin.codes import FAILED
from marvin.cloudstackTestCase import cloudstackTestCase
from marvin.cloudstackAPI import (migrateSystemVm, listRouters, listSystemVms)
from marvin.lib.base import (Cluster, Configurations, Host, Network, NetworkOffering, ServiceOffering, VirtualMachine,
Zone)
from marvin.lib.common import (get_domain, get_zone, get_template)
from marvin.lib.common import (get_domain, get_zone, get_test_template)
from marvin.lib.utils import wait_until
from marvin import jsonHelper
from nose.plugins.attrib import attr
Expand All @@ -43,7 +44,15 @@ def setUpClass(cls):

zone = get_zone(cls.apiclient, cls.testClient.getZoneForTests())
cls.zone = Zone(zone.__dict__)
cls.template = get_template(cls.apiclient, cls.zone.id)
cls.hypervisor = cls.testClient.getHypervisorInfo()
cls.template = get_test_template(
cls.apiclient,
cls.zone.id,
cls.hypervisor
)
if cls.template == FAILED:
assert False, "get_test_template() failed to return template\
with hypervisor %s" % cls.hypervisor
cls._cleanup = []

cls.logger = logging.getLogger("TestClusterDRS")
Expand Down
10 changes: 8 additions & 2 deletions test/integration/smoke/test_nonstrict_affinity_group.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import logging

from marvin.codes import FAILED
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import cloudstackTestCase
from marvin.cloudstackAPI import startVirtualMachine, stopVirtualMachine, destroyVirtualMachine
Expand All @@ -37,7 +38,8 @@

from marvin.lib.common import (get_domain,
get_zone,
get_template)
get_template,
get_test_template)


class TestNonStrictAffinityGroups(cloudstackTestCase):
Expand All @@ -54,7 +56,11 @@ def setUpClass(cls):

zone = get_zone(cls.apiclient, cls.testClient.getZoneForTests())
cls.zone = Zone(zone.__dict__)
cls.template = get_template(cls.apiclient, cls.zone.id)
cls.hypervisor = cls.testClient.getHypervisorInfo()
cls.template = get_test_template(cls.apiclient, cls.zone.id, cls.hypervisor)
if cls.template == FAILED:
assert False, "get_test_template() failed to return template\
with hypervisor %s" % cls.hypervisor
cls._cleanup = []

cls.logger = logging.getLogger("TestNonStrictAffinityGroups")
Expand Down
Loading