From 1e2f06c201cf6649f24b76015175c37be3458a34 Mon Sep 17 00:00:00 2001 From: Marcus G K Williams Date: Thu, 6 Jun 2019 18:12:52 -0700 Subject: 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 --- .../onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'bpmn') 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 @@ -1323,6 +1323,10 @@ public class WorkflowAction { northBoundRequest = catalogDbClient.getNorthBoundRequestByActionAndIsALaCarteAndRequestScopeAndCloudOwner( requestAction, resourceName.toString(), aLaCarte, cloudOwner); } + if (northBoundRequest == null) { + northBoundRequest = catalogDbClient.getNorthBoundRequestByActionAndIsALaCarteAndRequestScope(requestAction, + resourceName.toString(), aLaCarte); + } if (northBoundRequest == null) { if (aLaCarte) { buildAndThrowException(execution, -- cgit 1.2.3-korg