openstack/deb-senlin
Code Issues Proposed changes

Refactor cluster del nodes operation

Browse Source 
This patch refactors the cluster-del-nodes operation to use the 'create'
method from the Action module.

Change-Id: I5a891bc474efe324b8ee76f7334f044dad200618
This commit is contained in:
tengqm
2016-02-28 08:22:55 -05:00
parent 5cfb72a9f8
commit b0a1cf3f7c
2 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
senlin/tests/unit/engine/service/test_clusters.py
View File

@@ -858,7 +858,7 @@ class ClusterTest(base.SenlinTestCase):
])
mock_node.assert_called_once_with(self.ctx, 'NODE4')
@mock.patch("senlin.engine.actions.base.Action")
@mock.patch.object(action_mod.Action, 'create')
@mock.patch.object(service.EngineService, 'node_find')
@mock.patch.object(service.EngineService, 'cluster_find')
@mock.patch.object(dispatcher, 'start_action')
@@ -866,8 +866,7 @@ class ClusterTest(base.SenlinTestCase):
mock_action):
mock_find.return_value = mock.Mock(id='1234')
mock_node.return_value = mock.Mock(id='NODE2', cluster_id='1234')
x_action = mock.Mock(id='ACTION_ID')
mock_action.return_value = x_action
mock_action.return_value = 'ACTION_ID'
result = self.eng.cluster_del_nodes(self.ctx, 'CLUSTER', ['NODE1'])
@@ -875,19 +874,15 @@ class ClusterTest(base.SenlinTestCase):
mock_find.assert_called_once_with(self.ctx, 'CLUSTER')
mock_node.assert_called_once_with(self.ctx, 'NODE1')
mock_action.assert_called_once_with(
'1234', consts.CLUSTER_DEL_NODES,
self.ctx, '1234', consts.CLUSTER_DEL_NODES,
name='cluster_del_nodes_1234',
status=action_mod.Action.READY,
cause=action_mod.CAUSE_RPC,
inputs={
'count': 1,
'candidates': ['NODE2'],
},
user=self.ctx.user,
project=self.ctx.project,
domain=self.ctx.domain
)
self.assertEqual(x_action.READY, x_action.status)
x_action.store.assert_called_once_with(self.ctx)
notify.assert_called_once_with(action_id='ACTION_ID')
@mock.patch.object(service.EngineService, 'cluster_find')