Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tasks: remove organization from workflow_workspace #54

Merged
merged 1 commit into from
Jan 16, 2018
Merged

tasks: remove organization from workflow_workspace #54

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 9 additions & 6 deletions reana_workflow_controller/rest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1068,7 +1068,7 @@ def set_workflow_status(workflow_id): # noqa
{'message': 'User {} is not allowed to access workflow {}'
.format(user_uuid, workflow_id)}), 403
if status == START:
return start_workflow(organization, user_uuid, workflow)
return start_workflow(organization, workflow)
else:
raise NotImplemented("Status {} is not supported yet"
.format(status))
Expand All @@ -1078,24 +1078,27 @@ def set_workflow_status(workflow_id): # noqa
return jsonify({"message": str(e)}), 500


def start_workflow(organization, user_uuid, workflow):
def start_workflow(organization, workflow):
"""Start a workflow."""
workflow.status = WorkflowStatus.running
db.session.commit()
if workflow.type_ == 'yadage':
return run_yadage_workflow_from_spec(organization,
user_uuid,
workflow)
elif workflow.type_ == 'cwl':
pass


def run_yadage_workflow_from_spec(organization, user_uuid, workflow):
def run_yadage_workflow_from_spec(organization, workflow):
"""Run a yadage workflow."""
try:
# Remove organization from workspace path since workflow
# engines already work in its organization folder.
workspace_path_without_organization = \
'/'.join(workflow.workspace_path.strip('/').split('/')[1:])
kwargs = {
"workflow_uuid": str(workflow.id_),
"workflow_workspace": workflow.workspace_path,
"workflow_workspace": workspace_path_without_organization,
"workflow_json": workflow.specification,
"parameters": workflow.parameters
}
Expand All @@ -1109,7 +1112,7 @@ def run_yadage_workflow_from_spec(organization, user_uuid, workflow):
'workflow_id': workflow.id_,
'status': workflow.status.name,
'organization': organization,
'user': user_uuid}), 200
'user': str(workflow.owner_id)}), 200

except(KeyError, ValueError):
traceback.print_exc()
Expand Down