summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Carrillo Cruz <emaildericky@gmail.com>2011-02-12 21:32:58 +0100
committerRicardo Carrillo Cruz <emaildericky@gmail.com>2011-02-12 21:32:58 +0100
commit635f6c9fb2bc3a09fac43832d1e57913ce893714 (patch)
tree02a076c69a6b5173f2ef624a646bb5f017ae836e
parent7bc6ea8911e95c33b685c8f9b9a0e649f1ebbe93 (diff)
downloadnova-635f6c9fb2bc3a09fac43832d1e57913ce893714.tar.gz
nova-635f6c9fb2bc3a09fac43832d1e57913ce893714.tar.xz
nova-635f6c9fb2bc3a09fac43832d1e57913ce893714.zip
Preliminary fix for issue, need more thorough testing before pushing to lp
-rw-r--r--nova/api/ec2/cloud.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 4dc074fd5..1d89b58cf 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -324,12 +324,11 @@ class CloudController(object):
groups = db.security_group_get_by_project(context,
context.project_id)
groups = [self._format_security_group(context, g) for g in groups]
- LOG.debug(_("Groups after format_security_group: %s"),
- groups, context=context)
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'])}
def _format_security_group(self, context, group):
g = {}