Remove ObjectListBase

ObjectListBase is not used in Ironic at the moment, we should add it
when it is necessary.

Partial-Bug: #1488270
Change-Id: Ifc2aaa1fa09d95f1cfa6ed488f10871666b7fb3d
This commit is contained in:
Lin Tan
2015-08-25 10:46:40 +08:00
parent d9fccbd5ab
commit 6186a9de2a
2 changed files with 2 additions and 31 deletions

View File

@@ -412,14 +412,6 @@ class IronicObject(object_base.VersionedObjectDictCompat):
self[field] = loaded_object[field]
class ObjectListBase(object_base.ObjectListBase):
# NOTE(lintan): These are for transition to using the oslo base object
# and can be removed when we move to it.
fields = {
'objects': list,
}
class IronicObjectSerializer(object_base.VersionedObjectSerializer):
# Base class to use for object hydration
OBJ_BASE_CLASS = IronicObject
@@ -428,12 +420,9 @@ class IronicObjectSerializer(object_base.VersionedObjectSerializer):
def obj_to_primitive(obj):
"""Recursively turn an object into a python primitive.
An IronicObject becomes a dict, and anything that implements ObjectListBase
becomes a list.
An IronicObject becomes a dict
"""
if isinstance(obj, ObjectListBase):
return [obj_to_primitive(x) for x in obj]
elif isinstance(obj, IronicObject):
if isinstance(obj, IronicObject):
result = {}
for key, value in obj.items():
result[key] = obj_to_primitive(value)

View File

@@ -142,13 +142,6 @@ class TestUtils(test_base.TestCase):
self.assertIsNone(utils.dt_deserializer(None, None))
self.assertRaises(ValueError, utils.dt_deserializer, None, 'foo')
def test_obj_to_primitive_list(self):
class MyList(base.ObjectListBase, base.IronicObject):
pass
mylist = MyList(self.context)
mylist.objects = [1, 2, 3]
self.assertEqual([1, 2, 3], base.obj_to_primitive(mylist))
def test_obj_to_primitive_dict(self):
myobj = MyObj(self.context)
myobj.foo = 1
@@ -156,17 +149,6 @@ class TestUtils(test_base.TestCase):
self.assertEqual({'foo': 1, 'bar': 'foo'},
base.obj_to_primitive(myobj))
def test_obj_to_primitive_recursive(self):
class MyList(base.ObjectListBase, base.IronicObject):
pass
mylist = MyList(self.context)
mylist.objects = [MyObj(self.context), MyObj(self.context)]
for i, value in enumerate(mylist):
value.foo = i
self.assertEqual([{'foo': 0}, {'foo': 1}],
base.obj_to_primitive(mylist))
class _BaseTestCase(test_base.TestCase):
def setUp(self):