openstack/ironic
Code Issues Proposed changes

Merge "Remove deleted[_at] from base object."

Browse Source
This commit is contained in:
Jenkins
2013-06-12 00:07:21 +00:00
committed by Gerrit Code Review
parent bf85f7643f 65e0349786
commit 9d80a7171b
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ironic/objects/base.py
View File

@@ -177,8 +177,6 @@ class IronicObject(object):
fields = { fields = {
'created_at': obj_utils.datetime_or_none, 'created_at': obj_utils.datetime_or_none,
'updated_at': obj_utils.datetime_or_none, 'updated_at': obj_utils.datetime_or_none,
'deleted_at': obj_utils.datetime_or_none,
'deleted': int,
} }
def __init__(self): def __init__(self):

5
ironic/tests/objects/test_objects.py
View File

@@ -358,16 +358,15 @@ class _TestObject(object):
obj = MyObj() obj = MyObj()
obj.created_at = dt obj.created_at = dt
obj.updated_at = dt obj.updated_at = dt
obj.deleted_at = None
expected = {'ironic_object.name': 'MyObj', expected = {'ironic_object.name': 'MyObj',
'ironic_object.namespace': 'ironic', 'ironic_object.namespace': 'ironic',
'ironic_object.version': '1.5', 'ironic_object.version': '1.5',
'ironic_object.changes': 'ironic_object.changes':
['created_at', 'deleted_at', 'updated_at'], ['created_at', 'updated_at'],
'ironic_object.data': 'ironic_object.data':
{'created_at': timeutils.isotime(dt), {'created_at': timeutils.isotime(dt),
'updated_at': timeutils.isotime(dt), 'updated_at': timeutils.isotime(dt),
'deleted_at': None} }
} }
self.assertEqual(obj.obj_to_primitive(), expected) self.assertEqual(obj.obj_to_primitive(), expected)