From eb95abb7c03eaef28f675881430780418e1b9d65 Mon Sep 17 00:00:00 2001 From: Bo Lin Date: Wed, 24 Feb 2016 02:30:43 +0000 Subject: [PATCH] Revert "Move router db call ahead of backend call" This reverts commit e4f1f85d1c9e6a0d1e80d65ea7e5a62e56bdcc5b. Change-Id: I302496a639157abce3521ca369ad15f9ba00deef --- vmware_nsx/plugins/nsx_v3/plugin.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/vmware_nsx/plugins/nsx_v3/plugin.py b/vmware_nsx/plugins/nsx_v3/plugin.py index b06ae1c16f..7ed0cbc093 100644 --- a/vmware_nsx/plugins/nsx_v3/plugin.py +++ b/vmware_nsx/plugins/nsx_v3/plugin.py @@ -1459,8 +1459,6 @@ class NsxV3Plugin(addr_pair_db.AllowedAddressPairsMixin, else: raise l3.RouterInterfaceNotFoundForSubnet(router_id=router_id, subnet_id=subnet_id) - info = super(NsxV3Plugin, self).remove_router_interface( - context, router_id, interface_info) try: # TODO(berlin): Revocate announce the subnet on tier0 if # enable_snat is False @@ -1492,12 +1490,8 @@ class NsxV3Plugin(addr_pair_db.AllowedAddressPairsMixin, "%(net_id)s not found at the backend"), {'router_id': router_id, 'net_id': subnet['network_id']}) - except nsx_exc.ManagerError: - with excutils.save_and_reraise_exception(): - LOG.exception(_LE("Failed to update router %(id)s at the " - "backend. The error would lead to mapping " - "inconsistency on this router!"), - {'id': router_id}) + info = super(NsxV3Plugin, self).remove_router_interface( + context, router_id, interface_info) # Ensure the connection to the 'metadata access network' is removed # (with the network) if this the last subnet on the router. nsx_rpc.handle_router_metadata_access(self, context, router_id)