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/api | |
| 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/api')
| -rw-r--r-- | nova/api/metadata/base.py | 6 | ||||
| -rw-r--r-- | nova/api/openstack/compute/views/servers.py | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/nova/api/metadata/base.py b/nova/api/metadata/base.py index 425e5bf53..da0a50662 100644 --- a/nova/api/metadata/base.py +++ b/nova/api/metadata/base.py @@ -32,6 +32,8 @@ from nova.compute import flavors from nova import conductor from nova import context from nova import network +from nova import utils + from nova.openstack.common import timeutils from nova.virt import netutils @@ -127,9 +129,7 @@ class InstanceMetadata(): self.address = address # expose instance metadata. - self.launch_metadata = {} - for item in instance.get('metadata', []): - self.launch_metadata[item['key']] = item['value'] + self.launch_metadata = utils.instance_meta(instance) self.password = password.extract_password(instance) diff --git a/nova/api/openstack/compute/views/servers.py b/nova/api/openstack/compute/views/servers.py index 734bb647d..03b0a97a5 100644 --- a/nova/api/openstack/compute/views/servers.py +++ b/nova/api/openstack/compute/views/servers.py @@ -25,6 +25,7 @@ from nova.api.openstack.compute.views import images as views_images from nova.compute import flavors from nova.openstack.common import log as logging from nova.openstack.common import timeutils +from nova import utils LOG = logging.getLogger(__name__) @@ -132,8 +133,7 @@ class ViewBuilder(common.ViewBuilder): @staticmethod def _get_metadata(instance): - metadata = instance.get("metadata", []) - return dict((item['key'], item['value']) for item in metadata) + return utils.instance_meta(instance) @staticmethod def _get_vm_state(instance): |