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

lower-constraints.txt

@@ -90,7 +90,7 @@ oslo.reports==1.18.0
 oslo.rootwrap==5.8.0
 oslo.serialization==2.18.0
 oslo.service==1.24.0
-oslo.utils==3.33.0
+oslo.utils==3.37.0
 oslo.versionedobjects==1.31.2
 oslo.vmware==2.17.0
 oslotest==3.2.0

nova/test.py

@@ -42,6 +42,7 @@ from oslo_config import fixture as config_fixture
 from oslo_log.fixture import logging_error as log_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 timeutils
 from oslo_versionedobjects import fixture as ovo_fixture
 from oslotest import mock_fixture
@@ -60,7 +61,6 @@ from nova.objects import base as objects_base
 from nova.tests import fixtures as nova_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
 from nova.virt import images
 

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

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

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

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

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

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

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(

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

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

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

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

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

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

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

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

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

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

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

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'}

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'

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

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

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

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

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

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
 
 

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
 

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
 

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
 

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

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

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

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'

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

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'

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'

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

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",

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

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

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 = [

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'
 

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
 

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'

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

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
 

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,

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
 

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

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

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
 

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

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

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'

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

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

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 = {

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.

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'

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

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