Merge "Ensure net dict has provider info on precommit delete" into stable/victoria
This commit is contained in:
commit
407fdfacdb
|
@ -1201,8 +1201,12 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2,
|
||||||
priority=0)
|
priority=0)
|
||||||
def _network_delete_precommit_handler(self, rtype, event, trigger,
|
def _network_delete_precommit_handler(self, rtype, event, trigger,
|
||||||
context, network_id, **kwargs):
|
context, network_id, **kwargs):
|
||||||
network = (kwargs.get('network') or
|
if 'network' in kwargs:
|
||||||
self.get_network(context, network_id))
|
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,
|
mech_context = driver_context.NetworkContext(self,
|
||||||
context,
|
context,
|
||||||
network)
|
network)
|
||||||
|
|
Loading…
Reference in New Issue