openstack
/
neutron
Code Issues Proposed changes

Fix _update_subnet_allocation_pools returning empty list 

_update_subnet_allocation_pools was returning an empty list in all
cases due to trying to iterate over the same generator twice.
Generators cannot be iterated over multiple times.

This patch changes the generator into a list to fix this problem,
and alters the unit test so that this issue is exposed.

Change-Id: Iea98f3ae4f16964cd68154ac5edfeb125de889e0
Closes-Bug: 1483687
This commit is contained in:
John Davidge 2015-08-11 13:55:51 +01:00
parent dfadd1af75
commit 0b0aa4a61d
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/db/ipam_backend_mixin.py
View File

@ -158,9 +158,9 @@ class IpamBackendMixin(db_base_plugin_common.DbBasePluginCommon):
def _update_subnet_allocation_pools(self, context, subnet_id, s):
context.session.query(models_v2.IPAllocationPool).filter_by(
subnet_id=subnet_id).delete()
pools = ((netaddr.IPAddress(p.first, p.version).format(),
pools = [(netaddr.IPAddress(p.first, p.version).format(),
netaddr.IPAddress(p.last, p.version).format())
for p in s['allocation_pools'])
for p in s['allocation_pools']]
new_pools = [models_v2.IPAllocationPool(first_ip=p[0],
last_ip=p[1],
subnet_id=subnet_id)

32
neutron/tests/unit/db/test_db_base_plugin_v2.py
View File

@ -4167,6 +4167,19 @@ class TestSubnetsV2(NeutronDbPluginV2TestCase):
self.assertEqual(res.status_int,
webob.exc.HTTPClientError.code)
def _verify_updated_subnet_allocation_pools(self, res, with_gateway_ip):
res = self.deserialize(self.fmt, res)
self.assertEqual(len(res['subnet']['allocation_pools']), 2)
res_vals = (
list(res['subnet']['allocation_pools'][0].values()) +
list(res['subnet']['allocation_pools'][1].values())
)
for pool_val in ['10', '20', '30', '40']:
self.assertTrue('192.168.0.%s' % (pool_val) in res_vals)
if with_gateway_ip:
self.assertEqual((res['subnet']['gateway_ip']),
'192.168.0.9')
def _test_update_subnet_allocation_pools(self, with_gateway_ip=False):
"""Test that we can successfully update with sane params.
@ -4187,22 +4200,17 @@ class TestSubnetsV2(NeutronDbPluginV2TestCase):
data['subnet']['gateway_ip'] = '192.168.0.9'
req = self.new_update_request('subnets', data,
subnet['subnet']['id'])
#check res code but then do GET on subnet for verification
#check res code and contents
res = req.get_response(self.api)
self.assertEqual(res.status_code, 200)
self._verify_updated_subnet_allocation_pools(res,
with_gateway_ip)
#GET subnet to verify DB updated correctly
req = self.new_show_request('subnets', subnet['subnet']['id'],
self.fmt)
res = self.deserialize(self.fmt, req.get_response(self.api))
self.assertEqual(len(res['subnet']['allocation_pools']), 2)
res_vals = (
list(res['subnet']['allocation_pools'][0].values()) +
list(res['subnet']['allocation_pools'][1].values())
)
for pool_val in ['10', '20', '30', '40']:
self.assertTrue('192.168.0.%s' % (pool_val) in res_vals)
if with_gateway_ip:
self.assertEqual((res['subnet']['gateway_ip']),
'192.168.0.9')
res = req.get_response(self.api)
self._verify_updated_subnet_allocation_pools(res,
with_gateway_ip)
def test_update_subnet_allocation_pools(self):
self._test_update_subnet_allocation_pools()