diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-02-14 03:04:34 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-02-14 03:04:34 +0000 |
| commit | dc2f551f36fb0d0f6c46b465035f4a5fa064574e (patch) | |
| tree | 886be6648f85e93a457928e8fdebbdc384979dab /nova | |
| parent | 5a35643962a8978a1ac584d64dd381a9ffbc8517 (diff) | |
| parent | 7713cb99635f3a06e298d4a504dc1249e5bf3232 (diff) | |
| download | nova-dc2f551f36fb0d0f6c46b465035f4a5fa064574e.tar.gz nova-dc2f551f36fb0d0f6c46b465035f4a5fa064574e.tar.xz nova-dc2f551f36fb0d0f6c46b465035f4a5fa064574e.zip | |
Fixes describe_security_groups by forcing it to return a list instead of a generator.
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/api/ec2/cloud.py | 3 |
1 files changed, 2 insertions, 1 deletions
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 = {} |