From fc7e78134458b39a07af163396aa4e43602202ae Mon Sep 17 00:00:00 2001 From: Dina Belova Date: Mon, 12 Jan 2015 14:21:32 +0300 Subject: [PATCH] Use oslo_config instead of deprecated oslo.config Change-Id: I85d5c8d3d9f00f86fd14500be0da1289f5672614 --- ceilometer/agent/base.py | 2 +- ceilometer/agent/discovery/endpoint.py | 2 +- ceilometer/agent/discovery/tenant.py | 2 +- ceilometer/agent/manager.py | 2 +- ceilometer/agent/plugin_base.py | 2 +- ceilometer/alarm/evaluator/__init__.py | 2 +- ceilometer/alarm/notifier/rest.py | 2 +- ceilometer/alarm/notifier/trust.py | 2 +- ceilometer/alarm/rpc.py | 2 +- ceilometer/alarm/service.py | 2 +- ceilometer/alarm/storage/impl_sqlalchemy.py | 2 +- ceilometer/api/__init__.py | 2 +- ceilometer/api/app.py | 2 +- ceilometer/api/controllers/v2.py | 2 +- ceilometer/api/hooks.py | 2 +- ceilometer/cli.py | 2 +- ceilometer/cmd/alarm.py | 2 +- ceilometer/cmd/polling.py | 2 +- ceilometer/cmd/storage.py | 2 +- ceilometer/collector.py | 2 +- ceilometer/compute/discovery.py | 2 +- ceilometer/compute/notifications/__init__.py | 2 +- ceilometer/compute/util.py | 2 +- ceilometer/compute/virt/hyperv/inspector.py | 2 +- ceilometer/compute/virt/hyperv/utilsv2.py | 2 +- ceilometer/compute/virt/inspector.py | 2 +- ceilometer/compute/virt/libvirt/inspector.py | 2 +- ceilometer/compute/virt/vmware/inspector.py | 2 +- ceilometer/compute/virt/xenapi/inspector.py | 2 +- ceilometer/coordination.py | 2 +- ceilometer/data_processing/notifications.py | 3 +-- ceilometer/dispatcher/__init__.py | 2 +- ceilometer/dispatcher/file.py | 2 +- ceilometer/dispatcher/http.py | 2 +- ceilometer/energy/kwapi.py | 2 +- ceilometer/event/converter.py | 2 +- ceilometer/event/endpoint.py | 2 +- ceilometer/event/storage/impl_sqlalchemy.py | 2 +- ceilometer/hardware/discovery.py | 2 +- ceilometer/identity/notifications.py | 2 +- ceilometer/image/glance.py | 2 +- ceilometer/image/notifications.py | 2 +- ceilometer/ipmi/notifications/ironic.py | 2 +- ceilometer/ipmi/platform/intel_node_manager.py | 2 +- ceilometer/ipmi/pollsters/node.py | 2 +- ceilometer/ipmi/pollsters/sensor.py | 2 +- ceilometer/key_value_storage/notifications.py | 2 +- ceilometer/messaging.py | 2 +- ceilometer/middleware.py | 2 +- ceilometer/network/floatingip.py | 2 +- ceilometer/network/notifications.py | 2 +- ceilometer/network/services/discovery.py | 2 +- ceilometer/network/statistics/opencontrail/client.py | 2 +- ceilometer/network/statistics/opendaylight/client.py | 2 +- ceilometer/neutron_client.py | 2 +- ceilometer/notification.py | 2 +- ceilometer/nova_client.py | 2 +- ceilometer/objectstore/swift.py | 2 +- ceilometer/orchestration/notifications.py | 2 +- ceilometer/pipeline.py | 2 +- ceilometer/profiler/notifications.py | 2 +- ceilometer/publisher/messaging.py | 2 +- ceilometer/publisher/udp.py | 2 +- ceilometer/publisher/utils.py | 2 +- ceilometer/sample.py | 2 +- ceilometer/service.py | 2 +- ceilometer/storage/__init__.py | 2 +- ceilometer/storage/impl_db2.py | 2 +- ceilometer/storage/impl_mongodb.py | 2 +- ceilometer/storage/impl_sqlalchemy.py | 2 +- ceilometer/storage/mongo/utils.py | 2 +- ceilometer/tests/agent/agentbase.py | 2 +- ceilometer/tests/agent/test_discovery.py | 2 +- ceilometer/tests/agent/test_plugin.py | 2 +- ceilometer/tests/alarm/evaluator/test_threshold.py | 2 +- ceilometer/tests/alarm/partition/test_coordination.py | 2 +- ceilometer/tests/alarm/test_alarm_svc.py | 2 +- ceilometer/tests/alarm/test_notifier.py | 2 +- ceilometer/tests/alarm/test_partitioned_alarm_svc.py | 2 +- ceilometer/tests/alarm/test_rpc.py | 2 +- ceilometer/tests/alarm/test_singleton_alarm_svc.py | 2 +- ceilometer/tests/api/__init__.py | 4 ++-- ceilometer/tests/api/test_app.py | 4 ++-- ceilometer/tests/data_processing/test_notifications.py | 2 +- ceilometer/tests/db.py | 2 +- ceilometer/tests/dispatcher/test_db.py | 2 +- ceilometer/tests/dispatcher/test_file.py | 2 +- ceilometer/tests/dispatcher/test_http.py | 2 +- ceilometer/tests/event/test_converter.py | 2 +- ceilometer/tests/event/test_endpoint.py | 4 ++-- ceilometer/tests/image/test_glance.py | 2 +- ceilometer/tests/ipmi/pollsters/test_node.py | 2 +- ceilometer/tests/ipmi/pollsters/test_sensor.py | 2 +- ceilometer/tests/objectstore/test_swift_middleware.py | 2 +- ceilometer/tests/orchestration/test_notifications.py | 2 +- ceilometer/tests/publisher/test_messaging_publisher.py | 2 +- ceilometer/tests/publisher/test_udp.py | 2 +- ceilometer/tests/storage/test_get_connection.py | 2 +- ceilometer/tests/storage/test_impl_db2.py | 2 +- ceilometer/tests/storage/test_storage_scenarios.py | 2 +- ceilometer/tests/test_collector.py | 2 +- ceilometer/tests/test_coordination.py | 2 +- ceilometer/tests/test_messaging.py | 3 ++- ceilometer/tests/test_middleware.py | 2 +- ceilometer/tests/test_notification.py | 2 +- ceilometer/tests/test_novaclient.py | 2 +- ceilometer/utils.py | 2 +- ceilometer/volume/notifications.py | 2 +- tools/ceilometer-test-event.py | 2 +- tools/make_test_data.py | 2 +- tools/make_test_event_data.py | 2 +- tools/show_data.py | 2 +- tools/test_hbase_table_utils.py | 2 +- 113 files changed, 117 insertions(+), 117 deletions(-) diff --git a/ceilometer/agent/base.py b/ceilometer/agent/base.py index 004fb23b6..78ca17645 100644 --- a/ceilometer/agent/base.py +++ b/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 diff --git a/ceilometer/agent/discovery/endpoint.py b/ceilometer/agent/discovery/endpoint.py index 4d628e191..c7c84b366 100644 --- a/ceilometer/agent/discovery/endpoint.py +++ b/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 diff --git a/ceilometer/agent/discovery/tenant.py b/ceilometer/agent/discovery/tenant.py index 8e2c7debe..8c0430384 100644 --- a/ceilometer/agent/discovery/tenant.py +++ b/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 diff --git a/ceilometer/agent/manager.py b/ceilometer/agent/manager.py index 91dfcf7b2..95ad9a3e1 100644 --- a/ceilometer/agent/manager.py +++ b/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 diff --git a/ceilometer/agent/plugin_base.py b/ceilometer/agent/plugin_base.py index ebc44c5d1..b3b82264f 100644 --- a/ceilometer/agent/plugin_base.py +++ b/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 diff --git a/ceilometer/alarm/evaluator/__init__.py b/ceilometer/alarm/evaluator/__init__.py index 2de9b73f6..79c2a8022 100644 --- a/ceilometer/alarm/evaluator/__init__.py +++ b/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 diff --git a/ceilometer/alarm/notifier/rest.py b/ceilometer/alarm/notifier/rest.py index e923ead03..496f4f378 100644 --- a/ceilometer/alarm/notifier/rest.py +++ b/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 diff --git a/ceilometer/alarm/notifier/trust.py b/ceilometer/alarm/notifier/trust.py index 3a8f574f0..818ffc09b 100644 --- a/ceilometer/alarm/notifier/trust.py +++ b/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 diff --git a/ceilometer/alarm/rpc.py b/ceilometer/alarm/rpc.py index b50303c5f..a583703b3 100644 --- a/ceilometer/alarm/rpc.py +++ b/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 diff --git a/ceilometer/alarm/service.py b/ceilometer/alarm/service.py index c9f93a2ae..6cbb2aeaf 100644 --- a/ceilometer/alarm/service.py +++ b/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 diff --git a/ceilometer/alarm/storage/impl_sqlalchemy.py b/ceilometer/alarm/storage/impl_sqlalchemy.py index 18dc4d122..b71bf11de 100644 --- a/ceilometer/alarm/storage/impl_sqlalchemy.py +++ b/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 diff --git a/ceilometer/api/__init__.py b/ceilometer/api/__init__.py index 6585d716d..474de123d 100644 --- a/ceilometer/api/__init__.py +++ b/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 = [ diff --git a/ceilometer/api/app.py b/ceilometer/api/app.py index e5f0174c8..4037d3a39 100644 --- a/ceilometer/api/app.py +++ b/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 diff --git a/ceilometer/api/controllers/v2.py b/ceilometer/api/controllers/v2.py index 66dbd9f5e..f0d1ac4de 100644 --- a/ceilometer/api/controllers/v2.py +++ b/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 diff --git a/ceilometer/api/hooks.py b/ceilometer/api/hooks.py index dae4a3dc2..43efbd2a6 100644 --- a/ceilometer/api/hooks.py +++ b/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 diff --git a/ceilometer/cli.py b/ceilometer/cli.py index b14ab699b..f67b81532 100644 --- a/ceilometer/cli.py +++ b/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 diff --git a/ceilometer/cmd/alarm.py b/ceilometer/cmd/alarm.py index 0c0c94978..5e84f0ae4 100644 --- a/ceilometer/cmd/alarm.py +++ b/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 diff --git a/ceilometer/cmd/polling.py b/ceilometer/cmd/polling.py index 05dde9933..afa65fce3 100644 --- a/ceilometer/cmd/polling.py +++ b/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 diff --git a/ceilometer/cmd/storage.py b/ceilometer/cmd/storage.py index ac684d68f..380f3e533 100644 --- a/ceilometer/cmd/storage.py +++ b/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 diff --git a/ceilometer/collector.py b/ceilometer/collector.py index 15bcaeac7..57c7c1692 100644 --- a/ceilometer/collector.py +++ b/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 diff --git a/ceilometer/compute/discovery.py b/ceilometer/compute/discovery.py index 05175f210..ddf7b4a20 100644 --- a/ceilometer/compute/discovery.py +++ b/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 diff --git a/ceilometer/compute/notifications/__init__.py b/ceilometer/compute/notifications/__init__.py index a5213043e..890a91217 100644 --- a/ceilometer/compute/notifications/__init__.py +++ b/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 diff --git a/ceilometer/compute/util.py b/ceilometer/compute/util.py index 56b3b1f59..26f77111b 100644 --- a/ceilometer/compute/util.py +++ b/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 diff --git a/ceilometer/compute/virt/hyperv/inspector.py b/ceilometer/compute/virt/hyperv/inspector.py index 115082fc0..8deda07af 100644 --- a/ceilometer/compute/virt/hyperv/inspector.py +++ b/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 diff --git a/ceilometer/compute/virt/hyperv/utilsv2.py b/ceilometer/compute/virt/hyperv/utilsv2.py index faf828773..a00620028 100644 --- a/ceilometer/compute/virt/hyperv/utilsv2.py +++ b/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 _ diff --git a/ceilometer/compute/virt/inspector.py b/ceilometer/compute/virt/inspector.py index 299d96353..bc09f96a0 100644 --- a/ceilometer/compute/virt/inspector.py +++ b/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 diff --git a/ceilometer/compute/virt/libvirt/inspector.py b/ceilometer/compute/virt/libvirt/inspector.py index 7b0ef0220..75beabf48 100644 --- a/ceilometer/compute/virt/libvirt/inspector.py +++ b/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 diff --git a/ceilometer/compute/virt/vmware/inspector.py b/ceilometer/compute/virt/vmware/inspector.py index 0d73dc4f1..0c7344419 100644 --- a/ceilometer/compute/virt/vmware/inspector.py +++ b/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 diff --git a/ceilometer/compute/virt/xenapi/inspector.py b/ceilometer/compute/virt/xenapi/inspector.py index 07cb0e495..c3b293495 100644 --- a/ceilometer/compute/virt/xenapi/inspector.py +++ b/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 diff --git a/ceilometer/coordination.py b/ceilometer/coordination.py index f189fd62c..161112b28 100644 --- a/ceilometer/coordination.py +++ b/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 diff --git a/ceilometer/data_processing/notifications.py b/ceilometer/data_processing/notifications.py index 8ec61097c..eb2b9e75c 100644 --- a/ceilometer/data_processing/notifications.py +++ b/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 diff --git a/ceilometer/dispatcher/__init__.py b/ceilometer/dispatcher/__init__.py index 86d2b013d..d7a49c823 100644 --- a/ceilometer/dispatcher/__init__.py +++ b/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 diff --git a/ceilometer/dispatcher/file.py b/ceilometer/dispatcher/file.py index 72e498a2b..a6dfdddf4 100644 --- a/ceilometer/dispatcher/file.py +++ b/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 diff --git a/ceilometer/dispatcher/http.py b/ceilometer/dispatcher/http.py index ba8627c0b..d9add5a85 100755 --- a/ceilometer/dispatcher/http.py +++ b/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 diff --git a/ceilometer/energy/kwapi.py b/ceilometer/energy/kwapi.py index 93e490e01..0e6bc2129 100644 --- a/ceilometer/energy/kwapi.py +++ b/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 diff --git a/ceilometer/event/converter.py b/ceilometer/event/converter.py index fe646671f..b65b88514 100644 --- a/ceilometer/event/converter.py +++ b/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 diff --git a/ceilometer/event/endpoint.py b/ceilometer/event/endpoint.py index cdd9a42ae..30ab4ba65 100644 --- a/ceilometer/event/endpoint.py +++ b/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 diff --git a/ceilometer/event/storage/impl_sqlalchemy.py b/ceilometer/event/storage/impl_sqlalchemy.py index a42272665..89038b3f8 100644 --- a/ceilometer/event/storage/impl_sqlalchemy.py +++ b/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 diff --git a/ceilometer/hardware/discovery.py b/ceilometer/hardware/discovery.py index fa2544729..f959652b2 100644 --- a/ceilometer/hardware/discovery.py +++ b/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 _ diff --git a/ceilometer/identity/notifications.py b/ceilometer/identity/notifications.py index 1c6dad684..9b75074c0 100644 --- a/ceilometer/identity/notifications.py +++ b/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 diff --git a/ceilometer/image/glance.py b/ceilometer/image/glance.py index 8f4964aee..1df85d905 100644 --- a/ceilometer/image/glance.py +++ b/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 diff --git a/ceilometer/image/notifications.py b/ceilometer/image/notifications.py index dce3ed208..a96a744dc 100644 --- a/ceilometer/image/notifications.py +++ b/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 diff --git a/ceilometer/ipmi/notifications/ironic.py b/ceilometer/ipmi/notifications/ironic.py index ed40279af..0e3590008 100644 --- a/ceilometer/ipmi/notifications/ironic.py +++ b/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 diff --git a/ceilometer/ipmi/platform/intel_node_manager.py b/ceilometer/ipmi/platform/intel_node_manager.py index 85b81d51c..cbf7c5c8e 100644 --- a/ceilometer/ipmi/platform/intel_node_manager.py +++ b/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 diff --git a/ceilometer/ipmi/pollsters/node.py b/ceilometer/ipmi/pollsters/node.py index b6fc1aff1..46aabcf32 100644 --- a/ceilometer/ipmi/pollsters/node.py +++ b/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 diff --git a/ceilometer/ipmi/pollsters/sensor.py b/ceilometer/ipmi/pollsters/sensor.py index 7dda3c777..fd4d99c36 100644 --- a/ceilometer/ipmi/pollsters/sensor.py +++ b/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 diff --git a/ceilometer/key_value_storage/notifications.py b/ceilometer/key_value_storage/notifications.py index 4eb05e850..84584d9e9 100644 --- a/ceilometer/key_value_storage/notifications.py +++ b/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 diff --git a/ceilometer/messaging.py b/ceilometer/messaging.py index 694ec77fb..2c7fb3024 100644 --- a/ceilometer/messaging.py +++ b/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__" diff --git a/ceilometer/middleware.py b/ceilometer/middleware.py index 21e2edaa4..39243ae7a 100644 --- a/ceilometer/middleware.py +++ b/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 diff --git a/ceilometer/network/floatingip.py b/ceilometer/network/floatingip.py index 59832ebff..deebb8d4f 100644 --- a/ceilometer/network/floatingip.py +++ b/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 diff --git a/ceilometer/network/notifications.py b/ceilometer/network/notifications.py index 5c22c8e49..e2a67e17c 100644 --- a/ceilometer/network/notifications.py +++ b/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 _ diff --git a/ceilometer/network/services/discovery.py b/ceilometer/network/services/discovery.py index 68dc0e0c5..e96191feb 100644 --- a/ceilometer/network/services/discovery.py +++ b/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 diff --git a/ceilometer/network/statistics/opencontrail/client.py b/ceilometer/network/statistics/opencontrail/client.py index 9d9f7c453..54c1123a7 100644 --- a/ceilometer/network/statistics/opencontrail/client.py +++ b/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 diff --git a/ceilometer/network/statistics/opendaylight/client.py b/ceilometer/network/statistics/opendaylight/client.py index d5c9beb8a..499897580 100644 --- a/ceilometer/network/statistics/opendaylight/client.py +++ b/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 diff --git a/ceilometer/neutron_client.py b/ceilometer/neutron_client.py index 0d46b9aad..5c43596e7 100644 --- a/ceilometer/neutron_client.py +++ b/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 diff --git a/ceilometer/notification.py b/ceilometer/notification.py index 9d0ceaa30..659d6a56d 100644 --- a/ceilometer/notification.py +++ b/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 diff --git a/ceilometer/nova_client.py b/ceilometer/nova_client.py index 378143dbe..fca1870ac 100644 --- a/ceilometer/nova_client.py +++ b/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 diff --git a/ceilometer/objectstore/swift.py b/ceilometer/objectstore/swift.py index 7c82ab0de..b9ef9ed26 100644 --- a/ceilometer/objectstore/swift.py +++ b/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 diff --git a/ceilometer/orchestration/notifications.py b/ceilometer/orchestration/notifications.py index 4bd780524..236dbda77 100644 --- a/ceilometer/orchestration/notifications.py +++ b/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 diff --git a/ceilometer/pipeline.py b/ceilometer/pipeline.py index e169b367c..8fc5820ef 100644 --- a/ceilometer/pipeline.py +++ b/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 _ diff --git a/ceilometer/profiler/notifications.py b/ceilometer/profiler/notifications.py index 4a7a44024..c44c376ef 100644 --- a/ceilometer/profiler/notifications.py +++ b/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 diff --git a/ceilometer/publisher/messaging.py b/ceilometer/publisher/messaging.py index 9f783557d..6cfb46da0 100644 --- a/ceilometer/publisher/messaging.py +++ b/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 diff --git a/ceilometer/publisher/udp.py b/ceilometer/publisher/udp.py index 5d7fde7d7..9c3e2f932 100644 --- a/ceilometer/publisher/udp.py +++ b/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 _ diff --git a/ceilometer/publisher/utils.py b/ceilometer/publisher/utils.py index 5c16636e1..6169d7e51 100644 --- a/ceilometer/publisher/utils.py +++ b/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 diff --git a/ceilometer/sample.py b/ceilometer/sample.py index afc2b30f9..ec10ea615 100644 --- a/ceilometer/sample.py +++ b/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 = [ diff --git a/ceilometer/service.py b/ceilometer/service.py index 21e25e32c..5c4bf7195 100644 --- a/ceilometer/service.py +++ b/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 diff --git a/ceilometer/storage/__init__.py b/ceilometer/storage/__init__.py index 41a4002a7..ff40e0618 100644 --- a/ceilometer/storage/__init__.py +++ b/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 diff --git a/ceilometer/storage/impl_db2.py b/ceilometer/storage/impl_db2.py index c3e0579d7..9164cd18a 100644 --- a/ceilometer/storage/impl_db2.py +++ b/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 diff --git a/ceilometer/storage/impl_mongodb.py b/ceilometer/storage/impl_mongodb.py index a3d4a0bdb..db3dd581d 100644 --- a/ceilometer/storage/impl_mongodb.py +++ b/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 diff --git a/ceilometer/storage/impl_sqlalchemy.py b/ceilometer/storage/impl_sqlalchemy.py index 7d4cc2c05..9f7be201b 100644 --- a/ceilometer/storage/impl_sqlalchemy.py +++ b/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 diff --git a/ceilometer/storage/mongo/utils.py b/ceilometer/storage/mongo/utils.py index 403fd0296..874153da8 100644 --- a/ceilometer/storage/mongo/utils.py +++ b/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 diff --git a/ceilometer/tests/agent/agentbase.py b/ceilometer/tests/agent/agentbase.py index 72dfd0dc3..00ea44811 100644 --- a/ceilometer/tests/agent/agentbase.py +++ b/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 diff --git a/ceilometer/tests/agent/test_discovery.py b/ceilometer/tests/agent/test_discovery.py index e28caadda..22eaf6fde 100644 --- a/ceilometer/tests/agent/test_discovery.py +++ b/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 diff --git a/ceilometer/tests/agent/test_plugin.py b/ceilometer/tests/agent/test_plugin.py index 3cb303f19..0c6ca46fa 100644 --- a/ceilometer/tests/agent/test_plugin.py +++ b/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 diff --git a/ceilometer/tests/alarm/evaluator/test_threshold.py b/ceilometer/tests/alarm/evaluator/test_threshold.py index 1b03bf322..cbc413675 100644 --- a/ceilometer/tests/alarm/evaluator/test_threshold.py +++ b/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 diff --git a/ceilometer/tests/alarm/partition/test_coordination.py b/ceilometer/tests/alarm/partition/test_coordination.py index de4348696..9c2a03d28 100644 --- a/ceilometer/tests/alarm/partition/test_coordination.py +++ b/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 diff --git a/ceilometer/tests/alarm/test_alarm_svc.py b/ceilometer/tests/alarm/test_alarm_svc.py index f2d80750b..3e896dcbe 100644 --- a/ceilometer/tests/alarm/test_alarm_svc.py +++ b/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 diff --git a/ceilometer/tests/alarm/test_notifier.py b/ceilometer/tests/alarm/test_notifier.py index b2a2b41d0..ec5689132 100644 --- a/ceilometer/tests/alarm/test_notifier.py +++ b/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 diff --git a/ceilometer/tests/alarm/test_partitioned_alarm_svc.py b/ceilometer/tests/alarm/test_partitioned_alarm_svc.py index 45f2eb1d5..a885fb2c1 100644 --- a/ceilometer/tests/alarm/test_partitioned_alarm_svc.py +++ b/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 diff --git a/ceilometer/tests/alarm/test_rpc.py b/ceilometer/tests/alarm/test_rpc.py index 4c0dae7ad..bca284f05 100644 --- a/ceilometer/tests/alarm/test_rpc.py +++ b/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 diff --git a/ceilometer/tests/alarm/test_singleton_alarm_svc.py b/ceilometer/tests/alarm/test_singleton_alarm_svc.py index f6bd2affd..3d0040924 100644 --- a/ceilometer/tests/alarm/test_singleton_alarm_svc.py +++ b/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 diff --git a/ceilometer/tests/api/__init__.py b/ceilometer/tests/api/__init__.py index 9152f853e..f687e3c69 100644 --- a/ceilometer/tests/api/__init__.py +++ b/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 diff --git a/ceilometer/tests/api/test_app.py b/ceilometer/tests/api/test_app.py index 5fb483313..5daa60d84 100644 --- a/ceilometer/tests/api/test_app.py +++ b/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 diff --git a/ceilometer/tests/data_processing/test_notifications.py b/ceilometer/tests/data_processing/test_notifications.py index 9ee25eb4d..557d673ec 100644 --- a/ceilometer/tests/data_processing/test_notifications.py +++ b/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 diff --git a/ceilometer/tests/db.py b/ceilometer/tests/db.py index f29d4fee6..79d083716 100644 --- a/ceilometer/tests/db.py +++ b/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 diff --git a/ceilometer/tests/dispatcher/test_db.py b/ceilometer/tests/dispatcher/test_db.py index 26eecb856..c144af72a 100644 --- a/ceilometer/tests/dispatcher/test_db.py +++ b/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 diff --git a/ceilometer/tests/dispatcher/test_file.py b/ceilometer/tests/dispatcher/test_file.py index bdb6f181f..0d8360d4e 100644 --- a/ceilometer/tests/dispatcher/test_file.py +++ b/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 diff --git a/ceilometer/tests/dispatcher/test_http.py b/ceilometer/tests/dispatcher/test_http.py index 5f69af840..6f3942371 100755 --- a/ceilometer/tests/dispatcher/test_http.py +++ b/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 diff --git a/ceilometer/tests/event/test_converter.py b/ceilometer/tests/event/test_converter.py index 53f84a30a..b768a64eb 100644 --- a/ceilometer/tests/event/test_converter.py +++ b/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 diff --git a/ceilometer/tests/event/test_endpoint.py b/ceilometer/tests/event/test_endpoint.py index c87611c56..be5409905 100644 --- a/ceilometer/tests/event/test_endpoint.py +++ b/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 diff --git a/ceilometer/tests/image/test_glance.py b/ceilometer/tests/image/test_glance.py index e245e987a..92d71eebc 100644 --- a/ceilometer/tests/image/test_glance.py +++ b/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 diff --git a/ceilometer/tests/ipmi/pollsters/test_node.py b/ceilometer/tests/ipmi/pollsters/test_node.py index 16f546e77..30fc45dd5 100644 --- a/ceilometer/tests/ipmi/pollsters/test_node.py +++ b/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 diff --git a/ceilometer/tests/ipmi/pollsters/test_sensor.py b/ceilometer/tests/ipmi/pollsters/test_sensor.py index 3b4ab31c7..336a7f90f 100644 --- a/ceilometer/tests/ipmi/pollsters/test_sensor.py +++ b/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 diff --git a/ceilometer/tests/objectstore/test_swift_middleware.py b/ceilometer/tests/objectstore/test_swift_middleware.py index 426f10c0e..c7cb14f7a 100644 --- a/ceilometer/tests/objectstore/test_swift_middleware.py +++ b/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 diff --git a/ceilometer/tests/orchestration/test_notifications.py b/ceilometer/tests/orchestration/test_notifications.py index e98643f20..7addb7a6a 100644 --- a/ceilometer/tests/orchestration/test_notifications.py +++ b/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 diff --git a/ceilometer/tests/publisher/test_messaging_publisher.py b/ceilometer/tests/publisher/test_messaging_publisher.py index 5998d29c8..94f9bbaa8 100644 --- a/ceilometer/tests/publisher/test_messaging_publisher.py +++ b/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 diff --git a/ceilometer/tests/publisher/test_udp.py b/ceilometer/tests/publisher/test_udp.py index 8f6188752..80a640440 100644 --- a/ceilometer/tests/publisher/test_udp.py +++ b/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 diff --git a/ceilometer/tests/storage/test_get_connection.py b/ceilometer/tests/storage/test_get_connection.py index f057ee749..6148c2d9e 100644 --- a/ceilometer/tests/storage/test_get_connection.py +++ b/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 diff --git a/ceilometer/tests/storage/test_impl_db2.py b/ceilometer/tests/storage/test_impl_db2.py index 549a2f5a0..b80d7128d 100644 --- a/ceilometer/tests/storage/test_impl_db2.py +++ b/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): diff --git a/ceilometer/tests/storage/test_storage_scenarios.py b/ceilometer/tests/storage/test_storage_scenarios.py index 51c7bca57..77ad85619 100644 --- a/ceilometer/tests/storage/test_storage_scenarios.py +++ b/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 diff --git a/ceilometer/tests/test_collector.py b/ceilometer/tests/test_collector.py index 8246e08f0..8f6ca4bb0 100644 --- a/ceilometer/tests/test_collector.py +++ b/ceilometer/tests/test_collector.py @@ -19,8 +19,8 @@ import socket import mock import msgpack -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 timeutils from oslotest import mockpatch diff --git a/ceilometer/tests/test_coordination.py b/ceilometer/tests/test_coordination.py index 47a98bc08..99cac13ad 100644 --- a/ceilometer/tests/test_coordination.py +++ b/ceilometer/tests/test_coordination.py @@ -18,7 +18,7 @@ import logging import mock -from oslo.config import fixture as fixture_config +from oslo_config import fixture as fixture_config import tooz.coordination from ceilometer import coordination diff --git a/ceilometer/tests/test_messaging.py b/ceilometer/tests/test_messaging.py index b42aabb4b..1e89428a3 100644 --- a/ceilometer/tests/test_messaging.py +++ b/ceilometer/tests/test_messaging.py @@ -13,8 +13,9 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -from oslo.config import fixture as fixture_config + import oslo.messaging +from oslo_config import fixture as fixture_config from oslotest import base from ceilometer import messaging diff --git a/ceilometer/tests/test_middleware.py b/ceilometer/tests/test_middleware.py index 3de5e5930..92cebe82a 100644 --- a/ceilometer/tests/test_middleware.py +++ b/ceilometer/tests/test_middleware.py @@ -15,7 +15,7 @@ # License for the specific language governing permissions and limitations # under the License. import mock -from oslo.config import fixture as fixture_config +from oslo_config import fixture as fixture_config from ceilometer import middleware from ceilometer.tests import base diff --git a/ceilometer/tests/test_notification.py b/ceilometer/tests/test_notification.py index 5ac6bfb89..557b810bc 100644 --- a/ceilometer/tests/test_notification.py +++ b/ceilometer/tests/test_notification.py @@ -18,9 +18,9 @@ import eventlet import mock -from oslo.config import fixture as fixture_config import oslo.messaging import oslo.messaging.conffixture +from oslo_config import fixture as fixture_config from oslo_context import context from oslo_utils import timeutils from stevedore import extension diff --git a/ceilometer/tests/test_novaclient.py b/ceilometer/tests/test_novaclient.py index 8cd4add3c..fc24974b0 100644 --- a/ceilometer/tests/test_novaclient.py +++ b/ceilometer/tests/test_novaclient.py @@ -18,7 +18,7 @@ import mock import novaclient -from oslo.config import fixture as fixture_config +from oslo_config import fixture as fixture_config from oslotest import base from oslotest import mockpatch diff --git a/ceilometer/utils.py b/ceilometer/utils.py index 79b4b7214..8701eb961 100644 --- a/ceilometer/utils.py +++ b/ceilometer/utils.py @@ -27,8 +27,8 @@ import hashlib import multiprocessing import struct -from oslo.config import cfg from oslo_concurrency import processutils +from oslo_config import cfg from oslo_utils import timeutils from oslo_utils import units import six diff --git a/ceilometer/volume/notifications.py b/ceilometer/volume/notifications.py index ea9638d4b..f3eeb4904 100644 --- a/ceilometer/volume/notifications.py +++ b/ceilometer/volume/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 diff --git a/tools/ceilometer-test-event.py b/tools/ceilometer-test-event.py index b5c326276..66325cd21 100755 --- a/tools/ceilometer-test-event.py +++ b/tools/ceilometer-test-event.py @@ -25,7 +25,7 @@ you what events will be generated. import json import sys -from oslo.config import cfg +from oslo_config import cfg from stevedore import extension from ceilometer.event import converter diff --git a/tools/make_test_data.py b/tools/make_test_data.py index 456e60a07..dbd996249 100755 --- a/tools/make_test_data.py +++ b/tools/make_test_data.py @@ -35,7 +35,7 @@ import random import sys import uuid -from oslo.config import cfg +from oslo_config import cfg from oslo_utils import timeutils from ceilometer.publisher import utils diff --git a/tools/make_test_event_data.py b/tools/make_test_event_data.py index d8a27ff35..6fd32a9e0 100755 --- a/tools/make_test_event_data.py +++ b/tools/make_test_event_data.py @@ -30,7 +30,7 @@ import random import sys import uuid -from oslo.config import cfg +from oslo_config import cfg from oslo_utils import timeutils from ceilometer.event.storage import models diff --git a/tools/show_data.py b/tools/show_data.py index e36bd3c82..cd965d368 100755 --- a/tools/show_data.py +++ b/tools/show_data.py @@ -19,7 +19,7 @@ from __future__ import print_function import sys -from oslo.config import cfg +from oslo_config import cfg import six from ceilometer import storage diff --git a/tools/test_hbase_table_utils.py b/tools/test_hbase_table_utils.py index 209f9169f..1c5444b9f 100644 --- a/tools/test_hbase_table_utils.py +++ b/tools/test_hbase_table_utils.py @@ -13,7 +13,7 @@ import os import sys -from oslo.config import cfg +from oslo_config import cfg from ceilometer import storage