From e36915451ae230c719edbb482af7944400433ede Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Wed, 6 Nov 2019 16:33:35 -0500 Subject: [PATCH] Use ListOfUUIDField from oslo.versionedobjects This replaces the in-tree definition of the ListOfUUIDField field with the one from oslo.versionedobjects added in 1.35.0 [1]. Note that lower-constraints and requirements.txt already use 1.35.0. [1] https://review.opendev.org/#/c/634700/ Change-Id: Ia23f39ad44383af1d85329b61142c646e4a5f464 --- nova/objects/fields.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nova/objects/fields.py b/nova/objects/fields.py index 37a621254c..314565f989 100644 --- a/nova/objects/fields.py +++ b/nova/objects/fields.py @@ -47,6 +47,7 @@ DictOfStringsField = fields.DictOfStringsField DictOfNullableStringsField = fields.DictOfNullableStringsField DictOfIntegersField = fields.DictOfIntegersField ListOfStringsField = fields.ListOfStringsField +ListOfUUIDField = fields.ListOfUUIDField SetOfIntegersField = fields.SetOfIntegersField ListOfSetsOfIntegersField = fields.ListOfSetsOfIntegersField ListOfDictOfNullableStringsField = fields.ListOfDictOfNullableStringsField @@ -1278,11 +1279,5 @@ class ListOfListsOfStringsField(AutoTypedField): AUTO_TYPE = List(List(fields.String())) -# TODO(mriedem): Replace this with the version from oslo.versiondobjects -# when https://review.opendev.org/#/c/634700/ is released. -class ListOfUUIDField(AutoTypedField): - AUTO_TYPE = List(fields.UUID()) - - class DictOfSetOfIntegersField(AutoTypedField): AUTO_TYPE = Dict(Set(fields.Integer()))