summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorRicardo Carrillo Cruz <emaildericky@gmail.com>2011-02-13 20:04:45 +0000
committerTarmac <>2011-02-13 20:04:45 +0000
commit5a35643962a8978a1ac584d64dd381a9ffbc8517 (patch)
tree075e5f9da50fe6edc548c9e7048ea43c51c7d0e9 /nova
parent2df3182b6e9637fe0e9ce9358a60ee874a97acb3 (diff)
parentabe00772e1b8eef361ff2ce614a4679603438228 (diff)
downloadnova-5a35643962a8978a1ac584d64dd381a9ffbc8517.tar.gz
nova-5a35643962a8978a1ac584d64dd381a9ffbc8517.tar.xz
nova-5a35643962a8978a1ac584d64dd381a9ffbc8517.zip
Hi guys
This branch fixes lp708329. Have a look at cloud.py/describe_security_groups , it was just a matter of sorting by project, then by group name before returning the groups. Regards
Diffstat (limited to 'nova')
-rw-r--r--nova/api/ec2/cloud.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index c80e1168a..41a7ac706 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -327,7 +327,8 @@ class CloudController(object):
if not group_name is None:
groups = [g for g in groups if g.name in group_name]
- return {'securityGroupInfo': groups}
+ return {'securityGroupInfo':
+ sorted(groups, key=lambda k: (k['ownerId'], k['groupName']))}
def _format_security_group(self, context, group):
g = {}