openstack
/
senlin
Code Issues Proposed changes

Merge "Remove 'trigger' support from rpc client"

This commit is contained in:
Jenkins 2015-11-25 06:02:22 +00:00 committed by Gerrit Code Review
parent 48b8c7260d 46e373dcec
commit 0022ef6975
2 changed files with 0 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
senlin/rpc/client.py
View File

@ -359,35 +359,6 @@ class EngineClient(object):
return rpc_method(ctxt,
self.make_msg('webhook_delete', identity=identity))
def trigger_list(self, ctxt, limit=None, marker=None, sort_keys=None,
sort_dir=None, filters=None, project_safe=True,
show_deleted=False):
return self.call(ctxt,
self.make_msg('trigger_list',
limit=limit, marker=marker,
sort_keys=sort_keys, sort_dir=sort_dir,
filters=filters,
project_safe=project_safe,
show_deleted=show_deleted))
def trigger_create(self, ctxt, name, spec, description=None, enabled=None,
state=None, severity=None):
return self.call(ctxt,
self.make_msg('trigger_create', name=name, spec=spec,
description=description,
enabled=enabled, state=state,
severity=severity))
def trigger_get(self, ctxt, identity):
return self.call(ctxt,
self.make_msg('trigger_get', identity=identity))
def trigger_delete(self, ctxt, identity, force=False, cast=True):
rpc_method = self.cast if cast else self.call
return rpc_method(ctxt,
self.make_msg('trigger_delete', identity=identity,
force=force))
def event_list(self, ctxt, filters=None, limit=None, marker=None,
sort_keys=None, sort_dir=None, project_safe=True,
show_deleted=False):

35
senlin/tests/unit/test_rpc_client.py
View File

@ -473,41 +473,6 @@ class EngineRpcAPITestCase(base.SenlinTestCase):
def test_webhook_delete_call(self):
self._test_engine_api('webhook_delete', 'call', identity='wh_name')
def test_trigger_list(self):
default_args = {
'limit': mock.ANY,
'marker': mock.ANY,
'sort_keys': mock.ANY,
'sort_dir': mock.ANY,
'filters': mock.ANY,
'project_safe': mock.ANY,
'show_deleted': mock.ANY,
}
self._test_engine_api('trigger_list', 'call', **default_args)
def test_trigger_create(self):
kwargs = {
'name': 'mytrigger',
'spec': mock.ANY,
'description': 'desc',
'enabled': True,
'state': 'ok',
'severity': 'low',
}
self._test_engine_api('trigger_create', 'call', **kwargs)
def test_trigger_get(self):
self._test_engine_api('trigger_get', 'call', identity='a-trigger')
def test_trigger_delete_cast(self):
self._test_engine_api('trigger_delete', 'cast', identity='a-trigger',
force=True)
def test_trigger_delete_call(self):
self._test_engine_api('trigger_delete', 'call', identity='a-trigger',
force=True)
def test_event_list(self):
default_args = {
'filters': mock.ANY,