| commit | abeeecfdf18f087af4ae50f645a0e1e77ddbbbd4 | [log] [tgz] |
|---|---|---|
| author | Yulian Han <elaine.hanyulian@huawei.com> | Mon Apr 23 17:40:44 2018 +0800 |
| committer | Yulian Han <elaine.hanyulian@huawei.com> | Mon Apr 23 17:42:32 2018 +0800 |
| tree | 49ac804e654fde456cc84c51ab66f6f80e965a7c | |
| parent | 8fa2659ec0f0b94f22f5caa5d7e61048be18068c [diff] |
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 0ad2da4..a964a7e 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 @@ 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 5e00358..067012e 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateE2EServiceInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateE2EServiceInstance.bpmn
@@ -244,6 +244,7 @@ <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>