Use uuidsentinel from oslo.utils

oslo.utils release 3.37.0 [1] introduced uuidsentinel [2]. This change
rips out placement'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/

Depends-On: https://review.openstack.org/600041
Change-Id: Iac8952e46e382d4380af380151cad483a31dfce3

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

placement/tests/functional/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 placement import lib as placement_lib
 from placement.objects import resource_provider as rp_obj
 from placement import rc_fields as fields
 from placement.tests.functional.db import test_base as tb
-from placement.tests import uuidsentinel as uuids
 
 
 CONF = cfg.CONF

placement/tests/functional/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 placement import exception
@@ -20,7 +20,6 @@ from placement.objects import project as project_obj
 from placement.objects import resource_provider as rp_obj
 from placement.objects import user as user_obj
 from placement.tests.functional import base
-from placement.tests import uuidsentinel as uuids
 
 
 def create_provider(context, name, *aggs, **kwargs):

placement/tests/functional/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 placement import db_api
@@ -22,7 +23,7 @@ from placement.objects import user as user_obj
 from placement import rc_fields as fields
 from placement.tests.functional import base
 from placement.tests.functional.db import test_base as tb
-from placement.tests import uuidsentinel as uuids
+
 
 CONF = cfg.CONF
 CONSUMER_TBL = consumer_obj.CONSUMER_TBL

placement/tests/functional/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 placement import exception
 from placement.objects import project as project_obj
 from placement.tests.functional.db import test_base as tb
-from placement.tests import uuidsentinel as uuids
 
 
 class ProjectTestCase(tb.PlacementDbBaseTestCase):

placement/tests/functional/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 placement import exception
 from placement.objects import consumer as consumer_obj
 from placement.objects import resource_provider as rp_obj
 from placement.tests.functional.db import test_base as tb
-from placement.tests import uuidsentinel as uuids
 
 
 def alloc_for_rc(alloc_list, rc):

placement/tests/functional/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 placement
@@ -24,7 +25,6 @@ from placement.objects import consumer as consumer_obj
 from placement.objects import resource_provider as rp_obj
 from placement import rc_fields as fields
 from placement.tests.functional.db import test_base as tb
-from placement.tests import uuidsentinel
 
 
 DISK_INVENTORY = dict(

placement/tests/functional/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 placement import exception
 from placement.objects import user as user_obj
 from placement.tests.functional.db import test_base as tb
-from placement.tests import uuidsentinel as uuids
 
 
 class UserTestCase(tb.PlacementDbBaseTestCase):

placement/tests/functional/fixtures/gabbits.py

@@ -18,6 +18,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
 
@@ -32,7 +33,6 @@ from placement.tests import fixtures
 from placement.tests.functional.db import test_base as tb
 from placement.tests.functional.fixtures import capture
 from placement.tests.unit import policy_fixture
-from placement.tests import uuidsentinel as uuids
 
 
 CONF = cfg.CONF

placement/tests/functional/test_direct.py

@@ -11,10 +11,10 @@
 #    under the License.
 
 from oslo_config import cfg
+from oslo_utils.fixture import uuidsentinel
 
 from placement import direct
 from placement.tests.functional import base
-from placement.tests import uuidsentinel
 
 
 CONF = cfg.CONF

placement/tests/unit/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 placement import context
 from placement import exception
 from placement.objects import resource_provider
 from placement import rc_fields as fields
-from placement.tests import uuidsentinel as uuids
 
 
 _RESOURCE_CLASS_NAME = 'DISK_GB'

placement/tests/unit/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 placement import handler
 from placement.handlers import root
 from placement import microversion
-from placement.tests import uuidsentinel
 
 
 # Used in tests below

placement/tests/unit/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
@@ -33,9 +34,9 @@ from placement.objects import consumer as consumer_obj
 from placement.objects import project as project_obj
 from placement.objects import resource_provider as rp_obj
 from placement.objects import user as user_obj
-from placement.tests import uuidsentinel
 from placement import util
 
+
 CONF = cfg.CONF
 
 

requirements.txt

@@ -17,7 +17,7 @@ oslo.config>=6.1.0 # Apache-2.0
 oslo.context>=2.19.2 # 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
 oslo.db>=4.40.0 # Apache-2.0
 oslo.policy>=1.35.0 # Apache-2.0
 oslo.i18n>=3.15.3 # Apache-2.0