Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Grouped _add_*_filters methods together"

Browse Source
This commit is contained in:
Zuul
2018-05-09 08:20:37 +00:00
committed by Gerrit Code Review
parent 00aa77651b 93a8ba804f
commit 95ec79626b
1 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
watcher/db/sqlalchemy/api.py
View File

@@ -438,7 +438,35 @@ class Connection(api.BaseConnection):
query=query, model=models.EfficacyIndicator, filters=filters, query=query, model=models.EfficacyIndicator, filters=filters,
plain_fields=plain_fields, join_fieldmap=join_fieldmap) plain_fields=plain_fields, join_fieldmap=join_fieldmap)
# NOTE(erakli): other _add_*_filters functions should be moved here def _add_scoring_engine_filters(self, query, filters):
if filters is None:
filters = {}
plain_fields = ['id', 'description']
return self._add_filters(
query=query, model=models.ScoringEngine, filters=filters,
plain_fields=plain_fields)
def _add_action_descriptions_filters(self, query, filters):
if not filters:
filters = {}
plain_fields = ['id', 'action_type']
return self._add_filters(
query=query, model=models.ActionDescription, filters=filters,
plain_fields=plain_fields)
def _add_services_filters(self, query, filters):
if not filters:
filters = {}
plain_fields = ['id', 'name', 'host']
return self._add_filters(
query=query, model=models.Service, filters=filters,
plain_fields=plain_fields)
# ### GOALS ### # # ### GOALS ### #
@@ -956,16 +984,6 @@ class Connection(api.BaseConnection):
# ### SCORING ENGINES ### # # ### SCORING ENGINES ### #
def _add_scoring_engine_filters(self, query, filters):
if filters is None:
filters = {}
plain_fields = ['id', 'description']
return self._add_filters(
query=query, model=models.ScoringEngine, filters=filters,
plain_fields=plain_fields)
def get_scoring_engine_list(self, *args, **kwargs): def get_scoring_engine_list(self, *args, **kwargs):
return self._get_model_list(models.ScoringEngine, return self._get_model_list(models.ScoringEngine,
self._add_scoring_engine_filters, self._add_scoring_engine_filters,
@@ -1034,16 +1052,6 @@ class Connection(api.BaseConnection):
# ### SERVICES ### # # ### SERVICES ### #
def _add_services_filters(self, query, filters):
if not filters:
filters = {}
plain_fields = ['id', 'name', 'host']
return self._add_filters(
query=query, model=models.Service, filters=filters,
plain_fields=plain_fields)
def get_service_list(self, *args, **kwargs): def get_service_list(self, *args, **kwargs):
return self._get_model_list(models.Service, return self._get_model_list(models.Service,
self._add_services_filters, self._add_services_filters,
@@ -1092,16 +1100,6 @@ class Connection(api.BaseConnection):
# ### ACTION_DESCRIPTIONS ### # # ### ACTION_DESCRIPTIONS ### #
def _add_action_descriptions_filters(self, query, filters):
if not filters:
filters = {}
plain_fields = ['id', 'action_type']
return self._add_filters(
query=query, model=models.ActionDescription, filters=filters,
plain_fields=plain_fields)
def get_action_description_list(self, *args, **kwargs): def get_action_description_list(self, *args, **kwargs):
return self._get_model_list(models.ActionDescription, return self._get_model_list(models.ActionDescription,
self._add_action_descriptions_filters, self._add_action_descriptions_filters,