From 453353c6505d06e9bc905ca886cd7ab17e8d15db Mon Sep 17 00:00:00 2001 From: mharazin Date: Tue, 18 Aug 2020 16:01:00 +0200 Subject: If statement and logger correction Issue-ID: SO-2646 Signed-off-by: Mateusz Harazin Change-Id: Iec4c1d587a1d9c121c8ee8cbc061716a488cee03 --- .../java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bpmn/MSOCommonBPMN/src/main/java/org/onap') 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() -- cgit 1.2.3-korg