Merge "Fix bpmn by specifying script type"

2 files changed, 8 insertions, 6 deletions

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteResourcesV1.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteResourcesV1.groovy
index 8590375ad7..690738b312 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteResourcesV1.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteResourcesV1.groovy
@@ -156,7 +156,7 @@ public class DoDeleteResourcesV1 extends AbstractServiceTaskProcessor {
 
         def resourceSequence = BPMNProperties.getResourceSequenceProp()
 
-        for (resourceType in resourceSequence) {
+        for (resourceType in resourceSequence.reverse()) {
             for (resource in delResourceList) {
                 if (StringUtils.containsIgnoreCase(resource.getModelInfo().getModelName(), resourceType)) {
                     sequencedResourceList.add(resource)
@@ -236,7 +236,9 @@ public class DoDeleteResourcesV1 extends AbstractServiceTaskProcessor {
         resourceInput.setServiceModelInfo(modelInfo)
         resourceInput.setServiceType(serviceType)
 
-        HttpResponse resp = BpmnRestClient.post(recipeUri, requestId, recipeTimeout, requestAction, serviceInstanceId, serviceType, resourceInput.toString(), recipeParamXsd)
+        String recipeURL = BPMNProperties.getProperty("bpelURL", "http://mso:8080") + recipeUri
+
+        HttpResponse resp = BpmnRestClient.post(recipeURL, requestId, recipeTimeout, requestAction, serviceInstanceId, serviceType, resourceInput.toString(), recipeParamXsd)
         utils.log("INFO", " ======== END executeResourceDelete Process ======== ", isDebugEnabled)
     }
 
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteSDNCNetworkResource.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteSDNCNetworkResource.bpmn
index c730c8e2de..a9e3f5d807 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteSDNCNetworkResource.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteSDNCNetworkResource.bpmn
@@ -33,14 +33,14 @@ ex.processJavaException(execution)]]></bpmn:script>
     </bpmn:subProcess>
     <bpmn:sequenceFlow id="SequenceFlow_1twf9nk" sourceRef="Task_1t687g1" targetRef="Task_0i59nr9" />
     <bpmn:sequenceFlow id="SequenceFlow_1ba6i0r" sourceRef="Task_1cglzlg" targetRef="EndEvent_1x6k78c" />
-    <bpmn:scriptTask id="Task_1t687g1" name="Pre Resource Delete">
+    <bpmn:scriptTask id="Task_1t687g1" name="Pre Resource Delete" scriptFormat="groovy">
       <bpmn:incoming>SequenceFlow_01medil</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_1twf9nk</bpmn:outgoing>
       <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
 def dsdncr = new DeleteSDNCNetworkResource()
-dsdncr.preProcessSDNCDelete(execution)]]></bpmn:script>
+dsdncr.preProcessRequest(execution)]]></bpmn:script>
     </bpmn:scriptTask>
-    <bpmn:scriptTask id="Task_1cglzlg" name="Post Resource Delete">
+    <bpmn:scriptTask id="Task_1cglzlg" name="Post Resource Delete" scriptFormat="groovy">
       <bpmn:incoming>SequenceFlow_092fygq</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_1ba6i0r</bpmn:outgoing>
       <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
@@ -48,7 +48,7 @@ def dsdncr = new DeleteSDNCNetworkResource()
 dsdncr.postProcessSDNCDelete(execution)]]></bpmn:script>
     </bpmn:scriptTask>
     <bpmn:sequenceFlow id="SequenceFlow_01medil" sourceRef="Task_1d5rrfs" targetRef="Task_1t687g1" />
-    <bpmn:scriptTask id="Task_1d5rrfs" name="Set RecipeParam">
+    <bpmn:scriptTask id="Task_1d5rrfs" name="Set RecipeParam" scriptFormat="groovy">
       <bpmn:incoming>SequenceFlow_1qo2pln</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_01medil</bpmn:outgoing>
       <bpmn:script><![CDATA[String recipeParamXsdDemo="""