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

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

View File

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

View File

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

View File

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

View File

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

View File

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