From 408d6d4650a709c4652c05db54645a31f24f4636 Mon Sep 17 00:00:00 2001 From: Larry Rensing Date: Mon, 18 Apr 2016 14:12:12 +0000 Subject: [PATCH] Removed unused 'alarm' field The 'alarm' field is currently unused, so it has been removed. Change-Id: I02fa15b06ed49dbc5dd63de54a9cde601413983c Closes-Bug: #1550261 --- watcher/api/controllers/v1/action.py | 4 ---- watcher/db/sqlalchemy/api.py | 2 -- watcher/db/sqlalchemy/models.py | 2 -- watcher/decision_engine/planner/default.py | 1 - watcher/objects/action.py | 2 -- .../workflow_engine/test_default_workflow_engine.py | 1 - watcher/tests/db/test_action.py | 9 +++------ watcher/tests/db/utils.py | 1 - 8 files changed, 3 insertions(+), 19 deletions(-) diff --git a/watcher/api/controllers/v1/action.py b/watcher/api/controllers/v1/action.py index ef152c283..b67f51c8e 100644 --- a/watcher/api/controllers/v1/action.py +++ b/watcher/api/controllers/v1/action.py @@ -130,9 +130,6 @@ class Action(base.APIBase): state = wtypes.text """This audit state""" - alarm = types.uuid - """An alarm UUID related to this action""" - action_type = wtypes.text """Action type""" @@ -194,7 +191,6 @@ class Action(base.APIBase): sample = cls(uuid='27e3153e-d5bf-4b7e-b517-fb518e17f34c', description='action description', state='PENDING', - alarm=None, created_at=datetime.datetime.utcnow(), deleted_at=None, updated_at=datetime.datetime.utcnow()) diff --git a/watcher/db/sqlalchemy/api.py b/watcher/db/sqlalchemy/api.py index 7f0dc33ba..2d7288297 100644 --- a/watcher/db/sqlalchemy/api.py +++ b/watcher/db/sqlalchemy/api.py @@ -281,8 +281,6 @@ class Connection(api.BaseConnection): if 'state' in filters: query = query.filter_by(state=filters['state']) - if 'alarm' in filters: - query = query.filter_by(alarm=filters['alarm']) query = self.__add_soft_delete_mixin_filters( query, filters, models.Action) diff --git a/watcher/db/sqlalchemy/models.py b/watcher/db/sqlalchemy/models.py index 633f76057..bf63f8dd0 100644 --- a/watcher/db/sqlalchemy/models.py +++ b/watcher/db/sqlalchemy/models.py @@ -161,8 +161,6 @@ class Action(Base): action_type = Column(String(255), nullable=False) input_parameters = Column(JSONEncodedDict, nullable=True) state = Column(String(20), nullable=True) - # todo(jed) remove parameter alarm - alarm = Column(String(36)) next = Column(String(36), nullable=True) diff --git a/watcher/decision_engine/planner/default.py b/watcher/decision_engine/planner/default.py index 31540af49..db55f804d 100644 --- a/watcher/decision_engine/planner/default.py +++ b/watcher/decision_engine/planner/default.py @@ -53,7 +53,6 @@ class DefaultPlanner(base.BasePlanner): 'action_type': action_type, 'input_parameters': input_parameters, 'state': objects.action.State.PENDING, - 'alarm': None, 'next': None, } return action diff --git a/watcher/objects/action.py b/watcher/objects/action.py index 0cf821a99..e1d6b4384 100644 --- a/watcher/objects/action.py +++ b/watcher/objects/action.py @@ -44,8 +44,6 @@ class Action(base.WatcherObject): 'action_type': obj_utils.str_or_none, 'input_parameters': obj_utils.dict_or_none, 'state': obj_utils.str_or_none, - # todo(jed) remove parameter alarm - 'alarm': obj_utils.str_or_none, 'next': obj_utils.int_or_none, } diff --git a/watcher/tests/applier/workflow_engine/test_default_workflow_engine.py b/watcher/tests/applier/workflow_engine/test_default_workflow_engine.py index a571691bd..9172c106a 100644 --- a/watcher/tests/applier/workflow_engine/test_default_workflow_engine.py +++ b/watcher/tests/applier/workflow_engine/test_default_workflow_engine.py @@ -81,7 +81,6 @@ class TestDefaultWorkFlowEngine(base.DbTestCase): 'action_type': action_type, 'input_parameters': parameters, 'state': objects.action.State.PENDING, - 'alarm': None, 'next': next, } new_action = objects.Action(self.context, **action) diff --git a/watcher/tests/db/test_action.py b/watcher/tests/db/test_action.py index 7b57bea68..2067033f8 100644 --- a/watcher/tests/db/test_action.py +++ b/watcher/tests/db/test_action.py @@ -266,24 +266,21 @@ class DbActionTestCase(base.DbTestCase): description='description action 1', uuid=w_utils.generate_uuid(), next=None, - state='PENDING', - alarm=None) + state='PENDING') action2 = self._create_test_action( id=2, action_plan_id=2, description='description action 2', uuid=w_utils.generate_uuid(), next=action1['uuid'], - state='PENDING', - alarm=None) + state='PENDING') action3 = self._create_test_action( id=3, action_plan_id=1, description='description action 3', uuid=w_utils.generate_uuid(), next=action2['uuid'], - state='ONGOING', - alarm=None) + state='ONGOING') res = self.dbapi.get_action_list(self.context, filters={'state': 'ONGOING'}) self.assertEqual([action3['id']], [r.id for r in res]) diff --git a/watcher/tests/db/utils.py b/watcher/tests/db/utils.py index 54aae4a11..dd8e2f48c 100644 --- a/watcher/tests/db/utils.py +++ b/watcher/tests/db/utils.py @@ -91,7 +91,6 @@ def get_test_action(**kwargs): 'resource_id': '10a47dd1-4874-4298-91cf-eff046dbdb8d'}), 'state': kwargs.get('state', 'PENDING'), - 'alarm': kwargs.get('alarm', None), 'next': kwargs.get('next', 2), 'created_at': kwargs.get('created_at'), 'updated_at': kwargs.get('updated_at'),