diff options
| author | Ryan Lane <rlane@wikimedia.org> | 2011-01-20 19:07:24 +0000 |
|---|---|---|
| committer | Ryan Lane <rlane@wikimedia.org> | 2011-01-20 19:07:24 +0000 |
| commit | 8caebc896499184721f9d880186e6baa7e42aeac (patch) | |
| tree | d92d55595adc09415e8d75c0f4467d612e43b339 | |
| parent | 6cc743de02ee3993b3301bfe34c645ba63881e38 (diff) | |
| download | nova-8caebc896499184721f9d880186e6baa7e42aeac.tar.gz nova-8caebc896499184721f9d880186e6baa7e42aeac.tar.xz nova-8caebc896499184721f9d880186e6baa7e42aeac.zip | |
Adds security group output to describe_instances
| -rw-r--r-- | nova/api/ec2/cloud.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index c94540793..1203eb376 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -707,7 +707,13 @@ class CloudController(object): r = {} r['reservationId'] = instance['reservation_id'] r['ownerId'] = instance['project_id'] - r['groupSet'] = self._convert_to_set([], 'groups') + security_groups = db.security_group_get_by_instance(context, + instance_id) + security_group_ids = [] + for security_group in security_groups: + security_group_ids.append(security_group.name) + r['groupSet'] = self._convert_to_set(security_group_ids, + 'groupId') r['instancesSet'] = [] reservations[instance['reservation_id']] = r reservations[instance['reservation_id']]['instancesSet'].append(i) |