From faac8220ef71d68ac87706e521f11f445dcb2e4c Mon Sep 17 00:00:00 2001 From: Yulian Han Date: Sat, 21 Apr 2018 17:56:14 +0800 Subject: UpdateAAI lost serviceInstVersion and modeluuid bpmn ExclusiveGateway usage bug fix Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f064307 Issue-ID: SO-578 Signed-off-by: Yulian Han --- .../scripts/DoUpdateE2EServiceInstance.groovy | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'bpmn/MSOInfrastructureBPMN/src/main/groovy') diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateE2EServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateE2EServiceInstance.groovy index 38fb22572d..f29db9252f 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateE2EServiceInstance.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateE2EServiceInstance.groovy @@ -126,7 +126,11 @@ public class DoUpdateE2EServiceInstance extends AbstractServiceTaskProcessor { // user params String uuiRequest = execution.getVariable("uuiRequest") - utils.log("INFO","uuiRequest: " + uuiRequest, isDebugEnabled) + // target model uuid + String modelUuid = jsonUtil.getJsonValue(uuiRequest, "service.serviceUuid") + execution.setVariable("modelUuid", modelUuid) + + utils.log("INFO","modelUuid: " + modelUuid, isDebugEnabled) } catch (BpmnError e) { throw e; @@ -204,13 +208,11 @@ public class DoUpdateE2EServiceInstance extends AbstractServiceTaskProcessor { execution.setVariable("operationType", "create") - def hasResourcetoAdd = false + execution.setVariable("hasResourcetoAdd", false) List addResourceList = execution.getVariable("addResourceList") if(addResourceList != null && !addResourceList.isEmpty()) { - hasResourcetoAdd = true + execution.setVariable("hasResourcetoAdd", true) } - execution.setVariable("hasResourcetoAdd", hasResourcetoAdd) - utils.log("INFO"," *** Exit preProcessForAddResource *** ", isDebugEnabled) } @@ -230,12 +232,11 @@ public class DoUpdateE2EServiceInstance extends AbstractServiceTaskProcessor { execution.setVariable("operationType", "delete") - def hasResourcetoDelete = false + execution.setVariable("hasResourcetoDelete", false) List delResourceList = execution.getVariable("delResourceList") if(delResourceList != null && !delResourceList.isEmpty()) { - hasResourcetoDelete = true - } - execution.setVariable("hasResourcetoDelete", hasResourcetoDelete) + execution.setVariable("hasResourcetoDelete", true) + } execution.setVariable("resourceInstanceIDs", execution.getVariable("serviceRelationShip")) @@ -317,6 +318,7 @@ public class DoUpdateE2EServiceInstance extends AbstractServiceTaskProcessor { String namespace = aaiUriUtil.getNamespaceFromUri(aai_uri) utils.log("INFO","namespace: " + namespace, isDebugEnabled) + //update target model to aai String serviceInstanceData = """ ${modelUuid} -- cgit