Use uuidsentinel from oslo.utils

oslo.utils release 3.37.0 [1] introduced uuidsentinel [2]. This change rips out nova's uuidsentinel and replaces it with the one from oslo.utils. [1] https://review.openstack.org/#/c/599754/ [2] https://review.openstack.org/#/c/594179/ Change-Id: I7f5f08691ca3f73073c66c29dddb996fb2c2b266 Depends-On: https://review.openstack.org/600041
author: Eric Fried <efried@us.ibm.com> 2018-09-05 09:08:54 -0500
committer: Eric Fried <efried@us.ibm.com> 2018-09-05 09:08:54 -0500
commit: 8e1ca5bf34f924b9a23ddbcf31ae727a7dcacb20 (patch)
tree: 6f66cb4b700db568c1b8c4ae304943c9611d06fe /nova/tests
parent: 0f102089dd0b27c7d35f0cbba87332414032c0a4 (diff)
download: nova-8e1ca5bf34f924b9a23ddbcf31ae727a7dcacb20.tar.gz
191 files changed, 242 insertions, 252 deletions
diff --git a/nova/tests/fixtures.py b/nova/tests/fixtures.py
index df88589189..c93765ad6d 100644
--- a/nova/tests/fixtures.py
+++ b/nova/tests/fixtures.py
@@ -35,6 +35,7 @@ from oslo_config import cfg
 import oslo_messaging as messaging
 from oslo_messaging import conffixture as messaging_conffixture
 from oslo_privsep import daemon as privsep_daemon
+from oslo_utils.fixture import uuidsentinel
 from oslo_utils import uuidutils
 from requests import adapters
 from wsgi_intercept import interceptor
@@ -57,7 +58,6 @@ from nova import rpc
 from nova import service
 from nova.tests.functional.api import client
 from nova.tests.functional.api.openstack.placement.fixtures import placement
-from nova.tests import uuidsentinel
 
 _TRUE_VALUES = ('True', 'true', '1', 'yes')
 
diff --git a/nova/tests/functional/api/openstack/placement/db/test_allocation_candidates.py b/nova/tests/functional/api/openstack/placement/db/test_allocation_candidates.py
index 22b94b9533..bf95730b6a 100644
--- a/nova/tests/functional/api/openstack/placement/db/test_allocation_candidates.py
+++ b/nova/tests/functional/api/openstack/placement/db/test_allocation_candidates.py
@@ -11,6 +11,7 @@
 #    under the License.
 import os_traits
 from oslo_config import cfg
+from oslo_utils.fixture import uuidsentinel as uuids
 import six
 import sqlalchemy as sa
 
@@ -19,7 +20,6 @@ from nova.api.openstack.placement import lib as placement_lib
 from nova.api.openstack.placement.objects import resource_provider as rp_obj
 from nova import rc_fields as fields
 from nova.tests.functional.api.openstack.placement.db import test_base as tb
-from nova.tests import uuidsentinel as uuids
 
 
 CONF = cfg.CONF
diff --git a/nova/tests/functional/api/openstack/placement/db/test_base.py b/nova/tests/functional/api/openstack/placement/db/test_base.py
index 1dc9a5d72d..f5e72932ed 100644
--- a/nova/tests/functional/api/openstack/placement/db/test_base.py
+++ b/nova/tests/functional/api/openstack/placement/db/test_base.py
@@ -11,7 +11,7 @@
 #    under the License.
 """Base class and convenience utilities for functional placement tests."""
 
-
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import uuidutils
 
 from nova.api.openstack.placement import exception
@@ -20,7 +20,6 @@ from nova.api.openstack.placement.objects import project as project_obj
 from nova.api.openstack.placement.objects import resource_provider as rp_obj
 from nova.api.openstack.placement.objects import user as user_obj
 from nova.tests.functional.api.openstack.placement import base
-from nova.tests import uuidsentinel as uuids
 
 
 def create_provider(context, name, *aggs, **kwargs):
diff --git a/nova/tests/functional/api/openstack/placement/db/test_consumer.py b/nova/tests/functional/api/openstack/placement/db/test_consumer.py
index 9fe2f2493d..ff864ac7d6 100644
--- a/nova/tests/functional/api/openstack/placement/db/test_consumer.py
+++ b/nova/tests/functional/api/openstack/placement/db/test_consumer.py
@@ -11,6 +11,7 @@
 #    under the License.
 
 from oslo_config import cfg
+from oslo_utils.fixture import uuidsentinel as uuids
 import sqlalchemy as sa
 
 from nova.api.openstack.placement import db_api
@@ -22,7 +23,7 @@ from nova.api.openstack.placement.objects import user as user_obj
 from nova import rc_fields as fields
 from nova.tests.functional.api.openstack.placement import base
 from nova.tests.functional.api.openstack.placement.db import test_base as tb
-from nova.tests import uuidsentinel as uuids
+
 
 CONF = cfg.CONF
 CONSUMER_TBL = consumer_obj.CONSUMER_TBL
diff --git a/nova/tests/functional/api/openstack/placement/db/test_project.py b/nova/tests/functional/api/openstack/placement/db/test_project.py
index e34b991d94..93e373cc88 100644
--- a/nova/tests/functional/api/openstack/placement/db/test_project.py
+++ b/nova/tests/functional/api/openstack/placement/db/test_project.py
@@ -9,11 +9,11 @@
 #    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.fixture import uuidsentinel as uuids
 
 from nova.api.openstack.placement import exception
 from nova.api.openstack.placement.objects import project as project_obj
 from nova.tests.functional.api.openstack.placement.db import test_base as tb
-from nova.tests import uuidsentinel as uuids
 
 
 class ProjectTestCase(tb.PlacementDbBaseTestCase):
diff --git a/nova/tests/functional/api/openstack/placement/db/test_reshape.py b/nova/tests/functional/api/openstack/placement/db/test_reshape.py
index c91105edcb..86839ac187 100644
--- a/nova/tests/functional/api/openstack/placement/db/test_reshape.py
+++ b/nova/tests/functional/api/openstack/placement/db/test_reshape.py
@@ -9,12 +9,12 @@
 #    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.fixture import uuidsentinel as uuids
 
 from nova.api.openstack.placement import exception
 from nova.api.openstack.placement.objects import consumer as consumer_obj
 from nova.api.openstack.placement.objects import resource_provider as rp_obj
 from nova.tests.functional.api.openstack.placement.db import test_base as tb
-from nova.tests import uuidsentinel as uuids
 
 
 def alloc_for_rc(alloc_list, rc):
diff --git a/nova/tests/functional/api/openstack/placement/db/test_resource_provider.py b/nova/tests/functional/api/openstack/placement/db/test_resource_provider.py
index 10b95b2d04..ce2e70c803 100644
--- a/nova/tests/functional/api/openstack/placement/db/test_resource_provider.py
+++ b/nova/tests/functional/api/openstack/placement/db/test_resource_provider.py
@@ -15,6 +15,7 @@ import functools
 import mock
 import os_traits
 from oslo_db import exception as db_exc
+from oslo_utils.fixture import uuidsentinel
 import sqlalchemy as sa
 
 import nova
@@ -24,7 +25,6 @@ from nova.api.openstack.placement.objects import resource_provider as rp_obj
 from nova.db.sqlalchemy import api_models as models
 from nova import rc_fields as fields
 from nova.tests.functional.api.openstack.placement.db import test_base as tb
-from nova.tests import uuidsentinel
 
 
 DISK_INVENTORY = dict(
diff --git a/nova/tests/functional/api/openstack/placement/db/test_user.py b/nova/tests/functional/api/openstack/placement/db/test_user.py
index a656526d5a..145778c26d 100644
--- a/nova/tests/functional/api/openstack/placement/db/test_user.py
+++ b/nova/tests/functional/api/openstack/placement/db/test_user.py
@@ -9,11 +9,11 @@
 #    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.fixture import uuidsentinel as uuids
 
 from nova.api.openstack.placement import exception
 from nova.api.openstack.placement.objects import user as user_obj
 from nova.tests.functional.api.openstack.placement.db import test_base as tb
-from nova.tests import uuidsentinel as uuids
 
 
 class UserTestCase(tb.PlacementDbBaseTestCase):
diff --git a/nova/tests/functional/api/openstack/placement/fixtures/gabbits.py b/nova/tests/functional/api/openstack/placement/fixtures/gabbits.py
index 1a26fe6893..4a4aedc555 100644
--- a/nova/tests/functional/api/openstack/placement/fixtures/gabbits.py
+++ b/nova/tests/functional/api/openstack/placement/fixtures/gabbits.py
@@ -17,6 +17,7 @@ from oslo_config import cfg
 from oslo_config import fixture as config_fixture
 from oslo_middleware import cors
 from oslo_policy import opts as policy_opts
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import uuidutils
 from oslotest import output
 
@@ -31,7 +32,6 @@ from nova.tests import fixtures
 from nova.tests.functional.api.openstack.placement.db import test_base as tb
 from nova.tests.functional.api.openstack.placement.fixtures import capture
 from nova.tests.unit import policy_fixture
-from nova.tests import uuidsentinel as uuids
 
 
 CONF = cfg.CONF
diff --git a/nova/tests/functional/api/openstack/placement/test_direct.py b/nova/tests/functional/api/openstack/placement/test_direct.py
index 829c5e3eee..f4e901645d 100644
--- a/nova/tests/functional/api/openstack/placement/test_direct.py
+++ b/nova/tests/functional/api/openstack/placement/test_direct.py
@@ -11,10 +11,10 @@
 #    under the License.
 
 from oslo_config import cfg
+from oslo_utils.fixture import uuidsentinel
 
 from nova.api.openstack.placement import direct
 from nova.tests.functional.api.openstack.placement import base
-from nova.tests import uuidsentinel
 
 
 CONF = cfg.CONF
diff --git a/nova/tests/functional/api_sample_tests/test_keypairs.py b/nova/tests/functional/api_sample_tests/test_keypairs.py
index 3746f85d00..8c30730ebc 100644
--- a/nova/tests/functional/api_sample_tests/test_keypairs.py
+++ b/nova/tests/functional/api_sample_tests/test_keypairs.py
@@ -13,12 +13,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import uuidutils
 
 from nova.objects import keypair as keypair_obj
 from nova.tests.functional.api_sample_tests import api_sample_base
 from nova.tests.unit import fake_crypto
-from nova.tests import uuidsentinel as uuids
 
 
 class KeyPairsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21):
diff --git a/nova/tests/functional/api_sample_tests/test_migrations.py b/nova/tests/functional/api_sample_tests/test_migrations.py
index 8b888f5dd9..fc2af631fa 100644
--- a/nova/tests/functional/api_sample_tests/test_migrations.py
+++ b/nova/tests/functional/api_sample_tests/test_migrations.py
@@ -15,10 +15,11 @@
 
 import datetime
 
+from oslo_utils.fixture import uuidsentinel as uuids
+
 from nova import context
 from nova import objects
 from nova.tests.functional.api_sample_tests import api_sample_base
-from nova.tests import uuidsentinel as uuids
 
 
 # NOTE(ShaoHe Feng) here I can not use uuidsentinel, it generate a random
diff --git a/nova/tests/functional/api_sample_tests/test_virtual_interfaces.py b/nova/tests/functional/api_sample_tests/test_virtual_interfaces.py
index 9684db2704..8dcfedb2d4 100644
--- a/nova/tests/functional/api_sample_tests/test_virtual_interfaces.py
+++ b/nova/tests/functional/api_sample_tests/test_virtual_interfaces.py
@@ -12,11 +12,10 @@
 #    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.fixture import uuidsentinel as uuids
 
 from nova.tests.functional.api import client as api_client
 from nova.tests.functional import api_samples_test_base
-from nova.tests import uuidsentinel as uuids
 
 
 class VirtualInterfacesJsonTest(api_samples_test_base.ApiSampleTestBase):
diff --git a/nova/tests/functional/api_sample_tests/test_volumes.py b/nova/tests/functional/api_sample_tests/test_volumes.py
index e2f9e0ebcc..7fa7848e84 100644
--- a/nova/tests/functional/api_sample_tests/test_volumes.py
+++ b/nova/tests/functional/api_sample_tests/test_volumes.py
@@ -15,6 +15,8 @@
 
 import datetime
 
+from oslo_utils.fixture import uuidsentinel as uuids
+
 from nova.compute import api as compute_api
 from nova import context
 from nova import objects
@@ -24,7 +26,7 @@ from nova.tests.functional.api_sample_tests import test_servers
 from nova.tests.unit.api.openstack import fakes
 from nova.tests.unit import fake_block_device
 from nova.tests.unit import fake_instance
-from nova.tests import uuidsentinel as uuids
+
 
 COMPUTE_VERSION_OLD_ATTACH_FLOW = \
     compute_api.CINDER_V3_ATTACH_MIN_COMPUTE_VERSION - 1
diff --git a/nova/tests/functional/compute/test_host_api.py b/nova/tests/functional/compute/test_host_api.py
index b9b0e6c1a2..f689a6fd9f 100644
--- a/nova/tests/functional/compute/test_host_api.py
+++ b/nova/tests/functional/compute/test_host_api.py
@@ -11,6 +11,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.fixture import uuidsentinel as uuids
 
 from nova.compute import api as compute_api
 from nova import context
@@ -18,7 +19,6 @@ from nova import exception
 from nova import objects
 from nova import test
 from nova.tests import fixtures as nova_fixtures
-from nova.tests import uuidsentinel as uuids
 
 
 class ComputeHostAPIMultiCellTestCase(test.NoDBTestCase):
diff --git a/nova/tests/functional/compute/test_instance_list.py b/nova/tests/functional/compute/test_instance_list.py
index ecf19a6d65..a03f38da9a 100644
--- a/nova/tests/functional/compute/test_instance_list.py
+++ b/nova/tests/functional/compute/test_instance_list.py
@@ -12,13 +12,14 @@
 
 import datetime
 
+from oslo_utils.fixture import uuidsentinel as uuids
+
 from nova.compute import instance_list
 from nova import context
 from nova.db import api as db
 from nova import exception
 from nova import objects
 from nova import test
-from nova.tests import uuidsentinel as uuids
 
 
 class InstanceListTestCase(test.TestCase):
diff --git a/nova/tests/functional/compute/test_migration_list.py b/nova/tests/functional/compute/test_migration_list.py
index d4fc7e17c8..49ea236bc4 100644
--- a/nova/tests/functional/compute/test_migration_list.py
+++ b/nova/tests/functional/compute/test_migration_list.py
@@ -12,12 +12,13 @@
 
 import datetime
 
+from oslo_utils.fixture import uuidsentinel
+
 from nova.compute import migration_list
 from nova import context
 from nova import exception
 from nova import objects
 from nova import test
-from nova.tests import uuidsentinel
 
 
 class TestMigrationListObjects(test.TestCase):
diff --git a/nova/tests/functional/compute/test_resource_tracker.py b/nova/tests/functional/compute/test_resource_tracker.py
index 3271d30d6d..f05f5feb61 100644
--- a/nova/tests/functional/compute/test_resource_tracker.py
+++ b/nova/tests/functional/compute/test_resource_tracker.py
@@ -11,6 +11,7 @@
 #    under the License.
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova.compute import power_state
 from nova.compute import resource_tracker
@@ -22,9 +23,9 @@ from nova import objects
 from nova import rc_fields as fields
 from nova.tests import fixtures as nova_fixtures
 from nova.tests.functional import test_report_client as test_base
-from nova.tests import uuidsentinel as uuids
 from nova.virt import driver as virt_driver
 
+
 CONF = conf.CONF
 VCPU = fields.ResourceClass.VCPU
 MEMORY_MB = fields.ResourceClass.MEMORY_MB
diff --git a/nova/tests/functional/db/test_aggregate.py b/nova/tests/functional/db/test_aggregate.py
index f8709fd6e4..ffc08cfec0 100644
--- a/nova/tests/functional/db/test_aggregate.py
+++ b/nova/tests/functional/db/test_aggregate.py
@@ -14,6 +14,7 @@ from copy import deepcopy
 
 import mock
 from oslo_db import exception as db_exc
+from oslo_utils.fixture import uuidsentinel
 from oslo_utils import timeutils
 
 from nova import context
@@ -24,7 +25,6 @@ import nova.objects.aggregate as aggregate_obj
 from nova import test
 from nova.tests.unit import matchers
 from nova.tests.unit.objects.test_objects import compare_obj as base_compare
-from nova.tests import uuidsentinel
 
 
 SUBS = {'metadata': 'metadetails'}
diff --git a/nova/tests/functional/db/test_compute_node.py b/nova/tests/functional/db/test_compute_node.py
index dfa88ab643..a1ccf9ed12 100644
--- a/nova/tests/functional/db/test_compute_node.py
+++ b/nova/tests/functional/db/test_compute_node.py
@@ -9,12 +9,12 @@
 #    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.fixture import uuidsentinel
 
 from nova import context
 from nova import objects
 from nova.objects import fields as obj_fields
 from nova import test
-from nova.tests import uuidsentinel
 
 _HOSTNAME = 'fake-host'
 _NODENAME = 'fake-node'
diff --git a/nova/tests/functional/db/test_connection_switch.py b/nova/tests/functional/db/test_connection_switch.py
index b2e11b90d0..a4e1fb3a41 100644
--- a/nova/tests/functional/db/test_connection_switch.py
+++ b/nova/tests/functional/db/test_connection_switch.py
@@ -12,6 +12,7 @@
 
 import os
 
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import uuidutils
 
 from nova import context
@@ -19,7 +20,6 @@ from nova import exception
 from nova import objects
 from nova import test
 from nova.tests import fixtures as nova_fixtures
-from nova.tests import uuidsentinel as uuids
 
 
 class ConnectionSwitchTestCase(test.NoDBTestCase):
diff --git a/nova/tests/functional/db/test_console_auth_token.py b/nova/tests/functional/db/test_console_auth_token.py
index 79099c28c0..35efcc64d5 100644
--- a/nova/tests/functional/db/test_console_auth_token.py
+++ b/nova/tests/functional/db/test_console_auth_token.py
@@ -12,13 +12,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_utils.fixture import uuidsentinel
 from oslo_versionedobjects import fixture as ovo_fixture
 
 from nova import context
 from nova import exception
 from nova import objects
 from nova import test
-from nova.tests import uuidsentinel
 
 
 class ConsoleAuthTokenTestCase(test.TestCase):
diff --git a/nova/tests/functional/db/test_host_mapping.py b/nova/tests/functional/db/test_host_mapping.py
index 21ad08a945..e4b5a365a7 100644
--- a/nova/tests/functional/db/test_host_mapping.py
+++ b/nova/tests/functional/db/test_host_mapping.py
@@ -11,6 +11,7 @@
 #    under the License.
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import uuidutils
 
 from nova import context
@@ -20,7 +21,6 @@ from nova.objects import cell_mapping
 from nova.objects import host_mapping
 from nova import test
 from nova.tests import fixtures
-from nova.tests import uuidsentinel as uuids
 
 
 sample_mapping = {'host': 'fake-host',
diff --git a/nova/tests/functional/db/test_instance_group.py b/nova/tests/functional/db/test_instance_group.py
index 17d6f2d483..409bfd6f2f 100644
--- a/nova/tests/functional/db/test_instance_group.py
+++ b/nova/tests/functional/db/test_instance_group.py
@@ -11,6 +11,7 @@
 #    under the License.
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_versionedobjects import fixture as ovo_fixture
 
 from nova import context
@@ -19,7 +20,6 @@ from nova import exception
 from nova import objects
 from nova.objects import base
 from nova import test
-from nova.tests import uuidsentinel as uuids
 
 
 class InstanceGroupObjectTestCase(test.TestCase):
diff --git a/nova/tests/functional/db/test_instance_mapping.py b/nova/tests/functional/db/test_instance_mapping.py
index bd67c885ef..9e0ed3821c 100644
--- a/nova/tests/functional/db/test_instance_mapping.py
+++ b/nova/tests/functional/db/test_instance_mapping.py
@@ -10,6 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_utils.fixture import uuidsentinel
 from oslo_utils import uuidutils
 
 from nova.compute import vm_states
@@ -20,7 +21,6 @@ from nova.objects import instance
 from nova.objects import instance_mapping
 from nova import test
 from nova.tests import fixtures
-from nova.tests import uuidsentinel
 
 
 sample_mapping = {'instance_uuid': '',
diff --git a/nova/tests/functional/integrated_helpers.py b/nova/tests/functional/integrated_helpers.py
index cd7e98707e..1f2c9758af 100644
--- a/nova/tests/functional/integrated_helpers.py
+++ b/nova/tests/functional/integrated_helpers.py
@@ -22,6 +22,7 @@ import string
 import time
 
 from oslo_log import log as logging
+from oslo_utils.fixture import uuidsentinel as uuids
 
 import nova.conf
 from nova import context
@@ -34,7 +35,6 @@ from nova.tests.unit import cast_as_call
 from nova.tests.unit import fake_notifier
 import nova.tests.unit.image.fake
 from nova.tests.unit import policy_fixture
-from nova.tests import uuidsentinel as uuids
 from nova.virt import fake
 
 
diff --git a/nova/tests/functional/libvirt/test_shared_resource_provider.py b/nova/tests/functional/libvirt/test_shared_resource_provider.py
index 11d3e24963..a9dd1c6589 100644
--- a/nova/tests/functional/libvirt/test_shared_resource_provider.py
+++ b/nova/tests/functional/libvirt/test_shared_resource_provider.py
@@ -14,6 +14,7 @@
 #    under the License.
 
 import fixtures
+from oslo_utils.fixture import uuidsentinel as uuids
 import unittest
 
 from nova.compute import instance_actions
@@ -21,7 +22,7 @@ from nova import conf
 from nova.tests.functional import integrated_helpers
 import nova.tests.unit.image.fake
 from nova.tests.unit.virt.libvirt import fakelibvirt
-from nova.tests import uuidsentinel as uuids
+
 
 CONF = conf.CONF
 
diff --git a/nova/tests/functional/test_report_client.py b/nova/tests/functional/test_report_client.py
index 00ace9beec..f398d18acd 100644
--- a/nova/tests/functional/test_report_client.py
+++ b/nova/tests/functional/test_report_client.py
@@ -14,6 +14,7 @@
 import copy
 from keystoneauth1 import exceptions as kse
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 import pkg_resources
 
 from nova.api.openstack.placement import direct
@@ -31,7 +32,7 @@ from nova import rc_fields as fields
 from nova.scheduler.client import report
 from nova.scheduler import utils
 from nova import test
-from nova.tests import uuidsentinel as uuids
+
 
 CONF = conf.CONF
 
diff --git a/nova/tests/functional/test_servers.py b/nova/tests/functional/test_servers.py
index d7a5aa7b6d..4cc2382fa0 100644
--- a/nova/tests/functional/test_servers.py
+++ b/nova/tests/functional/test_servers.py
@@ -20,6 +20,7 @@ import zlib
 import mock
 from oslo_log import log as logging
 from oslo_serialization import base64
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils
 import six
 
@@ -40,7 +41,6 @@ from nova.tests.unit.api.openstack import fakes
 from nova.tests.unit import fake_block_device
 from nova.tests.unit import fake_notifier
 import nova.tests.unit.image.fake
-from nova.tests import uuidsentinel as uuids
 from nova.virt import fake
 from nova import volume
 
diff --git a/nova/tests/functional/wsgi/test_interfaces.py b/nova/tests/functional/wsgi/test_interfaces.py
index c3ef8b7bf2..04db0d2e71 100644
--- a/nova/tests/functional/wsgi/test_interfaces.py
+++ b/nova/tests/functional/wsgi/test_interfaces.py
@@ -13,13 +13,13 @@
 # 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.fixture import uuidsentinel as uuids
 
 from nova.tests import fixtures as nova_fixtures
 from nova.tests.functional.api import client
 from nova.tests.functional import integrated_helpers
 from nova.tests.functional import test_servers
 from nova.tests.unit import policy_fixture
-from nova.tests import uuidsentinel as uuids
 
 
 def create_request_body():
diff --git a/nova/tests/unit/api/openstack/compute/test_aggregates.py b/nova/tests/unit/api/openstack/compute/test_aggregates.py
index ce06f97885..eb185849a6 100644
--- a/nova/tests/unit/api/openstack/compute/test_aggregates.py
+++ b/nova/tests/unit/api/openstack/compute/test_aggregates.py
@@ -16,6 +16,7 @@
 """Tests for the aggregates admin api."""
 
 import mock
+from oslo_utils.fixture import uuidsentinel
 from webob import exc
 
 from nova.api.openstack import api_version_request
@@ -27,7 +28,6 @@ from nova import objects
 from nova.objects import base as obj_base
 from nova import test
 from nova.tests.unit.api.openstack import fakes
-from nova.tests import uuidsentinel
 
 
 def _make_agg_obj(agg_dict):
diff --git a/nova/tests/unit/api/openstack/compute/test_availability_zone.py b/nova/tests/unit/api/openstack/compute/test_availability_zone.py
index 3e67492930..8c7ac56cb0 100644
--- a/nova/tests/unit/api/openstack/compute/test_availability_zone.py
+++ b/nova/tests/unit/api/openstack/compute/test_availability_zone.py
@@ -16,6 +16,7 @@ import datetime
 
 import iso8601
 import mock
+from oslo_utils.fixture import uuidsentinel
 
 from nova.api.openstack.compute import availability_zone as az_v21
 from nova.api.openstack.compute import servers as servers_v21
@@ -30,7 +31,6 @@ from nova.tests.unit.api.openstack import fakes
 from nova.tests.unit.image import fake
 from nova.tests.unit import matchers
 from nova.tests.unit.objects import test_service
-from nova.tests import uuidsentinel
 
 
 FAKE_UUID = fakes.FAKE_UUID
diff --git a/nova/tests/unit/api/openstack/compute/test_consoles.py b/nova/tests/unit/api/openstack/compute/test_consoles.py
index 3748ca666a..4b5768253e 100644
--- a/nova/tests/unit/api/openstack/compute/test_consoles.py
+++ b/nova/tests/unit/api/openstack/compute/test_consoles.py
@@ -17,6 +17,7 @@
 import datetime
 
 from oslo_policy import policy as oslo_policy
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils
 import webob
 
@@ -27,7 +28,6 @@ from nova import policy
 from nova import test
 from nova.tests.unit.api.openstack import fakes
 from nova.tests.unit import matchers
-from nova.tests import uuidsentinel as uuids
 
 
 FAKE_UUID = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'
diff --git a/nova/tests/unit/api/openstack/compute/test_evacuate.py b/nova/tests/unit/api/openstack/compute/test_evacuate.py
index 48090485c7..ee4dddbc80 100644
--- a/nova/tests/unit/api/openstack/compute/test_evacuate.py
+++ b/nova/tests/unit/api/openstack/compute/test_evacuate.py
@@ -13,6 +13,7 @@
 #   under the License.
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 import testtools
 import webob
 
@@ -24,7 +25,6 @@ from nova import exception
 from nova import test
 from nova.tests.unit.api.openstack import fakes
 from nova.tests.unit import fake_instance
-from nova.tests import uuidsentinel as uuids
 
 
 CONF = nova.conf.CONF
diff --git a/nova/tests/unit/api/openstack/compute/test_extended_volumes.py b/nova/tests/unit/api/openstack/compute/test_extended_volumes.py
index f1d79d4bc1..26a8b940e4 100644
--- a/nova/tests/unit/api/openstack/compute/test_extended_volumes.py
+++ b/nova/tests/unit/api/openstack/compute/test_extended_volumes.py
@@ -15,6 +15,7 @@
 
 import mock
 from oslo_serialization import jsonutils
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova.api.openstack.compute import (extended_volumes
                                                    as extended_volumes_v21)
@@ -26,7 +27,7 @@ from nova import test
 from nova.tests.unit.api.openstack import fakes
 from nova.tests.unit import fake_block_device
 from nova.tests.unit import fake_instance
-from nova.tests import uuidsentinel as uuids
+
 
 UUID1 = '00000000-0000-0000-0000-000000000001'
 UUID2 = '00000000-0000-0000-0000-000000000002'
diff --git a/nova/tests/unit/api/openstack/compute/test_floating_ips.py b/nova/tests/unit/api/openstack/compute/test_floating_ips.py
index f8934f5cab..e3e07e7138 100644
--- a/nova/tests/unit/api/openstack/compute/test_floating_ips.py
+++ b/nova/tests/unit/api/openstack/compute/test_floating_ips.py
@@ -15,6 +15,7 @@
 #    under the License.
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 import six
 import webob
 
@@ -29,7 +30,6 @@ from nova.objects import base as obj_base
 from nova import test
 from nova.tests.unit.api.openstack import fakes
 from nova.tests.unit import fake_network
-from nova.tests import uuidsentinel as uuids
 
 
 FAKE_UUID = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'
diff --git a/nova/tests/unit/api/openstack/compute/test_hosts.py b/nova/tests/unit/api/openstack/compute/test_hosts.py
index 48ac5e9a26..4c35f5a343 100644
--- a/nova/tests/unit/api/openstack/compute/test_hosts.py
+++ b/nova/tests/unit/api/openstack/compute/test_hosts.py
@@ -14,6 +14,7 @@
 #    under the License.
 
 import mock
+from oslo_utils.fixture import uuidsentinel
 import testtools
 import webob.exc
 
@@ -27,7 +28,6 @@ from nova import test
 from nova.tests import fixtures
 from nova.tests.unit.api.openstack import fakes
 from nova.tests.unit import fake_hosts
-from nova.tests import uuidsentinel
 
 
 def stub_service_get_all(context, disabled=None):
diff --git a/nova/tests/unit/api/openstack/compute/test_hypervisors.py b/nova/tests/unit/api/openstack/compute/test_hypervisors.py
index 00ce1dd5b5..c91a4c0988 100644
--- a/nova/tests/unit/api/openstack/compute/test_hypervisors.py
+++ b/nova/tests/unit/api/openstack/compute/test_hypervisors.py
@@ -18,6 +18,7 @@ import copy
 import mock
 import netaddr
 from oslo_serialization import jsonutils
+from oslo_utils.fixture import uuidsentinel as uuids
 import six
 from webob import exc
 
@@ -29,7 +30,7 @@ from nova import objects
 from nova import test
 from nova.tests.unit.api.openstack import fakes
 from nova.tests.unit import fake_instance
-from nova.tests import uuidsentinel as uuids
+
 
 CPU_INFO = """
 {"arch": "x86_64",
diff --git a/nova/tests/unit/api/openstack/compute/test_instance_actions.py b/nova/tests/unit/api/openstack/compute/test_instance_actions.py
index a844a98c21..3c0f1e67d3 100644
--- a/nova/tests/unit/api/openstack/compute/test_instance_actions.py
+++ b/nova/tests/unit/api/openstack/compute/test_instance_actions.py
@@ -17,6 +17,7 @@ import copy
 
 import mock
 from oslo_policy import policy as oslo_policy
+from oslo_utils.fixture import uuidsentinel as uuids
 import six
 from webob import exc
 
@@ -30,7 +31,7 @@ from nova import policy
 from nova import test
 from nova.tests.unit.api.openstack import fakes
 from nova.tests.unit import fake_server_actions
-from nova.tests import uuidsentinel as uuids
+
 
 FAKE_UUID = fake_server_actions.FAKE_UUID
 FAKE_REQUEST_ID = fake_server_actions.FAKE_REQUEST_ID1
diff --git a/nova/tests/unit/api/openstack/compute/test_migrate_server.py b/nova/tests/unit/api/openstack/compute/test_migrate_server.py
index 664685cefe..b063534c5a 100644
--- a/nova/tests/unit/api/openstack/compute/test_migrate_server.py
+++ b/nova/tests/unit/api/openstack/compute/test_migrate_server.py
@@ -14,6 +14,7 @@
 #    under the License.
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import uuidutils
 import six
 import webob
@@ -26,7 +27,6 @@ from nova import objects
 from nova import test
 from nova.tests.unit.api.openstack.compute import admin_only_action_common
 from nova.tests.unit.api.openstack import fakes
-from nova.tests import uuidsentinel as uuids
 
 
 class MigrateServerTestsV21(admin_only_action_common.CommonTests):
diff --git a/nova/tests/unit/api/openstack/compute/test_migrations.py b/nova/tests/unit/api/openstack/compute/test_migrations.py
index 0ea049bc41..387d7f9217 100644
--- a/nova/tests/unit/api/openstack/compute/test_migrations.py
+++ b/nova/tests/unit/api/openstack/compute/test_migrations.py
@@ -15,6 +15,7 @@
 import datetime
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 import six
 from webob import exc
 
@@ -25,7 +26,6 @@ from nova import objects
 from nova.objects import base
 from nova import test
 from nova.tests.unit.api.openstack import fakes
-from nova.tests import uuidsentinel as uuids
 
 
 fake_migrations = [
diff --git a/nova/tests/unit/api/openstack/compute/test_networks.py b/nova/tests/unit/api/openstack/compute/test_networks.py
index c641542302..7c904022c1 100644
--- a/nova/tests/unit/api/openstack/compute/test_networks.py
+++ b/nova/tests/unit/api/openstack/compute/test_networks.py
@@ -22,6 +22,7 @@ import iso8601
 import mock
 import netaddr
 from oslo_config import cfg
+from oslo_utils.fixture import uuidsentinel as uuids
 import webob
 
 from nova.api.openstack.compute import networks as networks_v21
@@ -34,9 +35,9 @@ from nova.network.neutronv2 import api as neutron
 from nova import objects
 from nova import test
 from nova.tests.unit.api.openstack import fakes
-from nova.tests import uuidsentinel as uuids
 import nova.utils
 
+
 CONF = cfg.CONF
 FAKE_NETWORK_PROJECT_ID = '6133f8b603924f45bc0c9e21f6df12fa'
 
diff --git a/nova/tests/unit/api/openstack/compute/test_neutron_security_groups.py b/nova/tests/unit/api/openstack/compute/test_neutron_security_groups.py
index b663ae1fd4..8ec8897264 100644
--- a/nova/tests/unit/api/openstack/compute/test_neutron_security_groups.py
+++ b/nova/tests/unit/api/openstack/compute/test_neutron_security_groups.py
@@ -19,6 +19,7 @@ from neutronclient.common import exceptions as n_exc
 from oslo_config import cfg
 from oslo_serialization import jsonutils
 from oslo_utils import encodeutils
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import uuidutils
 import webob
 
@@ -32,7 +33,7 @@ from nova.objects import instance as instance_obj
 from nova import test
 from nova.tests.unit.api.openstack.compute import test_security_groups
 from nova.tests.unit.api.openstack import fakes
-from nova.tests import uuidsentinel as uuids
+
 
 UUID_SERVER = uuids.server
 
diff --git a/nova/tests/unit/api/openstack/compute/test_security_groups.py b/nova/tests/unit/api/openstack/compute/test_security_groups.py
index 436d0a6861..0408b5ccc4 100644
--- a/nova/tests/unit/api/openstack/compute/test_security_groups.py
+++ b/nova/tests/unit/api/openstack/compute/test_security_groups.py
@@ -17,6 +17,7 @@ import mock
 from oslo_config import cfg
 from oslo_serialization import jsonutils
 from oslo_utils import encodeutils
+from oslo_utils.fixture import uuidsentinel as uuids
 import webob
 
 from nova.api.openstack.compute import security_groups as \
@@ -30,7 +31,7 @@ from nova import objects
 from nova import test
 from nova.tests.unit.api.openstack import fakes
 from nova.tests.unit import fake_instance
-from nova.tests import uuidsentinel as uuids
+
 
 CONF = cfg.CONF
 FAKE_UUID1 = 'a47ae74e-ab08-447f-8eee-ffd43fc46c16'
diff --git a/nova/tests/unit/api/openstack/compute/test_server_actions.py b/nova/tests/unit/api/openstack/compute/test_server_actions.py
index c749992881..282fa15a9e 100644
--- a/nova/tests/unit/api/openstack/compute/test_server_actions.py
+++ b/nova/tests/unit/api/openstack/compute/test_server_actions.py
@@ -14,6 +14,7 @@
 #    under the License.
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import uuidutils
 import webob
 
@@ -31,7 +32,7 @@ from nova.tests.unit.api.openstack import fakes
 from nova.tests.unit import fake_block_device
 from nova.tests.unit import fake_instance
 from nova.tests.unit.image import fake
-from nova.tests import uuidsentinel as uuids
+
 
 CONF = nova.conf.CONF
 FAKE_UUID = fakes.FAKE_UUID
diff --git a/nova/tests/unit/api/openstack/compute/test_server_diagnostics.py b/nova/tests/unit/api/openstack/compute/test_server_diagnostics.py
index d56027040a..d39a7d7929 100644
--- a/nova/tests/unit/api/openstack/compute/test_server_diagnostics.py
+++ b/nova/tests/unit/api/openstack/compute/test_server_diagnostics.py
@@ -15,6 +15,7 @@
 
 import mock
 from oslo_serialization import jsonutils
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova.api.openstack.compute import server_diagnostics
 from nova.api.openstack import wsgi as os_wsgi
@@ -23,7 +24,7 @@ from nova import exception
 from nova import objects
 from nova import test
 from nova.tests.unit.api.openstack import fakes
-from nova.tests import uuidsentinel as uuids
+
 
 UUID = uuids.abc
 
diff --git a/nova/tests/unit/api/openstack/compute/test_server_external_events.py b/nova/tests/unit/api/openstack/compute/test_server_external_events.py
index 745c06fcb6..1cf7e89c3f 100644
--- a/nova/tests/unit/api/openstack/compute/test_server_external_events.py
+++ b/nova/tests/unit/api/openstack/compute/test_server_external_events.py
@@ -13,6 +13,7 @@
 #    under the License.
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 import webob
 
 from nova.api.openstack.compute import server_external_events \
@@ -22,7 +23,7 @@ from nova import objects
 from nova.objects import instance as instance_obj
 from nova import test
 from nova.tests.unit.api.openstack import fakes
-from nova.tests import uuidsentinel as uuids
+
 
 fake_instances = {
     '00000000-0000-0000-0000-000000000001': objects.Instance(id=1,
diff --git a/nova/tests/unit/api/openstack/compute/test_server_group_quotas.py b/nova/tests/unit/api/openstack/compute/test_server_group_quotas.py
index 8608a478e0..6b08be6fd9 100644
--- a/nova/tests/unit/api/openstack/compute/test_server_group_quotas.py
+++ b/nova/tests/unit/api/openstack/compute/test_server_group_quotas.py
@@ -15,6 +15,7 @@
 
 import mock
 from oslo_config import cfg
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import uuidutils
 import webob
 
@@ -23,7 +24,7 @@ from nova import context
 from nova import objects
 from nova import test
 from nova.tests.unit.api.openstack import fakes
-from nova.tests import uuidsentinel as uuids
+
 
 CONF = cfg.CONF
 
diff --git a/nova/tests/unit/api/openstack/compute/test_server_groups.py b/nova/tests/unit/api/openstack/compute/test_server_groups.py
index 0a05875e3a..9793bcc752 100644
--- a/nova/tests/unit/api/openstack/compute/test_server_groups.py
+++ b/nova/tests/unit/api/openstack/compute/test_server_groups.py
@@ -15,6 +15,7 @@
 
 import copy
 import mock
+from oslo_utils.fixture import uuidsentinel
 from oslo_utils import uuidutils
 import six
 import webob
@@ -29,7 +30,6 @@ from nova import test
 from nova.tests import fixtures
 from nova.tests.unit.api.openstack import fakes
 from nova.tests.unit import policy_fixture
-from nova.tests import uuidsentinel
 
 
 class AttrDict(dict):
diff --git a/nova/tests/unit/api/openstack/compute/test_server_metadata.py b/nova/tests/unit/api/openstack/compute/test_server_metadata.py
index 5ec3894a50..a03a42aeb6 100644
--- a/nova/tests/unit/api/openstack/compute/test_server_metadata.py
+++ b/nova/tests/unit/api/openstack/compute/test_server_metadata.py
@@ -16,6 +16,7 @@
 import mock
 from oslo_config import cfg
 from oslo_serialization import jsonutils
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils
 import six
 import webob
@@ -28,7 +29,6 @@ from nova import exception
 from nova import test
 from nova.tests.unit.api.openstack import fakes
 from nova.tests.unit import fake_instance
-from nova.tests import uuidsentinel as uuids
 
 
 CONF = cfg.CONF
diff --git a/nova/tests/unit/api/openstack/compute/test_server_migrations.py b/nova/tests/unit/api/openstack/compute/test_server_migrations.py
index 11bd9900e1..d9604a9238 100644
--- a/nova/tests/unit/api/openstack/compute/test_server_migrations.py
+++ b/nova/tests/unit/api/openstack/compute/test_server_migrations.py
@@ -17,6 +17,7 @@ import copy
 import datetime
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 import six
 import webob
 
@@ -26,7 +27,7 @@ from nova import objects
 from nova.objects import base
 from nova import test
 from nova.tests.unit.api.openstack import fakes
-from nova.tests import uuidsentinel as uuids
+
 
 SERVER_UUID = uuids.server_uuid
 
diff --git a/nova/tests/unit/api/openstack/compute/test_server_start_stop.py b/nova/tests/unit/api/openstack/compute/test_server_start_stop.py
index ebd687c05d..de3cb9152b 100644
--- a/nova/tests/unit/api/openstack/compute/test_server_start_stop.py
+++ b/nova/tests/unit/api/openstack/compute/test_server_start_stop.py
@@ -14,6 +14,7 @@
 
 import mock
 from oslo_policy import policy as oslo_policy
+from oslo_utils.fixture import uuidsentinel as uuids
 import six
 import webob
 
@@ -26,7 +27,6 @@ from nova import policy
 from nova import test
 from nova.tests import fixtures as nova_fixtures
 from nova.tests.unit.api.openstack import fakes
-from nova.tests import uuidsentinel as uuids
 
 
 class ServerStartStopTestV21(test.TestCase):
diff --git a/nova/tests/unit/api/openstack/compute/test_serversV21.py b/nova/tests/unit/api/openstack/compute/test_serversV21.py
index 9cbde56573..d8e0723a3c 100644
--- a/nova/tests/unit/api/openstack/compute/test_serversV21.py
+++ b/nova/tests/unit/api/openstack/compute/test_serversV21.py
@@ -26,6 +26,7 @@ from oslo_serialization import base64
 from oslo_serialization import jsonutils
 from oslo_utils import encodeutils
 from oslo_utils import fixture as utils_fixture
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils
 from oslo_utils import uuidutils
 import six
@@ -67,9 +68,9 @@ from nova.tests.unit import fake_instance
 from nova.tests.unit import fake_network
 from nova.tests.unit.image import fake
 from nova.tests.unit import matchers
-from nova.tests import uuidsentinel as uuids
 from nova import utils as nova_utils
 
+
 CONF = nova.conf.CONF
 
 FAKE_UUID = fakes.FAKE_UUID
diff --git a/nova/tests/unit/api/openstack/compute/test_services.py b/nova/tests/unit/api/openstack/compute/test_services.py
index 6526c8c73d..cfdae43a6d 100644
--- a/nova/tests/unit/api/openstack/compute/test_services.py
+++ b/nova/tests/unit/api/openstack/compute/test_services.py
@@ -19,6 +19,7 @@ import datetime
 import iso8601
 import mock
 from oslo_utils import fixture as utils_fixture
+from oslo_utils.fixture import uuidsentinel
 import six
 import webob.exc
 
@@ -35,7 +36,7 @@ from nova import test
 from nova.tests import fixtures
 from nova.tests.unit.api.openstack import fakes
 from nova.tests.unit.objects import test_service
-from nova.tests import uuidsentinel
+
 
 # This is tied into the os-services API samples functional tests.
 FAKE_UUID_COMPUTE_HOST1 = 'e81d66a4-ddd3-4aba-8a84-171d1cb4d339'
diff --git a/nova/tests/unit/api/openstack/compute/test_shelve.py b/nova/tests/unit/api/openstack/compute/test_shelve.py
index 35e5ed71e7..257bc5366d 100644
--- a/nova/tests/unit/api/openstack/compute/test_shelve.py
+++ b/nova/tests/unit/api/openstack/compute/test_shelve.py
@@ -14,6 +14,7 @@
 
 import mock
 from oslo_policy import policy as oslo_policy
+from oslo_utils.fixture import uuidsentinel
 import webob
 
 from nova.api.openstack.compute import shelve as shelve_v21
@@ -22,7 +23,6 @@ from nova import policy
 from nova import test
 from nova.tests.unit.api.openstack import fakes
 from nova.tests.unit import fake_instance
-from nova.tests import uuidsentinel
 
 
 class ShelvePolicyTestV21(test.NoDBTestCase):
diff --git a/nova/tests/unit/api/openstack/compute/test_simple_tenant_usage.py b/nova/tests/unit/api/openstack/compute/test_simple_tenant_usage.py
index 9e6c2a0782..e41e671fff 100644
--- a/nova/tests/unit/api/openstack/compute/test_simple_tenant_usage.py
+++ b/nova/tests/unit/api/openstack/compute/test_simple_tenant_usage.py
@@ -17,6 +17,7 @@ import datetime
 
 import mock
 from oslo_policy import policy as oslo_policy
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils
 from six.moves import range
 import webob
@@ -31,7 +32,6 @@ from nova import objects
 from nova import policy
 from nova import test
 from nova.tests.unit.api.openstack import fakes
-from nova.tests import uuidsentinel as uuids
 
 
 CONF = nova.conf.CONF
diff --git a/nova/tests/unit/api/openstack/compute/test_versions.py b/nova/tests/unit/api/openstack/compute/test_versions.py
index 8603f7e0ec..46d039e538 100644
--- a/nova/tests/unit/api/openstack/compute/test_versions.py
+++ b/nova/tests/unit/api/openstack/compute/test_versions.py
@@ -16,6 +16,7 @@
 import copy
 
 from oslo_serialization import jsonutils
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova.api.openstack import api_version_request as avr
 from nova.api.openstack.compute import views
@@ -23,7 +24,6 @@ from nova.api import wsgi
 from nova import test
 from nova.tests.unit.api.openstack import fakes
 from nova.tests.unit import matchers
-from nova.tests import uuidsentinel as uuids
 
 
 NS = {
diff --git a/nova/tests/unit/api/openstack/compute/test_volumes.py b/nova/tests/unit/api/openstack/compute/test_volumes.py
index 162d472034..e7102dc4f6 100644
--- a/nova/tests/unit/api/openstack/compute/test_volumes.py
+++ b/nova/tests/unit/api/openstack/compute/test_volumes.py
@@ -20,6 +20,7 @@ import fixtures
 import mock
 from oslo_serialization import jsonutils
 from oslo_utils import encodeutils
+from oslo_utils.fixture import uuidsentinel as uuids
 import six
 from six.moves import urllib
 import webob
@@ -41,9 +42,9 @@ from nova import test
 from nova.tests.unit.api.openstack import fakes
 from nova.tests.unit import fake_block_device
 from nova.tests.unit import fake_instance
-from nova.tests import uuidsentinel as uuids
 from nova.volume import cinder
 
+
 CONF = nova.conf.CONF
 
 # This is the server ID.
diff --git a/nova/tests/unit/api/openstack/placement/objects/test_resource_provider.py b/nova/tests/unit/api/openstack/placement/objects/test_resource_provider.py
index 28fa449f4d..1918fa2438 100644
--- a/nova/tests/unit/api/openstack/placement/objects/test_resource_provider.py
+++ b/nova/tests/unit/api/openstack/placement/objects/test_resource_provider.py
@@ -11,6 +11,7 @@
 #    under the License.
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils
 import six
 import testtools
@@ -19,7 +20,6 @@ from nova.api.openstack.placement import context
 from nova.api.openstack.placement import exception
 from nova.api.openstack.placement.objects import resource_provider
 from nova import rc_fields as fields
-from nova.tests import uuidsentinel as uuids
 
 
 _RESOURCE_CLASS_NAME = 'DISK_GB'
diff --git a/nova/tests/unit/api/openstack/placement/test_handler.py b/nova/tests/unit/api/openstack/placement/test_handler.py
index 01dda7ab34..0574c7e4bb 100644
--- a/nova/tests/unit/api/openstack/placement/test_handler.py
+++ b/nova/tests/unit/api/openstack/placement/test_handler.py
@@ -15,6 +15,7 @@
 
 import microversion_parse
 import mock
+from oslo_utils.fixture import uuidsentinel
 import routes
 import testtools
 import webob
@@ -22,7 +23,6 @@ import webob
 from nova.api.openstack.placement import handler
 from nova.api.openstack.placement.handlers import root
 from nova.api.openstack.placement import microversion
-from nova.tests import uuidsentinel
 
 
 # Used in tests below
diff --git a/nova/tests/unit/api/openstack/placement/test_util.py b/nova/tests/unit/api/openstack/placement/test_util.py
index 86d8efdea3..0d9d85bdea 100644
--- a/nova/tests/unit/api/openstack/placement/test_util.py
+++ b/nova/tests/unit/api/openstack/placement/test_util.py
@@ -20,6 +20,7 @@ import microversion_parse
 import mock
 from oslo_config import cfg
 from oslo_middleware import request_id
+from oslo_utils.fixture import uuidsentinel
 from oslo_utils import timeutils
 import testtools
 import webob
@@ -34,7 +35,7 @@ from nova.api.openstack.placement.objects import project as project_obj
 from nova.api.openstack.placement.objects import resource_provider as rp_obj
 from nova.api.openstack.placement.objects import user as user_obj
 from nova.api.openstack.placement import util
-from nova.tests import uuidsentinel
+
 
 CONF = cfg.CONF
 
diff --git a/nova/tests/unit/cells/test_cells_messaging.py b/nova/tests/unit/cells/test_cells_messaging.py
index 913224b08d..50f48e607b 100644
--- a/nova/tests/unit/cells/test_cells_messaging.py
+++ b/nova/tests/unit/cells/test_cells_messaging.py
@@ -21,6 +21,7 @@ import mock
 from mox3 import mox
 import oslo_messaging
 from oslo_serialization import jsonutils
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils
 
 from nova.cells import messaging
@@ -40,7 +41,6 @@ from nova import test
 from nova.tests.unit.cells import fakes
 from nova.tests.unit import fake_instance
 from nova.tests.unit import fake_server_actions
-from nova.tests import uuidsentinel as uuids
 
 
 class CellsMessageClassesTestCase(test.NoDBTestCase):
diff --git a/nova/tests/unit/cells/test_cells_rpcapi.py b/nova/tests/unit/cells/test_cells_rpcapi.py
index 18d262f5ac..3c37bd7450 100644
--- a/nova/tests/unit/cells/test_cells_rpcapi.py
+++ b/nova/tests/unit/cells/test_cells_rpcapi.py
@@ -17,6 +17,7 @@ Tests For Cells RPCAPI
 """
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 import six
 
 from nova.cells import rpcapi as cells_rpcapi
@@ -24,7 +25,6 @@ from nova import exception
 from nova import objects
 from nova import test
 from nova.tests.unit import fake_instance
-from nova.tests import uuidsentinel as uuids
 
 
 class CellsAPITestCase(test.NoDBTestCase):
diff --git a/nova/tests/unit/cells/test_cells_scheduler.py b/nova/tests/unit/cells/test_cells_scheduler.py
index e7d9bac927..d2e2fad352 100644
--- a/nova/tests/unit/cells/test_cells_scheduler.py
+++ b/nova/tests/unit/cells/test_cells_scheduler.py
@@ -18,6 +18,7 @@ Tests For CellsScheduler
 import copy
 
 import mock
+from oslo_utils.fixture import uuidsentinel
 from oslo_utils import uuidutils
 
 from nova import block_device
@@ -31,7 +32,6 @@ from nova import objects
 from nova import test
 from nova.tests.unit.cells import fakes
 from nova.tests.unit import fake_block_device
-from nova.tests import uuidsentinel
 from nova import utils
 
 
diff --git a/nova/tests/unit/cmd/test_status.py b/nova/tests/unit/cmd/test_status.py
index cfd0429387..68830ce4b6 100644
--- a/nova/tests/unit/cmd/test_status.py
+++ b/nova/tests/unit/cmd/test_status.py
@@ -23,6 +23,7 @@ from six.moves import StringIO
 from keystoneauth1 import exceptions as ks_exc
 from keystoneauth1 import loading as keystone
 from keystoneauth1 import session
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import uuidutils
 from requests import models
 
@@ -37,7 +38,7 @@ from nova.objects import request_spec as reqspec_obj
 from nova import rc_fields as fields
 from nova import test
 from nova.tests import fixtures as nova_fixtures
-from nova.tests import uuidsentinel as uuids
+
 
 CONF = nova.conf.CONF
 
diff --git a/nova/tests/unit/compute/test_compute.py b/nova/tests/unit/compute/test_compute.py
index 0215111144..3a446d1f01 100644
--- a/nova/tests/unit/compute/test_compute.py
+++ b/nova/tests/unit/compute/test_compute.py
@@ -34,6 +34,7 @@ import oslo_messaging as messaging
 from oslo_serialization import base64
 from oslo_serialization import jsonutils
 from oslo_utils import fixture as utils_fixture
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils
 from oslo_utils import units
 from oslo_utils import uuidutils
@@ -85,7 +86,6 @@ from nova.tests.unit.objects import test_flavor
 from nova.tests.unit.objects import test_instance_numa_topology
 from nova.tests.unit.objects import test_migration
 from nova.tests.unit import utils as test_utils
-from nova.tests import uuidsentinel as uuids
 from nova import utils
 from nova.virt import block_device as driver_block_device
 from nova.virt.block_device import DriverVolumeBlockDevice as driver_bdm_volume
@@ -94,6 +94,7 @@ from nova.virt import fake
 from nova.virt import hardware
 from nova.volume import cinder
 
+
 LOG = logging.getLogger(__name__)
 CONF = nova.conf.CONF
 
diff --git a/nova/tests/unit/compute/test_compute_api.py b/nova/tests/unit/compute/test_compute_api.py
index 963b38f2a4..7ad7f1e3b8 100644
--- a/nova/tests/unit/compute/test_compute_api.py
+++ b/nova/tests/unit/compute/test_compute_api.py
@@ -24,6 +24,7 @@ from mox3 import mox
 from oslo_messaging import exceptions as oslo_exceptions
 from oslo_serialization import jsonutils
 from oslo_utils import fixture as utils_fixture
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils
 from oslo_utils import uuidutils
 
@@ -60,7 +61,6 @@ from nova.tests.unit.image import fake as fake_image
 from nova.tests.unit import matchers
 from nova.tests.unit.objects import test_flavor
 from nova.tests.unit.objects import test_migration
-from nova.tests import uuidsentinel as uuids
 from nova import utils
 from nova.volume import cinder
 
diff --git a/nova/tests/unit/compute/test_compute_cells.py b/nova/tests/unit/compute/test_compute_cells.py
index 55a142b940..4580bab3be 100644
--- a/nova/tests/unit/compute/test_compute_cells.py
+++ b/nova/tests/unit/compute/test_compute_cells.py
@@ -20,6 +20,7 @@ import functools
 import inspect
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils
 
 from nova import block_device
@@ -43,7 +44,6 @@ from nova.tests.unit.compute import test_compute
 from nova.tests.unit.compute import test_shelve
 from nova.tests.unit import fake_instance
 from nova.tests.unit.objects import test_flavor
-from nova.tests import uuidsentinel as uuids
 
 
 ORIG_COMPUTE_API = None
diff --git a/nova/tests/unit/compute/test_compute_mgr.py b/nova/tests/unit/compute/test_compute_mgr.py
index 0114670b04..afa19c6c07 100644
--- a/nova/tests/unit/compute/test_compute_mgr.py
+++ b/nova/tests/unit/compute/test_compute_mgr.py
@@ -27,6 +27,7 @@ import netaddr
 from oslo_log import log as logging
 import oslo_messaging as messaging
 from oslo_serialization import jsonutils
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils
 from oslo_utils import uuidutils
 import six
@@ -65,7 +66,6 @@ from nova.tests.unit import fake_network_cache_model
 from nova.tests.unit import fake_notifier
 from nova.tests.unit.objects import test_instance_fault
 from nova.tests.unit.objects import test_instance_info_cache
-from nova.tests import uuidsentinel as uuids
 from nova import utils
 from nova.virt.block_device import DriverVolumeBlockDevice as driver_bdm_volume
 from nova.virt import driver as virt_driver
diff --git a/nova/tests/unit/compute/test_compute_utils.py b/nova/tests/unit/compute/test_compute_utils.py
index bed6dd2fe5..0fe8a84bbd 100644
--- a/nova/tests/unit/compute/test_compute_utils.py
+++ b/nova/tests/unit/compute/test_compute_utils.py
@@ -22,6 +22,7 @@ import traceback
 
 import mock
 from oslo_serialization import jsonutils
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import uuidutils
 import six
 
@@ -48,7 +49,6 @@ from nova.tests.unit import fake_network
 from nova.tests.unit import fake_notifier
 from nova.tests.unit import fake_server_actions
 from nova.tests.unit.objects import test_flavor
-from nova.tests import uuidsentinel as uuids
 
 
 FAKE_IMAGE_REF = uuids.image_ref
diff --git a/nova/tests/unit/compute/test_host_api.py b/nova/tests/unit/compute/test_host_api.py
index 27b2ff6cc8..e9b364c63b 100644
--- a/nova/tests/unit/compute/test_host_api.py
+++ b/nova/tests/unit/compute/test_host_api.py
@@ -19,6 +19,7 @@ import copy
 import fixtures
 import mock
 from oslo_serialization import jsonutils
+from oslo_utils.fixture import uuidsentinel as uuids
 import testtools
 
 from nova.api.openstack.compute import services
@@ -34,7 +35,6 @@ from nova.tests.unit.api.openstack import fakes
 from nova.tests.unit import fake_notifier
 from nova.tests.unit.objects import test_objects
 from nova.tests.unit.objects import test_service
-from nova.tests import uuidsentinel as uuids
 
 
 class ComputeHostAPITestCase(test.TestCase):
diff --git a/nova/tests/unit/compute/test_instance_list.py b/nova/tests/unit/compute/test_instance_list.py
index e5422c2743..c3be17dbb4 100644
--- a/nova/tests/unit/compute/test_instance_list.py
+++ b/nova/tests/unit/compute/test_instance_list.py
@@ -11,6 +11,7 @@
 #    under the License.
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova.compute import instance_list
 from nova.compute import multi_cell_list
@@ -18,7 +19,7 @@ from nova import context as nova_context
 from nova import objects
 from nova import test
 from nova.tests import fixtures
-from nova.tests import uuidsentinel as uuids
+
 
 FAKE_CELLS = [objects.CellMapping(), objects.CellMapping()]
 
diff --git a/nova/tests/unit/compute/test_multi_cell_list.py b/nova/tests/unit/compute/test_multi_cell_list.py
index b89ce9646d..b96edef294 100644
--- a/nova/tests/unit/compute/test_multi_cell_list.py
+++ b/nova/tests/unit/compute/test_multi_cell_list.py
@@ -14,13 +14,13 @@ from contextlib import contextmanager
 import copy
 import datetime
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova.compute import multi_cell_list
 from nova import context
 from nova import exception
 from nova import objects
 from nova import test
-from nova.tests import uuidsentinel as uuids
 
 
 class TestUtils(test.NoDBTestCase):
diff --git a/nova/tests/unit/compute/test_provider_tree.py b/nova/tests/unit/compute/test_provider_tree.py
index a0aae53b2c..71ed749d2c 100644
--- a/nova/tests/unit/compute/test_provider_tree.py
+++ b/nova/tests/unit/compute/test_provider_tree.py
@@ -9,11 +9,11 @@
 # 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.fixture import uuidsentinel as uuids
 
 from nova.compute import provider_tree
 from nova import objects
 from nova import test
-from nova.tests import uuidsentinel as uuids
 
 
 class TestProviderTree(test.NoDBTestCase):
diff --git a/nova/tests/unit/compute/test_resource_tracker.py b/nova/tests/unit/compute/test_resource_tracker.py
index 0ef183779e..063bdb6e34 100644
--- a/nova/tests/unit/compute/test_resource_tracker.py
+++ b/nova/tests/unit/compute/test_resource_tracker.py
@@ -16,6 +16,7 @@ import datetime
 from keystoneauth1 import exceptions as ks_exc
 import mock
 from oslo_config import cfg
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils
 from oslo_utils import units
 
@@ -38,7 +39,6 @@ from nova.scheduler.client import report
 from nova import test
 from nova.tests.unit import fake_notifier
 from nova.tests.unit.objects import test_pci_device as fake_pci_device
-from nova.tests import uuidsentinel as uuids
 from nova.virt import driver
 
 _HOSTNAME = 'fake-host'
diff --git a/nova/tests/unit/compute/test_rpcapi.py b/nova/tests/unit/compute/test_rpcapi.py
index d00e819e1c..def3a2f93c 100644
--- a/nova/tests/unit/compute/test_rpcapi.py
+++ b/nova/tests/unit/compute/test_rpcapi.py
@@ -18,6 +18,7 @@ Unit Tests for nova.compute.rpcapi
 
 import mock
 from oslo_serialization import jsonutils
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova.compute import rpcapi as compute_rpcapi
 from nova import context
@@ -29,7 +30,6 @@ from nova import test
 from nova.tests.unit import fake_block_device
 from nova.tests.unit import fake_flavor
 from nova.tests.unit import fake_instance
-from nova.tests import uuidsentinel as uuids
 
 
 class ComputeRpcAPITestCase(test.NoDBTestCase):
diff --git a/nova/tests/unit/compute/test_shelve.py b/nova/tests/unit/compute/test_shelve.py
index 1fc5b7a405..78a2a25263 100644
--- a/nova/tests/unit/compute/test_shelve.py
+++ b/nova/tests/unit/compute/test_shelve.py
@@ -12,6 +12,7 @@
 
 import mock
 from oslo_utils import fixture as utils_fixture
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils
 
 from nova.compute import claims
@@ -28,7 +29,7 @@ from nova import objects
 from nova import test
 from nova.tests.unit.compute import test_compute
 from nova.tests.unit.image import fake as fake_image
-from nova.tests import uuidsentinel as uuids
+
 
 CONF = nova.conf.CONF
 
diff --git a/nova/tests/unit/compute/test_stats.py b/nova/tests/unit/compute/test_stats.py
index f58d8bdad4..e713794a19 100644
--- a/nova/tests/unit/compute/test_stats.py
+++ b/nova/tests/unit/compute/test_stats.py
@@ -14,13 +14,13 @@
 #    under the License.
 
 """Tests for compute node stats."""
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova.compute import stats
 from nova.compute import task_states
 from nova.compute import vm_states
 from nova import test
 from nova.tests.unit import fake_instance
-from nova.tests import uuidsentinel as uuids
 
 
 class StatsTestCase(test.NoDBTestCase):
diff --git a/nova/tests/unit/conductor/tasks/test_live_migrate.py b/nova/tests/unit/conductor/tasks/test_live_migrate.py
index 02f92e3b9c..2402a4d088 100644
--- a/nova/tests/unit/conductor/tasks/test_live_migrate.py
+++ b/nova/tests/unit/conductor/tasks/test_live_migrate.py
@@ -12,6 +12,7 @@
 
 import mock
 import oslo_messaging as messaging
+from oslo_utils.fixture import uuidsentinel as uuids
 import six
 
 from nova.compute import power_state
@@ -26,7 +27,6 @@ from nova.scheduler import utils as scheduler_utils
 from nova import servicegroup
 from nova import test
 from nova.tests.unit import fake_instance
-from nova.tests import uuidsentinel as uuids
 from nova import utils
 
 
diff --git a/nova/tests/unit/conductor/tasks/test_migrate.py b/nova/tests/unit/conductor/tasks/test_migrate.py
index ff10779c59..92ffce9e50 100644
--- a/nova/tests/unit/conductor/tasks/test_migrate.py
+++ b/nova/tests/unit/conductor/tasks/test_migrate.py
@@ -11,6 +11,7 @@
 #    under the License.
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova.compute import rpcapi as compute_rpcapi
 from nova.conductor.tasks import migrate
@@ -23,7 +24,6 @@ from nova import test
 from nova.tests.unit.conductor.test_conductor import FakeContext
 from nova.tests.unit import fake_flavor
 from nova.tests.unit import fake_instance
-from nova.tests import uuidsentinel as uuids
 
 
 class MigrationTaskTestCase(test.NoDBTestCase):
diff --git a/nova/tests/unit/conductor/test_conductor.py b/nova/tests/unit/conductor/test_conductor.py
index 47f8b3a3d1..9e2ea4a455 100644
--- a/nova/tests/unit/conductor/test_conductor.py
+++ b/nova/tests/unit/conductor/test_conductor.py
@@ -20,6 +20,7 @@ import copy
 import mock
 import oslo_messaging as messaging
 from oslo_serialization import jsonutils
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils
 from oslo_versionedobjects import exception as ovo_exc
 import six
@@ -57,9 +58,9 @@ from nova.tests.unit import fake_notifier
 from nova.tests.unit import fake_request_spec
 from nova.tests.unit import fake_server_actions
 from nova.tests.unit import utils as test_utils
-from nova.tests import uuidsentinel as uuids
 from nova import utils
 
+
 CONF = conf.CONF
 
 
diff --git a/nova/tests/unit/console/test_websocketproxy.py b/nova/tests/unit/console/test_websocketproxy.py
index 60ccbc1617..d40e06b78a 100644
--- a/nova/tests/unit/console/test_websocketproxy.py
+++ b/nova/tests/unit/console/test_websocketproxy.py
@@ -18,6 +18,7 @@ import copy
 import socket
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 
 import nova.conf
 from nova.console.securityproxy import base
@@ -27,7 +28,6 @@ from nova import exception
 from nova import objects
 from nova import test
 from nova.tests.unit import fake_console_auth_token as fake_ca
-from nova.tests import uuidsentinel as uuids
 from nova import utils
 
 CONF = nova.conf.CONF
diff --git a/nova/tests/unit/consoleauth/test_consoleauth.py b/nova/tests/unit/consoleauth/test_consoleauth.py
index 2d587ae2ec..1c4f17f784 100644
--- a/nova/tests/unit/consoleauth/test_consoleauth.py
+++ b/nova/tests/unit/consoleauth/test_consoleauth.py
@@ -19,6 +19,7 @@ Tests for Consoleauth Code.
 """
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils
 import six
 
@@ -26,7 +27,6 @@ from nova.consoleauth import manager
 from nova import context
 from nova import objects
 from nova import test
-from nova.tests import uuidsentinel as uuids
 
 
 class ConsoleauthTestCase(test.NoDBTestCase):
diff --git a/nova/tests/unit/db/test_db_api.py b/nova/tests/unit/db/test_db_api.py
index cc87bfbd51..71c3a02d34 100644
--- a/nova/tests/unit/db/test_db_api.py
+++ b/nova/tests/unit/db/test_db_api.py
@@ -32,6 +32,7 @@ from oslo_db.sqlalchemy import update_match
 from oslo_db.sqlalchemy import utils as sqlalchemyutils
 from oslo_serialization import jsonutils
 from oslo_utils import fixture as utils_fixture
+from oslo_utils.fixture import uuidsentinel
 from oslo_utils import timeutils
 from oslo_utils import uuidutils
 import six
@@ -64,9 +65,9 @@ from nova.objects import fields
 from nova import test
 from nova.tests import fixtures as nova_fixtures
 from nova.tests.unit import fake_console_auth_token
-from nova.tests import uuidsentinel
 from nova import utils
 
+
 CONF = nova.conf.CONF
 
 get_engine = sqlalchemy_api.get_engine
diff --git a/nova/tests/unit/db/test_sqlalchemy_migration.py b/nova/tests/unit/db/test_sqlalchemy_migration.py
index e409f38a78..afc1be5a49 100644
--- a/nova/tests/unit/db/test_sqlalchemy_migration.py
+++ b/nova/tests/unit/db/test_sqlalchemy_migration.py
@@ -19,6 +19,7 @@ from migrate import UniqueConstraint
 from migrate.versioning import api as versioning_api
 import mock
 from oslo_db.sqlalchemy import utils as db_utils
+from oslo_utils.fixture import uuidsentinel
 import sqlalchemy
 
 from nova import context
@@ -29,7 +30,6 @@ from nova import exception
 from nova import objects
 from nova import test
 from nova.tests import fixtures as nova_fixtures
-from nova.tests import uuidsentinel
 
 
 class TestNullInstanceUuidScanDB(test.TestCase):
diff --git a/nova/tests/unit/fake_block_device.py b/nova/tests/unit/fake_block_device.py
index a09cc020af..1a001723e4 100644
--- a/nova/tests/unit/fake_block_device.py
+++ b/nova/tests/unit/fake_block_device.py
@@ -13,11 +13,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils
 
 from nova import block_device
 from nova import objects
-from nova.tests import uuidsentinel as uuids
 
 
 def fake_bdm_object(context, bdm_dict):
diff --git a/nova/tests/unit/fake_build_request.py b/nova/tests/unit/fake_build_request.py
index 955dbea3f2..733d75cbb7 100644
--- a/nova/tests/unit/fake_build_request.py
+++ b/nova/tests/unit/fake_build_request.py
@@ -13,6 +13,7 @@
 import datetime
 
 from oslo_serialization import jsonutils
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import uuidutils
 
 from nova import context
@@ -20,7 +21,6 @@ from nova import objects
 from nova.objects import fields
 from nova.tests.unit import fake_block_device
 from nova.tests.unit import fake_instance
-from nova.tests import uuidsentinel as uuids
 
 
 def fake_db_req(**updates):
diff --git a/nova/tests/unit/fake_console_auth_token.py b/nova/tests/unit/fake_console_auth_token.py
index 117569a08d..5cb27e8dfa 100644
--- a/nova/tests/unit/fake_console_auth_token.py
+++ b/nova/tests/unit/fake_console_auth_token.py
@@ -12,10 +12,11 @@
 #    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.fixture import uuidsentinel
 
-from nova.tests import uuidsentinel
 from nova import utils
 
+
 fake_token = uuidsentinel.token
 fake_token_hash = utils.get_sha256_str(fake_token)
 fake_instance_uuid = uuidsentinel.instance
diff --git a/nova/tests/unit/fake_network.py b/nova/tests/unit/fake_network.py
index a7a201430f..05b055266b 100644
--- a/nova/tests/unit/fake_network.py
+++ b/nova/tests/unit/fake_network.py
@@ -13,8 +13,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-
 from oslo_serialization import jsonutils
+from oslo_utils.fixture import uuidsentinel as uuids
 from six.moves import range
 
 from nova.compute import api as compute_api
@@ -34,7 +34,6 @@ from nova.tests.unit.objects import test_fixed_ip
 from nova.tests.unit.objects import test_instance_info_cache
 from nova.tests.unit.objects import test_pci_device
 from nova.tests.unit import utils
-from nova.tests import uuidsentinel as uuids
 
 
 HOST = "testhost"
diff --git a/nova/tests/unit/fake_request_spec.py b/nova/tests/unit/fake_request_spec.py
index 3c7cf316d9..6d7e50fcb1 100644
--- a/nova/tests/unit/fake_request_spec.py
+++ b/nova/tests/unit/fake_request_spec.py
@@ -11,12 +11,12 @@
 #    under the License.
 
 from oslo_serialization import jsonutils
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import uuidutils
 
 from nova import context
 from nova import objects
 from nova.tests.unit import fake_flavor
-from nova.tests import uuidsentinel as uuids
 
 
 INSTANCE_NUMA_TOPOLOGY = objects.InstanceNUMATopology(
diff --git a/nova/tests/unit/fake_volume.py b/nova/tests/unit/fake_volume.py
index b781292f79..7d9206cc17 100644
--- a/nova/tests/unit/fake_volume.py
+++ b/nova/tests/unit/fake_volume.py
@@ -13,11 +13,11 @@
 """Implementation of a fake volume API."""
 
 from oslo_log import log as logging
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils
 
 import nova.conf
 from nova import exception
-from nova.tests import uuidsentinel as uuids
 
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/tests/unit/image/test_glance.py b/nova/tests/unit/image/test_glance.py
index 5e71887409..9ca437dfd9 100644
--- a/nova/tests/unit/image/test_glance.py
+++ b/nova/tests/unit/image/test_glance.py
@@ -25,6 +25,7 @@ from glanceclient.v1 import images
 from glanceclient.v2 import schemas
 from keystoneauth1 import loading as ks_loading
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 import six
 from six.moves import StringIO
 import testtools
@@ -36,7 +37,7 @@ from nova.image import glance
 from nova import objects
 from nova import service_auth
 from nova import test
-from nova.tests import uuidsentinel as uuids
+
 
 CONF = nova.conf.CONF
 NOW_GLANCE_FORMAT = "2010-10-11T10:30:22.000000"
diff --git a/nova/tests/unit/network/security_group/test_neutron_driver.py b/nova/tests/unit/network/security_group/test_neutron_driver.py
index 3c861e2e37..75a62ca8fc 100644
--- a/nova/tests/unit/network/security_group/test_neutron_driver.py
+++ b/nova/tests/unit/network/security_group/test_neutron_driver.py
@@ -17,6 +17,7 @@ import mock
 from neutronclient.common import exceptions as n_exc
 from neutronclient.neutron import v2_0 as neutronv20
 from neutronclient.v2_0 import client
+from oslo_utils.fixture import uuidsentinel as uuids
 from six.moves import range
 
 from nova import context
@@ -24,7 +25,6 @@ from nova import exception
 from nova.network.security_group import neutron_driver
 from nova import objects
 from nova import test
-from nova.tests import uuidsentinel as uuids
 
 
 class TestNeutronDriver(test.NoDBTestCase):
diff --git a/nova/tests/unit/network/test_api.py b/nova/tests/unit/network/test_api.py
index 1f3a4be7d8..cf9366130d 100644
--- a/nova/tests/unit/network/test_api.py
+++ b/nova/tests/unit/network/test_api.py
@@ -19,6 +19,7 @@ import copy
 import itertools
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import uuidutils
 
 from nova.compute import flavors
@@ -37,7 +38,7 @@ from nova.tests.unit.api.openstack import fakes
 from nova.tests.unit import fake_instance
 from nova.tests.unit.objects import test_fixed_ip
 from nova.tests.unit.objects import test_virtual_interface
-from nova.tests import uuidsentinel as uuids
+
 
 FAKE_UUID = 'a47ae74e-ab08-547f-9eee-ffd23fc46c16'
 
diff --git a/nova/tests/unit/network/test_linux_net.py b/nova/tests/unit/network/test_linux_net.py
index 126214b580..9b854ca9f5 100644
--- a/nova/tests/unit/network/test_linux_net.py
+++ b/nova/tests/unit/network/test_linux_net.py
@@ -24,6 +24,7 @@ import netifaces
 from oslo_concurrency import processutils
 from oslo_serialization import jsonutils
 from oslo_utils import fileutils
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils
 
 import nova.conf
@@ -35,9 +36,9 @@ from nova.network import linux_net
 from nova.network import linux_utils as linux_net_utils
 from nova import objects
 from nova import test
-from nova.tests import uuidsentinel as uuids
 from nova import utils
 
+
 CONF = nova.conf.CONF
 
 instances = {uuids.instance_1:
diff --git a/nova/tests/unit/network/test_manager.py b/nova/tests/unit/network/test_manager.py
index 449859870f..afeea84776 100644
--- a/nova/tests/unit/network/test_manager.py
+++ b/nova/tests/unit/network/test_manager.py
@@ -24,6 +24,7 @@ from oslo_config import cfg
 from oslo_db import exception as db_exc
 from oslo_log import log as logging
 import oslo_messaging as messaging
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import importutils
 from oslo_utils import netutils
 import six
@@ -53,9 +54,9 @@ from nova.tests.unit.objects import test_floating_ip
 from nova.tests.unit.objects import test_network
 from nova.tests.unit.objects import test_service
 from nova.tests.unit import utils as test_utils
-from nova.tests import uuidsentinel as uuids
 from nova import utils
 
+
 CONF = cfg.CONF
 LOG = logging.getLogger(__name__)
 
diff --git a/nova/tests/unit/network/test_neutronv2.py b/nova/tests/unit/network/test_neutronv2.py
index 9a6337dbdb..31e1c5a883 100644
--- a/nova/tests/unit/network/test_neutronv2.py
+++ b/nova/tests/unit/network/test_neutronv2.py
@@ -29,6 +29,7 @@ from oslo_config import cfg
 from oslo_config import fixture as config_fixture
 from oslo_policy import policy as oslo_policy
 from oslo_serialization import jsonutils
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils
 from oslo_utils import uuidutils
 import requests_mock
@@ -53,7 +54,7 @@ from nova import service_auth
 from nova import test
 from nova.tests.unit import fake_instance
 from nova.tests.unit import fake_requests as fake_req
-from nova.tests import uuidsentinel as uuids
+
 
 CONF = cfg.CONF
 
diff --git a/nova/tests/unit/notifications/objects/test_instance.py b/nova/tests/unit/notifications/objects/test_instance.py
index 81d11d0419..e70a9a5694 100644
--- a/nova/tests/unit/notifications/objects/test_instance.py
+++ b/nova/tests/unit/notifications/objects/test_instance.py
@@ -11,6 +11,7 @@
 #    under the License.
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils
 
 from nova import context as nova_context
@@ -20,7 +21,6 @@ from nova.notifications.objects import instance as instance_notification
 from nova import objects
 from nova import test
 from nova.tests.unit import fake_instance
-from nova.tests import uuidsentinel as uuids
 
 
 class TestInstanceNotification(test.NoDBTestCase):
diff --git a/nova/tests/unit/notifications/objects/test_notification.py b/nova/tests/unit/notifications/objects/test_notification.py
index ca1cd785e6..1dba3e1402 100644
--- a/nova/tests/unit/notifications/objects/test_notification.py
+++ b/nova/tests/unit/notifications/objects/test_notification.py
@@ -14,6 +14,7 @@
 import collections
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils
 from oslo_versionedobjects import fixture
 
@@ -24,7 +25,6 @@ from nova.objects import base
 from nova.objects import fields
 from nova import test
 from nova.tests.unit.objects import test_objects
-from nova.tests import uuidsentinel as uuids
 
 
 class TestNotificationBase(test.NoDBTestCase):
diff --git a/nova/tests/unit/notifications/test_base.py b/nova/tests/unit/notifications/test_base.py
index 06f77db159..a5fa83db9a 100644
--- a/nova/tests/unit/notifications/test_base.py
+++ b/nova/tests/unit/notifications/test_base.py
@@ -16,12 +16,12 @@ import datetime
 
 from keystoneauth1 import exceptions as ks_exc
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova import context as nova_context
 from nova.notifications import base
 from nova import test
 from nova.tests.unit import fake_instance
-from nova.tests import uuidsentinel as uuids
 from nova import utils
 
 
diff --git a/nova/tests/unit/objects/test_aggregate.py b/nova/tests/unit/objects/test_aggregate.py
index 603d990417..e0e189050f 100644
--- a/nova/tests/unit/objects/test_aggregate.py
+++ b/nova/tests/unit/objects/test_aggregate.py
@@ -13,6 +13,7 @@
 #    under the License.
 
 import mock
+from oslo_utils.fixture import uuidsentinel
 from oslo_utils import timeutils
 
 from nova import exception
@@ -20,7 +21,6 @@ from nova.objects import aggregate
 from nova import test
 from nova.tests.unit import fake_notifier
 from nova.tests.unit.objects import test_objects
-from nova.tests import uuidsentinel
 
 
 NOW = timeutils.utcnow().replace(microsecond=0)
diff --git a/nova/tests/unit/objects/test_bandwidth_usage.py b/nova/tests/unit/objects/test_bandwidth_usage.py
index cde7dcdaaa..b439adc2b1 100644
--- a/nova/tests/unit/objects/test_bandwidth_usage.py
+++ b/nova/tests/unit/objects/test_bandwidth_usage.py
@@ -14,6 +14,7 @@ import datetime
 
 import iso8601
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils
 
 from nova import context
@@ -21,7 +22,6 @@ from nova.db import api as db
 from nova.objects import bandwidth_usage
 from nova import test
 from nova.tests.unit.objects import test_objects
-from nova.tests import uuidsentinel as uuids
 
 
 class _TestBandwidthUsage(test.TestCase):
diff --git a/nova/tests/unit/objects/test_block_device.py b/nova/tests/unit/objects/test_block_device.py
index c62b34b2aa..820f95fb18 100644
--- a/nova/tests/unit/objects/test_block_device.py
+++ b/nova/tests/unit/objects/test_block_device.py
@@ -13,6 +13,7 @@
 #    under the License.
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova.cells import rpcapi as cells_rpcapi
 from nova import context
@@ -26,7 +27,6 @@ from nova import test
 from nova.tests.unit import fake_block_device
 from nova.tests.unit import fake_instance
 from nova.tests.unit.objects import test_objects
-from nova.tests import uuidsentinel as uuids
 
 
 class _TestBlockDeviceMappingObject(object):
diff --git a/nova/tests/unit/objects/test_build_request.py b/nova/tests/unit/objects/test_build_request.py
index 4bdc9ee3fd..5508607c3a 100644
--- a/nova/tests/unit/objects/test_build_request.py
+++ b/nova/tests/unit/objects/test_build_request.py
@@ -12,6 +12,7 @@
 
 import mock
 from oslo_serialization import jsonutils
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_versionedobjects import base as o_vo_base
 
 from nova import exception
@@ -21,7 +22,6 @@ from nova.objects import build_request
 from nova.tests.unit import fake_build_request
 from nova.tests.unit import fake_instance
 from nova.tests.unit.objects import test_objects
-from nova.tests import uuidsentinel as uuids
 
 
 class _TestBuildRequestObject(object):
diff --git a/nova/tests/unit/objects/test_cell_mapping.py b/nova/tests/unit/objects/test_cell_mapping.py
index ba6f258a71..326ac61608 100644
--- a/nova/tests/unit/objects/test_cell_mapping.py
+++ b/nova/tests/unit/objects/test_cell_mapping.py
@@ -11,13 +11,13 @@
 #    under the License.
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import uuidutils
 
 from nova import exception
 from nova import objects
 from nova.objects import cell_mapping
 from nova.tests.unit.objects import test_objects
-from nova.tests import uuidsentinel as uuids
 
 
 def get_db_mapping(**updates):
diff --git a/nova/tests/unit/objects/test_compute_node.py b/nova/tests/unit/objects/test_compute_node.py
index 51a7b72bf5..ba9543dbed 100644
--- a/nova/tests/unit/objects/test_compute_node.py
+++ b/nova/tests/unit/objects/test_compute_node.py
@@ -17,6 +17,7 @@ import copy
 import mock
 import netaddr
 from oslo_serialization import jsonutils
+from oslo_utils.fixture import uuidsentinel
 from oslo_utils import timeutils
 from oslo_versionedobjects import base as ovo_base
 from oslo_versionedobjects import exception as ovo_exc
@@ -30,7 +31,7 @@ from nova.objects import hv_spec
 from nova.objects import service
 from nova.tests.unit import fake_pci_device_pools
 from nova.tests.unit.objects import test_objects
-from nova.tests import uuidsentinel
+
 
 NOW = timeutils.utcnow().replace(microsecond=0)
 fake_stats = {'num_foo': '10'}
diff --git a/nova/tests/unit/objects/test_console_auth_token.py b/nova/tests/unit/objects/test_console_auth_token.py
index f566dadbb4..bbc33086b0 100644
--- a/nova/tests/unit/objects/test_console_auth_token.py
+++ b/nova/tests/unit/objects/test_console_auth_token.py
@@ -17,13 +17,13 @@ import copy
 import mock
 
 from oslo_db.exception import DBDuplicateEntry
+from oslo_utils.fixture import uuidsentinel
 from oslo_utils import timeutils
 
 from nova import exception
 from nova.objects import console_auth_token as token_obj
 from nova.tests.unit import fake_console_auth_token as fakes
 from nova.tests.unit.objects import test_objects
-from nova.tests import uuidsentinel
 
 
 class _TestConsoleAuthToken(object):
diff --git a/nova/tests/unit/objects/test_ec2.py b/nova/tests/unit/objects/test_ec2.py
index efd8630311..44e3dc4548 100644
--- a/nova/tests/unit/objects/test_ec2.py
+++ b/nova/tests/unit/objects/test_ec2.py
@@ -13,12 +13,12 @@
 #    under the License.
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova.db import api as db
 from nova import objects
 from nova.objects import ec2 as ec2_obj
 from nova.tests.unit.objects import test_objects
-from nova.tests import uuidsentinel as uuids
 
 
 fake_map = {
diff --git a/nova/tests/unit/objects/test_fixed_ip.py b/nova/tests/unit/objects/test_fixed_ip.py
index 8d59251b59..aa0dacf071 100644
--- a/nova/tests/unit/objects/test_fixed_ip.py
+++ b/nova/tests/unit/objects/test_fixed_ip.py
@@ -17,6 +17,7 @@ import datetime
 import iso8601
 import mock
 import netaddr
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils
 from oslo_versionedobjects import base as ovo_base
 
@@ -26,7 +27,6 @@ from nova.objects import instance as instance_obj
 from nova.tests.unit import fake_instance
 from nova.tests.unit.objects import test_network
 from nova.tests.unit.objects import test_objects
-from nova.tests import uuidsentinel as uuids
 from nova import utils
 
 fake_fixed_ip = {
diff --git a/nova/tests/unit/objects/test_host_mapping.py b/nova/tests/unit/objects/test_host_mapping.py
index a0dc015ea0..f82970806a 100644
--- a/nova/tests/unit/objects/test_host_mapping.py
+++ b/nova/tests/unit/objects/test_host_mapping.py
@@ -11,6 +11,7 @@
 #    under the License.
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova import context
 from nova import exception
@@ -19,7 +20,6 @@ from nova.objects import host_mapping
 from nova import test
 from nova.tests.unit.objects import test_cell_mapping
 from nova.tests.unit.objects import test_objects
-from nova.tests import uuidsentinel as uuids
 
 
 def get_db_mapping(mapped_cell=None, **updates):
diff --git a/nova/tests/unit/objects/test_instance.py b/nova/tests/unit/objects/test_instance.py
index 7d7abcb133..7d545a4cff 100644
--- a/nova/tests/unit/objects/test_instance.py
+++ b/nova/tests/unit/objects/test_instance.py
@@ -18,6 +18,7 @@ import mock
 import netaddr
 from oslo_db import exception as db_exc
 from oslo_serialization import jsonutils
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils
 
 from nova.cells import rpcapi as cells_rpcapi
@@ -46,7 +47,6 @@ from nova.tests.unit.objects import test_migration_context as test_mig_ctxt
 from nova.tests.unit.objects import test_objects
 from nova.tests.unit.objects import test_security_group
 from nova.tests.unit.objects import test_vcpu_model
-from nova.tests import uuidsentinel as uuids
 from nova import utils
 
 
diff --git a/nova/tests/unit/objects/test_instance_action.py b/nova/tests/unit/objects/test_instance_action.py
index be344093b6..25f4a83abe 100644
--- a/nova/tests/unit/objects/test_instance_action.py
+++ b/nova/tests/unit/objects/test_instance_action.py
@@ -16,6 +16,7 @@ import traceback
 
 import mock
 from oslo_utils import fixture as utils_fixture
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils
 import six
 
@@ -23,7 +24,6 @@ from nova.db import api as db
 from nova.objects import instance_action
 from nova import test
 from nova.tests.unit.objects import test_objects
-from nova.tests import uuidsentinel as uuids
 
 
 NOW = timeutils.utcnow().replace(microsecond=0)
diff --git a/nova/tests/unit/objects/test_instance_fault.py b/nova/tests/unit/objects/test_instance_fault.py
index 38cef458d3..e16a61b2d9 100644
--- a/nova/tests/unit/objects/test_instance_fault.py
+++ b/nova/tests/unit/objects/test_instance_fault.py
@@ -13,12 +13,12 @@
 #    under the License.
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova.db import api as db
 from nova import exception
 from nova.objects import instance_fault
 from nova.tests.unit.objects import test_objects
-from nova.tests import uuidsentinel as uuids
 
 
 fake_faults = {
diff --git a/nova/tests/unit/objects/test_instance_group.py b/nova/tests/unit/objects/test_instance_group.py
index 482190e114..6645e569eb 100644
--- a/nova/tests/unit/objects/test_instance_group.py
+++ b/nova/tests/unit/objects/test_instance_group.py
@@ -16,6 +16,7 @@ import copy
 
 import mock
 from oslo_serialization import jsonutils
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils
 from oslo_versionedobjects import exception as ovo_exc
 
@@ -23,7 +24,6 @@ from nova import exception
 from nova import objects
 from nova.tests.unit.objects import test_objects
 from nova.tests.unit import utils as test_utils
-from nova.tests import uuidsentinel as uuids
 
 
 _TS_NOW = timeutils.utcnow(with_timezone=True)
diff --git a/nova/tests/unit/objects/test_instance_info_cache.py b/nova/tests/unit/objects/test_instance_info_cache.py
index 227f0ffc33..7f36ecad4a 100644
--- a/nova/tests/unit/objects/test_instance_info_cache.py
+++ b/nova/tests/unit/objects/test_instance_info_cache.py
@@ -15,6 +15,7 @@
 import datetime
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils
 
 from nova.cells import opts as cells_opts
@@ -24,7 +25,6 @@ from nova import exception
 from nova.network import model as network_model
 from nova.objects import instance_info_cache
 from nova.tests.unit.objects import test_objects
-from nova.tests import uuidsentinel as uuids
 
 
 fake_info_cache = {
diff --git a/nova/tests/unit/objects/test_instance_numa_topology.py b/nova/tests/unit/objects/test_instance_numa_topology.py
index 2cc93d355b..8f56ceac9e 100644
--- a/nova/tests/unit/objects/test_instance_numa_topology.py
+++ b/nova/tests/unit/objects/test_instance_numa_topology.py
@@ -13,13 +13,14 @@
 import copy
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_versionedobjects import base as ovo_base
 
 from nova import exception
 from nova import objects
 from nova.objects import fields
 from nova.tests.unit.objects import test_objects
-from nova.tests import uuidsentinel as uuids
+
 
 fake_instance_uuid = uuids.fake
 
diff --git a/nova/tests/unit/objects/test_instance_pci_requests.py b/nova/tests/unit/objects/test_instance_pci_requests.py
index 933846bafe..c5ea050487 100644
--- a/nova/tests/unit/objects/test_instance_pci_requests.py
+++ b/nova/tests/unit/objects/test_instance_pci_requests.py
@@ -12,12 +12,12 @@
 
 import mock
 from oslo_serialization import jsonutils
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_versionedobjects import base as ovo_base
 
 from nova import objects
 from nova.objects import fields
 from nova.tests.unit.objects import test_objects
-from nova.tests import uuidsentinel as uuids
 
 
 FAKE_UUID = '79a53d6b-0893-4838-a971-15f4f382e7c2'
diff --git a/nova/tests/unit/objects/test_migrate_data.py b/nova/tests/unit/objects/test_migrate_data.py
index d31c513d02..aa6a00f7a0 100644
--- a/nova/tests/unit/objects/test_migrate_data.py
+++ b/nova/tests/unit/objects/test_migrate_data.py
@@ -13,6 +13,7 @@
 #    under the License.
 
 from oslo_serialization import jsonutils
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_versionedobjects import base as ovo_base
 
 from nova import exception
@@ -21,7 +22,6 @@ from nova import objects
 from nova.objects import migrate_data
 from nova import test
 from nova.tests.unit.objects import test_objects
-from nova.tests import uuidsentinel as uuids
 
 
 class _TestLiveMigrateData(object):
diff --git a/nova/tests/unit/objects/test_migration.py b/nova/tests/unit/objects/test_migration.py
index a841837c81..c494bd1e0d 100644
--- a/nova/tests/unit/objects/test_migration.py
+++ b/nova/tests/unit/objects/test_migration.py
@@ -13,6 +13,7 @@
 #    under the License.
 
 import mock
+from oslo_utils.fixture import uuidsentinel
 from oslo_utils import timeutils
 
 from nova import context
@@ -22,7 +23,6 @@ from nova import objects
 from nova.objects import migration
 from nova.tests.unit import fake_instance
 from nova.tests.unit.objects import test_objects
-from nova.tests import uuidsentinel
 
 
 NOW = timeutils.utcnow().replace(microsecond=0)
diff --git a/nova/tests/unit/objects/test_migration_context.py b/nova/tests/unit/objects/test_migration_context.py
index 1f1a854843..03200bc83f 100644
--- a/nova/tests/unit/objects/test_migration_context.py
+++ b/nova/tests/unit/objects/test_migration_context.py
@@ -12,12 +12,12 @@
 
 import mock
 from oslo_serialization import jsonutils
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova import exception
 from nova import objects
 from nova.tests.unit.objects import test_instance_numa_topology
 from nova.tests.unit.objects import test_objects
-from nova.tests import uuidsentinel as uuids
 
 
 fake_instance_uuid = uuids.fake
diff --git a/nova/tests/unit/objects/test_network.py b/nova/tests/unit/objects/test_network.py
index f964510211..a382bfb051 100644
--- a/nova/tests/unit/objects/test_network.py
+++ b/nova/tests/unit/objects/test_network.py
@@ -14,10 +14,10 @@
 
 import mock
 import netaddr
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova.objects import network as network_obj
 from nova.tests.unit.objects import test_objects
-from nova.tests import uuidsentinel as uuids
 
 
 fake_network = {
diff --git a/nova/tests/unit/objects/test_pci_device.py b/nova/tests/unit/objects/test_pci_device.py
index 374894b9d1..f6881038e0 100644
--- a/nova/tests/unit/objects/test_pci_device.py
+++ b/nova/tests/unit/objects/test_pci_device.py
@@ -17,6 +17,7 @@ import copy
 
 import mock
 from oslo_serialization import jsonutils
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils
 
 from nova import context
@@ -27,7 +28,7 @@ from nova.objects import fields
 from nova.objects import instance
 from nova.objects import pci_device
 from nova.tests.unit.objects import test_objects
-from nova.tests import uuidsentinel as uuids
+
 
 dev_dict = {
     'compute_node_id': 1,
diff --git a/nova/tests/unit/objects/test_request_spec.py b/nova/tests/unit/objects/test_request_spec.py
index 50b49c0dd4..b9675a410d 100644
--- a/nova/tests/unit/objects/test_request_spec.py
+++ b/nova/tests/unit/objects/test_request_spec.py
@@ -14,6 +14,7 @@
 
 import mock
 from oslo_serialization import jsonutils
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import uuidutils
 from oslo_versionedobjects import base as ovo_base
 
@@ -29,7 +30,6 @@ from nova.tests.unit import fake_instance
 from nova.tests.unit import fake_network_cache_model
 from nova.tests.unit import fake_request_spec
 from nova.tests.unit.objects import test_objects
-from nova.tests import uuidsentinel as uuids
 
 
 class _TestRequestSpecObject(object):
diff --git a/nova/tests/unit/objects/test_security_group.py b/nova/tests/unit/objects/test_security_group.py
index 55b9661033..296e2607a0 100644
--- a/nova/tests/unit/objects/test_security_group.py
+++ b/nova/tests/unit/objects/test_security_group.py
@@ -13,13 +13,13 @@
 #    under the License.
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_versionedobjects import fixture as ovo_fixture
 
 from nova.db import api as db
 from nova.objects import instance
 from nova.objects import security_group
 from nova.tests.unit.objects import test_objects
-from nova.tests import uuidsentinel as uuids
 
 
 fake_secgroup = {
diff --git a/nova/tests/unit/objects/test_security_group_rule.py b/nova/tests/unit/objects/test_security_group_rule.py
index 1abc43c028..9bbe573e43 100644
--- a/nova/tests/unit/objects/test_security_group_rule.py
+++ b/nova/tests/unit/objects/test_security_group_rule.py
@@ -13,13 +13,14 @@
 #    under the License.
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_versionedobjects import exception as ovo_exc
 
 from nova.db import api as db
 from nova import objects
 from nova.tests.unit.objects import test_objects
 from nova.tests.unit.objects import test_security_group
-from nova.tests import uuidsentinel as uuids
+
 
 fake_rule = {
     'created_at': None,
diff --git a/nova/tests/unit/objects/test_selection.py b/nova/tests/unit/objects/test_selection.py
index afef9c1a67..b99995c9ab 100644
--- a/nova/tests/unit/objects/test_selection.py
+++ b/nova/tests/unit/objects/test_selection.py
@@ -11,12 +11,12 @@
 #    under the License.
 
 from oslo_serialization import jsonutils
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova import objects
 from nova.objects import numa
 from nova.scheduler import host_manager
 from nova.tests.unit.objects import test_objects
-from nova.tests import uuidsentinel as uuids
 
 
 fake_numa_limit1 = numa.NUMATopologyLimits(cpu_allocation_ratio=1.0,
diff --git a/nova/tests/unit/objects/test_service.py b/nova/tests/unit/objects/test_service.py
index 94f56e5af7..f824bf88a1 100644
--- a/nova/tests/unit/objects/test_service.py
+++ b/nova/tests/unit/objects/test_service.py
@@ -13,6 +13,7 @@
 #    under the License.
 
 import mock
+from oslo_utils.fixture import uuidsentinel
 from oslo_utils import timeutils
 from oslo_versionedobjects import base as ovo_base
 from oslo_versionedobjects import exception as ovo_exc
@@ -29,7 +30,7 @@ from nova import test
 from nova.tests import fixtures
 from nova.tests.unit.objects import test_compute_node
 from nova.tests.unit.objects import test_objects
-from nova.tests import uuidsentinel
+
 
 NOW = timeutils.utcnow().replace(microsecond=0)
 
diff --git a/nova/tests/unit/objects/test_virtual_interface.py b/nova/tests/unit/objects/test_virtual_interface.py
index 0a1ccc325c..5c4d14fa61 100644
--- a/nova/tests/unit/objects/test_virtual_interface.py
+++ b/nova/tests/unit/objects/test_virtual_interface.py
@@ -13,11 +13,12 @@
 #    under the License.
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova.db import api as db
 from nova.objects import virtual_interface as vif_obj
 from nova.tests.unit.objects import test_objects
-from nova.tests import uuidsentinel as uuids
+
 
 fake_vif = {
     'created_at': None,
diff --git a/nova/tests/unit/objects/test_volume_usage.py b/nova/tests/unit/objects/test_volume_usage.py
index 63e8352a72..91207eef6d 100644
--- a/nova/tests/unit/objects/test_volume_usage.py
+++ b/nova/tests/unit/objects/test_volume_usage.py
@@ -11,11 +11,11 @@
 #    under the License.
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils
 
 from nova import objects
 from nova.tests.unit.objects import test_objects
-from nova.tests import uuidsentinel as uuids
 
 
 NOW = timeutils.utcnow().replace(microsecond=0)
diff --git a/nova/tests/unit/pci/test_manager.py b/nova/tests/unit/pci/test_manager.py
index 5471bbc077..c0e2087e48 100644
--- a/nova/tests/unit/pci/test_manager.py
+++ b/nova/tests/unit/pci/test_manager.py
@@ -17,6 +17,7 @@ import copy
 
 import mock
 from oslo_serialization import jsonutils
+from oslo_utils.fixture import uuidsentinel
 
 import nova
 from nova.compute import vm_states
@@ -26,7 +27,6 @@ from nova.objects import fields
 from nova.pci import manager
 from nova import test
 from nova.tests.unit.pci import fakes as pci_fakes
-from nova.tests import uuidsentinel
 
 
 fake_pci = {
diff --git a/nova/tests/unit/scheduler/client/test_query.py b/nova/tests/unit/scheduler/client/test_query.py
index d72f5bad76..f8ea4aa337 100644
--- a/nova/tests/unit/scheduler/client/test_query.py
+++ b/nova/tests/unit/scheduler/client/test_query.py
@@ -11,12 +11,12 @@
 #    under the License.
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova import context
 from nova import objects
 from nova.scheduler.client import query
 from nova import test
-from nova.tests import uuidsentinel as uuids
 
 
 class SchedulerQueryClientTestCase(test.NoDBTestCase):
diff --git a/nova/tests/unit/scheduler/client/test_report.py b/nova/tests/unit/scheduler/client/test_report.py
index 01aec5a4c3..a060e3280b 100644
--- a/nova/tests/unit/scheduler/client/test_report.py
+++ b/nova/tests/unit/scheduler/client/test_report.py
@@ -16,6 +16,7 @@ import fixtures
 from keystoneauth1 import exceptions as ks_exc
 import mock
 from oslo_serialization import jsonutils
+from oslo_utils.fixture import uuidsentinel as uuids
 from six.moves.urllib import parse
 
 import nova.conf
@@ -27,7 +28,7 @@ from nova.scheduler.client import report
 from nova.scheduler import utils as scheduler_utils
 from nova import test
 from nova.tests.unit import fake_requests
-from nova.tests import uuidsentinel as uuids
+
 
 CONF = nova.conf.CONF
 
diff --git a/nova/tests/unit/scheduler/fakes.py b/nova/tests/unit/scheduler/fakes.py
index 23dcb585fb..92b64fad0c 100644
--- a/nova/tests/unit/scheduler/fakes.py
+++ b/nova/tests/unit/scheduler/fakes.py
@@ -18,10 +18,12 @@ Fakes For Scheduler tests.
 
 import datetime
 
+from oslo_utils.fixture import uuidsentinel
+
 from nova import objects
 from nova.scheduler import driver
 from nova.scheduler import host_manager
-from nova.tests import uuidsentinel
+
 
 NUMA_TOPOLOGY = objects.NUMATopology(cells=[
     objects.NUMACell(
diff --git a/nova/tests/unit/scheduler/filters/test_affinity_filters.py b/nova/tests/unit/scheduler/filters/test_affinity_filters.py
index 5dfafc0885..45c4d9834c 100644
--- a/nova/tests/unit/scheduler/filters/test_affinity_filters.py
+++ b/nova/tests/unit/scheduler/filters/test_affinity_filters.py
@@ -11,12 +11,12 @@
 #    under the License.
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova import objects
 from nova.scheduler.filters import affinity_filter
 from nova import test
 from nova.tests.unit.scheduler import fakes
-from nova.tests import uuidsentinel as uuids
 
 
 class TestDifferentHostFilter(test.NoDBTestCase):
diff --git a/nova/tests/unit/scheduler/filters/test_isolated_hosts_filter.py b/nova/tests/unit/scheduler/filters/test_isolated_hosts_filter.py
index 1f8da359f9..65f8cd6fd3 100644
--- a/nova/tests/unit/scheduler/filters/test_isolated_hosts_filter.py
+++ b/nova/tests/unit/scheduler/filters/test_isolated_hosts_filter.py
@@ -9,12 +9,12 @@
 #    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.fixture import uuidsentinel as uuids
 
 from nova import objects
 from nova.scheduler.filters import isolated_hosts_filter
 from nova import test
 from nova.tests.unit.scheduler import fakes
-from nova.tests import uuidsentinel as uuids
 
 
 class TestIsolatedHostsFilter(test.NoDBTestCase):
diff --git a/nova/tests/unit/scheduler/filters/test_numa_topology_filters.py b/nova/tests/unit/scheduler/filters/test_numa_topology_filters.py
index 935ac7e86b..535fac61cb 100644
--- a/nova/tests/unit/scheduler/filters/test_numa_topology_filters.py
+++ b/nova/tests/unit/scheduler/filters/test_numa_topology_filters.py
@@ -13,13 +13,13 @@
 import itertools
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova import objects
 from nova.objects import fields
 from nova.scheduler.filters import numa_topology_filter
 from nova import test
 from nova.tests.unit.scheduler import fakes
-from nova.tests import uuidsentinel as uuids
 
 
 class TestNUMATopologyFilter(test.NoDBTestCase):
diff --git a/nova/tests/unit/scheduler/filters/test_utils.py b/nova/tests/unit/scheduler/filters/test_utils.py
index 00f75411e7..f045ff6986 100644
--- a/nova/tests/unit/scheduler/filters/test_utils.py
+++ b/nova/tests/unit/scheduler/filters/test_utils.py
@@ -12,12 +12,13 @@
 #    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.fixture import uuidsentinel as uuids
 
 from nova import objects
 from nova.scheduler.filters import utils
 from nova import test
 from nova.tests.unit.scheduler import fakes
-from nova.tests import uuidsentinel as uuids
+
 
 _AGGREGATE_FIXTURES = [
     objects.Aggregate(
diff --git a/nova/tests/unit/scheduler/ironic_fakes.py b/nova/tests/unit/scheduler/ironic_fakes.py
index 9d3ea49857..e84651f786 100644
--- a/nova/tests/unit/scheduler/ironic_fakes.py
+++ b/nova/tests/unit/scheduler/ironic_fakes.py
@@ -15,9 +15,9 @@
 """
 Fake nodes for Ironic host manager tests.
 """
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova import objects
-from nova.tests import uuidsentinel as uuids
 
 
 COMPUTE_NODES = [
diff --git a/nova/tests/unit/scheduler/test_caching_scheduler.py b/nova/tests/unit/scheduler/test_caching_scheduler.py
index 5a4a87ec8a..917e4a329b 100644
--- a/nova/tests/unit/scheduler/test_caching_scheduler.py
+++ b/nova/tests/unit/scheduler/test_caching_scheduler.py
@@ -14,6 +14,7 @@
 #    under the License.
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils
 from six.moves import range
 
@@ -22,7 +23,7 @@ from nova import objects
 from nova.scheduler import caching_scheduler
 from nova.scheduler import host_manager
 from nova.tests.unit.scheduler import test_scheduler
-from nova.tests import uuidsentinel as uuids
+
 
 ENABLE_PROFILER = False
 
diff --git a/nova/tests/unit/scheduler/test_client.py b/nova/tests/unit/scheduler/test_client.py
index 90b501e891..a720a0bfbc 100644
--- a/nova/tests/unit/scheduler/test_client.py
+++ b/nova/tests/unit/scheduler/test_client.py
@@ -15,13 +15,13 @@
 
 import mock
 import oslo_messaging as messaging
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova import objects
 from nova.scheduler import client as scheduler_client
 from nova.scheduler.client import query as scheduler_query_client
 from nova.scheduler.client import report as scheduler_report_client
 from nova import test
-from nova.tests import uuidsentinel as uuids
 """Tests for Scheduler Client."""
 
 
diff --git a/nova/tests/unit/scheduler/test_filter_scheduler.py b/nova/tests/unit/scheduler/test_filter_scheduler.py
index 3f8f2d299c..459f710bb0 100644
--- a/nova/tests/unit/scheduler/test_filter_scheduler.py
+++ b/nova/tests/unit/scheduler/test_filter_scheduler.py
@@ -18,6 +18,7 @@ Tests For Filter Scheduler.
 
 import mock
 from oslo_serialization import jsonutils
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova import exception
 from nova import objects
@@ -29,7 +30,6 @@ from nova.scheduler import utils as scheduler_utils
 from nova.scheduler import weights
 from nova import test  # noqa
 from nova.tests.unit.scheduler import test_scheduler
-from nova.tests import uuidsentinel as uuids
 
 
 fake_numa_limit = objects.NUMATopologyLimits(cpu_allocation_ratio=1.0,
diff --git a/nova/tests/unit/scheduler/test_filters.py b/nova/tests/unit/scheduler/test_filters.py
index 273a1d4f9c..ce4dde6ee1 100644
--- a/nova/tests/unit/scheduler/test_filters.py
+++ b/nova/tests/unit/scheduler/test_filters.py
@@ -18,13 +18,13 @@ Tests For Scheduler Host Filters.
 import inspect
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 from six.moves import range
 
 from nova import filters
 from nova import loadables
 from nova import objects
 from nova import test
-from nova.tests import uuidsentinel as uuids
 
 
 class Filter1(filters.BaseFilter):
diff --git a/nova/tests/unit/scheduler/test_host_manager.py b/nova/tests/unit/scheduler/test_host_manager.py
index 74ce2dc774..09717f559d 100644
--- a/nova/tests/unit/scheduler/test_host_manager.py
+++ b/nova/tests/unit/scheduler/test_host_manager.py
@@ -22,6 +22,7 @@ import datetime
 
 import mock
 from oslo_serialization import jsonutils
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import versionutils
 import six
 
@@ -39,7 +40,6 @@ from nova import test
 from nova.tests import fixtures
 from nova.tests.unit import fake_instance
 from nova.tests.unit.scheduler import fakes
-from nova.tests import uuidsentinel as uuids
 
 
 class FakeFilterClass1(filters.BaseHostFilter):
diff --git a/nova/tests/unit/scheduler/test_request_filter.py b/nova/tests/unit/scheduler/test_request_filter.py
index c3f5c27d3c..519feb79e8 100644
--- a/nova/tests/unit/scheduler/test_request_filter.py
+++ b/nova/tests/unit/scheduler/test_request_filter.py
@@ -11,13 +11,13 @@
 #    under the License.
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova import context as nova_context
 from nova import exception
 from nova import objects
 from nova.scheduler import request_filter
 from nova import test
-from nova.tests import uuidsentinel as uuids
 
 
 class TestRequestFilter(test.NoDBTestCase):
diff --git a/nova/tests/unit/scheduler/test_rpcapi.py b/nova/tests/unit/scheduler/test_rpcapi.py
index e655afa0d0..d18ad3ba32 100644
--- a/nova/tests/unit/scheduler/test_rpcapi.py
+++ b/nova/tests/unit/scheduler/test_rpcapi.py
@@ -17,13 +17,13 @@ Unit Tests for nova.scheduler.rpcapi
 """
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova import context
 from nova import exception as exc
 from nova import objects
 from nova.scheduler import rpcapi as scheduler_rpcapi
 from nova import test
-from nova.tests import uuidsentinel as uuids
 
 
 class SchedulerRpcAPITestCase(test.NoDBTestCase):
diff --git a/nova/tests/unit/scheduler/test_scheduler.py b/nova/tests/unit/scheduler/test_scheduler.py
index fccf05082d..d1f7defc0d 100644
--- a/nova/tests/unit/scheduler/test_scheduler.py
+++ b/nova/tests/unit/scheduler/test_scheduler.py
@@ -19,6 +19,7 @@ Tests For Scheduler
 
 import mock
 import oslo_messaging as messaging
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova import context
 from nova import objects
@@ -30,7 +31,6 @@ from nova import servicegroup
 from nova import test
 from nova.tests.unit import fake_server_actions
 from nova.tests.unit.scheduler import fakes
-from nova.tests import uuidsentinel as uuids
 
 
 class SchedulerManagerInitTestCase(test.NoDBTestCase):
diff --git a/nova/tests/unit/scheduler/test_scheduler_utils.py b/nova/tests/unit/scheduler/test_scheduler_utils.py
index dfdc5dc9c1..032d82e63d 100644
--- a/nova/tests/unit/scheduler/test_scheduler_utils.py
+++ b/nova/tests/unit/scheduler/test_scheduler_utils.py
@@ -17,6 +17,7 @@ Tests For Scheduler Utils
 """
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 import six
 
 from nova.compute import flavors
@@ -28,7 +29,6 @@ from nova.scheduler import utils as scheduler_utils
 from nova import test
 from nova.tests.unit import fake_instance
 from nova.tests.unit.objects import test_flavor
-from nova.tests import uuidsentinel as uuids
 
 
 class SchedulerUtilsTestCase(test.NoDBTestCase):
diff --git a/nova/tests/unit/scheduler/test_utils.py b/nova/tests/unit/scheduler/test_utils.py
index dddfe7fa99..21e0275d18 100644
--- a/nova/tests/unit/scheduler/test_utils.py
+++ b/nova/tests/unit/scheduler/test_utils.py
@@ -11,6 +11,7 @@
 #    under the License.
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova.api.openstack.placement import lib as plib
 from nova import context as nova_context
@@ -20,7 +21,6 @@ from nova.scheduler.client import report
 from nova.scheduler import utils
 from nova import test
 from nova.tests.unit import fake_instance
-from nova.tests import uuidsentinel as uuids
 
 
 class TestUtils(test.NoDBTestCase):
diff --git a/nova/tests/unit/test_availability_zones.py b/nova/tests/unit/test_availability_zones.py
index e2b3096117..e36061b277 100644
--- a/nova/tests/unit/test_availability_zones.py
+++ b/nova/tests/unit/test_availability_zones.py
@@ -18,6 +18,7 @@ Tests for availability zones
 """
 
 import mock
+from oslo_utils.fixture import uuidsentinel
 import six
 
 from nova import availability_zones as az
@@ -26,7 +27,6 @@ from nova import context
 from nova.db import api as db
 from nova import objects
 from nova import test
-from nova.tests import uuidsentinel
 
 CONF = nova.conf.CONF
 
diff --git a/nova/tests/unit/test_block_device.py b/nova/tests/unit/test_block_device.py
index 859c43280b..c5668a705a 100644
--- a/nova/tests/unit/test_block_device.py
+++ b/nova/tests/unit/test_block_device.py
@@ -16,6 +16,7 @@
 """
 Tests for Block Device utility functions.
 """
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova import block_device
 from nova import exception
@@ -23,7 +24,6 @@ from nova import objects
 from nova import test
 from nova.tests.unit import fake_block_device
 from nova.tests.unit import matchers
-from nova.tests import uuidsentinel as uuids
 
 
 class BlockDeviceTestCase(test.NoDBTestCase):
diff --git a/nova/tests/unit/test_context.py b/nova/tests/unit/test_context.py
index 0160815830..c3984462e3 100644
--- a/nova/tests/unit/test_context.py
+++ b/nova/tests/unit/test_context.py
@@ -15,13 +15,13 @@
 import mock
 from oslo_context import context as o_context
 from oslo_context import fixture as o_fixture
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova import context
 from nova import exception
 from nova import objects
 from nova import test
 from nova.tests import fixtures as nova_fixtures
-from nova.tests import uuidsentinel as uuids
 
 
 class ContextTestCase(test.NoDBTestCase):
diff --git a/nova/tests/unit/test_fixtures.py b/nova/tests/unit/test_fixtures.py
index 645a856a1a..6870a30598 100644
--- a/nova/tests/unit/test_fixtures.py
+++ b/nova/tests/unit/test_fixtures.py
@@ -21,6 +21,7 @@ import fixtures as fx
 import mock
 from oslo_config import cfg
 from oslo_log import log as logging
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils
 from oslo_utils import uuidutils
 import sqlalchemy
@@ -38,7 +39,6 @@ from nova import test
 from nova.tests import fixtures
 from nova.tests.unit import conf_fixture
 from nova.tests.unit import policy_fixture
-from nova.tests import uuidsentinel as uuids
 from nova import utils
 
 CONF = cfg.CONF
diff --git a/nova/tests/unit/test_metadata.py b/nova/tests/unit/test_metadata.py
index f55dfc92d2..ec678f35d6 100644
--- a/nova/tests/unit/test_metadata.py
+++ b/nova/tests/unit/test_metadata.py
@@ -34,6 +34,7 @@ from oslo_config import cfg
 from oslo_serialization import base64
 from oslo_serialization import jsonutils
 from oslo_utils import encodeutils
+from oslo_utils.fixture import uuidsentinel as uuids
 import requests
 import six
 import webob
@@ -55,7 +56,6 @@ from nova.tests.unit.api.openstack import fakes
 from nova.tests.unit import fake_block_device
 from nova.tests.unit import fake_network
 from nova.tests.unit import fake_requests
-from nova.tests import uuidsentinel as uuids
 from nova import utils
 from nova.virt import netutils
 
diff --git a/nova/tests/unit/test_notifications.py b/nova/tests/unit/test_notifications.py
index b373cdafc0..aa058ade7c 100644
--- a/nova/tests/unit/test_notifications.py
+++ b/nova/tests/unit/test_notifications.py
@@ -21,6 +21,7 @@ import datetime
 import mock
 from oslo_config import cfg
 from oslo_context import fixture as o_fixture
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils
 
 from nova.compute import flavors
@@ -34,7 +35,7 @@ from nova.objects import base as obj_base
 from nova import test
 from nova.tests.unit import fake_network
 from nova.tests.unit import fake_notifier
-from nova.tests import uuidsentinel as uuids
+
 
 CONF = cfg.CONF
 
diff --git a/nova/tests/unit/test_nova_manage.py b/nova/tests/unit/test_nova_manage.py
index dae5324719..e556a60d64 100644
--- a/nova/tests/unit/test_nova_manage.py
+++ b/nova/tests/unit/test_nova_manage.py
@@ -22,6 +22,7 @@ import fixtures
 import mock
 from oslo_db import exception as db_exc
 from oslo_serialization import jsonutils
+from oslo_utils.fixture import uuidsentinel
 from oslo_utils import uuidutils
 from six.moves import StringIO
 
@@ -38,7 +39,7 @@ from nova.tests import fixtures as nova_fixtures
 from nova.tests.unit.db import fakes as db_fakes
 from nova.tests.unit import fake_requests
 from nova.tests.unit.objects import test_network
-from nova.tests import uuidsentinel
+
 
 CONF = conf.CONF
 
diff --git a/nova/tests/unit/test_uuid_sentinels.py b/nova/tests/unit/test_uuid_sentinels.py
deleted file mode 100644
index 346d981e3e..0000000000
--- a/nova/tests/unit/test_uuid_sentinels.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# 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 uuidutils
-
-from nova import test
-from nova.tests import uuidsentinel
-
-
-class TestUUIDSentinels(test.NoDBTestCase):
-    def test_different_sentinel(self):
-        uuid1 = uuidsentinel.foobar
-        uuid2 = uuidsentinel.barfoo
-        self.assertNotEqual(uuid1, uuid2)
-
-    def test_returns_uuid(self):
-        self.assertTrue(uuidutils.is_uuid_like(uuidsentinel.foo))
-
-    def test_returns_string(self):
-        self.assertIsInstance(uuidsentinel.foo, str)
diff --git a/nova/tests/unit/virt/hyperv/test_imagecache.py b/nova/tests/unit/virt/hyperv/test_imagecache.py
index b4ffda77e1..45137e0466 100644
--- a/nova/tests/unit/virt/hyperv/test_imagecache.py
+++ b/nova/tests/unit/virt/hyperv/test_imagecache.py
@@ -18,6 +18,7 @@ import os
 import fixtures
 import mock
 from oslo_config import cfg
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import units
 
 from nova import exception
@@ -25,7 +26,6 @@ from nova import objects
 from nova.tests.unit import fake_instance
 from nova.tests.unit.objects import test_flavor
 from nova.tests.unit.virt.hyperv import test_base
-from nova.tests import uuidsentinel as uuids
 from nova.virt.hyperv import constants
 from nova.virt.hyperv import imagecache
 
diff --git a/nova/tests/unit/virt/ironic/test_driver.py b/nova/tests/unit/virt/ironic/test_driver.py
index fbc0dd26ad..558ba2eab7 100644
--- a/nova/tests/unit/virt/ironic/test_driver.py
+++ b/nova/tests/unit/virt/ironic/test_driver.py
@@ -19,6 +19,7 @@ from ironicclient import exc as ironic_exception
 import mock
 from oslo_config import cfg
 from oslo_service import loopingcall
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import uuidutils
 import six
 from testtools import matchers
@@ -44,7 +45,6 @@ from nova.tests.unit import fake_instance
 from nova.tests.unit import matchers as nova_matchers
 from nova.tests.unit import utils
 from nova.tests.unit.virt.ironic import utils as ironic_utils
-from nova.tests import uuidsentinel as uuids
 from nova.virt import block_device as driver_block_device
 from nova.virt import configdrive
 from nova.virt import driver
diff --git a/nova/tests/unit/virt/libvirt/fakelibvirt.py b/nova/tests/unit/virt/libvirt/fakelibvirt.py
index aec8b2e874..bc2def0763 100644
--- a/nova/tests/unit/virt/libvirt/fakelibvirt.py
+++ b/nova/tests/unit/virt/libvirt/fakelibvirt.py
@@ -17,9 +17,9 @@ import time
 
 import fixtures
 from lxml import etree
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova.objects import fields as obj_fields
-from nova.tests import uuidsentinel as uuids
 from nova.virt.libvirt import config as vconfig
 
 # Allow passing None to the various connect methods
diff --git a/nova/tests/unit/virt/libvirt/storage/test_rbd.py b/nova/tests/unit/virt/libvirt/storage/test_rbd.py
index a23e32ddbc..5d885c512d 100644
--- a/nova/tests/unit/virt/libvirt/storage/test_rbd.py
+++ b/nova/tests/unit/virt/libvirt/storage/test_rbd.py
@@ -13,12 +13,12 @@
 
 from eventlet import tpool
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova.compute import task_states
 from nova import exception
 from nova import objects
 from nova import test
-from nova.tests import uuidsentinel as uuids
 from nova.virt.libvirt.storage import rbd_utils
 from nova.virt.libvirt import utils as libvirt_utils
 
diff --git a/nova/tests/unit/virt/libvirt/test_blockinfo.py b/nova/tests/unit/virt/libvirt/test_blockinfo.py
index 71e425397a..33441bc034 100644
--- a/nova/tests/unit/virt/libvirt/test_blockinfo.py
+++ b/nova/tests/unit/virt/libvirt/test_blockinfo.py
@@ -17,6 +17,7 @@ import copy
 
 import fixtures
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova import block_device
 from nova import context
@@ -27,7 +28,6 @@ from nova import test
 from nova.tests.unit import fake_block_device
 import nova.tests.unit.image.fake
 from nova.tests.unit.virt import fakelibosinfo
-from nova.tests import uuidsentinel as uuids
 from nova.virt import block_device as driver_block_device
 from nova.virt import driver
 from nova.virt.libvirt import blockinfo
diff --git a/nova/tests/unit/virt/libvirt/test_config.py b/nova/tests/unit/virt/libvirt/test_config.py
index 3a1a38a6d3..13c9ca00d0 100644
--- a/nova/tests/unit/virt/libvirt/test_config.py
+++ b/nova/tests/unit/virt/libvirt/test_config.py
@@ -13,12 +13,12 @@
 #    under the License.
 
 from lxml import etree
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import units
 
 from nova.objects import fields as obj_fields
 from nova import test
 from nova.tests.unit import matchers
-from nova.tests import uuidsentinel as uuids
 from nova.virt.libvirt import config
 
 
diff --git a/nova/tests/unit/virt/libvirt/test_driver.py b/nova/tests/unit/virt/libvirt/test_driver.py
index 4a23f5923e..81af44d22f 100644
--- a/nova/tests/unit/virt/libvirt/test_driver.py
+++ b/nova/tests/unit/virt/libvirt/test_driver.py
@@ -49,6 +49,7 @@ from oslo_serialization import jsonutils
 from oslo_service import loopingcall
 from oslo_utils import fileutils
 from oslo_utils import fixture as utils_fixture
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import units
 from oslo_utils import uuidutils
 from oslo_utils import versionutils
@@ -92,7 +93,6 @@ from nova.tests.unit.objects import test_vcpu_model
 from nova.tests.unit.virt.libvirt import fake_imagebackend
 from nova.tests.unit.virt.libvirt import fake_libvirt_utils
 from nova.tests.unit.virt.libvirt import fakelibvirt
-from nova.tests import uuidsentinel as uuids
 from nova import utils
 from nova import version
 from nova.virt import block_device as driver_block_device
diff --git a/nova/tests/unit/virt/libvirt/test_firewall.py b/nova/tests/unit/virt/libvirt/test_firewall.py
index be4e9b3912..317e3695f1 100644
--- a/nova/tests/unit/virt/libvirt/test_firewall.py
+++ b/nova/tests/unit/virt/libvirt/test_firewall.py
@@ -20,6 +20,7 @@ from eventlet import greenthread
 from lxml import etree
 import mock
 from oslo_concurrency.fixture import lockutils as lock_fixture
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import uuidutils
 
 from nova import exception
@@ -28,7 +29,6 @@ from nova import objects
 from nova import test
 from nova.tests.unit import fake_network
 from nova.tests.unit.virt.libvirt import fakelibvirt
-from nova.tests import uuidsentinel as uuids
 from nova.virt.libvirt import firewall
 from nova.virt.libvirt import host
 from nova.virt import netutils
diff --git a/nova/tests/unit/virt/libvirt/test_host.py b/nova/tests/unit/virt/libvirt/test_host.py
index a1448a66f1..e4f7bf1e91 100644
--- a/nova/tests/unit/virt/libvirt/test_host.py
+++ b/nova/tests/unit/virt/libvirt/test_host.py
@@ -17,6 +17,7 @@
 import eventlet
 from eventlet import greenthread
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import uuidutils
 import six
 import testtools
@@ -27,7 +28,6 @@ from nova import objects
 from nova.objects import fields as obj_fields
 from nova import test
 from nova.tests.unit.virt.libvirt import fakelibvirt
-from nova.tests import uuidsentinel as uuids
 from nova.virt import event
 from nova.virt.libvirt import config as vconfig
 from nova.virt.libvirt import driver as libvirt_driver
diff --git a/nova/tests/unit/virt/libvirt/test_imagecache.py b/nova/tests/unit/virt/libvirt/test_imagecache.py
index 22d28e9c33..66297d11b6 100644
--- a/nova/tests/unit/virt/libvirt/test_imagecache.py
+++ b/nova/tests/unit/virt/libvirt/test_imagecache.py
@@ -23,6 +23,7 @@ from oslo_concurrency import lockutils
 from oslo_concurrency import processutils
 from oslo_log import formatters
 from oslo_log import log as logging
+from oslo_utils.fixture import uuidsentinel as uuids
 from six.moves import cStringIO
 
 from nova.compute import manager as compute_manager
@@ -31,7 +32,6 @@ from nova import context
 from nova import objects
 from nova import test
 from nova.tests.unit import fake_instance
-from nova.tests import uuidsentinel as uuids
 from nova import utils
 from nova.virt.libvirt import imagecache
 
diff --git a/nova/tests/unit/virt/libvirt/test_migration.py b/nova/tests/unit/virt/libvirt/test_migration.py
index a2a5729785..9c4d594c4b 100644
--- a/nova/tests/unit/virt/libvirt/test_migration.py
+++ b/nova/tests/unit/virt/libvirt/test_migration.py
@@ -16,6 +16,7 @@ from collections import deque
 
 from lxml import etree
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import units
 import six
 
@@ -26,7 +27,6 @@ from nova import objects
 from nova import test
 from nova.tests.unit import matchers
 from nova.tests.unit.virt.libvirt import fakelibvirt
-from nova.tests import uuidsentinel as uuids
 from nova.virt.libvirt import config as vconfig
 from nova.virt.libvirt import guest as libvirt_guest
 from nova.virt.libvirt import host
diff --git a/nova/tests/unit/virt/libvirt/test_utils.py b/nova/tests/unit/virt/libvirt/test_utils.py
index 898d517f92..c31332f3b1 100644
--- a/nova/tests/unit/virt/libvirt/test_utils.py
+++ b/nova/tests/unit/virt/libvirt/test_utils.py
@@ -22,6 +22,7 @@ import mock
 from oslo_concurrency import processutils
 from oslo_config import cfg
 from oslo_utils import fileutils
+from oslo_utils.fixture import uuidsentinel as uuids
 import six
 
 from nova import context
@@ -32,7 +33,6 @@ import nova.privsep.fs
 from nova import test
 from nova.tests.unit import fake_instance
 from nova.tests.unit.virt.libvirt import fakelibvirt
-from nova.tests import uuidsentinel as uuids
 from nova import utils
 from nova.virt.disk import api as disk
 from nova.virt import images
diff --git a/nova/tests/unit/virt/libvirt/test_vif.py b/nova/tests/unit/virt/libvirt/test_vif.py
index f472a0cbbc..320a4a6bc4 100644
--- a/nova/tests/unit/virt/libvirt/test_vif.py
+++ b/nova/tests/unit/virt/libvirt/test_vif.py
@@ -21,6 +21,7 @@ from os_vif import objects as osv_objects
 from os_vif.objects import fields as osv_fields
 from oslo_concurrency import processutils
 from oslo_config import cfg
+from oslo_utils.fixture import uuidsentinel as uuids
 import six
 
 from nova import exception
@@ -32,7 +33,6 @@ from nova import test
 from nova.tests.unit import matchers
 from nova.tests.unit.virt import fakelibosinfo
 from nova.tests.unit.virt.libvirt import fakelibvirt
-from nova.tests import uuidsentinel as uuids
 from nova import utils
 from nova.virt.libvirt import config as vconfig
 from nova.virt.libvirt import host
diff --git a/nova/tests/unit/virt/libvirt/volume/test_mount.py b/nova/tests/unit/virt/libvirt/volume/test_mount.py
index 046dc39e8e..6346aa672a 100644
--- a/nova/tests/unit/virt/libvirt/volume/test_mount.py
+++ b/nova/tests/unit/virt/libvirt/volume/test_mount.py
@@ -19,12 +19,11 @@ import time
 import eventlet
 import fixtures
 import mock
-
 from oslo_concurrency import processutils
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova import exception
 from nova import test
-from nova.tests import uuidsentinel as uuids
 from nova.virt.libvirt import config as libvirt_config
 from nova.virt.libvirt import guest as libvirt_guest
 from nova.virt.libvirt import host as libvirt_host
diff --git a/nova/tests/unit/virt/libvirt/volume/test_nfs.py b/nova/tests/unit/virt/libvirt/volume/test_nfs.py
index cf01d86667..4cb907247b 100644
--- a/nova/tests/unit/virt/libvirt/volume/test_nfs.py
+++ b/nova/tests/unit/virt/libvirt/volume/test_nfs.py
@@ -13,9 +13,9 @@
 import os
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova.tests.unit.virt.libvirt.volume import test_volume
-from nova.tests import uuidsentinel as uuids
 from nova import utils
 from nova.virt.libvirt.volume import mount
 from nova.virt.libvirt.volume import nfs
diff --git a/nova/tests/unit/virt/libvirt/volume/test_volume.py b/nova/tests/unit/virt/libvirt/volume/test_volume.py
index 847557e1ea..2c0e7de0e8 100644
--- a/nova/tests/unit/virt/libvirt/volume/test_volume.py
+++ b/nova/tests/unit/virt/libvirt/volume/test_volume.py
@@ -14,11 +14,11 @@
 #    under the License.
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova import exception
 from nova import test
 from nova.tests.unit.virt.libvirt import fakelibvirt
-from nova.tests import uuidsentinel as uuids
 from nova.virt import fake
 from nova.virt.libvirt import driver
 from nova.virt.libvirt import host
diff --git a/nova/tests/unit/virt/powervm/__init__.py b/nova/tests/unit/virt/powervm/__init__.py
index 45442e3de9..dedb6af7db 100644
--- a/nova/tests/unit/virt/powervm/__init__.py
+++ b/nova/tests/unit/virt/powervm/__init__.py
@@ -12,10 +12,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
+from oslo_utils.fixture import uuidsentinel
+
 from nova.compute import power_state
 from nova.compute import vm_states
 from nova import objects
-from nova.tests import uuidsentinel
 
 
 TEST_FLAVOR = objects.flavor.Flavor(
diff --git a/nova/tests/unit/virt/powervm/disk/test_localdisk.py b/nova/tests/unit/virt/powervm/disk/test_localdisk.py
index 69d1e156f0..072bf85578 100644
--- a/nova/tests/unit/virt/powervm/disk/test_localdisk.py
+++ b/nova/tests/unit/virt/powervm/disk/test_localdisk.py
@@ -17,13 +17,13 @@ import mock
 
 from nova import exception
 from nova import test
+from oslo_utils.fixture import uuidsentinel as uuids
 from pypowervm import const as pvm_const
 from pypowervm.tasks import storage as tsk_stg
 from pypowervm.utils import transaction as pvm_tx
 from pypowervm.wrappers import storage as pvm_stg
 from pypowervm.wrappers import virtual_io_server as pvm_vios
 
-from nova.tests import uuidsentinel as uuids
 from nova.virt.powervm.disk import driver as disk_dvr
 from nova.virt.powervm.disk import localdisk
 
diff --git a/nova/tests/unit/virt/powervm/test_media.py b/nova/tests/unit/virt/powervm/test_media.py
index ba1890d95b..dda95fa764 100644
--- a/nova/tests/unit/virt/powervm/test_media.py
+++ b/nova/tests/unit/virt/powervm/test_media.py
@@ -18,6 +18,7 @@ from __future__ import absolute_import
 
 import fixtures
 import mock
+from oslo_utils.fixture import uuidsentinel
 from pypowervm.tasks import scsi_mapper as tsk_map
 from pypowervm.tests import test_fixtures as pvm_fx
 from pypowervm.utils import transaction as pvm_tx
@@ -31,7 +32,6 @@ elif six.PY3:
     import builtins
 
 from nova import test
-from nova.tests import uuidsentinel
 from nova.virt.powervm import media as m
 
 
diff --git a/nova/tests/unit/virt/test_block_device.py b/nova/tests/unit/virt/test_block_device.py
index 11096c6d76..6ae0f5db0b 100644
--- a/nova/tests/unit/virt/test_block_device.py
+++ b/nova/tests/unit/virt/test_block_device.py
@@ -15,6 +15,7 @@
 import mock
 from os_brick import encryptors
 from oslo_serialization import jsonutils
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova import block_device
 from nova import context
@@ -25,7 +26,6 @@ from nova import test
 from nova.tests.unit import fake_block_device
 from nova.tests.unit import fake_instance
 from nova.tests.unit import matchers
-from nova.tests import uuidsentinel as uuids
 from nova.virt import block_device as driver_block_device
 from nova.virt import driver
 from nova.virt import fake as fake_virt
diff --git a/nova/tests/unit/virt/test_hardware.py b/nova/tests/unit/virt/test_hardware.py
index e4375a5ef0..15c862fd1b 100644
--- a/nova/tests/unit/virt/test_hardware.py
+++ b/nova/tests/unit/virt/test_hardware.py
@@ -17,6 +17,7 @@ import copy
 
 import mock
 from oslo_serialization import jsonutils
+from oslo_utils.fixture import uuidsentinel as uuids
 import six
 
 from nova import context
@@ -27,7 +28,6 @@ from nova.objects import fields
 from nova.pci import stats
 from nova import test
 from nova.tests.unit import fake_pci_device_pools as fake_pci
-from nova.tests import uuidsentinel as uuids
 from nova.virt import hardware as hw
 
 
diff --git a/nova/tests/unit/virt/test_imagecache.py b/nova/tests/unit/virt/test_imagecache.py
index e860df600f..10444004dc 100644
--- a/nova/tests/unit/virt/test_imagecache.py
+++ b/nova/tests/unit/virt/test_imagecache.py
@@ -13,6 +13,7 @@
 #    under the License.
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 
 from nova import block_device
 from nova.compute import vm_states
@@ -22,7 +23,6 @@ from nova import objects
 from nova.objects import block_device as block_device_obj
 from nova import test
 from nova.tests.unit import fake_instance
-from nova.tests import uuidsentinel as uuids
 from nova.virt import imagecache
 
 CONF = nova.conf.CONF
diff --git a/nova/tests/unit/virt/vmwareapi/test_configdrive.py b/nova/tests/unit/virt/vmwareapi/test_configdrive.py
index 96d98b8efe..40568445f8 100644
--- a/nova/tests/unit/virt/vmwareapi/test_configdrive.py
+++ b/nova/tests/unit/virt/vmwareapi/test_configdrive.py
@@ -15,6 +15,7 @@
 
 import fixtures
 import mock
+from oslo_utils.fixture import uuidsentinel
 
 from nova import context
 from nova.image import glance
@@ -25,7 +26,6 @@ import nova.tests.unit.image.fake
 from nova.tests.unit import utils
 from nova.tests.unit.virt.vmwareapi import fake as vmwareapi_fake
 from nova.tests.unit.virt.vmwareapi import stubs
-from nova.tests import uuidsentinel
 from nova.virt import fake
 from nova.virt.vmwareapi import driver
 from nova.virt.vmwareapi import vm_util
diff --git a/nova/tests/unit/virt/vmwareapi/test_driver_api.py b/nova/tests/unit/virt/vmwareapi/test_driver_api.py
index 53be0ee0bc..d3fd0b0838 100644
--- a/nova/tests/unit/virt/vmwareapi/test_driver_api.py
+++ b/nova/tests/unit/virt/vmwareapi/test_driver_api.py
@@ -25,6 +25,7 @@ import datetime
 from eventlet import greenthread
 import mock
 from oslo_utils import fixture as utils_fixture
+from oslo_utils.fixture import uuidsentinel
 from oslo_utils import units
 from oslo_utils import uuidutils
 from oslo_vmware import exceptions as vexc
@@ -52,7 +53,6 @@ from nova.tests.unit.objects import test_diagnostics
 from nova.tests.unit import utils
 from nova.tests.unit.virt.vmwareapi import fake as vmwareapi_fake
 from nova.tests.unit.virt.vmwareapi import stubs
-from nova.tests import uuidsentinel
 from nova.virt import driver as v_driver
 from nova.virt.vmwareapi import constants
 from nova.virt.vmwareapi import driver
@@ -66,6 +66,7 @@ from nova.virt.vmwareapi import vm_util
 from nova.virt.vmwareapi import vmops
 from nova.virt.vmwareapi import volumeops
 
+
 CONF = nova.conf.CONF
 
 HOST = 'testhostname'
diff --git a/nova/tests/unit/virt/vmwareapi/test_imagecache.py b/nova/tests/unit/virt/vmwareapi/test_imagecache.py
index 7b0a8b13e8..a5de1cecea 100644
--- a/nova/tests/unit/virt/vmwareapi/test_imagecache.py
+++ b/nova/tests/unit/virt/vmwareapi/test_imagecache.py
@@ -17,6 +17,7 @@ import datetime
 import mock
 from oslo_config import cfg
 from oslo_utils import fixture as utils_fixture
+from oslo_utils.fixture import uuidsentinel
 from oslo_vmware.objects import datastore as ds_obj
 from oslo_vmware import vim_util as vutil
 
@@ -24,10 +25,10 @@ from nova import objects
 from nova import test
 from nova.tests.unit import fake_instance
 from nova.tests.unit.virt.vmwareapi import fake
-from nova.tests import uuidsentinel
 from nova.virt.vmwareapi import ds_util
 from nova.virt.vmwareapi import imagecache
 
+
 CONF = cfg.CONF
 
 
diff --git a/nova/tests/unit/virt/vmwareapi/test_images.py b/nova/tests/unit/virt/vmwareapi/test_images.py
index 8f6015d7ba..7dd9b7b06d 100644
--- a/nova/tests/unit/virt/vmwareapi/test_images.py
+++ b/nova/tests/unit/virt/vmwareapi/test_images.py
@@ -19,6 +19,7 @@ import os
 import tarfile
 
 import mock
+from oslo_utils.fixture import uuidsentinel
 from oslo_utils import units
 from oslo_vmware import rw_handles
 
@@ -26,7 +27,6 @@ from nova import exception
 from nova import objects
 from nova import test
 import nova.tests.unit.image.fake
-from nova.tests import uuidsentinel
 from nova.virt.vmwareapi import constants
 from nova.virt.vmwareapi import images
 from nova.virt.vmwareapi import vm_util
diff --git a/nova/tests/unit/virt/vmwareapi/test_vmops.py b/nova/tests/unit/virt/vmwareapi/test_vmops.py
index db72fe3a36..e015da0a8f 100644
--- a/nova/tests/unit/virt/vmwareapi/test_vmops.py
+++ b/nova/tests/unit/virt/vmwareapi/test_vmops.py
@@ -17,6 +17,7 @@ import time
 
 import mock
 from oslo_serialization import jsonutils
+from oslo_utils.fixture import uuidsentinel
 from oslo_utils import units
 from oslo_utils import uuidutils
 from oslo_vmware import exceptions as vexc
@@ -35,7 +36,6 @@ from nova.tests.unit import fake_instance
 import nova.tests.unit.image.fake
 from nova.tests.unit.virt.vmwareapi import fake as vmwareapi_fake
 from nova.tests.unit.virt.vmwareapi import stubs
-from nova.tests import uuidsentinel
 from nova import utils
 from nova import version
 from nova.virt import hardware
diff --git a/nova/tests/unit/virt/vmwareapi/test_volumeops.py b/nova/tests/unit/virt/vmwareapi/test_volumeops.py
index 450a38ded0..8ab8dd1a2d 100644
--- a/nova/tests/unit/virt/vmwareapi/test_volumeops.py
+++ b/nova/tests/unit/virt/vmwareapi/test_volumeops.py
@@ -13,6 +13,7 @@
 #    under the License.
 
 import mock
+from oslo_utils.fixture import uuidsentinel
 from oslo_vmware import exceptions as oslo_vmw_exceptions
 from oslo_vmware import vim_util as vutil
 
@@ -25,7 +26,6 @@ from nova.tests.unit import fake_instance
 from nova.tests.unit.image import fake as image_fake
 from nova.tests.unit.virt.vmwareapi import fake as vmwareapi_fake
 from nova.tests.unit.virt.vmwareapi import stubs
-from nova.tests import uuidsentinel
 from nova.virt.vmwareapi import constants
 from nova.virt.vmwareapi import driver
 from nova.virt.vmwareapi import vm_util
diff --git a/nova/tests/unit/virt/xenapi/test_driver.py b/nova/tests/unit/virt/xenapi/test_driver.py
index 551b334a35..507b1ad17d 100644
--- a/nova/tests/unit/virt/xenapi/test_driver.py
+++ b/nova/tests/unit/virt/xenapi/test_driver.py
@@ -16,13 +16,13 @@
 import math
 
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import units
 
 from nova import exception
 from nova.objects import fields as obj_fields
 from nova import rc_fields
 from nova.tests.unit.virt.xenapi import stubs
-from nova.tests import uuidsentinel as uuids
 from nova.virt import driver
 from nova.virt import fake
 from nova.virt import xenapi
diff --git a/nova/tests/unit/virt/xenapi/test_vm_utils.py b/nova/tests/unit/virt/xenapi/test_vm_utils.py
index 77a1bc0fdc..0815d508c0 100644
--- a/nova/tests/unit/virt/xenapi/test_vm_utils.py
+++ b/nova/tests/unit/virt/xenapi/test_vm_utils.py
@@ -20,6 +20,7 @@ from oslo_concurrency import lockutils
 from oslo_concurrency import processutils
 from oslo_config import fixture as config_fixture
 from oslo_utils import fixture as utils_fixture
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils
 from oslo_utils import uuidutils
 import six
@@ -36,7 +37,6 @@ from nova.tests.unit import fake_flavor
 from nova.tests.unit import fake_instance
 from nova.tests.unit.objects import test_flavor
 from nova.tests.unit.virt.xenapi import stubs
-from nova.tests import uuidsentinel as uuids
 from nova.virt import hardware
 from nova.virt.xenapi import driver as xenapi_conn
 from nova.virt.xenapi import fake
diff --git a/nova/tests/unit/virt/xenapi/test_vmops.py b/nova/tests/unit/virt/xenapi/test_vmops.py
index 6c52aa102a..e3215c6cca 100644
--- a/nova/tests/unit/virt/xenapi/test_vmops.py
+++ b/nova/tests/unit/virt/xenapi/test_vmops.py
@@ -26,6 +26,7 @@ from eventlet import greenthread
 import fixtures
 import mock
 from os_xenapi.client import host_xenstore
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import importutils
 from oslo_utils import timeutils
 import six
@@ -41,7 +42,6 @@ from nova import test
 from nova.tests.unit import fake_flavor
 from nova.tests.unit import fake_instance
 from nova.tests.unit.virt.xenapi import stubs
-from nova.tests import uuidsentinel as uuids
 from nova import utils
 from nova.virt import fake
 from nova.virt.xenapi import agent as xenapi_agent
diff --git a/nova/tests/unit/virt/xenapi/test_xenapi.py b/nova/tests/unit/virt/xenapi/test_xenapi.py
index 33f355ce38..f9ce7bf7c0 100644
--- a/nova/tests/unit/virt/xenapi/test_xenapi.py
+++ b/nova/tests/unit/virt/xenapi/test_xenapi.py
@@ -30,6 +30,7 @@ from oslo_concurrency import lockutils
 from oslo_config import fixture as config_fixture
 from oslo_log import log as logging
 from oslo_serialization import jsonutils
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import importutils
 from oslo_utils import uuidutils
 import testtools
@@ -64,7 +65,6 @@ from nova.tests.unit.objects import test_aggregate
 from nova.tests.unit.objects import test_diagnostics
 from nova.tests.unit import utils as test_utils
 from nova.tests.unit.virt.xenapi import stubs
-from nova.tests import uuidsentinel as uuids
 from nova.virt import fake
 from nova.virt.xenapi import agent
 from nova.virt.xenapi import driver as xenapi_conn
diff --git a/nova/tests/unit/virt/zvm/test_driver.py b/nova/tests/unit/virt/zvm/test_driver.py
index 35f481665e..d00da4581c 100644
--- a/nova/tests/unit/virt/zvm/test_driver.py
+++ b/nova/tests/unit/virt/zvm/test_driver.py
@@ -15,6 +15,7 @@
 import copy
 import mock
 import os
+from oslo_utils.fixture import uuidsentinel
 import six
 
 from nova import conf
@@ -24,7 +25,6 @@ from nova.network import model as network_model
 from nova import objects
 from nova import test
 from nova.tests.unit import fake_instance
-from nova.tests import uuidsentinel
 from nova.virt import fake
 from nova.virt.zvm import driver as zvmdriver
 
diff --git a/nova/tests/unit/volume/test_cinder.py b/nova/tests/unit/volume/test_cinder.py
index 9af5af994e..37b165a358 100644
--- a/nova/tests/unit/volume/test_cinder.py
+++ b/nova/tests/unit/volume/test_cinder.py
@@ -20,6 +20,7 @@ from keystoneauth1 import loading as ks_loading
 from keystoneauth1 import session
 from keystoneclient import exceptions as keystone_exception
 import mock
+from oslo_utils.fixture import uuidsentinel as uuids
 from oslo_utils import timeutils
 import six
 
@@ -28,9 +29,9 @@ from nova import context
 from nova import exception
 from nova import test
 from nova.tests.unit.fake_instance import fake_instance_obj
-from nova.tests import uuidsentinel as uuids
 from nova.volume import cinder
 
+
 CONF = nova.conf.CONF
 
 
diff --git a/nova/tests/uuidsentinel.py b/nova/tests/uuidsentinel.py
deleted file mode 100644
index 5fb7abe431..0000000000
--- a/nova/tests/uuidsentinel.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-import sys
-
-
-class UUIDSentinels(object):
-    def __init__(self):
-        from oslo_utils import uuidutils
-        self._uuid_module = uuidutils
-        self._sentinels = {}
-
-    def __getattr__(self, name):
-        if name.startswith('_'):
-            raise ValueError('Sentinels must not start with _')
-        if name not in self._sentinels:
-            self._sentinels[name] = self._uuid_module.generate_uuid()
-        return self._sentinels[name]
-
-
-sys.modules[__name__] = UUIDSentinels()
author	Eric Fried <efried@us.ibm.com>	2018-09-05 09:08:54 -0500
committer	Eric Fried <efried@us.ibm.com>	2018-09-05 09:08:54 -0500
commit	8e1ca5bf34f924b9a23ddbcf31ae727a7dcacb20 (patch)
tree	6f66cb4b700db568c1b8c4ae304943c9611d06fe /nova/tests
parent	0f102089dd0b27c7d35f0cbba87332414032c0a4 (diff)
download	nova-8e1ca5bf34f924b9a23ddbcf31ae727a7dcacb20.tar.gz