openstack
/
mistral
Code Issues Proposed changes

Merge "Remove _get_db_object_by_name_or_id function"

This commit is contained in:
Zuul 2017-11-16 15:07:12 +00:00 committed by Gerrit Code Review
parent 301efa2f9f e9515138b6
commit 5fa34ab18c
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mistral/db/v2/sqlalchemy/api.py
View File

@ -246,14 +246,6 @@ def _get_db_object_by_id(model, id, insecure=False):
return query.filter_by(id=id).first()
def _get_db_object_by_name_or_id(model, identifier, insecure=False):
return _get_db_object_by_name_and_namespace_or_id(
model,
identifier,
insecure=insecure
)
def _get_db_object_by_name_and_namespace_or_id(model, identifier,
namespace=None, insecure=False):
@ -603,7 +595,7 @@ def get_action_definition_by_id(id, session=None):
@b.session_aware()
def get_action_definition(identifier, session=None):
a_def = _get_db_object_by_name_or_id(
a_def = _get_db_object_by_name_and_namespace_or_id(
models.ActionDefinition,
identifier
)
@ -1158,7 +1150,7 @@ def _get_completed_root_executions_query(columns):
def get_cron_trigger(identifier, session=None):
ctx = context.ctx()
cron_trigger = _get_db_object_by_name_or_id(
cron_trigger = _get_db_object_by_name_and_namespace_or_id(
models.CronTrigger,
identifier,
insecure=ctx.is_admin
@ -1187,7 +1179,10 @@ def get_cron_trigger_by_id(id, session=None):
@b.session_aware()
def load_cron_trigger(identifier, session=None):
return _get_db_object_by_name_or_id(models.CronTrigger, identifier)
return _get_db_object_by_name_and_namespace_or_id(
models.CronTrigger,
identifier
)
@b.session_aware()
@ -1263,7 +1258,10 @@ def update_cron_trigger(identifier, values, session=None, query_filter=None):
@b.session_aware()
def create_or_update_cron_trigger(identifier, values, session=None):
cron_trigger = _get_db_object_by_name_or_id(models.CronTrigger, identifier)
cron_trigger = _get_db_object_by_name_and_namespace_or_id(
models.CronTrigger,
identifier
)
if not cron_trigger:
return create_cron_trigger(values)