From 04ae125290ed87e4019b124536755ad7bbc09600 Mon Sep 17 00:00:00 2001 From: Isaku Yamahata Date: Mon, 6 Apr 2015 17:48:17 -0700 Subject: [PATCH] s/oslo.config/oslo_config/ Change-Id: I0ea5ff7209aba2b9874283e5728cd74250ca571a --- tacker/agent/common/config.py | 2 +- tacker/agent/linux/external_process.py | 2 +- tacker/agent/linux/interface.py | 2 +- tacker/agent/linux/ip_lib.py | 2 +- tacker/api/api_common.py | 2 +- tacker/api/extensions.py | 2 +- tacker/api/v1/resource_helper.py | 2 +- tacker/auth.py | 2 +- tacker/cmd/server.py | 2 +- tacker/common/config.py | 2 +- tacker/common/rpc.py | 2 +- tacker/common/rpc_compat.py | 2 +- tacker/common/utils.py | 2 +- tacker/db/api.py | 2 +- tacker/db/migration/cli.py | 2 +- tacker/manager.py | 2 +- tacker/openstack/common/cache/cache.py | 6 +++--- tacker/openstack/common/db/options.py | 6 +++--- tacker/openstack/common/db/sqlalchemy/session.py | 6 +++--- tacker/openstack/common/eventlet_backdoor.py | 2 +- tacker/openstack/common/fixture/config.py | 2 +- tacker/openstack/common/lockutils.py | 2 +- tacker/openstack/common/log.py | 2 +- tacker/openstack/common/log_handler.py | 2 +- tacker/openstack/common/middleware/sizelimit.py | 2 +- tacker/openstack/common/periodic_task.py | 2 +- tacker/openstack/common/service.py | 2 +- tacker/openstack/common/sslutils.py | 2 +- tacker/policy.py | 2 +- tacker/service.py | 2 +- tacker/tests/base.py | 2 +- tacker/tests/unit/__init__.py | 2 +- tacker/tests/unit/services/vm/agent/test_agent.py | 2 +- tacker/tests/unit/services/vm/agent/test_namespace_proxy.py | 2 +- tacker/tests/unit/services/vm/mgmt_drivers/test_proxy.py | 2 +- tacker/tests/unit/services/vm/mgmt_drivers/test_rpc.py | 2 +- tacker/tests/unit/services/vm/test_proxy_api.py | 2 +- tacker/tests/unit/test_api_v2.py | 2 +- tacker/tests/unit/test_api_v2_extension.py | 2 +- tacker/tests/unit/test_config.py | 2 +- tacker/tests/unit/test_wsgi.py | 2 +- tacker/vm/drivers/nova/nova.py | 2 +- tacker/vm/plugin.py | 2 +- tacker/wsgi.py | 2 +- 44 files changed, 50 insertions(+), 50 deletions(-) diff --git a/tacker/agent/common/config.py b/tacker/agent/common/config.py index 4cf011e49..48443712e 100644 --- a/tacker/agent/common/config.py +++ b/tacker/agent/common/config.py @@ -17,7 +17,7 @@ import os -from oslo.config import cfg +from oslo_config import cfg from tacker.common import config from tacker.openstack.common import log as logging diff --git a/tacker/agent/linux/external_process.py b/tacker/agent/linux/external_process.py index c7b5e4245..ebd345255 100644 --- a/tacker/agent/linux/external_process.py +++ b/tacker/agent/linux/external_process.py @@ -18,7 +18,7 @@ import os -from oslo.config import cfg +from oslo_config import cfg from tacker.agent.linux import ip_lib from tacker.agent.linux import utils diff --git a/tacker/agent/linux/interface.py b/tacker/agent/linux/interface.py index b2b5ac94a..1470d0579 100644 --- a/tacker/agent/linux/interface.py +++ b/tacker/agent/linux/interface.py @@ -18,7 +18,7 @@ import abc import netaddr -from oslo.config import cfg +from oslo_config import cfg import six from tacker.agent.common import config diff --git a/tacker/agent/linux/ip_lib.py b/tacker/agent/linux/ip_lib.py index 2b73b2720..02c8462d1 100644 --- a/tacker/agent/linux/ip_lib.py +++ b/tacker/agent/linux/ip_lib.py @@ -15,7 +15,7 @@ # under the License. import netaddr -from oslo.config import cfg +from oslo_config import cfg from tacker.agent.linux import utils from tacker.common import exceptions diff --git a/tacker/api/api_common.py b/tacker/api/api_common.py index ee943e0b8..6e3071f4b 100644 --- a/tacker/api/api_common.py +++ b/tacker/api/api_common.py @@ -15,7 +15,7 @@ import urllib -from oslo.config import cfg +from oslo_config import cfg from webob import exc from tacker.common import constants diff --git a/tacker/api/extensions.py b/tacker/api/extensions.py index 350c841c3..cf74d7c94 100644 --- a/tacker/api/extensions.py +++ b/tacker/api/extensions.py @@ -18,7 +18,7 @@ import abc import imp import os -from oslo.config import cfg +from oslo_config import cfg import routes import six import webob.dec diff --git a/tacker/api/v1/resource_helper.py b/tacker/api/v1/resource_helper.py index da2e1c4d2..f52ea6746 100644 --- a/tacker/api/v1/resource_helper.py +++ b/tacker/api/v1/resource_helper.py @@ -14,7 +14,7 @@ # under the License. # @author: Paul Michali Cisco Systems, Inc. -from oslo.config import cfg +from oslo_config import cfg from tacker.api import extensions from tacker.api.v1 import base diff --git a/tacker/auth.py b/tacker/auth.py index 4b4524532..3c0bbd0a4 100644 --- a/tacker/auth.py +++ b/tacker/auth.py @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg import webob.dec import webob.exc diff --git a/tacker/cmd/server.py b/tacker/cmd/server.py index 9d9eb29dd..6c652096b 100644 --- a/tacker/cmd/server.py +++ b/tacker/cmd/server.py @@ -23,7 +23,7 @@ import sys import eventlet eventlet.monkey_patch() -from oslo.config import cfg +from oslo_config import cfg from tacker.common import config from tacker.openstack.common import service as common_service diff --git a/tacker/common/config.py b/tacker/common/config.py index 131bf3277..a021024ea 100644 --- a/tacker/common/config.py +++ b/tacker/common/config.py @@ -19,8 +19,8 @@ Routines for configuring Tacker import os -from oslo.config import cfg from oslo import messaging +from oslo_config import cfg from paste import deploy from tacker.common import utils diff --git a/tacker/common/rpc.py b/tacker/common/rpc.py index e3d8de2dc..5203df17d 100644 --- a/tacker/common/rpc.py +++ b/tacker/common/rpc.py @@ -15,9 +15,9 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg from oslo import messaging from oslo.messaging import serializer as om_serializer +from oslo_config import cfg from tacker.common import exceptions from tacker import context diff --git a/tacker/common/rpc_compat.py b/tacker/common/rpc_compat.py index 19aa25356..60c76ffbb 100644 --- a/tacker/common/rpc_compat.py +++ b/tacker/common/rpc_compat.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg from oslo import messaging +from oslo_config import cfg from tacker.common import rpc as n_rpc from tacker.openstack.common import log as logging diff --git a/tacker/common/utils.py b/tacker/common/utils.py index 145f36dee..b6c0af2bb 100644 --- a/tacker/common/utils.py +++ b/tacker/common/utils.py @@ -30,7 +30,7 @@ import socket import uuid from eventlet.green import subprocess -from oslo.config import cfg +from oslo_config import cfg from tacker.common import constants as q_const from tacker.openstack.common import lockutils diff --git a/tacker/db/api.py b/tacker/db/api.py index 700c9b974..971c8232d 100644 --- a/tacker/db/api.py +++ b/tacker/db/api.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg import sqlalchemy as sql from tacker.db import model_base diff --git a/tacker/db/migration/cli.py b/tacker/db/migration/cli.py index 268e37c51..5bf34794d 100644 --- a/tacker/db/migration/cli.py +++ b/tacker/db/migration/cli.py @@ -20,7 +20,7 @@ from alembic import command as alembic_command from alembic import config as alembic_config from alembic import script as alembic_script from alembic import util as alembic_util -from oslo.config import cfg +from oslo_config import cfg HEAD_FILENAME = 'HEAD' diff --git a/tacker/manager.py b/tacker/manager.py index 904df0a5e..74a7827b6 100644 --- a/tacker/manager.py +++ b/tacker/manager.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from tacker.common import rpc_compat from tacker.common import utils diff --git a/tacker/openstack/common/cache/cache.py b/tacker/openstack/common/cache/cache.py index c81bdb5d9..f86658030 100644 --- a/tacker/openstack/common/cache/cache.py +++ b/tacker/openstack/common/cache/cache.py @@ -25,13 +25,13 @@ from stevedore import driver def _get_olso_configs(): - """Returns the oslo.config options to register.""" - # NOTE(flaper87): Oslo config should be + """Returns the oslo_config options to register.""" + # NOTE(flaper87): oslo_config should be # optional. Instead of doing try / except # at the top of this file, lets import cfg # here and assume that the caller of this # function already took care of this dependency. - from oslo.config import cfg + from oslo_config import cfg return [ cfg.StrOpt('cache_url', default='memory://', diff --git a/tacker/openstack/common/db/options.py b/tacker/openstack/common/db/options.py index 36c451185..de1a9ec2a 100644 --- a/tacker/openstack/common/db/options.py +++ b/tacker/openstack/common/db/options.py @@ -12,7 +12,7 @@ import copy -from oslo.config import cfg +from oslo_config import cfg database_opts = [ @@ -153,9 +153,9 @@ def set_defaults(sql_connection, sqlite_db, max_pool_size=None, def list_opts(): - """Returns a list of oslo.config options available in the library. + """Returns a list of oslo_config options available in the library. - The returned list includes all oslo.config options which may be registered + The returned list includes all oslo_config options which may be registered at runtime by the library. Each element of the list is a tuple. The first element is the name of the diff --git a/tacker/openstack/common/db/sqlalchemy/session.py b/tacker/openstack/common/db/sqlalchemy/session.py index 2088f0de9..e2e0af093 100644 --- a/tacker/openstack/common/db/sqlalchemy/session.py +++ b/tacker/openstack/common/db/sqlalchemy/session.py @@ -878,13 +878,13 @@ class EngineFacade(object): @classmethod def from_config(cls, connection_string, conf, sqlite_fk=False, autocommit=True, expire_on_commit=False): - """Initialize EngineFacade using oslo.config config instance options. + """Initialize EngineFacade using oslo_config config instance options. :param connection_string: SQLAlchemy connection string :type connection_string: string - :param conf: oslo.config config instance - :type conf: oslo.config.cfg.ConfigOpts + :param conf: oslo_config config instance + :type conf: oslo_config.cfg.ConfigOpts :param sqlite_fk: enable foreign keys in SQLite :type sqlite_fk: bool diff --git a/tacker/openstack/common/eventlet_backdoor.py b/tacker/openstack/common/eventlet_backdoor.py index cc47d2e22..79ff73185 100644 --- a/tacker/openstack/common/eventlet_backdoor.py +++ b/tacker/openstack/common/eventlet_backdoor.py @@ -27,7 +27,7 @@ import traceback import eventlet import eventlet.backdoor import greenlet -from oslo.config import cfg +from oslo_config import cfg from tacker.openstack.common.gettextutils import _ from tacker.openstack.common import log as logging diff --git a/tacker/openstack/common/fixture/config.py b/tacker/openstack/common/fixture/config.py index 0bf90ff7a..be3addf52 100644 --- a/tacker/openstack/common/fixture/config.py +++ b/tacker/openstack/common/fixture/config.py @@ -15,7 +15,7 @@ # License for the specific language governing permissions and limitations # under the License. import fixtures -from oslo.config import cfg +from oslo_config import cfg import six diff --git a/tacker/openstack/common/lockutils.py b/tacker/openstack/common/lockutils.py index df70d668a..afde90c0e 100644 --- a/tacker/openstack/common/lockutils.py +++ b/tacker/openstack/common/lockutils.py @@ -26,7 +26,7 @@ import threading import time import weakref -from oslo.config import cfg +from oslo_config import cfg from tacker.openstack.common import fileutils from tacker.openstack.common.gettextutils import _ diff --git a/tacker/openstack/common/log.py b/tacker/openstack/common/log.py index 760b476c9..8bd86cc77 100644 --- a/tacker/openstack/common/log.py +++ b/tacker/openstack/common/log.py @@ -37,7 +37,7 @@ import re import sys import traceback -from oslo.config import cfg +from oslo_config import cfg import six from six import moves diff --git a/tacker/openstack/common/log_handler.py b/tacker/openstack/common/log_handler.py index 610769f73..70ba02fb7 100644 --- a/tacker/openstack/common/log_handler.py +++ b/tacker/openstack/common/log_handler.py @@ -14,7 +14,7 @@ import logging -from oslo.config import cfg +from oslo_config import cfg from tacker.openstack.common import notifier diff --git a/tacker/openstack/common/middleware/sizelimit.py b/tacker/openstack/common/middleware/sizelimit.py index 6ae05e45b..487d247f9 100644 --- a/tacker/openstack/common/middleware/sizelimit.py +++ b/tacker/openstack/common/middleware/sizelimit.py @@ -17,7 +17,7 @@ Request Body limiting middleware. """ -from oslo.config import cfg +from oslo_config import cfg import webob.dec import webob.exc diff --git a/tacker/openstack/common/periodic_task.py b/tacker/openstack/common/periodic_task.py index 5506993e1..e6e083af9 100644 --- a/tacker/openstack/common/periodic_task.py +++ b/tacker/openstack/common/periodic_task.py @@ -13,7 +13,7 @@ import time -from oslo.config import cfg +from oslo_config import cfg import six from tacker.openstack.common.gettextutils import _, _LE, _LI diff --git a/tacker/openstack/common/service.py b/tacker/openstack/common/service.py index 6077a5403..d7b455a04 100644 --- a/tacker/openstack/common/service.py +++ b/tacker/openstack/common/service.py @@ -35,7 +35,7 @@ except ImportError: import eventlet from eventlet import event -from oslo.config import cfg +from oslo_config import cfg from tacker.openstack.common import eventlet_backdoor from tacker.openstack.common.gettextutils import _LE, _LI, _LW diff --git a/tacker/openstack/common/sslutils.py b/tacker/openstack/common/sslutils.py index ff44bb96f..105cd4e27 100644 --- a/tacker/openstack/common/sslutils.py +++ b/tacker/openstack/common/sslutils.py @@ -15,7 +15,7 @@ import os import ssl -from oslo.config import cfg +from oslo_config import cfg from tacker.openstack.common.gettextutils import _ diff --git a/tacker/policy.py b/tacker/policy.py index 90917811a..e3a0bff66 100644 --- a/tacker/policy.py +++ b/tacker/policy.py @@ -21,7 +21,7 @@ Policy engine for tacker. Largely copied from nova. import itertools import re -from oslo.config import cfg +from oslo_config import cfg from tacker.api.v1 import attributes from tacker.common import exceptions diff --git a/tacker/service.py b/tacker/service.py index 04ef544b1..0981f8f20 100644 --- a/tacker/service.py +++ b/tacker/service.py @@ -18,7 +18,7 @@ import logging as std_logging import os import random -from oslo.config import cfg +from oslo_config import cfg from tacker.common import config from tacker.common import rpc_compat diff --git a/tacker/tests/base.py b/tacker/tests/base.py index 7cb3fdafa..d68014c7f 100644 --- a/tacker/tests/base.py +++ b/tacker/tests/base.py @@ -28,8 +28,8 @@ import weakref import eventlet.timeout import fixtures import mock -from oslo.config import cfg from oslo.messaging import conffixture as messaging_conffixture +from oslo_config import cfg import testtools from tacker.common import config diff --git a/tacker/tests/unit/__init__.py b/tacker/tests/unit/__init__.py index 96b119faf..fe79bab17 100644 --- a/tacker/tests/unit/__init__.py +++ b/tacker/tests/unit/__init__.py @@ -17,7 +17,7 @@ import os -from oslo.config import cfg +from oslo_config import cfg reldir = os.path.join(os.path.dirname(__file__), '..', '..', '..') diff --git a/tacker/tests/unit/services/vm/agent/test_agent.py b/tacker/tests/unit/services/vm/agent/test_agent.py index b56cf07a4..005c2ff0b 100644 --- a/tacker/tests/unit/services/vm/agent/test_agent.py +++ b/tacker/tests/unit/services/vm/agent/test_agent.py @@ -21,10 +21,10 @@ import uuid import mock -from oslo.config import cfg import oslo.messaging.rpc.client from oslo.messaging import target from oslo.messaging import transport +from oslo_config import cfg import tacker.agent.linux.ip_lib from tacker import context diff --git a/tacker/tests/unit/services/vm/agent/test_namespace_proxy.py b/tacker/tests/unit/services/vm/agent/test_namespace_proxy.py index 3efb6f1e9..c514fdbac 100644 --- a/tacker/tests/unit/services/vm/agent/test_namespace_proxy.py +++ b/tacker/tests/unit/services/vm/agent/test_namespace_proxy.py @@ -19,7 +19,7 @@ # @author: Isaku Yamahata, Intel Corporation. import mock -from oslo.config import cfg +from oslo_config import cfg from tacker import context from tacker.tests import base diff --git a/tacker/tests/unit/services/vm/mgmt_drivers/test_proxy.py b/tacker/tests/unit/services/vm/mgmt_drivers/test_proxy.py index 4807d34b6..3ba833795 100644 --- a/tacker/tests/unit/services/vm/mgmt_drivers/test_proxy.py +++ b/tacker/tests/unit/services/vm/mgmt_drivers/test_proxy.py @@ -21,7 +21,7 @@ import uuid import mock -from oslo.config import cfg +from oslo_config import cfg from tacker.common import topics from tacker import context diff --git a/tacker/tests/unit/services/vm/mgmt_drivers/test_rpc.py b/tacker/tests/unit/services/vm/mgmt_drivers/test_rpc.py index 378e24d03..3c1bac6f9 100644 --- a/tacker/tests/unit/services/vm/mgmt_drivers/test_rpc.py +++ b/tacker/tests/unit/services/vm/mgmt_drivers/test_rpc.py @@ -21,7 +21,7 @@ import uuid import mock -from oslo.config import cfg +from oslo_config import cfg from tacker.db import api as db import tacker.openstack.common.rpc.proxy diff --git a/tacker/tests/unit/services/vm/test_proxy_api.py b/tacker/tests/unit/services/vm/test_proxy_api.py index 67c77d983..bf1737c47 100644 --- a/tacker/tests/unit/services/vm/test_proxy_api.py +++ b/tacker/tests/unit/services/vm/test_proxy_api.py @@ -21,7 +21,7 @@ import uuid import mock -from oslo.config import cfg +from oslo_config import cfg from tacker.api.v1 import attributes import tacker.openstack.common.rpc.proxy diff --git a/tacker/tests/unit/test_api_v2.py b/tacker/tests/unit/test_api_v2.py index dcb211806..dbbaa1dab 100644 --- a/tacker/tests/unit/test_api_v2.py +++ b/tacker/tests/unit/test_api_v2.py @@ -18,7 +18,7 @@ import os import mock -from oslo.config import cfg +from oslo_config import cfg import six.moves.urllib.parse as urlparse import webob from webob import exc diff --git a/tacker/tests/unit/test_api_v2_extension.py b/tacker/tests/unit/test_api_v2_extension.py index 49d77576b..cba3950c4 100644 --- a/tacker/tests/unit/test_api_v2_extension.py +++ b/tacker/tests/unit/test_api_v2_extension.py @@ -21,7 +21,7 @@ import uuid import mock -from oslo.config import cfg +from oslo_config import cfg from webob import exc import webtest diff --git a/tacker/tests/unit/test_config.py b/tacker/tests/unit/test_config.py index bf4a421af..c31dd8211 100644 --- a/tacker/tests/unit/test_config.py +++ b/tacker/tests/unit/test_config.py @@ -16,7 +16,7 @@ import os import mock -from oslo.config import cfg +from oslo_config import cfg from tacker.common import config # noqa from tacker.tests import base diff --git a/tacker/tests/unit/test_wsgi.py b/tacker/tests/unit/test_wsgi.py index 360c36079..7bbff90de 100644 --- a/tacker/tests/unit/test_wsgi.py +++ b/tacker/tests/unit/test_wsgi.py @@ -20,7 +20,7 @@ import socket import urllib2 import mock -from oslo.config import cfg +from oslo_config import cfg import testtools import webob import webob.exc diff --git a/tacker/vm/drivers/nova/nova.py b/tacker/vm/drivers/nova/nova.py index 299e237c6..76c8535bf 100644 --- a/tacker/vm/drivers/nova/nova.py +++ b/tacker/vm/drivers/nova/nova.py @@ -22,7 +22,7 @@ import time -from oslo.config import cfg +from oslo_config import cfg from tacker.api.v1 import attributes from tacker.openstack.common import log as logging from tacker.vm.drivers import abstract_driver diff --git a/tacker/vm/plugin.py b/tacker/vm/plugin.py index 13130524b..81113a663 100644 --- a/tacker/vm/plugin.py +++ b/tacker/vm/plugin.py @@ -23,7 +23,7 @@ import inspect import eventlet -from oslo.config import cfg +from oslo_config import cfg from tacker.api.v1 import attributes from tacker.common import driver_manager diff --git a/tacker/wsgi.py b/tacker/wsgi.py index c02288e50..2e5a6cd33 100644 --- a/tacker/wsgi.py +++ b/tacker/wsgi.py @@ -31,7 +31,7 @@ from xml.parsers import expat import eventlet.wsgi #eventlet.patcher.monkey_patch(all=False, socket=True, thread=True) -from oslo.config import cfg +from oslo_config import cfg import routes.middleware import webob.dec import webob.exc