From: Roey Chen <roeyc@vmware.com>
Date: Wed, 18 Mar 2015 16:29:19 +0000 (-0700)
Subject: Fix create_security_group_rule_bulk_native to return all created rules
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=c1893ae8d4579840ce9bfe95fbf80aa952a1110e;p=openstack-build%2Fneutron-build.git

Fix create_security_group_rule_bulk_native to return all created rules

create_security_group_rule_bulk_native should return all of the created
security-group rules, but returns only one, this patch fix the issue and
adds a unittest to validate it.

Closes-Bug: #1434207
Change-Id: I8611c83fecf90e025b24b09fc3a371cbeebce637
---

diff --git a/neutron/db/securitygroups_db.py b/neutron/db/securitygroups_db.py
index 92dcc7ac4..5e6deae43 100644
--- a/neutron/db/securitygroups_db.py
+++ b/neutron/db/securitygroups_db.py
@@ -308,7 +308,7 @@ class SecurityGroupDbMixin(ext_sg.SecurityGroupPluginBase):
                     port_range_max=rule['port_range_max'],
                     remote_ip_prefix=rule.get('remote_ip_prefix'))
                 context.session.add(db)
-            ret.append(self._make_security_group_rule_dict(db))
+                ret.append(self._make_security_group_rule_dict(db))
         return ret
 
     def create_security_group_rule(self, context, security_group_rule):
diff --git a/neutron/tests/unit/test_extension_security_group.py b/neutron/tests/unit/test_extension_security_group.py
index 58c049277..4fac0e886 100644
--- a/neutron/tests/unit/test_extension_security_group.py
+++ b/neutron/tests/unit/test_extension_security_group.py
@@ -1238,8 +1238,9 @@ class TestSecurityGroups(SecurityGroupDBTestCase):
             rules = {'security_group_rules': [rule1['security_group_rule'],
                                               rule2['security_group_rule']]}
             res = self._create_security_group_rule(self.fmt, rules)
-            self.deserialize(self.fmt, res)
+            ret = self.deserialize(self.fmt, res)
             self.assertEqual(res.status_int, webob.exc.HTTPCreated.code)
+            self.assertEqual(2, len(ret['security_group_rules']))
 
     def test_create_security_group_rule_bulk_emulated(self):
         real_has_attr = hasattr