diff options
| author |   Chuanyu Chen <chenchuanyu@huawei.com> | 2018-04-09 04:07:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-04-09 04:07:54 +0000 |
| commit | 2410f3e11ff12b193e6193670e093e0b37449c8e (patch) | |
| tree | 065b462bec60a57a732fd15ad9fb54f24c649be8 | |
| parent | cebe3e054796eba2c538ec7e45dfdf9076599dd4 (diff) | |
| parent | 9c1a82863dd6d5fdc6e7b051c89a2ed0b34d01cd (diff) | |
Merge "Pass uuiRequest as input variable"
2 files changed, 3 insertions, 2 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 6b0990ba5d..93f86592ab 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 @@ -185,8 +185,8 @@ public class DoCreateResources extends AbstractServiceTaskProcessor String incomingRequest = execution.getVariable("uuiRequest") //set the requestInputs from tempalte To Be Done - String serviceModelUuid = execution.getVariable("modelUuid") - String serviceParameters = jsonUtil.getJsonValue(incomingRequest, "service.parameters") + String serviceModelUuid = jsonUtil.getJsonValue(incomingRequest,"service.serviceUuid") + String serviceParameters = jsonUtil.getJsonValue(incomingRequest, "service.parameters") String resourceParameters = ResourceRequestBuilder.buildResourceRequestParameters(execution, serviceModelUuid, resourceCustomizationUuid, serviceParameters) resourceInput.setResourceParameters(resourceParameters) execution.setVariable("resourceInput", resourceInput) diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn index e59595c793..5772faadf0 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn @@ -209,6 +209,7 @@ dcsi.doServiceHoming(execution)]]></bpmn2:script> <camunda:in source="addResourceList" target="addResourceList" /> <camunda:in source="serviceInstanceName" target="serviceInstanceName" /> <camunda:in source="serviceDecomposition" target="serviceDecomposition" /> + <camunda:in source="uuiRequest" target="uuiRequest" /> </bpmn2:extensionElements> <bpmn2:incoming>SequenceFlow_0bf6bzp</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_0d0c20n</bpmn2:outgoing> |