11 files changed, 13 insertions, 11 deletions
diff --git a/nova/tests/objects/test_aggregate.py b/nova/tests/objects/test_aggregate.py
index a1d016bb2b..9492b26cf8 100644
--- a/nova/tests/objects/test_aggregate.py
+++ b/nova/tests/objects/test_aggregate.py
@@ -13,11 +13,11 @@
 #    under the License.
 
 import mock
+from oslo.utils import timeutils
 
 from nova import db
 from nova import exception
 from nova.objects import aggregate
-from nova.openstack.common import timeutils
 from nova.tests import fake_notifier
 from nova.tests.objects import test_objects
 
diff --git a/nova/tests/objects/test_bandwidth_usage.py b/nova/tests/objects/test_bandwidth_usage.py
index e8e28bedb1..d7662210b6 100644
--- a/nova/tests/objects/test_bandwidth_usage.py
+++ b/nova/tests/objects/test_bandwidth_usage.py
@@ -14,11 +14,11 @@ import datetime
 
 import iso8601
 import mock
+from oslo.utils import timeutils
 
 from nova import context
 from nova import db
 from nova.objects import bandwidth_usage
-from nova.openstack.common import timeutils
 from nova import test
 from nova.tests.objects import test_objects
 
diff --git a/nova/tests/objects/test_compute_node.py b/nova/tests/objects/test_compute_node.py
index c02646f3e2..7401278580 100644
--- a/nova/tests/objects/test_compute_node.py
+++ b/nova/tests/objects/test_compute_node.py
@@ -13,13 +13,13 @@
 #    under the License.
 
 import mock
+from oslo.utils import timeutils
 
 from nova import db
 from nova import exception
 from nova.objects import compute_node
 from nova.objects import service
 from nova.openstack.common import jsonutils
-from nova.openstack.common import timeutils
 from nova.tests.objects import test_objects
 from nova.virt import hardware
 
diff --git a/nova/tests/objects/test_fields.py b/nova/tests/objects/test_fields.py
index cfc5b87d9f..806d97773a 100644
--- a/nova/tests/objects/test_fields.py
+++ b/nova/tests/objects/test_fields.py
@@ -16,11 +16,11 @@ import datetime
 
 import iso8601
 import netaddr
+from oslo.utils import timeutils
 
 from nova.network import model as network_model
 from nova.objects import base as obj_base
 from nova.objects import fields
-from nova.openstack.common import timeutils
 from nova import test
 
 
diff --git a/nova/tests/objects/test_fixed_ip.py b/nova/tests/objects/test_fixed_ip.py
index e30459a124..f699110d78 100644
--- a/nova/tests/objects/test_fixed_ip.py
+++ b/nova/tests/objects/test_fixed_ip.py
@@ -17,10 +17,10 @@ import datetime
 import iso8601
 import mock
 import netaddr
+from oslo.utils import timeutils
 
 from nova import exception
 from nova.objects import fixed_ip
-from nova.openstack.common import timeutils
 from nova.tests import fake_instance
 from nova.tests.objects import test_network
 from nova.tests.objects import test_objects
diff --git a/nova/tests/objects/test_instance.py b/nova/tests/objects/test_instance.py
index d89c673fc5..a11a8fc3e9 100644
--- a/nova/tests/objects/test_instance.py
+++ b/nova/tests/objects/test_instance.py
@@ -18,6 +18,7 @@ import iso8601
 import mock
 import mox
 import netaddr
+from oslo.utils import timeutils
 
 from nova.cells import rpcapi as cells_rpcapi
 from nova.compute import flavors
@@ -30,7 +31,6 @@ from nova.objects import instance_info_cache
 from nova.objects import instance_numa_topology
 from nova.objects import pci_device
 from nova.objects import security_group
-from nova.openstack.common import timeutils
 from nova import test
 from nova.tests.api.openstack import fakes
 from nova.tests import fake_instance
diff --git a/nova/tests/objects/test_instance_action.py b/nova/tests/objects/test_instance_action.py
index 9d4bc969c1..37804035db 100644
--- a/nova/tests/objects/test_instance_action.py
+++ b/nova/tests/objects/test_instance_action.py
@@ -15,10 +15,10 @@
 import traceback
 
 import mock
+from oslo.utils import timeutils
 
 from nova import db
 from nova.objects import instance_action
-from nova.openstack.common import timeutils
 from nova import test
 from nova.tests.objects import test_objects
 
diff --git a/nova/tests/objects/test_keypair.py b/nova/tests/objects/test_keypair.py
index 1118f51a40..6ac66b04ae 100644
--- a/nova/tests/objects/test_keypair.py
+++ b/nova/tests/objects/test_keypair.py
@@ -12,10 +12,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo.utils import timeutils
+
 from nova import db
 from nova import exception
 from nova.objects import keypair
-from nova.openstack.common import timeutils
 from nova.tests.objects import test_objects
 
 NOW = timeutils.utcnow().replace(microsecond=0)
diff --git a/nova/tests/objects/test_migration.py b/nova/tests/objects/test_migration.py
index 23e1b857a0..8d6d9c8113 100644
--- a/nova/tests/objects/test_migration.py
+++ b/nova/tests/objects/test_migration.py
@@ -12,11 +12,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo.utils import timeutils
+
 from nova import context
 from nova import db
 from nova import exception
 from nova.objects import migration
-from nova.openstack.common import timeutils
 from nova.tests import fake_instance
 from nova.tests.objects import test_objects
 
diff --git a/nova/tests/objects/test_objects.py b/nova/tests/objects/test_objects.py
index d8ef3ce19a..4f0aee317a 100644
--- a/nova/tests/objects/test_objects.py
+++ b/nova/tests/objects/test_objects.py
@@ -20,6 +20,7 @@ import os
 import pprint
 
 import mock
+from oslo.utils import timeutils
 import six
 from testtools import matchers
 
@@ -31,7 +32,6 @@ from nova.objects import base
 from nova.objects import fields
 from nova.openstack.common import jsonutils
 from nova.openstack.common import log
-from nova.openstack.common import timeutils
 from nova import rpc
 from nova import test
 from nova.tests import fake_notifier
diff --git a/nova/tests/objects/test_service.py b/nova/tests/objects/test_service.py
index 8951e9a0dc..cb3f8c3646 100644
--- a/nova/tests/objects/test_service.py
+++ b/nova/tests/objects/test_service.py
@@ -13,12 +13,12 @@
 #    under the License.
 
 import mock
+from oslo.utils import timeutils
 
 from nova import db
 from nova import exception
 from nova.objects import aggregate
 from nova.objects import service
-from nova.openstack.common import timeutils
 from nova.tests.objects import test_compute_node
 from nova.tests.objects import test_objects