openstack
/
neutron
Code Issues Proposed changes

Merge "Ensure net dict has provider info on precommit delete" into stable/train

This commit is contained in:
Zuul 2021-09-15 14:49:22 +00:00 committed by Gerrit Code Review
parent 68b7aaf500 7086cf8d5c
commit 9c255bc1a3
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
neutron/plugins/ml2/plugin.py
View File

@ -1200,8 +1200,12 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2,
priority=0)
def _network_delete_precommit_handler(self, rtype, event, trigger,
context, network_id, **kwargs):
network = (kwargs.get('network') or
self.get_network(context, network_id))
if 'network' in kwargs:
network = kwargs['network']
self.type_manager.extend_network_dict_provider(context, network)
else:
network = self.get_network(context, network_id)
mech_context = driver_context.NetworkContext(self,
context,
network)