openstack/placement
Code Issues Proposed changes

Merge "Add register_opts param to PlacementFixture"

Browse Source
This commit is contained in:
Zuul
2019-03-21 10:24:57 +00:00
committed by Gerrit Code Review
parent c2a9bcad38 f7f5231677
commit c6a23a3037
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
placement/conf/__init__.py
View File

@@ -14,6 +14,8 @@
# under the License. # under the License.
from __future__ import absolute_import from __future__ import absolute_import
from oslo_log import log as logging
from placement.conf import api from placement.conf import api
from placement.conf import base from placement.conf import base
from placement.conf import database from placement.conf import database
@@ -21,7 +23,7 @@ from placement.conf import paths
from placement.conf import placement from placement.conf import placement
# To avoid global config, we require an existing ConfigOpts is passed # To avoid global config, we require an existing ConfigOpts to be passed
# to register_opts. Then the caller can have some assurance that the # to register_opts. Then the caller can have some assurance that the
# config they are using will maintain some independence. # config they are using will maintain some independence.
def register_opts(conf): def register_opts(conf):
@@ -30,3 +32,4 @@ def register_opts(conf):
database.register_opts(conf) database.register_opts(conf)
paths.register_opts(conf) paths.register_opts(conf)
placement.register_opts(conf) placement.register_opts(conf)
logging.register_options(conf)

7
placement/tests/functional/fixtures/placement.py
View File

@@ -42,7 +42,7 @@ class PlacementFixture(fixtures.Fixture):
Used by other services, including nova, for functional tests. Used by other services, including nova, for functional tests.
""" """
def __init__(self, token='admin', conf_fixture=None, db=True, def __init__(self, token='admin', conf_fixture=None, db=True,
use_intercept=True): use_intercept=True, register_opts=True):
"""Create a Placement Fixture. """Create a Placement Fixture.
:param token: The value to be used when passing an auth token :param token: The value to be used when passing an auth token
@@ -52,18 +52,21 @@ class PlacementFixture(fixtures.Fixture):
:param db: Whether to start the Database fixture. :param db: Whether to start the Database fixture.
:param use_intercept: If true, install a wsgi-intercept of the :param use_intercept: If true, install a wsgi-intercept of the
placement WSGI app. placement WSGI app.
:param register_opts: If True, register configuration options.
""" """
self.token = token self.token = token
self.db = db self.db = db
self.use_intercept = use_intercept self.use_intercept = use_intercept
self.conf_fixture = conf_fixture self.conf_fixture = conf_fixture
self.register_opts = register_opts
def setUp(self): def setUp(self):
super(PlacementFixture, self).setUp() super(PlacementFixture, self).setUp()
if not self.conf_fixture: if not self.conf_fixture:
config = cfg.ConfigOpts() config = cfg.ConfigOpts()
self.conf_fixture = self.useFixture(config_fixture.Config(config)) self.conf_fixture = self.useFixture(config_fixture.Config(config))
conf.register_opts(self.conf_fixture.conf) if self.register_opts:
conf.register_opts(self.conf_fixture.conf)
if self.db: if self.db:
self.useFixture(db_fixture.Database(self.conf_fixture, self.useFixture(db_fixture.Database(self.conf_fixture,

1
placement/wsgi.py
View File

@@ -71,7 +71,6 @@ def _get_config_files(env=None):
def _parse_args(config, argv, default_config_files): def _parse_args(config, argv, default_config_files):
# register placement's config options # register placement's config options
conf.register_opts(config) conf.register_opts(config)
logging.register_options(config)
if profiler: if profiler:
profiler.set_defaults(config) profiler.set_defaults(config)