diff options
| author | Ryan Lane <rlane@wikimedia.org> | 2011-01-28 03:09:46 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-01-28 03:09:46 +0000 |
| commit | 2a64ccb8139eb30aab394391cf137d4cb83ce55e (patch) | |
| tree | 6ed127ba461b2614992778f3a40dec1f60d24922 /nova/api | |
| parent | caca4a1320638b0d806f1854ba8233d941f50e86 (diff) | |
| parent | 870faca2947289758c03c24a422fe8391a9ce45e (diff) | |
| download | nova-2a64ccb8139eb30aab394391cf137d4cb83ce55e.tar.gz nova-2a64ccb8139eb30aab394391cf137d4cb83ce55e.tar.xz nova-2a64ccb8139eb30aab394391cf137d4cb83ce55e.zip | |
Adds security group output to describe_instances.
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 9683e2ebd..00d044e95 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -714,7 +714,12 @@ class CloudController(object): r = {} r['reservationId'] = instance['reservation_id'] r['ownerId'] = instance['project_id'] - r['groupSet'] = self._convert_to_set([], 'groups') + security_group_names = [] + if instance.get('security_groups'): + for security_group in instance['security_groups']: + security_group_names.append(security_group['name']) + r['groupSet'] = self._convert_to_set(security_group_names, + 'groupId') r['instancesSet'] = [] reservations[instance['reservation_id']] = r reservations[instance['reservation_id']]['instancesSet'].append(i) |