openstack
/
neutron-lbaas
Code Issues Proposed changes

Merge "The lb namespace can not be deleted"

This commit is contained in:
Jenkins 2017-01-26 23:56:43 +00:00 committed by Gerrit Code Review
parent 19b2da8a3f 9073940a82
commit 448ff8eab9
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron_lbaas/drivers/haproxy/namespace_driver.py
View File

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

3
neutron_lbaas/tests/unit/drivers/haproxy/test_namespace_driver.py
View File

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