From 83b5c423a5612e3aa3fad8ae163b87654ea51e41 Mon Sep 17 00:00:00 2001 From: Ryan Rossiter Date: Fri, 13 Nov 2015 21:14:23 +0000 Subject: [PATCH] Use o.vo DictOfListOfStringsField As of o.vo 0.7.0, there has been a DictOfListOfStringsField. So change over nova's field to use o.vo's. Change-Id: Ib2a50adf272e026be2035a153ad920865f98ace1 --- nova/objects/fields.py | 6 +----- nova/tests/unit/objects/test_fields.py | 16 ---------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/nova/objects/fields.py b/nova/objects/fields.py index 25d5a0b4a5..10cfe807cd 100644 --- a/nova/objects/fields.py +++ b/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() diff --git a/nova/tests/unit/objects/test_fields.py b/nova/tests/unit/objects/test_fields.py index 0a3f01cca9..af162c10a5 100644 --- a/nova/tests/unit/objects/test_fields.py +++ b/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()