diff options
| author | Isaku Yamahata <yamahata@valinux.co.jp> | 2011-05-29 22:45:58 +0900 |
|---|---|---|
| committer | Isaku Yamahata <yamahata@valinux.co.jp> | 2011-05-29 22:45:58 +0900 |
| commit | 4171160aa24d2e055da8b33c90c77c5b75c26fd9 (patch) | |
| tree | 0c09562b786f02018c268344aac99fc60aa6d18d /nova/api | |
| parent | d49944698224225a860560ff559a3679e0dd8493 (diff) | |
boot-from-volume: some comments and NOTE(user name)
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/apirequest.py | 6 | ||||
| -rw-r--r-- | nova/api/ec2/cloud.py | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/nova/api/ec2/apirequest.py b/nova/api/ec2/apirequest.py index 4d6aa7f0a..368d925d8 100644 --- a/nova/api/ec2/apirequest.py +++ b/nova/api/ec2/apirequest.py @@ -134,6 +134,12 @@ class APIRequest(object): # into their respective values value = _try_convert(value) + # NOTE(yamahata) + # parse multi dot-separted argument. + # EBS boot uses multi dot-separeted arguments like + # BlockDeviceMapping.1.DeviceName=snap-id + # Convert the above into + # {'block_device_mapping': {'1': {'device_name': snap-id}}} if len(parts) > 1: d = args.get(key, {}) args[key] = d diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index caefe6ff3..cff459cad 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -891,6 +891,7 @@ class CloudController(object): ramdisk = self._get_image(context, kwargs['ramdisk_id']) kwargs['ramdisk_id'] = ramdisk['id'] for bdm in kwargs.get('block_device_mapping', []): + # NOTE(yamahata) # BlockDevicedMapping.<N>.DeviceName # BlockDevicedMapping.<N>.Ebs.SnapshotId # BlockDevicedMapping.<N>.Ebs.VolumeSize |