Merge "Use oslo_utils instead of deprecated oslo.utils"

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
 

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

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 _

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
 

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

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

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

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 _

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

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

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

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

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

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

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:

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 _

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
 

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
 

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

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

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

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

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

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 _

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

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 _

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

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

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

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

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
 

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
 

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__)
 

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
 

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
 

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

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
 

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 _

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
 

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 _

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
 

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_

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

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
 
 

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

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)

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

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

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
 

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

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):

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

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

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'],

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

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

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
 

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

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

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

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

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

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

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()

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

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

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

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

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

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

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

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

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

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

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
 

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
 

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 _

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
 
 

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
 

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

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