diff options
| author |   sarada prasad sahoo <sarada.prasad.sahoo@huawei.com> | 2019-05-03 12:24:32 +0530 |
|---|---|---|
| committer | sarada prasad sahoo <sarada.prasad.sahoo@huawei.com> | 2019-05-20 11:31:51 +0530 |
| commit | 56c2c009a90f4f25c714e7773aaecf5e6957b499 (patch) | |
| tree | f61aa7b7fd573f60f40b3cde70aef99264a03a9a /bpmn/so-bpmn-infrastructure-common/src | |
| parent | ef93fddc253a72f870a224361e0be8303811d976 (diff) | |
Enhanced logic for multilevel list input
Added extra VF/VFC level test cases,
also corrected first level index increment logic.
Change-Id: I18982b4b6821da4f7dc06743c3aeca0fa54176e3
Issue-ID: SO-1393
Signed-off-by: sarada prasad sahoo <sarada.prasad.sahoo@huawei.com>
Diffstat (limited to 'bpmn/so-bpmn-infrastructure-common/src')
| -rw-r--r-- | bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateResources.groovy | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateResources.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateResources.groovy index e18ad92ef0..ea25904cf3 100644 --- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateResources.groovy +++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateResources.groovy @@ -254,19 +254,16 @@ public class DoCreateResources extends AbstractServiceTaskProcessor{ resourceInput.setResourceModelInfo(currentResource.getModelInfo()) resourceInput.getResourceModelInfo().setModelType(currentResource.getResourceType().toString()) ServiceDecomposition serviceDecomposition = execution.getVariable("serviceDecomposition") - resourceInput.setServiceModelInfo(serviceDecomposition.getModelInfo()) - def String resourceCustomizationUuid = currentResource.getModelInfo().getModelCustomizationUuid(); String incomingRequest = execution.getVariable("uuiRequest") //set the requestInputs from tempalte To Be Done - String serviceModelUuid = jsonUtil.getJsonValue(incomingRequest,"service.serviceUuid") - String serviceParameters = jsonUtil.getJsonValue(incomingRequest, "service.parameters") + String uuiServiceParameters = jsonUtil.getJsonValue(incomingRequest, "service.parameters") Map<String, Object> currentVFData = (Map) execution.getVariable("currentVFData"); if (null == currentVFData) { currentVFData = new HashMap<>(); } - String resourceParameters = ResourceRequestBuilder.buildResourceRequestParameters(execution, serviceModelUuid, resourceCustomizationUuid, serviceParameters, currentVFData) + String resourceParameters = ResourceRequestBuilder.buildResourceRequestParameters(execution, currentResource, uuiServiceParameters, currentVFData) resourceInput.setResourceParameters(resourceParameters) resourceInput.setRequestsInputs(incomingRequest) execution.setVariable("resourceInput", resourceInput.toString()) |