diff --git a/senlin/drivers/os/lbaas.py b/senlin/drivers/os/lbaas.py index 52782a5d1..12b2b464c 100644 --- a/senlin/drivers/os/lbaas.py +++ b/senlin/drivers/os/lbaas.py @@ -351,7 +351,7 @@ class LoadBalancerDriver(base.DriverBase): LOG.exception('Failed in removing member %(m)s from pool %(p)s: ' '%(ex)s', {'m': member_id, 'p': pool_id, 'ex': ex}) return None - res = self._wait_for_lb_ready(lb_id) + res = self._wait_for_lb_ready(lb_id, ignore_not_found=True) if res is False: LOG.error('Failed in deleting pool member (%s).', member_id) return None diff --git a/senlin/tests/unit/drivers/test_lbaas.py b/senlin/tests/unit/drivers/test_lbaas.py index 1a3af3e31..1bdc0d366 100644 --- a/senlin/tests/unit/drivers/test_lbaas.py +++ b/senlin/tests/unit/drivers/test_lbaas.py @@ -661,7 +661,7 @@ class TestOctaviaLBaaSDriver(base.SenlinTestCase): self.assertTrue(res) self.oc.pool_member_delete.assert_called_once_with(pool_id, member_id) self.lb_driver._wait_for_lb_ready.assert_has_calls( - [mock.call(lb_id), mock.call(lb_id)]) + [mock.call(lb_id), mock.call(lb_id, ignore_not_found=True)]) def test_member_remove_lb_unready_for_member_delete(self): self.lb_driver._wait_for_lb_ready = mock.Mock() @@ -690,4 +690,4 @@ class TestOctaviaLBaaSDriver(base.SenlinTestCase): res = self.lb_driver.member_remove('LB_ID', 'POOL_ID', 'MEMBER_ID') self.assertIsNone(res) self.lb_driver._wait_for_lb_ready.assert_has_calls( - [mock.call('LB_ID'), mock.call('LB_ID')]) + [mock.call('LB_ID'), mock.call('LB_ID', ignore_not_found=True)])