diff options
Diffstat (limited to 'nova/objects')
| -rw-r--r-- | nova/objects/base.py | 1 | ||||
| -rw-r--r-- | nova/objects/instance.py | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/nova/objects/base.py b/nova/objects/base.py index 1ba0f03b7..b263b14e4 100644 --- a/nova/objects/base.py +++ b/nova/objects/base.py @@ -180,6 +180,7 @@ class NovaObject(object): 'created_at': obj_utils.datetime_or_str_or_none, 'updated_at': obj_utils.datetime_or_str_or_none, 'deleted_at': obj_utils.datetime_or_str_or_none, + 'deleted': bool, } def __init__(self): diff --git a/nova/objects/instance.py b/nova/objects/instance.py index dbf9786df..0489f1374 100644 --- a/nova/objects/instance.py +++ b/nova/objects/instance.py @@ -149,7 +149,10 @@ class Instance(base.NovaObject): for field in instance.fields: if field in ['metadata', 'system_metadata']: continue - instance[field] = db_inst[field] + elif field == 'deleted': + instance.deleted = db_inst['deleted'] == db_inst['id'] + else: + instance[field] = db_inst[field] if 'metadata' in expected_attrs: instance['metadata'] = utils.metadata_to_dict(db_inst['metadata']) |