x/vmware-nsx
Code Issues Proposed changes

Fix empty network deletion in db_base_plugin for postgresql

Browse Source 
Need to disable joined loads for port query in delete_network
as in other methods.

No unit test is being added, because the problem is not reproducible with
sqlite.

Closes-Bug: #1261652

Change-Id: I7a015be6f2f9b8ae43bc29a767d16af30120f13f
This commit is contained in:
Eugene Nikanorov 2013-12-22 00:48:48 +04:00
parent d9f66fc76b
commit cd0389c12e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
neutron/db/db_base_plugin_v2.py
View File

@ -991,8 +991,10 @@ class NeutronDbPluginV2(neutron_plugin_base_v2.NeutronPluginBaseV2,
filters = {'network_id': [id]} filters = {'network_id': [id]}
# NOTE(armando-migliaccio): stick with base plugin # NOTE(armando-migliaccio): stick with base plugin
ports = self._get_ports_query( query = context.session.query(
context, filters=filters).with_lockmode('update') models_v2.Port).enable_eagerloads(False)
ports = self._apply_filters_to_query(
query, models_v2.Port, filters).with_lockmode('update')
# check if there are any tenant owned ports in-use # check if there are any tenant owned ports in-use
only_auto_del = all(p['device_owner'] in AUTO_DELETE_PORT_OWNERS only_auto_del = all(p['device_owner'] in AUTO_DELETE_PORT_OWNERS