From b23cf7b08c000ea2303ce3492032898f677b246b Mon Sep 17 00:00:00 2001
From: Seshu-Kumar-M <seshu.kumar.m@huawei.com>
Date: Wed, 20 Sep 2017 20:14:28 +0800
Subject: [PATCH] Fix duplicate service instance ids IssueId: SO-146

Change-Id: I483f96eea7be409546ebc5c84e2332b2992672e7
Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>
---
 .../subprocess/DoCreateE2ENetworkInstance.bpmn     |   4 +-
 .../subprocess/DoCreateE2EServiceInstance.bpmn     | 233 ++++++++-------------
 .../DoCreateVFCNetworkServiceInstance.bpmn         | 149 ++++++-------
 3 files changed, 171 insertions(+), 215 deletions(-)

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2ENetworkInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2ENetworkInstance.bpmn
index 0010c1414c..9fad8dd398 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2ENetworkInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2ENetworkInstance.bpmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.7.2">
-  <bpmn:process id="DoCreateNetworkInstance" name="DoCreateNetworkInstance" isExecutable="true">
+  <bpmn:process id="DoCreateE2ENetworkInstance" name="DoCreateE2ENetworkInstance" isExecutable="true">
     <bpmn:startEvent id="StartEvent_1">
       <bpmn:outgoing>SequenceFlow_1gomb9n</bpmn:outgoing>
     </bpmn:startEvent>
@@ -62,7 +62,7 @@ dcsi.postProcessAAIGET2(execution)]]></bpmn:script>
     <bpmn:sequenceFlow id="SequenceFlow_1gomb9n" sourceRef="StartEvent_1" targetRef="ScriptTask_16gvaru" />
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateNetworkInstance">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateE2ENetworkInstance">
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
         <dc:Bounds x="173" y="102" width="36" height="36" />
       </bpmndi:BPMNShape>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn
index edbb03d40f..d5ddac1803 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_MagIIMOUEeW8asg-vCEgWQ" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.6.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_MagIIMOUEeW8asg-vCEgWQ" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.7.2" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="DoCreateE2EServiceInstance" name="DoCreateE2EServiceInstance" isExecutable="true">
     <bpmn2:startEvent id="createSI_startEvent" name="Start Flow">
       <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
@@ -101,12 +101,11 @@ dcsi.postProcessRollback(execution)
       </bpmn2:scriptTask>
       <bpmn2:sequenceFlow id="SequenceFlow_1xzgv5k" sourceRef="ScriptTask_1p0vyip" targetRef="EndEvent_117lkk3" />
     </bpmn2:subProcess>
-    <bpmn2:exclusiveGateway id="ExclusiveGateway_1nk6aol" name="sdncVersion is 1610?" default="SequenceFlow_156ih25">
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_1nk6aol" name="sdncVersion is 1610?">
       <bpmn2:incoming>SequenceFlow_1dd86x8</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_156ih25</bpmn2:outgoing>
       <bpmn2:outgoing>SequenceFlow_00v4npo</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_1170ztf</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="SequenceFlow_156ih25" name="no" sourceRef="ExclusiveGateway_1nk6aol" targetRef="ParallelGateway_01c99ru" />
     <bpmn2:endEvent id="EndEvent_10659gr">
       <bpmn2:incoming>SequenceFlow_00v4npo</bpmn2:incoming>
     </bpmn2:endEvent>
@@ -133,30 +132,25 @@ ddsi.postProcessAAIPUT(execution)]]></bpmn2:script>
 def dcsi = new DoCreateE2EServiceInstance()
 dcsi.postProcessAAIGET2(execution)]]></bpmn2:script>
 </bpmn2:scriptTask>
-    <bpmn2:parallelGateway id="ParallelGateway_01c99ru">
-      <bpmn2:incoming>SequenceFlow_156ih25</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_09sdmg1</bpmn2:outgoing>
-      <bpmn2:outgoing>SequenceFlow_1a9kmos</bpmn2:outgoing>
-    </bpmn2:parallelGateway>
     <bpmn2:scriptTask id="ScriptTask_0081lne" name="Prepare SDN-C Adaptor Data Request" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_09sdmg1</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_1170ztf</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0ofqw6v</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
 def csi = new  DoCreateE2EServiceInstance()
 csi.preSDNCRequest(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:scriptTask id="ScriptTask_0wvq4t8" name="Prepare VF-C Adaptor Data Request" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_1a9kmos</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_1d4wn2y</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_15zgrcq</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
 def csi = new  DoCreateE2EServiceInstance()
 csi.preVFCRequest(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:callActivity id="CallActivity_09c3ajg" name="Call DoCreateNetworkInstance" calledElement="DoCreateNetworkInstance">
+    <bpmn2:callActivity id="CallActivity_09c3ajg" name="Call DoCreateE2ENetworkInstance" calledElement="DoCreateE2ENetworkInstance">
       <bpmn2:incoming>SequenceFlow_0ofqw6v</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1vvdkcs</bpmn2:outgoing>
     </bpmn2:callActivity>
-    <bpmn2:callActivity id="CallActivity_0uwm4l1" name="Call DoCreateNetworkServiceInstance" calledElement="DoCreateNetworkServiceInstance">
+    <bpmn2:callActivity id="CallActivity_0uwm4l1" name="Call DoCreateVFCNetworkServiceInstance" calledElement="DoCreateVFCNetworkServiceInstance">
       <bpmn2:incoming>SequenceFlow_15zgrcq</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1x8vphc</bpmn2:outgoing>
     </bpmn2:callActivity>
@@ -168,34 +162,15 @@ csi.preVFCRequest(execution)]]></bpmn2:script>
     <bpmn2:exclusiveGateway id="ExclusiveGateway_0cdz77v" name="Success?">
       <bpmn2:incoming>SequenceFlow_1x8vphc</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0ou0spo</bpmn2:outgoing>
-      <bpmn2:outgoing>SequenceFlow_1an6ial</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_0mcyg0e</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
-    <bpmn2:parallelGateway id="ParallelGateway_0r1ne67">
-      <bpmn2:incoming>SequenceFlow_1d4wn2y</bpmn2:incoming>
-      <bpmn2:incoming>SequenceFlow_1an6ial</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_0w7skxr</bpmn2:outgoing>
-    </bpmn2:parallelGateway>
-    <bpmn2:endEvent id="EndEvent_0kbbt94">
-      <bpmn2:incoming>SequenceFlow_092ghvu</bpmn2:incoming>
-      <bpmn2:terminateEventDefinition />
-    </bpmn2:endEvent>
     <bpmn2:scriptTask id="ScriptTask_1xdjlzm" name="Post Config Service Instance Creation" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_0w7skxr</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_0mcyg0e</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_092ghvu</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
 def csi = new  DoCreateE2EServiceInstance()
 csi.postConfigRequest(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:endEvent id="EndEvent_11lmyvs">
-      <bpmn2:incoming>SequenceFlow_1yv1kef</bpmn2:incoming>
-      <bpmn2:terminateEventDefinition />
-    </bpmn2:endEvent>
-    <bpmn2:endEvent id="EndEvent_01h4q8z">
-      <bpmn2:incoming>SequenceFlow_0ou0spo</bpmn2:incoming>
-      <bpmn2:terminateEventDefinition />
-    </bpmn2:endEvent>
-    <bpmn2:sequenceFlow id="SequenceFlow_09sdmg1" sourceRef="ParallelGateway_01c99ru" targetRef="ScriptTask_0081lne" />
-    <bpmn2:sequenceFlow id="SequenceFlow_1a9kmos" sourceRef="ParallelGateway_01c99ru" targetRef="ScriptTask_0wvq4t8" />
     <bpmn2:sequenceFlow id="SequenceFlow_0ofqw6v" sourceRef="ScriptTask_0081lne" targetRef="CallActivity_09c3ajg" />
     <bpmn2:sequenceFlow id="SequenceFlow_15zgrcq" sourceRef="ScriptTask_0wvq4t8" targetRef="CallActivity_0uwm4l1" />
     <bpmn2:sequenceFlow id="SequenceFlow_1vvdkcs" sourceRef="CallActivity_09c3ajg" targetRef="ExclusiveGateway_0lczgac" />
@@ -203,17 +178,24 @@ csi.postConfigRequest(execution)]]></bpmn2:script>
     <bpmn2:sequenceFlow id="SequenceFlow_1yv1kef" name="No" sourceRef="ExclusiveGateway_0lczgac" targetRef="EndEvent_11lmyvs">
       <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("WorkflowException") != null}]]></bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="SequenceFlow_1d4wn2y" name="Yes" sourceRef="ExclusiveGateway_0lczgac" targetRef="ParallelGateway_0r1ne67">
+    <bpmn2:sequenceFlow id="SequenceFlow_1d4wn2y" name="Yes" sourceRef="ExclusiveGateway_0lczgac" targetRef="ScriptTask_0wvq4t8">
       <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("WorkflowException") != null}]]></bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_0ou0spo" name="No" sourceRef="ExclusiveGateway_0cdz77v" targetRef="EndEvent_01h4q8z">
       <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("WorkflowException") != null}]]></bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="SequenceFlow_1an6ial" name="Yes" sourceRef="ExclusiveGateway_0cdz77v" targetRef="ParallelGateway_0r1ne67">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("WorkflowException") != null}]]></bpmn2:conditionExpression>
-    </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="SequenceFlow_0w7skxr" sourceRef="ParallelGateway_0r1ne67" targetRef="ScriptTask_1xdjlzm" />
     <bpmn2:sequenceFlow id="SequenceFlow_092ghvu" sourceRef="ScriptTask_1xdjlzm" targetRef="EndEvent_0kbbt94" />
+    <bpmn2:sequenceFlow id="SequenceFlow_0mcyg0e" sourceRef="ExclusiveGateway_0cdz77v" targetRef="ScriptTask_1xdjlzm" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1170ztf" sourceRef="ExclusiveGateway_1nk6aol" targetRef="ScriptTask_0081lne" />
+    <bpmn2:endEvent id="EndEvent_11lmyvs">
+      <bpmn2:incoming>SequenceFlow_1yv1kef</bpmn2:incoming>
+    </bpmn2:endEvent>
+    <bpmn2:endEvent id="EndEvent_01h4q8z">
+      <bpmn2:incoming>SequenceFlow_0ou0spo</bpmn2:incoming>
+    </bpmn2:endEvent>
+    <bpmn2:endEvent id="EndEvent_0kbbt94">
+      <bpmn2:incoming>SequenceFlow_092ghvu</bpmn2:incoming>
+    </bpmn2:endEvent>
   </bpmn2:process>
   <bpmn2:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" />
   <bpmn2:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" />
@@ -334,16 +316,9 @@ csi.postConfigRequest(execution)]]></bpmn2:script>
       <bpmndi:BPMNShape id="ExclusiveGateway_1nk6aol_di" bpmnElement="ExclusiveGateway_1nk6aol" isMarkerVisible="true">
         <dc:Bounds x="997" y="460" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="903" y="472" width="75" height="24" />
+          <dc:Bounds x="905" y="472" width="72" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_156ih25_di" bpmnElement="SequenceFlow_156ih25">
-        <di:waypoint xsi:type="dc:Point" x="1022" y="510" />
-        <di:waypoint xsi:type="dc:Point" x="1021" y="716" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="990.6229572950259" y="581.6137587257341" width="15" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="EndEvent_10659gr_di" bpmnElement="EndEvent_10659gr">
         <dc:Bounds x="1103" y="467" width="36" height="36" />
         <bpmndi:BPMNLabel>
@@ -404,156 +379,128 @@ csi.postConfigRequest(execution)]]></bpmn2:script>
       <bpmndi:BPMNShape id="ScriptTask_1tp0fcx_di" bpmnElement="ScriptTask_1tp0fcx">
         <dc:Bounds x="1527" y="1137" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ParallelGateway_01c99ru_di" bpmnElement="ParallelGateway_01c99ru">
-        <dc:Bounds x="996" y="716" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="976" y="770" width="0" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0081lne_di" bpmnElement="ScriptTask_0081lne">
-        <dc:Bounds x="845" y="894" width="100" height="80" />
+        <dc:Bounds x="972" y="552" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0wvq4t8_di" bpmnElement="ScriptTask_0wvq4t8">
-        <dc:Bounds x="845" y="701" width="100" height="80" />
+        <dc:Bounds x="713" y="818" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_09c3ajg_di" bpmnElement="CallActivity_09c3ajg">
-        <dc:Bounds x="704" y="894" width="100" height="80" />
+        <dc:Bounds x="972" y="694" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_0uwm4l1_di" bpmnElement="CallActivity_0uwm4l1">
-        <dc:Bounds x="704" y="701" width="100" height="80" />
+        <dc:Bounds x="517" y="818" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_0lczgac_di" bpmnElement="ExclusiveGateway_0lczgac" isMarkerVisible="true">
-        <dc:Bounds x="566" y="909" width="50" height="50" />
+        <dc:Bounds x="901" y="843" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="565" y="884" width="51" height="12" />
+          <dc:Bounds x="901" y="818" width="49" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_0cdz77v_di" bpmnElement="ExclusiveGateway_0cdz77v" isMarkerVisible="true">
-        <dc:Bounds x="566" y="716" width="50" height="50" />
+        <dc:Bounds x="375" y="833" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="566" y="691" width="50" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ParallelGateway_0r1ne67_di" bpmnElement="ParallelGateway_0r1ne67">
-        <dc:Bounds x="403" y="804" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="383" y="858" width="0" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="EndEvent_0kbbt94_di" bpmnElement="EndEvent_0kbbt94">
-        <dc:Bounds x="109" y="811" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="81" y="851" width="0" height="12" />
+          <dc:Bounds x="376" y="808" width="49" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_1xdjlzm_di" bpmnElement="ScriptTask_1xdjlzm">
-        <dc:Bounds x="231" y="789" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="EndEvent_11lmyvs_di" bpmnElement="EndEvent_11lmyvs">
-        <dc:Bounds x="573" y="1003" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="546" y="1042" width="0" height="12" />
-        </bpmndi:BPMNLabel>
+        <dc:Bounds x="218" y="818" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="EndEvent_01h4q8z_di" bpmnElement="EndEvent_01h4q8z">
-        <dc:Bounds x="573" y="601" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="546" y="640" width="0" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_09sdmg1_di" bpmnElement="SequenceFlow_09sdmg1">
-        <di:waypoint xsi:type="dc:Point" x="1021" y="766" />
-        <di:waypoint xsi:type="dc:Point" x="1021" y="934" />
-        <di:waypoint xsi:type="dc:Point" x="945" y="934" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="991" y="844" width="0" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_1a9kmos_di" bpmnElement="SequenceFlow_1a9kmos">
-        <di:waypoint xsi:type="dc:Point" x="996" y="741" />
-        <di:waypoint xsi:type="dc:Point" x="945" y="741" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="926.5" y="720" width="0" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0ofqw6v_di" bpmnElement="SequenceFlow_0ofqw6v">
-        <di:waypoint xsi:type="dc:Point" x="845" y="934" />
-        <di:waypoint xsi:type="dc:Point" x="804" y="934" />
+        <di:waypoint xsi:type="dc:Point" x="1022" y="632" />
+        <di:waypoint xsi:type="dc:Point" x="1022" y="694" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="780.5" y="913" width="0" height="12" />
+          <dc:Bounds x="992" y="657" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_15zgrcq_di" bpmnElement="SequenceFlow_15zgrcq">
-        <di:waypoint xsi:type="dc:Point" x="845" y="741" />
-        <di:waypoint xsi:type="dc:Point" x="825" y="741" />
-        <di:waypoint xsi:type="dc:Point" x="825" y="741" />
-        <di:waypoint xsi:type="dc:Point" x="804" y="741" />
+        <di:waypoint xsi:type="dc:Point" x="713" y="858" />
+        <di:waypoint xsi:type="dc:Point" x="617" y="858" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="795" y="735" width="0" height="12" />
+          <dc:Bounds x="620" y="837" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1vvdkcs_di" bpmnElement="SequenceFlow_1vvdkcs">
-        <di:waypoint xsi:type="dc:Point" x="704" y="934" />
-        <di:waypoint xsi:type="dc:Point" x="616" y="934" />
+        <di:waypoint xsi:type="dc:Point" x="1022" y="774" />
+        <di:waypoint xsi:type="dc:Point" x="1022" y="868" />
+        <di:waypoint xsi:type="dc:Point" x="951" y="868" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="615" y="913" width="0" height="12" />
+          <dc:Bounds x="992" y="815" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1x8vphc_di" bpmnElement="SequenceFlow_1x8vphc">
-        <di:waypoint xsi:type="dc:Point" x="704" y="741" />
-        <di:waypoint xsi:type="dc:Point" x="660" y="741" />
-        <di:waypoint xsi:type="dc:Point" x="660" y="741" />
-        <di:waypoint xsi:type="dc:Point" x="616" y="741" />
+        <di:waypoint xsi:type="dc:Point" x="517" y="858" />
+        <di:waypoint xsi:type="dc:Point" x="425" y="858" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="630" y="735" width="0" height="12" />
+          <dc:Bounds x="426" y="837" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1yv1kef_di" bpmnElement="SequenceFlow_1yv1kef">
-        <di:waypoint xsi:type="dc:Point" x="591" y="959" />
-        <di:waypoint xsi:type="dc:Point" x="591" y="982" />
-        <di:waypoint xsi:type="dc:Point" x="591" y="982" />
-        <di:waypoint xsi:type="dc:Point" x="591" y="1003" />
+        <di:waypoint xsi:type="dc:Point" x="926" y="893" />
+        <di:waypoint xsi:type="dc:Point" x="926" y="997" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="583" y="970" width="16" height="12" />
+          <dc:Bounds x="919" y="992.0434782608695" width="14" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1d4wn2y_di" bpmnElement="SequenceFlow_1d4wn2y">
-        <di:waypoint xsi:type="dc:Point" x="566" y="934" />
-        <di:waypoint xsi:type="dc:Point" x="428" y="934" />
-        <di:waypoint xsi:type="dc:Point" x="428" y="854" />
+        <di:waypoint xsi:type="dc:Point" x="901" y="868" />
+        <di:waypoint xsi:type="dc:Point" x="857" y="868" />
+        <di:waypoint xsi:type="dc:Point" x="857" y="868" />
+        <di:waypoint xsi:type="dc:Point" x="813" y="868" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="487" y="913" width="21" height="12" />
+          <dc:Bounds x="845.6658431603746" y="884.169830656822" width="18" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0ou0spo_di" bpmnElement="SequenceFlow_0ou0spo">
-        <di:waypoint xsi:type="dc:Point" x="591" y="716" />
-        <di:waypoint xsi:type="dc:Point" x="591" y="637" />
+        <di:waypoint xsi:type="dc:Point" x="400" y="883" />
+        <di:waypoint xsi:type="dc:Point" x="400" y="975" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="613" y="636.5" width="16" height="12" />
+          <dc:Bounds x="369.0759493670887" y="891.6808510638298" width="14" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_1an6ial_di" bpmnElement="SequenceFlow_1an6ial">
-        <di:waypoint xsi:type="dc:Point" x="566" y="741" />
-        <di:waypoint xsi:type="dc:Point" x="428" y="741" />
-        <di:waypoint xsi:type="dc:Point" x="428" y="804" />
+      <bpmndi:BPMNEdge id="SequenceFlow_092ghvu_di" bpmnElement="SequenceFlow_092ghvu">
+        <di:waypoint xsi:type="dc:Point" x="218" y="858" />
+        <di:waypoint xsi:type="dc:Point" x="182" y="858" />
+        <di:waypoint xsi:type="dc:Point" x="182" y="858" />
+        <di:waypoint xsi:type="dc:Point" x="137" y="858" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="487" y="720" width="21" height="12" />
+          <dc:Bounds x="152" y="852" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0w7skxr_di" bpmnElement="SequenceFlow_0w7skxr">
-        <di:waypoint xsi:type="dc:Point" x="403" y="829" />
-        <di:waypoint xsi:type="dc:Point" x="331" y="829" />
+      <bpmndi:BPMNEdge id="SequenceFlow_0mcyg0e_di" bpmnElement="SequenceFlow_0mcyg0e">
+        <di:waypoint xsi:type="dc:Point" x="375" y="858" />
+        <di:waypoint xsi:type="dc:Point" x="353" y="858" />
+        <di:waypoint xsi:type="dc:Point" x="353" y="858" />
+        <di:waypoint xsi:type="dc:Point" x="318" y="858" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="322" y="808" width="0" height="12" />
+          <dc:Bounds x="368" y="852" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_092ghvu_di" bpmnElement="SequenceFlow_092ghvu">
-        <di:waypoint xsi:type="dc:Point" x="231" y="829" />
-        <di:waypoint xsi:type="dc:Point" x="145" y="829" />
+      <bpmndi:BPMNEdge id="SequenceFlow_1170ztf_di" bpmnElement="SequenceFlow_1170ztf">
+        <di:waypoint xsi:type="dc:Point" x="1022" y="510" />
+        <di:waypoint xsi:type="dc:Point" x="1022" y="552" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="143" y="808" width="0" height="12" />
+          <dc:Bounds x="1037" y="525" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="EndEvent_0g2btws_di" bpmnElement="EndEvent_11lmyvs">
+        <dc:Bounds x="908" y="997" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="836" y="1036" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="EndEvent_0y0wvdf_di" bpmnElement="EndEvent_01h4q8z">
+        <dc:Bounds x="382" y="975" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="310" y="1014" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="EndEvent_01p249c_di" bpmnElement="EndEvent_0kbbt94">
+        <dc:Bounds x="101" y="840" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="28" y="880" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
-</bpmn2:definitions>
\ No newline at end of file
+</bpmn2:definitions>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVFCNetworkServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVFCNetworkServiceInstance.bpmn
index 75c5820dd0..4fc1fc6907 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVFCNetworkServiceInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVFCNetworkServiceInstance.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.10.0">
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.7.2">
   <bpmn:process id="DoCreateVFCNetworkServiceInstance" name="DoCreateVFCNetworkServiceInstance" isExecutable="true">
     <bpmn:startEvent id="StartEvent_1">
       <bpmn:outgoing>SequenceFlow_1qo2pln</bpmn:outgoing>
@@ -10,16 +10,25 @@
     <bpmn:scriptTask id="Task_09nzhwk" name="Create Network Service">
       <bpmn:incoming>SequenceFlow_0khtova</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_1uiz85h</bpmn:outgoing>
+      <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def csi = new  DoCreateE2EServiceInstance()
+csi.preSDNCRequest(execution)]]></bpmn:script>
     </bpmn:scriptTask>
     <bpmn:scriptTask id="Task_0h2p1i1" name="Preprocess Incoming Request">
       <bpmn:incoming>SequenceFlow_1qo2pln</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0khtova</bpmn:outgoing>
+      <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def csi = new  DoCreateE2EServiceInstance()
+csi.preSDNCRequest(execution)]]></bpmn:script>
     </bpmn:scriptTask>
     <bpmn:scriptTask id="Task_15v20es" name="Instantiate Network Service">
       <bpmn:incoming>SequenceFlow_1rt03zl</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_1ywe21t</bpmn:outgoing>
+      <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def csi = new  DoCreateE2EServiceInstance()
+csi.preSDNCRequest(execution)]]></bpmn:script>
     </bpmn:scriptTask>
-    <bpmn:exclusiveGateway id="ExclusiveGateway_0zfksms" name="Create NS Success?">
+    <bpmn:exclusiveGateway id="ExclusiveGateway_0zfksms" name="Create NS Success?" default="SequenceFlow_0df541u">
       <bpmn:incoming>SequenceFlow_1uiz85h</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_1rt03zl</bpmn:outgoing>
       <bpmn:outgoing>SequenceFlow_0df541u</bpmn:outgoing>
@@ -27,58 +36,58 @@
     <bpmn:sequenceFlow id="SequenceFlow_1rt03zl" name="yes" sourceRef="ExclusiveGateway_0zfksms" targetRef="Task_15v20es">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression" />
     </bpmn:sequenceFlow>
-    <bpmn:endEvent id="EndEvent_1tncafd">
-      <bpmn:incoming>SequenceFlow_0df541u</bpmn:incoming>
-      <bpmn:terminateEventDefinition />
-    </bpmn:endEvent>
     <bpmn:sequenceFlow id="SequenceFlow_0df541u" name="no" sourceRef="ExclusiveGateway_0zfksms" targetRef="EndEvent_1tncafd" />
-    <bpmn:exclusiveGateway id="ExclusiveGateway_1is7zys" name="Instantiate NS Success?">
+    <bpmn:exclusiveGateway id="ExclusiveGateway_1is7zys" name="Instantiate NS Success?" default="SequenceFlow_0j7xo94">
       <bpmn:incoming>SequenceFlow_1ywe21t</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0j7xo94</bpmn:outgoing>
       <bpmn:outgoing>SequenceFlow_1ui2n9l</bpmn:outgoing>
     </bpmn:exclusiveGateway>
     <bpmn:sequenceFlow id="SequenceFlow_1ywe21t" sourceRef="Task_15v20es" targetRef="ExclusiveGateway_1is7zys" />
-    <bpmn:endEvent id="EndEvent_1gkvvpn">
-      <bpmn:incoming>SequenceFlow_0j7xo94</bpmn:incoming>
-      <bpmn:terminateEventDefinition />
-    </bpmn:endEvent>
-    <bpmn:sequenceFlow id="SequenceFlow_0j7xo94" name="no" sourceRef="ExclusiveGateway_1is7zys" targetRef="EndEvent_1gkvvpn">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression" language=""></bpmn:conditionExpression>
-    </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="SequenceFlow_0j7xo94" name="no" sourceRef="ExclusiveGateway_1is7zys" targetRef="EndEvent_1gkvvpn" />
     <bpmn:sequenceFlow id="SequenceFlow_1ui2n9l" name="yes" sourceRef="ExclusiveGateway_1is7zys" targetRef="Task_0ff3d5r" />
-    <bpmn:scriptTask id="Task_0ff3d5r" name="Query NS Progress">
-      <bpmn:incoming>SequenceFlow_1ui2n9l</bpmn:incoming>
-      <bpmn:incoming>SequenceFlow_0omec46</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_1jaltbk</bpmn:outgoing>
-    </bpmn:scriptTask>
-    <bpmn:exclusiveGateway id="ExclusiveGateway_0y0tqb7" name="Query Job Success?">
+    <bpmn:exclusiveGateway id="ExclusiveGateway_0y0tqb7" name="Query Job Success?" default="SequenceFlow_0yegc4p">
       <bpmn:incoming>SequenceFlow_1jaltbk</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0yegc4p</bpmn:outgoing>
       <bpmn:outgoing>SequenceFlow_118dtip</bpmn:outgoing>
     </bpmn:exclusiveGateway>
     <bpmn:sequenceFlow id="SequenceFlow_1jaltbk" sourceRef="Task_0ff3d5r" targetRef="ExclusiveGateway_0y0tqb7" />
-    <bpmn:endEvent id="EndEvent_0ev3qbb">
-      <bpmn:incoming>SequenceFlow_0yegc4p</bpmn:incoming>
-      <bpmn:terminateEventDefinition />
-    </bpmn:endEvent>
     <bpmn:sequenceFlow id="SequenceFlow_0yegc4p" name="no" sourceRef="ExclusiveGateway_0y0tqb7" targetRef="EndEvent_0ev3qbb" />
-    <bpmn:exclusiveGateway id="ExclusiveGateway_15492gl" name="Instantiate Finished?">
+    <bpmn:exclusiveGateway id="ExclusiveGateway_15492gl" name="Instantiate Finished?" default="SequenceFlow_0omec46">
       <bpmn:incoming>SequenceFlow_118dtip</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0hftgi6</bpmn:outgoing>
       <bpmn:outgoing>SequenceFlow_0omec46</bpmn:outgoing>
     </bpmn:exclusiveGateway>
     <bpmn:sequenceFlow id="SequenceFlow_118dtip" name="yes" sourceRef="ExclusiveGateway_0y0tqb7" targetRef="ExclusiveGateway_15492gl" />
-    <bpmn:task id="Task_0hltnyg" name="Finish NS Create">
-      <bpmn:incoming>SequenceFlow_0hftgi6</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_0cq2q6g</bpmn:outgoing>
-    </bpmn:task>
     <bpmn:sequenceFlow id="SequenceFlow_0hftgi6" name="yes" sourceRef="ExclusiveGateway_15492gl" targetRef="Task_0hltnyg" />
     <bpmn:sequenceFlow id="SequenceFlow_0omec46" name="no" sourceRef="ExclusiveGateway_15492gl" targetRef="Task_0ff3d5r" />
+    <bpmn:sequenceFlow id="SequenceFlow_0cq2q6g" sourceRef="Task_0hltnyg" targetRef="EndEvent_1x6k78c" />
+    <bpmn:endEvent id="EndEvent_1tncafd">
+      <bpmn:incoming>SequenceFlow_0df541u</bpmn:incoming>
+    </bpmn:endEvent>
+    <bpmn:endEvent id="EndEvent_1gkvvpn">
+      <bpmn:incoming>SequenceFlow_0j7xo94</bpmn:incoming>
+    </bpmn:endEvent>
+    <bpmn:endEvent id="EndEvent_0ev3qbb">
+      <bpmn:incoming>SequenceFlow_0yegc4p</bpmn:incoming>
+    </bpmn:endEvent>
     <bpmn:endEvent id="EndEvent_1x6k78c">
       <bpmn:incoming>SequenceFlow_0cq2q6g</bpmn:incoming>
-      <bpmn:terminateEventDefinition />
     </bpmn:endEvent>
-    <bpmn:sequenceFlow id="SequenceFlow_0cq2q6g" sourceRef="Task_0hltnyg" targetRef="EndEvent_1x6k78c" />
+    <bpmn:scriptTask id="Task_0ff3d5r" name="Query NS Progress">
+      <bpmn:incoming>SequenceFlow_1ui2n9l</bpmn:incoming>
+      <bpmn:incoming>SequenceFlow_0omec46</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_1jaltbk</bpmn:outgoing>
+      <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def csi = new  DoCreateE2EServiceInstance()
+csi.preSDNCRequest(execution)]]></bpmn:script>
+    </bpmn:scriptTask>
+    <bpmn:scriptTask id="Task_0hltnyg" name="Finish NS Create">
+      <bpmn:incoming>SequenceFlow_0hftgi6</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_0cq2q6g</bpmn:outgoing>
+      <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def csi = new  DoCreateE2EServiceInstance()
+csi.preSDNCRequest(execution)]]></bpmn:script>
+    </bpmn:scriptTask>
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateVFCNetworkServiceInstance">
@@ -123,7 +132,7 @@
       <bpmndi:BPMNShape id="ExclusiveGateway_0zfksms_di" bpmnElement="ExclusiveGateway_0zfksms" isMarkerVisible="true">
         <dc:Bounds x="683" y="104" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="684" y="158" width="52" height="24" />
+          <dc:Bounds x="685" y="158" width="51" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1rt03zl_di" bpmnElement="SequenceFlow_1rt03zl">
@@ -133,12 +142,6 @@
           <dc:Bounds x="777" y="108" width="19" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="EndEvent_1nhef11_di" bpmnElement="EndEvent_1tncafd">
-        <dc:Bounds x="690" y="-3" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="708" y="37" width="0" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0df541u_di" bpmnElement="SequenceFlow_0df541u">
         <di:waypoint xsi:type="dc:Point" x="708" y="104" />
         <di:waypoint xsi:type="dc:Point" x="708" y="33" />
@@ -149,7 +152,7 @@
       <bpmndi:BPMNShape id="ExclusiveGateway_1is7zys_di" bpmnElement="ExclusiveGateway_1is7zys" isMarkerVisible="true">
         <dc:Bounds x="1034" y="105" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1028" y="159" width="69" height="24" />
+          <dc:Bounds x="1029" y="159" width="68" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1ywe21t_di" bpmnElement="SequenceFlow_1ywe21t">
@@ -159,12 +162,6 @@
           <dc:Bounds x="986.5" y="108.5" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="EndEvent_1gkvvpn_di" bpmnElement="EndEvent_1gkvvpn">
-        <dc:Bounds x="1041" y="-3" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1059" y="37" width="0" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0j7xo94_di" bpmnElement="SequenceFlow_0j7xo94">
         <di:waypoint xsi:type="dc:Point" x="1059" y="105" />
         <di:waypoint xsi:type="dc:Point" x="1059" y="33" />
@@ -176,16 +173,13 @@
         <di:waypoint xsi:type="dc:Point" x="1059" y="155" />
         <di:waypoint xsi:type="dc:Point" x="1059" y="271" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1065" y="207" width="19" height="12" />
+          <dc:Bounds x="1066" y="207" width="18" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ScriptTask_1dyd7pi_di" bpmnElement="Task_0ff3d5r">
-        <dc:Bounds x="1009" y="271" width="100" height="80" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_0y0tqb7_di" bpmnElement="ExclusiveGateway_0y0tqb7" isMarkerVisible="true">
         <dc:Bounds x="1181" y="429" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1182" y="483" width="53" height="24" />
+          <dc:Bounds x="1183" y="483" width="52" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1jaltbk_di" bpmnElement="SequenceFlow_1jaltbk">
@@ -193,20 +187,14 @@
         <di:waypoint xsi:type="dc:Point" x="1206" y="311" />
         <di:waypoint xsi:type="dc:Point" x="1206" y="429" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1157.5" y="290" width="0" height="12" />
+          <dc:Bounds x="1112.5" y="290" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="EndEvent_0ev3qbb_di" bpmnElement="EndEvent_0ev3qbb">
-        <dc:Bounds x="1323" y="436" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1341" y="476" width="0" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0yegc4p_di" bpmnElement="SequenceFlow_0yegc4p">
         <di:waypoint xsi:type="dc:Point" x="1231" y="454" />
         <di:waypoint xsi:type="dc:Point" x="1323" y="454" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1270.6" y="433" width="12" height="12" />
+          <dc:Bounds x="1271" y="433" width="12" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_15492gl_di" bpmnElement="ExclusiveGateway_15492gl" isMarkerVisible="true">
@@ -223,36 +211,57 @@
           <dc:Bounds x="1212" y="589" width="19" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="Task_0hltnyg_di" bpmnElement="Task_0hltnyg">
-        <dc:Bounds x="740" y="555" width="100" height="80" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0hftgi6_di" bpmnElement="SequenceFlow_0hftgi6">
         <di:waypoint xsi:type="dc:Point" x="1034" y="595" />
         <di:waypoint xsi:type="dc:Point" x="840" y="595" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="928" y="574" width="19" height="12" />
+          <dc:Bounds x="929" y="574" width="18" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0omec46_di" bpmnElement="SequenceFlow_0omec46">
         <di:waypoint xsi:type="dc:Point" x="1059" y="570" />
         <di:waypoint xsi:type="dc:Point" x="1059" y="351" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1068" y="455" width="12" height="12" />
+          <dc:Bounds x="1077" y="405" width="12" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="EndEvent_1j727tc_di" bpmnElement="EndEvent_1x6k78c">
-        <dc:Bounds x="576" y="577" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="593.907" y="617" width="0" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0cq2q6g_di" bpmnElement="SequenceFlow_0cq2q6g">
         <di:waypoint xsi:type="dc:Point" x="740" y="595" />
         <di:waypoint xsi:type="dc:Point" x="612" y="595" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="676" y="574" width="0" height="12" />
+          <dc:Bounds x="631" y="574" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="EndEvent_1ido9wi_di" bpmnElement="EndEvent_1tncafd">
+        <dc:Bounds x="690" y="-3" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="663" y="37" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="EndEvent_0xgvlmx_di" bpmnElement="EndEvent_1gkvvpn">
+        <dc:Bounds x="1041" y="-3" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1014" y="37" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="EndEvent_09lhjod_di" bpmnElement="EndEvent_0ev3qbb">
+        <dc:Bounds x="1323" y="436" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1296" y="476" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="EndEvent_15pcuuc_di" bpmnElement="EndEvent_1x6k78c">
+        <dc:Bounds x="576" y="577" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="549" y="617" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ScriptTask_0sxy5we_di" bpmnElement="Task_0ff3d5r">
+        <dc:Bounds x="1009" y="271" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ScriptTask_0xxyfku_di" bpmnElement="Task_0hltnyg">
+        <dc:Bounds x="740" y="555" width="100" height="80" />
+      </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn:definitions>
-- 
2.16.6