diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-11 22:42:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-11 22:42:54 +0000 |
| commit | 2dd6adac8304547fbb2d80b1c4ef659e53048cf9 (patch) | |
| tree | a0878ec9d420929ad11313e250884fa3245e5436 /nova/objects | |
| parent | 1d2e0fa313bb9e93291754c7b900b9ddba4d43e4 (diff) | |
| parent | 91ac85ce82bc6d050b1152dd7af8851b43b01ea5 (diff) | |
| download | nova-2dd6adac8304547fbb2d80b1c4ef659e53048cf9.tar.gz nova-2dd6adac8304547fbb2d80b1c4ef659e53048cf9.tar.xz nova-2dd6adac8304547fbb2d80b1c4ef659e53048cf9.zip | |
Merge "Add deleted flag to NovaObject base"
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']) |