NSX|V3: Do not fail on router rollback

When rotuer interface creation fails, the plugin rolls it back.
If the rollback also fails it should only log it, and keep the
original exceprion of hte creation failure

Change-Id: Ic2bc51ed7172ddb71b274164a16fda2218ed6d8a
This commit is contained in:
Adit Sarfaty 2018-10-24 11:45:59 +03:00
parent f17bc33284
commit 684bbdd956

View File

@ -4392,8 +4392,13 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
LOG.error("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)
try:
self.remove_router_interface(
context, router_id, interface_info)
except Exception:
# rollback also failed
LOG.error("Neutron rollback failed to remove router "
"interface on router %s.", router_id)
return info
def remove_router_interface(self, context, router_id, interface_info):