From 8caebc896499184721f9d880186e6baa7e42aeac Mon Sep 17 00:00:00 2001
From: Ryan Lane <rlane@wikimedia.org>
Date: Thu, 20 Jan 2011 19:07:24 +0000
Subject: Adds security group output to describe_instances

---
 nova/api/ec2/cloud.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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)
-- 
cgit 


From b03fc3f7d84cd4e0b75efdda543cfcbcd4bb78ac Mon Sep 17 00:00:00 2001
From: Ryan Lane <rlane@wikimedia.org>
Date: Thu, 20 Jan 2011 20:05:07 +0000
Subject: Saving a database call by getting the security groups from the
 instance object.

---
 nova/api/ec2/cloud.py | 11 +++++------
 1 file 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
-- 
cgit 


From 870faca2947289758c03c24a422fe8391a9ce45e Mon Sep 17 00:00:00 2001
From: Ryan Lane <rlane@wikimedia.org>
Date: Thu, 27 Jan 2011 12:19:15 +0000
Subject: Properly pulling the name attribute from security_group

---
 nova/api/ec2/cloud.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index e2012066f..00d044e95 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -717,7 +717,7 @@ class CloudController(object):
                 security_group_names = []
                 if instance.get('security_groups'):
                     for security_group in instance['security_groups']:
-                        security_group_names.append(security_group.name)
+                        security_group_names.append(security_group['name'])
                 r['groupSet'] = self._convert_to_set(security_group_names,
                                                      'groupId')
                 r['instancesSet'] = []
-- 
cgit