From d5687c71db43fd49f9a55ba3e5ca97537e540c06 Mon Sep 17 00:00:00 2001 From: Sahid Orentino Ferdjaoui Date: Tue, 7 Apr 2015 12:41:36 -0400 Subject: [PATCH] objects: remove field ListOfEnumField Commit 1a5dff21daab08499426d118f4dfa3e5dfe26154 introduces new field ListOfEnumField to handle cpu arch but was never used. This commit remove it Change-Id: I8223e2965df05b6bc762145050cb9a6594f2bf75 --- nova/objects/fields.py | 19 ------------------- nova/tests/unit/objects/test_fields.py | 23 ----------------------- 2 files changed, 42 deletions(-) diff --git a/nova/objects/fields.py b/nova/objects/fields.py index 1198094e8d13..226923652bc7 100644 --- a/nova/objects/fields.py +++ b/nova/objects/fields.py @@ -693,25 +693,6 @@ class ListOfStringsField(AutoTypedField): AUTO_TYPE = List(String()) -class ListOfEnumField(AutoTypedField): - def __init__(self, valid_values, **kwargs): - self.AUTO_TYPE = List(Enum(valid_values=valid_values)) - super(ListOfEnumField, self).__init__(**kwargs) - - def __repr__(self): - valid_values = self._type._element_type._type._valid_values - args = { - 'nullable': self._nullable, - 'default': self._default, - } - if valid_values: - args.update({'valid_values': valid_values}) - args = OrderedDict(sorted(args.items())) - return '%s(%s)' % (self._type.__class__.__name__, - ','.join(['%s=%s' % (k, v) - for k, v in args.items()])) - - class SetOfIntegersField(AutoTypedField): AUTO_TYPE = Set(Integer()) diff --git a/nova/tests/unit/objects/test_fields.py b/nova/tests/unit/objects/test_fields.py index efa68beaa580..38ae25f72940 100644 --- a/nova/tests/unit/objects/test_fields.py +++ b/nova/tests/unit/objects/test_fields.py @@ -317,29 +317,6 @@ class TestListOfStrings(TestField): self.assertEqual("['abc']", self.field.stringify(['abc'])) -class TestListOfEnum(TestField): - def setUp(self): - super(TestListOfEnum, self).setUp() - self.field = fields.ListOfEnumField(valid_values=['foo', 'bar']) - self.coerce_good_values = [(['foo', 'bar'], ['foo', 'bar'])] - self.coerce_bad_values = ['foo', ['foo', 'bar1']] - self.to_primitive_values = [(['foo'], ['foo'])] - self.from_primitive_values = [(['foo'], ['foo'])] - - def test_stringify(self): - self.assertEqual("['foo']", self.field.stringify(['foo'])) - - def test_stringify_invalid(self): - self.assertRaises(ValueError, self.field.stringify, '[abc]') - - def test_fingerprint(self): - # Notes(yjiang5): make sure changing valid_value will be detected - # in test_objects.test_versions - field1 = fields.ListOfEnumField(valid_values=['foo', 'bar']) - field2 = fields.ListOfEnumField(valid_values=['foo', 'bar1']) - self.assertNotEqual(str(field1), str(field2)) - - class TestSet(TestField): def setUp(self): super(TestSet, self).setUp()