s/oslo.config/oslo_config/

Change-Id: I0ea5ff7209aba2b9874283e5728cd74250ca571a

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

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

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

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

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

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

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

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
 

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

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

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

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

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

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

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'

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

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."""
+    """Returns the oslo_config options to register."""
-    # NOTE(flaper87): Oslo config should be
+    # 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://',

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

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
+        :param conf: oslo_config config instance
-        :type conf: oslo.config.cfg.ConfigOpts
+        :type conf: oslo_config.cfg.ConfigOpts
 
         :param sqlite_fk: enable foreign keys in SQLite
         :type sqlite_fk: bool

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

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
 
 

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 _

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
 

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
 

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
 

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

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

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 _
 

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

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

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

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__), '..', '..', '..')

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

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

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

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

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

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

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
 

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

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

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

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

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