diff options
| author | Alexei Kornienko <akornienko@mirantis.com> | 2013-06-19 12:37:57 +0300 |
|---|---|---|
| committer | Alexei Kornienko <akornienko@mirantis.com> | 2013-06-27 18:10:16 +0300 |
| commit | 8596f8b294e552873a29b6861bae4aa794d92b31 (patch) | |
| tree | 4b51edf4afc160d5cabe7c7a3a91c3ce44199198 /nova/utils.py | |
| parent | 2bcd6b59a6d6848144ff9fb4f7b4c2241b907515 (diff) | |
| download | nova-8596f8b294e552873a29b6861bae4aa794d92b31.tar.gz nova-8596f8b294e552873a29b6861bae4aa794d92b31.tar.xz nova-8596f8b294e552873a29b6861bae4aa794d92b31.zip | |
Fix metadata access in prep for instance objects
Related to blueprint unified-object-model
Fixes: bug #1192012
Change-Id: I8b708dc3d89fedfcb4bbf5d26b959da1298b0525
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 5e968bd35..24823484e 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -973,6 +973,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'] |