Unify constants usage in flows tests

Change-Id: I43176c5701070d20352e08b492a86b3997014755
This commit is contained in:
Bertrand Lallau 2015-11-12 16:15:56 +01:00 committed by Michael Johnson
parent 51fb13dd8f
commit 3d1f10bce3
6 changed files with 126 additions and 101 deletions

@ -15,6 +15,7 @@
from taskflow.patterns import linear_flow as flow
from octavia.common import constants
from octavia.controller.worker.flows import health_monitor_flows
import octavia.tests.unit.base as base
@ -33,9 +34,9 @@ class TestHealthMonitorFlows(base.TestCase):
self.assertIsInstance(health_mon_flow, flow.Flow)
self.assertIn('listener', health_mon_flow.requires)
self.assertIn('loadbalancer', health_mon_flow.requires)
self.assertIn('vip', health_mon_flow.requires)
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(0, len(health_mon_flow.provides))
@ -47,10 +48,10 @@ class TestHealthMonitorFlows(base.TestCase):
self.assertIsInstance(health_mon_flow, flow.Flow)
self.assertIn('health_mon', health_mon_flow.requires)
self.assertIn('pool_id', health_mon_flow.requires)
self.assertIn('listener', health_mon_flow.requires)
self.assertIn('vip', health_mon_flow.requires)
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(0, len(health_mon_flow.provides))
@ -62,11 +63,11 @@ class TestHealthMonitorFlows(base.TestCase):
self.assertIsInstance(health_mon_flow, flow.Flow)
self.assertIn('listener', health_mon_flow.requires)
self.assertIn('loadbalancer', health_mon_flow.requires)
self.assertIn('vip', health_mon_flow.requires)
self.assertIn('health_mon', health_mon_flow.requires)
self.assertIn('update_dict', health_mon_flow.requires)
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(0, len(health_mon_flow.provides))

@ -15,6 +15,7 @@
from taskflow.patterns import linear_flow as flow
from octavia.common import constants
from octavia.controller.worker.flows import listener_flows
import octavia.tests.unit.base as base
@ -32,9 +33,9 @@ class TestListenerFlows(base.TestCase):
self.assertIsInstance(listener_flow, flow.Flow)
self.assertIn('listener', listener_flow.requires)
self.assertIn('loadbalancer', listener_flow.requires)
self.assertIn('vip', listener_flow.requires)
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(0, len(listener_flow.provides))
@ -45,9 +46,9 @@ class TestListenerFlows(base.TestCase):
self.assertIsInstance(listener_flow, flow.Flow)
self.assertIn('listener', listener_flow.requires)
self.assertIn('loadbalancer', listener_flow.requires)
self.assertIn('vip', listener_flow.requires)
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(0, len(listener_flow.provides))
@ -58,10 +59,10 @@ class TestListenerFlows(base.TestCase):
self.assertIsInstance(listener_flow, flow.Flow)
self.assertIn('listener', listener_flow.requires)
self.assertIn('loadbalancer', listener_flow.requires)
self.assertIn('vip', listener_flow.requires)
self.assertIn('update_dict', listener_flow.requires)
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(0, len(listener_flow.provides))

@ -50,7 +50,7 @@ class TestLoadBalancerFlows(base.TestCase):
self.assertIsInstance(lb_flow, flow.Flow)
self.assertIn('loadbalancer', lb_flow.requires)
self.assertIn(constants.LOADBALANCER, lb_flow.requires)
self.assertEqual(0, len(lb_flow.provides))
self.assertEqual(1, len(lb_flow.requires))
@ -77,7 +77,7 @@ class TestLoadBalancerFlows(base.TestCase):
self.assertIsInstance(lb_flow, flow.Flow)
self.assertIn('loadbalancer', lb_flow.requires)
self.assertIn(constants.LOADBALANCER, lb_flow.requires)
self.assertEqual(0, len(lb_flow.provides))
self.assertEqual(2, len(lb_flow.requires))

@ -15,6 +15,7 @@
from taskflow.patterns import linear_flow as flow
from octavia.common import constants
from octavia.controller.worker.flows import member_flows
import octavia.tests.unit.base as base
@ -32,9 +33,9 @@ class TestMemberFlows(base.TestCase):
self.assertIsInstance(member_flow, flow.Flow)
self.assertIn('listener', member_flow.requires)
self.assertIn('loadbalancer', member_flow.requires)
self.assertIn('vip', member_flow.requires)
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.provides))
@ -45,11 +46,11 @@ class TestMemberFlows(base.TestCase):
self.assertIsInstance(member_flow, flow.Flow)
self.assertIn('listener', member_flow.requires)
self.assertIn('loadbalancer', member_flow.requires)
self.assertIn('member', member_flow.requires)
self.assertIn('member_id', member_flow.requires)
self.assertIn('vip', member_flow.requires)
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(0, len(member_flow.provides))
@ -60,10 +61,10 @@ class TestMemberFlows(base.TestCase):
self.assertIsInstance(member_flow, flow.Flow)
self.assertIn('listener', member_flow.requires)
self.assertIn('loadbalancer', member_flow.requires)
self.assertIn('vip', member_flow.requires)
self.assertIn('update_dict', member_flow.requires)
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(0, len(member_flow.provides))

@ -15,6 +15,7 @@
from taskflow.patterns import linear_flow as flow
from octavia.common import constants
from octavia.controller.worker.flows import pool_flows
import octavia.tests.unit.base as base
@ -32,9 +33,9 @@ class TestPoolFlows(base.TestCase):
self.assertIsInstance(pool_flow, flow.Flow)
self.assertIn('listener', pool_flow.requires)
self.assertIn('loadbalancer', pool_flow.requires)
self.assertIn('vip', 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.assertEqual(3, len(pool_flow.requires))
self.assertEqual(0, len(pool_flow.provides))
@ -45,10 +46,10 @@ class TestPoolFlows(base.TestCase):
self.assertIsInstance(pool_flow, flow.Flow)
self.assertIn('listener', pool_flow.requires)
self.assertIn('loadbalancer', pool_flow.requires)
self.assertIn('vip', pool_flow.requires)
self.assertIn('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.POOL, pool_flow.requires)
self.assertEqual(4, len(pool_flow.requires))
self.assertEqual(0, len(pool_flow.provides))
@ -59,11 +60,11 @@ class TestPoolFlows(base.TestCase):
self.assertIsInstance(pool_flow, flow.Flow)
self.assertIn('pool', pool_flow.requires)
self.assertIn('listener', pool_flow.requires)
self.assertIn('loadbalancer', pool_flow.requires)
self.assertIn('vip', pool_flow.requires)
self.assertIn('update_dict', pool_flow.requires)
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(0, len(pool_flow.provides))

@ -140,7 +140,7 @@ class TestControllerWorker(base.TestCase):
(base_taskflow.BaseTaskFlowEngine._taskflow_load.
assert_called_once_with('TEST',
store={'amphora': _amphora_mock}))
store={constants.AMPHORA: _amphora_mock}))
_flow_mock.run.assert_called_once_with()
@ -167,10 +167,13 @@ class TestControllerWorker(base.TestCase):
(base_taskflow.BaseTaskFlowEngine._taskflow_load.
assert_called_once_with(_flow_mock,
store={'health_mon': _health_mon_mock,
'listener': _listener_mock,
'loadbalancer': _load_balancer_mock,
'vip': _vip_mock}))
store={constants.HEALTH_MON:
_health_mon_mock,
constants.LISTENER:
_listener_mock,
constants.LOADBALANCER:
_load_balancer_mock,
constants.VIP: _vip_mock}))
_flow_mock.run.assert_called_once_with()
@ -197,11 +200,14 @@ class TestControllerWorker(base.TestCase):
(base_taskflow.BaseTaskFlowEngine._taskflow_load.
assert_called_once_with(_flow_mock,
store={'health_mon': _health_mon_mock,
'pool_id': HM_ID,
'listener': _listener_mock,
'loadbalancer': _load_balancer_mock,
'vip': _vip_mock}))
store={constants.HEALTH_MON:
_health_mon_mock,
constants.POOL_ID: HM_ID,
constants.LISTENER:
_listener_mock,
constants.LOADBALANCER:
_load_balancer_mock,
constants.VIP: _vip_mock}))
_flow_mock.run.assert_called_once_with()
@ -229,11 +235,15 @@ class TestControllerWorker(base.TestCase):
(base_taskflow.BaseTaskFlowEngine._taskflow_load.
assert_called_once_with(_flow_mock,
store={'health_mon': _health_mon_mock,
'listener': _listener_mock,
'loadbalancer': _load_balancer_mock,
'vip': _vip_mock,
'update_dict': HEALTH_UPDATE_DICT}))
store={constants.HEALTH_MON:
_health_mon_mock,
constants.LISTENER:
_listener_mock,
constants.LOADBALANCER:
_load_balancer_mock,
constants.VIP: _vip_mock,
constants.UPDATE_DICT:
HEALTH_UPDATE_DICT}))
_flow_mock.run.assert_called_once_with()
@ -259,9 +269,11 @@ class TestControllerWorker(base.TestCase):
(base_taskflow.BaseTaskFlowEngine._taskflow_load.
assert_called_once_with(_flow_mock,
store={'listener': _listener_mock,
'loadbalancer': _load_balancer_mock,
'vip': _vip_mock}))
store={constants.LISTENER:
_listener_mock,
constants.LOADBALANCER:
_load_balancer_mock,
constants.VIP: _vip_mock}))
_flow_mock.run.assert_called_once_with()
@ -315,11 +327,12 @@ class TestControllerWorker(base.TestCase):
(base_taskflow.BaseTaskFlowEngine._taskflow_load.
assert_called_once_with(_flow_mock,
store={'listener': _listener_mock,
'vip': _vip_mock,
'loadbalancer': _load_balancer_mock,
'update_dict':
LISTENER_UPDATE_DICT}))
store={constants.LISTENER: _listener_mock,
constants.VIP: _vip_mock,
constants.LOADBALANCER:
_load_balancer_mock,
constants.UPDATE_DICT:
LISTENER_UPDATE_DICT}))
_flow_mock.run.assert_called_once_with()
@ -417,7 +430,7 @@ class TestControllerWorker(base.TestCase):
(base_taskflow.BaseTaskFlowEngine._taskflow_load.
assert_called_once_with(_flow_mock,
store={'loadbalancer':
store={constants.LOADBALANCER:
_load_balancer_mock}))
_flow_mock.run.assert_called_once_with()
@ -449,8 +462,8 @@ class TestControllerWorker(base.TestCase):
(base_taskflow.BaseTaskFlowEngine._taskflow_load.
assert_called_once_with(_flow_mock,
store={'update_dict': change,
'loadbalancer':
store={constants.UPDATE_DICT: change,
constants.LOADBALANCER:
_load_balancer_mock}))
_flow_mock.run.assert_called_once_with()
@ -477,10 +490,11 @@ class TestControllerWorker(base.TestCase):
(base_taskflow.BaseTaskFlowEngine._taskflow_load.
assert_called_once_with(_flow_mock,
store={'member': _member_mock,
'listener': _listener_mock,
'loadbalancer': _load_balancer_mock,
'vip': _vip_mock}))
store={constants.MEMBER: _member_mock,
constants.LISTENER: _listener_mock,
constants.LOADBALANCER:
_load_balancer_mock,
constants.VIP: _vip_mock}))
_flow_mock.run.assert_called_once_with()
@ -506,11 +520,12 @@ class TestControllerWorker(base.TestCase):
(base_taskflow.BaseTaskFlowEngine._taskflow_load.
assert_called_once_with(
_flow_mock, store={'member': _member_mock,
'member_id': MEMBER_ID,
'listener': _listener_mock,
'vip': _vip_mock,
'loadbalancer': _load_balancer_mock}))
_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}))
_flow_mock.run.assert_called_once_with()
@ -536,11 +551,13 @@ class TestControllerWorker(base.TestCase):
(base_taskflow.BaseTaskFlowEngine._taskflow_load.
assert_called_once_with(_flow_mock,
store={'member': _member_mock,
'listener': _listener_mock,
'loadbalancer': _load_balancer_mock,
'vip': _vip_mock,
'update_dict': MEMBER_UPDATE_DICT}))
store={constants.MEMBER: _member_mock,
constants.LISTENER: _listener_mock,
constants.LOADBALANCER:
_load_balancer_mock,
constants.VIP: _vip_mock,
constants.UPDATE_DICT:
MEMBER_UPDATE_DICT}))
_flow_mock.run.assert_called_once_with()
@ -566,10 +583,11 @@ class TestControllerWorker(base.TestCase):
(base_taskflow.BaseTaskFlowEngine._taskflow_load.
assert_called_once_with(_flow_mock,
store={'pool': _pool_mock,
'listener': _listener_mock,
'loadbalancer': _load_balancer_mock,
'vip': _vip_mock}))
store={constants.POOL: _pool_mock,
constants.LISTENER: _listener_mock,
constants.LOADBALANCER:
_load_balancer_mock,
constants.VIP: _vip_mock}))
_flow_mock.run.assert_called_once_with()
@ -595,10 +613,11 @@ class TestControllerWorker(base.TestCase):
(base_taskflow.BaseTaskFlowEngine._taskflow_load.
assert_called_once_with(_flow_mock,
store={'pool': _pool_mock,
'listener': _listener_mock,
'loadbalancer': _load_balancer_mock,
'vip': _vip_mock}))
store={constants.POOL: _pool_mock,
constants.LISTENER: _listener_mock,
constants.LOADBALANCER:
_load_balancer_mock,
constants.VIP: _vip_mock}))
_flow_mock.run.assert_called_once_with()
@ -624,11 +643,13 @@ class TestControllerWorker(base.TestCase):
(base_taskflow.BaseTaskFlowEngine._taskflow_load.
assert_called_once_with(_flow_mock,
store={'pool': _pool_mock,
'listener': _listener_mock,
'loadbalancer': _load_balancer_mock,
'vip': _vip_mock,
'update_dict': POOL_UPDATE_DICT}))
store={constants.POOL: _pool_mock,
constants.LISTENER: _listener_mock,
constants.LOADBALANCER:
_load_balancer_mock,
constants.VIP: _vip_mock,
constants.UPDATE_DICT:
POOL_UPDATE_DICT}))
_flow_mock.run.assert_called_once_with()