From a3b33ee499f527eb487d5218454374d8a5d8621d Mon Sep 17 00:00:00 2001 From: Kobi Samoray Date: Tue, 12 Dec 2017 13:31:44 +0200 Subject: [PATCH] NSXv: Handle LBaaSv2 listener inconsistency When backend is inconsistent with Neutron DB, resume LB listener deletion. Change-Id: Iedf65d17468b66cf01427fc16394201d83084b2f --- vmware_nsx/services/lbaas/nsx_v/v2/listener_mgr.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/vmware_nsx/services/lbaas/nsx_v/v2/listener_mgr.py b/vmware_nsx/services/lbaas/nsx_v/v2/listener_mgr.py index 746f81b287..91d4eb9359 100644 --- a/vmware_nsx/services/lbaas/nsx_v/v2/listener_mgr.py +++ b/vmware_nsx/services/lbaas/nsx_v/v2/listener_mgr.py @@ -288,10 +288,7 @@ class EdgeListenerManager(base_mgr.EdgeLoadbalancerBaseManager): except vcns_exc.ResourceNotFound: LOG.error('vip not found on edge: %s', edge_id) except vcns_exc.VcnsApiException: - with excutils.save_and_reraise_exception(): - self.lbv2_driver.listener.failed_completion(context, - listener) - LOG.error('Failed to delete vip on edge: %s', edge_id) + LOG.error('Failed to delete vip on edge: %s', edge_id) try: with locking.LockManager.get_lock(edge_id): @@ -299,12 +296,7 @@ class EdgeListenerManager(base_mgr.EdgeLoadbalancerBaseManager): except vcns_exc.ResourceNotFound: LOG.error('app profile not found on edge: %s', edge_id) except vcns_exc.VcnsApiException: - with excutils.save_and_reraise_exception(): - self.lbv2_driver.listener.failed_completion(context, - listener) - LOG.error( - 'Failed to delete app profile on Edge: %s', - edge_id) + LOG.error('Failed to delete app profile on Edge: %s', edge_id) nsxv_db.del_nsxv_lbaas_listener_binding(context.session, lb_id, listener.id)