diff options
| author | Ryan Lane <rlane@wikimedia.org> | 2011-01-20 20:05:07 +0000 |
|---|---|---|
| committer | Ryan Lane <rlane@wikimedia.org> | 2011-01-20 20:05:07 +0000 |
| commit | b03fc3f7d84cd4e0b75efdda543cfcbcd4bb78ac (patch) | |
| tree | f840a8d9ac3979ffc419906c704b99992b2ce92d | |
| parent | 8caebc896499184721f9d880186e6baa7e42aeac (diff) | |
| download | nova-b03fc3f7d84cd4e0b75efdda543cfcbcd4bb78ac.tar.gz nova-b03fc3f7d84cd4e0b75efdda543cfcbcd4bb78ac.tar.xz nova-b03fc3f7d84cd4e0b75efdda543cfcbcd4bb78ac.zip | |
Saving a database call by getting the security groups from the instance object.
| -rw-r--r-- | nova/api/ec2/cloud.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 1203eb376..434a1921f 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -707,12 +707,11 @@ class CloudController(object): r = {} r['reservationId'] = instance['reservation_id'] r['ownerId'] = instance['project_id'] - 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, + 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 |