diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-04-30 22:23:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-04-30 22:23:11 +0000 |
| commit | dda036044e2ddb249aef8d483269bcbf97141abd (patch) | |
| tree | 86c4f07c5198265e06752b26a7120371307f9db0 /nova/api | |
| parent | 2c72cb3bcee6b64fff6e3eaa738e4bc80828a830 (diff) | |
| parent | 58af96d3e01c7fbe993344374190d8afe1a1d0ff (diff) | |
| download | nova-dda036044e2ddb249aef8d483269bcbf97141abd.tar.gz nova-dda036044e2ddb249aef8d483269bcbf97141abd.tar.xz nova-dda036044e2ddb249aef8d483269bcbf97141abd.zip | |
Merge "Migrate block_device_mapping to use instance uuids."
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 8 | ||||
| -rw-r--r-- | nova/api/metadata/handler.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 4b2d1d686..8c6a1fdc3 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -999,7 +999,7 @@ class CloudController(object): def _format_attr_block_device_mapping(instance, result): tmp = {} self._format_instance_root_device_name(instance, tmp) - self._format_instance_bdm(context, instance_id, + self._format_instance_bdm(context, instance['uuid'], tmp['rootDeviceName'], result) def _format_attr_disable_api_termination(instance, result): @@ -1099,13 +1099,13 @@ class CloudController(object): instances_set.append(i) return {'instancesSet': instances_set} - def _format_instance_bdm(self, context, instance_id, root_device_name, + def _format_instance_bdm(self, context, instance_uuid, root_device_name, result): """Format InstanceBlockDeviceMappingResponseItemType""" root_device_type = 'instance-store' mapping = [] for bdm in db.block_device_mapping_get_all_by_instance(context, - instance_id): + instance_uuid): volume_id = bdm['volume_id'] if (volume_id is None or bdm['no_device']): continue @@ -1221,7 +1221,7 @@ class CloudController(object): i['launchTime'] = instance['created_at'] i['amiLaunchIndex'] = instance['launch_index'] self._format_instance_root_device_name(instance, i) - self._format_instance_bdm(context, instance_id, + self._format_instance_bdm(context, instance['uuid'], i['rootDeviceName'], i) host = instance['host'] services = db.service_get_all_by_host(context.elevated(), host) diff --git a/nova/api/metadata/handler.py b/nova/api/metadata/handler.py index 1ad8a5413..9929e6e66 100644 --- a/nova/api/metadata/handler.py +++ b/nova/api/metadata/handler.py @@ -99,7 +99,7 @@ class MetadataRequestHandler(wsgi.Application): # 'ephemeralN', 'swap' and ebs for bdm in db.block_device_mapping_get_all_by_instance( - ctxt, instance_ref['id']): + ctxt, instance_ref['uuid']): if bdm['no_device']: continue |