Merge lp:~rcarrillocruz/nova/lp708329 into lp:~hudson-openstack/nova/trunk

[Ricardo Carrillo Cruz]

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

[Jay Pipes (jaypipes)]

lgtm.

review: Approve

[Devin Carlen (devcamcar)]

lgtm

review: Approve

=== modified file 'nova/api/ec2/cloud.py'
--- nova/api/ec2/cloud.py	2011-02-07 23:01:57 +0000
+++ nova/api/ec2/cloud.py	2011-02-13 18:57:54 +0000
@@ -327,7 +327,8 @@
         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 = {}