openstack
/
neutron
Code Issues Proposed changes

Merge "Convert filters to empty dict if None in DB's get_subnetpools()."

This commit is contained in:
Jenkins 2016-12-08 16:14:23 +00:00 committed by Gerrit Code Review
parent 1031e137d4 3ee76d4980
commit 042c7ef528
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
neutron/db/db_base_plugin_v2.py
View File

@ -1115,6 +1115,7 @@ class NeutronDbPluginV2(db_base_plugin_common.DbBasePluginCommon,
sorts=None, limit=None, marker=None,
page_reverse=False):
pager = base_obj.Pager(sorts, limit, page_reverse, marker)
filters = filters or {}
subnetpools = subnetpool_obj.SubnetPool.get_objects(
context, _pager=pager, validate_filters=False, **filters)
return [

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

@ -5541,6 +5541,18 @@ class TestSubnetPoolsV2(NeutronDbPluginV2TestCase):
self.assertEqual(1, len(admin_res['subnetpools']))
self.assertEqual(0, len(mortal_res['subnetpools']))
def test_list_subnetpools_filters_none(self):
subnet_pool = self._test_create_subnetpool(['10.10.10.0/24'],
None,
True,
name=self._POOL_NAME,
min_prefixlen='24',
shared=True)
sp_list = self.plugin.get_subnetpools(
context.Context('', 'not-the-owner'))
self.assertEqual(1, len(sp_list))
self.assertEqual(subnet_pool['subnetpool']['id'], sp_list[0]['id'])
def test_delete_subnetpool(self):
subnetpool = self._test_create_subnetpool(['10.10.10.0/24'],
tenant_id=self._tenant_id,