aboutsummaryrefslogtreecommitdiffstats
path: root/bpmn/MSOCommonBPMN/src/main/java/org
diff options
context:
space:
mode:
authorKalkere Ramesh, Sharan <sharan.kalkere.ramesh@att.com>2020-04-02 15:18:37 -0400
committerBenjamin, Max (mb388a) <mb388a@att.com>2020-04-04 14:27:11 -0400
commitfd0f5f41dccae8837045314a3b34a473b62e474b (patch)
tree5b6a5b96edaa3ee803bc31540e74fa75723fbbcd /bpmn/MSOCommonBPMN/src/main/java/org
parent3534e7089c955406866bd8e796a8f5e40b08100b (diff)
updated bbinput setup to pull vf if no vnf found
updated bbinput setup to pull vf if no vnf found updated name of unit test as its a compilation error updated pom to get logging analytics library fix broken test by removing vnf from service fixed test as mock for setup utils was not correct Issue-ID: SO-2783 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: I1077ef934b19980d3fecd839e5f383555aa72d1d
Diffstat (limited to 'bpmn/MSOCommonBPMN/src/main/java/org')
-rw-r--r--bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java13
1 files changed, 8 insertions, 5 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 f0954c3695..e686fc2fb5 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
@@ -631,18 +631,21 @@ public class BBInputSetup implements JavaDelegate {
break;
}
}
+ VfModuleCustomization vfResourceCustomization = null;
if (vnfResourceCustomization != null) {
- VfModuleCustomization vfResourceCustomization = vnfResourceCustomization.getVfModuleCustomizations()
- .stream() // Convert to steam
+ vfResourceCustomization = vnfResourceCustomization.getVfModuleCustomizations().stream() // Convert to steam
.filter(x -> modelInfo.getModelCustomizationId().equalsIgnoreCase(x.getModelCustomizationUUID()))// find
// what
// we
// want
.findAny() // If 'findAny' then return found
.orElse(null);
- if (vfResourceCustomization != null) {
- vfModule.setModelInfoVfModule(this.mapperLayer.mapCatalogVfModuleToVfModule(vfResourceCustomization));
- }
+ } else {
+ vfResourceCustomization = bbInputSetupUtils
+ .getVfModuleCustomizationByModelCuztomizationUUID(modelInfo.getModelCustomizationId());
+ }
+ if (vfResourceCustomization != null) {
+ vfModule.setModelInfoVfModule(this.mapperLayer.mapCatalogVfModuleToVfModule(vfResourceCustomization));
}
}