diff options
| author |   Kalkere Ramesh, Sharan <sharan.kalkere.ramesh@att.com> | 2020-04-08 11:55:07 -0400 |
|---|---|---|
| committer |   Benjamin, Max (mb388a) <mb388a@att.com> | 2020-04-08 11:55:08 -0400 |
| commit | 659845b67001ff0d0375adda8c1c384efda26496 (patch) | |
| tree | 979ea7d5957bf024d9feac23efc27cac5f9cd87a /bpmn | |
| parent | 858a52f53fc62b5da552e8f3a80d42998bab7671 (diff) | |
run get vf module cust by id if vf module cust is
run get vf module cust by id if vf module cust is null
Issue-ID: SO-2800
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: If4e39535c9b6b6715f8a4169f049bbb1d058e863
Diffstat (limited to 'bpmn')
2 files changed, 3 insertions, 3 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 e686fc2fb5..488b4aab41 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 @@ -640,7 +640,8 @@ public class BBInputSetup implements JavaDelegate { // want .findAny() // If 'findAny' then return found .orElse(null); - } else { + } + if (vfResourceCustomization == null) { vfResourceCustomization = bbInputSetupUtils .getVfModuleCustomizationByModelCuztomizationUUID(modelInfo.getModelCustomizationId()); } diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java index 21b0d834dd..be9965b5b7 100644 --- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java +++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java @@ -2947,7 +2947,7 @@ public class BBInputSetupTest { } @Test - public void testMapCatalogVfModuleIfNoVnf() { + public void testMapCatalogVfModuleIfNoVfUnderVnf() { String vnfModelCustomizationUUID = "vnfResourceCustUUID"; String vfModuleCustomizationUUID = "vfModelCustomizationUUID"; VfModule vfModule = new VfModule(); @@ -2958,7 +2958,6 @@ public class BBInputSetupTest { vnfResourceCust.setModelCustomizationUUID(vnfModelCustomizationUUID); VfModuleCustomization vfModuleCust = new VfModuleCustomization(); vfModuleCust.setModelCustomizationUUID(vfModuleCustomizationUUID); - vnfResourceCust.getVfModuleCustomizations().add(vfModuleCust); ModelInfoVfModule modelInfoVfModule = new ModelInfoVfModule(); doReturn(vfModuleCust).when(SPY_bbInputSetupUtils) .getVfModuleCustomizationByModelCuztomizationUUID(vfModuleCustomizationUUID); |