summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorRicardo Carrillo Cruz <emaildericky@gmail.com>2011-02-13 19:34:20 +0100
committerRicardo Carrillo Cruz <emaildericky@gmail.com>2011-02-13 19:34:20 +0100
commitabe00772e1b8eef361ff2ce614a4679603438228 (patch)
tree0aa437ecf414f8a82d3e55d0fe84bf0c80904a1f /nova
parent635f6c9fb2bc3a09fac43832d1e57913ce893714 (diff)
downloadnova-abe00772e1b8eef361ff2ce614a4679603438228.tar.gz
nova-abe00772e1b8eef361ff2ce614a4679603438228.tar.xz
nova-abe00772e1b8eef361ff2ce614a4679603438228.zip
now sorting by project, then by group
Diffstat (limited to 'nova')
-rw-r--r--nova/api/ec2/cloud.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 1d89b58cf..41a7ac706 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -328,7 +328,7 @@ class CloudController(object):
groups = [g for g in groups if g.name in group_name]
return {'securityGroupInfo':
- sorted(groups, key=lambda k: k['ownerId'])}
+ sorted(groups, key=lambda k: (k['ownerId'], k['groupName']))}
def _format_security_group(self, context, group):
g = {}