Merge "NSX|P: be more careful when deleting a network" into stable/train

This commit is contained in:
Zuul 2019-12-19 12:21:03 +00:00 committed by Gerrit Code Review
commit dff1cf6283
1 changed files with 2 additions and 1 deletions

View File

@ -837,7 +837,8 @@ class NsxPolicyPlugin(nsx_plugin_common.NsxPluginV3Base):
if network_id in NET_NEUTRON_2_NSX_ID_CACHE:
nsx_id = NET_NEUTRON_2_NSX_ID_CACHE[network_id]
del NET_NEUTRON_2_NSX_ID_CACHE[network_id]
del NET_NSX_2_NEUTRON_ID_CACHE[nsx_id]
if nsx_id in NET_NSX_2_NEUTRON_ID_CACHE:
del NET_NSX_2_NEUTRON_ID_CACHE[nsx_id]
def update_network(self, context, network_id, network):
original_net = super(NsxPolicyPlugin, self).get_network(