From a677bd75cf7f3d3610db537cf2938a4d03c171c9 Mon Sep 17 00:00:00 2001 From: Yulian Han Date: Tue, 20 Mar 2018 15:02:27 +0800 Subject: modify bugs of Update E2E Rollback bpmn Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f0641e0 Issue-ID: SO-419 Signed-off-by: Yulian Han --- .../scripts/DoUpdateE2EServiceInstanceRollback.groovy | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'bpmn/MSOInfrastructureBPMN/src/main/groovy') diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateE2EServiceInstanceRollback.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateE2EServiceInstanceRollback.groovy index 2891855e8f..1e70f95bd3 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateE2EServiceInstanceRollback.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateE2EServiceInstanceRollback.groovy @@ -77,8 +77,9 @@ public class DoUpdateE2EServiceInstanceRollback extends AbstractServiceTaskProce List addResourceList = execution.getVariable("addResourceList") List delResourceList = execution.getVariable("delResourceList") execution.setVariable("addResourceList_o", addResourceList) - execution.setVariable("addResourceList", delResourceList) execution.setVariable("delResourceList_o", delResourceList) + //exchange add and delete resource list + execution.setVariable("addResourceList", delResourceList) execution.setVariable("delResourceList", addResourceList) try { @@ -204,7 +205,7 @@ public class DoUpdateE2EServiceInstanceRollback extends AbstractServiceTaskProce } - public void preProcessAAIGET2(DelegateExecution execution) { + public void preProcessAAIGET(DelegateExecution execution) { def isDebugEnabled=execution.getVariable("isDebugLogEnabled") } @@ -264,7 +265,7 @@ public class DoUpdateE2EServiceInstanceRollback extends AbstractServiceTaskProce String serviceInstanceData = """ - ${serviceInstanceVersion} + ${modelUuid} """.trim() execution.setVariable("serviceInstanceData", serviceInstanceData) @@ -310,7 +311,7 @@ public class DoUpdateE2EServiceInstanceRollback extends AbstractServiceTaskProce def isDebugEnabled=execution.getVariable("isDebugLogEnabled") utils.log("DEBUG"," ***** processRollbackException ***** ", isDebugEnabled) try{ - utils.log("DEBUG", "Caught an Exception in DoCreateServiceInstanceRollback", isDebugEnabled) + utils.log("DEBUG", "Caught an Exception in DoUpdateE2EServiceInstanceRollback", isDebugEnabled) execution.setVariable("rollbackData", null) execution.setVariable("rollbackError", "Caught exception in ServiceInstance Update Rollback") execution.setVariable("WorkflowException", null) -- cgit 1.2.3-korg