Merge "NSX|V3: Enhance add router interface failure handle"

This commit is contained in:
Jenkins 2016-08-24 14:55:03 +00:00 committed by Gerrit Code Review
commit 9f8c500882

View File

@ -2477,8 +2477,11 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
# its DHCP port), by creating it if needed.
nsx_rpc.handle_router_metadata_access(self, context, router_id,
interface=info)
except nsx_lib_exc.ManagerError:
except Exception:
with excutils.save_and_reraise_exception():
LOG.error(_LE("Neutron failed to add_router_interface on "
"router %s, and would try to rollback."),
router_id)
self.remove_router_interface(
context, router_id, interface_info)
return info