Merge "Use o.vo DictOfListOfStringsField"

nova/objects/fields.py

@@ -57,6 +57,7 @@ ObjectField = fields.ObjectField
 ListOfObjectsField = fields.ListOfObjectsField
 VersionPredicateField = fields.VersionPredicateField
 FlexibleBooleanField = fields.FlexibleBooleanField
+DictOfListOfStringsField = fields.DictOfListOfStringsField
 
 
 # NOTE(danms): These are things we need to import for some of our
@@ -687,11 +688,6 @@ class ListOfIntegersField(AutoTypedField):
     AUTO_TYPE = List(fields.Integer())
 
 
-# FIXME(sbauza): Remove this after oslo.versionedobjects releases it
-class DictOfListOfStringsField(AutoTypedField):
-    AUTO_TYPE = Dict(List(fields.String()))
-
-
 class NonNegativeFloatField(AutoTypedField):
     AUTO_TYPE = NonNegativeFloat()
 

nova/tests/unit/objects/test_fields.py

@@ -840,22 +840,6 @@ class TestListOfSetsOfIntegers(TestField):
         self.assertEqual('[set([1,2])]', self.field.stringify([set([1, 2])]))
 
 
-class TestDictOfListOfStrings(TestField):
-    def setUp(self):
-        super(TestDictOfListOfStrings, self).setUp()
-        self.field = fields.DictOfListOfStringsField()
-        self.coerce_good_values = [({'foo': ['1', '2']}, {'foo': ['1', '2']}),
-                                   ({'foo': [1]}, {'foo': ['1']})]
-        self.coerce_bad_values = [{'foo': [None, None]}, 'foo']
-        self.to_primitive_values = [({'foo': ['1', '2']}, {'foo': ['1', '2']})]
-        self.from_primitive_values = [({'foo': ['1', '2']},
-                                       {'foo': ['1', '2']})]
-
-    def test_stringify(self):
-        self.assertEqual("{foo=['1','2']}",
-                         self.field.stringify({'foo': ['1', '2']}))
-
-
 class TestNetworkModel(TestField):
     def setUp(self):
         super(TestNetworkModel, self).setUp()