openstack
/
nova
Code Issues Proposed changes

objects: remove field ListOfEnumField 

Commit 1a5dff21da introduces
new field ListOfEnumField to handle cpu arch but was never
used.

This commit remove it

Change-Id: I8223e2965df05b6bc762145050cb9a6594f2bf75
This commit is contained in:
Sahid Orentino Ferdjaoui 2015-04-07 12:41:36 -04:00 committed by sahid
parent c3a85120c7
commit d5687c71db
2 changed files with 0 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
nova/objects/fields.py
View File

@ -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())

23
nova/tests/unit/objects/test_fields.py
View File

@ -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()