From: Aaron Rosen <arosen@nicira.com>
Date: Fri, 25 Jan 2013 19:30:18 +0000 (-0800)
Subject: Make get_security_groups() return security group rules
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=dc3e446aeccdd784c480b094b9285a5618e1b607;p=openstack-build%2Fneutron-build.git

Make get_security_groups() return security group rules

In nova, get_security_groups() returns the security groups and their
security group rules. In order to implement the security group proxy
it needs to return this data to nova. This can be done using multiple
requests from nova-api to quantum i.e: get_security_groups(), then
get_security_group() for each group to obtain the rules. If one has a lot
of security groups this will generate a lot of requests. Adding this change
allows all the security groups and their rules to be returned in one shot.

Fix bug 1105399

Change-Id: Ib685960311221ac4e5fe0913c7e00e15ab74accb
---

diff --git a/quantum/db/securitygroups_db.py b/quantum/db/securitygroups_db.py
index 9a70856ba..7eba36cf5 100644
--- a/quantum/db/securitygroups_db.py
+++ b/quantum/db/securitygroups_db.py
@@ -202,6 +202,8 @@ class SecurityGroupDbMixin(ext_sg.SecurityGroupPluginBase):
                'description': security_group['description']}
         if security_group.get('external_id'):
             res['external_id'] = security_group['external_id']
+        res['security_group_rules'] = [self._make_security_group_rule_dict(r)
+                                       for r in security_group.rules]
         return self._fields(res, fields)
 
     def _make_security_group_binding_dict(self, security_group, fields=None):
diff --git a/quantum/tests/unit/test_extension_security_group.py b/quantum/tests/unit/test_extension_security_group.py
index 86735f473..879bee8c2 100644
--- a/quantum/tests/unit/test_extension_security_group.py
+++ b/quantum/tests/unit/test_extension_security_group.py
@@ -281,6 +281,11 @@ class TestSecurityGroups(SecurityGroupDBTestCase):
             res = self.new_list_request('security-groups')
             groups = self.deserialize('json', res.get_response(self.ext_api))
             self.assertEqual(len(groups['security_groups']), 2)
+            for group in groups['security_groups']:
+                if group['name'] == 'default':
+                    self.assertEquals(len(group['security_group_rules']), 2)
+                else:
+                    self.assertEquals(len(group['security_group_rules']), 0)
 
     def test_get_security_group(self):
         name = 'webservers'