Merge "NSX|P: be more careful when deleting a network"
This commit is contained in:
commit
75e9b31a8e
@ -837,7 +837,8 @@ class NsxPolicyPlugin(nsx_plugin_common.NsxPluginV3Base):
|
|||||||
if network_id in NET_NEUTRON_2_NSX_ID_CACHE:
|
if network_id in NET_NEUTRON_2_NSX_ID_CACHE:
|
||||||
nsx_id = NET_NEUTRON_2_NSX_ID_CACHE[network_id]
|
nsx_id = NET_NEUTRON_2_NSX_ID_CACHE[network_id]
|
||||||
del 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):
|
def update_network(self, context, network_id, network):
|
||||||
original_net = super(NsxPolicyPlugin, self).get_network(
|
original_net = super(NsxPolicyPlugin, self).get_network(
|
||||||
|
Loading…
Reference in New Issue
Block a user