Merge "The lb namespace can not be deleted"
This commit is contained in:
commit
448ff8eab9
|
@ -469,7 +469,8 @@ class ListenerManager(agent_device_driver.BaseListenerManager):
|
|||
else:
|
||||
# undeploy instance because haproxy will throw error if port is
|
||||
# missing in frontend
|
||||
self.driver.undeploy_instance(loadbalancer.id)
|
||||
self.driver.undeploy_instance(loadbalancer.id,
|
||||
delete_namespace=True)
|
||||
|
||||
|
||||
class PoolManager(agent_device_driver.BasePoolManager):
|
||||
|
|
|
@ -603,7 +603,8 @@ class TestListenerManager(BaseTestListenerManager):
|
|||
self.driver.reset_mock()
|
||||
self.listener_manager.delete(self.listener2)
|
||||
self.assertFalse(self.refresh.called)
|
||||
self.driver.undeploy_instance.assert_called_once_with(self.in_lb.id)
|
||||
self.driver.undeploy_instance.assert_called_once_with(
|
||||
self.in_lb.id, delete_namespace=True)
|
||||
|
||||
|
||||
class BaseTestPoolManager(BaseTestListenerManager):
|
||||
|
|
Loading…
Reference in New Issue