From: subhash kumar singh <subhash.kumar.singh@huawei.com>
Date: Fri, 17 May 2019 13:31:40 +0000 (+0530)
Subject: Add model type to resource model
X-Git-Tag: 1.5.2~343^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=7e19e0aa3ad2fff8f8593579192a417932b36004;p=so.git

Add model type to resource model

Add model type to resource model.

Change-Id: Ic1937d859cebca1b515d9c069c51c9811d6874ab
Issue-ID: SO-1393
Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
---

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 fd698d486f..aa0a4e70da 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")