diff options
Diffstat (limited to 'bpmn/MSOCommonBPMN/src/main/java')
| -rw-r--r-- | bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java | 14 |
1 files changed, 12 insertions, 2 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 5cbadd6b75..83d1f5249f 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 @@ -1054,8 +1054,18 @@ public class BBInputSetup implements JavaDelegate { if (requestDetails.getOwningEntity() != null) owningEntity = mapperLayer.mapRequestOwningEntity(requestDetails.getOwningEntity()); - Service service = - bbInputSetupUtils.getCatalogServiceByModelUUID(requestDetails.getModelInfo().getModelVersionId()); + String modelVersionId = requestDetails.getModelInfo().getModelVersionId(); + + if (ModelType.vnf == requestDetails.getModelInfo().getModelType()) { + for (RelatedInstanceList relatedInstanceList : requestDetails.getRelatedInstanceList()) { + if (ModelType.service == relatedInstanceList.getRelatedInstance().getModelInfo().getModelType()) { + modelVersionId = relatedInstanceList.getRelatedInstance().getModelInfo().getModelVersionId(); + break; + } + } + } + + Service service = bbInputSetupUtils.getCatalogServiceByModelUUID(modelVersionId); if (service == null) { service = bbInputSetupUtils.getCatalogServiceByModelVersionAndModelInvariantUUID( requestDetails.getModelInfo().getModelVersion(), |