From f0d73175c7f6cd7ae7006448ad753233d86fc572 Mon Sep 17 00:00:00 2001 From: Esra Celik Date: Fri, 12 Feb 2016 14:16:54 +0200 Subject: [PATCH] Removal of unnecessary `import_opt`s for cells config options After centralizing cells options, importing nova.conf module is enough for using cells options. import_opt(, ) functions are not necessary. Blueprint centralize-config-options Change-Id: I9aabe8f2cc337c1237c2a73475cc1a3d3f4a1575 --- nova/api/openstack/common.py | 5 ++--- nova/api/openstack/compute/cells.py | 6 ++---- nova/api/openstack/compute/legacy_v2/contrib/cells.py | 6 ++---- nova/cmd/cells.py | 6 ++---- nova/compute/api.py | 1 - nova/compute/manager.py | 1 - nova/consoleauth/manager.py | 4 ++-- .../api_sample_tests/test_availability_zone.py | 6 ++---- nova/tests/functional/api_sample_tests/test_cells.py | 4 ++-- nova/tests/functional/integrated_helpers.py | 5 ++--- nova/tests/unit/cells/fakes.py | 6 ++---- nova/tests/unit/cells/test_cells_manager.py | 4 ++-- nova/tests/unit/cells/test_cells_messaging.py | 5 ++--- nova/tests/unit/cells/test_cells_rpc_driver.py | 6 ++---- nova/tests/unit/cells/test_cells_rpcapi.py | 5 ++--- nova/tests/unit/cells/test_cells_scheduler.py | 9 ++------- nova/tests/unit/compute/test_compute_cells.py | 4 ++-- 17 files changed, 30 insertions(+), 53 deletions(-) diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py index 557805416b55..194bed985d5a 100644 --- a/nova/api/openstack/common.py +++ b/nova/api/openstack/common.py @@ -29,6 +29,7 @@ from webob import exc from nova.compute import task_states from nova.compute import utils as compute_utils from nova.compute import vm_states +import nova.conf from nova import exception from nova.i18n import _ from nova.i18n import _LE @@ -49,14 +50,12 @@ osapi_opts = [ help='Base URL that will be presented to users in links ' 'to glance resources'), ] -CONF = cfg.CONF +CONF = nova.conf.CONF CONF.register_opts(osapi_opts) LOG = logging.getLogger(__name__) QUOTAS = quota.QUOTAS -CONF.import_opt('enable', 'nova.cells.opts', group='cells') - _STATE_MAP = { vm_states.ACTIVE: { diff --git a/nova/api/openstack/compute/cells.py b/nova/api/openstack/compute/cells.py index 636e08df8a78..605a37ae19ba 100644 --- a/nova/api/openstack/compute/cells.py +++ b/nova/api/openstack/compute/cells.py @@ -16,7 +16,6 @@ """The cells extension.""" -from oslo_config import cfg import oslo_messaging as messaging from oslo_utils import strutils import six @@ -28,14 +27,13 @@ from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api import validation from nova.cells import rpcapi as cells_rpcapi +import nova.conf from nova import exception from nova.i18n import _ from nova import rpc -CONF = cfg.CONF -CONF.import_opt('name', 'nova.cells.opts', group='cells') -CONF.import_opt('capabilities', 'nova.cells.opts', group='cells') +CONF = nova.conf.CONF ALIAS = "os-cells" authorize = extensions.os_compute_authorizer(ALIAS) diff --git a/nova/api/openstack/compute/legacy_v2/contrib/cells.py b/nova/api/openstack/compute/legacy_v2/contrib/cells.py index 199753f33a22..4c09d3123966 100644 --- a/nova/api/openstack/compute/legacy_v2/contrib/cells.py +++ b/nova/api/openstack/compute/legacy_v2/contrib/cells.py @@ -16,7 +16,6 @@ """The cells extension.""" -from oslo_config import cfg import oslo_messaging as messaging from oslo_utils import strutils from oslo_utils import timeutils @@ -26,15 +25,14 @@ from webob import exc from nova.api.openstack import common from nova.api.openstack import extensions from nova.cells import rpcapi as cells_rpcapi +import nova.conf from nova import context as nova_context from nova import exception from nova.i18n import _ from nova import rpc -CONF = cfg.CONF -CONF.import_opt('name', 'nova.cells.opts', group='cells') -CONF.import_opt('capabilities', 'nova.cells.opts', group='cells') +CONF = nova.conf.CONF authorize = extensions.extension_authorizer('compute', 'cells') diff --git a/nova/cmd/cells.py b/nova/cmd/cells.py index 7996fc530723..b74867c96b03 100644 --- a/nova/cmd/cells.py +++ b/nova/cmd/cells.py @@ -17,19 +17,17 @@ import sys -from oslo_config import cfg from oslo_log import log as logging from oslo_reports import guru_meditation_report as gmr +import nova.conf from nova import config from nova import objects from nova import service from nova import utils from nova import version -CONF = cfg.CONF -CONF.import_opt('topic', 'nova.cells.opts', group='cells') -CONF.import_opt('manager', 'nova.cells.opts', group='cells') +CONF = nova.conf.CONF def main(): diff --git a/nova/compute/api.py b/nova/compute/api.py index ca273b0c52ee..20bb64a3394d 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -89,7 +89,6 @@ wrap_exception = functools.partial(exception.wrap_exception, CONF = nova.conf.CONF CONF.import_opt('compute_topic', 'nova.compute.rpcapi') -CONF.import_opt('enable', 'nova.cells.opts', group='cells') MAX_USERDATA_SIZE = 65535 RO_SECURITY_GROUPS = ['default'] diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 0d5e41355d63..f94ccef47356 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -268,7 +268,6 @@ CONF.import_opt('console_topic', 'nova.console.rpcapi') CONF.import_opt('host', 'nova.netconf') CONF.import_opt('enabled', 'nova.vnc', group='vnc') CONF.import_opt('enabled', 'nova.spice', group='spice') -CONF.import_opt('enable', 'nova.cells.opts', group='cells') CONF.import_opt('image_cache_manager_interval', 'nova.virt.imagecache') CONF.import_opt('enabled', 'nova.rdp', group='rdp') CONF.import_opt('html5_proxy_base_url', 'nova.rdp', group='rdp') diff --git a/nova/consoleauth/manager.py b/nova/consoleauth/manager.py index 87ae98570616..31add59ecf70 100644 --- a/nova/consoleauth/manager.py +++ b/nova/consoleauth/manager.py @@ -26,6 +26,7 @@ from oslo_serialization import jsonutils from nova import cache_utils from nova.cells import rpcapi as cells_rpcapi from nova.compute import rpcapi as compute_rpcapi +import nova.conf from nova.i18n import _LI, _LW from nova import manager from nova import objects @@ -39,9 +40,8 @@ consoleauth_opts = [ help='How many seconds before deleting tokens') ] -CONF = cfg.CONF +CONF = nova.conf.CONF CONF.register_opts(consoleauth_opts) -CONF.import_opt('enable', 'nova.cells.opts', group='cells') class ConsoleAuthManager(manager.Manager): diff --git a/nova/tests/functional/api_sample_tests/test_availability_zone.py b/nova/tests/functional/api_sample_tests/test_availability_zone.py index 9b3f7dbaab41..0c95ee57660c 100644 --- a/nova/tests/functional/api_sample_tests/test_availability_zone.py +++ b/nova/tests/functional/api_sample_tests/test_availability_zone.py @@ -12,12 +12,10 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_config import cfg - +import nova.conf from nova.tests.functional.api_sample_tests import test_servers -CONF = cfg.CONF -CONF.import_opt('manager', 'nova.cells.opts', group='cells') +CONF = nova.conf.CONF CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') diff --git a/nova/tests/functional/api_sample_tests/test_cells.py b/nova/tests/functional/api_sample_tests/test_cells.py index 2e106cd670dc..85d8fa46a5d9 100644 --- a/nova/tests/functional/api_sample_tests/test_cells.py +++ b/nova/tests/functional/api_sample_tests/test_cells.py @@ -13,15 +13,15 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_config import cfg from six.moves import range from nova.cells import state +import nova.conf from nova.db.sqlalchemy import models from nova import exception from nova.tests.functional.api_sample_tests import api_sample_base -CONF = cfg.CONF +CONF = nova.conf.CONF CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') diff --git a/nova/tests/functional/integrated_helpers.py b/nova/tests/functional/integrated_helpers.py index bb890d86adec..54a3aadb9750 100644 --- a/nova/tests/functional/integrated_helpers.py +++ b/nova/tests/functional/integrated_helpers.py @@ -21,9 +21,9 @@ import random import string import uuid -from oslo_config import cfg from oslo_log import log as logging +import nova.conf import nova.image.glance from nova import test from nova.tests import fixtures as nova_fixtures @@ -31,9 +31,8 @@ from nova.tests.unit import cast_as_call import nova.tests.unit.image.fake -CONF = cfg.CONF +CONF = nova.conf.CONF LOG = logging.getLogger(__name__) -CONF.import_opt('manager', 'nova.cells.opts', group='cells') def generate_random_alphanumeric(length): diff --git a/nova/tests/unit/cells/fakes.py b/nova/tests/unit/cells/fakes.py index 31c520d09635..e567e7a03809 100644 --- a/nova/tests/unit/cells/fakes.py +++ b/nova/tests/unit/cells/fakes.py @@ -16,19 +16,17 @@ Fakes For Cells tests. """ -from oslo_config import cfg - from nova.cells import driver from nova.cells import manager as cells_manager from nova.cells import state as cells_state from nova.cells import utils as cells_utils +import nova.conf import nova.db from nova.db import base from nova import exception from nova import objects -CONF = cfg.CONF -CONF.import_opt('name', 'nova.cells.opts', group='cells') +CONF = nova.conf.CONF # Fake Cell Hierarchy diff --git a/nova/tests/unit/cells/test_cells_manager.py b/nova/tests/unit/cells/test_cells_manager.py index a06d8ade408b..df6f661f4e45 100644 --- a/nova/tests/unit/cells/test_cells_manager.py +++ b/nova/tests/unit/cells/test_cells_manager.py @@ -19,12 +19,12 @@ import copy import datetime import mock -from oslo_config import cfg from oslo_utils import timeutils from six.moves import range from nova.cells import messaging from nova.cells import utils as cells_utils +import nova.conf from nova import context from nova import objects from nova import test @@ -33,7 +33,7 @@ from nova.tests.unit import fake_instance from nova.tests.unit import fake_server_actions from nova.tests.unit.objects import test_flavor -CONF = cfg.CONF +CONF = nova.conf.CONF CONF.import_opt('compute_topic', 'nova.compute.rpcapi') diff --git a/nova/tests/unit/cells/test_cells_messaging.py b/nova/tests/unit/cells/test_cells_messaging.py index c4f8900865aa..398a5cf69d69 100644 --- a/nova/tests/unit/cells/test_cells_messaging.py +++ b/nova/tests/unit/cells/test_cells_messaging.py @@ -21,7 +21,6 @@ import uuid import mock from mox3 import mox -from oslo_config import cfg import oslo_messaging from oslo_serialization import jsonutils from oslo_utils import timeutils @@ -32,6 +31,7 @@ from nova.cells import rpcapi as cells_rpcapi from nova.cells import utils as cells_utils from nova.compute import task_states from nova.compute import vm_states +import nova.conf from nova import context from nova import db from nova import exception @@ -44,8 +44,7 @@ from nova.tests.unit.cells import fakes from nova.tests.unit import fake_instance from nova.tests.unit import fake_server_actions -CONF = cfg.CONF -CONF.import_opt('name', 'nova.cells.opts', group='cells') +CONF = nova.conf.CONF class CellsMessageClassesTestCase(test.NoDBTestCase): diff --git a/nova/tests/unit/cells/test_cells_rpc_driver.py b/nova/tests/unit/cells/test_cells_rpc_driver.py index 4e9894dc0fdf..e51f68d0b1c0 100644 --- a/nova/tests/unit/cells/test_cells_rpc_driver.py +++ b/nova/tests/unit/cells/test_cells_rpc_driver.py @@ -19,19 +19,17 @@ Tests For Cells RPC Communication Driver import mock from mox3 import mox -from oslo_config import cfg import oslo_messaging from nova.cells import messaging from nova.cells import rpc_driver +import nova.conf from nova import context from nova import rpc from nova import test from nova.tests.unit.cells import fakes -CONF = cfg.CONF -CONF.import_opt('rpc_driver_queue_base', 'nova.cells.rpc_driver', - group='cells') +CONF = nova.conf.CONF class CellsRPCDriverTestCase(test.NoDBTestCase): diff --git a/nova/tests/unit/cells/test_cells_rpcapi.py b/nova/tests/unit/cells/test_cells_rpcapi.py index faa00494be4e..369f9baf692b 100644 --- a/nova/tests/unit/cells/test_cells_rpcapi.py +++ b/nova/tests/unit/cells/test_cells_rpcapi.py @@ -16,17 +16,16 @@ Tests For Cells RPCAPI """ -from oslo_config import cfg import six from nova.cells import rpcapi as cells_rpcapi +import nova.conf from nova import exception from nova import objects from nova import test from nova.tests.unit import fake_instance -CONF = cfg.CONF -CONF.import_opt('topic', 'nova.cells.opts', group='cells') +CONF = nova.conf.CONF class CellsAPITestCase(test.NoDBTestCase): diff --git a/nova/tests/unit/cells/test_cells_scheduler.py b/nova/tests/unit/cells/test_cells_scheduler.py index 6e0aa638fd03..b534f70177fa 100644 --- a/nova/tests/unit/cells/test_cells_scheduler.py +++ b/nova/tests/unit/cells/test_cells_scheduler.py @@ -18,13 +18,13 @@ Tests For CellsScheduler import copy import time -from oslo_config import cfg from oslo_utils import uuidutils from nova import block_device from nova.cells import filters from nova.cells import weights from nova.compute import vm_states +import nova.conf from nova import context from nova import db from nova import exception @@ -35,12 +35,7 @@ from nova.tests.unit.cells import fakes from nova.tests.unit import fake_block_device from nova import utils -CONF = cfg.CONF -CONF.import_opt('scheduler_retries', 'nova.cells.scheduler', group='cells') -CONF.import_opt('scheduler_filter_classes', 'nova.cells.scheduler', - group='cells') -CONF.import_opt('scheduler_weight_classes', 'nova.cells.scheduler', - group='cells') +CONF = nova.conf.CONF class FakeFilterClass1(filters.BaseCellFilter): diff --git a/nova/tests/unit/compute/test_compute_cells.py b/nova/tests/unit/compute/test_compute_cells.py index e4376cce7a22..6cbe07c37feb 100644 --- a/nova/tests/unit/compute/test_compute_cells.py +++ b/nova/tests/unit/compute/test_compute_cells.py @@ -20,7 +20,6 @@ import inspect import mock from mox3 import mox -from oslo_config import cfg from oslo_utils import timeutils from nova import block_device @@ -30,6 +29,7 @@ from nova.compute import cells_api as compute_cells_api from nova.compute import flavors from nova.compute import utils as compute_utils from nova.compute import vm_states +import nova.conf from nova import context from nova import db from nova import exception @@ -43,7 +43,7 @@ from nova.tests import uuidsentinel as uuids ORIG_COMPUTE_API = None -cfg.CONF.import_opt('enable', 'nova.cells.opts', group='cells') +CONF = nova.conf.CONF def stub_call_to_cells(context, instance, method, *args, **kwargs):