Fix to get the resource from ordered list 67/44367/1
authorsubhash kumar singh <subhash.kumar.singh@huawei.com>
Tue, 24 Apr 2018 13:32:23 +0000 (13:32 +0000)
committersubhash kumar singh <subhash.kumar.singh@huawei.com>
Tue, 24 Apr 2018 13:32:23 +0000 (13:32 +0000)
Fix to get the resource from ordered list

Change-Id: I43a7a33a7d2464d7580f175807a1b42d2dce94f2
Issue-ID: SO-422
Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteResourcesV1.groovy

index 46dd7d6..5dd8109 100644 (file)
@@ -193,7 +193,7 @@ public class DoDeleteResourcesV1 extends AbstractServiceTaskProcessor {
         String isContainsWanResource = wanResources.isEmpty() ? "false" : "true"
         execution.setVariable("isContainsWanResource", isContainsWanResource)
         execution.setVariable("currentResourceIndex", 0)
-        execution.setVariable("resourceSequence", resourceSequence)
+        execution.setVariable("resourceSequence", sequencedResourceList)
         utils.log("INFO", "resourceSequence: " + resourceSequence, isDebugEnabled)
         execution.setVariable("wanResources", wanResources)
         utils.log("INFO", " ======== END sequenceResource Process ======== ", isDebugEnabled)
@@ -208,7 +208,7 @@ public class DoDeleteResourcesV1 extends AbstractServiceTaskProcessor {
 
         utils.log("INFO", " ======== STARTED preResourceDelete Process ======== ", isDebugEnabled)
 
-        List<Resource> existResourceList = execution.getVariable("deleteResourceList")
+        List<Resource> existResourceList = execution.getVariable("resourceSequence")
 
         int currentIndex = execution.getVariable("currentResourceIndex")
         Resource curResource = existResourceList.get(currentIndex);