openstack/deb-senlin
Code Issues Proposed changes

Merge "Refactor webhook trigger operation"

Browse Source
This commit is contained in:
Jenkins
2016-02-29 02:17:59 +00:00
committed by Gerrit Code Review
parent 90551eff7d b96c61c7bb
commit 4f6ea9e7c9
2 changed files with 23 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
senlin/engine/service.py
View File

@@ -2014,24 +2014,19 @@ class EngineService(service.Service):
if params:
data.update(params)
action_name = 'webhook_%s' % receiver.id[:8]
kwargs = {
'name': action_name,
'name': 'webhook_%s' % receiver.id[:8],
'cause': action_mod.CAUSE_RPC,
'status': action_mod.Action.READY,
'inputs': data,
'user': context.user,
'project': context.project,
'domain': context.domain,
}
action = action_mod.Action(cluster.id, receiver.action, **kwargs)
action.status = action.READY
action.store(context)
dispatcher.start_action(action_id=action.id)
action_id = action_mod.Action.create(context, cluster.id,
receiver.action, **kwargs)
dispatcher.start_action(action_id=action_id)
LOG.info(_LI("Webhook %(w)s' triggered with action queued: %(a)s."),
{'w': identity, 'a': action.id})
{'w': identity, 'a': action_id})
return {'action': action.id}
return {'action': action_id}
def event_find(self, context, identity, project_safe=True):
"""Find an event with the given identity.

45
senlin/tests/unit/engine/service/test_webhooks.py
View File

@@ -30,45 +30,32 @@ class WebhookTest(base.SenlinTestCase):
self.eng = service.EngineService('host-a', 'topic-a')
@mock.patch.object(dispatcher, 'start_action')
@mock.patch.object(action_mod, 'Action')
@mock.patch.object(action_mod.Action, 'create')
@mock.patch.object(service.EngineService, 'cluster_find')
@mock.patch.object(service.EngineService, 'receiver_find')
def test_webhook_trigger(self, mock_get, mock_find, mock_action, notify):
fake_cluster = mock.Mock()
fake_cluster.id = 'FAKE_CLUSTER'
mock_find.return_value = fake_cluster
mock_find.return_value = mock.Mock(id='FAKE_CLUSTER')
mock_get.return_value = mock.Mock(id='01234567-abcd-efef',
cluster_id='FAKE_CLUSTER',
action='DANCE',
params={'foo': 'bar'})
mock_action.return_value = 'ACTION_ID'
fake_receiver = mock.Mock()
fake_receiver.id = '01234567-abcd-efef'
fake_receiver.cluster_id = 'FAKE_CLUSTER'
fake_receiver.action = 'DANCE'
fake_receiver.params = {'foo': 'bar'}
mock_get.return_value = fake_receiver
fake_action = mock.Mock()
fake_action.READY = 'READY'
fake_action.id = 'FAKE_ACTION'
mock_action.return_value = fake_action
res = self.eng.webhook_trigger(self.ctx, 'FAKE_RECEIVER',
params={'kee': 'vee'})
self.assertEqual({'action': 'FAKE_ACTION'}, res)
self.assertEqual({'action': 'ACTION_ID'}, res)
mock_get.assert_called_once_with(self.ctx, 'FAKE_RECEIVER')
mock_find.assert_called_once_with(self.ctx, 'FAKE_CLUSTER')
kwargs = {
'name': 'webhook_01234567',
'cause': action_mod.CAUSE_RPC,
'inputs': {'kee': 'vee', 'foo': 'bar'},
'user': self.ctx.user,
'project': self.ctx.project,
'domain': self.ctx.domain,
}
mock_action.assert_called_once_with('FAKE_CLUSTER', 'DANCE', **kwargs)
fake_action.store.assert_called_once_with(self.ctx)
self.assertEqual('READY', fake_action.status)
notify.assert_called_once_with(action_id='FAKE_ACTION')
mock_action.assert_called_once_with(
self.ctx, 'FAKE_CLUSTER', 'DANCE',
name='webhook_01234567',
cause=action_mod.CAUSE_RPC,
status=action_mod.Action.READY,
inputs={'kee': 'vee', 'foo': 'bar'},
)
notify.assert_called_once_with(action_id='ACTION_ID')
@mock.patch.object(service.EngineService, 'receiver_find')
def test_webhook_trigger_receiver_not_found(self, mock_find):