From 9c3411c13936438964cc8a21b031c819edbd0ed1 Mon Sep 17 00:00:00 2001
From: Isaku Yamahata <yamahata@valinux.co.jp>
Date: Fri, 27 May 2011 11:07:45 +0900
Subject: teach ec2 parser multi dot-separted argument

nova.api.ec2.apirequest.APIRequest knows only single dot-separated
arguments.
EBS boot uses multi dot-separeted arguments like
BlockDeviceMapping.1.DeviceName=snap-id
This patch teaches the parser those argument as the preparetion for ebs boot
support.
---
 nova/api/ec2/apirequest.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/ec2/apirequest.py b/nova/api/ec2/apirequest.py
index 94900dfbd..4d6aa7f0a 100644
--- a/nova/api/ec2/apirequest.py
+++ b/nova/api/ec2/apirequest.py
@@ -133,11 +133,18 @@ class APIRequest(object):
                 # NOTE(vish): Automatically convert strings back
                 #             into their respective values
                 value = _try_convert(value)
-            if len(parts) > 1:
-                d = args.get(key, {})
-                d[parts[1]] = value
-                value = d
-            args[key] = value
+
+                if len(parts) > 1:
+                    d = args.get(key, {})
+                    args[key] = d
+                    for k in parts[1:-1]:
+                        k = _camelcase_to_underscore(k)
+                        v = d.get(k, {})
+                        d[k] = v
+                        d = v
+                    d[_camelcase_to_underscore(parts[-1])] = value
+                else:
+                    args[key] = value
 
         for key in args.keys():
             # NOTE(vish): Turn numeric dict keys into lists
-- 
cgit