aboutsummaryrefslogtreecommitdiffstats
path: root/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp
diff options
context:
space:
mode:
authorsubhash kumar singh <subhash.kumar.singh@huawei.com>2018-04-17 05:53:30 +0000
committersubhash kumar singh <subhash.kumar.singh@huawei.com>2018-04-17 05:53:30 +0000
commit635e3ec4166a91871fd47f146f1b039c5be90a93 (patch)
tree767108d13d6f8908da6f40dfba581cc1a5e6c272 /bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp
parent62aaca24667fe9c614d6a982fe39dc52756d7702 (diff)
Fix bpmn by specifying script type
Fix bpmn by specifying script type Change-Id: I68a6a6272362eb195582641980865d02bd9ed44b Issue-ID: SO-422 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
Diffstat (limited to 'bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp')
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteResourcesV1.groovy6
1 files changed, 4 insertions, 2 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)
}