From 677ef939a00b4d694b0433b7294389d71b507faa Mon Sep 17 00:00:00 2001
From: "Janet L. Goldstein" <jgoldste@nrao.edu>
Date: Thu, 13 Jan 2022 08:54:40 -0700
Subject: [PATCH] WS-858: correct keyword
---
services/capability/capability/views/capability_request.py | 2 +-
.../workspaces/workflow/services/workflow_service.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/services/capability/capability/views/capability_request.py b/services/capability/capability/views/capability_request.py
index 8311d6678..abca1cc8c 100644
--- a/services/capability/capability/views/capability_request.py
+++ b/services/capability/capability/views/capability_request.py
@@ -154,7 +154,7 @@ def create_follow_on_capability_request(request: Request) -> Response:
sdm_id = metadata["fileSetIds"][0] if isinstance(metadata["fileSetIds"], list) else metadata["fileSetIds"]
new_capability_request = request.capability_info.create_capability_request(
- followon_type=followon_type,
+ capability_name=followon_type,
parameters={
"user_email": user_email,
"version": version_number,
diff --git a/shared/workspaces/workspaces/workflow/services/workflow_service.py b/shared/workspaces/workspaces/workflow/services/workflow_service.py
index bd1d90cac..00ac7f463 100644
--- a/shared/workspaces/workspaces/workflow/services/workflow_service.py
+++ b/shared/workspaces/workspaces/workflow/services/workflow_service.py
@@ -378,7 +378,7 @@ class WorkflowService(WorkflowServiceIF):
argument2 = [wf_request.argument["cal_locator"]]
elif "imaging" in name:
wrest_type = "-si"
- argument = wf_request.argument["sdmId"]
+ argument = wf_request.argument["sdm_id"]
argument2 = []
elif "carta" in name:
wrest_type = "--carta"
@@ -700,7 +700,7 @@ class WorkflowMessageHandler:
subject = message["subject"]
wf_req_id = subject["workflow_request_id"]
wf_request = self.info.lookup_workflow_request(wf_req_id)
- subject["execution_wf_id"] = wf_request.argument["parent_wf_request_id"]
+ subject["execution_wf_id"] = wf_request.argument["previous_workflow_request_id"]
if "ingest" in wf_request.workflow_name:
logger.info("SENDING INGESTION FAILED MESSAGE!")
--
GitLab