aboutsummaryrefslogtreecommitdiffstats
path: root/bpmn/MSOCommonBPMN
diff options
context:
space:
mode:
authormharazin <mateusz.harazin@nokia.com>2020-08-18 16:01:00 +0200
committermharazin <mateusz.harazin@nokia.com>2020-08-18 16:01:00 +0200
commit453353c6505d06e9bc905ca886cd7ab17e8d15db (patch)
treeb18efabb34ffe5dc832e605681c86c3e0145f594 /bpmn/MSOCommonBPMN
parent87260307fcdb8b4296558f564d36ad18653268cd (diff)
If statement and logger correction
Issue-ID: SO-2646 Signed-off-by: Mateusz Harazin <mateusz.harazin@nokia.com> Change-Id: Iec4c1d587a1d9c121c8ee8cbc061716a488cee03
Diffstat (limited to 'bpmn/MSOCommonBPMN')
-rw-r--r--bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java
index e237462a1d..009686d0fc 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java
@@ -1552,7 +1552,8 @@ public class BBInputSetup implements JavaDelegate {
}
parameter.setApplicationId(applicationId);
this.populateGenericVnf(parameter);
- } else if (bbName.contains(PNF) || bbName.equals("ControllerExecutionBB")) {
+ } else if (bbName.contains(PNF) || (bbName.contains(CONTROLLER)
+ && (PNF).equalsIgnoreCase(executeBB.getBuildingBlock().getBpmnScope()))) {
String pnfId = lookupKeyMap.get(ResourceKey.PNF);
resources.getPnfs().stream()
.filter(pnfs -> Objects.equals(key, pnfs.getModelInfo().getModelCustomizationId())).findFirst()