openstack
/
neutron
Code Issues Proposed changes

Merge "make/update_subnetpool_dict call _dict_extend"

This commit is contained in:
Jenkins 2016-03-02 16:59:57 +00:00 committed by Gerrit Code Review
parent f94ad5abbe c40012ffae
commit 2d51a534c2
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/db/db_base_plugin_common.py
View File

@ -152,6 +152,8 @@ class DbBasePluginCommon(common_db_mixin.CommonDbMixin):
'ip_version': subnetpool['ip_version'],
'default_quota': subnetpool['default_quota'],
'address_scope_id': subnetpool['address_scope_id']}
self._apply_dict_extend_functions(attributes.SUBNETPOOLS, res,
subnetpool)
return self._fields(res, fields)
def _make_port_dict(self, port, fields=None,

6
neutron/db/db_base_plugin_v2.py
View File

@ -1026,9 +1026,11 @@ class NeutronDbPluginV2(db_base_plugin_common.DbBasePluginCommon,
for key in ['id', 'name', 'ip_version', 'min_prefixlen',
'max_prefixlen', 'default_prefixlen', 'is_default',
'shared', 'default_quota', 'address_scope_id']:
'shared', 'default_quota', 'address_scope_id',
'standard_attr']:
self._write_key(key, updated, model, new_pool)
self._apply_dict_extend_functions(attributes.SUBNETPOOLS,
updated, model)
return updated
def _write_key(self, key, update, orig, new_dict):