diff options
| author |   Chuanyu Chen <chenchuanyu@huawei.com> | 2018-03-20 08:50:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-20 08:50:17 +0000 |
| commit | 622eb2cf25e0c99828dbd92791ea1fbadc35af64 (patch) | |
| tree | 77f661ddbe152e5051ed8ff4efb93d26ae59fb89 | |
| parent | 91a59422f0f99ecc9cc508ed017cfca56c975fdf (diff) | |
| parent | a677bd75cf7f3d3610db537cf2938a4d03c171c9 (diff) | |
Merge "modify bugs of Update E2E Rollback bpmn"
| -rw-r--r-- | bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateE2EServiceInstanceRollback.groovy | 9 |
1 files changed, 5 insertions, 4 deletions
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 = """<service-instance xmlns=\"${namespace}\"> - <resource-version">${serviceInstanceVersion}</resource-version> + <resource-version">${modelUuid}</resource-version> </service-instance>""".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) |