diff options
| author |   Marcus G K Williams <marcus.williams@intel.com> | 2019-06-06 18:12:52 -0700 |
|---|---|---|
| committer | Marcus Williams <marcus.williams@intel.com> | 2019-06-07 00:36:52 +0000 |
| commit | 1e2f06c201cf6649f24b76015175c37be3458a34 (patch) | |
| tree | 6c9bc76f0b76269ecd405f1f6b291d85c2652f3c /bpmn | |
| parent | b18228fdec0db5007e1feec55ba742bba740dc49 (diff) | |
Add non-cloudowner nbrequest lookup in workflowAction
Using a cloudOwner different than "CloudOwner"
when instantiating a vfmodule using GR_API
causes nbrequest lookup in workflowAction to
fail. This change adds a final check for
northboundRequest that does not use
cloudOwner field before failing.
This should enable instantiation
on multiple cloudRegions without
seperate northbound_request_ref_lookup
actions for each cloudOwner.
Issue-ID: SO-1995
Change-Id: I9d1fe39fb056d03e8473a524c21f41319c13c20f
Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
Diffstat (limited to 'bpmn')
| -rw-r--r-- | bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java index 70726f2014..7065c2c76c 100644 --- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java +++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java @@ -1324,6 +1324,10 @@ public class WorkflowAction { requestAction, resourceName.toString(), aLaCarte, cloudOwner); } if (northBoundRequest == null) { + northBoundRequest = catalogDbClient.getNorthBoundRequestByActionAndIsALaCarteAndRequestScope(requestAction, + resourceName.toString(), aLaCarte); + } + if (northBoundRequest == null) { if (aLaCarte) { buildAndThrowException(execution, "The request: ALaCarte " + resourceName + " " + requestAction + " is not supported by GR_API."); |