openstack
/
senlin
Code Issues Proposed changes

Merge "Fix detach LB policy when LB is not in ACTIVE and ONLINE"

This commit is contained in:
Zuul 2019-03-06 00:11:03 +00:00 committed by Gerrit Code Review
parent 71d9a66abe 9a52f4a311
commit fefdb2c674
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
senlin/drivers/os/lbaas.py
View File

@ -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

4
senlin/tests/unit/drivers/test_lbaas.py
View File

@ -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)])