openstack/nova
Code Issues Proposed changes

Merge "testing: Reset affinity support global variables"

Browse Source
This commit is contained in:
Zuul
2023-03-06 18:57:21 +00:00
committed by Gerrit Code Review
parent 595443a1ca d533727904
commit c4fe563bdd
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
nova/scheduler/utils.py
View File

@@ -1080,6 +1080,17 @@ _SUPPORTS_SOFT_AFFINITY = None
_SUPPORTS_SOFT_ANTI_AFFINITY = None _SUPPORTS_SOFT_ANTI_AFFINITY = None
def reset_globals():
global _SUPPORTS_AFFINITY
_SUPPORTS_AFFINITY = None
global _SUPPORTS_ANTI_AFFINITY
_SUPPORTS_ANTI_AFFINITY = None
global _SUPPORTS_SOFT_AFFINITY
_SUPPORTS_SOFT_AFFINITY = None
global _SUPPORTS_SOFT_ANTI_AFFINITY
_SUPPORTS_SOFT_ANTI_AFFINITY = None
def _get_group_details(context, instance_uuid, user_group_hosts=None): def _get_group_details(context, instance_uuid, user_group_hosts=None):
"""Provide group_hosts and group_policies sets related to instances if """Provide group_hosts and group_policies sets related to instances if
those instances are belonging to a group and if corresponding filters are those instances are belonging to a group and if corresponding filters are

7
nova/test.py
View File

@@ -62,6 +62,7 @@ from nova import objects
from nova.objects import base as objects_base from nova.objects import base as objects_base
from nova import quota from nova import quota
from nova.scheduler.client import report from nova.scheduler.client import report
from nova.scheduler import utils as scheduler_utils
from nova.tests import fixtures as nova_fixtures from nova.tests import fixtures as nova_fixtures
from nova.tests.unit import matchers from nova.tests.unit import matchers
from nova import utils from nova import utils
@@ -310,6 +311,12 @@ class TestCase(base.BaseTestCase):
if self.STUB_COMPUTE_ID: if self.STUB_COMPUTE_ID:
self.useFixture(nova_fixtures.ComputeNodeIdFixture()) self.useFixture(nova_fixtures.ComputeNodeIdFixture())
# Reset globals indicating affinity filter support. Some tests may set
# self.flags(enabled_filters=...) which could make the affinity filter
# support globals get set to a non-default configuration which affects
# all other tests.
scheduler_utils.reset_globals()
def _setup_cells(self): def _setup_cells(self):
"""Setup a normal cellsv2 environment. """Setup a normal cellsv2 environment.