openstack
/
neutron
Code Issues Proposed changes

Merge "Stop using .delete() in external net handling code"

This commit is contained in:
Jenkins 2017-01-10 15:57:50 +00:00 committed by Gerrit Code Review
parent 1eeb39ec75 9dea90d453
commit 232f862d0e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
neutron/db/external_net_db.py
View File

@ -164,10 +164,12 @@ class External_net_db_mixin(object):
if port:
raise external_net.ExternalNetworkInUse(net_id=net_id)
context.session.query(ext_net_models.ExternalNetwork).filter_by(
network_id=net_id).delete()
context.session.query(rbac_db.NetworkRBAC).filter_by(
object_id=net_id, action='access_as_external').delete()
for edb in (context.session.query(ext_net_models.ExternalNetwork).
filter_by(network_id=net_id)):
context.session.delete(edb)
for rbdb in (context.session.query(rbac_db.NetworkRBAC).filter_by(
object_id=net_id, action='access_as_external')):
context.session.delete(rbdb)
net_data[external_net.EXTERNAL] = False
def _process_l3_delete(self, context, network_id):