openstack/octavia
Code Issues Proposed changes

Optimize Taskflow storage (remove some requires parameter)

Browse Source 
flows have been optimized to limit the amount of data being stored.
* member object is stored in flow, hence member_id can easily be retrieved
* same with vip and load_balancer

Change-Id: I85c1f55dc7faa412dcb649bd09a845c674ea853c
Closes-Bug: #1461686
This commit is contained in:
Bertrand Lallau 2015-09-03 16:22:52 +02:00 committed by Bertrand Lallau
parent d2ee56469a
commit 608d0a317c
14 changed files with 66 additions and 115 deletions

38
octavia/controller/worker/controller_worker.py

@ -96,7 +96,6 @@ class ControllerWorker(base_taskflow.BaseTaskFlowEngine):
listener = health_mon.pool.listener
health_mon.pool.health_monitor = health_mon
listener.default_pool = health_mon.pool
vip = health_mon.pool.listener.load_balancer.vip
load_balancer = health_mon.pool.listener.load_balancer
create_hm_tf = self._taskflow_load(self._health_monitor_flows.
@ -105,8 +104,7 @@ class ControllerWorker(base_taskflow.BaseTaskFlowEngine):
health_mon,
constants.LISTENER: listener,
constants.LOADBALANCER:
load_balancer,
constants.VIP: vip})
load_balancer})
with tf_logging.DynamicLoggingListener(create_hm_tf,
log=LOG):
create_hm_tf.run()
@ -123,14 +121,13 @@ class ControllerWorker(base_taskflow.BaseTaskFlowEngine):
listener = health_mon.pool.listener
listener.default_pool = health_mon.pool
vip = listener.load_balancer.vip
load_balancer = listener.load_balancer
delete_hm_tf = self._taskflow_load(
self._health_monitor_flows.get_delete_health_monitor_flow(),
store={constants.HEALTH_MON: health_mon, constants.POOL_ID:
pool_id, constants.LISTENER: listener,
constants.LOADBALANCER: load_balancer, constants.VIP: vip})
constants.LOADBALANCER: load_balancer})
with tf_logging.DynamicLoggingListener(delete_hm_tf,
log=LOG):
delete_hm_tf.run()
@ -149,7 +146,6 @@ class ControllerWorker(base_taskflow.BaseTaskFlowEngine):
listener = health_mon.pool.listener
health_mon.pool.health_monitor = health_mon
listener.default_pool = health_mon.pool
vip = health_mon.pool.listener.load_balancer.vip
load_balancer = health_mon.pool.listener.load_balancer
update_hm_tf = self._taskflow_load(self._health_monitor_flows.
@ -159,7 +155,6 @@ class ControllerWorker(base_taskflow.BaseTaskFlowEngine):
constants.LISTENER: listener,
constants.LOADBALANCER:
load_balancer,
constants.VIP: vip,
constants.UPDATE_DICT:
health_monitor_updates})
with tf_logging.DynamicLoggingListener(update_hm_tf,
@ -176,15 +171,13 @@ class ControllerWorker(base_taskflow.BaseTaskFlowEngine):
listener = self._listener_repo.get(db_apis.get_session(),
id=listener_id)
load_balancer = listener.load_balancer
vip = listener.load_balancer.vip
create_listener_tf = self._taskflow_load(self._listener_flows.
get_create_listener_flow(),
store={constants.LISTENER:
listener,
constants.LOADBALANCER:
load_balancer,
constants.VIP: vip})
load_balancer})
with tf_logging.DynamicLoggingListener(create_listener_tf,
log=LOG):
create_listener_tf.run()
@ -199,12 +192,11 @@ class ControllerWorker(base_taskflow.BaseTaskFlowEngine):
listener = self._listener_repo.get(db_apis.get_session(),
id=listener_id)
load_balancer = listener.load_balancer
vip = load_balancer.vip
delete_listener_tf = self._taskflow_load(
self._listener_flows.get_delete_listener_flow(),
store={constants.LOADBALANCER: load_balancer,
constants.LISTENER: listener, constants.VIP: vip})
constants.LISTENER: listener})
with tf_logging.DynamicLoggingListener(delete_listener_tf,
log=LOG):
delete_listener_tf.run()
@ -221,13 +213,11 @@ class ControllerWorker(base_taskflow.BaseTaskFlowEngine):
id=listener_id)
load_balancer = listener.load_balancer
vip = listener.load_balancer.vip
update_listener_tf = self._taskflow_load(self._listener_flows.
get_update_listener_flow(),
store={constants.LISTENER:
listener,
constants.VIP: vip,
constants.LOADBALANCER:
load_balancer,
constants.UPDATE_DICT:
@ -336,7 +326,6 @@ class ControllerWorker(base_taskflow.BaseTaskFlowEngine):
listener = member.pool.listener
listener.default_pool = member.pool
load_balancer = listener.load_balancer
vip = listener.load_balancer.vip
create_member_tf = self._taskflow_load(self._member_flows.
get_create_member_flow(),
@ -344,8 +333,7 @@ class ControllerWorker(base_taskflow.BaseTaskFlowEngine):
constants.LISTENER:
listener,
constants.LOADBALANCER:
load_balancer,
constants.VIP: vip})
load_balancer})
with tf_logging.DynamicLoggingListener(create_member_tf,
log=LOG):
create_member_tf.run()
@ -363,12 +351,10 @@ class ControllerWorker(base_taskflow.BaseTaskFlowEngine):
listener = member.pool.listener
listener.default_pool = member.pool
load_balancer = listener.load_balancer
vip = load_balancer.vip
delete_member_tf = self._taskflow_load(
self._member_flows.get_delete_member_flow(),
store={constants.MEMBER: member, constants.MEMBER_ID: member_id,
constants.LISTENER: listener, constants.VIP: vip,
store={constants.MEMBER: member, constants.LISTENER: listener,
constants.LOADBALANCER: load_balancer})
with tf_logging.DynamicLoggingListener(delete_member_tf,
log=LOG):
@ -388,7 +374,6 @@ class ControllerWorker(base_taskflow.BaseTaskFlowEngine):
listener = member.pool.listener
listener.default_pool = member.pool
load_balancer = listener.load_balancer
vip = listener.load_balancer.vip
update_member_tf = self._taskflow_load(self._member_flows.
get_update_member_flow(),
@ -397,7 +382,6 @@ class ControllerWorker(base_taskflow.BaseTaskFlowEngine):
listener,
constants.LOADBALANCER:
load_balancer,
constants.VIP: vip,
constants.UPDATE_DICT:
member_updates})
with tf_logging.DynamicLoggingListener(update_member_tf,
@ -417,7 +401,6 @@ class ControllerWorker(base_taskflow.BaseTaskFlowEngine):
listener = pool.listener
listener.default_pool = pool
load_balancer = listener.load_balancer
vip = listener.load_balancer.vip
create_pool_tf = self._taskflow_load(self._pool_flows.
get_create_pool_flow(),
@ -425,8 +408,7 @@ class ControllerWorker(base_taskflow.BaseTaskFlowEngine):
constants.LISTENER:
listener,
constants.LOADBALANCER:
load_balancer,
constants.VIP: vip})
load_balancer})
with tf_logging.DynamicLoggingListener(create_pool_tf,
log=LOG):
create_pool_tf.run()
@ -443,13 +425,11 @@ class ControllerWorker(base_taskflow.BaseTaskFlowEngine):
load_balancer = pool.listener.load_balancer
listener = pool.listener
vip = load_balancer.vip
delete_pool_tf = self._taskflow_load(
self._pool_flows.get_delete_pool_flow(),
store={constants.POOL: pool, constants.LISTENER: listener,
constants.LOADBALANCER: load_balancer,
constants.VIP: vip})
constants.LOADBALANCER: load_balancer})
with tf_logging.DynamicLoggingListener(delete_pool_tf,
log=LOG):
delete_pool_tf.run()
@ -468,7 +448,6 @@ class ControllerWorker(base_taskflow.BaseTaskFlowEngine):
listener = pool.listener
listener.default_pool = pool
load_balancer = listener.load_balancer
vip = listener.load_balancer.vip
update_pool_tf = self._taskflow_load(self._pool_flows.
get_update_pool_flow(),
@ -477,7 +456,6 @@ class ControllerWorker(base_taskflow.BaseTaskFlowEngine):
listener,
constants.LOADBALANCER:
load_balancer,
constants.VIP: vip,
constants.UPDATE_DICT:
pool_updates})
with tf_logging.DynamicLoggingListener(update_pool_tf,

6
octavia/controller/worker/flows/health_monitor_flows.py

@ -30,7 +30,7 @@ class HealthMonitorFlows(object):
"""
create_hm_flow = linear_flow.Flow(constants.CREATE_HEALTH_MONITOR_FLOW)
create_hm_flow.add(amphora_driver_tasks.ListenerUpdate(
requires=[constants.LISTENER, constants.VIP]))
requires=[constants.LOADBALANCER, constants.LISTENER]))
create_hm_flow.add(database_tasks.MarkLBAndListenerActiveInDB(
requires=[constants.LOADBALANCER, constants.LISTENER]))
@ -46,7 +46,7 @@ class HealthMonitorFlows(object):
DeleteModelObject(rebind={constants.OBJECT:
constants.HEALTH_MON}))
delete_hm_flow.add(amphora_driver_tasks.ListenerUpdate(
requires=[constants.LISTENER, constants.VIP]))
requires=[constants.LOADBALANCER, constants.LISTENER]))
delete_hm_flow.add(database_tasks.DeleteHealthMonitorInDB(
requires=constants.POOL_ID))
delete_hm_flow.add(database_tasks.MarkLBAndListenerActiveInDB(
@ -65,7 +65,7 @@ class HealthMonitorFlows(object):
rebind={constants.OBJECT: constants.HEALTH_MON},
requires=[constants.UPDATE_DICT]))
update_hm_flow.add(amphora_driver_tasks.ListenerUpdate(
requires=[constants.LISTENER, constants.VIP]))
requires=[constants.LOADBALANCER, constants.LISTENER]))
update_hm_flow.add(database_tasks.UpdateHealthMonInDB(
requires=[constants.HEALTH_MON, constants.UPDATE_DICT]))
update_hm_flow.add(database_tasks.MarkLBAndListenerActiveInDB(

6
octavia/controller/worker/flows/listener_flows.py

@ -37,7 +37,7 @@ class ListenerFlows(object):
requires='listener',
provides='listener'))
create_listener_flow.add(amphora_driver_tasks.ListenerUpdate(
requires=[constants.LISTENER, constants.VIP]))
requires=[constants.LOADBALANCER, constants.LISTENER]))
create_listener_flow.add(network_tasks.UpdateVIP(
requires=constants.LOADBALANCER))
create_listener_flow.add(database_tasks.
@ -53,7 +53,7 @@ class ListenerFlows(object):
"""
delete_listener_flow = linear_flow.Flow(constants.DELETE_LISTENER_FLOW)
delete_listener_flow.add(amphora_driver_tasks.ListenerDelete(
requires=[constants.LISTENER, constants.VIP]))
requires=[constants.LOADBALANCER, constants.LISTENER]))
delete_listener_flow.add(network_tasks.UpdateVIP(
requires=constants.LOADBALANCER))
delete_listener_flow.add(database_tasks.DeleteListenerInDB(
@ -75,7 +75,7 @@ class ListenerFlows(object):
constants.LISTENER},
requires=[constants.UPDATE_DICT]))
update_listener_flow.add(amphora_driver_tasks.ListenerUpdate(
requires=[constants.LISTENER, constants.VIP]))
requires=[constants.LOADBALANCER, constants.LISTENER]))
update_listener_flow.add(database_tasks.UpdateListenerInDB(
requires=[constants.LISTENER, constants.UPDATE_DICT]))
update_listener_flow.add(database_tasks.

8
octavia/controller/worker/flows/member_flows.py

@ -39,7 +39,7 @@ class MemberFlows(object):
requires=(constants.LOADBALANCER, constants.ADDED_PORTS)
))
create_member_flow.add(amphora_driver_tasks.ListenerUpdate(
requires=(constants.LISTENER, constants.VIP)))
requires=(constants.LOADBALANCER, constants.LISTENER)))
create_member_flow.add(database_tasks.
MarkLBAndListenerActiveInDB(
requires=(constants.LOADBALANCER,
@ -57,9 +57,9 @@ class MemberFlows(object):
DeleteModelObject(rebind={constants.OBJECT:
constants.MEMBER}))
delete_member_flow.add(amphora_driver_tasks.ListenerUpdate(
requires=[constants.LISTENER, constants.VIP]))
requires=[constants.LOADBALANCER, constants.LISTENER]))
delete_member_flow.add(database_tasks.DeleteMemberInDB(
requires=constants.MEMBER_ID))
requires=constants.MEMBER))
delete_member_flow.add(database_tasks.
MarkLBAndListenerActiveInDB(
requires=[constants.LOADBALANCER,
@ -78,7 +78,7 @@ class MemberFlows(object):
rebind={constants.OBJECT: constants.MEMBER},
requires=[constants.UPDATE_DICT]))
update_member_flow.add(amphora_driver_tasks.ListenerUpdate(
requires=[constants.LISTENER, constants.VIP]))
requires=[constants.LOADBALANCER, constants.LISTENER]))
update_member_flow.add(database_tasks.UpdateMemberInDB(
requires=[constants.MEMBER, constants.UPDATE_DICT]))
update_member_flow.add(database_tasks.

6
octavia/controller/worker/flows/pool_flows.py

@ -30,7 +30,7 @@ class PoolFlows(object):
"""
create_pool_flow = linear_flow.Flow(constants.CREATE_POOL_FLOW)
create_pool_flow.add(amphora_driver_tasks.ListenerUpdate(
requires=[constants.LISTENER, constants.VIP]))
requires=[constants.LOADBALANCER, constants.LISTENER]))
create_pool_flow.add(database_tasks.MarkLBAndListenerActiveInDB(
requires=[constants.LOADBALANCER, constants.LISTENER]))
@ -45,7 +45,7 @@ class PoolFlows(object):
delete_pool_flow.add(model_tasks.DeleteModelObject(
rebind={constants.OBJECT: constants.POOL}))
delete_pool_flow.add(amphora_driver_tasks.ListenerUpdate(
requires=[constants.LISTENER, constants.VIP]))
requires=[constants.LOADBALANCER, constants.LISTENER]))
delete_pool_flow.add(database_tasks.DeletePoolInDB(
requires=constants.POOL))
delete_pool_flow.add(database_tasks.MarkLBAndListenerActiveInDB(
@ -64,7 +64,7 @@ class PoolFlows(object):
rebind={constants.OBJECT: constants.POOL},
requires=[constants.UPDATE_DICT]))
update_pool_flow.add(amphora_driver_tasks.ListenerUpdate(
requires=[constants.LISTENER, constants.VIP]))
requires=[constants.LOADBALANCER, constants.LISTENER]))
update_pool_flow.add(database_tasks.UpdatePoolInDB(
requires=[constants.POOL, constants.UPDATE_DICT]))
update_pool_flow.add(database_tasks.MarkLBAndListenerActiveInDB(

16
octavia/controller/worker/tasks/amphora_driver_tasks.py

@ -48,14 +48,14 @@ class BaseAmphoraTask(task.Task):
class ListenerUpdate(BaseAmphoraTask):
"""Task to update an amphora with new configuration for the listener."""
def execute(self, listener, vip):
def execute(self, loadbalancer, listener):
"""Execute listener update routines for an amphora."""
# Ideally this shouldn't be needed. This is a workaround, for a not
# very well understood bug not related to Octavia.
# https://bugs.launchpad.net/octavia/+bug/1492493
listener = self.listener_repo.get(db_apis.get_session(),
id=listener.id)
self.amphora_driver.update(listener, vip)
self.amphora_driver.update(listener, loadbalancer.vip)
LOG.debug("Updated amphora with new configuration for listener")
def revert(self, listener, *args, **kwargs):
@ -88,9 +88,9 @@ class ListenersUpdate(BaseAmphoraTask):
class ListenerStop(BaseAmphoraTask):
"""Task to stop the listener on the vip."""
def execute(self, listener, vip):
def execute(self, loadbalancer, listener):
"""Execute listener stop routines for an amphora."""
self.amphora_driver.stop(listener, vip)
self.amphora_driver.stop(listener, loadbalancer.vip)
LOG.debug("Stopped the listener on the vip")
def revert(self, listener, *args, **kwargs):
@ -105,9 +105,9 @@ class ListenerStop(BaseAmphoraTask):
class ListenerStart(BaseAmphoraTask):
"""Task to start the listener on the vip."""
def execute(self, listener, vip):
def execute(self, loadbalancer, listener):
"""Execute listener start routines for an amphora."""
self.amphora_driver.start(listener, vip)
self.amphora_driver.start(listener, loadbalancer.vip)
LOG.debug("Started the listener on the vip")
def revert(self, listener, *args, **kwargs):
@ -141,9 +141,9 @@ class ListenersStart(BaseAmphoraTask):
class ListenerDelete(BaseAmphoraTask):
"""Task to delete the listener on the vip."""
def execute(self, listener, vip):
def execute(self, loadbalancer, listener):
"""Execute listener delete routines for an amphora."""
self.amphora_driver.delete(listener, vip)
self.amphora_driver.delete(listener, loadbalancer.vip)
LOG.debug("Deleted the listener on the vip")
def revert(self, listener, *args, **kwargs):

12
octavia/controller/worker/tasks/database_tasks.py

@ -133,24 +133,24 @@ class DeleteMemberInDB(BaseDatabaseTask):
Since sqlalchemy will likely retry by itself always revert if it fails
"""
def execute(self, member_id):
def execute(self, member):
"""Delete the member in the DB
:param member_id: The member ID to be deleted
:param member: The member to be deleted
:returns: None
"""
LOG.debug("DB delete member for id: %s ", member_id)
self.member_repo.delete(db_apis.get_session(), id=member_id)
LOG.debug("DB delete member for id: %s ", member.id)
self.member_repo.delete(db_apis.get_session(), id=member.id)
def revert(self, member_id, *args, **kwargs):
def revert(self, member, *args, **kwargs):
"""Mark the member ERROR since the delete couldn't happen
:returns: None
"""
LOG.warn(_LW("Reverting delete in DB "
"for member id %s"), member_id)
"for member id %s"), member.id)
# TODO(johnsom) fix this
# self.member_repo.update(db_apis.get_session(), member.id,
# operating_status=constants.ERROR)

9
octavia/tests/unit/controller/worker/flows/test_health_monitor_flows.py

@ -36,9 +36,8 @@ class TestHealthMonitorFlows(base.TestCase):
self.assertIn(constants.LISTENER, health_mon_flow.requires)
self.assertIn(constants.LOADBALANCER, health_mon_flow.requires)
self.assertIn(constants.VIP, health_mon_flow.requires)
self.assertEqual(3, len(health_mon_flow.requires))
self.assertEqual(2, len(health_mon_flow.requires))
self.assertEqual(0, len(health_mon_flow.provides))
def test_get_delete_health_monitor_flow(self):
@ -51,9 +50,8 @@ class TestHealthMonitorFlows(base.TestCase):
self.assertIn(constants.HEALTH_MON, health_mon_flow.requires)
self.assertIn(constants.POOL_ID, health_mon_flow.requires)
self.assertIn(constants.LISTENER, health_mon_flow.requires)
self.assertIn(constants.VIP, health_mon_flow.requires)
self.assertEqual(5, len(health_mon_flow.requires))
self.assertEqual(4, len(health_mon_flow.requires))
self.assertEqual(0, len(health_mon_flow.provides))
def test_get_update_health_monitor_flow(self):
@ -65,9 +63,8 @@ class TestHealthMonitorFlows(base.TestCase):
self.assertIn(constants.LISTENER, health_mon_flow.requires)
self.assertIn(constants.LOADBALANCER, health_mon_flow.requires)
self.assertIn(constants.VIP, health_mon_flow.requires)
self.assertIn(constants.HEALTH_MON, health_mon_flow.requires)
self.assertIn(constants.UPDATE_DICT, health_mon_flow.requires)
self.assertEqual(5, len(health_mon_flow.requires))
self.assertEqual(4, len(health_mon_flow.requires))
self.assertEqual(0, len(health_mon_flow.provides))

9
octavia/tests/unit/controller/worker/flows/test_listener_flows.py

@ -35,9 +35,8 @@ class TestListenerFlows(base.TestCase):
self.assertIn(constants.LISTENER, listener_flow.requires)
self.assertIn(constants.LOADBALANCER, listener_flow.requires)
self.assertIn(constants.VIP, listener_flow.requires)
self.assertEqual(3, len(listener_flow.requires))
self.assertEqual(2, len(listener_flow.requires))
self.assertEqual(1, len(listener_flow.provides))
def test_get_delete_listener_flow(self):
@ -48,9 +47,8 @@ class TestListenerFlows(base.TestCase):
self.assertIn(constants.LISTENER, listener_flow.requires)
self.assertIn(constants.LOADBALANCER, listener_flow.requires)
self.assertIn(constants.VIP, listener_flow.requires)
self.assertEqual(3, len(listener_flow.requires))
self.assertEqual(2, len(listener_flow.requires))
self.assertEqual(0, len(listener_flow.provides))
def test_get_update_listener_flow(self):
@ -61,8 +59,7 @@ class TestListenerFlows(base.TestCase):
self.assertIn(constants.LISTENER, listener_flow.requires)
self.assertIn(constants.LOADBALANCER, listener_flow.requires)
self.assertIn(constants.VIP, listener_flow.requires)
self.assertIn(constants.UPDATE_DICT, listener_flow.requires)
self.assertEqual(4, len(listener_flow.requires))
self.assertEqual(3, len(listener_flow.requires))
self.assertEqual(0, len(listener_flow.provides))

10
octavia/tests/unit/controller/worker/flows/test_member_flows.py

@ -35,9 +35,8 @@ class TestMemberFlows(base.TestCase):
self.assertIn(constants.LISTENER, member_flow.requires)
self.assertIn(constants.LOADBALANCER, member_flow.requires)
self.assertIn(constants.VIP, member_flow.requires)
self.assertEqual(3, len(member_flow.requires))
self.assertEqual(2, len(member_flow.requires))
self.assertEqual(2, len(member_flow.provides))
def test_get_delete_member_flow(self):
@ -49,10 +48,8 @@ class TestMemberFlows(base.TestCase):
self.assertIn(constants.LISTENER, member_flow.requires)
self.assertIn(constants.LOADBALANCER, member_flow.requires)
self.assertIn(constants.MEMBER, member_flow.requires)
self.assertIn(constants.MEMBER_ID, member_flow.requires)
self.assertIn(constants.VIP, member_flow.requires)
self.assertEqual(5, len(member_flow.requires))
self.assertEqual(3, len(member_flow.requires))
self.assertEqual(0, len(member_flow.provides))
def test_get_update_member_flow(self):
@ -63,8 +60,7 @@ class TestMemberFlows(base.TestCase):
self.assertIn(constants.LISTENER, member_flow.requires)
self.assertIn(constants.LOADBALANCER, member_flow.requires)
self.assertIn(constants.VIP, member_flow.requires)
self.assertIn(constants.UPDATE_DICT, member_flow.requires)
self.assertEqual(5, len(member_flow.requires))
self.assertEqual(4, len(member_flow.requires))
self.assertEqual(0, len(member_flow.provides))

9
octavia/tests/unit/controller/worker/flows/test_pool_flows.py

@ -35,9 +35,8 @@ class TestPoolFlows(base.TestCase):
self.assertIn(constants.LISTENER, pool_flow.requires)
self.assertIn(constants.LOADBALANCER, pool_flow.requires)
self.assertIn(constants.VIP, pool_flow.requires)
self.assertEqual(3, len(pool_flow.requires))
self.assertEqual(2, len(pool_flow.requires))
self.assertEqual(0, len(pool_flow.provides))
def test_get_delete_pool_flow(self):
@ -48,10 +47,9 @@ class TestPoolFlows(base.TestCase):
self.assertIn(constants.LISTENER, pool_flow.requires)
self.assertIn(constants.LOADBALANCER, pool_flow.requires)
self.assertIn(constants.VIP, pool_flow.requires)
self.assertIn(constants.POOL, pool_flow.requires)
self.assertEqual(4, len(pool_flow.requires))
self.assertEqual(3, len(pool_flow.requires))
self.assertEqual(0, len(pool_flow.provides))
def test_get_update_pool_flow(self):
@ -63,8 +61,7 @@ class TestPoolFlows(base.TestCase):
self.assertIn(constants.POOL, pool_flow.requires)
self.assertIn(constants.LISTENER, pool_flow.requires)
self.assertIn(constants.LOADBALANCER, pool_flow.requires)
self.assertIn(constants.VIP, pool_flow.requires)
self.assertIn(constants.UPDATE_DICT, pool_flow.requires)
self.assertEqual(5, len(pool_flow.requires))
self.assertEqual(4, len(pool_flow.requires))
self.assertEqual(0, len(pool_flow.provides))

23
octavia/tests/unit/controller/worker/tasks/test_amphora_driver_tasks.py

@ -32,7 +32,10 @@ _amphora_mock = mock.MagicMock()
_amphora_mock.id = AMP_ID
_listener_mock = mock.MagicMock()
_listener_mock.id = LISTENER_ID
_load_balancer_mock = mock.MagicMock()
_load_balancer_mock.id = LB_ID
_vip_mock = mock.MagicMock()
_load_balancer_mock.vip = _vip_mock
_LB_mock = mock.MagicMock()
_amphorae_mock = [_amphora_mock]
_network_mock = mock.MagicMock()
@ -67,10 +70,9 @@ class TestAmphoraDriverTasks(base.TestCase):
mock_amphora_repo_update):
listener_update_obj = amphora_driver_tasks.ListenerUpdate()
listener_update_obj.execute(_listener_mock, _vip_mock)
listener_update_obj.execute(_load_balancer_mock, _listener_mock)
mock_driver.update.assert_called_once_with(
_listener_mock, _vip_mock)
mock_driver.update.assert_called_once_with(_listener_mock, _vip_mock)
# Test the revert
amp = listener_update_obj.revert(_listener_mock)
@ -90,10 +92,9 @@ class TestAmphoraDriverTasks(base.TestCase):
mock_amphora_repo_update):
listener_stop_obj = amphora_driver_tasks.ListenerStop()
listener_stop_obj.execute(_listener_mock, _vip_mock)
listener_stop_obj.execute(_load_balancer_mock, _listener_mock)
mock_driver.stop.assert_called_once_with(
_listener_mock, _vip_mock)
mock_driver.stop.assert_called_once_with(_listener_mock, _vip_mock)
# Test the revert
amp = listener_stop_obj.revert(_listener_mock)
@ -113,10 +114,9 @@ class TestAmphoraDriverTasks(base.TestCase):
mock_amphora_repo_update):
listener_start_obj = amphora_driver_tasks.ListenerStart()
listener_start_obj.execute(_listener_mock, _vip_mock)
listener_start_obj.execute(_load_balancer_mock, _listener_mock)
mock_driver.start.assert_called_once_with(
_listener_mock, _vip_mock)
mock_driver.start.assert_called_once_with(_listener_mock, _vip_mock)
# Test the revert
amp = listener_start_obj.revert(_listener_mock)
@ -136,10 +136,9 @@ class TestAmphoraDriverTasks(base.TestCase):
mock_amphora_repo_update):
listener_delete_obj = amphora_driver_tasks.ListenerDelete()
listener_delete_obj.execute(_listener_mock, _vip_mock)
listener_delete_obj.execute(_load_balancer_mock, _listener_mock)
mock_driver.delete.assert_called_once_with(
_listener_mock, _vip_mock)
mock_driver.delete.assert_called_once_with(_listener_mock, _vip_mock)
# Test the revert
amp = listener_delete_obj.revert(_listener_mock)

4
octavia/tests/unit/controller/worker/tasks/test_database_tasks.py

@ -209,7 +209,7 @@ class TestDatabaseTasks(base.TestCase):
mock_amphora_repo_delete):
delete_member = database_tasks.DeleteMemberInDB()
delete_member.execute(MEMBER_ID)
delete_member.execute(self.member_mock)
repo.MemberRepository.delete.assert_called_once_with(
'TEST',
@ -218,7 +218,7 @@ class TestDatabaseTasks(base.TestCase):
# Test the revert
mock_member_repo_delete.reset_mock()
delete_member.revert(MEMBER_ID)
delete_member.revert(self.member_mock)
# TODO(johnsom) Fix
# repo.MemberRepository.delete.assert_called_once_with(

25
octavia/tests/unit/controller/worker/test_controller_worker.py

@ -175,8 +175,7 @@ class TestControllerWorker(base.TestCase):
constants.LISTENER:
_listener_mock,
constants.LOADBALANCER:
_load_balancer_mock,
constants.VIP: _vip_mock}))
_load_balancer_mock}))
_flow_mock.run.assert_called_once_with()
@ -209,8 +208,7 @@ class TestControllerWorker(base.TestCase):
constants.LISTENER:
_listener_mock,
constants.LOADBALANCER:
_load_balancer_mock,
constants.VIP: _vip_mock}))
_load_balancer_mock}))
_flow_mock.run.assert_called_once_with()
@ -244,7 +242,6 @@ class TestControllerWorker(base.TestCase):
_listener_mock,
constants.LOADBALANCER:
_load_balancer_mock,
constants.VIP: _vip_mock,
constants.UPDATE_DICT:
HEALTH_UPDATE_DICT}))
@ -275,8 +272,7 @@ class TestControllerWorker(base.TestCase):
store={constants.LISTENER:
_listener_mock,
constants.LOADBALANCER:
_load_balancer_mock,
constants.VIP: _vip_mock}))
_load_balancer_mock}))
_flow_mock.run.assert_called_once_with()
@ -303,7 +299,6 @@ class TestControllerWorker(base.TestCase):
(base_taskflow.BaseTaskFlowEngine._taskflow_load.
assert_called_once_with(
_flow_mock, store={constants.LISTENER: _listener_mock,
constants.VIP: _vip_mock,
constants.LOADBALANCER: _load_balancer_mock}))
_flow_mock.run.assert_called_once_with()
@ -331,7 +326,6 @@ class TestControllerWorker(base.TestCase):
(base_taskflow.BaseTaskFlowEngine._taskflow_load.
assert_called_once_with(_flow_mock,
store={constants.LISTENER: _listener_mock,
constants.VIP: _vip_mock,
constants.LOADBALANCER:
_load_balancer_mock,
constants.UPDATE_DICT:
@ -495,8 +489,7 @@ class TestControllerWorker(base.TestCase):
store={constants.MEMBER: _member_mock,
constants.LISTENER: _listener_mock,
constants.LOADBALANCER:
_load_balancer_mock,
constants.VIP: _vip_mock}))
_load_balancer_mock}))
_flow_mock.run.assert_called_once_with()
@ -523,9 +516,7 @@ class TestControllerWorker(base.TestCase):
(base_taskflow.BaseTaskFlowEngine._taskflow_load.
assert_called_once_with(
_flow_mock, store={constants.MEMBER: _member_mock,
constants.MEMBER_ID: MEMBER_ID,
constants.LISTENER: _listener_mock,
constants.VIP: _vip_mock,
constants.LOADBALANCER:
_load_balancer_mock}))
@ -557,7 +548,6 @@ class TestControllerWorker(base.TestCase):
constants.LISTENER: _listener_mock,
constants.LOADBALANCER:
_load_balancer_mock,
constants.VIP: _vip_mock,
constants.UPDATE_DICT:
MEMBER_UPDATE_DICT}))
@ -588,8 +578,7 @@ class TestControllerWorker(base.TestCase):
store={constants.POOL: _pool_mock,
constants.LISTENER: _listener_mock,
constants.LOADBALANCER:
_load_balancer_mock,
constants.VIP: _vip_mock}))
_load_balancer_mock}))
_flow_mock.run.assert_called_once_with()
@ -618,8 +607,7 @@ class TestControllerWorker(base.TestCase):
store={constants.POOL: _pool_mock,
constants.LISTENER: _listener_mock,
constants.LOADBALANCER:
_load_balancer_mock,
constants.VIP: _vip_mock}))
_load_balancer_mock}))
_flow_mock.run.assert_called_once_with()
@ -649,7 +637,6 @@ class TestControllerWorker(base.TestCase):
constants.LISTENER: _listener_mock,
constants.LOADBALANCER:
_load_balancer_mock,
constants.VIP: _vip_mock,
constants.UPDATE_DICT:
POOL_UPDATE_DICT}))