X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=bpmn%2FMSOInfrastructureBPMN%2Fsrc%2Fmain%2Fgroovy%2Forg%2Fopenecomp%2Fmso%2Fbpmn%2Finfrastructure%2Fscripts%2FDoCreateResources.groovy;h=ae75d54afecb5e3c1cf265b6a1de9264aa6232e9;hb=58dd35b739d5a141467866580b95e30aff03b4f2;hp=8eea0f5b9c6a15687e05b740a6e62126d81350bf;hpb=3bda1fa802e7310bfe771c3e3533510f77614ab0;p=so.git

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 8eea0f5b9c..ae75d54afe 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
@@ -20,6 +20,7 @@
  
 package org.openecomp.mso.bpmn.infrastructure.scripts
 
+import org.codehaus.jackson.map.ObjectMapper
 import org.openecomp.mso.bpmn.infrastructure.properties.BPMNProperties
 
 import java.util.ArrayList
@@ -100,25 +101,44 @@ public class DoCreateResources extends AbstractServiceTaskProcessor
         
         String serviceModelUUID = execution.getVariable("modelUuid")      
                
-        List<Resource> addResourceList = execution.getVariable("addResourceList")        
-
+        List<Resource> addResourceList = execution.getVariable("addResourceList")
         List<NetworkResource> networkResourceList = new ArrayList<NetworkResource>()
 
-        //define sequenced resource list, we deploy vf first and then network and then ar 
-        //this is defaule sequence
         List<Resource> sequencedResourceList = new ArrayList<Resource>()
         def resourceSequence = BPMNProperties.getResourceSequenceProp()
 
-        for (resourceType in resourceSequence) {
-            for (resource in addResourceList) {
-                if (StringUtils.containsIgnoreCase(resource.getModelInfo().getModelName(), resourceType)) {
-                    sequencedResourceList.add(resource)
+        if(resourceSequence != null) {
+            // sequence is defined in config file
+            for (resourceType in resourceSequence) {
+                for (resource in addResourceList) {
+                    if (StringUtils.containsIgnoreCase(resource.getModelInfo().getModelName(), resourceType)) {
+                        sequencedResourceList.add(resource)
 
-                    if (resource instanceof NetworkResource) {
-                        networkResourceList.add(resource)
+                        if (resource instanceof NetworkResource) {
+                            networkResourceList.add(resource)
+                        }
                     }
                 }
             }
+        } else {
+
+        //define sequenced resource list, we deploy vf first and then network and then ar
+        //this is defaule sequence
+        List<VnfResource> vnfResourceList = new ArrayList<VnfResource>()
+        List<AllottedResource> arResourceList = new ArrayList<AllottedResource>()
+
+        for (Resource rc : addResourceList){
+            if (rc instanceof VnfResource) {
+                vnfResourceList.add(rc)
+            } else if (rc instanceof NetworkResource) {
+                networkResourceList.add(rc)
+            } else if (rc instanceof AllottedResource) {
+                arResourceList.add(rc)
+            }
+        }
+        sequencedResourceList.addAll(vnfResourceList)
+        sequencedResourceList.addAll(networkResourceList)
+        sequencedResourceList.addAll(arResourceList)
         }
 
         String isContainsWanResource = networkResourceList.isEmpty() ? "false" : "true"
@@ -127,7 +147,28 @@ public class DoCreateResources extends AbstractServiceTaskProcessor
         execution.setVariable("sequencedResourceList", sequencedResourceList)
         utils.log("INFO", "sequencedResourceList: " + sequencedResourceList, isDebugEnabled) 
         utils.log("INFO", "======== COMPLETED sequenceResoure Process ======== ", isDebugEnabled)
-    }   
+    }
+
+    public prepareServiceTopologyRequest(DelegateExecution execution) {
+
+        def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
+        utils.log("INFO", "======== Start prepareServiceTopologyRequest Process ======== ", isDebugEnabled)
+
+        String serviceDecompose = execution.getVariable("serviceDecomposition")
+
+        execution.setVariable("operationType", "create")
+        execution.setVariable("resourceType", "")
+
+        String serviceInvariantUuid = jsonUtil.getJsonValue(serviceDecompose, "serviceResources.modelInfo.modelInvariantUuid")
+        String serviceUuid = jsonUtil.getJsonValue(serviceDecompose, "serviceResources.modelInfo.modelUuid")
+        String serviceModelName = jsonUtil.getJsonValue(serviceDecompose, "serviceResources.modelInfo.modelName")
+
+        execution.setVariable("modelInvariantUuid", serviceInvariantUuid)
+        execution.setVariable("modelUuid", serviceUuid)
+        execution.setVariable("serviceModelName", serviceModelName)
+
+        utils.log("INFO", "======== End prepareServiceTopologyRequest Process ======== ", isDebugEnabled)
+    }
    
     public void getCurrentResoure(DelegateExecution execution){
 	    def isDebugEnabled=execution.getVariable("isDebugLogEnabled")   
@@ -156,7 +197,7 @@ public class DoCreateResources extends AbstractServiceTaskProcessor
     }    
 
 	 public void prepareResourceRecipeRequest(DelegateExecution execution){
-		 def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+ 		 def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
 		 utils.log("INFO", "======== Start prepareResourceRecipeRequest Process ======== ", isDebugEnabled)
 		 ResourceInput resourceInput = new ResourceInput()
 		 String serviceInstanceName = execution.getVariable("serviceInstanceName")
@@ -168,7 +209,7 @@ public class DoCreateResources extends AbstractServiceTaskProcessor
 		 String serviceType = execution.getVariable("serviceType")
 		 String serviceInstanceId = execution.getVariable("serviceInstanceId")
 		 String operationId = execution.getVariable("operationId")
-		 String operationType = execution.getVariable("operationType")
+		 String operationType = "createInstance"
 		 resourceInput.setGlobalSubscriberId(globalSubscriberId)
 		 resourceInput.setServiceType(serviceType)
 		 resourceInput.setServiceInstanceId(serviceInstanceId)
@@ -199,7 +240,10 @@ public class DoCreateResources extends AbstractServiceTaskProcessor
 		 String serviceInstanceId = execution.getVariable("serviceInstanceId")
 		 String serviceType = execution.getVariable("serviceType")
 		 ResourceInput resourceInput = execution.getVariable("resourceInput")
-		 String requestAction = resourceInput.getOperationType()
+		 
+		 // requestAction is action, not opertiontype
+		 //String requestAction = resourceInput.getOperationType()
+		 String requestAction = "createInstance"
 		 JSONObject resourceRecipe = cutils.getResourceRecipe(execution, resourceInput.getResourceModelInfo().getModelUuid(), requestAction)
          String recipeURL = BPMNProperties.getProperty("bpelURL", "http://mso:8080") + resourceRecipe.getString("orchestrationUri")
 		 int recipeTimeOut = resourceRecipe.getInt("recipeTimeout")