diff options
81 files changed, 85 insertions, 85 deletions
diff --git a/ceilometer/alarm/evaluator/__init__.py b/ceilometer/alarm/evaluator/__init__.py index 0e308361..2de9b73f 100644 --- a/ceilometer/alarm/evaluator/__init__.py +++ b/ceilometer/alarm/evaluator/__init__.py @@ -22,7 +22,7 @@ import datetime from ceilometerclient import client as ceiloclient import croniter from oslo.config import cfg -from oslo.utils import timeutils +from oslo_utils import timeutils import pytz import six diff --git a/ceilometer/alarm/evaluator/threshold.py b/ceilometer/alarm/evaluator/threshold.py index c4901f24..fc5ca9bd 100644 --- a/ceilometer/alarm/evaluator/threshold.py +++ b/ceilometer/alarm/evaluator/threshold.py @@ -19,7 +19,7 @@ import datetime import operator -from oslo.utils import timeutils +from oslo_utils import timeutils from ceilometer.alarm import evaluator from ceilometer.alarm.evaluator import utils diff --git a/ceilometer/alarm/partition/coordination.py b/ceilometer/alarm/partition/coordination.py index cf36cc30..11a74aef 100644 --- a/ceilometer/alarm/partition/coordination.py +++ b/ceilometer/alarm/partition/coordination.py @@ -19,7 +19,7 @@ import math import random import uuid -from oslo.utils import timeutils +from oslo_utils import timeutils from ceilometer.alarm import rpc as rpc_alarm from ceilometer.i18n import _ diff --git a/ceilometer/alarm/service.py b/ceilometer/alarm/service.py index 9b2d3496..a2be4a3b 100644 --- a/ceilometer/alarm/service.py +++ b/ceilometer/alarm/service.py @@ -21,7 +21,7 @@ import abc from ceilometerclient import client as ceiloclient from oslo.config import cfg -from oslo.utils import netutils +from oslo_utils import netutils import six from stevedore import extension diff --git a/ceilometer/api/controllers/v2.py b/ceilometer/api/controllers/v2.py index db4e6a61..66dbd9f5 100644 --- a/ceilometer/api/controllers/v2.py +++ b/ceilometer/api/controllers/v2.py @@ -38,10 +38,10 @@ import uuid import croniter import jsonschema from oslo.config import cfg -from oslo.utils import netutils -from oslo.utils import strutils -from oslo.utils import timeutils from oslo_context import context +from oslo_utils import netutils +from oslo_utils import strutils +from oslo_utils import timeutils import pecan from pecan import rest import pytz diff --git a/ceilometer/cli.py b/ceilometer/cli.py index d1f4870e..b14ab699 100644 --- a/ceilometer/cli.py +++ b/ceilometer/cli.py @@ -29,8 +29,8 @@ import eventlet # oslo.messaging use threading.local eventlet.monkey_patch(socket=True, select=True, thread=True) from oslo.config import cfg -from oslo.utils import timeutils from oslo_context import context +from oslo_utils import timeutils from ceilometer import pipeline from ceilometer import sample diff --git a/ceilometer/collector.py b/ceilometer/collector.py index 756b4ee4..15bcaeac 100644 --- a/ceilometer/collector.py +++ b/ceilometer/collector.py @@ -20,7 +20,7 @@ import socket import msgpack from oslo.config import cfg import oslo.messaging -from oslo.utils import units +from oslo_utils import units from ceilometer import dispatcher from ceilometer import messaging diff --git a/ceilometer/compute/notifications/cpu.py b/ceilometer/compute/notifications/cpu.py index 75c1f5ed..a3dfd680 100644 --- a/ceilometer/compute/notifications/cpu.py +++ b/ceilometer/compute/notifications/cpu.py @@ -17,7 +17,7 @@ """Converters for producing compute CPU sample messages from notification events. """ -from oslo.utils import timeutils +from oslo_utils import timeutils from ceilometer.compute import notifications from ceilometer.i18n import _ diff --git a/ceilometer/compute/pollsters/__init__.py b/ceilometer/compute/pollsters/__init__.py index a648ce8b..9c45a98a 100644 --- a/ceilometer/compute/pollsters/__init__.py +++ b/ceilometer/compute/pollsters/__init__.py @@ -14,7 +14,7 @@ import abc -from oslo.utils import timeutils +from oslo_utils import timeutils import six from ceilometer.agent import plugin_base diff --git a/ceilometer/compute/pollsters/net.py b/ceilometer/compute/pollsters/net.py index c0e6b9d2..f5efc830 100644 --- a/ceilometer/compute/pollsters/net.py +++ b/ceilometer/compute/pollsters/net.py @@ -19,7 +19,7 @@ import copy -from oslo.utils import timeutils +from oslo_utils import timeutils import ceilometer from ceilometer.compute import pollsters diff --git a/ceilometer/compute/pollsters/util.py b/ceilometer/compute/pollsters/util.py index 0492c19a..41a52b66 100644 --- a/ceilometer/compute/pollsters/util.py +++ b/ceilometer/compute/pollsters/util.py @@ -16,7 +16,7 @@ # 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.utils import timeutils +from oslo_utils import timeutils from ceilometer.compute import util as compute_util from ceilometer import sample diff --git a/ceilometer/compute/virt/hyperv/inspector.py b/ceilometer/compute/virt/hyperv/inspector.py index c9edf0ff..115082fc 100644 --- a/ceilometer/compute/virt/hyperv/inspector.py +++ b/ceilometer/compute/virt/hyperv/inspector.py @@ -17,7 +17,7 @@ """Implementation of Inspector abstraction for Hyper-V""" from oslo.config import cfg -from oslo.utils import units +from oslo_utils import units from ceilometer.compute.pollsters import util from ceilometer.compute.virt.hyperv import utilsv2 diff --git a/ceilometer/compute/virt/libvirt/inspector.py b/ceilometer/compute/virt/libvirt/inspector.py index 3066f9bf..7b0ef022 100644 --- a/ceilometer/compute/virt/libvirt/inspector.py +++ b/ceilometer/compute/virt/libvirt/inspector.py @@ -18,7 +18,7 @@ from lxml import etree from oslo.config import cfg -from oslo.utils import units +from oslo_utils import units import six from ceilometer.compute.pollsters import util diff --git a/ceilometer/compute/virt/vmware/inspector.py b/ceilometer/compute/virt/vmware/inspector.py index be61b316..0d73dc4f 100644 --- a/ceilometer/compute/virt/vmware/inspector.py +++ b/ceilometer/compute/virt/vmware/inspector.py @@ -16,8 +16,8 @@ """Implementation of Inspector abstraction for VMware vSphere""" from oslo.config import cfg -from oslo.utils import units from oslo.vmware import api +from oslo_utils import units from ceilometer.compute.virt import inspector as virt_inspector from ceilometer.compute.virt.vmware import vsphere_operations diff --git a/ceilometer/compute/virt/xenapi/inspector.py b/ceilometer/compute/virt/xenapi/inspector.py index a81aea72..07cb0e49 100644 --- a/ceilometer/compute/virt/xenapi/inspector.py +++ b/ceilometer/compute/virt/xenapi/inspector.py @@ -17,7 +17,7 @@ from eventlet import timeout from oslo.config import cfg -from oslo.utils import units +from oslo_utils import units try: import XenAPI as api except ImportError: diff --git a/ceilometer/dispatcher/database.py b/ceilometer/dispatcher/database.py index f21c799c..fcc846a4 100644 --- a/ceilometer/dispatcher/database.py +++ b/ceilometer/dispatcher/database.py @@ -14,7 +14,7 @@ # 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.utils import timeutils +from oslo_utils import timeutils from ceilometer import dispatcher from ceilometer.i18n import _ diff --git a/ceilometer/event/converter.py b/ceilometer/event/converter.py index fc27575c..fe646671 100644 --- a/ceilometer/event/converter.py +++ b/ceilometer/event/converter.py @@ -20,7 +20,7 @@ import os import jsonpath_rw from oslo.config import cfg -from oslo.utils import timeutils +from oslo_utils import timeutils import six import yaml diff --git a/ceilometer/event/storage/models.py b/ceilometer/event/storage/models.py index 7c485108..d31437d9 100644 --- a/ceilometer/event/storage/models.py +++ b/ceilometer/event/storage/models.py @@ -12,7 +12,7 @@ # under the License. """Model classes for use in the events storage API. """ -from oslo.utils import timeutils +from oslo_utils import timeutils from ceilometer.storage import base diff --git a/ceilometer/hardware/plugin.py b/ceilometer/hardware/plugin.py index 302fbe7a..f6eb5fa4 100644 --- a/ceilometer/hardware/plugin.py +++ b/ceilometer/hardware/plugin.py @@ -22,7 +22,7 @@ import abc import itertools -from oslo.utils import netutils +from oslo_utils import netutils import six from ceilometer.agent import plugin_base diff --git a/ceilometer/hardware/pollsters/util.py b/ceilometer/hardware/pollsters/util.py index d3190d97..61c2159e 100644 --- a/ceilometer/hardware/pollsters/util.py +++ b/ceilometer/hardware/pollsters/util.py @@ -20,7 +20,7 @@ import copy -from oslo.utils import timeutils +from oslo_utils import timeutils from six.moves.urllib import parse as urlparse from ceilometer import sample diff --git a/ceilometer/image/glance.py b/ceilometer/image/glance.py index 34d2d28b..8f4964ae 100644 --- a/ceilometer/image/glance.py +++ b/ceilometer/image/glance.py @@ -22,7 +22,7 @@ import itertools import glanceclient from oslo.config import cfg -from oslo.utils import timeutils +from oslo_utils import timeutils from ceilometer.agent import plugin_base from ceilometer import sample diff --git a/ceilometer/ipmi/pollsters/node.py b/ceilometer/ipmi/pollsters/node.py index 180fe7cf..b6fc1aff 100644 --- a/ceilometer/ipmi/pollsters/node.py +++ b/ceilometer/ipmi/pollsters/node.py @@ -17,7 +17,7 @@ import abc from oslo.config import cfg -from oslo.utils import timeutils +from oslo_utils import timeutils import six from ceilometer.agent import plugin_base diff --git a/ceilometer/ipmi/pollsters/sensor.py b/ceilometer/ipmi/pollsters/sensor.py index 0e900ebd..7dda3c77 100644 --- a/ceilometer/ipmi/pollsters/sensor.py +++ b/ceilometer/ipmi/pollsters/sensor.py @@ -15,7 +15,7 @@ # under the License. from oslo.config import cfg -from oslo.utils import timeutils +from oslo_utils import timeutils from ceilometer.agent import plugin_base from ceilometer.ipmi.notifications import ironic as parser diff --git a/ceilometer/network/floatingip.py b/ceilometer/network/floatingip.py index 05429604..0988be4f 100644 --- a/ceilometer/network/floatingip.py +++ b/ceilometer/network/floatingip.py @@ -19,7 +19,7 @@ # under the License. from oslo.config import cfg -from oslo.utils import timeutils +from oslo_utils import timeutils from ceilometer.agent import plugin_base from ceilometer.i18n import _ diff --git a/ceilometer/network/services/fwaas.py b/ceilometer/network/services/fwaas.py index ed6a1ab5..52d76559 100644 --- a/ceilometer/network/services/fwaas.py +++ b/ceilometer/network/services/fwaas.py @@ -14,7 +14,7 @@ # 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.utils import timeutils +from oslo_utils import timeutils from ceilometer.i18n import _ from ceilometer.network.services import base diff --git a/ceilometer/network/services/lbaas.py b/ceilometer/network/services/lbaas.py index 9b71033a..51ce60c9 100644 --- a/ceilometer/network/services/lbaas.py +++ b/ceilometer/network/services/lbaas.py @@ -18,7 +18,7 @@ import abc import collections -from oslo.utils import timeutils +from oslo_utils import timeutils import six from ceilometer.i18n import _ diff --git a/ceilometer/network/services/vpnaas.py b/ceilometer/network/services/vpnaas.py index 0c9e7dbf..b16bc246 100644 --- a/ceilometer/network/services/vpnaas.py +++ b/ceilometer/network/services/vpnaas.py @@ -14,7 +14,7 @@ # 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.utils import timeutils +from oslo_utils import timeutils from ceilometer.i18n import _ from ceilometer.network.services import base diff --git a/ceilometer/network/statistics/__init__.py b/ceilometer/network/statistics/__init__.py index 86a45c52..ce692d2b 100644 --- a/ceilometer/network/statistics/__init__.py +++ b/ceilometer/network/statistics/__init__.py @@ -15,7 +15,7 @@ import abc -from oslo.utils import netutils +from oslo_utils import netutils import six from six.moves.urllib import parse as urlparse from stevedore import driver as _driver diff --git a/ceilometer/network/statistics/opencontrail/driver.py b/ceilometer/network/statistics/opencontrail/driver.py index e362a3c7..7d6e13db 100644 --- a/ceilometer/network/statistics/opencontrail/driver.py +++ b/ceilometer/network/statistics/opencontrail/driver.py @@ -13,7 +13,7 @@ # 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.utils import timeutils +from oslo_utils import timeutils from six.moves.urllib import parse as urlparse from ceilometer.network.statistics import driver diff --git a/ceilometer/network/statistics/opendaylight/driver.py b/ceilometer/network/statistics/opendaylight/driver.py index 9b974b1f..5d9f6b5d 100644 --- a/ceilometer/network/statistics/opendaylight/driver.py +++ b/ceilometer/network/statistics/opendaylight/driver.py @@ -12,7 +12,7 @@ # 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.utils import timeutils +from oslo_utils import timeutils import six from six import moves from six.moves.urllib import parse as urlparse diff --git a/ceilometer/objectstore/swift.py b/ceilometer/objectstore/swift.py index ee084f2b..7c82ab0d 100644 --- a/ceilometer/objectstore/swift.py +++ b/ceilometer/objectstore/swift.py @@ -21,7 +21,7 @@ from __future__ import absolute_import from keystoneclient import exceptions from oslo.config import cfg -from oslo.utils import timeutils +from oslo_utils import timeutils import six.moves.urllib.parse as urlparse from swiftclient import client as swift diff --git a/ceilometer/objectstore/swift_middleware.py b/ceilometer/objectstore/swift_middleware.py index 6eb7f8ed..c5e357b5 100644 --- a/ceilometer/objectstore/swift_middleware.py +++ b/ceilometer/objectstore/swift_middleware.py @@ -42,8 +42,8 @@ before "proxy-server" and add the following filter in the file: from __future__ import absolute_import import logging -from oslo.utils import timeutils from oslo_context import context +from oslo_utils import timeutils import six import six.moves.urllib.parse as urlparse diff --git a/ceilometer/openstack/common/fileutils.py b/ceilometer/openstack/common/fileutils.py index ec26eaf9..64cee1ce 100644 --- a/ceilometer/openstack/common/fileutils.py +++ b/ceilometer/openstack/common/fileutils.py @@ -19,7 +19,7 @@ import logging import os import tempfile -from oslo.utils import excutils +from oslo_utils import excutils LOG = logging.getLogger(__name__) diff --git a/ceilometer/openstack/common/log.py b/ceilometer/openstack/common/log.py index 58d9fb7e..2e3e3a43 100644 --- a/ceilometer/openstack/common/log.py +++ b/ceilometer/openstack/common/log.py @@ -40,7 +40,7 @@ import traceback from oslo.config import cfg from oslo.serialization import jsonutils -from oslo.utils import importutils +from oslo_utils import importutils import six from six import moves diff --git a/ceilometer/publisher/__init__.py b/ceilometer/publisher/__init__.py index acee885f..70578833 100644 --- a/ceilometer/publisher/__init__.py +++ b/ceilometer/publisher/__init__.py @@ -19,7 +19,7 @@ import abc -from oslo.utils import netutils +from oslo_utils import netutils import six from stevedore import driver diff --git a/ceilometer/publisher/udp.py b/ceilometer/publisher/udp.py index 9b387f5a..5d7fde7d 100644 --- a/ceilometer/publisher/udp.py +++ b/ceilometer/publisher/udp.py @@ -22,7 +22,7 @@ import socket import msgpack from oslo.config import cfg -from oslo.utils import netutils +from oslo_utils import netutils from ceilometer.i18n import _ from ceilometer.openstack.common import log diff --git a/ceilometer/storage/base.py b/ceilometer/storage/base.py index 3655796a..0d34c9b3 100644 --- a/ceilometer/storage/base.py +++ b/ceilometer/storage/base.py @@ -21,7 +21,7 @@ import datetime import inspect import math -from oslo.utils import timeutils +from oslo_utils import timeutils import six from six import moves diff --git a/ceilometer/storage/hbase/base.py b/ceilometer/storage/hbase/base.py index bd10d307..fd5dc7d3 100644 --- a/ceilometer/storage/hbase/base.py +++ b/ceilometer/storage/hbase/base.py @@ -14,7 +14,7 @@ import os import happybase -from oslo.utils import netutils +from oslo_utils import netutils from six.moves.urllib import parse as urlparse from ceilometer.i18n import _ diff --git a/ceilometer/storage/impl_db2.py b/ceilometer/storage/impl_db2.py index 0f973d59..c3e0579d 100644 --- a/ceilometer/storage/impl_db2.py +++ b/ceilometer/storage/impl_db2.py @@ -29,7 +29,7 @@ import sys import bson.code import bson.objectid from oslo.config import cfg -from oslo.utils import timeutils +from oslo_utils import timeutils import pymongo import six diff --git a/ceilometer/storage/impl_hbase.py b/ceilometer/storage/impl_hbase.py index f376ce28..6c2fe866 100644 --- a/ceilometer/storage/impl_hbase.py +++ b/ceilometer/storage/impl_hbase.py @@ -15,7 +15,7 @@ import datetime import operator import time -from oslo.utils import timeutils +from oslo_utils import timeutils import ceilometer from ceilometer.i18n import _ diff --git a/ceilometer/storage/impl_mongodb.py b/ceilometer/storage/impl_mongodb.py index c0d8b480..9be67d69 100644 --- a/ceilometer/storage/impl_mongodb.py +++ b/ceilometer/storage/impl_mongodb.py @@ -30,7 +30,7 @@ import uuid import bson.code import bson.objectid from oslo.config import cfg -from oslo.utils import timeutils +from oslo_utils import timeutils import pymongo import six diff --git a/ceilometer/storage/impl_sqlalchemy.py b/ceilometer/storage/impl_sqlalchemy.py index b8df8d29..7d4cc2c0 100644 --- a/ceilometer/storage/impl_sqlalchemy.py +++ b/ceilometer/storage/impl_sqlalchemy.py @@ -25,7 +25,7 @@ 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.utils import timeutils +from oslo_utils import timeutils import six import sqlalchemy as sa from sqlalchemy import and_ diff --git a/ceilometer/storage/mongo/utils.py b/ceilometer/storage/mongo/utils.py index 62a4586b..403fd029 100644 --- a/ceilometer/storage/mongo/utils.py +++ b/ceilometer/storage/mongo/utils.py @@ -22,7 +22,7 @@ import time import weakref from oslo.config import cfg -from oslo.utils import netutils +from oslo_utils import netutils import pymongo import six from six.moves.urllib import parse diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/005_remove_resource_timestamp.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/005_remove_resource_timestamp.py index 0659fd84..46867e75 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/005_remove_resource_timestamp.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/005_remove_resource_timestamp.py @@ -14,7 +14,7 @@ # 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.utils import timeutils +from oslo_utils import timeutils from sqlalchemy import MetaData, Table, Column, DateTime diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/029_sample_recorded_at.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/029_sample_recorded_at.py index 722d7107..844d906d 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/029_sample_recorded_at.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/029_sample_recorded_at.py @@ -10,7 +10,7 @@ # 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.utils import timeutils +from oslo_utils import timeutils import sqlalchemy from ceilometer.storage.sqlalchemy import models diff --git a/ceilometer/storage/sqlalchemy/models.py b/ceilometer/storage/sqlalchemy/models.py index d0c56e43..62f73b06 100644 --- a/ceilometer/storage/sqlalchemy/models.py +++ b/ceilometer/storage/sqlalchemy/models.py @@ -19,7 +19,7 @@ SQLAlchemy models for Ceilometer data. import hashlib import json -from oslo.utils import timeutils +from oslo_utils import timeutils import six from sqlalchemy import (Column, Integer, String, ForeignKey, Index, UniqueConstraint, BigInteger) diff --git a/ceilometer/tests/alarm/evaluator/test_base.py b/ceilometer/tests/alarm/evaluator/test_base.py index 0f4239c1..40c034fc 100644 --- a/ceilometer/tests/alarm/evaluator/test_base.py +++ b/ceilometer/tests/alarm/evaluator/test_base.py @@ -19,7 +19,7 @@ import datetime import mock -from oslo.utils import timeutils +from oslo_utils import timeutils from oslotest import base from ceilometer.alarm import evaluator diff --git a/ceilometer/tests/alarm/evaluator/test_combination.py b/ceilometer/tests/alarm/evaluator/test_combination.py index 220a3375..315faa49 100644 --- a/ceilometer/tests/alarm/evaluator/test_combination.py +++ b/ceilometer/tests/alarm/evaluator/test_combination.py @@ -24,7 +24,7 @@ import uuid from ceilometerclient import exc from ceilometerclient.v2 import alarms import mock -from oslo.utils import timeutils +from oslo_utils import timeutils import pytz from ceilometer.alarm.evaluator import combination diff --git a/ceilometer/tests/alarm/evaluator/test_threshold.py b/ceilometer/tests/alarm/evaluator/test_threshold.py index cb63ebbe..1b03bf32 100644 --- a/ceilometer/tests/alarm/evaluator/test_threshold.py +++ b/ceilometer/tests/alarm/evaluator/test_threshold.py @@ -23,7 +23,7 @@ from ceilometerclient import exc from ceilometerclient.v2 import statistics import mock from oslo.config import cfg -from oslo.utils import timeutils +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 7e6e6c70..de434869 100644 --- a/ceilometer/tests/alarm/partition/test_coordination.py +++ b/ceilometer/tests/alarm/partition/test_coordination.py @@ -22,7 +22,7 @@ import uuid import mock from oslo.config import fixture as fixture_config -from oslo.utils import timeutils +from oslo_utils import timeutils from six import moves from ceilometer.alarm.partition import coordination diff --git a/ceilometer/tests/alarm/test_notifier.py b/ceilometer/tests/alarm/test_notifier.py index 281cf03d..b2a2b41d 100644 --- a/ceilometer/tests/alarm/test_notifier.py +++ b/ceilometer/tests/alarm/test_notifier.py @@ -214,7 +214,7 @@ class TestAlarmNotifier(tests_base.BaseTestCase): raise Exception("Evil urlsplit!") def test_notify_alarm_invalid_url(self): - with mock.patch('oslo.utils.netutils.urlsplit', + with mock.patch('oslo_utils.netutils.urlsplit', self._fake_urlsplit): LOG = mock.MagicMock() with mock.patch('ceilometer.alarm.service.LOG', LOG): diff --git a/ceilometer/tests/alarm/test_rpc.py b/ceilometer/tests/alarm/test_rpc.py index d2d8ce15..4c0dae7a 100644 --- a/ceilometer/tests/alarm/test_rpc.py +++ b/ceilometer/tests/alarm/test_rpc.py @@ -20,7 +20,7 @@ import uuid from ceilometerclient.v2 import alarms import eventlet from oslo.config import fixture as fixture_config -from oslo.utils import timeutils +from oslo_utils import timeutils import six from ceilometer.alarm import rpc as rpc_alarm diff --git a/ceilometer/tests/api/v2/test_acl_scenarios.py b/ceilometer/tests/api/v2/test_acl_scenarios.py index c6cb2fb2..a2398c9b 100644 --- a/ceilometer/tests/api/v2/test_acl_scenarios.py +++ b/ceilometer/tests/api/v2/test_acl_scenarios.py @@ -19,7 +19,7 @@ import datetime import json -from oslo.utils import timeutils +from oslo_utils import timeutils import webtest from ceilometer.api import app diff --git a/ceilometer/tests/api/v2/test_alarm_scenarios.py b/ceilometer/tests/api/v2/test_alarm_scenarios.py index ac2f93cd..5572b708 100644 --- a/ceilometer/tests/api/v2/test_alarm_scenarios.py +++ b/ceilometer/tests/api/v2/test_alarm_scenarios.py @@ -835,7 +835,7 @@ class TestAlarms(v2.FunctionalTest, raise Exception("Evil urlsplit!") def test_post_invalid_alarm_actions_format(self): - with mock.patch('oslo.utils.netutils.urlsplit', + with mock.patch('oslo_utils.netutils.urlsplit', self._fake_urlsplit): self._do_post_alarm_invalid_action( alarm_actions=['http://[::1'], diff --git a/ceilometer/tests/api/v2/test_complex_query_scenarios.py b/ceilometer/tests/api/v2/test_complex_query_scenarios.py index 2daa602c..cf8bb1f9 100644 --- a/ceilometer/tests/api/v2/test_complex_query_scenarios.py +++ b/ceilometer/tests/api/v2/test_complex_query_scenarios.py @@ -20,7 +20,7 @@ import datetime -from oslo.utils import timeutils +from oslo_utils import timeutils from ceilometer.alarm.storage import models from ceilometer.publisher import utils diff --git a/ceilometer/tests/api/v2/test_compute_duration_by_resource_scenarios.py b/ceilometer/tests/api/v2/test_compute_duration_by_resource_scenarios.py index 83ffeb1c..d7a42d92 100644 --- a/ceilometer/tests/api/v2/test_compute_duration_by_resource_scenarios.py +++ b/ceilometer/tests/api/v2/test_compute_duration_by_resource_scenarios.py @@ -20,7 +20,7 @@ import datetime import mock -from oslo.utils import timeutils +from oslo_utils import timeutils from ceilometer.storage import models from ceilometer.tests.api import v2 diff --git a/ceilometer/tests/api/v2/test_list_events_scenarios.py b/ceilometer/tests/api/v2/test_list_events_scenarios.py index 6a6e60ab..f1fc22ce 100644 --- a/ceilometer/tests/api/v2/test_list_events_scenarios.py +++ b/ceilometer/tests/api/v2/test_list_events_scenarios.py @@ -20,7 +20,7 @@ import datetime import mock -from oslo.utils import timeutils +from oslo_utils import timeutils import six import webtest.app diff --git a/ceilometer/tests/api/v2/test_list_resources_scenarios.py b/ceilometer/tests/api/v2/test_list_resources_scenarios.py index d5e92871..58fedca8 100644 --- a/ceilometer/tests/api/v2/test_list_resources_scenarios.py +++ b/ceilometer/tests/api/v2/test_list_resources_scenarios.py @@ -20,7 +20,7 @@ import datetime import json -from oslo.utils import timeutils +from oslo_utils import timeutils import six from ceilometer.publisher import utils diff --git a/ceilometer/tests/api/v2/test_post_samples_scenarios.py b/ceilometer/tests/api/v2/test_post_samples_scenarios.py index c39cdbb6..c7ebf9c8 100644 --- a/ceilometer/tests/api/v2/test_post_samples_scenarios.py +++ b/ceilometer/tests/api/v2/test_post_samples_scenarios.py @@ -21,7 +21,7 @@ import copy import datetime import mock -from oslo.utils import timeutils +from oslo_utils import timeutils from oslotest import mockpatch from ceilometer.tests.api import v2 diff --git a/ceilometer/tests/api/v2/test_query.py b/ceilometer/tests/api/v2/test_query.py index afc5ea85..31cdba66 100644 --- a/ceilometer/tests/api/v2/test_query.py +++ b/ceilometer/tests/api/v2/test_query.py @@ -18,7 +18,7 @@ import datetime import fixtures import mock -from oslo.utils import timeutils +from oslo_utils import timeutils from oslotest import base from oslotest import mockpatch import wsme diff --git a/ceilometer/tests/base.py b/ceilometer/tests/base.py index b1b60014..b7660357 100644 --- a/ceilometer/tests/base.py +++ b/ceilometer/tests/base.py @@ -22,7 +22,7 @@ import os.path import eventlet import oslo.messaging.conffixture -from oslo.utils import timeutils +from oslo_utils import timeutils from oslotest import base from oslotest import mockpatch import six diff --git a/ceilometer/tests/compute/virt/hyperv/test_inspector.py b/ceilometer/tests/compute/virt/hyperv/test_inspector.py index 41d79344..985d6286 100644 --- a/ceilometer/tests/compute/virt/hyperv/test_inspector.py +++ b/ceilometer/tests/compute/virt/hyperv/test_inspector.py @@ -18,7 +18,7 @@ Tests for Hyper-V inspector. """ import mock -from oslo.utils import units +from oslo_utils import units from oslotest import base from ceilometer.compute.virt.hyperv import inspector as hyperv_inspector diff --git a/ceilometer/tests/compute/virt/libvirt/test_inspector.py b/ceilometer/tests/compute/virt/libvirt/test_inspector.py index 4a18fcbb..5500af5c 100644 --- a/ceilometer/tests/compute/virt/libvirt/test_inspector.py +++ b/ceilometer/tests/compute/virt/libvirt/test_inspector.py @@ -22,7 +22,7 @@ import contextlib import fixtures import mock -from oslo.utils import units +from oslo_utils import units from oslotest import base from ceilometer.compute.virt import inspector as virt_inspector diff --git a/ceilometer/tests/event/test_converter.py b/ceilometer/tests/event/test_converter.py index 2df34cf9..53f84a30 100644 --- a/ceilometer/tests/event/test_converter.py +++ b/ceilometer/tests/event/test_converter.py @@ -547,7 +547,7 @@ class TestEventDefinition(ConverterBase): edef = converter.EventDefinition(cfg, self.fake_plugin_mgr) self.assertTrue(edef.is_catchall) - @mock.patch('oslo.utils.timeutils.utcnow') + @mock.patch('oslo_utils.timeutils.utcnow') def test_extract_when(self, mock_utcnow): now = datetime.datetime.utcnow() modified = now + datetime.timedelta(minutes=1) @@ -624,7 +624,7 @@ class TestNotificationConverter(ConverterBase): host='cydonia') self.fake_plugin_mgr = {} - @mock.patch('oslo.utils.timeutils.utcnow') + @mock.patch('oslo_utils.timeutils.utcnow') def test_converter_missing_keys(self, mock_utcnow): # test a malformed notification now = datetime.datetime.utcnow() diff --git a/ceilometer/tests/hardware/inspector/test_inspector.py b/ceilometer/tests/hardware/inspector/test_inspector.py index 75c0deba..22a245c4 100644 --- a/ceilometer/tests/hardware/inspector/test_inspector.py +++ b/ceilometer/tests/hardware/inspector/test_inspector.py @@ -14,7 +14,7 @@ # 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.utils import netutils +from oslo_utils import netutils from ceilometer.hardware import inspector from ceilometer.tests import base diff --git a/ceilometer/tests/hardware/inspector/test_snmp.py b/ceilometer/tests/hardware/inspector/test_snmp.py index a93bad1b..e43fd427 100644 --- a/ceilometer/tests/hardware/inspector/test_snmp.py +++ b/ceilometer/tests/hardware/inspector/test_snmp.py @@ -16,7 +16,7 @@ # under the License. """Tests for ceilometer/hardware/inspector/snmp/inspector.py """ -from oslo.utils import netutils +from oslo_utils import netutils from oslotest import mockpatch from ceilometer.hardware.inspector import snmp diff --git a/ceilometer/tests/hardware/pollsters/test_util.py b/ceilometer/tests/hardware/pollsters/test_util.py index 247492a1..a31cdbb3 100644 --- a/ceilometer/tests/hardware/pollsters/test_util.py +++ b/ceilometer/tests/hardware/pollsters/test_util.py @@ -15,7 +15,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.utils import netutils +from oslo_utils import netutils from ceilometer.hardware.pollsters import util from ceilometer import sample diff --git a/ceilometer/tests/network/statistics/test_statistics.py b/ceilometer/tests/network/statistics/test_statistics.py index 324ba34e..7d942dd5 100644 --- a/ceilometer/tests/network/statistics/test_statistics.py +++ b/ceilometer/tests/network/statistics/test_statistics.py @@ -15,7 +15,7 @@ import datetime -from oslo.utils import timeutils +from oslo_utils import timeutils from oslotest import base from ceilometer.network import statistics diff --git a/ceilometer/tests/pipeline_base.py b/ceilometer/tests/pipeline_base.py index 10dd7839..5bda3727 100644 --- a/ceilometer/tests/pipeline_base.py +++ b/ceilometer/tests/pipeline_base.py @@ -22,7 +22,7 @@ import datetime import traceback import mock -from oslo.utils import timeutils +from oslo_utils import timeutils from oslotest import base from oslotest import mockpatch import six diff --git a/ceilometer/tests/publisher/test_file.py b/ceilometer/tests/publisher/test_file.py index 13ebbe5d..4c92c40e 100644 --- a/ceilometer/tests/publisher/test_file.py +++ b/ceilometer/tests/publisher/test_file.py @@ -22,7 +22,7 @@ import logging.handlers import os import tempfile -from oslo.utils import netutils +from oslo_utils import netutils from oslotest import base from ceilometer.publisher import file diff --git a/ceilometer/tests/publisher/test_messaging_publisher.py b/ceilometer/tests/publisher/test_messaging_publisher.py index 678fd627..5998d29c 100644 --- a/ceilometer/tests/publisher/test_messaging_publisher.py +++ b/ceilometer/tests/publisher/test_messaging_publisher.py @@ -23,8 +23,8 @@ import eventlet import mock from oslo.config import fixture as fixture_config import oslo.messaging -from oslo.utils import netutils from oslo_context import context +from oslo_utils import netutils import testscenarios.testcase from ceilometer import messaging diff --git a/ceilometer/tests/publisher/test_udp.py b/ceilometer/tests/publisher/test_udp.py index 324ce8cc..8f618875 100644 --- a/ceilometer/tests/publisher/test_udp.py +++ b/ceilometer/tests/publisher/test_udp.py @@ -22,7 +22,7 @@ import datetime import mock import msgpack from oslo.config import fixture as fixture_config -from oslo.utils import netutils +from oslo_utils import netutils from oslotest import base from ceilometer.publisher import udp diff --git a/ceilometer/tests/storage/test_impl_sqlalchemy.py b/ceilometer/tests/storage/test_impl_sqlalchemy.py index f05f075e..5165991c 100644 --- a/ceilometer/tests/storage/test_impl_sqlalchemy.py +++ b/ceilometer/tests/storage/test_impl_sqlalchemy.py @@ -26,7 +26,7 @@ import datetime import repr import mock -from oslo.utils import timeutils +from oslo_utils import timeutils from ceilometer.alarm.storage import impl_sqlalchemy as impl_sqla_alarm from ceilometer.event.storage import impl_sqlalchemy as impl_sqla_event diff --git a/ceilometer/tests/storage/test_storage_scenarios.py b/ceilometer/tests/storage/test_storage_scenarios.py index 0239536e..51c7bca5 100644 --- a/ceilometer/tests/storage/test_storage_scenarios.py +++ b/ceilometer/tests/storage/test_storage_scenarios.py @@ -24,7 +24,7 @@ import operator import mock from oslo.config import cfg -from oslo.utils import timeutils +from oslo_utils import timeutils import pymongo import ceilometer diff --git a/ceilometer/tests/test_collector.py b/ceilometer/tests/test_collector.py index 3293acbc..8246e08f 100644 --- a/ceilometer/tests/test_collector.py +++ b/ceilometer/tests/test_collector.py @@ -21,8 +21,8 @@ import mock import msgpack from oslo.config import fixture as fixture_config import oslo.messaging -from oslo.utils import timeutils from oslo_context import context +from oslo_utils import timeutils from oslotest import mockpatch from stevedore import extension diff --git a/ceilometer/tests/test_notification.py b/ceilometer/tests/test_notification.py index 9cd9c109..5ac6bfb8 100644 --- a/ceilometer/tests/test_notification.py +++ b/ceilometer/tests/test_notification.py @@ -21,8 +21,8 @@ import mock from oslo.config import fixture as fixture_config import oslo.messaging import oslo.messaging.conffixture -from oslo.utils import timeutils from oslo_context import context +from oslo_utils import timeutils from stevedore import extension import yaml diff --git a/ceilometer/transformer/conversions.py b/ceilometer/transformer/conversions.py index f9344757..498f466f 100644 --- a/ceilometer/transformer/conversions.py +++ b/ceilometer/transformer/conversions.py @@ -18,7 +18,7 @@ import collections import re -from oslo.utils import timeutils +from oslo_utils import timeutils import six from ceilometer.i18n import _ diff --git a/ceilometer/utils.py b/ceilometer/utils.py index 4a0ab6a8..79b4b721 100644 --- a/ceilometer/utils.py +++ b/ceilometer/utils.py @@ -28,9 +28,9 @@ import multiprocessing import struct from oslo.config import cfg -from oslo.utils import timeutils -from oslo.utils import units from oslo_concurrency import processutils +from oslo_utils import timeutils +from oslo_utils import units import six diff --git a/nova_tests/test_notifier.py b/nova_tests/test_notifier.py index 1e466f74..bb0af0b9 100644 --- a/nova_tests/test_notifier.py +++ b/nova_tests/test_notifier.py @@ -22,7 +22,7 @@ import contextlib import datetime import mock -from oslo.utils import importutils +from oslo_utils import importutils from oslotest import base from oslotest import moxstubout diff --git a/tools/make_test_data.py b/tools/make_test_data.py index 5d304c4b..456e60a0 100755 --- a/tools/make_test_data.py +++ b/tools/make_test_data.py @@ -36,7 +36,7 @@ import sys import uuid from oslo.config import cfg -from oslo.utils import timeutils +from oslo_utils import timeutils from ceilometer.publisher import utils from ceilometer import sample diff --git a/tools/make_test_event_data.py b/tools/make_test_event_data.py index 1581ee3f..d8a27ff3 100755 --- a/tools/make_test_event_data.py +++ b/tools/make_test_event_data.py @@ -31,7 +31,7 @@ import sys import uuid from oslo.config import cfg -from oslo.utils import timeutils +from oslo_utils import timeutils from ceilometer.event.storage import models from ceilometer import storage |