openstack
/
neutron
Code Issues Proposed changes

Merge "Parameter 'fileds' value is not used in _get_subnets"

This commit is contained in:
Zuul 2019-11-23 05:21:10 +00:00 committed by Gerrit Code Review
parent b5e50821c2 39255f3e7e
commit 71e3cb0ea5
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
neutron/db/db_base_plugin_common.py
View File

@ -298,9 +298,8 @@ class DbBasePluginCommon(object):
return subnet_obj.Subnet.get_objects(context, return subnet_obj.Subnet.get_objects(context,
subnetpool_id=subnetpool_id) subnetpool_id=subnetpool_id)
def _get_subnets(self, context, filters=None, fields=None, def _get_subnets(self, context, filters=None, sorts=None, limit=None,
sorts=None, limit=None, marker=None, marker=None, page_reverse=False):
page_reverse=False):
pager = base_obj.Pager(sorts, limit, page_reverse, marker) pager = base_obj.Pager(sorts, limit, page_reverse, marker)
filters = filters or {} filters = filters or {}
# turn the CIDRs into a proper subnets # turn the CIDRs into a proper subnets

2
neutron/db/db_base_plugin_v2.py
View File

@ -1085,7 +1085,7 @@ class NeutronDbPluginV2(db_base_plugin_common.DbBasePluginCommon,
def get_subnets(self, context, filters=None, fields=None, def get_subnets(self, context, filters=None, fields=None,
sorts=None, limit=None, marker=None, sorts=None, limit=None, marker=None,
page_reverse=False): page_reverse=False):
subnet_objs = self._get_subnets(context, filters, fields, sorts, limit, subnet_objs = self._get_subnets(context, filters, sorts, limit,
marker, page_reverse) marker, page_reverse)
return [ return [
self._make_subnet_dict(subnet_object, fields, context) self._make_subnet_dict(subnet_object, fields, context)