From 1be6641f0226ac67d6414ec5a39c1bbb872cf225 Mon Sep 17 00:00:00 2001
From: c00149107 <chenchuanyu@huawei.com>
Date: Tue, 7 Nov 2017 16:04:40 +0800
Subject: Fix AAI Relationship read failed in delete flow

Fix AAI Relationship read failed in delete flow

Change-Id: Ieb31f2088aba3d4bb2d4ad5c72aec061cf833069
Issue-ID:SO-311
Signed-off-by: c00149107 <chenchuanyu@huawei.com>
---
 .../src/main/resources/process/DeleteCustomE2EServiceInstance.bpmn    | 3 ++-
 .../main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn   | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'bpmn/MSOInfrastructureBPMN/src/main/resources')

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteCustomE2EServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteCustomE2EServiceInstance.bpmn
index c6a6d02e4c..bc2b95c5fe 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteCustomE2EServiceInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteCustomE2EServiceInstance.bpmn
@@ -34,8 +34,9 @@ ex.processJavaException(execution)]]></bpmn:script>
         <camunda:in source="serviceInputParams" target="serviceInputParams" />
         <camunda:in source="failIfExists" target="failIfExists" />
         <camunda:in source="globalSubscriberId" target="globalSubscriberId" />
-        <camunda:in source="subscriptionServiceType" target="subscriptionServiceType" />
+        <camunda:in source="serviceType" target="serviceType" />
         <camunda:in sourceExpression="1610" target="sdncVersion" />
+        <camunda:in source="operationId" target="operationId" />
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_0zf2qyk</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_07hrbs0</bpmn:outgoing>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn
index ecdfd628bb..897fffff95 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn
@@ -182,7 +182,7 @@ ddsi.preInitResourcesOperStatus(execution)]]></bpmn:script>
             <camunda:inputParameter name="headers">
               <camunda:map>
                 <camunda:entry key="content-type">application/soap+xml</camunda:entry>
-                <camunda:entry key="Authorization">#{BasicAuthHeaderValueDB}</camunda:entry>
+                <camunda:entry key="Authorization">Basic QlBFTENsaWVudDpwYXNzd29yZDEk</camunda:entry>
               </camunda:map>
             </camunda:inputParameter>
             <camunda:inputParameter name="payload">${CVFMI_initResOperStatusRequest}</camunda:inputParameter>
@@ -207,6 +207,8 @@ ddsi.preInitResourcesOperStatus(execution)]]></bpmn:script>
         <camunda:out source="WorkflowException" target="WorkflowException" />
         <camunda:out source="GENGS_siResourceLink" target="GENGS_siResourceLink" />
         <camunda:out source="GENGS_service" target="GENGS_service" />
+        <camunda:in source="globalSubscriberId" target="GENGS_globalCustomerId" />
+        <camunda:in source="serviceType" target="GENGS_serviceType" />
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_11e6bfy</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_188ejvu</bpmn:outgoing>
-- 
cgit 1.2.3-korg