From 6e1e445e557998208d63fae07f98dea09996a143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Antal?= Date: Fri, 27 Nov 2015 18:53:34 +0100 Subject: [PATCH] Fixed tense consistency (used past) in statuses In several places in Watcher, there are statuses which corresponds to a status in the respective life cycle. There were used past tense everywhere, except "SUCCESS" which was written in present tense. So I searched for all the occurences of this state, and replaced them with their past tense form. Change-Id: Ic41def96d1a608da06a1e394e24704d4f06ab32a Closes-Bug: #1520276 --- watcher/applier/framework/command_executor.py | 2 +- watcher/applier/framework/messaging/launch_action_plan.py | 2 +- watcher/decision_engine/command/audit.py | 5 +++-- watcher/objects/action.py | 2 +- watcher/objects/action_plan.py | 2 +- watcher/objects/audit.py | 2 +- watcher/tests/api/v1/test_actions.py | 2 +- watcher/tests/api/v1/test_audits.py | 2 +- .../framework/command/test_launch_action_plan_command.py | 8 ++++---- .../decision_engine/command/test_trigger_audit_command.py | 8 ++++---- watcher/tests/objects/test_action.py | 4 ++-- watcher/tests/objects/test_action_plan.py | 4 ++-- watcher/tests/objects/test_audit.py | 4 ++-- 13 files changed, 24 insertions(+), 23 deletions(-) diff --git a/watcher/applier/framework/command_executor.py b/watcher/applier/framework/command_executor.py index ce312151c..51ee995ee 100644 --- a/watcher/applier/framework/command_executor.py +++ b/watcher/applier/framework/command_executor.py @@ -64,7 +64,7 @@ class CommandExecutor(object): return False else: self.deploy.populate(primitive) - self.notify(action, Status.SUCCESS) + self.notify(action, Status.SUCCEEDED) except Exception as e: LOG.debug( 'The applier module failed to execute the action{0} with ' diff --git a/watcher/applier/framework/messaging/launch_action_plan.py b/watcher/applier/framework/messaging/launch_action_plan.py index 3548069aa..8aa00a69a 100644 --- a/watcher/applier/framework/messaging/launch_action_plan.py +++ b/watcher/applier/framework/messaging/launch_action_plan.py @@ -59,7 +59,7 @@ class LaunchActionPlanCommand(ApplierCommand): LOG.error("Launch Action Plan " + unicode(e)) finally: if result is True: - status = Status.SUCCESS + status = Status.SUCCEEDED else: status = Status.FAILED # update state diff --git a/watcher/decision_engine/command/audit.py b/watcher/decision_engine/command/audit.py index e675c18fb..96fc2f9bb 100644 --- a/watcher/decision_engine/command/audit.py +++ b/watcher/decision_engine/command/audit.py @@ -75,8 +75,9 @@ class TriggerAuditCommand(BaseDecisionEngineCommand): planner = DefaultPlanner() planner.schedule(request_context, audit.id, solution) - # 7 - change status to SUCCESS and notify - self.update_audit(request_context, audit_uuid, AuditStatus.SUCCESS) + # 7 - change status to SUCCEEDED and notify + self.update_audit(request_context, audit_uuid, + AuditStatus.SUCCEEDED) except Exception as e: self.update_audit(request_context, audit_uuid, AuditStatus.FAILED) LOG.error("Execute audit command {0} ".format(unicode(e))) diff --git a/watcher/objects/action.py b/watcher/objects/action.py index c8df7b8fc..63bd32de7 100644 --- a/watcher/objects/action.py +++ b/watcher/objects/action.py @@ -26,7 +26,7 @@ class Status(object): PENDING = 'PENDING' ONGOING = 'ONGOING' FAILED = 'FAILED' - SUCCESS = 'SUCCESS' + SUCCEEDED = 'SUCCEEDED' DELETED = 'DELETED' CANCELLED = 'CANCELLED' diff --git a/watcher/objects/action_plan.py b/watcher/objects/action_plan.py index 358dea738..9ea6e923c 100644 --- a/watcher/objects/action_plan.py +++ b/watcher/objects/action_plan.py @@ -26,7 +26,7 @@ class Status(object): RECOMMENDED = 'RECOMMENDED' ONGOING = 'ONGOING' FAILED = 'FAILED' - SUCCESS = 'SUCCESS' + SUCCEEDED = 'SUCCEEDED' DELETED = 'DELETED' CANCELLED = 'CANCELLED' diff --git a/watcher/objects/audit.py b/watcher/objects/audit.py index 1f70fbbac..7232d4073 100644 --- a/watcher/objects/audit.py +++ b/watcher/objects/audit.py @@ -24,7 +24,7 @@ from watcher.objects import utils as obj_utils class AuditStatus(object): ONGOING = 'ONGOING' - SUCCESS = 'SUCCESS' + SUCCEEDED = 'SUCCEEDED' SUBMITTED = 'SUBMITTED' FAILED = 'FAILED' CANCELLED = 'CANCELLED' diff --git a/watcher/tests/api/v1/test_actions.py b/watcher/tests/api/v1/test_actions.py index ea34fffe7..cd08c0657 100644 --- a/watcher/tests/api/v1/test_actions.py +++ b/watcher/tests/api/v1/test_actions.py @@ -467,7 +467,7 @@ class TestPatch(api_base.FunctionalTest): self.assertTrue(response.json['error_message']) def test_add_ok(self): - new_state = 'SUCCESS' + new_state = 'SUCCEEDED' response = self.patch_json( '/actions/%s' % self.action.uuid, [{'path': '/state', 'value': new_state, 'op': 'add'}]) diff --git a/watcher/tests/api/v1/test_audits.py b/watcher/tests/api/v1/test_audits.py index dd108b235..4ac3c05a0 100644 --- a/watcher/tests/api/v1/test_audits.py +++ b/watcher/tests/api/v1/test_audits.py @@ -360,7 +360,7 @@ class TestPatch(api_base.FunctionalTest): self.assertTrue(response.json['error_message']) def test_add_ok(self): - new_state = 'SUCCESS' + new_state = 'SUCCEEDED' response = self.patch_json( '/audits/%s' % self.audit.uuid, [{'path': '/state', 'value': new_state, 'op': 'add'}]) diff --git a/watcher/tests/applier/framework/command/test_launch_action_plan_command.py b/watcher/tests/applier/framework/command/test_launch_action_plan_command.py index 735c76805..878a05e54 100644 --- a/watcher/tests/applier/framework/command/test_launch_action_plan_command.py +++ b/watcher/tests/applier/framework/command/test_launch_action_plan_command.py @@ -52,7 +52,7 @@ class TestLaunchActionPlanCommand(DbTestCase): command.execute() action_plan = ActionPlan.get_by_uuid(self.context, self.action_plan.uuid) - self.assertEqual(Status.SUCCESS, action_plan.state) + self.assertEqual(Status.SUCCEEDED, action_plan.state) def test_trigger_audit_send_notification(self): messaging = MagicMock() @@ -63,10 +63,10 @@ class TestLaunchActionPlanCommand(DbTestCase): call_on_going = call(Events.LAUNCH_ACTION_PLAN.name, { 'action_plan_status': Status.ONGOING, 'action_plan__uuid': self.action_plan.uuid}) - call_success = call(Events.LAUNCH_ACTION_PLAN.name, { - 'action_plan_status': Status.SUCCESS, + call_succeeded = call(Events.LAUNCH_ACTION_PLAN.name, { + 'action_plan_status': Status.SUCCEEDED, 'action_plan__uuid': self.action_plan.uuid}) - calls = [call_on_going, call_success] + calls = [call_on_going, call_succeeded] messaging.topic_status.publish_event.assert_has_calls(calls) self.assertEqual(2, messaging.topic_status.publish_event.call_count) diff --git a/watcher/tests/decision_engine/command/test_trigger_audit_command.py b/watcher/tests/decision_engine/command/test_trigger_audit_command.py index d89f4668f..4eb2e7459 100644 --- a/watcher/tests/decision_engine/command/test_trigger_audit_command.py +++ b/watcher/tests/decision_engine/command/test_trigger_audit_command.py @@ -49,7 +49,7 @@ class TestTriggerAuditCommand(DbTestCase): command.strategy_context.execute_strategy = MagicMock() command.execute(self.audit.uuid, self.context) audit = Audit.get_by_uuid(self.context, self.audit.uuid) - self.assertEqual(AuditStatus.SUCCESS, audit.state) + self.assertEqual(AuditStatus.SUCCEEDED, audit.state) def test_trigger_audit_send_notification(self): messaging = MagicMock() @@ -62,10 +62,10 @@ class TestTriggerAuditCommand(DbTestCase): call_on_going = call(Events.TRIGGER_AUDIT.name, { 'audit_status': AuditStatus.ONGOING, 'audit_uuid': self.audit.uuid}) - call_success = call(Events.TRIGGER_AUDIT.name, { - 'audit_status': AuditStatus.SUCCESS, + call_succeeded = call(Events.TRIGGER_AUDIT.name, { + 'audit_status': AuditStatus.SUCCEEDED, 'audit_uuid': self.audit.uuid}) - calls = [call_on_going, call_success] + calls = [call_on_going, call_succeeded] messaging.topic_status.publish_event.assert_has_calls(calls) self.assertEqual(2, messaging.topic_status.publish_event.call_count) diff --git a/watcher/tests/objects/test_action.py b/watcher/tests/objects/test_action.py index 4c0520bfb..31ce76fe3 100644 --- a/watcher/tests/objects/test_action.py +++ b/watcher/tests/objects/test_action.py @@ -93,12 +93,12 @@ class TestActionObject(base.DbTestCase): with mock.patch.object(self.dbapi, 'update_action', autospec=True) as mock_update_action: action = objects.Action.get_by_uuid(self.context, uuid) - action.state = 'SUCCESS' + action.state = 'SUCCEEDED' action.save() mock_get_action.assert_called_once_with(self.context, uuid) mock_update_action.assert_called_once_with( - uuid, {'state': 'SUCCESS'}) + uuid, {'state': 'SUCCEEDED'}) self.assertEqual(self.context, action._context) def test_refresh(self): diff --git a/watcher/tests/objects/test_action_plan.py b/watcher/tests/objects/test_action_plan.py index a056e0f9d..9b615720f 100644 --- a/watcher/tests/objects/test_action_plan.py +++ b/watcher/tests/objects/test_action_plan.py @@ -97,13 +97,13 @@ class TestActionPlanObject(base.DbTestCase): autospec=True) as mock_update_action_plan: action_plan = objects.ActionPlan.get_by_uuid( self.context, uuid) - action_plan.state = 'SUCCESS' + action_plan.state = 'SUCCEEDED' action_plan.save() mock_get_action_plan.assert_called_once_with( self.context, uuid) mock_update_action_plan.assert_called_once_with( - uuid, {'state': 'SUCCESS'}) + uuid, {'state': 'SUCCEEDED'}) self.assertEqual(self.context, action_plan._context) def test_refresh(self): diff --git a/watcher/tests/objects/test_audit.py b/watcher/tests/objects/test_audit.py index 759cfa192..72392539e 100644 --- a/watcher/tests/objects/test_audit.py +++ b/watcher/tests/objects/test_audit.py @@ -93,12 +93,12 @@ class TestAuditObject(base.DbTestCase): with mock.patch.object(self.dbapi, 'update_audit', autospec=True) as mock_update_audit: audit = objects.Audit.get_by_uuid(self.context, uuid) - audit.state = 'SUCCESS' + audit.state = 'SUCCEEDED' audit.save() mock_get_audit.assert_called_once_with(self.context, uuid) mock_update_audit.assert_called_once_with( - uuid, {'state': 'SUCCESS'}) + uuid, {'state': 'SUCCEEDED'}) self.assertEqual(self.context, audit._context) def test_refresh(self):