diff --git a/ironic/objects/base.py b/ironic/objects/base.py index 8324fcd14c..0613cd2d99 100644 --- a/ironic/objects/base.py +++ b/ironic/objects/base.py @@ -177,8 +177,6 @@ class IronicObject(object): fields = { 'created_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): diff --git a/ironic/tests/objects/test_objects.py b/ironic/tests/objects/test_objects.py index a09b9e3fad..102141c266 100644 --- a/ironic/tests/objects/test_objects.py +++ b/ironic/tests/objects/test_objects.py @@ -358,16 +358,15 @@ class _TestObject(object): obj = MyObj() obj.created_at = dt obj.updated_at = dt - obj.deleted_at = None expected = {'ironic_object.name': 'MyObj', 'ironic_object.namespace': 'ironic', 'ironic_object.version': '1.5', 'ironic_object.changes': - ['created_at', 'deleted_at', 'updated_at'], + ['created_at', 'updated_at'], 'ironic_object.data': {'created_at': timeutils.isotime(dt), 'updated_at': timeutils.isotime(dt), - 'deleted_at': None} + } } self.assertEqual(obj.obj_to_primitive(), expected)