Use oslo_config instead of deprecated oslo.config

Change-Id: I85d5c8d3d9f00f86fd14500be0da1289f5672614

ceilometer/agent/base.py

@@ -22,7 +22,7 @@ import collections
 import fnmatch
 import itertools
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_context import context
 import six
 from six.moves.urllib import parse as urlparse

ceilometer/agent/discovery/endpoint.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
 
 from ceilometer.agent import plugin_base as plugin
 from ceilometer.i18n import _LW

ceilometer/agent/discovery/tenant.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
 
 from ceilometer.agent import plugin_base as plugin
 from ceilometer.openstack.common import log

ceilometer/agent/manager.py

@@ -16,7 +16,7 @@
 # under the License.
 
 from keystoneclient.v2_0 import client as ksclient
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ceilometer.agent import base
 from ceilometer.openstack.common import log

ceilometer/agent/plugin_base.py

@@ -22,8 +22,8 @@ import collections
 import fnmatch
 
 from keystoneclient.v2_0 import client as ksclient
-from oslo.config import cfg
 import oslo.messaging
+from oslo_config import cfg
 from oslo_context import context
 import six
 

ceilometer/alarm/evaluator/__init__.py

@@ -21,7 +21,7 @@ import datetime
 
 from ceilometerclient import client as ceiloclient
 import croniter
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import timeutils
 import pytz
 import six

ceilometer/alarm/notifier/rest.py

@@ -17,8 +17,8 @@
 """Rest alarm notifier."""
 
 import eventlet
-from oslo.config import cfg
 from oslo.serialization import jsonutils
+from oslo_config import cfg
 from oslo_context import context
 import requests
 import six.moves.urllib.parse as urlparse

ceilometer/alarm/notifier/trust.py

@@ -15,7 +15,7 @@
 """Rest alarm notifier with trusted authentication."""
 
 from keystoneclient.v3 import client as keystone_client
-from oslo.config import cfg
+from oslo_config import cfg
 from six.moves.urllib import parse
 
 from ceilometer.alarm.notifier import rest

ceilometer/alarm/rpc.py

@@ -15,7 +15,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_context import context
 import six
 

ceilometer/alarm/service.py

@@ -20,7 +20,7 @@
 import abc
 
 from ceilometerclient import client as ceiloclient
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import netutils
 import six
 from stevedore import extension

ceilometer/alarm/storage/impl_sqlalchemy.py

@@ -19,8 +19,8 @@
 from __future__ import absolute_import
 import os
 
-from oslo.config import cfg
 from oslo.db.sqlalchemy import session as db_session
+from oslo_config import cfg
 from sqlalchemy import desc
 
 import ceilometer

ceilometer/api/__init__.py

@@ -15,7 +15,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 # Register options for the service
 OPTS = [

ceilometer/api/app.py

@@ -21,7 +21,7 @@ import socket
 from wsgiref import simple_server
 
 import netaddr
-from oslo.config import cfg
+from oslo_config import cfg
 from paste import deploy
 import pecan
 

ceilometer/api/controllers/v2.py

@@ -37,7 +37,7 @@ import uuid
 
 import croniter
 import jsonschema
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_context import context
 from oslo_utils import netutils
 from oslo_utils import strutils

ceilometer/api/hooks.py

@@ -18,7 +18,7 @@
 
 import threading
 
-from oslo.config import cfg
+from oslo_config import cfg
 from pecan import hooks
 
 from ceilometer import pipeline

ceilometer/cli.py

@@ -28,7 +28,7 @@ import eventlet
 # first read() or select(), thread need to be patched too, because
 # oslo.messaging use threading.local
 eventlet.monkey_patch(socket=True, select=True, thread=True)
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_context import context
 from oslo_utils import timeutils
 

ceilometer/cmd/alarm.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
 from stevedore import driver
 
 from ceilometer.alarm import service as alarm_service

ceilometer/cmd/polling.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
 
 from ceilometer.agent import manager
 from ceilometer.openstack.common import service as os_service

ceilometer/cmd/storage.py

@@ -16,7 +16,7 @@
 
 import logging
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ceilometer.i18n import _
 from ceilometer import service

ceilometer/collector.py

@@ -18,8 +18,8 @@
 import socket
 
 import msgpack
-from oslo.config import cfg
 import oslo.messaging
+from oslo_config import cfg
 from oslo_utils import units
 
 from ceilometer import dispatcher

ceilometer/compute/discovery.py

@@ -15,7 +15,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ceilometer.agent import plugin_base
 from ceilometer import nova_client

ceilometer/compute/notifications/__init__.py

@@ -15,8 +15,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
 import oslo.messaging
+from oslo_config import cfg
 
 from ceilometer.agent import plugin_base
 

ceilometer/compute/util.py

@@ -15,7 +15,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 

ceilometer/compute/virt/hyperv/inspector.py

@@ -16,7 +16,7 @@
 # under the License.
 """Implementation of Inspector abstraction for Hyper-V"""
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import units
 
 from ceilometer.compute.pollsters import util

ceilometer/compute/virt/hyperv/utilsv2.py

@@ -25,7 +25,7 @@ import sys
 if sys.platform == 'win32':
     import wmi
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ceilometer.compute.virt import inspector
 from ceilometer.i18n import _

ceilometer/compute/virt/inspector.py

@@ -19,7 +19,7 @@
 
 import collections
 
-from oslo.config import cfg
+from oslo_config import cfg
 from stevedore import driver
 
 import ceilometer

ceilometer/compute/virt/libvirt/inspector.py

@@ -17,7 +17,7 @@
 """Implementation of Inspector abstraction for libvirt."""
 
 from lxml import etree
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import units
 import six
 

ceilometer/compute/virt/vmware/inspector.py

@@ -15,8 +15,8 @@
 
 """Implementation of Inspector abstraction for VMware vSphere"""
 
-from oslo.config import cfg
 from oslo.vmware import api
+from oslo_config import cfg
 from oslo_utils import units
 
 from ceilometer.compute.virt import inspector as virt_inspector

ceilometer/compute/virt/xenapi/inspector.py

@@ -16,7 +16,7 @@
 """Implementation of Inspector abstraction for XenAPI."""
 
 from eventlet import timeout
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import units
 try:
     import XenAPI as api

ceilometer/coordination.py

@@ -17,7 +17,7 @@
 
 import uuid
 
-from oslo.config import cfg
+from oslo_config import cfg
 import tooz.coordination
 
 from ceilometer.i18n import _LE, _LI

ceilometer/data_processing/notifications.py

@@ -13,9 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-from oslo.config import cfg
 import oslo.messaging
+from oslo_config import cfg
 
 from ceilometer.agent import plugin_base
 from ceilometer import sample

ceilometer/dispatcher/__init__.py

@@ -17,7 +17,7 @@
 
 import abc
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 from stevedore import named
 

ceilometer/dispatcher/file.py

@@ -18,7 +18,7 @@
 import logging
 import logging.handlers
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ceilometer import dispatcher
 

ceilometer/dispatcher/http.py

@@ -16,7 +16,7 @@
 
 import json
 
-from oslo.config import cfg
+from oslo_config import cfg
 import requests
 
 from ceilometer import dispatcher

ceilometer/energy/kwapi.py

@@ -17,7 +17,7 @@
 import datetime
 
 from keystoneclient import exceptions
-from oslo.config import cfg
+from oslo_config import cfg
 import requests
 import six
 

ceilometer/event/converter.py

@@ -19,7 +19,7 @@ import fnmatch
 import os
 
 import jsonpath_rw
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import timeutils
 import six
 import yaml

ceilometer/event/endpoint.py

@@ -17,8 +17,8 @@
 
 import logging
 
-from oslo.config import cfg
 import oslo.messaging
+from oslo_config import cfg
 from stevedore import extension
 
 import ceilometer

ceilometer/event/storage/impl_sqlalchemy.py

@@ -17,9 +17,9 @@ from __future__ import absolute_import
 import operator
 import os
 
-from oslo.config import cfg
 from oslo.db import exception as dbexc
 from oslo.db.sqlalchemy import session as db_session
+from oslo_config import cfg
 import six
 import sqlalchemy as sa
 

ceilometer/hardware/discovery.py

@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ceilometer.agent import plugin_base
 from ceilometer.i18n import _

ceilometer/identity/notifications.py

@@ -11,8 +11,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
 import oslo.messaging
+from oslo_config import cfg
 
 from ceilometer.agent import plugin_base
 from ceilometer import sample

ceilometer/image/glance.py

@@ -21,7 +21,7 @@ from __future__ import absolute_import
 import itertools
 
 import glanceclient
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import timeutils
 
 from ceilometer.agent import plugin_base

ceilometer/image/notifications.py

@@ -18,8 +18,8 @@
    events.
 """
 
-from oslo.config import cfg
 import oslo.messaging
+from oslo_config import cfg
 
 from ceilometer.agent import plugin_base
 from ceilometer import sample

ceilometer/ipmi/notifications/ironic.py

@@ -18,8 +18,8 @@
 notification events.
 """
 
-from oslo.config import cfg
 from oslo import messaging
+from oslo_config import cfg
 
 from ceilometer.agent import plugin_base
 from ceilometer.openstack.common import log

ceilometer/ipmi/platform/intel_node_manager.py

@@ -29,7 +29,7 @@ import collections
 import tempfile
 import time
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ceilometer.i18n import _
 from ceilometer.ipmi.platform import exception as nmexcept

ceilometer/ipmi/pollsters/node.py

@@ -16,7 +16,7 @@
 
 import abc
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import timeutils
 import six
 

ceilometer/ipmi/pollsters/sensor.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
 from oslo_utils import timeutils
 
 from ceilometer.agent import plugin_base

ceilometer/key_value_storage/notifications.py

@@ -10,8 +10,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
 import oslo.messaging
+from oslo_config import cfg
 
 from ceilometer.agent import plugin_base
 from ceilometer import sample

ceilometer/messaging.py

@@ -15,9 +15,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
 import oslo.messaging
 from oslo.serialization import jsonutils
+from oslo_config import cfg
 from oslo_context import context
 
 DEFAULT_URL = "__default__"

ceilometer/middleware.py

@@ -15,8 +15,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
 import oslo.messaging
+from oslo_config import cfg
 
 from ceilometer.agent import plugin_base
 from ceilometer import sample

ceilometer/network/floatingip.py

@@ -18,7 +18,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import timeutils
 
 from ceilometer.agent import plugin_base

ceilometer/network/notifications.py

@@ -19,8 +19,8 @@
 
 """
 
-from oslo.config import cfg
 import oslo.messaging
+from oslo_config import cfg
 
 from ceilometer.agent import plugin_base
 from ceilometer.i18n import _

ceilometer/network/services/discovery.py

@@ -15,7 +15,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ceilometer.agent import plugin_base
 from ceilometer import neutron_client

ceilometer/network/statistics/opencontrail/client.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 requests
 import six
 from six.moves.urllib import parse as urlparse

ceilometer/network/statistics/opendaylight/client.py

@@ -15,7 +15,7 @@
 
 import abc
 
-from oslo.config import cfg
+from oslo_config import cfg
 import requests
 from requests import auth
 import six

ceilometer/neutron_client.py

@@ -18,7 +18,7 @@ import functools
 
 from neutronclient.common import exceptions
 from neutronclient.v2_0 import client as clientv20
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ceilometer.openstack.common import log
 

ceilometer/notification.py

@@ -15,8 +15,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
 import oslo.messaging
+from oslo_config import cfg
 from oslo_context import context
 from stevedore import extension
 

ceilometer/nova_client.py

@@ -17,7 +17,7 @@ import functools
 
 import novaclient
 from novaclient.v1_1 import client as nova_client
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ceilometer.openstack.common import log
 

ceilometer/objectstore/swift.py

@@ -20,7 +20,7 @@
 from __future__ import absolute_import
 
 from keystoneclient import exceptions
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import timeutils
 import six.moves.urllib.parse as urlparse
 from swiftclient import client as swift

ceilometer/orchestration/notifications.py

@@ -15,8 +15,8 @@
    events.
 """
 
-from oslo.config import cfg
 import oslo.messaging
+from oslo_config import cfg
 
 from ceilometer.agent import plugin_base
 from ceilometer import sample

ceilometer/pipeline.py

@@ -20,7 +20,7 @@
 import fnmatch
 import os
 
-from oslo.config import cfg
+from oslo_config import cfg
 import yaml
 
 from ceilometer.i18n import _

ceilometer/profiler/notifications.py

@@ -13,8 +13,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
 import oslo.messaging
+from oslo_config import cfg
 
 from ceilometer.agent import plugin_base
 from ceilometer import sample

ceilometer/publisher/messaging.py

@@ -21,8 +21,8 @@ import abc
 import itertools
 import operator
 
-from oslo.config import cfg
 import oslo.messaging
+from oslo_config import cfg
 import six
 import six.moves.urllib.parse as urlparse
 

ceilometer/publisher/udp.py

@@ -21,7 +21,7 @@
 import socket
 
 import msgpack
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import netutils
 
 from ceilometer.i18n import _

ceilometer/publisher/utils.py

@@ -21,7 +21,7 @@
 import hashlib
 import hmac
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 from ceilometer import utils

ceilometer/sample.py

@@ -26,7 +26,7 @@ in by the plugins that create them.
 import copy
 import uuid
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 
 OPTS = [

ceilometer/service.py

@@ -20,8 +20,8 @@ import os
 import socket
 import sys
 
-from oslo.config import cfg
 from oslo import i18n
+from oslo_config import cfg
 
 from ceilometer.i18n import _
 from ceilometer import messaging

ceilometer/storage/__init__.py

@@ -17,8 +17,8 @@
 """Storage backend management
 """
 
-from oslo.config import cfg
 from oslo.db import options as db_options
+from oslo_config import cfg
 import retrying
 import six
 import six.moves.urllib.parse as urlparse

ceilometer/storage/impl_db2.py

@@ -28,7 +28,7 @@ import sys
 
 import bson.code
 import bson.objectid
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import timeutils
 import pymongo
 import six

ceilometer/storage/impl_mongodb.py

@@ -29,7 +29,7 @@ import uuid
 
 import bson.code
 import bson.objectid
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import timeutils
 import pymongo
 import six

ceilometer/storage/impl_sqlalchemy.py

@@ -21,10 +21,10 @@ import datetime
 import hashlib
 import os
 
-from oslo.config import cfg
 from oslo.db import exception as dbexc
 from oslo.db.sqlalchemy import session as db_session
 from oslo.serialization import jsonutils
+from oslo_config import cfg
 from oslo_utils import timeutils
 import six
 import sqlalchemy as sa

ceilometer/storage/mongo/utils.py

@@ -21,7 +21,7 @@
 import time
 import weakref
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import netutils
 import pymongo
 import six

ceilometer/tests/agent/agentbase.py

@@ -26,7 +26,7 @@ import copy
 import datetime
 
 import mock
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 from oslotest import mockpatch
 import six
 from stevedore import extension

ceilometer/tests/agent/test_discovery.py

@@ -18,7 +18,7 @@
 """
 
 import mock
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 from oslotest import base
 
 from ceilometer.agent.discovery import endpoint

ceilometer/tests/agent/test_plugin.py

@@ -16,7 +16,7 @@
 # under the License.
 
 import mock
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 from oslotest import base
 
 from ceilometer.agent import plugin_base

ceilometer/tests/alarm/evaluator/test_threshold.py

@@ -22,7 +22,7 @@ import uuid
 from ceilometerclient import exc
 from ceilometerclient.v2 import statistics
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import timeutils
 import pytz
 from six import moves

ceilometer/tests/alarm/partition/test_coordination.py

@@ -21,7 +21,7 @@ import logging
 import uuid
 
 import mock
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 from oslo_utils import timeutils
 from six import moves
 

ceilometer/tests/alarm/test_alarm_svc.py

@@ -17,7 +17,7 @@
 """Tests for ceilometer.alarm.service.SingletonAlarmService.
 """
 import mock
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 from stevedore import extension
 
 from ceilometer.alarm import service

ceilometer/tests/alarm/test_notifier.py

@@ -16,8 +16,8 @@
 # under the License.
 
 import mock
-from oslo.config import fixture as fixture_config
 from oslo.serialization import jsonutils
+from oslo_config import fixture as fixture_config
 from oslo_context import context
 from oslotest import mockpatch
 import requests

ceilometer/tests/alarm/test_partitioned_alarm_svc.py

@@ -19,7 +19,7 @@
 import contextlib
 
 import mock
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 from stevedore import extension
 
 from ceilometer.alarm import service

ceilometer/tests/alarm/test_rpc.py

@@ -19,7 +19,7 @@ import uuid
 
 from ceilometerclient.v2 import alarms
 import eventlet
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 from oslo_utils import timeutils
 import six
 

ceilometer/tests/alarm/test_singleton_alarm_svc.py

@@ -17,7 +17,7 @@
 """Tests for ceilometer.alarm.service.SingletonAlarmService.
 """
 import mock
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 from stevedore import extension
 
 from ceilometer.alarm import service

ceilometer/tests/api/__init__.py

@@ -17,8 +17,8 @@
 """Base classes for API tests.
 """
 
-from oslo.config import cfg
-from oslo.config import fixture as fixture_config
+from oslo_config import cfg
+from oslo_config import fixture as fixture_config
 import pecan
 import pecan.testing
 

ceilometer/tests/api/test_app.py

@@ -18,8 +18,8 @@
 import socket
 
 import mock
-from oslo.config import cfg
-from oslo.config import fixture as fixture_config
+from oslo_config import cfg
+from oslo_config import fixture as fixture_config
 
 from ceilometer.api import app
 from ceilometer.tests import base

ceilometer/tests/data_processing/test_notifications.py

@@ -16,7 +16,7 @@
 import datetime
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 from oslotest import base
 
 from ceilometer.data_processing import notifications

ceilometer/tests/db.py

@@ -24,7 +24,7 @@ import warnings
 
 import fixtures
 import mock
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 from oslotest import mockpatch
 import six
 from six.moves.urllib import parse as urlparse

ceilometer/tests/dispatcher/test_db.py

@@ -18,7 +18,7 @@ import datetime
 import uuid
 
 import mock
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 from oslotest import base
 
 from ceilometer.dispatcher import database

ceilometer/tests/dispatcher/test_file.py

@@ -18,7 +18,7 @@ import logging.handlers
 import os
 import tempfile
 
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 from oslotest import base
 
 from ceilometer.dispatcher import file

ceilometer/tests/dispatcher/test_http.py

@@ -16,7 +16,7 @@
 # under the License.
 
 import mock
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 from oslotest import base
 import requests
 

ceilometer/tests/event/test_converter.py

@@ -19,7 +19,7 @@ import datetime
 
 import jsonpath_rw
 import mock
-from oslo.config import cfg as oslo_cfg
+from oslo_config import cfg as oslo_cfg
 import six
 
 from ceilometer.event import converter

ceilometer/tests/event/test_endpoint.py

@@ -17,9 +17,9 @@
 """Tests for Ceilometer notify daemon."""
 
 import mock
-from oslo.config import cfg
-from oslo.config import fixture as fixture_config
 import oslo.messaging
+from oslo_config import cfg
+from oslo_config import fixture as fixture_config
 from stevedore import extension
 
 import ceilometer

ceilometer/tests/image/test_glance.py

@@ -16,7 +16,7 @@
 # under the License.
 
 import mock
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 from oslo_context import context
 from oslotest import base
 from oslotest import mockpatch

ceilometer/tests/ipmi/pollsters/test_node.py

@@ -15,7 +15,7 @@
 # under the License.
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ceilometer.ipmi.pollsters import node
 from ceilometer.tests.ipmi.pollsters import base

ceilometer/tests/ipmi/pollsters/test_sensor.py

@@ -15,7 +15,7 @@
 # under the License.
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from ceilometer.ipmi.pollsters import sensor
 from ceilometer.tests.ipmi.notifications import ipmi_test_data

ceilometer/tests/objectstore/test_swift_middleware.py

@@ -17,7 +17,7 @@
 # under the License.
 
 import mock
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 from oslotest import mockpatch
 import six
 

ceilometer/tests/orchestration/test_notifications.py

@@ -15,7 +15,7 @@
 import datetime
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 from oslotest import base
 
 from ceilometer.openstack.common import log

ceilometer/tests/publisher/test_messaging_publisher.py

@@ -21,8 +21,8 @@ import datetime
 
 import eventlet
 import mock
-from oslo.config import fixture as fixture_config
 import oslo.messaging
+from oslo_config import fixture as fixture_config
 from oslo_context import context
 from oslo_utils import netutils
 import testscenarios.testcase

ceilometer/tests/publisher/test_udp.py

@@ -21,7 +21,7 @@ import datetime
 
 import mock
 import msgpack
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 from oslo_utils import netutils
 from oslotest import base
 

ceilometer/tests/storage/test_get_connection.py

@@ -17,7 +17,7 @@
 """Tests for ceilometer/storage/
 """
 import mock
-from oslo.config import fixture as fixture_config
+from oslo_config import fixture as fixture_config
 from oslotest import base
 import retrying
 

ceilometer/tests/storage/test_impl_db2.py

@@ -30,7 +30,7 @@ from ceilometer.storage.mongo import utils as pymongo_utils
 from ceilometer.tests import base as test_base
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 
 class CapabilitiesTest(test_base.BaseTestCase):

ceilometer/tests/storage/test_storage_scenarios.py

@@ -23,7 +23,7 @@ import datetime
 import operator
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import timeutils
 import pymongo