openstack
/
neutron
Code Issues Proposed changes

Merge "Make RBAC entry removal enginefacade friendly"

This commit is contained in:
Jenkins 2017-04-01 12:05:20 +00:00 committed by Gerrit Code Review
parent de443b7700 e022c1a182
commit 36cb26268b
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/db/db_base_plugin_v2.py
View File

@ -388,8 +388,7 @@ class NeutronDbPluginV2(db_base_plugin_common.DbBasePluginCommon,
target_tenant='*', tenant_id=network['tenant_id'])
context.session.add(entry)
elif not update_shared and entry:
context.session.delete(entry)
context.session.expire(network, ['rbac_entries'])
network.rbac_entries.remove(entry)
# The filter call removes attributes from the body received from
# the API that are logically tied to network resources but are
# stored in other database tables handled by extensions