From 7713cb99635f3a06e298d4a504dc1249e5bf3232 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Sun, 13 Feb 2011 15:44:41 -0800
Subject: return a list instead of a generator from describe_groups

---
 nova/api/ec2/cloud.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 41a7ac706..5d387d45d 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -328,7 +328,8 @@ class CloudController(object):
             groups = [g for g in groups if g.name in group_name]
 
         return {'securityGroupInfo':
-                sorted(groups, key=lambda k: (k['ownerId'], k['groupName']))}
+                list(sorted(groups,
+                            key=lambda k: (k['ownerId'], k['groupName'])))}
 
     def _format_security_group(self, context, group):
         g = {}
-- 
cgit