From 4171160aa24d2e055da8b33c90c77c5b75c26fd9 Mon Sep 17 00:00:00 2001
From: Isaku Yamahata <yamahata@valinux.co.jp>
Date: Sun, 29 May 2011 22:45:58 +0900
Subject: boot-from-volume: some comments and NOTE(user name)

---
 nova/api/ec2/apirequest.py | 6 ++++++
 nova/api/ec2/cloud.py      | 1 +
 2 files changed, 7 insertions(+)

(limited to 'nova/api')

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
-- 
cgit