openstack/nova
Code Issues Proposed changes

Merge "Use a placement conf when testing report client"

Browse Source
This commit is contained in:
Zuul 2019-03-05 02:27:13 +00:00 committed by Gerrit Code Review
commit 6343f48026
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nova/tests/functional/test_report_client.py
View File

@ -20,7 +20,7 @@ from oslo_config import fixture as config_fixture
from oslo_utils.fixture import uuidsentinel as uuids from oslo_utils.fixture import uuidsentinel as uuids
import pkg_resources import pkg_resources
from placement import direct from placement import direct
from placement.tests import fixtures as placement_db from placement.tests.functional.fixtures import placement
from nova.cmd import status from nova.cmd import status
from nova.compute import provider_tree from nova.compute import provider_tree
@ -89,10 +89,13 @@ class SchedulerReportClientTestBase(test.TestCase):
def setUp(self): def setUp(self):
super(SchedulerReportClientTestBase, self).setUp() super(SchedulerReportClientTestBase, self).setUp()
# Because these tests use PlacementDirect we need to manage # Because these tests use PlacementDirect we need to manage
# the database ourselves. # the database and other config ourselves.
config = cfg.ConfigOpts() config = cfg.ConfigOpts()
placement_conf = self.useFixture(config_fixture.Config(config)) placement_conf = self.useFixture(config_fixture.Config(config))
self.useFixture(placement_db.Database(placement_conf, set_config=True)) self.useFixture(
placement.PlacementFixture(conf_fixture=placement_conf, db=True,
use_intercept=False))
self.placement_conf = placement_conf.conf
def _interceptor(self, app=None, latest_microversion=True): def _interceptor(self, app=None, latest_microversion=True):
"""Set up an intercepted placement API to test against. """Set up an intercepted placement API to test against.
@ -122,7 +125,7 @@ class SchedulerReportClientTestBase(test.TestCase):
return client return client
interceptor = ReportClientInterceptor( interceptor = ReportClientInterceptor(
CONF, latest_microversion=latest_microversion) self.placement_conf, latest_microversion=latest_microversion)
if app: if app:
interceptor.app = app interceptor.app = app
return interceptor return interceptor