x
/
vmware-nsx
Code Issues Proposed changes

Merge "NSX|P Fix network update rollback in case of NSX error"

This commit is contained in:
Zuul 2019-06-27 12:18:48 +00:00 committed by Gerrit Code Review
parent 41392c8cec 105bbfabd5
commit bcf7d24fc6
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vmware_nsx/plugins/nsx_p/plugin.py
View File

@ -817,6 +817,10 @@ class NsxPolicyPlugin(nsx_plugin_common.NsxPluginV3Base):
LOG.exception("Unable to update NSX backend, rolling "
"back changes on neutron")
with excutils.save_and_reraise_exception():
# remove the AZ from the network before rollback because
# it is read only, and breaks the rollback
if 'availability_zone_hints' in original_net:
del original_net['availability_zone_hints']
super(NsxPolicyPlugin, self).update_network(
context, network_id, {'network': original_net})