diff --git a/lower-constraints.txt b/lower-constraints.txt index 6860ddc09..8181030bb 100644 --- a/lower-constraints.txt +++ b/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 diff --git a/placement/tests/functional/db/test_allocation_candidates.py b/placement/tests/functional/db/test_allocation_candidates.py index c8aad417f..5680559fc 100644 --- a/placement/tests/functional/db/test_allocation_candidates.py +++ b/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 diff --git a/placement/tests/functional/db/test_base.py b/placement/tests/functional/db/test_base.py index 076faed7d..cf4b7c422 100644 --- a/placement/tests/functional/db/test_base.py +++ b/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): diff --git a/placement/tests/functional/db/test_consumer.py b/placement/tests/functional/db/test_consumer.py index 64d6f89e7..706bbbb71 100644 --- a/placement/tests/functional/db/test_consumer.py +++ b/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 diff --git a/placement/tests/functional/db/test_project.py b/placement/tests/functional/db/test_project.py index 96687815f..21c42bb31 100644 --- a/placement/tests/functional/db/test_project.py +++ b/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): diff --git a/placement/tests/functional/db/test_reshape.py b/placement/tests/functional/db/test_reshape.py index 9bd4a7291..ceee41581 100644 --- a/placement/tests/functional/db/test_reshape.py +++ b/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): diff --git a/placement/tests/functional/db/test_resource_provider.py b/placement/tests/functional/db/test_resource_provider.py index 6e7e1464b..002b68847 100644 --- a/placement/tests/functional/db/test_resource_provider.py +++ b/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( diff --git a/placement/tests/functional/db/test_user.py b/placement/tests/functional/db/test_user.py index b61920ccd..81706faa5 100644 --- a/placement/tests/functional/db/test_user.py +++ b/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): diff --git a/placement/tests/functional/fixtures/gabbits.py b/placement/tests/functional/fixtures/gabbits.py index af23f21cd..547ed1a91 100644 --- a/placement/tests/functional/fixtures/gabbits.py +++ b/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 diff --git a/placement/tests/functional/test_direct.py b/placement/tests/functional/test_direct.py index 94ec431a6..d0e79dddd 100644 --- a/placement/tests/functional/test_direct.py +++ b/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 diff --git a/placement/tests/unit/objects/test_resource_provider.py b/placement/tests/unit/objects/test_resource_provider.py index fcfb8b510..ebc2227ae 100644 --- a/placement/tests/unit/objects/test_resource_provider.py +++ b/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' diff --git a/placement/tests/unit/test_handler.py b/placement/tests/unit/test_handler.py index 0ab55c391..230b3572d 100644 --- a/placement/tests/unit/test_handler.py +++ b/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 diff --git a/placement/tests/unit/test_util.py b/placement/tests/unit/test_util.py index 6f33de8ce..403c77194 100644 --- a/placement/tests/unit/test_util.py +++ b/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 diff --git a/requirements.txt b/requirements.txt index f292856ad..15704145d 100644 --- a/requirements.txt +++ b/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