From: Yulian Han <elaine.hanyulian@huawei.com>
Date: Mon, 23 Apr 2018 09:40:44 +0000 (+0800)
Subject: Add 'not found in AAI' for updateE2E syncresponse
X-Git-Tag: v1.2.1~112^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=abeeecfdf18f087af4ae50f645a0e1e77ddbbbd4;p=so.git

Add 'not found in AAI' for updateE2E syncresponse

add 'operaterID'  input para to call deleteE2Em

Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f064308
Issue-ID: SO-578
Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>
---

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateCustomE2EServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateCustomE2EServiceInstance.groovy
index 0ad2da4a9a..a964a7e32a 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateCustomE2EServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateCustomE2EServiceInstance.groovy
@@ -451,7 +451,7 @@ public class UpdateCustomE2EServiceInstance extends AbstractServiceTaskProcessor
 				updateServiceResp = """{"operationId":"${operationId}"}""".trim()
 			}
 			else {
-				updateServiceResp =  """{"OperationResult":"No Resource to Add or Delete"}"""
+				updateServiceResp =  """{"OperationResult":"No Resource to Add or Delete or Service Instance not found in AAI."}"""
 			}
 			
 			utils.log("INFO", " sendSyncResponse to APIH:" + "\n" + updateServiceResp, isDebugEnabled)
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateE2EServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateE2EServiceInstance.bpmn
index 5e00358302..067012e675 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateE2EServiceInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateE2EServiceInstance.bpmn
@@ -244,6 +244,7 @@ dcsi.preProcessAAIPUT(execution)]]></bpmn2:script>
         <camunda:in source="delResourceList" target="deleteResourceList" />
         <camunda:in source="resourceInstanceIDs" target="resourceInstanceIDs" />
         <camunda:in source="operationType" target="operationType" />
+        <camunda:in source="operationId" target="operationId" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_0ur34hv</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0w4t4ao</bpmn2:outgoing>