diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-27 18:55:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-27 18:55:43 +0000 |
| commit | 50735046421fdfa311153e17563e8514e0e7867d (patch) | |
| tree | df81be58ab64f1212df75f6b7e35a02931547b8d /nova/utils.py | |
| parent | ff1cc9caae32b28030ce9cb1bb9416cb37b182e8 (diff) | |
| parent | 8596f8b294e552873a29b6861bae4aa794d92b31 (diff) | |
| download | nova-50735046421fdfa311153e17563e8514e0e7867d.tar.gz nova-50735046421fdfa311153e17563e8514e0e7867d.tar.xz nova-50735046421fdfa311153e17563e8514e0e7867d.zip | |
Merge "Fix metadata access in prep for instance objects"
Diffstat (limited to 'nova/utils.py')
| -rw-r--r-- | nova/utils.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/nova/utils.py b/nova/utils.py index da14d019c..c2580271d 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -981,6 +981,13 @@ def dict_to_metadata(metadata): return result +def instance_meta(instance): + if isinstance(instance['metadata'], dict): + return instance['metadata'] + else: + return metadata_to_dict(instance['metadata']) + + def instance_sys_meta(instance): if isinstance(instance['system_metadata'], dict): return instance['system_metadata'] |