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
This commit is contained in:
Eric Fried 2018-09-05 09:08:54 -05:00
parent 0f102089dd
commit 8e1ca5bf34
194 changed files with 245 additions and 255 deletions

View File

@ -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

View File

@ -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

View File

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

View File

@ -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

View File

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

View File

@ -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

View File

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

View File

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

View File

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

View File

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

View File

@ -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

View File

@ -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

View File

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

View File

@ -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

View File

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

View File

@ -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

View File

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

View File

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

View File

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

View File

@ -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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

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

View File

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

View File

@ -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

View File

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

View File

@ -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

View File

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

View File

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

View File

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

View File

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

View File

@ -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

View File

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

View File

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

View File

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

View File

@ -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

View File

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

View File

@ -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

View File

@ -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

View File

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

View File

@ -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

View File

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

View File

@ -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

View File

@ -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

View File

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

View File

@ -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

View File

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

View File

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

View File

@ -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

View File

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

View File

@ -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.

View File

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

View File

@ -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

View File

@ -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

View File

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

View File

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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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

View File

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

View File

@ -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

View File

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

View File

@ -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

View File

@ -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

View File

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

View File

@ -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

View File

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

View File

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

View File

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

View File

@ -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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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

View File

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

Some files were not shown because too many files have changed in this diff Show More