diff options
| author | Dan Smith <danms@us.ibm.com> | 2013-06-05 16:54:31 -0700 |
|---|---|---|
| committer | Dan Smith <danms@us.ibm.com> | 2013-06-07 11:37:38 -0700 |
| commit | 91ac85ce82bc6d050b1152dd7af8851b43b01ea5 (patch) | |
| tree | 99c7e7dbd889283b71957a0ff409da886d73e6cc /nova/objects | |
| parent | 3100abbd9d15496a9c6eb16c3b4a7be2b2208c59 (diff) | |
Add deleted flag to NovaObject base
This is present in NovaBase for the SQLAlchemy objects, and is
expected to be in the NovaObjects as well.
Related to blueprint unified-object-model
Change-Id: I1698d5a986d17899dfcefb9ec65d6b2623af2da3
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']) |