Refactor extract_param_list()

Change-Id: Ia338c7c4a17af90885b1c83297d32a61d2177ecd
Signed-off-by: Zane Bitter <zbitter@redhat.com>

diff --git a/heat/api/aws/utils.py b/heat/api/aws/utils.py
index aecc509f2740888a30cb61cf5bc17b5063678ed8..ef5bde5fe94c3b782623d336626439968ad64294 100644 (file)
--- a/heat/api/aws/utils.py
+++ b/heat/api/aws/utils.py
@@ -18,6 +18,7 @@ Helper utilities related to the AWS API implementations
 '''
 
 import re
+import itertools
 
 
 def format_response(action, response):
@@ -83,35 +84,27 @@ def extract_param_list(params, prefix=''):
     list containing two dicts
     """
 
-    key_re = re.compile(r"%s\.member\.([0-9]*?)\.(.*?)$" % (prefix))
-    result = []
-    for k in params:
-        keymatch = key_re.match(k)
-        if keymatch:
-            try:
-                index = int(keymatch.group(1))
-            except ValueError:
-                # Regex match should mean this never happens..
-                logger.error('Could not extract index %s' % keymatch.group(1))
-                continue
-
-            key = keymatch.group(2)
-            try:
-                value = params[k]
-            except KeyError:
-                logger.error('Could not extract parameter for %s' % key)
-                continue
-
-            # We can't rely on list indexes being in-order, so
-            # populate the list with empty dicts up to the current
-            # index value if index > current list length
-            # We then merge the result into the appropriate dict
-            if index > len(result):
-                while len(result) < index:
-                    result.append({})
-            result[index - 1].update({key: value})
+    key_re = re.compile(r"%s\.member\.([0-9]+)\.(.*)" % (prefix))
 
-    return result
+    def get_param_data(params):
+        for param_name, value in params.items():
+            match = key_re.match(param_name)
+            if match:
+                try:
+                    index = int(match.group(1))
+                except ValueError:
+                    pass
+                else:
+                    key = match.group(2)
+
+                    yield (index, (key, value))
+
+    # Sort and group by index
+    key_func = lambda d: d[0]
+    data = sorted(get_param_data(params), key=key_func)
+    members = itertools.groupby(data, key_func)
+
+    return [dict(kv for di, kv in m) for mi, m in members]
 
 
 def reformat_dict_keys(keymap={}, inputdict={}):

diff --git a/heat/tests/test_api_aws.py b/heat/tests/test_api_aws.py
index ba3bf1f614b0b28ff8d3d1d0e02316b7b6bc23ab..b24a5fde9641bb0a27a05db54a0a6adcad3463b5 100644 (file)
--- a/heat/tests/test_api_aws.py
+++ b/heat/tests/test_api_aws.py
@@ -163,15 +163,15 @@ class AWSCommon(unittest.TestCase):
               'MetricData.member.3.Unit': 'Bytes',
               'MetricData.member.3.Value': 12345}
         params = api_utils.extract_param_list(p, prefix='MetricData')
-        self.assertEqual(len(params), 3)
+        self.assertEqual(len(params), 2)
         self.assertTrue('MetricName' in params[0])
-        self.assertTrue('MetricName' in params[2])
+        self.assertTrue('MetricName' in params[1])
         self.assertEqual(params[0]['MetricName'], 'foo')
         self.assertEqual(params[0]['Unit'], 'Bytes')
         self.assertEqual(params[0]['Value'], 234333)
-        self.assertEqual(params[2]['MetricName'], 'foo2')
-        self.assertEqual(params[2]['Unit'], 'Bytes')
-        self.assertEqual(params[2]['Value'], 12345)
+        self.assertEqual(params[1]['MetricName'], 'foo2')
+        self.assertEqual(params[1]['Unit'], 'Bytes')
+        self.assertEqual(params[1]['Value'], 12345)
 
     def test_extract_param_list_badindex(self):
         p = {'MetricData.member.xyz.MetricName': 'foo',