From 64d0ab5ebd9121de878d7932e2469afae74c8a99 Mon Sep 17 00:00:00 2001
From: c00149107 <chenchuanyu@huawei.com>
Date: Fri, 13 Oct 2017 10:48:59 +0800
Subject: Correct the workflow for NS Create

Correct the workflow for NS Create bpmn

Change-Id: I71283c88a3936d1b19b3403f6940823875405c90
Issue-ID:SO-217
Signed-off-by: c00149107 <chenchuanyu@huawei.com>
---
 .../process/CreateCustomE2EServiceInstance.bpmn    | 54 ++++++++++++++--------
 1 file changed, 35 insertions(+), 19 deletions(-)

(limited to 'bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateCustomE2EServiceInstance.bpmn')

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateCustomE2EServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateCustomE2EServiceInstance.bpmn
index 0a80602705..b9d5e2c1d2 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateCustomE2EServiceInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateCustomE2EServiceInstance.bpmn
@@ -113,7 +113,7 @@ csi.sendSyncError(execution)]]></bpmn:script>
       <bpmn:sequenceFlow id="SequenceFlow_01umodj" sourceRef="ScriptTask_0u8o9p2" targetRef="CallActivity_1ang7q8" />
     </bpmn:subProcess>
     <bpmn:scriptTask id="ScriptTask_0xupxj9" name="Send Sync Ack Response" scriptFormat="groovy">
-      <bpmn:incoming>SequenceFlow_081z8l2</bpmn:incoming>
+      <bpmn:incoming>SequenceFlow_194rnud</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_19eilro</bpmn:outgoing>
       <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
 def csi = new  CreateCustomE2EServiceInstance()
@@ -148,7 +148,7 @@ csi.sendSyncResponse(execution)]]></bpmn:script>
 def csi= new CreateCustomE2EServiceInstance()
 csi.InitServiceOperationStatus(execution)]]></bpmn:script>
     </bpmn:scriptTask>
-    <bpmn:sequenceFlow id="SequenceFlow_081z8l2" sourceRef="Task_19mxcw3" targetRef="ScriptTask_0xupxj9" />
+    <bpmn:sequenceFlow id="SequenceFlow_081z8l2" sourceRef="Task_19mxcw3" targetRef="Task_0in343a" />
     <bpmn:serviceTask id="Task_19mxcw3" name="Update Service Operation Status">
       <bpmn:extensionElements>
         <camunda:connector>
@@ -171,6 +171,12 @@ csi.InitServiceOperationStatus(execution)]]></bpmn:script>
       <bpmn:incoming>SequenceFlow_1euqjsp</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_081z8l2</bpmn:outgoing>
     </bpmn:serviceTask>
+    <bpmn:sequenceFlow id="SequenceFlow_194rnud" sourceRef="Task_0in343a" targetRef="ScriptTask_0xupxj9" />
+    <bpmn:scriptTask id="Task_0in343a" name="Send SDNC Service" scriptFormat="java">
+      <bpmn:incoming>SequenceFlow_081z8l2</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_194rnud</bpmn:outgoing>
+      <bpmn:script></bpmn:script>
+    </bpmn:scriptTask>
   </bpmn:process>
   <bpmn:error id="Error_0nbdy47" name="MSOWorkflowException" errorCode="MSOWorkflowException" />
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
@@ -194,7 +200,7 @@ csi.InitServiceOperationStatus(execution)]]></bpmn:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_1s09c7d_di" bpmnElement="ScriptTask_1s09c7d">
-        <dc:Bounds x="158" y="158" width="100" height="80" />
+        <dc:Bounds x="129" y="158" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0ttvn8r_di" bpmnElement="ScriptTask_0ttvn8r">
         <dc:Bounds x="1038" y="158" width="100" height="80" />
@@ -206,7 +212,7 @@ csi.InitServiceOperationStatus(execution)]]></bpmn:script>
         <dc:Bounds x="348" y="370" width="679" height="194" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0xupxj9_di" bpmnElement="ScriptTask_0xupxj9">
-        <dc:Bounds x="550" y="158" width="100" height="80" />
+        <dc:Bounds x="577" y="158" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_0aqn64l_di" bpmnElement="ExclusiveGateway_0aqn64l" isMarkerVisible="true">
         <dc:Bounds x="903" y="173" width="50" height="50" />
@@ -222,16 +228,16 @@ csi.InitServiceOperationStatus(execution)]]></bpmn:script>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0s2spoq_di" bpmnElement="SequenceFlow_0s2spoq">
         <di:waypoint xsi:type="dc:Point" x="118" y="198" />
-        <di:waypoint xsi:type="dc:Point" x="158" y="198" />
+        <di:waypoint xsi:type="dc:Point" x="129" y="198" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="93" y="177" width="90" height="12" />
+          <dc:Bounds x="78.5" y="177" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_19eilro_di" bpmnElement="SequenceFlow_19eilro">
-        <di:waypoint xsi:type="dc:Point" x="650" y="198" />
+        <di:waypoint xsi:type="dc:Point" x="677" y="198" />
         <di:waypoint xsi:type="dc:Point" x="701" y="198" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="630.5" y="177" width="90" height="12" />
+          <dc:Bounds x="644" y="177" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0klbpxx_di" bpmnElement="SequenceFlow_0klbpxx">
@@ -249,10 +255,10 @@ csi.InitServiceOperationStatus(execution)]]></bpmn:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0z4faf9_di" bpmnElement="SequenceFlow_0z4faf9">
-        <di:waypoint xsi:type="dc:Point" x="258" y="198" />
-        <di:waypoint xsi:type="dc:Point" x="298" y="198" />
+        <di:waypoint xsi:type="dc:Point" x="229" y="198" />
+        <di:waypoint xsi:type="dc:Point" x="245" y="198" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="233" y="177" width="90" height="12" />
+          <dc:Bounds x="192" y="177" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_14zu6wr_di" bpmnElement="SequenceFlow_14zu6wr">
@@ -363,24 +369,34 @@ csi.InitServiceOperationStatus(execution)]]></bpmn:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1euqjsp_di" bpmnElement="SequenceFlow_1euqjsp">
-        <di:waypoint xsi:type="dc:Point" x="398" y="198" />
-        <di:waypoint xsi:type="dc:Point" x="425.46307385229545" y="198" />
+        <di:waypoint xsi:type="dc:Point" x="345" y="198" />
+        <di:waypoint xsi:type="dc:Point" x="371" y="198" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="411.7315369261477" y="177" width="0" height="12" />
+          <dc:Bounds x="358" y="177" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_1a3vwas_di" bpmnElement="Task_1tqjch6">
-        <dc:Bounds x="298" y="158" width="100" height="80" />
+        <dc:Bounds x="245" y="158" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_081z8l2_di" bpmnElement="SequenceFlow_081z8l2">
-        <di:waypoint xsi:type="dc:Point" x="525.4630738522955" y="198" />
-        <di:waypoint xsi:type="dc:Point" x="550" y="198" />
+        <di:waypoint xsi:type="dc:Point" x="497" y="198" />
+        <di:waypoint xsi:type="dc:Point" x="522" y="198" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="537.7315369261478" y="177" width="0" height="12" />
+          <dc:Bounds x="509.5" y="177" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ServiceTask_1afiuuq_di" bpmnElement="Task_19mxcw3">
-        <dc:Bounds x="426" y="158" width="100" height="80" />
+        <dc:Bounds x="371" y="158" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_194rnud_di" bpmnElement="SequenceFlow_194rnud">
+        <di:waypoint xsi:type="dc:Point" x="597" y="198" />
+        <di:waypoint xsi:type="dc:Point" x="627" y="198" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="612" y="177" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_1u5yu0n_di" bpmnElement="Task_0in343a">
+        <dc:Bounds x="476" y="158" width="100" height="80" />
       </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
-- 
cgit 1.2.3-korg