diff options
| author |   Chuanyu Chen <chenchuanyu@huawei.com> | 2018-04-09 04:07:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-04-09 04:07:39 +0000 |
| commit | a03caaa93c329f697b3597f5b7b5e094897d1466 (patch) | |
| tree | 63ccca9e0763f0ec5e2d4e25f7cad6e63add3eb6 /bpmn | |
| parent | fe3c38a5fb679237352cb077a883e6a9af44d280 (diff) | |
| parent | 842b4536673c52790037da742a0369afe4e9a483 (diff) | |
Merge "Fix missing input parameter for subprocess"
Diffstat (limited to 'bpmn')
2 files changed, 4 insertions, 0 deletions
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateResources.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateResources.groovy index a53540ac89..6b0990ba5d 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateResources.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateResources.groovy @@ -137,6 +137,7 @@ public class DoCreateResources extends AbstractServiceTaskProcessor def currentIndex = execution.getVariable("currentResourceIndex") List<Resource> sequencedResourceList = execution.getVariable("sequencedResourceList") Resource currentResource = sequencedResourceList.get(currentIndex) + execution.setVariable("resourceType", currentResource.getModelInfo().getModelName()) utils.log("INFO", "Now we deal with resouce:" + currentResource.getModelInfo().getModelName(), isDebugEnabled) utils.log("INFO", "======== COMPLETED getCurrentResoure Process ======== ", isDebugEnabled) } @@ -161,6 +162,7 @@ public class DoCreateResources extends AbstractServiceTaskProcessor utils.log("INFO", "======== Start prepareResourceRecipeRequest Process ======== ", isDebugEnabled) ResourceInput resourceInput = new ResourceInput() String serviceInstanceName = execution.getVariable("serviceInstanceName") + String resourceType = execution.getVariable("resourceType") String resourceInstanceName = resourceType + "_" + serviceInstanceName resourceInput.setResourceInstanceName(resourceInstanceName) utils.log("INFO", "Prepare Resource Request resourceInstanceName:" + resourceInstanceName, isDebugEnabled) diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn index b1c76d88f8..e59595c793 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn @@ -207,6 +207,8 @@ dcsi.doServiceHoming(execution)]]></bpmn2:script> <camunda:in source="resourceParameters" target="resourceParameters" /> <camunda:in source="operationType" target="operationType" /> <camunda:in source="addResourceList" target="addResourceList" /> + <camunda:in source="serviceInstanceName" target="serviceInstanceName" /> + <camunda:in source="serviceDecomposition" target="serviceDecomposition" /> </bpmn2:extensionElements> <bpmn2:incoming>SequenceFlow_0bf6bzp</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_0d0c20n</bpmn2:outgoing> |