Use uuidsentinel from oslo.utils
A recent nova change [1] removing uuidsentinel (which is now found in oslo.utils) broke our UTs. This changes our code to use oslo.utils, fixing the issue. [1] 8e1ca5bf34f924b9a23ddbcf31ae727a7dcacb20 Change-Id: Ic314f975c4206a73d2ddd3608181cddc43604f59
This commit is contained in:
parent
1b698fb77a
commit
b9338ee261
|
@ -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
|
||||
|
|
|
@ -19,7 +19,7 @@ import mock
|
|||
|
||||
from nova import exception as nova_exc
|
||||
from nova import test
|
||||
from nova.tests import uuidsentinel as uuids
|
||||
from oslo_utils.fixture import uuidsentinel as uuids
|
||||
from pypowervm import const as pvm_const
|
||||
from pypowervm.tasks import storage as tsk_stor
|
||||
from pypowervm.tests import test_fixtures as pvm_fx
|
||||
|
|
|
@ -30,13 +30,13 @@ from nova import objects
|
|||
from nova.objects import base as obj_base
|
||||
from nova.objects import block_device as bdmobj
|
||||
from nova import test
|
||||
from nova.tests import uuidsentinel as uuids
|
||||
from nova.virt import block_device as nova_virt_bdm
|
||||
from nova.virt import driver as virt_driver
|
||||
from nova.virt import fake
|
||||
from nova.virt import hardware
|
||||
from nova.virt.powervm_ext import driver
|
||||
from oslo_serialization import jsonutils
|
||||
from oslo_utils.fixture import uuidsentinel as uuids
|
||||
from pypowervm import adapter as pvm_adp
|
||||
from pypowervm import const as pvm_const
|
||||
from pypowervm import exceptions as pvm_exc
|
||||
|
|
|
@ -7,7 +7,7 @@ six>=1.10.0 # MIT
|
|||
oslo.config>=5.2.0 # Apache-2.0
|
||||
oslo.log>=3.36.0 # Apache-2.0
|
||||
oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
|
||||
oslo.utils>=3.33.0 # Apache-2.0
|
||||
oslo.utils>=3.37.0 # Apache-2.0
|
||||
pypowervm>=1.1.16 # Apache-2.0
|
||||
python-swiftclient>=3.2.0 # Apache-2.0
|
||||
taskflow>=2.16.0 # Apache-2.0
|
||||
|
|
Loading…
Reference in New Issue