x
/
cerberus
Code Issues Proposed changes

Merge "Task API: Change action restart into start"

This commit is contained in:
Jenkins 2015-06-02 14:03:48 +00:00 committed by Gerrit Code Review
parent 8174e77d9c 7b78686ca2
commit b99fcede7b
6 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cerberus/api/v1/controllers/tasks.py
View File

@ -31,7 +31,7 @@ from cerberus.openstack.common import log
LOG = log.getLogger(__name__)
action_kind = ["stop", "restart", "force_delete"]
action_kind = ["stop", "start", "force_delete"]
action_kind_enum = wtypes.Enum(str, *action_kind)
@ -39,7 +39,7 @@ class ActionController(base.BaseController):
_custom_actions = {
'stop': ['POST'],
'force_delete': ['POST'],
'restart': ['POST'],
'start': ['POST'],
}
@wsme_pecan.wsexpose(None, wtypes.text)
@ -68,14 +68,14 @@ class ActionController(base.BaseController):
raise exc.HTTPNotFound(explanation=e.value)
@wsme_pecan.wsexpose(None, wtypes.text)
def restart(self, task_id):
"""Restart delete task
def start(self, task_id):
"""Start task
:raises:
HTTPBadRequest: task not found or impossible to restart it
HTTPBadRequest: task not found or impossible to start it
"""
try:
self.restart_task(task_id)
self.start_task(task_id)
except rpc.RemoteError as e:
raise exc.HTTPBadRequest(explanation=e.value)
@ -97,11 +97,11 @@ class ActionController(base.BaseController):
LOG.exception(e)
raise
def restart_task(self, task_id):
def start_task(self, task_id):
ctx = pecan.request.context.to_dict()
try:
self.client.call(ctx,
'restart_recurrent_task',
'start_recurrent_task',
task_id=task_id)
except rpc.RemoteError as e:
LOG.exception(e)

12
cerberus/common/errors.py
View File

@ -54,18 +54,18 @@ class TaskDeletionNotAllowed(InvalidOperation):
)
class TaskRestartNotAllowed(InvalidOperation):
class TaskStartNotAllowed(InvalidOperation):
def __init__(self, _id):
super(TaskRestartNotAllowed, self).__init__(
_("Restarting task %s is not allowed because either it "
super(TaskStartNotAllowed, self).__init__(
_("Starting task %s is not allowed because either it "
"does not exist or it is not recurrent") % _id
)
class TaskRestartNotPossible(InvalidOperation):
class TaskStartNotPossible(InvalidOperation):
def __init__(self, _id):
super(TaskRestartNotPossible, self).__init__(
_("Restarting task %s is not possible because it is running") % _id
super(TaskStartNotPossible, self).__init__(
_("Starting task %s is not possible because it is running") % _id
)

20
cerberus/manager.py
View File

@ -387,7 +387,7 @@ class CerberusManager(service.CerberusService):
def _stop_recurrent_task(self, task_id):
"""Stop the recurrent task but does not remove it from the ThreadGroup.
The task still exists and could be restarted. Plus, if the task is
The task still exists and could be started. Plus, if the task is
running, wait for the end of its execution
:param task_id: the id of the recurrent task to stop
:return:
@ -556,18 +556,18 @@ class CerberusManager(service.CerberusService):
return json.dumps(task,
cls=base.ThreadEncoder)
def _restart_recurrent_task(self, task_id):
def _start_recurrent_task(self, task_id):
"""
Restart the task
:param task_id: the identifier of the task to restart
Start the task
:param task_id: the identifier of the task to start
:return:
"""
recurrent_task = self._get_recurrent_task(task_id)
if (recurrent_task is None):
raise errors.TaskRestartNotAllowed(str(task_id))
raise errors.TaskStartNotAllowed(str(task_id))
period = recurrent_task.kw.get("task_period", None)
if recurrent_task._running is True:
raise errors.TaskRestartNotPossible(str(task_id))
raise errors.TaskStartNotPossible(str(task_id))
else:
try:
recurrent_task.start(int(period))
@ -577,16 +577,16 @@ class CerberusManager(service.CerberusService):
LOG.exception(e)
raise e
def restart_recurrent_task(self, ctx, task_id):
def start_recurrent_task(self, ctx, task_id):
'''
This method is designed to be called by an rpc client.
E.g: Cerberus-api
Restart a recurrent task after it's being stopped
Start a recurrent task after it's being stopped
:param ctx: a request context dict supplied by client
:param task_id: the identifier of the task to restart
:param task_id: the identifier of the task to start
'''
try:
self._restart_recurrent_task(task_id)
self._start_recurrent_task(task_id)
except errors.InvalidOperation:
raise
return task_id

2
cerberus/tests/functional/api/v1/test_api.py
View File

@ -220,7 +220,7 @@ class TaskTestsV1(base.TestCase):
# Start the task
resp, body = self.security_client.post(
self.security_client._version + '/tasks/' + task_id +
'/action/restart', json.dumps({}), headers=headers)
'/action/start', json.dumps({}), headers=headers)
self.assertEqual(204, resp.status)
resp, body = self.security_client.get(

2
cerberus/tests/functional/test_notifications.py
View File

@ -117,7 +117,7 @@ class NotificationTests(base.TestCase):
self.assertEqual(204, resp.status)
# Check if a sample has been created in Ceilometer
time.sleep(5)
time.sleep(10)
resp = self.mgr.telemetry_client.list_samples(
'security.security_report.store')
self.assertEqual(samples_number + 1, len(resp))

16
cerberus/tests/unit/test_cerberus_manager.py
View File

@ -419,7 +419,7 @@ class TestCerberusManager(base.TestBase):
assert(recurrent_task.gt.dead is True)
assert(len(self.manager.tg.timers) == 0)
def test_restart_recurrent_task(self):
def test_start_recurrent_task(self):
ctxt = {'some': 'context'}
db_api.update_state_task = mock.MagicMock()
task_id = 1
@ -432,7 +432,7 @@ class TestCerberusManager(base.TestBase):
assert(self.manager.tg.timers[0]._running is True)
self.manager._stop_recurrent_task(task_id)
assert(self.manager.tg.timers[0]._running is False)
self.manager.restart_recurrent_task(ctxt, task_id)
self.manager.start_recurrent_task(ctxt, task_id)
assert(self.manager.tg.timers[0]._running is True)
@ -585,7 +585,7 @@ class FaultyTestCerberusManager(base.TestBaseFaulty):
assert(recurrent_task.gt.dead is False)
assert(len(self.manager.tg.timers) == 1)
def test_restart_recurrent_task_wrong_id(self):
def test_start_recurrent_task_wrong_id(self):
ctxt = {"some": "ctx"}
db_api.update_state_task = mock.MagicMock()
task_id = 1
@ -596,13 +596,13 @@ class FaultyTestCerberusManager(base.TestBaseFaulty):
assert(self.manager.tg.timers[0]._running is True)
self.manager._stop_recurrent_task(task_id)
assert(self.manager.tg.timers[0]._running is False)
self.assertRaises(errors.TaskRestartNotAllowed,
self.manager.restart_recurrent_task,
self.assertRaises(errors.TaskStartNotAllowed,
self.manager.start_recurrent_task,
ctxt,
task_id + 1)
assert(self.manager.tg.timers[0]._running is False)
def test_restart_recurrent_task_running(self):
def test_start_recurrent_task_running(self):
ctxt = {"some": "ctx"}
task_id = 1
self.manager._add_recurrent_task(
@ -610,8 +610,8 @@ class FaultyTestCerberusManager(base.TestBaseFaulty):
5,
task_id=task_id)
assert(self.manager.tg.timers[0]._running is True)
self.assertRaises(errors.TaskRestartNotPossible,
self.manager.restart_recurrent_task,
self.assertRaises(errors.TaskStartNotPossible,
self.manager.start_recurrent_task,
ctxt,
task_id)
assert(self.manager.tg.timers[0]._running is True)