aboutsummaryrefslogtreecommitdiffstats
path: root/bpmn
diff options
context:
space:
mode:
authorSeshu Kumar M <seshu.kumar.m@huawei.com>2019-05-20 05:14:45 +0000
committerGerrit Code Review <gerrit@onap.org>2019-05-20 05:14:45 +0000
commitef93fddc253a72f870a224361e0be8303811d976 (patch)
tree54097b04858c7dde45fb02eeb25be9e98c18ed20 /bpmn
parent66f5fcc11053b6d50fbe2fff12bdfdfb21a3e1a6 (diff)
parent7e19e0aa3ad2fff8f8593579192a417932b36004 (diff)
Merge "Add model type to resource model"
Diffstat (limited to 'bpmn')
-rw-r--r--bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateResources.groovy8
1 files changed, 5 insertions, 3 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 c2f0c02a09..e18ad92ef0 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
@@ -90,7 +90,7 @@ public class DoCreateResources extends AbstractServiceTaskProcessor{
}
// this method will convert resource list to instance_resource_list
- void prepareInstanceResourceList(DelegateExecution execution) {
+ public void prepareInstanceResourceList(DelegateExecution execution) {
String uuiRequest = execution.getVariable("uuiRequest")
List<Resource> sequencedResourceList = execution.getVariable("sequencedResourceList")
@@ -251,9 +251,11 @@ public class DoCreateResources extends AbstractServiceTaskProcessor{
def currentIndex = execution.getVariable("currentResourceIndex")
List<Resource> sequencedResourceList = execution.getVariable("instanceResourceList")
Resource currentResource = sequencedResourceList.get(currentIndex)
- resourceInput.setResourceModelInfo(currentResource.getModelInfo());
+ resourceInput.setResourceModelInfo(currentResource.getModelInfo())
+ resourceInput.getResourceModelInfo().setModelType(currentResource.getResourceType().toString())
ServiceDecomposition serviceDecomposition = execution.getVariable("serviceDecomposition")
- resourceInput.setServiceModelInfo(serviceDecomposition.getModelInfo());
+
+ resourceInput.setServiceModelInfo(serviceDecomposition.getModelInfo())
def String resourceCustomizationUuid = currentResource.getModelInfo().getModelCustomizationUuid();
String incomingRequest = execution.getVariable("uuiRequest")