From b48b84b19b51caff2f82b354d6fa4f155113bca7 Mon Sep 17 00:00:00 2001 From: Kobi Samoray Date: Wed, 13 Feb 2019 17:07:28 +0200 Subject: [PATCH] NSXP LB: Remove monitor only if pool has it The code attempts to remove a monitor from the pool even if the pool doesn't use the monitor. Although this condition is invalid, it may occur due to inconsistencies between Neutron and the backend. When such inconsistency occurs, we could raise an exception. But, as this is a delete operation, and the users wants this to be gone - if it's not there, then we are good... Change-Id: Ifce56be6846b85130ea716c95a11be4d33db177b --- vmware_nsxlib/v3/policy/lb_resources.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vmware_nsxlib/v3/policy/lb_resources.py b/vmware_nsxlib/v3/policy/lb_resources.py index ab707697..43a13a7e 100644 --- a/vmware_nsxlib/v3/policy/lb_resources.py +++ b/vmware_nsxlib/v3/policy/lb_resources.py @@ -425,8 +425,9 @@ class NsxPolicyLoadBalancerPoolApi(NsxPolicyResourceBase): lb_pool_id=lb_pool_id, tenant=tenant) lb_pool = self.policy_api.get(lb_pool_def) monitor_paths = lb_pool.get('active_monitor_paths', []) - monitor_paths.remove(monitor_path) - self.update(lb_pool_id, active_monitor_paths=monitor_paths) + if monitor_path in monitor_paths: + monitor_paths.remove(monitor_path) + self.update(lb_pool_id, active_monitor_paths=monitor_paths) def create_pool_member_and_add_to_pool( self, lb_pool_id, ip_address, port=None,