[MSO-8] Second step of the rebase for MSO

Second rebase containing additional features for MSO + total reworking
of the BPMN structure + Notification flow can now be added at the end of
some BPMN flows

Change-Id: I7e937c7a0ba1593ca85e164a093f79c7e38b6ce0
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>

14 files changed, 4226 insertions, 2270 deletions

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateNetworkInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateNetworkInstance.bpmn
index 59f82013b1..ecd23f0ca9 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateNetworkInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateNetworkInstance.bpmn
@@ -297,10 +297,9 @@ WorkflowException
       <bpmn2:outgoing>SequenceFlow_59</bpmn2:outgoing>
     </bpmn2:serviceTask>
     <bpmn2:sequenceFlow id="SequenceFlow_59" name="" sourceRef="callCreateNetwork_ServiceTask" targetRef="validateCreatePONetwork_ScriptTask" />
-    <bpmn2:sequenceFlow id="SequenceFlow_13" name="" sourceRef="validateCreatePONetwork_ScriptTask" targetRef="isSdncRpc2_ExclusiveGateway2" />
+    <bpmn2:sequenceFlow id="SequenceFlow_13" name="" sourceRef="validateCreatePONetwork_ScriptTask" targetRef="callRESTReQueryNetworkID_ScriptTask" />
     <bpmn2:scriptTask id="callRESTReQueryNetworkID_ScriptTask" name="Call REST ReQuery Network Id in AAI" scriptFormat="groovy">
-      <bpmn2:incoming>isSdncRpc2No_SequenceFlow2</bpmn2:incoming>
-      <bpmn2:incoming>SequenceFlow_1jia57e</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_13</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_35</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
 def DoCreateNetworkInstance = new DoCreateNetworkInstance()
@@ -366,7 +365,7 @@ DoCreateNetworkInstance.callRESTQueryAAINetworkName(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="workflowExceptionSINotFound" name="Create Workflow Exception" scriptFormat="groovy">
       <bpmn2:incoming>siFoundNo</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_30</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.utils.*
 ExceptionUtil exceptionUtil = new ExceptionUtil()
 exceptionUtil.buildWorkflowException(execution, 404, "Service Instance Not Found")]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -454,7 +453,7 @@ DoCreateNetworkInstance.prepareRpcSDNCActivateRequest(execution)]]></bpmn2:scrip
     <bpmn2:sequenceFlow id="SequenceFlow_13deudk" sourceRef="Task_1rd6dg6" targetRef="Task_1ipbwbj" />
     <bpmn2:sequenceFlow id="SequenceFlow_08qibb9" sourceRef="Task_1ipbwbj" targetRef="validateSDNCActivate_Task" />
     <bpmn2:sequenceFlow id="SequenceFlow_1t03rs2" sourceRef="validateSDNCActivate_Task" targetRef="ExclusiveGateway_0n0ptg6" />
-    <bpmn2:sequenceFlow id="SequenceFlow_1jia57e" name="Yes" sourceRef="ExclusiveGateway_0n0ptg6" targetRef="callRESTReQueryNetworkID_ScriptTask">
+    <bpmn2:sequenceFlow id="SequenceFlow_1jia57e" name="Yes" sourceRef="ExclusiveGateway_0n0ptg6" targetRef="Task_0zzobg6">
       <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("CRENWKI_sdncResponseSuccess" ) == true}]]></bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_18ybfu5" name="No" sourceRef="ExclusiveGateway_0n0ptg6" targetRef="EndEvent_13v46cq" />
@@ -500,14 +499,14 @@ DoCreateNetworkInstance.validateRpcSDNCActivateResponse(execution)]]></bpmn2:scr
     <bpmn2:sequenceFlow id="SequenceFlow_0j8bxnb" sourceRef="Task_10lubzj" targetRef="Task_0pbtywn" />
     <bpmn2:sequenceFlow id="SequenceFlow_0d93bqw" sourceRef="Task_0pbtywn" targetRef="validateSDNCResponse_ScriptTask" />
     <bpmn2:exclusiveGateway id="isSdncRpc2_ExclusiveGateway2" name="is &#39;1702&#39; SNDC Call?" default="isSdncRpc2No_SequenceFlow2">
-      <bpmn2:incoming>SequenceFlow_13</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_1ipz2ze</bpmn2:incoming>
       <bpmn2:outgoing>isSdncRpc2Yes_SequenceFlow2</bpmn2:outgoing>
       <bpmn2:outgoing>isSdncRpc2No_SequenceFlow2</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="isSdncRpc2Yes_SequenceFlow2" name="Yes" sourceRef="isSdncRpc2_ExclusiveGateway2" targetRef="Task_1rd6dg6">
       <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("sdncVersion") == '1702'} ]]></bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="isSdncRpc2No_SequenceFlow2" name="No" sourceRef="isSdncRpc2_ExclusiveGateway2" targetRef="callRESTReQueryNetworkID_ScriptTask" />
+    <bpmn2:sequenceFlow id="isSdncRpc2No_SequenceFlow2" name="No" sourceRef="isSdncRpc2_ExclusiveGateway2" targetRef="Task_0zzobg6" />
     <bpmn2:scriptTask id="Task_10lubzj" name="Prepare Assign SDNC RPC Request" scriptFormat="groovy">
       <bpmn2:incoming>isSdncRpc1Yes_SequenceFlow1</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0j8bxnb</bpmn2:outgoing>
@@ -524,13 +523,14 @@ DoCreateNetworkInstance.prepareRpcSDNCRequest(execution)
     </bpmn2:endEvent>
     <bpmn2:sequenceFlow id="SequenceFlow_1s8b1m1" sourceRef="Task_0zzobg6" targetRef="EndEvent_1te02c4" />
     <bpmn2:scriptTask id="Task_0zzobg6" name="PostProcess Response" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_1ipz2ze</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_1jia57e</bpmn2:incoming>
+      <bpmn2:incoming>isSdncRpc2No_SequenceFlow2</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1s8b1m1</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
 def DoCreateNetworkInstance = new DoCreateNetworkInstance()
 DoCreateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_1ipz2ze" sourceRef="callRESTUpdateContrailNetwork_ScriptTask" targetRef="Task_0zzobg6" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1ipz2ze" sourceRef="callRESTUpdateContrailNetwork_ScriptTask" targetRef="isSdncRpc2_ExclusiveGateway2" />
     <bpmn2:scriptTask id="ScriptTask_0p3v749" name="Post Process Response" scriptFormat="groovy">
       <bpmn2:incoming>isNetworkActiveYes_SequenceFlow</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_18ylufb</bpmn2:outgoing>
@@ -730,16 +730,16 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script>
         <dc:Bounds x="1454" y="505" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_134" bpmnElement="callRESTReQueryNetworkID_ScriptTask">
-        <dc:Bounds x="909" y="1392" width="100" height="80" />
+        <dc:Bounds x="1454" y="1392" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_135" bpmnElement="callRESTUpdateContrailNetwork_ScriptTask">
-        <dc:Bounds x="735" y="1392" width="100" height="80" />
+        <dc:Bounds x="1454" y="1538" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_54" bpmnElement="SequenceFlow_35" sourceElement="_BPMNShape_ScriptTask_134" targetElement="_BPMNShape_ScriptTask_135">
-        <di:waypoint xsi:type="dc:Point" x="909" y="1432" />
-        <di:waypoint xsi:type="dc:Point" x="835" y="1432" />
+        <di:waypoint xsi:type="dc:Point" x="1504" y="1472" />
+        <di:waypoint xsi:type="dc:Point" x="1504" y="1538" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="872" y="1417" width="0" height="0" />
+          <dc:Bounds x="1519" y="1505" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_156" bpmnElement="callRESTQueryVpnBinding_ScriptTask">
@@ -865,11 +865,9 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_19" bpmnElement="SequenceFlow_13" sourceElement="_BPMNShape_ScriptTask_63" targetElement="_BPMNShape_ScriptTask_134">
         <di:waypoint xsi:type="dc:Point" x="1507" y="1338" />
-        <di:waypoint xsi:type="dc:Point" x="1507" y="1373" />
-        <di:waypoint xsi:type="dc:Point" x="1507" y="1373" />
-        <di:waypoint xsi:type="dc:Point" x="1507" y="1407" />
+        <di:waypoint xsi:type="dc:Point" x="1505" y="1392" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1522" y="1373" width="0" height="0" />
+          <dc:Bounds x="1506" y="1350" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_SubProcess_28" bpmnElement="unexpectedErrors_SubProcess" isExpanded="true">
@@ -1006,77 +1004,73 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="CallActivity_1uxa4p9_di" bpmnElement="Task_1ipbwbj">
-        <dc:Bounds x="1267" y="1538" width="100" height="80" />
+        <dc:Bounds x="1014" y="1538" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0m5hrmn_di" bpmnElement="Task_1rd6dg6">
-        <dc:Bounds x="1457" y="1538" width="100" height="80" />
+        <dc:Bounds x="1183" y="1538" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_0n0ptg6_di" bpmnElement="ExclusiveGateway_0n0ptg6" isMarkerVisible="true">
-        <dc:Bounds x="934" y="1553" width="50" height="50" />
+        <dc:Bounds x="724" y="1553" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="857" y="1566" width="68" height="24" />
+          <dc:Bounds x="644" y="1566" width="68" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_13deudk_di" bpmnElement="SequenceFlow_13deudk">
-        <di:waypoint xsi:type="dc:Point" x="1457" y="1578" />
-        <di:waypoint xsi:type="dc:Point" x="1367" y="1578" />
+        <di:waypoint xsi:type="dc:Point" x="1183" y="1578" />
+        <di:waypoint xsi:type="dc:Point" x="1114" y="1578" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1412" y="1563" width="0" height="0" />
+          <dc:Bounds x="1149" y="1563" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_08qibb9_di" bpmnElement="SequenceFlow_08qibb9">
-        <di:waypoint xsi:type="dc:Point" x="1267" y="1578" />
-        <di:waypoint xsi:type="dc:Point" x="1229" y="1578" />
-        <di:waypoint xsi:type="dc:Point" x="1229" y="1578" />
-        <di:waypoint xsi:type="dc:Point" x="1191" y="1578" />
+        <di:waypoint xsi:type="dc:Point" x="1014" y="1578" />
+        <di:waypoint xsi:type="dc:Point" x="953" y="1578" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1244" y="1578" width="0" height="0" />
+          <dc:Bounds x="984" y="1563" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1t03rs2_di" bpmnElement="SequenceFlow_1t03rs2">
-        <di:waypoint xsi:type="dc:Point" x="1091" y="1578" />
-        <di:waypoint xsi:type="dc:Point" x="1038" y="1578" />
-        <di:waypoint xsi:type="dc:Point" x="1038" y="1578" />
-        <di:waypoint xsi:type="dc:Point" x="984" y="1578" />
+        <di:waypoint xsi:type="dc:Point" x="853" y="1578" />
+        <di:waypoint xsi:type="dc:Point" x="774" y="1578" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1053" y="1578" width="0" height="0" />
+          <dc:Bounds x="814" y="1563" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1jia57e_di" bpmnElement="SequenceFlow_1jia57e">
-        <di:waypoint xsi:type="dc:Point" x="959" y="1553" />
-        <di:waypoint xsi:type="dc:Point" x="959" y="1472" />
+        <di:waypoint xsi:type="dc:Point" x="749" y="1553" />
+        <di:waypoint xsi:type="dc:Point" x="749" y="1484" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="972" y="1542.77440535676" width="18" height="12" />
+          <dc:Bounds x="757" y="1537.7047949008065" width="18" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_18ybfu5_di" bpmnElement="SequenceFlow_18ybfu5">
-        <di:waypoint xsi:type="dc:Point" x="959" y="1603" />
-        <di:waypoint xsi:type="dc:Point" x="959" y="1662" />
+        <di:waypoint xsi:type="dc:Point" x="749" y="1603" />
+        <di:waypoint xsi:type="dc:Point" x="749" y="1669" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="968" y="1601.171717171717" width="14" height="12" />
+          <dc:Bounds x="758" y="1603.7606668519034" width="14" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_1v458g5_di" bpmnElement="validateSDNCActivate_Task">
-        <dc:Bounds x="1091" y="1538" width="100" height="80" />
+        <dc:Bounds x="853" y="1538" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BoundaryEvent_0pg57au_di" bpmnElement="BoundaryEvent_0vb26bm">
-        <dc:Bounds x="1097" y="1600" width="36" height="36" />
+        <dc:Bounds x="859" y="1600" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1115" y="1636" width="0" height="0" />
+          <dc:Bounds x="877" y="1636" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0s51ns0_di" bpmnElement="SequenceFlow_0s51ns0">
-        <di:waypoint xsi:type="dc:Point" x="1115" y="1636" />
-        <di:waypoint xsi:type="dc:Point" x="1115" y="1680" />
-        <di:waypoint xsi:type="dc:Point" x="977" y="1680" />
+        <di:waypoint xsi:type="dc:Point" x="877" y="1636" />
+        <di:waypoint xsi:type="dc:Point" x="877" y="1687" />
+        <di:waypoint xsi:type="dc:Point" x="767" y="1687" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1130" y="1658" width="0" height="0" />
+          <dc:Bounds x="892" y="1661.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="EndEvent_0h7h49p_di" bpmnElement="EndEvent_13v46cq">
-        <dc:Bounds x="941" y="1662" width="36" height="36" />
+        <dc:Bounds x="731" y="1669" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="921" y="1708" width="76" height="24" />
+          <dc:Bounds x="711" y="1715" width="76" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_0f9d94i_di" bpmnElement="isSDNCActivate_ExclusiveGateway" isMarkerVisible="true">
@@ -1160,25 +1154,24 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_1gghe34_di" bpmnElement="isSdncRpc2_ExclusiveGateway2" isMarkerVisible="true">
-        <dc:Bounds x="1482" y="1407" width="50" height="50" />
+        <dc:Bounds x="1360" y="1553" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1540" y="1420" width="76" height="24" />
+          <dc:Bounds x="1347" y="1619" width="76" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1lphs99_di" bpmnElement="isSdncRpc2Yes_SequenceFlow2">
-        <di:waypoint xsi:type="dc:Point" x="1507" y="1457" />
-        <di:waypoint xsi:type="dc:Point" x="1507" y="1498" />
-        <di:waypoint xsi:type="dc:Point" x="1507" y="1498" />
-        <di:waypoint xsi:type="dc:Point" x="1507" y="1538" />
+        <di:waypoint xsi:type="dc:Point" x="1360" y="1578" />
+        <di:waypoint xsi:type="dc:Point" x="1283" y="1578" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1511" y="1459.0987654320988" width="18" height="12" />
+          <dc:Bounds x="1337" y="1580.0388981849903" width="18" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0lk1uut_di" bpmnElement="isSdncRpc2No_SequenceFlow2">
-        <di:waypoint xsi:type="dc:Point" x="1482" y="1432" />
-        <di:waypoint xsi:type="dc:Point" x="1009" y="1432" />
+        <di:waypoint xsi:type="dc:Point" x="1385" y="1553" />
+        <di:waypoint xsi:type="dc:Point" x="1385" y="1444" />
+        <di:waypoint xsi:type="dc:Point" x="799" y="1444" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1460" y="1410" width="14" height="12" />
+          <dc:Bounds x="1362" y="1543.660178848007" width="14" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_1lkq0a3_di" bpmnElement="Task_10lubzj">
@@ -1188,9 +1181,9 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script>
         <dc:Bounds x="682" y="832" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_1te02c4_di" bpmnElement="EndEvent_1te02c4">
-        <dc:Bounds x="459" y="1414" width="36" height="36" />
+        <dc:Bounds x="467" y="1426" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="478" y="1450" width="0" height="0" />
+          <dc:Bounds x="486" y="1462" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_1kpt4kc_di" bpmnElement="EndEvent_1kpt4kc">
@@ -1206,16 +1199,16 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1s8b1m1_di" bpmnElement="SequenceFlow_1s8b1m1">
-        <di:waypoint xsi:type="dc:Point" x="576" y="1432" />
-        <di:waypoint xsi:type="dc:Point" x="525" y="1432" />
-        <di:waypoint xsi:type="dc:Point" x="525" y="1432" />
-        <di:waypoint xsi:type="dc:Point" x="495" y="1432" />
+        <di:waypoint xsi:type="dc:Point" x="699" y="1444" />
+        <di:waypoint xsi:type="dc:Point" x="597" y="1444" />
+        <di:waypoint xsi:type="dc:Point" x="597" y="1444" />
+        <di:waypoint xsi:type="dc:Point" x="503" y="1444" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="540" y="1432" width="0" height="0" />
+          <dc:Bounds x="612" y="1444" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_1feo4ms_di" bpmnElement="Task_0zzobg6">
-        <dc:Bounds x="576" y="1392" width="100" height="80" />
+        <dc:Bounds x="699" y="1404" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0myjg9k_di" bpmnElement="ScriptTask_0myjg9k">
         <dc:Bounds x="682" y="1055" width="100" height="80" />
@@ -1231,10 +1224,12 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script>
         <dc:Bounds x="273" y="832" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1ipz2ze_di" bpmnElement="SequenceFlow_1ipz2ze">
-        <di:waypoint xsi:type="dc:Point" x="735" y="1432" />
-        <di:waypoint xsi:type="dc:Point" x="676" y="1432" />
+        <di:waypoint xsi:type="dc:Point" x="1454" y="1578" />
+        <di:waypoint xsi:type="dc:Point" x="1432" y="1578" />
+        <di:waypoint xsi:type="dc:Point" x="1432" y="1578" />
+        <di:waypoint xsi:type="dc:Point" x="1410" y="1578" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="706" y="1417" width="0" height="0" />
+          <dc:Bounds x="1447" y="1578" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="CallActivity_1u07hp7_di" bpmnElement="CallActivity_1u07hp7">
@@ -1382,4 +1377,4 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
-</bpmn2:definitions>
\ No newline at end of file
+</bpmn2:definitions>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstance.bpmn
index 302620fdaf..a770c8c11a 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstance.bpmn
@@ -1,390 +1,390 @@
-<?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.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
-  <bpmn2:process id="DoCreateServiceInstance" name="DoCreateServiceInstance" isExecutable="true">
-    <bpmn2:startEvent id="createSI_startEvent" name="Start Flow">
-      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
-    </bpmn2:startEvent>
-    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="createSI_startEvent" targetRef="preProcessRequest_ScriptTask" />
-    <bpmn2:scriptTask id="getAAICustomerById_scriptTask" name="Get AAI Customer By globalCustomerId " scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def dcsi = new DoCreateServiceInstance()
-dcsi.getAAICustomerById(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="getAAICustomerById_scriptTask" targetRef="ExclusiveGateway_09wkav2" />
-    <bpmn2:scriptTask id="preProcessRequest_ScriptTask" name="PreProcess Incoming Request" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def dcsi = new DoCreateServiceInstance()
-dcsi.preProcessRequest(execution)
-]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="callGenericGetService" targetRef="ScriptTask_0i8cqdy" />
-    <bpmn2:scriptTask id="PreProcessSDNCAssignRequest" name="PreProcess SDNC Assign Request" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_156ih25</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def dcsi = new DoCreateServiceInstance()
-dcsi.preProcessSDNCAssignRequest(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:scriptTask id="PostProcessSDNCAssignRequest" name="Post Process SDNC Assign Request" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_10</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def dcsi = new DoCreateServiceInstance()
-dcsi.postProcessSDNCAssign(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:callActivity id="CallSDNCAdapterServiceTopologyAssign" name="Call SDNC Adapter Service Topology Assign" calledElement="sdncAdapter">
-      <bpmn2:extensionElements>
-        <camunda:in source="sdncAssignRequest" target="sdncAdapterWorkflowRequest" />
-        <camunda:in source="msoRequestId" target="mso-request-id" />
-        <camunda:in source="serviceInstanceId" target="mso-service-instance-id" />
-        <camunda:out source="WorkflowException" target="WorkflowException" />
-        <camunda:out source="sdncAdapterResponse" target="sdncAdapterResponse" />
-        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />
-      </bpmn2:extensionElements>
-      <bpmn2:incoming>SequenceFlow_14</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_9</bpmn2:outgoing>
-    </bpmn2:callActivity>
-    <bpmn2:endEvent id="EndEvent_3">
-      <bpmn2:incoming>SequenceFlow_10</bpmn2:incoming>
-    </bpmn2:endEvent>
-    <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="preProcessRequest_ScriptTask" targetRef="getAAICustomerById_scriptTask" />
-    <bpmn2:sequenceFlow id="SequenceFlow_14" name="" sourceRef="PreProcessSDNCAssignRequest" targetRef="CallSDNCAdapterServiceTopologyAssign" />
-    <bpmn2:sequenceFlow id="SequenceFlow_9" name="" sourceRef="CallSDNCAdapterServiceTopologyAssign" targetRef="PostProcessSDNCAssignRequest" />
-    <bpmn2:sequenceFlow id="SequenceFlow_10" name="" sourceRef="PostProcessSDNCAssignRequest" targetRef="EndEvent_3" />
-    <bpmn2:callActivity id="callGenericGetService" name="Call GenericGetService" calledElement="GenericGetService">
-      <bpmn2:extensionElements>
-        <camunda:in source="serviceInstanceName" target="GENGS_serviceInstanceName" />
-        <camunda:in source="globalSubscriberId" target="GENGS_globalCustomerId" />
-        <camunda:in sourceExpression="service-instance" target="GENGS_type" />
-        <camunda:out source="GENGS_FoundIndicator" target="GENGS_FoundIndicator" />
-        <camunda:out source="GENGS_SuccessIndicator" target="GENGS_SuccessIndicator" />
-        <camunda:out source="WorkflowException" target="WorkflowException" />
-      </bpmn2:extensionElements>
-      <bpmn2:incoming>SequenceFlow_11fnnkb</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
-    </bpmn2:callActivity>
-    <bpmn2:callActivity id="callGenericPutService" name="Call Generic Put Service" calledElement="GenericPutService">
-      <bpmn2:extensionElements>
-        <camunda:in source="globalSubscriberId" target="GENPS_globalSubscriberId" />
-        <camunda:in source="serviceInstanceId" target="GENPS_serviceInstanceId" />
-        <camunda:in source="subscriptionServiceType" target="GENPS_serviceType" />
-        <camunda:in sourceExpression="service-instance" target="GENPS_type" />
-        <camunda:in source="serviceInstanceData" target="GENPS_payload" />
-        <camunda:out source="GENPS_SuccessIndicator" target="GENPS_SuccessIndicator" />
-        <camunda:in source="msoRequestId" target="GENPS_requesId" />
-        <camunda:out source="WorkflowException" target="WorkflowException" />
-      </bpmn2:extensionElements>
-      <bpmn2:incoming>SequenceFlow_1uw2p9a</bpmn2:incoming>
-      <bpmn2:incoming>SequenceFlow_1w01tqs</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_129ih1g</bpmn2:outgoing>
-    </bpmn2:callActivity>
-    <bpmn2:sequenceFlow id="SequenceFlow_129ih1g" sourceRef="callGenericPutService" targetRef="ScriptTask_0q37vn9" />
-    <bpmn2:exclusiveGateway id="ExclusiveGateway_09wkav2" name="sdncVersion is 1610 or serviceInstance name is populated?" default="SequenceFlow_1uw2p9a">
-      <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_11fnnkb</bpmn2:outgoing>
-      <bpmn2:outgoing>SequenceFlow_1uw2p9a</bpmn2:outgoing>
-    </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="SequenceFlow_11fnnkb" name="yes" sourceRef="ExclusiveGateway_09wkav2" targetRef="callGenericGetService">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{(execution.getVariable("serviceInstanceName" )  != null && execution.getVariable("serviceInstanceName" )  != "" ) || execution.getVariable("sdncVersion" )   == "1610" }]]></bpmn2:conditionExpression>
-    </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="SequenceFlow_1uw2p9a" name="no" sourceRef="ExclusiveGateway_09wkav2" targetRef="callGenericPutService" />
-    <bpmn2:subProcess id="SubProcess_06d8lk8" name="Sub-process for Application Errors" triggeredByEvent="true">
-      <bpmn2:startEvent id="StartEvent_0yljq9y">
-        <bpmn2:outgoing>SequenceFlow_0tgrn11</bpmn2:outgoing>
-        <bpmn2:errorEventDefinition />
-      </bpmn2:startEvent>
-      <bpmn2:endEvent id="EndEvent_117lkk3">
-        <bpmn2:incoming>SequenceFlow_1xzgv5k</bpmn2:incoming>
-      </bpmn2:endEvent>
-      <bpmn2:callActivity id="CallActivity_1srx6p6" name="Call DoCreateServiceInstanceRollback" calledElement="DoCreateServiceInstanceRollback">
-        <bpmn2:extensionElements>
-          <camunda:in source="msoRequestId" target="mso-request-id" />
-          <camunda:in source="rollbackData" target="rollbackData" />
-          <camunda:out source="rolledBack" target="rolledBack" />
-          <camunda:in source="disableRollback" target="disableRollback" />
-          <camunda:out source="rollbackError" target="rollbackErrror" />
-        </bpmn2:extensionElements>
-        <bpmn2:incoming>SequenceFlow_1lqktwf</bpmn2:incoming>
-        <bpmn2:outgoing>SequenceFlow_0eumzpf</bpmn2:outgoing>
-      </bpmn2:callActivity>
-      <bpmn2:sequenceFlow id="SequenceFlow_0eumzpf" sourceRef="CallActivity_1srx6p6" targetRef="ScriptTask_1p0vyip" />
-      <bpmn2:sequenceFlow id="SequenceFlow_0tgrn11" sourceRef="StartEvent_0yljq9y" targetRef="ScriptTask_0ocetux" />
-      <bpmn2:scriptTask id="ScriptTask_0ocetux" name="Pre Process Rollback" scriptFormat="groovy">
-        <bpmn2:incoming>SequenceFlow_0tgrn11</bpmn2:incoming>
-        <bpmn2:outgoing>SequenceFlow_1lqktwf</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def dcsi = new DoCreateServiceInstance()
-dcsi.preProcessRollback(execution)
-]]></bpmn2:script>
-      </bpmn2:scriptTask>
-      <bpmn2:sequenceFlow id="SequenceFlow_1lqktwf" sourceRef="ScriptTask_0ocetux" targetRef="CallActivity_1srx6p6" />
-      <bpmn2:scriptTask id="ScriptTask_1p0vyip" name="Post Process Rollback" scriptFormat="groovy">
-        <bpmn2:incoming>SequenceFlow_0eumzpf</bpmn2:incoming>
-        <bpmn2:outgoing>SequenceFlow_1xzgv5k</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def dcsi = new DoCreateServiceInstance()
-dcsi.postProcessRollback(execution)
-]]></bpmn2:script>
-      </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:incoming>SequenceFlow_1dd86x8</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_156ih25</bpmn2:outgoing>
-      <bpmn2:outgoing>SequenceFlow_00v4npo</bpmn2:outgoing>
-    </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="SequenceFlow_156ih25" name="no" sourceRef="ExclusiveGateway_1nk6aol" targetRef="PreProcessSDNCAssignRequest" />
-    <bpmn2:endEvent id="EndEvent_10659gr">
-      <bpmn2:incoming>SequenceFlow_00v4npo</bpmn2:incoming>
-    </bpmn2:endEvent>
-    <bpmn2:sequenceFlow id="SequenceFlow_00v4npo" name="yes" sourceRef="ExclusiveGateway_1nk6aol" targetRef="EndEvent_10659gr">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("sdncVersion" ) == "1610"}]]></bpmn2:conditionExpression>
-    </bpmn2:sequenceFlow>
-    <bpmn2:scriptTask id="ScriptTask_0i8cqdy" name="Post Process AAI GET" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_1w01tqs</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def dcsi = new DoCreateServiceInstance()
-dcsi.postProcessAAIGET(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_1w01tqs" sourceRef="ScriptTask_0i8cqdy" targetRef="callGenericPutService" />
-    <bpmn2:scriptTask id="ScriptTask_0q37vn9" name="Post Process AAI PUT" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_129ih1g</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_1dd86x8</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def ddsi = new DoCreateServiceInstance()
-ddsi.postProcessAAIPUT(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_1dd86x8" sourceRef="ScriptTask_0q37vn9" targetRef="ExclusiveGateway_1nk6aol" />
-  </bpmn2:process>
-  <bpmn2:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" />
-  <bpmn2:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" />
-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateServiceInstance">
-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="createSI_startEvent">
-        <dc:Bounds x="152" y="79" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="147" y="120" width="48" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_61" bpmnElement="preProcessRequest_ScriptTask">
-        <dc:Bounds x="245" y="57" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_47" targetElement="_BPMNShape_ScriptTask_61">
-        <di:waypoint xsi:type="dc:Point" x="188" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="245" y="97" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="217" y="82" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_62" bpmnElement="getAAICustomerById_scriptTask">
-        <dc:Bounds x="393" y="57" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_ScriptTask_62">
-        <di:waypoint xsi:type="dc:Point" x="493" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="565" y="97" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="529" y="82" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_177" bpmnElement="EndEvent_3">
-        <dc:Bounds x="1142" y="886" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1160" y="927" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="SequenceFlow_4">
-        <di:waypoint xsi:type="dc:Point" x="839" y="94" />
-        <di:waypoint xsi:type="dc:Point" x="971" y="94" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="905" y="79" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_334" bpmnElement="PreProcessSDNCAssignRequest">
-        <dc:Bounds x="972" y="578" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_335" bpmnElement="PostProcessSDNCAssignRequest">
-        <dc:Bounds x="972" y="864" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_CallActivity_74" bpmnElement="CallSDNCAdapterServiceTopologyAssign">
-        <dc:Bounds x="972" y="721" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_61" targetElement="_BPMNShape_ScriptTask_62">
-        <di:waypoint xsi:type="dc:Point" x="345" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="393" y="97" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="369" y="82" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_ScriptTask_334" targetElement="_BPMNShape_CallActivity_74">
-        <di:waypoint xsi:type="dc:Point" x="1020" y="658" />
-        <di:waypoint xsi:type="dc:Point" x="1020" y="692" />
-        <di:waypoint xsi:type="dc:Point" x="1020" y="692" />
-        <di:waypoint xsi:type="dc:Point" x="1020" y="715" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1035" y="692" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_CallActivity_74" targetElement="_BPMNShape_ScriptTask_335">
-        <di:waypoint xsi:type="dc:Point" x="1022" y="801" />
-        <di:waypoint xsi:type="dc:Point" x="1022" y="840" />
-        <di:waypoint xsi:type="dc:Point" x="1022" y="840" />
-        <di:waypoint xsi:type="dc:Point" x="1022" y="864" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1037" y="840" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_ScriptTask_335">
-        <di:waypoint xsi:type="dc:Point" x="1072" y="904" />
-        <di:waypoint xsi:type="dc:Point" x="1111" y="904" />
-        <di:waypoint xsi:type="dc:Point" x="1111" y="904" />
-        <di:waypoint xsi:type="dc:Point" x="1142" y="904" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1126" y="904" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="CallActivity_1md4kyb_di" bpmnElement="callGenericGetService">
-        <dc:Bounds x="739" y="57" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="CallActivity_0khp0qc_di" bpmnElement="callGenericPutService">
-        <dc:Bounds x="972" y="206" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_129ih1g_di" bpmnElement="SequenceFlow_129ih1g">
-        <di:waypoint xsi:type="dc:Point" x="1023" y="286" />
-        <di:waypoint xsi:type="dc:Point" x="1022" y="336" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1023" y="296" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ExclusiveGateway_09wkav2_di" bpmnElement="ExclusiveGateway_09wkav2" isMarkerVisible="true">
-        <dc:Bounds x="565" y="72" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="547" y="7" width="81" height="62" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_11fnnkb_di" bpmnElement="SequenceFlow_11fnnkb">
-        <di:waypoint xsi:type="dc:Point" x="615" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="739" y="97" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="635" y="76" width="18" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_1uw2p9a_di" bpmnElement="SequenceFlow_1uw2p9a">
-        <di:waypoint xsi:type="dc:Point" x="590" y="122" />
-        <di:waypoint xsi:type="dc:Point" x="590" y="246" />
-        <di:waypoint xsi:type="dc:Point" x="972" y="246" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="594" y="132.89706349694825" width="12" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="SubProcess_06d8lk8_di" bpmnElement="SubProcess_06d8lk8" isExpanded="true">
-        <dc:Bounds x="99" y="531" width="783" height="195" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="StartEvent_0yljq9y_di" bpmnElement="StartEvent_0yljq9y">
-        <dc:Bounds x="195" y="608" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="213" y="649" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="EndEvent_117lkk3_di" bpmnElement="EndEvent_117lkk3">
-        <dc:Bounds x="828" y="608" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="846" y="649" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="CallActivity_1srx6p6_di" bpmnElement="CallActivity_1srx6p6">
-        <dc:Bounds x="493" y="586" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_0eumzpf_di" bpmnElement="SequenceFlow_0eumzpf">
-        <di:waypoint xsi:type="dc:Point" x="593" y="626" />
-        <di:waypoint xsi:type="dc:Point" x="661" y="626" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="627" y="611" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0tgrn11_di" bpmnElement="SequenceFlow_0tgrn11">
-        <di:waypoint xsi:type="dc:Point" x="231" y="626" />
-        <di:waypoint xsi:type="dc:Point" x="330" y="626" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="281" y="611" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <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" />
-        </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="1022" y="545" />
-        <di:waypoint xsi:type="dc:Point" x="1022" y="545" />
-        <di:waypoint xsi:type="dc:Point" x="1022" y="575" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1039" y="510.8721806797853" width="12" 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>
-          <dc:Bounds x="1121" y="508" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_00v4npo_di" bpmnElement="SequenceFlow_00v4npo">
-        <di:waypoint xsi:type="dc:Point" x="1047" y="485" />
-        <di:waypoint xsi:type="dc:Point" x="1103" y="485" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1063" y="461" width="18" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ScriptTask_0i8cqdy_di" bpmnElement="ScriptTask_0i8cqdy">
-        <dc:Bounds x="971" y="57" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1w01tqs_di" bpmnElement="SequenceFlow_1w01tqs">
-        <di:waypoint xsi:type="dc:Point" x="1021" y="137" />
-        <di:waypoint xsi:type="dc:Point" x="1021" y="172" />
-        <di:waypoint xsi:type="dc:Point" x="1021" y="172" />
-        <di:waypoint xsi:type="dc:Point" x="1021" y="206" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1036" y="172" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ScriptTask_0q37vn9_di" bpmnElement="ScriptTask_0q37vn9">
-        <dc:Bounds x="972" y="336" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1dd86x8_di" bpmnElement="SequenceFlow_1dd86x8">
-        <di:waypoint xsi:type="dc:Point" x="1022" y="416" />
-        <di:waypoint xsi:type="dc:Point" x="1022" y="460" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1037" y="438" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ScriptTask_0ocetux_di" bpmnElement="ScriptTask_0ocetux">
-        <dc:Bounds x="330" y="586" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1lqktwf_di" bpmnElement="SequenceFlow_1lqktwf">
-        <di:waypoint xsi:type="dc:Point" x="430" y="626" />
-        <di:waypoint xsi:type="dc:Point" x="493" y="626" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="462" y="611" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ScriptTask_1p0vyip_di" bpmnElement="ScriptTask_1p0vyip">
-        <dc:Bounds x="661" y="586" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1xzgv5k_di" bpmnElement="SequenceFlow_1xzgv5k">
-        <di:waypoint xsi:type="dc:Point" x="761" y="626" />
-        <di:waypoint xsi:type="dc:Point" x="793" y="626" />
-        <di:waypoint xsi:type="dc:Point" x="793" y="626" />
-        <di:waypoint xsi:type="dc:Point" x="828" y="626" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="808" y="626" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-    </bpmndi:BPMNPlane>
-  </bpmndi:BPMNDiagram>
-</bpmn2:definitions>
+<?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.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">

+  <bpmn2:process id="DoCreateServiceInstance" name="DoCreateServiceInstance" isExecutable="true">

+    <bpmn2:startEvent id="createSI_startEvent" name="Start Flow">

+      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>

+    </bpmn2:startEvent>

+    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="createSI_startEvent" targetRef="preProcessRequest_ScriptTask" />

+    <bpmn2:scriptTask id="getAAICustomerById_scriptTask" name="Get AAI Customer By globalCustomerId " scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def dcsi = new DoCreateServiceInstance()

+dcsi.getAAICustomerById(execution)]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="getAAICustomerById_scriptTask" targetRef="ExclusiveGateway_09wkav2" />

+    <bpmn2:scriptTask id="preProcessRequest_ScriptTask" name="PreProcess Incoming Request" scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def dcsi = new DoCreateServiceInstance()

+dcsi.preProcessRequest(execution)

+]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="callGenericGetService" targetRef="ScriptTask_0i8cqdy" />

+    <bpmn2:scriptTask id="PreProcessSDNCAssignRequest" name="PreProcess SDNC Assign Request" scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_156ih25</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def dcsi = new DoCreateServiceInstance()

+dcsi.preProcessSDNCAssignRequest(execution)]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:scriptTask id="PostProcessSDNCAssignRequest" name="Post Process SDNC Assign Request" scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_10</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def dcsi = new DoCreateServiceInstance()

+dcsi.postProcessSDNCAssign(execution)]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:callActivity id="CallSDNCAdapterServiceTopologyAssign" name="Call SDNC Adapter Service Topology Assign" calledElement="sdncAdapter">

+      <bpmn2:extensionElements>

+        <camunda:in source="sdncAssignRequest" target="sdncAdapterWorkflowRequest" />

+        <camunda:in source="msoRequestId" target="mso-request-id" />

+        <camunda:in source="serviceInstanceId" target="mso-service-instance-id" />

+        <camunda:out source="WorkflowException" target="WorkflowException" />

+        <camunda:out source="sdncAdapterResponse" target="sdncAdapterResponse" />

+        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />

+      </bpmn2:extensionElements>

+      <bpmn2:incoming>SequenceFlow_14</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_9</bpmn2:outgoing>

+    </bpmn2:callActivity>

+    <bpmn2:endEvent id="EndEvent_3">

+      <bpmn2:incoming>SequenceFlow_10</bpmn2:incoming>

+    </bpmn2:endEvent>

+    <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="preProcessRequest_ScriptTask" targetRef="getAAICustomerById_scriptTask" />

+    <bpmn2:sequenceFlow id="SequenceFlow_14" name="" sourceRef="PreProcessSDNCAssignRequest" targetRef="CallSDNCAdapterServiceTopologyAssign" />

+    <bpmn2:sequenceFlow id="SequenceFlow_9" name="" sourceRef="CallSDNCAdapterServiceTopologyAssign" targetRef="PostProcessSDNCAssignRequest" />

+    <bpmn2:sequenceFlow id="SequenceFlow_10" name="" sourceRef="PostProcessSDNCAssignRequest" targetRef="EndEvent_3" />

+    <bpmn2:callActivity id="callGenericGetService" name="Call GenericGetService" calledElement="GenericGetService">

+      <bpmn2:extensionElements>

+        <camunda:in source="serviceInstanceName" target="GENGS_serviceInstanceName" />

+        <camunda:in source="globalSubscriberId" target="GENGS_globalCustomerId" />

+        <camunda:in sourceExpression="service-instance" target="GENGS_type" />

+        <camunda:out source="GENGS_FoundIndicator" target="GENGS_FoundIndicator" />

+        <camunda:out source="GENGS_SuccessIndicator" target="GENGS_SuccessIndicator" />

+        <camunda:out source="WorkflowException" target="WorkflowException" />

+      </bpmn2:extensionElements>

+      <bpmn2:incoming>SequenceFlow_11fnnkb</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>

+    </bpmn2:callActivity>

+    <bpmn2:callActivity id="callGenericPutService" name="Call Generic Put Service" calledElement="GenericPutService">

+      <bpmn2:extensionElements>

+        <camunda:in source="globalSubscriberId" target="GENPS_globalSubscriberId" />

+        <camunda:in source="serviceInstanceId" target="GENPS_serviceInstanceId" />

+        <camunda:in source="subscriptionServiceType" target="GENPS_serviceType" />

+        <camunda:in sourceExpression="service-instance" target="GENPS_type" />

+        <camunda:in source="serviceInstanceData" target="GENPS_payload" />

+        <camunda:out source="GENPS_SuccessIndicator" target="GENPS_SuccessIndicator" />

+        <camunda:in source="msoRequestId" target="GENPS_requesId" />

+        <camunda:out source="WorkflowException" target="WorkflowException" />

+      </bpmn2:extensionElements>

+      <bpmn2:incoming>SequenceFlow_1uw2p9a</bpmn2:incoming>

+      <bpmn2:incoming>SequenceFlow_1w01tqs</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_129ih1g</bpmn2:outgoing>

+    </bpmn2:callActivity>

+    <bpmn2:sequenceFlow id="SequenceFlow_129ih1g" sourceRef="callGenericPutService" targetRef="ScriptTask_0q37vn9" />

+    <bpmn2:exclusiveGateway id="ExclusiveGateway_09wkav2" name="sdncVersion is 1610 or serviceInstance name is populated?" default="SequenceFlow_1uw2p9a">

+      <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_11fnnkb</bpmn2:outgoing>

+      <bpmn2:outgoing>SequenceFlow_1uw2p9a</bpmn2:outgoing>

+    </bpmn2:exclusiveGateway>

+    <bpmn2:sequenceFlow id="SequenceFlow_11fnnkb" name="yes" sourceRef="ExclusiveGateway_09wkav2" targetRef="callGenericGetService">

+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{(execution.getVariable("serviceInstanceName" )  != null && execution.getVariable("serviceInstanceName" )  != "" ) || execution.getVariable("sdncVersion" )   == "1610" }]]></bpmn2:conditionExpression>

+    </bpmn2:sequenceFlow>

+    <bpmn2:sequenceFlow id="SequenceFlow_1uw2p9a" name="no" sourceRef="ExclusiveGateway_09wkav2" targetRef="callGenericPutService" />

+    <bpmn2:subProcess id="SubProcess_06d8lk8" name="Sub-process for Application Errors" triggeredByEvent="true">

+      <bpmn2:startEvent id="StartEvent_0yljq9y">

+        <bpmn2:outgoing>SequenceFlow_0tgrn11</bpmn2:outgoing>

+        <bpmn2:errorEventDefinition />

+      </bpmn2:startEvent>

+      <bpmn2:endEvent id="EndEvent_117lkk3">

+        <bpmn2:incoming>SequenceFlow_1xzgv5k</bpmn2:incoming>

+      </bpmn2:endEvent>

+      <bpmn2:callActivity id="CallActivity_1srx6p6" name="Call DoCreateServiceInstanceRollback" calledElement="DoCreateServiceInstanceRollback">

+        <bpmn2:extensionElements>

+          <camunda:in source="msoRequestId" target="mso-request-id" />

+          <camunda:in source="rollbackData" target="rollbackData" />

+          <camunda:out source="rolledBack" target="rolledBack" />

+          <camunda:in source="disableRollback" target="disableRollback" />

+          <camunda:out source="rollbackError" target="rollbackErrror" />

+        </bpmn2:extensionElements>

+        <bpmn2:incoming>SequenceFlow_1lqktwf</bpmn2:incoming>

+        <bpmn2:outgoing>SequenceFlow_0eumzpf</bpmn2:outgoing>

+      </bpmn2:callActivity>

+      <bpmn2:sequenceFlow id="SequenceFlow_0eumzpf" sourceRef="CallActivity_1srx6p6" targetRef="ScriptTask_1p0vyip" />

+      <bpmn2:sequenceFlow id="SequenceFlow_0tgrn11" sourceRef="StartEvent_0yljq9y" targetRef="ScriptTask_0ocetux" />

+      <bpmn2:scriptTask id="ScriptTask_0ocetux" name="Pre Process Rollback" scriptFormat="groovy">

+        <bpmn2:incoming>SequenceFlow_0tgrn11</bpmn2:incoming>

+        <bpmn2:outgoing>SequenceFlow_1lqktwf</bpmn2:outgoing>

+        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def dcsi = new DoCreateServiceInstance()

+dcsi.preProcessRollback(execution)

+]]></bpmn2:script>

+      </bpmn2:scriptTask>

+      <bpmn2:sequenceFlow id="SequenceFlow_1lqktwf" sourceRef="ScriptTask_0ocetux" targetRef="CallActivity_1srx6p6" />

+      <bpmn2:scriptTask id="ScriptTask_1p0vyip" name="Post Process Rollback" scriptFormat="groovy">

+        <bpmn2:incoming>SequenceFlow_0eumzpf</bpmn2:incoming>

+        <bpmn2:outgoing>SequenceFlow_1xzgv5k</bpmn2:outgoing>

+        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def dcsi = new DoCreateServiceInstance()

+dcsi.postProcessRollback(execution)

+]]></bpmn2:script>

+      </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:incoming>SequenceFlow_1dd86x8</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_156ih25</bpmn2:outgoing>

+      <bpmn2:outgoing>SequenceFlow_00v4npo</bpmn2:outgoing>

+    </bpmn2:exclusiveGateway>

+    <bpmn2:sequenceFlow id="SequenceFlow_156ih25" name="no" sourceRef="ExclusiveGateway_1nk6aol" targetRef="PreProcessSDNCAssignRequest" />

+    <bpmn2:endEvent id="EndEvent_10659gr">

+      <bpmn2:incoming>SequenceFlow_00v4npo</bpmn2:incoming>

+    </bpmn2:endEvent>

+    <bpmn2:sequenceFlow id="SequenceFlow_00v4npo" name="yes" sourceRef="ExclusiveGateway_1nk6aol" targetRef="EndEvent_10659gr">

+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("sdncVersion" ) == "1610"}]]></bpmn2:conditionExpression>

+    </bpmn2:sequenceFlow>

+    <bpmn2:scriptTask id="ScriptTask_0i8cqdy" name="Post Process AAI GET" scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_1w01tqs</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def dcsi = new DoCreateServiceInstance()

+dcsi.postProcessAAIGET(execution)]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:sequenceFlow id="SequenceFlow_1w01tqs" sourceRef="ScriptTask_0i8cqdy" targetRef="callGenericPutService" />

+    <bpmn2:scriptTask id="ScriptTask_0q37vn9" name="Post Process AAI PUT" scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_129ih1g</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_1dd86x8</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def ddsi = new DoCreateServiceInstance()

+ddsi.postProcessAAIPUT(execution)]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:sequenceFlow id="SequenceFlow_1dd86x8" sourceRef="ScriptTask_0q37vn9" targetRef="ExclusiveGateway_1nk6aol" />

+  </bpmn2:process>

+  <bpmn2:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" />

+  <bpmn2:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" />

+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">

+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateServiceInstance">

+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="createSI_startEvent">

+        <dc:Bounds x="152" y="79" width="36" height="36" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="147" y="120" width="48" height="14" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_61" bpmnElement="preProcessRequest_ScriptTask">

+        <dc:Bounds x="245" y="57" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_47" targetElement="_BPMNShape_ScriptTask_61">

+        <di:waypoint xsi:type="dc:Point" x="188" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="245" y="97" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="217" y="82" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_62" bpmnElement="getAAICustomerById_scriptTask">

+        <dc:Bounds x="393" y="57" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_ScriptTask_62">

+        <di:waypoint xsi:type="dc:Point" x="493" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="565" y="97" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="529" y="82" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_177" bpmnElement="EndEvent_3">

+        <dc:Bounds x="1142" y="886" width="36" height="36" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1160" y="927" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="SequenceFlow_4">

+        <di:waypoint xsi:type="dc:Point" x="839" y="94" />

+        <di:waypoint xsi:type="dc:Point" x="971" y="94" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="905" y="79" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_334" bpmnElement="PreProcessSDNCAssignRequest">

+        <dc:Bounds x="972" y="578" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_335" bpmnElement="PostProcessSDNCAssignRequest">

+        <dc:Bounds x="972" y="864" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_CallActivity_74" bpmnElement="CallSDNCAdapterServiceTopologyAssign">

+        <dc:Bounds x="972" y="721" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_61" targetElement="_BPMNShape_ScriptTask_62">

+        <di:waypoint xsi:type="dc:Point" x="345" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="393" y="97" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="369" y="82" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_ScriptTask_334" targetElement="_BPMNShape_CallActivity_74">

+        <di:waypoint xsi:type="dc:Point" x="1020" y="658" />

+        <di:waypoint xsi:type="dc:Point" x="1020" y="692" />

+        <di:waypoint xsi:type="dc:Point" x="1020" y="692" />

+        <di:waypoint xsi:type="dc:Point" x="1020" y="715" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1035" y="692" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_CallActivity_74" targetElement="_BPMNShape_ScriptTask_335">

+        <di:waypoint xsi:type="dc:Point" x="1022" y="801" />

+        <di:waypoint xsi:type="dc:Point" x="1022" y="840" />

+        <di:waypoint xsi:type="dc:Point" x="1022" y="840" />

+        <di:waypoint xsi:type="dc:Point" x="1022" y="864" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1037" y="840" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_ScriptTask_335">

+        <di:waypoint xsi:type="dc:Point" x="1072" y="904" />

+        <di:waypoint xsi:type="dc:Point" x="1111" y="904" />

+        <di:waypoint xsi:type="dc:Point" x="1111" y="904" />

+        <di:waypoint xsi:type="dc:Point" x="1142" y="904" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1126" y="904" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="CallActivity_1md4kyb_di" bpmnElement="callGenericGetService">

+        <dc:Bounds x="739" y="57" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="CallActivity_0khp0qc_di" bpmnElement="callGenericPutService">

+        <dc:Bounds x="972" y="206" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_129ih1g_di" bpmnElement="SequenceFlow_129ih1g">

+        <di:waypoint xsi:type="dc:Point" x="1023" y="286" />

+        <di:waypoint xsi:type="dc:Point" x="1022" y="336" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1023" y="296" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="ExclusiveGateway_09wkav2_di" bpmnElement="ExclusiveGateway_09wkav2" isMarkerVisible="true">

+        <dc:Bounds x="565" y="72" width="50" height="50" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="547" y="7" width="81" height="62" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_11fnnkb_di" bpmnElement="SequenceFlow_11fnnkb">

+        <di:waypoint xsi:type="dc:Point" x="615" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="739" y="97" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="635" y="76" width="18" height="14" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_1uw2p9a_di" bpmnElement="SequenceFlow_1uw2p9a">

+        <di:waypoint xsi:type="dc:Point" x="590" y="122" />

+        <di:waypoint xsi:type="dc:Point" x="590" y="246" />

+        <di:waypoint xsi:type="dc:Point" x="972" y="246" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="594" y="132.89706349694825" width="12" height="14" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="SubProcess_06d8lk8_di" bpmnElement="SubProcess_06d8lk8" isExpanded="true">

+        <dc:Bounds x="99" y="531" width="783" height="195" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="StartEvent_0yljq9y_di" bpmnElement="StartEvent_0yljq9y">

+        <dc:Bounds x="195" y="608" width="36" height="36" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="213" y="649" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="EndEvent_117lkk3_di" bpmnElement="EndEvent_117lkk3">

+        <dc:Bounds x="828" y="608" width="36" height="36" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="846" y="649" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="CallActivity_1srx6p6_di" bpmnElement="CallActivity_1srx6p6">

+        <dc:Bounds x="493" y="586" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_0eumzpf_di" bpmnElement="SequenceFlow_0eumzpf">

+        <di:waypoint xsi:type="dc:Point" x="593" y="626" />

+        <di:waypoint xsi:type="dc:Point" x="661" y="626" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="627" y="611" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_0tgrn11_di" bpmnElement="SequenceFlow_0tgrn11">

+        <di:waypoint xsi:type="dc:Point" x="231" y="626" />

+        <di:waypoint xsi:type="dc:Point" x="330" y="626" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="281" y="611" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <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" />

+        </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="1022" y="545" />

+        <di:waypoint xsi:type="dc:Point" x="1022" y="545" />

+        <di:waypoint xsi:type="dc:Point" x="1022" y="575" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1039" y="510.8721806797853" width="12" 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>

+          <dc:Bounds x="1121" y="508" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_00v4npo_di" bpmnElement="SequenceFlow_00v4npo">

+        <di:waypoint xsi:type="dc:Point" x="1047" y="485" />

+        <di:waypoint xsi:type="dc:Point" x="1103" y="485" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1063" y="461" width="18" height="12" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="ScriptTask_0i8cqdy_di" bpmnElement="ScriptTask_0i8cqdy">

+        <dc:Bounds x="971" y="57" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_1w01tqs_di" bpmnElement="SequenceFlow_1w01tqs">

+        <di:waypoint xsi:type="dc:Point" x="1021" y="137" />

+        <di:waypoint xsi:type="dc:Point" x="1021" y="172" />

+        <di:waypoint xsi:type="dc:Point" x="1021" y="172" />

+        <di:waypoint xsi:type="dc:Point" x="1021" y="206" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1036" y="172" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="ScriptTask_0q37vn9_di" bpmnElement="ScriptTask_0q37vn9">

+        <dc:Bounds x="972" y="336" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_1dd86x8_di" bpmnElement="SequenceFlow_1dd86x8">

+        <di:waypoint xsi:type="dc:Point" x="1022" y="416" />

+        <di:waypoint xsi:type="dc:Point" x="1022" y="460" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1037" y="438" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="ScriptTask_0ocetux_di" bpmnElement="ScriptTask_0ocetux">

+        <dc:Bounds x="330" y="586" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_1lqktwf_di" bpmnElement="SequenceFlow_1lqktwf">

+        <di:waypoint xsi:type="dc:Point" x="430" y="626" />

+        <di:waypoint xsi:type="dc:Point" x="493" y="626" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="462" y="611" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="ScriptTask_1p0vyip_di" bpmnElement="ScriptTask_1p0vyip">

+        <dc:Bounds x="661" y="586" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_1xzgv5k_di" bpmnElement="SequenceFlow_1xzgv5k">

+        <di:waypoint xsi:type="dc:Point" x="761" y="626" />

+        <di:waypoint xsi:type="dc:Point" x="793" y="626" />

+        <di:waypoint xsi:type="dc:Point" x="793" y="626" />

+        <di:waypoint xsi:type="dc:Point" x="828" y="626" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="808" y="626" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+    </bpmndi:BPMNPlane>

+  </bpmndi:BPMNDiagram>

+</bpmn2:definitions>

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstanceRollback.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstanceRollback.bpmn
index e73c79d953..80ace28ae7 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstanceRollback.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstanceRollback.bpmn
@@ -1,338 +1,338 @@
-<?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.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
-  <bpmn2:process id="DoCreateServiceInstanceRollback" name="DoCreateServiceInstanceRollback" isExecutable="true">
-    <bpmn2:startEvent id="createSIRollback_startEvent" name="Start Flow">
-      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
-    </bpmn2:startEvent>
-    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="createSIRollback_startEvent" targetRef="preProcessRequest_ScriptTask" />
-    <bpmn2:scriptTask id="preProcessRequest_ScriptTask" name="PreProcess Incoming Request" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def rbk = new DoCreateServiceInstanceRollback()
-rbk.preProcessRequest(execution)
-]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:endEvent id="EndEvent_3">
-      <bpmn2:incoming>SequenceFlow_01l4ssl</bpmn2:incoming>
-    </bpmn2:endEvent>
-    <bpmn2:subProcess id="UnexpectedError_SubProcess_1" name="Sub-process for Errors" triggeredByEvent="true">
-      <bpmn2:startEvent id="StartEvent_1">
-        <bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing>
-        <bpmn2:errorEventDefinition id="_ErrorEventDefinition_92" />
-      </bpmn2:startEvent>
-      <bpmn2:endEvent id="EndEvent_1">
-        <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>
-      </bpmn2:endEvent>
-      <bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="StartEvent_1" targetRef="ScriptTask_1" />
-      <bpmn2:scriptTask id="ScriptTask_1" name="Handle Errors" scriptFormat="groovy">
-        <bpmn2:incoming>SequenceFlow_8</bpmn2:incoming>
-        <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def rbk= new DoCreateServiceInstanceRollback()
-rbk.processRollbackException(execution)]]></bpmn2:script>
-      </bpmn2:scriptTask>
-      <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="ScriptTask_1" targetRef="EndEvent_1" />
-    </bpmn2:subProcess>
-    <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="preProcessRequest_ScriptTask" targetRef="ExclusiveGateway_19tbjgn" />
-    <bpmn2:callActivity id="callGenericDeleteService" name="Call AAI GenericDelete Service " calledElement="GenericDeleteService">
-      <bpmn2:extensionElements>
-        <camunda:in source="serviceInstanceId" target="GENDS_serviceInstanceId" />
-        <camunda:in source="subscriptionServiceType" target="GENDS_serviceType" />
-        <camunda:in source="globalSubscriberId" target="GENDS_globalCustomerId" />
-        <camunda:in sourceExpression="service-instance" target="GENDS_type" />
-        <camunda:out source="GENDS_FoundIndicator" target="GENDS_FoundIndicator" />
-        <camunda:in sourceExpression="&#34;&#34;" target="GENGS_serviceType" />
-        <camunda:out source="GENDS_SuccessIndicator" target="GENDS_SuccessIndicator" />
-        <camunda:out source="WorkflowException" target="WorkflowExecption" />
-      </bpmn2:extensionElements>
-      <bpmn2:incoming>SequenceFlow_1x9eh33</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_05wu9i7</bpmn2:outgoing>
-    </bpmn2:callActivity>
-    <bpmn2:exclusiveGateway id="ExclusiveGateway_09wkav2" name="RollbackSDNC?" default="SequenceFlow_1uw2p9a">
-      <bpmn2:incoming>SequenceFlow_06aasqh</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_11fnnkb</bpmn2:outgoing>
-      <bpmn2:outgoing>SequenceFlow_1uw2p9a</bpmn2:outgoing>
-    </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="SequenceFlow_11fnnkb" name="yes" sourceRef="ExclusiveGateway_09wkav2" targetRef="CallActivity_0ak0ezb">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("rollbackSDNC" )  == "true"}]]></bpmn2:conditionExpression>
-    </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="SequenceFlow_1uw2p9a" name="no" sourceRef="ExclusiveGateway_09wkav2" targetRef="ExclusiveGateway_0ii31dq" />
-    <bpmn2:exclusiveGateway id="ExclusiveGateway_0ii31dq" name="RollBackAAI?" default="SequenceFlow_1n7wade">
-      <bpmn2:documentation>rollback AAI</bpmn2:documentation>
-      <bpmn2:incoming>SequenceFlow_1uw2p9a</bpmn2:incoming>
-      <bpmn2:incoming>SequenceFlow_0khjo7l</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_1n7wade</bpmn2:outgoing>
-      <bpmn2:outgoing>SequenceFlow_1x9eh33</bpmn2:outgoing>
-    </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="SequenceFlow_1n7wade" name="no" sourceRef="ExclusiveGateway_0ii31dq" targetRef="PostProcess_ScriptTask" />
-    <bpmn2:sequenceFlow id="SequenceFlow_05wu9i7" sourceRef="callGenericDeleteService" targetRef="PostProcess_ScriptTask" />
-    <bpmn2:sequenceFlow id="SequenceFlow_1x9eh33" name="yes" sourceRef="ExclusiveGateway_0ii31dq" targetRef="callGenericDeleteService">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("rollbackAAI" )  == "true"}]]></bpmn2:conditionExpression>
-    </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="SequenceFlow_0k28xib" sourceRef="CallActivity_0ak0ezb" targetRef="ScriptTask_1uxr0cx" />
-    <bpmn2:callActivity id="CallActivity_0ak0ezb" name="Call SDNC Service Topology Rollback" calledElement="sdncAdapter">
-      <bpmn2:extensionElements>
-        <camunda:in source="sdncRollbackRequest" target="sdncAdapterWorkflowRequest" />
-        <camunda:in source="msoRequestId" target="mso-request-id" />
-        <camunda:in source="serviceInstanceId" target="mso-service-instance-id" />
-        <camunda:out source="WorkflowException" target="WorkflowException" />
-        <camunda:out source="sdncAdapterResponse" target="sdncAdapterResponse" />
-        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />
-      </bpmn2:extensionElements>
-      <bpmn2:incoming>SequenceFlow_11fnnkb</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_0k28xib</bpmn2:outgoing>
-    </bpmn2:callActivity>
-    <bpmn2:scriptTask id="ScriptTask_1uxr0cx" name="Post Process SDNC Rollback " scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_0k28xib</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_0khjo7l</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def rbk= new DoCreateServiceInstanceRollback()
-rbk.validateSDNCResponse(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_0khjo7l" sourceRef="ScriptTask_1uxr0cx" targetRef="ExclusiveGateway_0ii31dq" />
-    <bpmn2:exclusiveGateway id="ExclusiveGateway_19tbjgn" name="skip Rollback" default="SequenceFlow_06aasqh">
-      <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_06aasqh</bpmn2:outgoing>
-      <bpmn2:outgoing>SequenceFlow_1rzlaoy</bpmn2:outgoing>
-    </bpmn2:exclusiveGateway>
-    <bpmn2:scriptTask id="PostProcess_ScriptTask" name="Post Process Request" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_05wu9i7</bpmn2:incoming>
-      <bpmn2:incoming>SequenceFlow_1n7wade</bpmn2:incoming>
-      <bpmn2:incoming>SequenceFlow_1rzlaoy</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_01l4ssl</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def rbk = new DoCreateServiceInstanceRollback()
-rbk.postProcessRequest(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_01l4ssl" sourceRef="PostProcess_ScriptTask" targetRef="EndEvent_3" />
-    <bpmn2:sequenceFlow id="SequenceFlow_06aasqh" name="no" sourceRef="ExclusiveGateway_19tbjgn" targetRef="ExclusiveGateway_09wkav2" />
-    <bpmn2:sequenceFlow id="SequenceFlow_1rzlaoy" name="yes" sourceRef="ExclusiveGateway_19tbjgn" targetRef="PostProcess_ScriptTask">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("skipRollback" )  == true}]]></bpmn2:conditionExpression>
-    </bpmn2:sequenceFlow>
-    <bpmn2:subProcess id="SubProcess_11bi8mc" name="Java Exception Handling Sub Process" triggeredByEvent="true">
-      <bpmn2:startEvent id="StartEvent_1gxe17c">
-        <bpmn2:outgoing>SequenceFlow_1ch4xrf</bpmn2:outgoing>
-        <bpmn2:errorEventDefinition errorRef="Error_1" />
-      </bpmn2:startEvent>
-      <bpmn2:scriptTask id="ScriptTask_15yddb0" name="Process Java Error" scriptFormat="groovy">
-        <bpmn2:incoming>SequenceFlow_1ch4xrf</bpmn2:incoming>
-        <bpmn2:outgoing>SequenceFlow_1pjk2ff</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def rbk= new DoCreateServiceInstanceRollback()
-rbk.processRollbackJavaException(execution)]]></bpmn2:script>
-      </bpmn2:scriptTask>
-      <bpmn2:endEvent id="EndEvent_12e3h6k">
-        <bpmn2:incoming>SequenceFlow_1pjk2ff</bpmn2:incoming>
-        <bpmn2:terminateEventDefinition />
-      </bpmn2:endEvent>
-      <bpmn2:sequenceFlow id="SequenceFlow_1ch4xrf" name="" sourceRef="StartEvent_1gxe17c" targetRef="ScriptTask_15yddb0" />
-      <bpmn2:sequenceFlow id="SequenceFlow_1pjk2ff" name="" sourceRef="ScriptTask_15yddb0" targetRef="EndEvent_12e3h6k" />
-    </bpmn2:subProcess>
-  </bpmn2:process>
-  <bpmn2:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" />
-  <bpmn2:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" />
-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateServiceInstanceRollback">
-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="createSIRollback_startEvent">
-        <dc:Bounds x="151" y="79" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="146" y="120" width="48" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_61" bpmnElement="preProcessRequest_ScriptTask">
-        <dc:Bounds x="234" y="57" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_47" targetElement="_BPMNShape_ScriptTask_61">
-        <di:waypoint xsi:type="dc:Point" x="187" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="234" y="97" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="211" y="82" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_177" bpmnElement="EndEvent_3">
-        <dc:Bounds x="1166" y="358" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1184" y="399" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_SubProcess_27" bpmnElement="UnexpectedError_SubProcess_1" isExpanded="true">
-        <dc:Bounds x="286" y="318" width="467" height="193" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_70" bpmnElement="StartEvent_1">
-        <dc:Bounds x="354" y="384" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="372" y="425" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_219" bpmnElement="EndEvent_1">
-        <dc:Bounds x="647" y="384" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="665" y="425" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_StartEvent_70" targetElement="_BPMNShape_ScriptTask_269">
-        <di:waypoint xsi:type="dc:Point" x="390" y="402" />
-        <di:waypoint xsi:type="dc:Point" x="458" y="402" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="425" y="387" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_61">
-        <di:waypoint xsi:type="dc:Point" x="334" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="367" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="367" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="393" y="97" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="382" y="97" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="CallActivity_1md4kyb_di" bpmnElement="callGenericDeleteService">
-        <dc:Bounds x="1134" y="53" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ExclusiveGateway_09wkav2_di" bpmnElement="ExclusiveGateway_09wkav2" isMarkerVisible="true">
-        <dc:Bounds x="527" y="72" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="512" y="129" width="80" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_11fnnkb_di" bpmnElement="SequenceFlow_11fnnkb">
-        <di:waypoint xsi:type="dc:Point" x="577" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="640" y="97" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="601" y="101.351489674803" width="18" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_1uw2p9a_di" bpmnElement="SequenceFlow_1uw2p9a">
-        <di:waypoint xsi:type="dc:Point" x="552" y="72" />
-        <di:waypoint xsi:type="dc:Point" x="552" y="-23" />
-        <di:waypoint xsi:type="dc:Point" x="1021" y="-23" />
-        <di:waypoint xsi:type="dc:Point" x="1021" y="72" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="635" y="-43" width="12" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ExclusiveGateway_0ii31dq_di" bpmnElement="ExclusiveGateway_0ii31dq" isMarkerVisible="true">
-        <dc:Bounds x="996" y="72" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="939" y="113" width="66" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1n7wade_di" bpmnElement="SequenceFlow_1n7wade">
-        <di:waypoint xsi:type="dc:Point" x="1021" y="122" />
-        <di:waypoint xsi:type="dc:Point" x="1021" y="246" />
-        <di:waypoint xsi:type="dc:Point" x="1134" y="246" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1030" y="124.63737966405313" width="13" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_05wu9i7_di" bpmnElement="SequenceFlow_05wu9i7">
-        <di:waypoint xsi:type="dc:Point" x="1184" y="133" />
-        <di:waypoint xsi:type="dc:Point" x="1184" y="206" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1199" y="169.5" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_1x9eh33_di" bpmnElement="SequenceFlow_1x9eh33">
-        <di:waypoint xsi:type="dc:Point" x="1046" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="1134" y="97" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1082" y="82" width="18" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0k28xib_di" bpmnElement="SequenceFlow_0k28xib">
-        <di:waypoint xsi:type="dc:Point" x="743" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="820" y="97" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="782" y="82" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="CallActivity_0ak0ezb_di" bpmnElement="CallActivity_0ak0ezb">
-        <dc:Bounds x="640" y="57" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ScriptTask_1uxr0cx_di" bpmnElement="ScriptTask_1uxr0cx">
-        <dc:Bounds x="823" y="57" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_0khjo7l_di" bpmnElement="SequenceFlow_0khjo7l">
-        <di:waypoint xsi:type="dc:Point" x="923" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="996" y="97" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="960" y="82" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ExclusiveGateway_19tbjgn_di" bpmnElement="ExclusiveGateway_19tbjgn" isMarkerVisible="true">
-        <dc:Bounds x="393" y="72" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="385" y="38" width="65" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_269" bpmnElement="ScriptTask_1">
-        <dc:Bounds x="458" y="362" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ScriptTask_269" targetElement="_BPMNShape_EndEvent_219">
-        <di:waypoint xsi:type="dc:Point" x="558" y="402" />
-        <di:waypoint xsi:type="dc:Point" x="647" y="402" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="603" y="387" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ScriptTask_1wk55es_di" bpmnElement="PostProcess_ScriptTask">
-        <dc:Bounds x="1134" y="206" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_01l4ssl_di" bpmnElement="SequenceFlow_01l4ssl">
-        <di:waypoint xsi:type="dc:Point" x="1184" y="286" />
-        <di:waypoint xsi:type="dc:Point" x="1184" y="358" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1199" y="322" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_06aasqh_di" bpmnElement="SequenceFlow_06aasqh">
-        <di:waypoint xsi:type="dc:Point" x="443" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="527" y="97" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="479" y="82" width="12" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_1rzlaoy_di" bpmnElement="SequenceFlow_1rzlaoy">
-        <di:waypoint xsi:type="dc:Point" x="418" y="122" />
-        <di:waypoint xsi:type="dc:Point" x="418" y="268" />
-        <di:waypoint xsi:type="dc:Point" x="1131" y="272" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="424" y="195" width="18" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="SubProcess_11bi8mc_di" bpmnElement="SubProcess_11bi8mc" isExpanded="true">
-        <dc:Bounds x="325" y="576" width="419" height="150" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="StartEvent_1gxe17c_di" bpmnElement="StartEvent_1gxe17c">
-        <dc:Bounds x="360" y="628" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="378" y="669" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ScriptTask_15yddb0_di" bpmnElement="ScriptTask_15yddb0">
-        <dc:Bounds x="468" y="606" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="EndEvent_12e3h6k_di" bpmnElement="EndEvent_12e3h6k">
-        <dc:Bounds x="618" y="628" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="636" y="669" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1ch4xrf_di" bpmnElement="SequenceFlow_1ch4xrf">
-        <di:waypoint xsi:type="dc:Point" x="396" y="646" />
-        <di:waypoint xsi:type="dc:Point" x="468" y="646" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="421" y="646" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_1pjk2ff_di" bpmnElement="SequenceFlow_1pjk2ff">
-        <di:waypoint xsi:type="dc:Point" x="568" y="646" />
-        <di:waypoint xsi:type="dc:Point" x="618" y="646" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="593" y="646" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-    </bpmndi:BPMNPlane>
-  </bpmndi:BPMNDiagram>
-</bpmn2:definitions>
+<?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.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">

+  <bpmn2:process id="DoCreateServiceInstanceRollback" name="DoCreateServiceInstanceRollback" isExecutable="true">

+    <bpmn2:startEvent id="createSIRollback_startEvent" name="Start Flow">

+      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>

+    </bpmn2:startEvent>

+    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="createSIRollback_startEvent" targetRef="preProcessRequest_ScriptTask" />

+    <bpmn2:scriptTask id="preProcessRequest_ScriptTask" name="PreProcess Incoming Request" scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def rbk = new DoCreateServiceInstanceRollback()

+rbk.preProcessRequest(execution)

+]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:endEvent id="EndEvent_3">

+      <bpmn2:incoming>SequenceFlow_01l4ssl</bpmn2:incoming>

+    </bpmn2:endEvent>

+    <bpmn2:subProcess id="UnexpectedError_SubProcess_1" name="Sub-process for Errors" triggeredByEvent="true">

+      <bpmn2:startEvent id="StartEvent_1">

+        <bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing>

+        <bpmn2:errorEventDefinition id="_ErrorEventDefinition_92" />

+      </bpmn2:startEvent>

+      <bpmn2:endEvent id="EndEvent_1">

+        <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>

+      </bpmn2:endEvent>

+      <bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="StartEvent_1" targetRef="ScriptTask_1" />

+      <bpmn2:scriptTask id="ScriptTask_1" name="Handle Errors" scriptFormat="groovy">

+        <bpmn2:incoming>SequenceFlow_8</bpmn2:incoming>

+        <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>

+        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def rbk= new DoCreateServiceInstanceRollback()

+rbk.processRollbackException(execution)]]></bpmn2:script>

+      </bpmn2:scriptTask>

+      <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="ScriptTask_1" targetRef="EndEvent_1" />

+    </bpmn2:subProcess>

+    <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="preProcessRequest_ScriptTask" targetRef="ExclusiveGateway_19tbjgn" />

+    <bpmn2:callActivity id="callGenericDeleteService" name="Call AAI GenericDelete Service " calledElement="GenericDeleteService">

+      <bpmn2:extensionElements>

+        <camunda:in source="serviceInstanceId" target="GENDS_serviceInstanceId" />

+        <camunda:in source="subscriptionServiceType" target="GENDS_serviceType" />

+        <camunda:in source="globalSubscriberId" target="GENDS_globalCustomerId" />

+        <camunda:in sourceExpression="service-instance" target="GENDS_type" />

+        <camunda:out source="GENDS_FoundIndicator" target="GENDS_FoundIndicator" />

+        <camunda:in sourceExpression="&#34;&#34;" target="GENGS_serviceType" />

+        <camunda:out source="GENDS_SuccessIndicator" target="GENDS_SuccessIndicator" />

+        <camunda:out source="WorkflowException" target="WorkflowExecption" />

+      </bpmn2:extensionElements>

+      <bpmn2:incoming>SequenceFlow_1x9eh33</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_05wu9i7</bpmn2:outgoing>

+    </bpmn2:callActivity>

+    <bpmn2:exclusiveGateway id="ExclusiveGateway_09wkav2" name="RollbackSDNC?" default="SequenceFlow_1uw2p9a">

+      <bpmn2:incoming>SequenceFlow_06aasqh</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_11fnnkb</bpmn2:outgoing>

+      <bpmn2:outgoing>SequenceFlow_1uw2p9a</bpmn2:outgoing>

+    </bpmn2:exclusiveGateway>

+    <bpmn2:sequenceFlow id="SequenceFlow_11fnnkb" name="yes" sourceRef="ExclusiveGateway_09wkav2" targetRef="CallActivity_0ak0ezb">

+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("rollbackSDNC" )  == "true"}]]></bpmn2:conditionExpression>

+    </bpmn2:sequenceFlow>

+    <bpmn2:sequenceFlow id="SequenceFlow_1uw2p9a" name="no" sourceRef="ExclusiveGateway_09wkav2" targetRef="ExclusiveGateway_0ii31dq" />

+    <bpmn2:exclusiveGateway id="ExclusiveGateway_0ii31dq" name="RollBackAAI?" default="SequenceFlow_1n7wade">

+      <bpmn2:documentation>rollback AAI</bpmn2:documentation>

+      <bpmn2:incoming>SequenceFlow_1uw2p9a</bpmn2:incoming>

+      <bpmn2:incoming>SequenceFlow_0khjo7l</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_1n7wade</bpmn2:outgoing>

+      <bpmn2:outgoing>SequenceFlow_1x9eh33</bpmn2:outgoing>

+    </bpmn2:exclusiveGateway>

+    <bpmn2:sequenceFlow id="SequenceFlow_1n7wade" name="no" sourceRef="ExclusiveGateway_0ii31dq" targetRef="PostProcess_ScriptTask" />

+    <bpmn2:sequenceFlow id="SequenceFlow_05wu9i7" sourceRef="callGenericDeleteService" targetRef="PostProcess_ScriptTask" />

+    <bpmn2:sequenceFlow id="SequenceFlow_1x9eh33" name="yes" sourceRef="ExclusiveGateway_0ii31dq" targetRef="callGenericDeleteService">

+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("rollbackAAI" )  == "true"}]]></bpmn2:conditionExpression>

+    </bpmn2:sequenceFlow>

+    <bpmn2:sequenceFlow id="SequenceFlow_0k28xib" sourceRef="CallActivity_0ak0ezb" targetRef="ScriptTask_1uxr0cx" />

+    <bpmn2:callActivity id="CallActivity_0ak0ezb" name="Call SDNC Service Topology Rollback" calledElement="sdncAdapter">

+      <bpmn2:extensionElements>

+        <camunda:in source="sdncRollbackRequest" target="sdncAdapterWorkflowRequest" />

+        <camunda:in source="msoRequestId" target="mso-request-id" />

+        <camunda:in source="serviceInstanceId" target="mso-service-instance-id" />

+        <camunda:out source="WorkflowException" target="WorkflowException" />

+        <camunda:out source="sdncAdapterResponse" target="sdncAdapterResponse" />

+        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />

+      </bpmn2:extensionElements>

+      <bpmn2:incoming>SequenceFlow_11fnnkb</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_0k28xib</bpmn2:outgoing>

+    </bpmn2:callActivity>

+    <bpmn2:scriptTask id="ScriptTask_1uxr0cx" name="Post Process SDNC Rollback " scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_0k28xib</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_0khjo7l</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def rbk= new DoCreateServiceInstanceRollback()

+rbk.validateSDNCResponse(execution)]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:sequenceFlow id="SequenceFlow_0khjo7l" sourceRef="ScriptTask_1uxr0cx" targetRef="ExclusiveGateway_0ii31dq" />

+    <bpmn2:exclusiveGateway id="ExclusiveGateway_19tbjgn" name="skip Rollback" default="SequenceFlow_06aasqh">

+      <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_06aasqh</bpmn2:outgoing>

+      <bpmn2:outgoing>SequenceFlow_1rzlaoy</bpmn2:outgoing>

+    </bpmn2:exclusiveGateway>

+    <bpmn2:scriptTask id="PostProcess_ScriptTask" name="Post Process Request" scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_05wu9i7</bpmn2:incoming>

+      <bpmn2:incoming>SequenceFlow_1n7wade</bpmn2:incoming>

+      <bpmn2:incoming>SequenceFlow_1rzlaoy</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_01l4ssl</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def rbk = new DoCreateServiceInstanceRollback()

+rbk.postProcessRequest(execution)]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:sequenceFlow id="SequenceFlow_01l4ssl" sourceRef="PostProcess_ScriptTask" targetRef="EndEvent_3" />

+    <bpmn2:sequenceFlow id="SequenceFlow_06aasqh" name="no" sourceRef="ExclusiveGateway_19tbjgn" targetRef="ExclusiveGateway_09wkav2" />

+    <bpmn2:sequenceFlow id="SequenceFlow_1rzlaoy" name="yes" sourceRef="ExclusiveGateway_19tbjgn" targetRef="PostProcess_ScriptTask">

+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("skipRollback" )  == true}]]></bpmn2:conditionExpression>

+    </bpmn2:sequenceFlow>

+    <bpmn2:subProcess id="SubProcess_11bi8mc" name="Java Exception Handling Sub Process" triggeredByEvent="true">

+      <bpmn2:startEvent id="StartEvent_1gxe17c">

+        <bpmn2:outgoing>SequenceFlow_1ch4xrf</bpmn2:outgoing>

+        <bpmn2:errorEventDefinition errorRef="Error_1" />

+      </bpmn2:startEvent>

+      <bpmn2:scriptTask id="ScriptTask_15yddb0" name="Process Java Error" scriptFormat="groovy">

+        <bpmn2:incoming>SequenceFlow_1ch4xrf</bpmn2:incoming>

+        <bpmn2:outgoing>SequenceFlow_1pjk2ff</bpmn2:outgoing>

+        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def rbk= new DoCreateServiceInstanceRollback()

+rbk.processRollbackJavaException(execution)]]></bpmn2:script>

+      </bpmn2:scriptTask>

+      <bpmn2:endEvent id="EndEvent_12e3h6k">

+        <bpmn2:incoming>SequenceFlow_1pjk2ff</bpmn2:incoming>

+        <bpmn2:terminateEventDefinition />

+      </bpmn2:endEvent>

+      <bpmn2:sequenceFlow id="SequenceFlow_1ch4xrf" name="" sourceRef="StartEvent_1gxe17c" targetRef="ScriptTask_15yddb0" />

+      <bpmn2:sequenceFlow id="SequenceFlow_1pjk2ff" name="" sourceRef="ScriptTask_15yddb0" targetRef="EndEvent_12e3h6k" />

+    </bpmn2:subProcess>

+  </bpmn2:process>

+  <bpmn2:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" />

+  <bpmn2:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" />

+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">

+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateServiceInstanceRollback">

+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="createSIRollback_startEvent">

+        <dc:Bounds x="151" y="79" width="36" height="36" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="146" y="120" width="48" height="14" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_61" bpmnElement="preProcessRequest_ScriptTask">

+        <dc:Bounds x="234" y="57" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_47" targetElement="_BPMNShape_ScriptTask_61">

+        <di:waypoint xsi:type="dc:Point" x="187" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="234" y="97" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="211" y="82" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_177" bpmnElement="EndEvent_3">

+        <dc:Bounds x="1166" y="358" width="36" height="36" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1184" y="399" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_SubProcess_27" bpmnElement="UnexpectedError_SubProcess_1" isExpanded="true">

+        <dc:Bounds x="286" y="318" width="467" height="193" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_70" bpmnElement="StartEvent_1">

+        <dc:Bounds x="354" y="384" width="36" height="36" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="372" y="425" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_219" bpmnElement="EndEvent_1">

+        <dc:Bounds x="647" y="384" width="36" height="36" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="665" y="425" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_StartEvent_70" targetElement="_BPMNShape_ScriptTask_269">

+        <di:waypoint xsi:type="dc:Point" x="390" y="402" />

+        <di:waypoint xsi:type="dc:Point" x="458" y="402" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="425" y="387" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_61">

+        <di:waypoint xsi:type="dc:Point" x="334" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="367" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="367" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="393" y="97" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="382" y="97" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="CallActivity_1md4kyb_di" bpmnElement="callGenericDeleteService">

+        <dc:Bounds x="1134" y="53" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="ExclusiveGateway_09wkav2_di" bpmnElement="ExclusiveGateway_09wkav2" isMarkerVisible="true">

+        <dc:Bounds x="527" y="72" width="50" height="50" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="512" y="129" width="80" height="14" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_11fnnkb_di" bpmnElement="SequenceFlow_11fnnkb">

+        <di:waypoint xsi:type="dc:Point" x="577" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="640" y="97" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="601" y="101.351489674803" width="18" height="12" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_1uw2p9a_di" bpmnElement="SequenceFlow_1uw2p9a">

+        <di:waypoint xsi:type="dc:Point" x="552" y="72" />

+        <di:waypoint xsi:type="dc:Point" x="552" y="-23" />

+        <di:waypoint xsi:type="dc:Point" x="1021" y="-23" />

+        <di:waypoint xsi:type="dc:Point" x="1021" y="72" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="635" y="-43" width="12" height="12" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="ExclusiveGateway_0ii31dq_di" bpmnElement="ExclusiveGateway_0ii31dq" isMarkerVisible="true">

+        <dc:Bounds x="996" y="72" width="50" height="50" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="939" y="113" width="66" height="12" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_1n7wade_di" bpmnElement="SequenceFlow_1n7wade">

+        <di:waypoint xsi:type="dc:Point" x="1021" y="122" />

+        <di:waypoint xsi:type="dc:Point" x="1021" y="246" />

+        <di:waypoint xsi:type="dc:Point" x="1134" y="246" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1030" y="124.63737966405313" width="13" height="12" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_05wu9i7_di" bpmnElement="SequenceFlow_05wu9i7">

+        <di:waypoint xsi:type="dc:Point" x="1184" y="133" />

+        <di:waypoint xsi:type="dc:Point" x="1184" y="206" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1199" y="169.5" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_1x9eh33_di" bpmnElement="SequenceFlow_1x9eh33">

+        <di:waypoint xsi:type="dc:Point" x="1046" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="1134" y="97" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1082" y="82" width="18" height="12" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_0k28xib_di" bpmnElement="SequenceFlow_0k28xib">

+        <di:waypoint xsi:type="dc:Point" x="743" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="820" y="97" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="782" y="82" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="CallActivity_0ak0ezb_di" bpmnElement="CallActivity_0ak0ezb">

+        <dc:Bounds x="640" y="57" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="ScriptTask_1uxr0cx_di" bpmnElement="ScriptTask_1uxr0cx">

+        <dc:Bounds x="823" y="57" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_0khjo7l_di" bpmnElement="SequenceFlow_0khjo7l">

+        <di:waypoint xsi:type="dc:Point" x="923" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="996" y="97" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="960" y="82" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="ExclusiveGateway_19tbjgn_di" bpmnElement="ExclusiveGateway_19tbjgn" isMarkerVisible="true">

+        <dc:Bounds x="393" y="72" width="50" height="50" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="385" y="38" width="65" height="12" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_269" bpmnElement="ScriptTask_1">

+        <dc:Bounds x="458" y="362" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ScriptTask_269" targetElement="_BPMNShape_EndEvent_219">

+        <di:waypoint xsi:type="dc:Point" x="558" y="402" />

+        <di:waypoint xsi:type="dc:Point" x="647" y="402" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="603" y="387" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="ScriptTask_1wk55es_di" bpmnElement="PostProcess_ScriptTask">

+        <dc:Bounds x="1134" y="206" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_01l4ssl_di" bpmnElement="SequenceFlow_01l4ssl">

+        <di:waypoint xsi:type="dc:Point" x="1184" y="286" />

+        <di:waypoint xsi:type="dc:Point" x="1184" y="358" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1199" y="322" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_06aasqh_di" bpmnElement="SequenceFlow_06aasqh">

+        <di:waypoint xsi:type="dc:Point" x="443" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="527" y="97" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="479" y="82" width="12" height="14" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_1rzlaoy_di" bpmnElement="SequenceFlow_1rzlaoy">

+        <di:waypoint xsi:type="dc:Point" x="418" y="122" />

+        <di:waypoint xsi:type="dc:Point" x="418" y="268" />

+        <di:waypoint xsi:type="dc:Point" x="1131" y="272" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="424" y="195" width="18" height="14" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="SubProcess_11bi8mc_di" bpmnElement="SubProcess_11bi8mc" isExpanded="true">

+        <dc:Bounds x="325" y="576" width="419" height="150" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="StartEvent_1gxe17c_di" bpmnElement="StartEvent_1gxe17c">

+        <dc:Bounds x="360" y="628" width="36" height="36" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="378" y="669" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="ScriptTask_15yddb0_di" bpmnElement="ScriptTask_15yddb0">

+        <dc:Bounds x="468" y="606" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="EndEvent_12e3h6k_di" bpmnElement="EndEvent_12e3h6k">

+        <dc:Bounds x="618" y="628" width="36" height="36" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="636" y="669" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_1ch4xrf_di" bpmnElement="SequenceFlow_1ch4xrf">

+        <di:waypoint xsi:type="dc:Point" x="396" y="646" />

+        <di:waypoint xsi:type="dc:Point" x="468" y="646" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="421" y="646" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_1pjk2ff_di" bpmnElement="SequenceFlow_1pjk2ff">

+        <di:waypoint xsi:type="dc:Point" x="568" y="646" />

+        <di:waypoint xsi:type="dc:Point" x="618" y="646" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="593" y="646" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+    </bpmndi:BPMNPlane>

+  </bpmndi:BPMNDiagram>

+</bpmn2:definitions>

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModule.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModule.bpmn
index 62eb91810f..fecb720666 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModule.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModule.bpmn
@@ -1,1006 +1,1167 @@
-<?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="_pNTO8MRhEeWv36YLr7PC3Q" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
-  <bpmn2:process id="DoCreateVfModule" name="DoCreateVfModule" isExecutable="true">
-    <bpmn2:startEvent id="StartEvent_1" name="Start">
-      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
-    </bpmn2:startEvent>
-    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="PreProcessRequest" />
-    <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_1" name="DoCreateVfModule">
-      <bpmn2:outgoing>SequenceFlow_15</bpmn2:outgoing>
-      <bpmn2:linkEventDefinition id="_LinkEventDefinition_26" name="DoCreateVfModule" />
-    </bpmn2:intermediateCatchEvent>
-    <bpmn2:sequenceFlow id="SequenceFlow_15" name="" sourceRef="IntermediateCatchEvent_1" targetRef="IsVolumeGroupIdSpecified" />
-    <bpmn2:exclusiveGateway id="IsVolumeGroupIdSpecified" name="Is volume_group_id specified?" default="SequenceFlow_11">
-      <bpmn2:incoming>SequenceFlow_15</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_11</bpmn2:outgoing>
-      <bpmn2:outgoing>SequenceFlow_40</bpmn2:outgoing>
-    </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="SequenceFlow_11" name="no" sourceRef="IsVolumeGroupIdSpecified" targetRef="ExclusiveGateway_4" />
-    <bpmn2:callActivity id="ConfirmVolumeGroupTenant" name="Confirm Volume Group Tenant" calledElement="ConfirmVolumeGroupTenant">
-      <bpmn2:extensionElements>
-        <camunda:in source="DCVFM_volumeGroupId" target="volumeGroupId" />
-        <camunda:in source="DCVFM_tenantId" target="tenantId" />
-        <camunda:in source="DCVFM_cloudRegionForVolume" target="aicCloudRegion" />
-        <camunda:in source="mso-request-id" target="mso-request-id" />
-        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
-        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
-        <camunda:out source="ConfirmVolumeGroupTenantResponse" target="DCVFM_volumeGroupStackId" />
-        <camunda:out source="WorkflowException" target="WorkflowException" />
-      </bpmn2:extensionElements>
-      <bpmn2:incoming>SequenceFlow_43</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_17</bpmn2:outgoing>
-    </bpmn2:callActivity>
-    <bpmn2:sequenceFlow id="SequenceFlow_17" name="" sourceRef="ConfirmVolumeGroupTenant" targetRef="IsVolumeGroupNameSpecified" />
-    <bpmn2:exclusiveGateway id="IsVolumeGroupNameSpecified" name="Is volume_group_name specified?" default="SequenceFlow_21">
-      <bpmn2:incoming>SequenceFlow_17</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_19</bpmn2:outgoing>
-      <bpmn2:outgoing>SequenceFlow_21</bpmn2:outgoing>
-    </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="SequenceFlow_19" name="yes" sourceRef="IsVolumeGroupNameSpecified" targetRef="ConfirmVolumeName">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def doCreateVfModule = new DoCreateVfModule()
-return doCreateVfModule.isVolumeGroupNamePresent(execution)]]></bpmn2:conditionExpression>
-    </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="SequenceFlow_21" name="no" sourceRef="IsVolumeGroupNameSpecified" targetRef="ExclusiveGateway_4" />
-    <bpmn2:callActivity id="ConfirmVolumeName" name="Confirm Volume Group Name" calledElement="ConfirmVolumeGroupName">
-      <bpmn2:extensionElements>
-        <camunda:in source="DCVFM_volumeGroupId" target="ConfirmVolumeGroupName_volumeGroupId" />
-        <camunda:in source="DCVFM_volumeGroupName" target="ConfirmVolumeGroupName_volumeGroupName" />
-        <camunda:in source="DCVFM_cloudRegionForVolume" target="ConfirmVolumeGroupName_aicCloudRegion" />
-        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
-        <camunda:out source="WorkflowException" target="WorkflowException" />
-        <camunda:out source="WorkflowResponse" target="DCVM_confirmResponse" />
-      </bpmn2:extensionElements>
-      <bpmn2:incoming>SequenceFlow_19</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_35</bpmn2:outgoing>
-    </bpmn2:callActivity>
-    <bpmn2:sequenceFlow id="SequenceFlow_35" name="" sourceRef="ConfirmVolumeName" targetRef="ExclusiveGateway_4" />
-    <bpmn2:exclusiveGateway id="ExclusiveGateway_4">
-      <bpmn2:incoming>SequenceFlow_11</bpmn2:incoming>
-      <bpmn2:incoming>SequenceFlow_21</bpmn2:incoming>
-      <bpmn2:incoming>SequenceFlow_35</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing>
-    </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="ExclusiveGateway_4" targetRef="CreateAAIVfModule" />
-    <bpmn2:callActivity id="CallSDNCAdapterVDModuleTopologyAssign" name="Call SDNC Adapter: VF Module Topology Assign" calledElement="sdncAdapter">
-      <bpmn2:extensionElements>
-        <camunda:in source="DCVFM_assignSDNCRequest" target="sdncAdapterWorkflowRequest" />
-        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
-        <camunda:in source="mso-request-id" target="mso-request-id" />
-        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
-        <camunda:out source="WorkflowException" target="WorkflowException" />
-        <camunda:out source="sdncAdapterResponse" target="DCVFM_assignSDNCAdapterResponse" />
-        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />
-      </bpmn2:extensionElements>
-      <bpmn2:incoming>SequenceFlow_18</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_20</bpmn2:outgoing>
-    </bpmn2:callActivity>
-    <bpmn2:scriptTask id="PostProcessSDNCAssignRequest" name="PostProcess SDNC Assign  Request" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_20</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_22</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-
-String response = execution.getVariable("DCVFM_assignSDNCAdapterResponse")
-
-def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.validateSDNCResponse(execution, response, "assign")]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:scriptTask id="PreProcessSDNCAssignRequest" name="PreProcess SDNC Assign Request" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_8</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_18</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.preProcessSDNCAssignRequest(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_18" name="" sourceRef="PreProcessSDNCAssignRequest" targetRef="CallSDNCAdapterVDModuleTopologyAssign" />
-    <bpmn2:sequenceFlow id="SequenceFlow_20" name="" sourceRef="CallSDNCAdapterVDModuleTopologyAssign" targetRef="PostProcessSDNCAssignRequest" />
-    <bpmn2:scriptTask id="PreProcessSDNCGetRequest" name="PreProcess SDNC GET Request" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_22</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_23</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.preProcessSDNCGetRequest(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:callActivity id="CallSDNCAdapterVFModuleTopologyGET" name="Call SDNC Adapter: VF Module Topology GET" calledElement="sdncAdapter">
-      <bpmn2:extensionElements>
-        <camunda:in source="DCVFM_getSDNCRequest" target="sdncAdapterWorkflowRequest" />
-        <camunda:in source="mso-request-id" target="mso-request-id" />
-        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
-        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
-        <camunda:out source="WorkflowException" target="WorkflowException" />
-        <camunda:out source="sdncAdapterResponse" target="DCVFM_getSDNCAdapterResponse" />
-        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />
-      </bpmn2:extensionElements>
-      <bpmn2:incoming>SequenceFlow_23</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_24</bpmn2:outgoing>
-    </bpmn2:callActivity>
-    <bpmn2:sequenceFlow id="SequenceFlow_22" name="" sourceRef="PostProcessSDNCAssignRequest" targetRef="PreProcessSDNCGetRequest" />
-    <bpmn2:sequenceFlow id="SequenceFlow_23" name="" sourceRef="PreProcessSDNCGetRequest" targetRef="CallSDNCAdapterVFModuleTopologyGET" />
-    <bpmn2:sequenceFlow id="SequenceFlow_24" name="" sourceRef="CallSDNCAdapterVFModuleTopologyGET" targetRef="PostProcessSDNCGetRequest" />
-    <bpmn2:scriptTask id="PostProcessSDNCGetRequest" name="PostProcess SDNC GET Request" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_24</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_31</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-
-String response = execution.getVariable("DCVFM_getSDNCAdapterResponse")
-
-def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.validateSDNCResponse(execution, response, "get")]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:callActivity id="UpdateAAIVfModule_1" name="UpdateAAIVfModule" calledElement="UpdateAAIVfModule">
-      <bpmn2:extensionElements>
-        <camunda:in source="DCVFM_updateAAIVfModuleRequest" target="UpdateAAIVfModuleRequest" />
-        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
-        <camunda:out source="WorkflowException" target="WorkflowException" />
-        <camunda:out source="WorkflowResponse" target="DCVM_updateAAIVfModuleResponse" />
-      </bpmn2:extensionElements>
-      <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_10</bpmn2:outgoing>
-    </bpmn2:callActivity>
-    <bpmn2:scriptTask id="PreProcessUpdateAAIVfModule_1" name="PreProcess Update AAIVfModule" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_1avfxsz</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.preProcessUpdateAAIVfModuleRequestOrch(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:scriptTask id="PreProcessSDNCActivateRequest" name="PreProcess SDNC Activate Request" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_10</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_12</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.preProcessSDNCActivateRequest(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:callActivity id="CallSDNCAdapterVFModuleTopologyActivate" name="Call SDNC Adapter: VF Module Topology Activate" calledElement="sdncAdapter">
-      <bpmn2:extensionElements>
-        <camunda:in source="DCVFM_activateSDNCRequest" target="sdncAdapterWorkflowRequest" />
-        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
-        <camunda:in source="mso-request-id" target="mso-request-id" />
-        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
-        <camunda:out source="WorkflowException" target="WorkflowException" />
-        <camunda:out source="sdncAdapterResponse" target="DCVFM_activateSDNCAdapterResponse" />
-        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />
-      </bpmn2:extensionElements>
-      <bpmn2:incoming>SequenceFlow_12</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_13</bpmn2:outgoing>
-    </bpmn2:callActivity>
-    <bpmn2:scriptTask id="PostProcessSDNCActivateRequest" name="PostProcess SDNC Activate Request" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_13</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-      
-      String response = execution.getVariable("DCVFM_activateSDNCAdapterResponse")
-      
-def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.validateSDNCResponse(execution, response, "activate")]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:exclusiveGateway id="ExclusiveGateway_5" name="Is volume_group_id specified?" default="SequenceFlow_30">
-      <bpmn2:incoming>SequenceFlow_14</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_28</bpmn2:outgoing>
-      <bpmn2:outgoing>SequenceFlow_30</bpmn2:outgoing>
-    </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="SequenceFlow_28" name="yes" sourceRef="ExclusiveGateway_5" targetRef="PrepareCreateAAIVfModuleVolumeGroupRequest">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def doCreateVfModule = new DoCreateVfModule()
-return doCreateVfModule.isVolumeGroupIdPresent(execution)]]></bpmn2:conditionExpression>
-    </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="SequenceFlow_30" name="no" sourceRef="ExclusiveGateway_5" targetRef="ExclusiveGateway_6" />
-    <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="PreProcessUpdateAAIVfModule_1" targetRef="UpdateAAIVfModule_1" />
-    <bpmn2:sequenceFlow id="SequenceFlow_10" name="" sourceRef="UpdateAAIVfModule_1" targetRef="PreProcessSDNCActivateRequest" />
-    <bpmn2:sequenceFlow id="SequenceFlow_12" name="" sourceRef="PreProcessSDNCActivateRequest" targetRef="CallSDNCAdapterVFModuleTopologyActivate" />
-    <bpmn2:sequenceFlow id="SequenceFlow_13" name="" sourceRef="CallSDNCAdapterVFModuleTopologyActivate" targetRef="PostProcessSDNCActivateRequest" />
-    <bpmn2:sequenceFlow id="SequenceFlow_14" name="" sourceRef="PostProcessSDNCActivateRequest" targetRef="ExclusiveGateway_5" />
-    <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_3" name="UpdateAndActivate">
-      <bpmn2:outgoing>SequenceFlow_0363dz7</bpmn2:outgoing>
-      <bpmn2:linkEventDefinition id="_LinkEventDefinition_30" name="UpdateAndActivate" />
-    </bpmn2:intermediateCatchEvent>
-    <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_2" name="Provision">
-      <bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing>
-      <bpmn2:linkEventDefinition id="_LinkEventDefinition_29" name="Provision" />
-    </bpmn2:intermediateCatchEvent>
-    <bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="IntermediateCatchEvent_2" targetRef="PreProcessSDNCAssignRequest" />
-    <bpmn2:scriptTask id="PrepareCreateAAIVfModuleVolumeGroupRequest" name="Prepare CreateAAIVfModuleVolumeGroup Request" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_28</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.prepareCreateAAIVfModuleVolumeGroupRequest(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:callActivity id="CreateAAIVfModuleVolumeGroup" name="CreateAAIVfModuleVolumeGroup" calledElement="CreateAAIVfModuleVolumeGroup">
-      <bpmn2:extensionElements>
-        <camunda:in source="DCVFM_createAAIVfModuleVolumeGroupRequest" target="CreateAAIVfModuleVolumeGroupRequest" />
-        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
-        <camunda:out source="WorkflowException" target="WorkflowException" />
-        <camunda:out source="WorkflowResponse" target="DCVM_updateAAIVfModuleResponse" />
-      </bpmn2:extensionElements>
-      <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_29</bpmn2:outgoing>
-    </bpmn2:callActivity>
-    <bpmn2:sequenceFlow id="SequenceFlow_29" name="" sourceRef="CreateAAIVfModuleVolumeGroup" targetRef="ExclusiveGateway_6" />
-    <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="PrepareCreateAAIVfModuleVolumeGroupRequest" targetRef="CreateAAIVfModuleVolumeGroup" />
-    <bpmn2:exclusiveGateway id="ExclusiveGateway_6">
-      <bpmn2:incoming>SequenceFlow_30</bpmn2:incoming>
-      <bpmn2:incoming>SequenceFlow_29</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_16</bpmn2:outgoing>
-    </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="SequenceFlow_16" name="" sourceRef="ExclusiveGateway_6" targetRef="ScriptTask_setSuccess" />
-    <bpmn2:scriptTask id="PreProcessVNFAdapterRequest" name="PreProcess VNF Adapter Request" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_31</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_32</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.preProcessVNFAdapterRequest(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:callActivity id="CallVNFAdapterVFModuleCreate" name="Call VNF Adapter to create VF Module" calledElement="vnfAdapterRestV1">
-      <bpmn2:extensionElements>
-        <camunda:in source="DCVFM_createVnfARequest" target="vnfAdapterRestV1Request" />
-        <camunda:out source="vnfAdapterRestV1Response" target="DCVFM_createVnfAResponse" />
-        <camunda:in source="mso-request-id" target="mso-request-id" />
-        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
-        <camunda:in variables="all" />
-        <camunda:out source="WorkflowException" target="WorkflowException" />
-      </bpmn2:extensionElements>
-      <bpmn2:incoming>SequenceFlow_32</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_33</bpmn2:outgoing>
-    </bpmn2:callActivity>
-    <bpmn2:scriptTask id="PostProcessVNFAdapterRequest" name="PostProcess VNF Adapter Request" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_33</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_1ushk1d</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.postProcessVNFAdapterRequest(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_2" name="To UpdateAndActivate">
-      <bpmn2:incoming>SequenceFlow_0xfanpi</bpmn2:incoming>
-      <bpmn2:incoming>SequenceFlow_0abffyj</bpmn2:incoming>
-      <bpmn2:linkEventDefinition id="_LinkEventDefinition_31" name="UpdateAndActivate" />
-    </bpmn2:intermediateThrowEvent>
-    <bpmn2:sequenceFlow id="SequenceFlow_31" name="" sourceRef="PostProcessSDNCGetRequest" targetRef="PreProcessVNFAdapterRequest" />
-    <bpmn2:sequenceFlow id="SequenceFlow_32" name="" sourceRef="PreProcessVNFAdapterRequest" targetRef="CallVNFAdapterVFModuleCreate" />
-    <bpmn2:sequenceFlow id="SequenceFlow_33" name="" sourceRef="CallVNFAdapterVFModuleCreate" targetRef="PostProcessVNFAdapterRequest" />
-    <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_3" name="To Provision">
-      <bpmn2:incoming>SequenceFlow_41</bpmn2:incoming>
-      <bpmn2:linkEventDefinition id="_LinkEventDefinition_28" name="Provision" />
-    </bpmn2:intermediateThrowEvent>
-    <bpmn2:exclusiveGateway id="ExclusiveGateway_2">
-      <bpmn2:incoming>SequenceFlow_39</bpmn2:incoming>
-      <bpmn2:incoming>SequenceFlow_37</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_41</bpmn2:outgoing>
-    </bpmn2:exclusiveGateway>
-    <bpmn2:scriptTask id="PostProcessCreateAAIVfModule" name="PostProcess CreateAAIVfModule" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_25</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_27</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.postProcessCreateAAIVfModule(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_27" name="" sourceRef="PostProcessCreateAAIVfModule" targetRef="IsBaseVfModule" />
-    <bpmn2:exclusiveGateway id="IsBaseVfModule" name="Is Base VF Module?" default="SequenceFlow_36">
-      <bpmn2:incoming>SequenceFlow_27</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_36</bpmn2:outgoing>
-      <bpmn2:outgoing>SequenceFlow_39</bpmn2:outgoing>
-    </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="SequenceFlow_36" name="no" sourceRef="IsBaseVfModule" targetRef="QueryAAIVfModule" />
-    <bpmn2:sequenceFlow id="SequenceFlow_39" name="yes" sourceRef="IsBaseVfModule" targetRef="ExclusiveGateway_2">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable("DCVFM_isBaseVfModule") == "true"]]></bpmn2:conditionExpression>
-    </bpmn2:sequenceFlow>
-    <bpmn2:scriptTask id="QueryAAIVfModule" name="Query AAI Vf Module" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_36</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_37</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.queryAAIVfModule(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_37" name="" sourceRef="QueryAAIVfModule" targetRef="ExclusiveGateway_2" />
-    <bpmn2:sequenceFlow id="SequenceFlow_41" name="" sourceRef="ExclusiveGateway_2" targetRef="IntermediateThrowEvent_3" />
-    <bpmn2:scriptTask id="ScriptTask_setSuccess" name="Set Success Indicator" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_16</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.setSuccessIndicator(execution, true)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="ScriptTask_setSuccess" targetRef="EndEvent_1" />
-    <bpmn2:endEvent id="EndEvent_1">
-      <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>
-      <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_8" />
-    </bpmn2:endEvent>
-    <bpmn2:scriptTask id="QueryCloudRegion" name="Query Cloud Region" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_40</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_43</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def doCreateVfModule = new DoCreateVfModule()
-return doCreateVfModule.queryCloudRegion(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_40" name="yes" sourceRef="IsVolumeGroupIdSpecified" targetRef="QueryCloudRegion">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def doCreateVfModule = new DoCreateVfModule()
-return doCreateVfModule.isVolumeGroupIdPresent(execution)]]></bpmn2:conditionExpression>
-    </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="SequenceFlow_43" name="" sourceRef="QueryCloudRegion" targetRef="ConfirmVolumeGroupTenant" />
-    <bpmn2:subProcess id="SubProcess_1" name="Error Handling Sub Process" triggeredByEvent="true">
-      <bpmn2:scriptTask id="ScriptTask_1" name="Process Error" scriptFormat="groovy">
-        <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming>
-        <bpmn2:outgoing>SequenceFlow_38</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.processBPMNException(execution)]]></bpmn2:script>
-      </bpmn2:scriptTask>
-      <bpmn2:sequenceFlow id="SequenceFlow_38" name="" sourceRef="ScriptTask_1" targetRef="EndEvent_2" />
-      <bpmn2:startEvent id="StartEvent_2">
-        <bpmn2:outgoing>SequenceFlow_9</bpmn2:outgoing>
-        <bpmn2:errorEventDefinition id="ErrorEventDefinition_1" />
-      </bpmn2:startEvent>
-      <bpmn2:sequenceFlow id="SequenceFlow_9" name="" sourceRef="StartEvent_2" targetRef="ScriptTask_1" />
-      <bpmn2:endEvent id="EndEvent_2">
-        <bpmn2:incoming>SequenceFlow_38</bpmn2:incoming>
-      </bpmn2:endEvent>
-    </bpmn2:subProcess>
-    <bpmn2:scriptTask id="PreProcessRequest" name="Pre-Process Request" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.preProcessRequest(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="PreProcessRequest" targetRef="IntermediateThrowEvent_1" />
-    <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_1" name="To DoCreateVfModule">
-      <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>
-      <bpmn2:linkEventDefinition id="_LinkEventDefinition_25" name="DoCreateVfModule" />
-    </bpmn2:intermediateThrowEvent>
-    <bpmn2:callActivity id="CreateAAIVfModule" name="CreateAAIVfModule" calledElement="CreateAAIVfModule">
-      <bpmn2:extensionElements>
-        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
-        <camunda:in source="isVidRequest" target="isVidRequest" />
-        <camunda:in source="newVfModuleId" target="newVfModuleId" />
-        <camunda:out source="WorkflowException" target="WorkflowException" />
-        <camunda:out source="CreateAAIVfModuleResponse" target="DCVFM_createVfModuleResponse" />
-        <camunda:in source="DCVFM_vnfId" target="vnfId" />
-        <camunda:in source="DCVFM_vnfName" target="vnfName" />
-        <camunda:in source="DCVFM_vnfType" target="vnfType" />
-        <camunda:in source="DCVFM_serviceId" target="serviceId" />
-        <camunda:in source="DCVFM_personaModelId" target="personaModelId" />
-        <camunda:in source="DCVFM_isBaseVfModule" target="isBaseVfModule" />
-        <camunda:in source="DCVFM_vfModuleName" target="vfModuleName" />
-        <camunda:in source="DCVFM_vfModuleModelName" target="vfModuleModelName" />
-        <camunda:in source="DCVFM_personaModelVersion" target="personaModelVersion" />
-        <camunda:in source="DCVFM_modelCustomizationUuid" target="modelCustomizationId" />
-      </bpmn2:extensionElements>
-      <bpmn2:incoming>SequenceFlow_6</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_25</bpmn2:outgoing>
-    </bpmn2:callActivity>
-    <bpmn2:sequenceFlow id="SequenceFlow_25" name="" sourceRef="CreateAAIVfModule" targetRef="PostProcessCreateAAIVfModule" />
-    <bpmn2:exclusiveGateway id="ExclusiveGateway_183x8vk" name="need to create network policies in AAI?" default="SequenceFlow_0xfanpi">
-      <bpmn2:incoming>SequenceFlow_1ushk1d</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_0ery1pk</bpmn2:outgoing>
-      <bpmn2:outgoing>SequenceFlow_0xfanpi</bpmn2:outgoing>
-    </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="SequenceFlow_1ushk1d" sourceRef="PostProcessVNFAdapterRequest" targetRef="ExclusiveGateway_183x8vk" />
-    <bpmn2:sequenceFlow id="SequenceFlow_0ery1pk" name="yes" sourceRef="ExclusiveGateway_183x8vk" targetRef="CreateNetworkPoliciesInAAI">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable("DCVFM_contrailNetworkPolicyFqdnList") != null && !execution.getVariable("DCVFM_contrailNetworkPolicyFqdnList").isEmpty()]]></bpmn2:conditionExpression>
-    </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="SequenceFlow_0xfanpi" name="no" sourceRef="ExclusiveGateway_183x8vk" targetRef="IntermediateThrowEvent_2" />
-    <bpmn2:sequenceFlow id="SequenceFlow_0abffyj" sourceRef="CreateNetworkPoliciesInAAI" targetRef="IntermediateThrowEvent_2" />
-    <bpmn2:scriptTask id="CreateNetworkPoliciesInAAI" name="Create Network Policies In AAI" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_0ery1pk</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_0abffyj</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.createNetworkPoliciesInAAI(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:exclusiveGateway id="ExclusiveGateway_0f54imv" name="need to update VNF in AAI?" default="SequenceFlow_1k5uku2">
-      <bpmn2:incoming>SequenceFlow_0363dz7</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_0bi38s7</bpmn2:outgoing>
-      <bpmn2:outgoing>SequenceFlow_1k5uku2</bpmn2:outgoing>
-    </bpmn2:exclusiveGateway>
-    <bpmn2:exclusiveGateway id="ExclusiveGateway_1edqxlf">
-      <bpmn2:incoming>SequenceFlow_112los9</bpmn2:incoming>
-      <bpmn2:incoming>SequenceFlow_1k5uku2</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_1avfxsz</bpmn2:outgoing>
-    </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="SequenceFlow_0bi38s7" name="yes" sourceRef="ExclusiveGateway_0f54imv" targetRef="PreProcessUpdateAAIGenericVnf">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[!execution.getVariable("DCVFM_oamManagementV4Address").isEmpty() || !execution.getVariable("DCVFM_oamManagementV6Address").isEmpty()]]></bpmn2:conditionExpression>
-    </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="SequenceFlow_1qm81ym" sourceRef="PreProcessUpdateAAIGenericVnf" targetRef="UpdateAAIGenericVNFTask" />
-    <bpmn2:sequenceFlow id="SequenceFlow_112los9" sourceRef="UpdateAAIGenericVNFTask" targetRef="ExclusiveGateway_1edqxlf" />
-    <bpmn2:sequenceFlow id="SequenceFlow_1k5uku2" name="no" sourceRef="ExclusiveGateway_0f54imv" targetRef="ExclusiveGateway_1edqxlf" />
-    <bpmn2:sequenceFlow id="SequenceFlow_1avfxsz" sourceRef="ExclusiveGateway_1edqxlf" targetRef="PreProcessUpdateAAIVfModule_1" />
-    <bpmn2:sequenceFlow id="SequenceFlow_0363dz7" sourceRef="IntermediateCatchEvent_3" targetRef="ExclusiveGateway_0f54imv" />
-    <bpmn2:scriptTask id="PreProcessUpdateAAIGenericVnf" name="PreProcess Update AAI Generic VNF" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_0bi38s7</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_1qm81ym</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.prepUpdateAAIGenericVnf(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:callActivity id="UpdateAAIGenericVNFTask" name="Update AAI Generic VNF" calledElement="UpdateAAIGenericVnf">
-      <bpmn2:extensionElements>
-        <camunda:in source="DCVM_updateAAIGenericVnfRequest" target="UpdateAAIGenericVnfRequest" />
-        <camunda:in source="mso-request-id" target="mso-request-id" />
-        <camunda:in source="mso-service-id" target="mso-service-id" />
-        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
-        <camunda:out source="WorkflowException" target="WorkflowException" />
-      </bpmn2:extensionElements>
-      <bpmn2:incoming>SequenceFlow_1qm81ym</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_112los9</bpmn2:outgoing>
-    </bpmn2:callActivity>
-  </bpmn2:process>
-  <bpmn2:message id="Message_1" name="DoCreateVfModuleRequest" />
-  <bpmn2:error id="Error_1" name="MSOWorkflowException" errorCode="MSOWorkflowException" />
-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateVfModule">
-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_50" bpmnElement="StartEvent_1">
-        <dc:Bounds x="41" y="231" width="36" height="36" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_50" targetElement="_BPMNShape_ScriptTask_124">
-        <di:waypoint xsi:type="dc:Point" x="77" y="249" />
-        <di:waypoint xsi:type="dc:Point" x="150" y="249" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="99" y="249" width="6" height="6" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_124" bpmnElement="PreProcessRequest">
-        <dc:Bounds x="150" y="209" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_IntermediateCatchEvent_24" bpmnElement="IntermediateCatchEvent_1">
-        <dc:Bounds x="36" y="376" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="0" y="417" width="114" height="22" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_IntermediateThrowEvent_22" bpmnElement="IntermediateThrowEvent_1">
-        <dc:Bounds x="338" y="231" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="290" y="272" width="132" height="22" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_157" bpmnElement="CallSDNCAdapterVDModuleTopologyAssign">
-        <dc:Bounds x="266" y="672" width="121" height="94" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_158" bpmnElement="CallSDNCAdapterVFModuleTopologyGET">
-        <dc:Bounds x="744" y="670" width="133" height="97" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_90" bpmnElement="IsVolumeGroupIdSpecified" isMarkerVisible="true">
-        <dc:Bounds x="144" y="368" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="89" y="347" width="178" height="22" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_172" bpmnElement="ConfirmVolumeGroupTenant">
-        <dc:Bounds x="209" y="528" width="118" height="89" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_91" bpmnElement="ExclusiveGateway_4" isMarkerVisible="true">
-        <dc:Bounds x="559" y="368" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="584" y="423" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_11" sourceElement="_BPMNShape_ExclusiveGateway_90" targetElement="_BPMNShape_ExclusiveGateway_91">
-        <di:waypoint xsi:type="dc:Point" x="194" y="393" />
-        <di:waypoint xsi:type="dc:Point" x="559" y="393" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="209" y="393" width="20" height="22" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_173" bpmnElement="CallVNFAdapterVFModuleCreate">
-        <dc:Bounds x="1236" y="672" width="121" height="97" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_174" bpmnElement="UpdateAAIVfModule_1">
-        <dc:Bounds x="768" y="830" width="117" height="97" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_175" bpmnElement="CallSDNCAdapterVFModuleTopologyActivate">
-        <dc:Bounds x="1090" y="828" width="119" height="99" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_92" bpmnElement="ExclusiveGateway_5" isMarkerVisible="true">
-        <dc:Bounds x="1435" y="853" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1432" y="825" width="86" height="36" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_176" bpmnElement="CreateAAIVfModuleVolumeGroup">
-        <dc:Bounds x="1693" y="986" width="121" height="112" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_28" bpmnElement="SequenceFlow_28" sourceElement="_BPMNShape_ExclusiveGateway_92" targetElement="_BPMNShape_Task_7">
-        <di:waypoint xsi:type="dc:Point" x="1460" y="903" />
-        <di:waypoint xsi:type="dc:Point" x="1460" y="1042" />
-        <di:waypoint xsi:type="dc:Point" x="1520" y="1042" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1452" y="928" width="18" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_93" bpmnElement="ExclusiveGateway_6" isMarkerVisible="true">
-        <dc:Bounds x="1818" y="854" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1843" y="909" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_29" bpmnElement="SequenceFlow_29" sourceElement="_BPMNShape_ScriptTask_176" targetElement="_BPMNShape_ExclusiveGateway_93">
-        <di:waypoint xsi:type="dc:Point" x="1813" y="1042" />
-        <di:waypoint xsi:type="dc:Point" x="1843" y="1042" />
-        <di:waypoint xsi:type="dc:Point" x="1843" y="944" />
-        <di:waypoint xsi:type="dc:Point" x="1843" y="904" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1839" y="1042" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_30" bpmnElement="SequenceFlow_30" sourceElement="_BPMNShape_ExclusiveGateway_92" targetElement="_BPMNShape_ExclusiveGateway_93">
-        <di:waypoint xsi:type="dc:Point" x="1485" y="878" />
-        <di:waypoint xsi:type="dc:Point" x="1651" y="878" />
-        <di:waypoint xsi:type="dc:Point" x="1651" y="879" />
-        <di:waypoint xsi:type="dc:Point" x="1818" y="879" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1519" y="878" width="12" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_15" bpmnElement="SequenceFlow_15" sourceElement="_BPMNShape_IntermediateCatchEvent_24" targetElement="_BPMNShape_ExclusiveGateway_90">
-        <di:waypoint xsi:type="dc:Point" x="72" y="394" />
-        <di:waypoint xsi:type="dc:Point" x="120" y="394" />
-        <di:waypoint xsi:type="dc:Point" x="120" y="393" />
-        <di:waypoint xsi:type="dc:Point" x="144" y="393" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="117" y="394" width="6" height="6" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_101" bpmnElement="IsVolumeGroupNameSpecified" isMarkerVisible="true">
-        <dc:Bounds x="360" y="547" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="309" y="496" width="200" height="22" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_17" bpmnElement="SequenceFlow_17" sourceElement="_BPMNShape_ScriptTask_172" targetElement="_BPMNShape_ExclusiveGateway_101">
-        <di:waypoint xsi:type="dc:Point" x="327" y="572" />
-        <di:waypoint xsi:type="dc:Point" x="360" y="572" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="338" y="572" width="6" height="6" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_Task_3" bpmnElement="ConfirmVolumeName">
-        <dc:Bounds x="453" y="528" width="109" height="89" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_19" bpmnElement="SequenceFlow_19" sourceElement="_BPMNShape_ExclusiveGateway_101" targetElement="_BPMNShape_Task_3">
-        <di:waypoint xsi:type="dc:Point" x="410" y="572" />
-        <di:waypoint xsi:type="dc:Point" x="453" y="572" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="410" y="576" width="27" height="22" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_21" bpmnElement="SequenceFlow_21" sourceElement="_BPMNShape_ExclusiveGateway_101" targetElement="_BPMNShape_ExclusiveGateway_91">
-        <di:waypoint xsi:type="dc:Point" x="385" y="547" />
-        <di:waypoint xsi:type="dc:Point" x="385" y="393" />
-        <di:waypoint xsi:type="dc:Point" x="559" y="393" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="392" y="450" width="20" height="22" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_35" bpmnElement="SequenceFlow_35" sourceElement="_BPMNShape_Task_3" targetElement="_BPMNShape_ExclusiveGateway_91">
-        <di:waypoint xsi:type="dc:Point" x="561" y="572" />
-        <di:waypoint xsi:type="dc:Point" x="584" y="572" />
-        <di:waypoint xsi:type="dc:Point" x="584" y="418" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="581" y="492" width="6" height="6" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_ScriptTask_124" targetElement="_BPMNShape_IntermediateThrowEvent_22">
-        <di:waypoint xsi:type="dc:Point" x="250" y="249" />
-        <di:waypoint xsi:type="dc:Point" x="338" y="249" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="287" y="249" width="6" height="6" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_ExclusiveGateway_91" targetElement="_BPMNShape_ScriptTask_156">
-        <di:waypoint xsi:type="dc:Point" x="609" y="393" />
-        <di:waypoint xsi:type="dc:Point" x="628" y="393" />
-        <di:waypoint xsi:type="dc:Point" x="628" y="394" />
-        <di:waypoint xsi:type="dc:Point" x="696" y="394" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="636" y="394" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_178" bpmnElement="PreProcessSDNCAssignRequest">
-        <dc:Bounds x="109" y="674" width="121" height="94" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_179" bpmnElement="PostProcessSDNCAssignRequest">
-        <dc:Bounds x="435" y="674" width="121" height="94" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_IntermediateThrowEvent_44" bpmnElement="IntermediateThrowEvent_3">
-        <dc:Bounds x="1537" y="374" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1517" y="415" width="76" height="22" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_IntermediateCatchEvent_29" bpmnElement="IntermediateCatchEvent_2">
-        <dc:Bounds x="24" y="706" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="13" y="747" width="58" height="22" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_IntermediateCatchEvent_29" targetElement="_BPMNShape_ScriptTask_178">
-        <di:waypoint xsi:type="dc:Point" x="60" y="724" />
-        <di:waypoint xsi:type="dc:Point" x="81" y="724" />
-        <di:waypoint xsi:type="dc:Point" x="81" y="721" />
-        <di:waypoint xsi:type="dc:Point" x="109" y="721" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="78" y="722" width="6" height="6" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="SequenceFlow_18" sourceElement="_BPMNShape_ScriptTask_178" targetElement="_BPMNShape_ScriptTask_157">
-        <di:waypoint xsi:type="dc:Point" x="229" y="721" />
-        <di:waypoint xsi:type="dc:Point" x="248" y="721" />
-        <di:waypoint xsi:type="dc:Point" x="248" y="719" />
-        <di:waypoint xsi:type="dc:Point" x="266" y="719" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_20" bpmnElement="SequenceFlow_20" sourceElement="_BPMNShape_ScriptTask_157" targetElement="_BPMNShape_ScriptTask_179">
-        <di:waypoint xsi:type="dc:Point" x="386" y="719" />
-        <di:waypoint xsi:type="dc:Point" x="411" y="719" />
-        <di:waypoint xsi:type="dc:Point" x="411" y="721" />
-        <di:waypoint xsi:type="dc:Point" x="435" y="721" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_213" bpmnElement="PreProcessSDNCGetRequest">
-        <dc:Bounds x="588" y="672" width="121" height="94" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_214" bpmnElement="PostProcessSDNCGetRequest">
-        <dc:Bounds x="924" y="672" width="121" height="94" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_22" bpmnElement="SequenceFlow_22" sourceElement="_BPMNShape_ScriptTask_179" targetElement="_BPMNShape_ScriptTask_213">
-        <di:waypoint xsi:type="dc:Point" x="555" y="721" />
-        <di:waypoint xsi:type="dc:Point" x="572" y="721" />
-        <di:waypoint xsi:type="dc:Point" x="572" y="719" />
-        <di:waypoint xsi:type="dc:Point" x="588" y="719" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_23" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_ScriptTask_213" targetElement="_BPMNShape_ScriptTask_158">
-        <di:waypoint xsi:type="dc:Point" x="708" y="719" />
-        <di:waypoint xsi:type="dc:Point" x="726" y="719" />
-        <di:waypoint xsi:type="dc:Point" x="726" y="718" />
-        <di:waypoint xsi:type="dc:Point" x="744" y="718" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_24" bpmnElement="SequenceFlow_24" sourceElement="_BPMNShape_ScriptTask_158" targetElement="_BPMNShape_ScriptTask_214">
-        <di:waypoint xsi:type="dc:Point" x="876" y="718" />
-        <di:waypoint xsi:type="dc:Point" x="899" y="718" />
-        <di:waypoint xsi:type="dc:Point" x="899" y="719" />
-        <di:waypoint xsi:type="dc:Point" x="924" y="719" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="897" y="719" width="6" height="6" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_Task_2" bpmnElement="PreProcessUpdateAAIVfModule_1">
-        <dc:Bounds x="609" y="830" width="118" height="97" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_Task_33" bpmnElement="PreProcessSDNCActivateRequest">
-        <dc:Bounds x="935" y="829" width="118" height="98" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_Task_4" bpmnElement="PostProcessSDNCActivateRequest">
-        <dc:Bounds x="1252" y="830" width="121" height="95" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_Task_2" targetElement="_BPMNShape_ScriptTask_174">
-        <di:waypoint xsi:type="dc:Point" x="727" y="878" />
-        <di:waypoint xsi:type="dc:Point" x="768" y="878" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="748" y="853" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_ScriptTask_174" targetElement="_BPMNShape_Task_33">
-        <di:waypoint xsi:type="dc:Point" x="884" y="878" />
-        <di:waypoint xsi:type="dc:Point" x="935" y="878" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="910" y="853" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_Task_33" targetElement="_BPMNShape_ScriptTask_175">
-        <di:waypoint xsi:type="dc:Point" x="1053" y="878" />
-        <di:waypoint xsi:type="dc:Point" x="1071" y="878" />
-        <di:waypoint xsi:type="dc:Point" x="1071" y="877" />
-        <di:waypoint xsi:type="dc:Point" x="1090" y="877" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1086" y="868" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="SequenceFlow_13" sourceElement="_BPMNShape_ScriptTask_175" targetElement="_BPMNShape_Task_4">
-        <di:waypoint xsi:type="dc:Point" x="1208" y="877" />
-        <di:waypoint xsi:type="dc:Point" x="1252" y="877" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1230" y="852" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_14" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_Task_4" targetElement="_BPMNShape_ExclusiveGateway_92">
-        <di:waypoint xsi:type="dc:Point" x="1372" y="877" />
-        <di:waypoint xsi:type="dc:Point" x="1404" y="877" />
-        <di:waypoint xsi:type="dc:Point" x="1404" y="878" />
-        <di:waypoint xsi:type="dc:Point" x="1435" y="878" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1419" y="868" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_175" bpmnElement="EndEvent_1">
-        <dc:Bounds x="1808" y="860" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1826" y="901" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_16" bpmnElement="SequenceFlow_16" sourceElement="_BPMNShape_ExclusiveGateway_93" targetElement="_BPMNShape_ScriptTask_218">
-        <di:waypoint xsi:type="dc:Point" x="1868" y="879" />
-        <di:waypoint xsi:type="dc:Point" x="1894" y="879" />
-        <di:waypoint xsi:type="dc:Point" x="1894" y="877" />
-        <di:waypoint xsi:type="dc:Point" x="1933" y="877" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1881" y="879" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_IntermediateThrowEvent_45" bpmnElement="IntermediateThrowEvent_2">
-        <dc:Bounds x="1771" y="701" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1747" y="742" width="84" height="36" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_IntermediateCatchEvent_30" bpmnElement="IntermediateCatchEvent_3">
-        <dc:Bounds x="24" y="860" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="16" y="901" width="84" height="24" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_Task_7" bpmnElement="PrepareCreateAAIVfModuleVolumeGroupRequest">
-        <dc:Bounds x="1520" y="986" width="121" height="112" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_Task_7" targetElement="_BPMNShape_ScriptTask_176">
-        <di:waypoint xsi:type="dc:Point" x="1640" y="1042" />
-        <di:waypoint xsi:type="dc:Point" x="1693" y="1042" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1667" y="1017" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_Task_25" bpmnElement="PreProcessVNFAdapterRequest">
-        <dc:Bounds x="1073" y="672" width="121" height="96" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_Task_35" bpmnElement="PostProcessVNFAdapterRequest">
-        <dc:Bounds x="1397" y="674" width="116" height="92" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_31" bpmnElement="SequenceFlow_31" sourceElement="_BPMNShape_ScriptTask_214" targetElement="_BPMNShape_Task_25">
-        <di:waypoint xsi:type="dc:Point" x="1044" y="719" />
-        <di:waypoint xsi:type="dc:Point" x="1059" y="719" />
-        <di:waypoint xsi:type="dc:Point" x="1059" y="720" />
-        <di:waypoint xsi:type="dc:Point" x="1073" y="720" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_32" bpmnElement="SequenceFlow_32" sourceElement="_BPMNShape_Task_25" targetElement="_BPMNShape_ScriptTask_173">
-        <di:waypoint xsi:type="dc:Point" x="1193" y="720" />
-        <di:waypoint xsi:type="dc:Point" x="1236" y="720" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_33" bpmnElement="SequenceFlow_33" sourceElement="_BPMNShape_ScriptTask_173" targetElement="_BPMNShape_Task_35">
-        <di:waypoint xsi:type="dc:Point" x="1356" y="720" />
-        <di:waypoint xsi:type="dc:Point" x="1397" y="720" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_215" bpmnElement="QueryAAIVfModule">
-        <dc:Bounds x="1224" y="516" width="125" height="92" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_211" bpmnElement="IsBaseVfModule" isMarkerVisible="true">
-        <dc:Bounds x="1128" y="368" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1092" y="336" width="124" height="22" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_212" bpmnElement="ExclusiveGateway_2" isMarkerVisible="true">
-        <dc:Bounds x="1408" y="368" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1433" y="423" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_36" bpmnElement="SequenceFlow_36" sourceElement="_BPMNShape_ExclusiveGateway_211" targetElement="_BPMNShape_ScriptTask_215">
-        <di:waypoint xsi:type="dc:Point" x="1153" y="418" />
-        <di:waypoint xsi:type="dc:Point" x="1153" y="562" />
-        <di:waypoint xsi:type="dc:Point" x="1224" y="562" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1122" y="450" width="20" height="22" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_39" bpmnElement="SequenceFlow_39" sourceElement="_BPMNShape_ExclusiveGateway_211" targetElement="_BPMNShape_ExclusiveGateway_212">
-        <di:waypoint xsi:type="dc:Point" x="1178" y="393" />
-        <di:waypoint xsi:type="dc:Point" x="1408" y="393" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1285" y="393" width="27" height="22" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_216" bpmnElement="PostProcessCreateAAIVfModule">
-        <dc:Bounds x="897" y="348" width="125" height="92" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_27" bpmnElement="SequenceFlow_27" sourceElement="_BPMNShape_ScriptTask_216" targetElement="_BPMNShape_ExclusiveGateway_211">
-        <di:waypoint xsi:type="dc:Point" x="1021" y="394" />
-        <di:waypoint xsi:type="dc:Point" x="1075" y="394" />
-        <di:waypoint xsi:type="dc:Point" x="1075" y="393" />
-        <di:waypoint xsi:type="dc:Point" x="1128" y="393" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1072" y="394" width="6" height="6" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_37" bpmnElement="SequenceFlow_37" sourceElement="_BPMNShape_ScriptTask_215" targetElement="_BPMNShape_ExclusiveGateway_212">
-        <di:waypoint xsi:type="dc:Point" x="1348" y="562" />
-        <di:waypoint xsi:type="dc:Point" x="1378" y="562" />
-        <di:waypoint xsi:type="dc:Point" x="1378" y="393" />
-        <di:waypoint xsi:type="dc:Point" x="1408" y="393" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_41" bpmnElement="SequenceFlow_41" sourceElement="_BPMNShape_ExclusiveGateway_212" targetElement="_BPMNShape_IntermediateThrowEvent_44">
-        <di:waypoint xsi:type="dc:Point" x="1458" y="393" />
-        <di:waypoint xsi:type="dc:Point" x="1497" y="393" />
-        <di:waypoint xsi:type="dc:Point" x="1497" y="392" />
-        <di:waypoint xsi:type="dc:Point" x="1537" y="392" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_218" bpmnElement="ScriptTask_setSuccess">
-        <dc:Bounds x="1933" y="831" width="128" height="95" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ScriptTask_218" targetElement="_BPMNShape_EndEvent_175">
-        <di:waypoint xsi:type="dc:Point" x="1933" y="878" />
-        <di:waypoint xsi:type="dc:Point" x="1844" y="877" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1889" y="862.5" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_254" bpmnElement="QueryCloudRegion">
-        <dc:Bounds x="101" y="440" width="134" height="81" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_40" bpmnElement="SequenceFlow_40" sourceElement="_BPMNShape_ExclusiveGateway_90" targetElement="_BPMNShape_ScriptTask_254">
-        <di:waypoint xsi:type="dc:Point" x="169" y="418" />
-        <di:waypoint xsi:type="dc:Point" x="169" y="429" />
-        <di:waypoint xsi:type="dc:Point" x="168" y="429" />
-        <di:waypoint xsi:type="dc:Point" x="168" y="440" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="180" y="417" width="27" height="22" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_43" bpmnElement="SequenceFlow_43" sourceElement="_BPMNShape_ScriptTask_254" targetElement="_BPMNShape_ScriptTask_172">
-        <di:waypoint xsi:type="dc:Point" x="168" y="520" />
-        <di:waypoint xsi:type="dc:Point" x="168" y="524" />
-        <di:waypoint xsi:type="dc:Point" x="168" y="581" />
-        <di:waypoint xsi:type="dc:Point" x="208" y="581" />
-        <di:waypoint xsi:type="dc:Point" x="209" y="581" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="165" y="574" width="6" height="6" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_SubProcess_21" bpmnElement="SubProcess_1" isExpanded="true">
-        <dc:Bounds x="29" y="1197" width="405" height="203" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_55" bpmnElement="StartEvent_2">
-        <dc:Bounds x="58" y="1281" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="76" y="1322" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_181" bpmnElement="EndEvent_2">
-        <dc:Bounds x="370" y="1281" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="388" y="1322" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_284" bpmnElement="ScriptTask_1">
-        <dc:Bounds x="165" y="1258" width="134" height="81" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_StartEvent_55" targetElement="_BPMNShape_ScriptTask_284">
-        <di:waypoint xsi:type="dc:Point" x="94" y="1299" />
-        <di:waypoint xsi:type="dc:Point" x="165" y="1298" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="118" y="1299" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_38" bpmnElement="SequenceFlow_38" sourceElement="_BPMNShape_ScriptTask_284" targetElement="_BPMNShape_EndEvent_181">
-        <di:waypoint xsi:type="dc:Point" x="299" y="1298" />
-        <di:waypoint xsi:type="dc:Point" x="370" y="1299" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="329" y="1298" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_156" bpmnElement="CreateAAIVfModule">
-        <dc:Bounds x="696" y="348" width="121" height="92" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_25" bpmnElement="SequenceFlow_25" sourceElement="_BPMNShape_ScriptTask_156" targetElement="_BPMNShape_ScriptTask_216">
-        <di:waypoint xsi:type="dc:Point" x="816" y="394" />
-        <di:waypoint xsi:type="dc:Point" x="897" y="394" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="857" y="369" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ExclusiveGateway_183x8vk_di" bpmnElement="ExclusiveGateway_183x8vk" isMarkerVisible="true">
-        <dc:Bounds x="1565.9780439121755" y="696" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1546" y="746" width="89" height="36" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1ushk1d_di" bpmnElement="SequenceFlow_1ushk1d">
-        <di:waypoint xsi:type="dc:Point" x="1513" y="720" />
-        <di:waypoint xsi:type="dc:Point" x="1566" y="721" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1540" y="705.5" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0ery1pk_di" bpmnElement="SequenceFlow_0ery1pk">
-        <di:waypoint xsi:type="dc:Point" x="1591" y="696" />
-        <di:waypoint xsi:type="dc:Point" x="1591" y="616" />
-        <di:waypoint xsi:type="dc:Point" x="1621" y="616" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1558" y="658" width="18" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0xfanpi_di" bpmnElement="SequenceFlow_0xfanpi">
-        <di:waypoint xsi:type="dc:Point" x="1616" y="721" />
-        <di:waypoint xsi:type="dc:Point" x="1771" y="719" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1688" y="695" width="12" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0abffyj_di" bpmnElement="SequenceFlow_0abffyj">
-        <di:waypoint xsi:type="dc:Point" x="1721" y="616" />
-        <di:waypoint xsi:type="dc:Point" x="1746" y="616" />
-        <di:waypoint xsi:type="dc:Point" x="1746" y="719" />
-        <di:waypoint xsi:type="dc:Point" x="1771" y="719" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1761" y="667.5" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ScriptTask_1dv7amn_di" bpmnElement="CreateNetworkPoliciesInAAI">
-        <dc:Bounds x="1621" y="576" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ExclusiveGateway_0f54imv_di" bpmnElement="ExclusiveGateway_0f54imv" isMarkerVisible="true">
-        <dc:Bounds x="114.59500000000003" y="854" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="101" y="819" width="77" height="24" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ExclusiveGateway_1edqxlf_di" bpmnElement="ExclusiveGateway_1edqxlf" isMarkerVisible="true">
-        <dc:Bounds x="482.595" y="854" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="508" y="904" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_0bi38s7_di" bpmnElement="SequenceFlow_0bi38s7">
-        <di:waypoint xsi:type="dc:Point" x="140" y="904" />
-        <di:waypoint xsi:type="dc:Point" x="140" y="1057" />
-        <di:waypoint xsi:type="dc:Point" x="193" y="1057" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="146" y="980.5" width="18" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_1qm81ym_di" bpmnElement="SequenceFlow_1qm81ym">
-        <di:waypoint xsi:type="dc:Point" x="293" y="1057" />
-        <di:waypoint xsi:type="dc:Point" x="329" y="1057" />
-        <di:waypoint xsi:type="dc:Point" x="329" y="1057" />
-        <di:waypoint xsi:type="dc:Point" x="365" y="1057" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="344" y="1057" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_112los9_di" bpmnElement="SequenceFlow_112los9">
-        <di:waypoint xsi:type="dc:Point" x="465" y="1057" />
-        <di:waypoint xsi:type="dc:Point" x="508" y="1057" />
-        <di:waypoint xsi:type="dc:Point" x="508" y="904" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="487" y="1042" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_1k5uku2_di" bpmnElement="SequenceFlow_1k5uku2">
-        <di:waypoint xsi:type="dc:Point" x="165" y="879" />
-        <di:waypoint xsi:type="dc:Point" x="483" y="879" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="318" y="864" width="12" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_1avfxsz_di" bpmnElement="SequenceFlow_1avfxsz">
-        <di:waypoint xsi:type="dc:Point" x="533" y="879" />
-        <di:waypoint xsi:type="dc:Point" x="571" y="879" />
-        <di:waypoint xsi:type="dc:Point" x="571" y="879" />
-        <di:waypoint xsi:type="dc:Point" x="609" y="879" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="586" y="879" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0363dz7_di" bpmnElement="SequenceFlow_0363dz7">
-        <di:waypoint xsi:type="dc:Point" x="60" y="878" />
-        <di:waypoint xsi:type="dc:Point" x="115" y="879" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="88" y="853.5" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ScriptTask_0o3bcyq_di" bpmnElement="PreProcessUpdateAAIGenericVnf">
-        <dc:Bounds x="193" y="1018" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="CallActivity_0j45ic9_di" bpmnElement="UpdateAAIGenericVNFTask">
-        <dc:Bounds x="365" y="1017" width="100" height="80" />
-      </bpmndi:BPMNShape>
-    </bpmndi:BPMNPlane>
-  </bpmndi:BPMNDiagram>
+<?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="_pNTO8MRhEeWv36YLr7PC3Q" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">

+  <bpmn2:process id="DoCreateVfModule" name="DoCreateVfModule" isExecutable="true">

+    <bpmn2:startEvent id="StartEvent_1" name="Start">

+      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>

+    </bpmn2:startEvent>

+    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="PreProcessRequest" />

+    <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_1" name="DoCreateVfModule">

+      <bpmn2:outgoing>SequenceFlow_15</bpmn2:outgoing>

+      <bpmn2:linkEventDefinition id="_LinkEventDefinition_26" name="DoCreateVfModule" />

+    </bpmn2:intermediateCatchEvent>

+    <bpmn2:sequenceFlow id="SequenceFlow_15" name="" sourceRef="IntermediateCatchEvent_1" targetRef="IsVolumeGroupIdSpecified" />

+    <bpmn2:exclusiveGateway id="IsVolumeGroupIdSpecified" name="Is volume_group_id specified?" default="SequenceFlow_11">

+      <bpmn2:incoming>SequenceFlow_15</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_11</bpmn2:outgoing>

+      <bpmn2:outgoing>SequenceFlow_40</bpmn2:outgoing>

+    </bpmn2:exclusiveGateway>

+    <bpmn2:sequenceFlow id="SequenceFlow_11" name="no" sourceRef="IsVolumeGroupIdSpecified" targetRef="ExclusiveGateway_4" />

+    <bpmn2:callActivity id="ConfirmVolumeGroupTenant" name="Confirm Volume Group Tenant" calledElement="ConfirmVolumeGroupTenant">

+      <bpmn2:extensionElements>

+        <camunda:in source="DCVFM_volumeGroupId" target="volumeGroupId" />

+        <camunda:in source="DCVFM_tenantId" target="tenantId" />

+        <camunda:in source="DCVFM_cloudRegionForVolume" target="aicCloudRegion" />

+        <camunda:in source="mso-request-id" target="mso-request-id" />

+        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />

+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />

+        <camunda:out source="ConfirmVolumeGroupTenantResponse" target="DCVFM_volumeGroupStackId" />

+        <camunda:out source="WorkflowException" target="WorkflowException" />

+      </bpmn2:extensionElements>

+      <bpmn2:incoming>SequenceFlow_43</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_17</bpmn2:outgoing>

+    </bpmn2:callActivity>

+    <bpmn2:sequenceFlow id="SequenceFlow_17" name="" sourceRef="ConfirmVolumeGroupTenant" targetRef="IsVolumeGroupNameSpecified" />

+    <bpmn2:exclusiveGateway id="IsVolumeGroupNameSpecified" name="Is volume_group_name specified?" default="SequenceFlow_21">

+      <bpmn2:incoming>SequenceFlow_17</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_19</bpmn2:outgoing>

+      <bpmn2:outgoing>SequenceFlow_21</bpmn2:outgoing>

+    </bpmn2:exclusiveGateway>

+    <bpmn2:sequenceFlow id="SequenceFlow_19" name="yes" sourceRef="IsVolumeGroupNameSpecified" targetRef="ConfirmVolumeName">

+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def doCreateVfModule = new DoCreateVfModule()

+return doCreateVfModule.isVolumeGroupNamePresent(execution)]]></bpmn2:conditionExpression>

+    </bpmn2:sequenceFlow>

+    <bpmn2:sequenceFlow id="SequenceFlow_21" name="no" sourceRef="IsVolumeGroupNameSpecified" targetRef="ExclusiveGateway_4" />

+    <bpmn2:callActivity id="ConfirmVolumeName" name="Confirm Volume Group Name" calledElement="ConfirmVolumeGroupName">

+      <bpmn2:extensionElements>

+        <camunda:in source="DCVFM_volumeGroupId" target="ConfirmVolumeGroupName_volumeGroupId" />

+        <camunda:in source="DCVFM_volumeGroupName" target="ConfirmVolumeGroupName_volumeGroupName" />

+        <camunda:in source="DCVFM_cloudRegionForVolume" target="ConfirmVolumeGroupName_aicCloudRegion" />

+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />

+        <camunda:out source="WorkflowException" target="WorkflowException" />

+        <camunda:out source="WorkflowResponse" target="DCVM_confirmResponse" />

+      </bpmn2:extensionElements>

+      <bpmn2:incoming>SequenceFlow_19</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_35</bpmn2:outgoing>

+    </bpmn2:callActivity>

+    <bpmn2:sequenceFlow id="SequenceFlow_35" name="" sourceRef="ConfirmVolumeName" targetRef="ExclusiveGateway_4" />

+    <bpmn2:exclusiveGateway id="ExclusiveGateway_4">

+      <bpmn2:incoming>SequenceFlow_11</bpmn2:incoming>

+      <bpmn2:incoming>SequenceFlow_21</bpmn2:incoming>

+      <bpmn2:incoming>SequenceFlow_35</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing>

+    </bpmn2:exclusiveGateway>

+    <bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="ExclusiveGateway_4" targetRef="CreateAAIVfModule" />

+    <bpmn2:callActivity id="CallSDNCAdapterVDModuleTopologyAssign" name="Call SDNC Adapter: VF Module Topology Assign" calledElement="sdncAdapter">

+      <bpmn2:extensionElements>

+        <camunda:in source="DCVFM_assignSDNCRequest" target="sdncAdapterWorkflowRequest" />

+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />

+        <camunda:in source="mso-request-id" target="mso-request-id" />

+        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />

+        <camunda:out source="WorkflowException" target="WorkflowException" />

+        <camunda:out source="sdncAdapterResponse" target="DCVFM_assignSDNCAdapterResponse" />

+        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />

+      </bpmn2:extensionElements>

+      <bpmn2:incoming>SequenceFlow_18</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_20</bpmn2:outgoing>

+    </bpmn2:callActivity>

+    <bpmn2:scriptTask id="PostProcessSDNCAssignRequest" name="PostProcess SDNC Assign  Request" scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_20</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_22</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+

+String response = execution.getVariable("DCVFM_assignSDNCAdapterResponse")

+

+def doCreateVfModule = new DoCreateVfModule()

+doCreateVfModule.validateSDNCResponse(execution, response, "assign")]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:scriptTask id="PreProcessSDNCAssignRequest" name="PreProcess SDNC Assign Request" scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_8</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_18</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def doCreateVfModule = new DoCreateVfModule()

+doCreateVfModule.preProcessSDNCAssignRequest(execution)]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:sequenceFlow id="SequenceFlow_18" name="" sourceRef="PreProcessSDNCAssignRequest" targetRef="CallSDNCAdapterVDModuleTopologyAssign" />

+    <bpmn2:sequenceFlow id="SequenceFlow_20" name="" sourceRef="CallSDNCAdapterVDModuleTopologyAssign" targetRef="PostProcessSDNCAssignRequest" />

+    <bpmn2:scriptTask id="PreProcessSDNCGetRequest" name="PreProcess SDNC GET Request" scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_22</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_23</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def doCreateVfModule = new DoCreateVfModule()

+doCreateVfModule.preProcessSDNCGetRequest(execution, "vfmodule")]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:callActivity id="CallSDNCAdapterVFModuleTopologyGET" name="Call SDNC Adapter: VF Module Topology GET" calledElement="sdncAdapter">

+      <bpmn2:extensionElements>

+        <camunda:in source="DCVFM_getSDNCRequest" target="sdncAdapterWorkflowRequest" />

+        <camunda:in source="mso-request-id" target="mso-request-id" />

+        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />

+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />

+        <camunda:out source="WorkflowException" target="WorkflowException" />

+        <camunda:out source="sdncAdapterResponse" target="DCVFM_getSDNCAdapterResponse" />

+        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />

+      </bpmn2:extensionElements>

+      <bpmn2:incoming>SequenceFlow_23</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_24</bpmn2:outgoing>

+    </bpmn2:callActivity>

+    <bpmn2:sequenceFlow id="SequenceFlow_22" name="" sourceRef="PostProcessSDNCAssignRequest" targetRef="PreProcessSDNCGetRequest" />

+    <bpmn2:sequenceFlow id="SequenceFlow_23" name="" sourceRef="PreProcessSDNCGetRequest" targetRef="CallSDNCAdapterVFModuleTopologyGET" />

+    <bpmn2:sequenceFlow id="SequenceFlow_24" name="" sourceRef="CallSDNCAdapterVFModuleTopologyGET" targetRef="PostProcessSDNCGetRequest" />

+    <bpmn2:scriptTask id="PostProcessSDNCGetRequest" name="PostProcess SDNC GET Request" scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_24</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_31</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+

+String response = execution.getVariable("DCVFM_getSDNCAdapterResponse")

+

+def doCreateVfModule = new DoCreateVfModule()

+doCreateVfModule.validateSDNCResponse(execution, response, "get")]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:callActivity id="UpdateAAIVfModule_1" name="UpdateAAIVfModule" calledElement="UpdateAAIVfModule">

+      <bpmn2:extensionElements>

+        <camunda:in source="DCVFM_updateAAIVfModuleRequest" target="UpdateAAIVfModuleRequest" />

+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />

+        <camunda:out source="WorkflowException" target="WorkflowException" />

+        <camunda:out source="WorkflowResponse" target="DCVM_updateAAIVfModuleResponse" />

+      </bpmn2:extensionElements>

+      <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_10</bpmn2:outgoing>

+    </bpmn2:callActivity>

+    <bpmn2:scriptTask id="PreProcessUpdateAAIVfModule_1" name="PreProcess Update AAIVfModule" scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_1avfxsz</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def doCreateVfModule = new DoCreateVfModule()

+doCreateVfModule.preProcessUpdateAAIVfModuleRequestOrch(execution)]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:scriptTask id="PreProcessSDNCActivateRequest" name="PreProcess SDNC Activate Request" scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_10</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_12</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def doCreateVfModule = new DoCreateVfModule()

+doCreateVfModule.preProcessSDNCActivateRequest(execution)]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:callActivity id="CallSDNCAdapterVFModuleTopologyActivate" name="Call SDNC Adapter: VF Module Topology Activate" calledElement="sdncAdapter">

+      <bpmn2:extensionElements>

+        <camunda:in source="DCVFM_activateSDNCRequest" target="sdncAdapterWorkflowRequest" />

+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />

+        <camunda:in source="mso-request-id" target="mso-request-id" />

+        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />

+        <camunda:out source="WorkflowException" target="WorkflowException" />

+        <camunda:out source="sdncAdapterResponse" target="DCVFM_activateSDNCAdapterResponse" />

+        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />

+      </bpmn2:extensionElements>

+      <bpmn2:incoming>SequenceFlow_12</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_13</bpmn2:outgoing>

+    </bpmn2:callActivity>

+    <bpmn2:scriptTask id="PostProcessSDNCActivateRequest" name="PostProcess SDNC Activate Request" scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_13</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+      

+      String response = execution.getVariable("DCVFM_activateSDNCAdapterResponse")

+      

+def doCreateVfModule = new DoCreateVfModule()

+doCreateVfModule.validateSDNCResponse(execution, response, "activate")]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:exclusiveGateway id="ExclusiveGateway_5" name="Is volume_group_id specified?" default="SequenceFlow_30">

+      <bpmn2:incoming>SequenceFlow_14</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_28</bpmn2:outgoing>

+      <bpmn2:outgoing>SequenceFlow_30</bpmn2:outgoing>

+    </bpmn2:exclusiveGateway>

+    <bpmn2:sequenceFlow id="SequenceFlow_28" name="yes" sourceRef="ExclusiveGateway_5" targetRef="PrepareCreateAAIVfModuleVolumeGroupRequest">

+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def doCreateVfModule = new DoCreateVfModule()

+return doCreateVfModule.isVolumeGroupIdPresent(execution)]]></bpmn2:conditionExpression>

+    </bpmn2:sequenceFlow>

+    <bpmn2:sequenceFlow id="SequenceFlow_30" name="no" sourceRef="ExclusiveGateway_5" targetRef="ExclusiveGateway_6" />

+    <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="PreProcessUpdateAAIVfModule_1" targetRef="UpdateAAIVfModule_1" />

+    <bpmn2:sequenceFlow id="SequenceFlow_10" name="" sourceRef="UpdateAAIVfModule_1" targetRef="PreProcessSDNCActivateRequest" />

+    <bpmn2:sequenceFlow id="SequenceFlow_12" name="" sourceRef="PreProcessSDNCActivateRequest" targetRef="CallSDNCAdapterVFModuleTopologyActivate" />

+    <bpmn2:sequenceFlow id="SequenceFlow_13" name="" sourceRef="CallSDNCAdapterVFModuleTopologyActivate" targetRef="PostProcessSDNCActivateRequest" />

+    <bpmn2:sequenceFlow id="SequenceFlow_14" name="" sourceRef="PostProcessSDNCActivateRequest" targetRef="ExclusiveGateway_5" />

+    <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_3" name="UpdateAndActivate">

+      <bpmn2:outgoing>SequenceFlow_0363dz7</bpmn2:outgoing>

+      <bpmn2:linkEventDefinition id="_LinkEventDefinition_30" name="UpdateAndActivate" />

+    </bpmn2:intermediateCatchEvent>

+    <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_2" name="Provision">

+      <bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing>

+      <bpmn2:linkEventDefinition id="_LinkEventDefinition_29" name="Provision" />

+    </bpmn2:intermediateCatchEvent>

+    <bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="IntermediateCatchEvent_2" targetRef="PreProcessSDNCAssignRequest" />

+    <bpmn2:scriptTask id="PrepareCreateAAIVfModuleVolumeGroupRequest" name="Prepare CreateAAIVfModuleVolumeGroup Request" scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_28</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def doCreateVfModule = new DoCreateVfModule()

+doCreateVfModule.prepareCreateAAIVfModuleVolumeGroupRequest(execution)]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:callActivity id="CreateAAIVfModuleVolumeGroup" name="CreateAAIVfModuleVolumeGroup" calledElement="CreateAAIVfModuleVolumeGroup">

+      <bpmn2:extensionElements>

+        <camunda:in source="DCVFM_createAAIVfModuleVolumeGroupRequest" target="CreateAAIVfModuleVolumeGroupRequest" />

+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />

+        <camunda:out source="WorkflowException" target="WorkflowException" />

+        <camunda:out source="WorkflowResponse" target="DCVM_updateAAIVfModuleResponse" />

+      </bpmn2:extensionElements>

+      <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_29</bpmn2:outgoing>

+    </bpmn2:callActivity>

+    <bpmn2:sequenceFlow id="SequenceFlow_29" name="" sourceRef="CreateAAIVfModuleVolumeGroup" targetRef="ExclusiveGateway_6" />

+    <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="PrepareCreateAAIVfModuleVolumeGroupRequest" targetRef="CreateAAIVfModuleVolumeGroup" />

+    <bpmn2:exclusiveGateway id="ExclusiveGateway_6">

+      <bpmn2:incoming>SequenceFlow_30</bpmn2:incoming>

+      <bpmn2:incoming>SequenceFlow_29</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_16</bpmn2:outgoing>

+    </bpmn2:exclusiveGateway>

+    <bpmn2:sequenceFlow id="SequenceFlow_16" name="" sourceRef="ExclusiveGateway_6" targetRef="ScriptTask_setSuccess" />

+    <bpmn2:scriptTask id="PreProcessVNFAdapterRequest" name="PreProcess VNF Adapter Request" scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_31</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_32</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def doCreateVfModule = new DoCreateVfModule()

+doCreateVfModule.preProcessVNFAdapterRequest(execution)]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:callActivity id="CallVNFAdapterVFModuleCreate" name="Call VNF Adapter to create VF Module" calledElement="vnfAdapterRestV1">

+      <bpmn2:extensionElements>

+        <camunda:in source="DCVFM_createVnfARequest" target="vnfAdapterRestV1Request" />

+        <camunda:out source="vnfAdapterRestV1Response" target="DCVFM_createVnfAResponse" />

+        <camunda:in source="mso-request-id" target="mso-request-id" />

+        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />

+        <camunda:in variables="all" />

+        <camunda:out source="WorkflowException" target="WorkflowException" />

+      </bpmn2:extensionElements>

+      <bpmn2:incoming>SequenceFlow_32</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_33</bpmn2:outgoing>

+    </bpmn2:callActivity>

+    <bpmn2:scriptTask id="PostProcessVNFAdapterRequest" name="PostProcess VNF Adapter Request" scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_33</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_1ushk1d</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def doCreateVfModule = new DoCreateVfModule()

+doCreateVfModule.postProcessVNFAdapterRequest(execution)]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_2" name="To UpdateAndActivate">

+      <bpmn2:incoming>SequenceFlow_0xfanpi</bpmn2:incoming>

+      <bpmn2:incoming>SequenceFlow_0abffyj</bpmn2:incoming>

+      <bpmn2:linkEventDefinition id="_LinkEventDefinition_31" name="UpdateAndActivate" />

+    </bpmn2:intermediateThrowEvent>

+    <bpmn2:sequenceFlow id="SequenceFlow_31" name="" sourceRef="PostProcessSDNCGetRequest" targetRef="PreProcessVNFAdapterRequest" />

+    <bpmn2:sequenceFlow id="SequenceFlow_32" name="" sourceRef="PreProcessVNFAdapterRequest" targetRef="CallVNFAdapterVFModuleCreate" />

+    <bpmn2:sequenceFlow id="SequenceFlow_33" name="" sourceRef="CallVNFAdapterVFModuleCreate" targetRef="PostProcessVNFAdapterRequest" />

+    <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_3" name="To Provision">

+      <bpmn2:incoming>SequenceFlow_0zcfn2x</bpmn2:incoming>

+      <bpmn2:incoming>SequenceFlow_170kw7h</bpmn2:incoming>

+      <bpmn2:linkEventDefinition id="_LinkEventDefinition_28" name="Provision" />

+    </bpmn2:intermediateThrowEvent>

+    <bpmn2:exclusiveGateway id="ExclusiveGateway_2" name="Need to query SDNC for VNF Topology?" default="SequenceFlow_0zcfn2x">

+      <bpmn2:incoming>SequenceFlow_39</bpmn2:incoming>

+      <bpmn2:incoming>SequenceFlow_37</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_0zcfn2x</bpmn2:outgoing>

+      <bpmn2:outgoing>SequenceFlow_0m382su</bpmn2:outgoing>

+    </bpmn2:exclusiveGateway>

+    <bpmn2:scriptTask id="PostProcessCreateAAIVfModule" name="PostProcess CreateAAIVfModule" scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_25</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_27</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def doCreateVfModule = new DoCreateVfModule()

+doCreateVfModule.postProcessCreateAAIVfModule(execution)]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:sequenceFlow id="SequenceFlow_27" name="" sourceRef="PostProcessCreateAAIVfModule" targetRef="IsBaseVfModule" />

+    <bpmn2:exclusiveGateway id="IsBaseVfModule" name="Is Base VF Module?" default="SequenceFlow_36">

+      <bpmn2:incoming>SequenceFlow_27</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_36</bpmn2:outgoing>

+      <bpmn2:outgoing>SequenceFlow_39</bpmn2:outgoing>

+    </bpmn2:exclusiveGateway>

+    <bpmn2:sequenceFlow id="SequenceFlow_36" name="no" sourceRef="IsBaseVfModule" targetRef="QueryAAIVfModule" />

+    <bpmn2:sequenceFlow id="SequenceFlow_39" name="yes" sourceRef="IsBaseVfModule" targetRef="ExclusiveGateway_2">

+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable("DCVFM_isBaseVfModule") == "true"]]></bpmn2:conditionExpression>

+    </bpmn2:sequenceFlow>

+    <bpmn2:scriptTask id="QueryAAIVfModule" name="Query AAI Vf Module" scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_36</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_37</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def doCreateVfModule = new DoCreateVfModule()

+doCreateVfModule.queryAAIVfModule(execution)]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:sequenceFlow id="SequenceFlow_37" name="" sourceRef="QueryAAIVfModule" targetRef="ExclusiveGateway_2" />

+    <bpmn2:scriptTask id="ScriptTask_setSuccess" name="Set Success Indicator" scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_16</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def doCreateVfModule = new DoCreateVfModule()

+doCreateVfModule.setSuccessIndicator(execution, true)]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="ScriptTask_setSuccess" targetRef="EndEvent_1" />

+    <bpmn2:endEvent id="EndEvent_1">

+      <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>

+      <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_8" />

+    </bpmn2:endEvent>

+    <bpmn2:scriptTask id="QueryCloudRegion" name="Query Cloud Region" scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_40</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_43</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def doCreateVfModule = new DoCreateVfModule()

+return doCreateVfModule.queryCloudRegion(execution)]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:sequenceFlow id="SequenceFlow_40" name="yes" sourceRef="IsVolumeGroupIdSpecified" targetRef="QueryCloudRegion">

+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def doCreateVfModule = new DoCreateVfModule()

+return doCreateVfModule.isVolumeGroupIdPresent(execution)]]></bpmn2:conditionExpression>

+    </bpmn2:sequenceFlow>

+    <bpmn2:sequenceFlow id="SequenceFlow_43" name="" sourceRef="QueryCloudRegion" targetRef="ConfirmVolumeGroupTenant" />

+    <bpmn2:subProcess id="SubProcess_1" name="Error Handling Sub Process" triggeredByEvent="true">

+      <bpmn2:scriptTask id="ScriptTask_1" name="Process Error" scriptFormat="groovy">

+        <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming>

+        <bpmn2:outgoing>SequenceFlow_38</bpmn2:outgoing>

+        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def doCreateVfModule = new DoCreateVfModule()

+doCreateVfModule.processBPMNException(execution)]]></bpmn2:script>

+      </bpmn2:scriptTask>

+      <bpmn2:sequenceFlow id="SequenceFlow_38" name="" sourceRef="ScriptTask_1" targetRef="EndEvent_2" />

+      <bpmn2:startEvent id="StartEvent_2">

+        <bpmn2:outgoing>SequenceFlow_9</bpmn2:outgoing>

+        <bpmn2:errorEventDefinition id="ErrorEventDefinition_1" />

+      </bpmn2:startEvent>

+      <bpmn2:sequenceFlow id="SequenceFlow_9" name="" sourceRef="StartEvent_2" targetRef="ScriptTask_1" />

+      <bpmn2:endEvent id="EndEvent_2">

+        <bpmn2:incoming>SequenceFlow_38</bpmn2:incoming>

+      </bpmn2:endEvent>

+    </bpmn2:subProcess>

+    <bpmn2:scriptTask id="PreProcessRequest" name="Pre-Process Request" scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def doCreateVfModule = new DoCreateVfModule()

+doCreateVfModule.preProcessRequest(execution)]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="PreProcessRequest" targetRef="ExclusiveGateway_0ffvqla" />

+    <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_1" name="To DoCreateVfModule">

+      <bpmn2:incoming>SequenceFlow_1f53tby</bpmn2:incoming>

+      <bpmn2:incoming>SequenceFlow_0270n5c</bpmn2:incoming>

+      <bpmn2:linkEventDefinition id="_LinkEventDefinition_25" name="DoCreateVfModule" />

+    </bpmn2:intermediateThrowEvent>

+    <bpmn2:callActivity id="CreateAAIVfModule" name="CreateAAIVfModule" calledElement="CreateAAIVfModule">

+      <bpmn2:extensionElements>

+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />

+        <camunda:in source="isVidRequest" target="isVidRequest" />

+        <camunda:in source="newVfModuleId" target="newVfModuleId" />

+        <camunda:out source="WorkflowException" target="WorkflowException" />

+        <camunda:out source="CreateAAIVfModuleResponse" target="DCVFM_createVfModuleResponse" />

+        <camunda:in source="DCVFM_vnfId" target="vnfId" />

+        <camunda:in source="DCVFM_vnfName" target="vnfName" />

+        <camunda:in source="DCVFM_vnfType" target="vnfType" />

+        <camunda:in source="DCVFM_serviceId" target="serviceId" />

+        <camunda:in source="DCVFM_personaModelId" target="personaModelId" />

+        <camunda:in source="DCVFM_isBaseVfModule" target="isBaseVfModule" />

+        <camunda:in source="DCVFM_vfModuleName" target="vfModuleName" />

+        <camunda:in source="DCVFM_vfModuleModelName" target="vfModuleModelName" />

+        <camunda:in source="DCVFM_personaModelVersion" target="personaModelVersion" />

+        <camunda:in source="DCVFM_modelCustomizationUuid" target="modelCustomizationId" />

+      </bpmn2:extensionElements>

+      <bpmn2:incoming>SequenceFlow_6</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_25</bpmn2:outgoing>

+    </bpmn2:callActivity>

+    <bpmn2:sequenceFlow id="SequenceFlow_25" name="" sourceRef="CreateAAIVfModule" targetRef="PostProcessCreateAAIVfModule" />

+    <bpmn2:exclusiveGateway id="ExclusiveGateway_183x8vk" name="need to create network policies in AAI?" default="SequenceFlow_0xfanpi">

+      <bpmn2:incoming>SequenceFlow_1ushk1d</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_0ery1pk</bpmn2:outgoing>

+      <bpmn2:outgoing>SequenceFlow_0xfanpi</bpmn2:outgoing>

+    </bpmn2:exclusiveGateway>

+    <bpmn2:sequenceFlow id="SequenceFlow_1ushk1d" sourceRef="PostProcessVNFAdapterRequest" targetRef="ExclusiveGateway_183x8vk" />

+    <bpmn2:sequenceFlow id="SequenceFlow_0ery1pk" name="yes" sourceRef="ExclusiveGateway_183x8vk" targetRef="CreateNetworkPoliciesInAAI">

+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable("DCVFM_contrailNetworkPolicyFqdnList") != null && !execution.getVariable("DCVFM_contrailNetworkPolicyFqdnList").isEmpty()]]></bpmn2:conditionExpression>

+    </bpmn2:sequenceFlow>

+    <bpmn2:sequenceFlow id="SequenceFlow_0xfanpi" name="no" sourceRef="ExclusiveGateway_183x8vk" targetRef="IntermediateThrowEvent_2" />

+    <bpmn2:sequenceFlow id="SequenceFlow_0abffyj" sourceRef="CreateNetworkPoliciesInAAI" targetRef="IntermediateThrowEvent_2" />

+    <bpmn2:scriptTask id="CreateNetworkPoliciesInAAI" name="Create Network Policies In AAI" scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_0ery1pk</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_0abffyj</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def doCreateVfModule = new DoCreateVfModule()

+doCreateVfModule.createNetworkPoliciesInAAI(execution)]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:exclusiveGateway id="ExclusiveGateway_0f54imv" name="need to update VNF in AAI?" default="SequenceFlow_1k5uku2">

+      <bpmn2:incoming>SequenceFlow_0363dz7</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_0bi38s7</bpmn2:outgoing>

+      <bpmn2:outgoing>SequenceFlow_1k5uku2</bpmn2:outgoing>

+    </bpmn2:exclusiveGateway>

+    <bpmn2:exclusiveGateway id="ExclusiveGateway_1edqxlf">

+      <bpmn2:incoming>SequenceFlow_112los9</bpmn2:incoming>

+      <bpmn2:incoming>SequenceFlow_1k5uku2</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_1avfxsz</bpmn2:outgoing>

+    </bpmn2:exclusiveGateway>

+    <bpmn2:sequenceFlow id="SequenceFlow_0bi38s7" name="yes" sourceRef="ExclusiveGateway_0f54imv" targetRef="PreProcessUpdateAAIGenericVnf">

+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[!execution.getVariable("DCVFM_oamManagementV4Address").isEmpty() || !execution.getVariable("DCVFM_oamManagementV6Address").isEmpty()]]></bpmn2:conditionExpression>

+    </bpmn2:sequenceFlow>

+    <bpmn2:sequenceFlow id="SequenceFlow_1qm81ym" sourceRef="PreProcessUpdateAAIGenericVnf" targetRef="UpdateAAIGenericVNFTask" />

+    <bpmn2:sequenceFlow id="SequenceFlow_112los9" sourceRef="UpdateAAIGenericVNFTask" targetRef="ExclusiveGateway_1edqxlf" />

+    <bpmn2:sequenceFlow id="SequenceFlow_1k5uku2" name="no" sourceRef="ExclusiveGateway_0f54imv" targetRef="ExclusiveGateway_1edqxlf" />

+    <bpmn2:sequenceFlow id="SequenceFlow_1avfxsz" sourceRef="ExclusiveGateway_1edqxlf" targetRef="PreProcessUpdateAAIVfModule_1" />

+    <bpmn2:sequenceFlow id="SequenceFlow_0363dz7" sourceRef="IntermediateCatchEvent_3" targetRef="ExclusiveGateway_0f54imv" />

+    <bpmn2:scriptTask id="PreProcessUpdateAAIGenericVnf" name="PreProcess Update AAI Generic VNF" scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_0bi38s7</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_1qm81ym</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def doCreateVfModule = new DoCreateVfModule()

+doCreateVfModule.prepUpdateAAIGenericVnf(execution)]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:callActivity id="UpdateAAIGenericVNFTask" name="Update AAI Generic VNF" calledElement="UpdateAAIGenericVnf">

+      <bpmn2:extensionElements>

+        <camunda:in source="DCVM_updateAAIGenericVnfRequest" target="UpdateAAIGenericVnfRequest" />

+        <camunda:in source="mso-request-id" target="mso-request-id" />

+        <camunda:in source="mso-service-id" target="mso-service-id" />

+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />

+        <camunda:out source="WorkflowException" target="WorkflowException" />

+      </bpmn2:extensionElements>

+      <bpmn2:incoming>SequenceFlow_1qm81ym</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_112los9</bpmn2:outgoing>

+    </bpmn2:callActivity>

+    <bpmn2:sequenceFlow id="SequenceFlow_0zcfn2x" name="no" sourceRef="ExclusiveGateway_2" targetRef="IntermediateThrowEvent_3" />

+    <bpmn2:sequenceFlow id="SequenceFlow_0m382su" name="yes" sourceRef="ExclusiveGateway_2" targetRef="QueryVNF">

+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFM_sdncVersion" ) == '1707'}]]></bpmn2:conditionExpression>

+    </bpmn2:sequenceFlow>

+    <bpmn2:sequenceFlow id="SequenceFlow_0g270u0" sourceRef="PreProcessSDNCVnfGetRequest" targetRef="CallSDNCAdapterVNFTopologyGET" />

+    <bpmn2:sequenceFlow id="SequenceFlow_1yrlvgb" sourceRef="CallSDNCAdapterVNFTopologyGET" targetRef="PostProcessSDNCVnfGetRequest" />

+    <bpmn2:scriptTask id="PreProcessSDNCVnfGetRequest" name="PreProcess SDNC VNF Topology GET Request" scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_0d00zqi</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_0g270u0</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def doCreateVfModule = new DoCreateVfModule()

+doCreateVfModule.preProcessSDNCGetRequest(execution, 'vnf')]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:callActivity id="CallSDNCAdapterVNFTopologyGET" name="Call SDNC Adapter: VNF Topology GET" calledElement="sdncAdapter">

+      <bpmn2:extensionElements>

+        <camunda:in source="DCVFM_getSDNCRequest" target="sdncAdapterWorkflowRequest" />

+        <camunda:in source="mso-request-id" target="mso-request-id" />

+        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />

+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />

+        <camunda:out source="WorkflowException" target="WorkflowException" />

+        <camunda:out source="sdncAdapterResponse" target="DCVFM_getVnfSDNCAdapterResponse" />

+        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />

+      </bpmn2:extensionElements>

+      <bpmn2:incoming>SequenceFlow_0g270u0</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_1yrlvgb</bpmn2:outgoing>

+    </bpmn2:callActivity>

+    <bpmn2:scriptTask id="PostProcessSDNCVnfGetRequest" name="PostProcess SDNC VNF Toplogy GET request" scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_1yrlvgb</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_170kw7h</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+

+String response = execution.getVariable("DCVFM_getVnfSDNCAdapterResponse")

+

+def doCreateVfModule = new DoCreateVfModule()

+doCreateVfModule.validateSDNCResponse(execution, response, "get")]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:sequenceFlow id="SequenceFlow_0d00zqi" sourceRef="QueryVNF" targetRef="PreProcessSDNCVnfGetRequest" />

+    <bpmn2:sequenceFlow id="SequenceFlow_170kw7h" sourceRef="PostProcessSDNCVnfGetRequest" targetRef="IntermediateThrowEvent_3" />

+    <bpmn2:callActivity id="QueryVNF" name="Query VNF" calledElement="GenericGetVnf">

+      <bpmn2:extensionElements>

+        <camunda:in source="DCVFM_vnfId" target="GENGV_vnfId" />

+        <camunda:in source="DCVFM_vnfTypeToQuery" target="GENGV_type" />

+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />

+        <camunda:out source="GENGV_vnf" target="DCVFM_vnfQueryResponse" />

+        <camunda:out source="WorkflowException" target="WorkflowException" />

+      </bpmn2:extensionElements>

+      <bpmn2:incoming>SequenceFlow_0m382su</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_0d00zqi</bpmn2:outgoing>

+    </bpmn2:callActivity>

+    <bpmn2:sequenceFlow id="SequenceFlow_1f53tby" sourceRef="Task_0kuj2a1" targetRef="IntermediateThrowEvent_1" />

+    <bpmn2:exclusiveGateway id="ExclusiveGateway_0ffvqla" name="Is vf_module_name specified?" default="SequenceFlow_0270n5c">

+      <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_0270n5c</bpmn2:outgoing>

+      <bpmn2:outgoing>SequenceFlow_05og7iw</bpmn2:outgoing>

+    </bpmn2:exclusiveGateway>

+    <bpmn2:sequenceFlow id="SequenceFlow_0270n5c" name="yes" sourceRef="ExclusiveGateway_0ffvqla" targetRef="IntermediateThrowEvent_1" />

+    <bpmn2:sequenceFlow id="SequenceFlow_05og7iw" name="no" sourceRef="ExclusiveGateway_0ffvqla" targetRef="Task_0kuj2a1">

+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFM_vfModuleName") == null}]]></bpmn2:conditionExpression>

+    </bpmn2:sequenceFlow>

+    <bpmn2:callActivity id="Task_0kuj2a1" name="Generate VF Module Name" calledElement="GenerateVfModuleName">

+      <bpmn2:extensionElements>

+        <camunda:in source="DCVFM_vnfId" target="vnfId" />

+        <camunda:in source="DCVFM_vnfName" target="vnfName" />

+        <camunda:in source="DCVFM_vfModuleLabel" target="vfModuleLabel" />

+        <camunda:in source="DCVFM_pesonaModelId" target="personaModelId" />

+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />

+        <camunda:out source="WorkflowException" target="WorkflowException" />

+        <camunda:out source="vfModuleName" target="DCVFM_vfModuleName" />

+      </bpmn2:extensionElements>

+      <bpmn2:incoming>SequenceFlow_05og7iw</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_1f53tby</bpmn2:outgoing>

+    </bpmn2:callActivity>

+  </bpmn2:process>

+  <bpmn2:message id="Message_1" name="DoCreateVfModuleRequest" />

+  <bpmn2:error id="Error_1" name="MSOWorkflowException" errorCode="MSOWorkflowException" />

+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">

+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateVfModule">

+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_50" bpmnElement="StartEvent_1">

+        <dc:Bounds x="38" y="153" width="36" height="36" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="44" y="189" width="23" height="12" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_50" targetElement="_BPMNShape_ScriptTask_124">

+        <di:waypoint xsi:type="dc:Point" x="74" y="171" />

+        <di:waypoint xsi:type="dc:Point" x="147" y="171" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="99" y="171" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_124" bpmnElement="PreProcessRequest">

+        <dc:Bounds x="147" y="131" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_IntermediateCatchEvent_24" bpmnElement="IntermediateCatchEvent_1">

+        <dc:Bounds x="36" y="376" width="36" height="36" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="0" y="417" width="114" height="22" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_IntermediateThrowEvent_22" bpmnElement="IntermediateThrowEvent_1">

+        <dc:Bounds x="530" y="153" width="36" height="36" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="571" y="173" width="86" height="36" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_157" bpmnElement="CallSDNCAdapterVDModuleTopologyAssign">

+        <dc:Bounds x="266" y="672" width="121" height="94" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_158" bpmnElement="CallSDNCAdapterVFModuleTopologyGET">

+        <dc:Bounds x="744" y="670" width="133" height="97" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_90" bpmnElement="IsVolumeGroupIdSpecified" isMarkerVisible="true">

+        <dc:Bounds x="144" y="368" width="50" height="50" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="89" y="347" width="178" height="22" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_172" bpmnElement="ConfirmVolumeGroupTenant">

+        <dc:Bounds x="209" y="528" width="118" height="89" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_91" bpmnElement="ExclusiveGateway_4" isMarkerVisible="true">

+        <dc:Bounds x="559" y="368" width="50" height="50" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="584" y="423" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_11" sourceElement="_BPMNShape_ExclusiveGateway_90" targetElement="_BPMNShape_ExclusiveGateway_91">

+        <di:waypoint xsi:type="dc:Point" x="194" y="393" />

+        <di:waypoint xsi:type="dc:Point" x="559" y="393" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="209" y="393" width="20" height="22" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_173" bpmnElement="CallVNFAdapterVFModuleCreate">

+        <dc:Bounds x="1236" y="672" width="121" height="97" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_174" bpmnElement="UpdateAAIVfModule_1">

+        <dc:Bounds x="768" y="830" width="117" height="97" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_175" bpmnElement="CallSDNCAdapterVFModuleTopologyActivate">

+        <dc:Bounds x="1090" y="828" width="119" height="99" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_92" bpmnElement="ExclusiveGateway_5" isMarkerVisible="true">

+        <dc:Bounds x="1435" y="853" width="50" height="50" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1432" y="825" width="86" height="36" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_176" bpmnElement="CreateAAIVfModuleVolumeGroup">

+        <dc:Bounds x="1693" y="986" width="121" height="112" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_28" bpmnElement="SequenceFlow_28" sourceElement="_BPMNShape_ExclusiveGateway_92" targetElement="_BPMNShape_Task_7">

+        <di:waypoint xsi:type="dc:Point" x="1460" y="903" />

+        <di:waypoint xsi:type="dc:Point" x="1460" y="1042" />

+        <di:waypoint xsi:type="dc:Point" x="1520" y="1042" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1452" y="928" width="18" height="12" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_93" bpmnElement="ExclusiveGateway_6" isMarkerVisible="true">

+        <dc:Bounds x="1818" y="854" width="50" height="50" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1843" y="909" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_29" bpmnElement="SequenceFlow_29" sourceElement="_BPMNShape_ScriptTask_176" targetElement="_BPMNShape_ExclusiveGateway_93">

+        <di:waypoint xsi:type="dc:Point" x="1813" y="1042" />

+        <di:waypoint xsi:type="dc:Point" x="1843" y="1042" />

+        <di:waypoint xsi:type="dc:Point" x="1843" y="944" />

+        <di:waypoint xsi:type="dc:Point" x="1843" y="904" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1839" y="1042" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_30" bpmnElement="SequenceFlow_30" sourceElement="_BPMNShape_ExclusiveGateway_92" targetElement="_BPMNShape_ExclusiveGateway_93">

+        <di:waypoint xsi:type="dc:Point" x="1485" y="878" />

+        <di:waypoint xsi:type="dc:Point" x="1651" y="878" />

+        <di:waypoint xsi:type="dc:Point" x="1651" y="879" />

+        <di:waypoint xsi:type="dc:Point" x="1818" y="879" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1519" y="878" width="12" height="12" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_15" bpmnElement="SequenceFlow_15" sourceElement="_BPMNShape_IntermediateCatchEvent_24" targetElement="_BPMNShape_ExclusiveGateway_90">

+        <di:waypoint xsi:type="dc:Point" x="72" y="394" />

+        <di:waypoint xsi:type="dc:Point" x="120" y="394" />

+        <di:waypoint xsi:type="dc:Point" x="120" y="393" />

+        <di:waypoint xsi:type="dc:Point" x="144" y="393" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="117" y="394" width="6" height="6" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_101" bpmnElement="IsVolumeGroupNameSpecified" isMarkerVisible="true">

+        <dc:Bounds x="360" y="547" width="50" height="50" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="309" y="496" width="200" height="22" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_17" bpmnElement="SequenceFlow_17" sourceElement="_BPMNShape_ScriptTask_172" targetElement="_BPMNShape_ExclusiveGateway_101">

+        <di:waypoint xsi:type="dc:Point" x="327" y="572" />

+        <di:waypoint xsi:type="dc:Point" x="360" y="572" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="338" y="572" width="6" height="6" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="_BPMNShape_Task_3" bpmnElement="ConfirmVolumeName">

+        <dc:Bounds x="453" y="528" width="109" height="89" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_19" bpmnElement="SequenceFlow_19" sourceElement="_BPMNShape_ExclusiveGateway_101" targetElement="_BPMNShape_Task_3">

+        <di:waypoint xsi:type="dc:Point" x="410" y="572" />

+        <di:waypoint xsi:type="dc:Point" x="453" y="572" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="410" y="576" width="27" height="22" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_21" bpmnElement="SequenceFlow_21" sourceElement="_BPMNShape_ExclusiveGateway_101" targetElement="_BPMNShape_ExclusiveGateway_91">

+        <di:waypoint xsi:type="dc:Point" x="385" y="547" />

+        <di:waypoint xsi:type="dc:Point" x="385" y="393" />

+        <di:waypoint xsi:type="dc:Point" x="559" y="393" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="392" y="450" width="20" height="22" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_35" bpmnElement="SequenceFlow_35" sourceElement="_BPMNShape_Task_3" targetElement="_BPMNShape_ExclusiveGateway_91">

+        <di:waypoint xsi:type="dc:Point" x="561" y="572" />

+        <di:waypoint xsi:type="dc:Point" x="584" y="572" />

+        <di:waypoint xsi:type="dc:Point" x="584" y="418" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="581" y="492" width="6" height="6" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_ScriptTask_124" targetElement="_BPMNShape_IntermediateThrowEvent_22">

+        <di:waypoint xsi:type="dc:Point" x="247" y="171" />

+        <di:waypoint xsi:type="dc:Point" x="294" y="171" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="271" y="156" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_ExclusiveGateway_91" targetElement="_BPMNShape_ScriptTask_156">

+        <di:waypoint xsi:type="dc:Point" x="609" y="393" />

+        <di:waypoint xsi:type="dc:Point" x="628" y="393" />

+        <di:waypoint xsi:type="dc:Point" x="628" y="394" />

+        <di:waypoint xsi:type="dc:Point" x="696" y="394" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="636" y="394" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_178" bpmnElement="PreProcessSDNCAssignRequest">

+        <dc:Bounds x="109" y="674" width="121" height="94" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_179" bpmnElement="PostProcessSDNCAssignRequest">

+        <dc:Bounds x="435" y="674" width="121" height="94" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_IntermediateThrowEvent_44" bpmnElement="IntermediateThrowEvent_3">

+        <dc:Bounds x="2193" y="376" width="36" height="36" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="2181" y="417" width="60" height="12" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_IntermediateCatchEvent_29" bpmnElement="IntermediateCatchEvent_2">

+        <dc:Bounds x="24" y="706" width="36" height="36" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="13" y="747" width="58" height="22" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_IntermediateCatchEvent_29" targetElement="_BPMNShape_ScriptTask_178">

+        <di:waypoint xsi:type="dc:Point" x="60" y="724" />

+        <di:waypoint xsi:type="dc:Point" x="81" y="724" />

+        <di:waypoint xsi:type="dc:Point" x="81" y="721" />

+        <di:waypoint xsi:type="dc:Point" x="109" y="721" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="78" y="722" width="6" height="6" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="SequenceFlow_18" sourceElement="_BPMNShape_ScriptTask_178" targetElement="_BPMNShape_ScriptTask_157">

+        <di:waypoint xsi:type="dc:Point" x="229" y="721" />

+        <di:waypoint xsi:type="dc:Point" x="248" y="721" />

+        <di:waypoint xsi:type="dc:Point" x="248" y="719" />

+        <di:waypoint xsi:type="dc:Point" x="266" y="719" />

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_20" bpmnElement="SequenceFlow_20" sourceElement="_BPMNShape_ScriptTask_157" targetElement="_BPMNShape_ScriptTask_179">

+        <di:waypoint xsi:type="dc:Point" x="386" y="719" />

+        <di:waypoint xsi:type="dc:Point" x="411" y="719" />

+        <di:waypoint xsi:type="dc:Point" x="411" y="721" />

+        <di:waypoint xsi:type="dc:Point" x="435" y="721" />

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_213" bpmnElement="PreProcessSDNCGetRequest">

+        <dc:Bounds x="588" y="672" width="121" height="94" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_214" bpmnElement="PostProcessSDNCGetRequest">

+        <dc:Bounds x="924" y="672" width="121" height="94" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_22" bpmnElement="SequenceFlow_22" sourceElement="_BPMNShape_ScriptTask_179" targetElement="_BPMNShape_ScriptTask_213">

+        <di:waypoint xsi:type="dc:Point" x="555" y="721" />

+        <di:waypoint xsi:type="dc:Point" x="572" y="721" />

+        <di:waypoint xsi:type="dc:Point" x="572" y="719" />

+        <di:waypoint xsi:type="dc:Point" x="588" y="719" />

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_23" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_ScriptTask_213" targetElement="_BPMNShape_ScriptTask_158">

+        <di:waypoint xsi:type="dc:Point" x="708" y="719" />

+        <di:waypoint xsi:type="dc:Point" x="726" y="719" />

+        <di:waypoint xsi:type="dc:Point" x="726" y="718" />

+        <di:waypoint xsi:type="dc:Point" x="744" y="718" />

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_24" bpmnElement="SequenceFlow_24" sourceElement="_BPMNShape_ScriptTask_158" targetElement="_BPMNShape_ScriptTask_214">

+        <di:waypoint xsi:type="dc:Point" x="876" y="718" />

+        <di:waypoint xsi:type="dc:Point" x="899" y="718" />

+        <di:waypoint xsi:type="dc:Point" x="899" y="719" />

+        <di:waypoint xsi:type="dc:Point" x="924" y="719" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="897" y="719" width="6" height="6" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="_BPMNShape_Task_2" bpmnElement="PreProcessUpdateAAIVfModule_1">

+        <dc:Bounds x="609" y="830" width="118" height="97" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_Task_33" bpmnElement="PreProcessSDNCActivateRequest">

+        <dc:Bounds x="935" y="829" width="118" height="98" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_Task_4" bpmnElement="PostProcessSDNCActivateRequest">

+        <dc:Bounds x="1252" y="830" width="121" height="95" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_Task_2" targetElement="_BPMNShape_ScriptTask_174">

+        <di:waypoint xsi:type="dc:Point" x="727" y="878" />

+        <di:waypoint xsi:type="dc:Point" x="768" y="878" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="748" y="853" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_ScriptTask_174" targetElement="_BPMNShape_Task_33">

+        <di:waypoint xsi:type="dc:Point" x="884" y="878" />

+        <di:waypoint xsi:type="dc:Point" x="935" y="878" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="910" y="853" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_Task_33" targetElement="_BPMNShape_ScriptTask_175">

+        <di:waypoint xsi:type="dc:Point" x="1053" y="878" />

+        <di:waypoint xsi:type="dc:Point" x="1071" y="878" />

+        <di:waypoint xsi:type="dc:Point" x="1071" y="877" />

+        <di:waypoint xsi:type="dc:Point" x="1090" y="877" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1086" y="868" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="SequenceFlow_13" sourceElement="_BPMNShape_ScriptTask_175" targetElement="_BPMNShape_Task_4">

+        <di:waypoint xsi:type="dc:Point" x="1208" y="877" />

+        <di:waypoint xsi:type="dc:Point" x="1252" y="877" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1230" y="852" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_14" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_Task_4" targetElement="_BPMNShape_ExclusiveGateway_92">

+        <di:waypoint xsi:type="dc:Point" x="1372" y="877" />

+        <di:waypoint xsi:type="dc:Point" x="1404" y="877" />

+        <di:waypoint xsi:type="dc:Point" x="1404" y="878" />

+        <di:waypoint xsi:type="dc:Point" x="1435" y="878" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1419" y="868" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_175" bpmnElement="EndEvent_1">

+        <dc:Bounds x="2112" y="861" width="36" height="36" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="2130" y="902" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_16" bpmnElement="SequenceFlow_16" sourceElement="_BPMNShape_ExclusiveGateway_93" targetElement="_BPMNShape_ScriptTask_218">

+        <di:waypoint xsi:type="dc:Point" x="1868" y="879" />

+        <di:waypoint xsi:type="dc:Point" x="1934" y="878" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1901" y="863.5" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="_BPMNShape_IntermediateThrowEvent_45" bpmnElement="IntermediateThrowEvent_2">

+        <dc:Bounds x="1771" y="701" width="36" height="36" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1747" y="742" width="84" height="36" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_IntermediateCatchEvent_30" bpmnElement="IntermediateCatchEvent_3">

+        <dc:Bounds x="24" y="860" width="36" height="36" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="16" y="901" width="84" height="24" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_Task_7" bpmnElement="PrepareCreateAAIVfModuleVolumeGroupRequest">

+        <dc:Bounds x="1520" y="986" width="121" height="112" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_Task_7" targetElement="_BPMNShape_ScriptTask_176">

+        <di:waypoint xsi:type="dc:Point" x="1640" y="1042" />

+        <di:waypoint xsi:type="dc:Point" x="1693" y="1042" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1667" y="1017" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="_BPMNShape_Task_25" bpmnElement="PreProcessVNFAdapterRequest">

+        <dc:Bounds x="1073" y="672" width="121" height="96" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_Task_35" bpmnElement="PostProcessVNFAdapterRequest">

+        <dc:Bounds x="1397" y="674" width="116" height="92" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_31" bpmnElement="SequenceFlow_31" sourceElement="_BPMNShape_ScriptTask_214" targetElement="_BPMNShape_Task_25">

+        <di:waypoint xsi:type="dc:Point" x="1044" y="719" />

+        <di:waypoint xsi:type="dc:Point" x="1059" y="719" />

+        <di:waypoint xsi:type="dc:Point" x="1059" y="720" />

+        <di:waypoint xsi:type="dc:Point" x="1073" y="720" />

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_32" bpmnElement="SequenceFlow_32" sourceElement="_BPMNShape_Task_25" targetElement="_BPMNShape_ScriptTask_173">

+        <di:waypoint xsi:type="dc:Point" x="1193" y="720" />

+        <di:waypoint xsi:type="dc:Point" x="1236" y="720" />

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_33" bpmnElement="SequenceFlow_33" sourceElement="_BPMNShape_ScriptTask_173" targetElement="_BPMNShape_Task_35">

+        <di:waypoint xsi:type="dc:Point" x="1356" y="720" />

+        <di:waypoint xsi:type="dc:Point" x="1397" y="720" />

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_215" bpmnElement="QueryAAIVfModule">

+        <dc:Bounds x="1224" y="516" width="125" height="92" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_211" bpmnElement="IsBaseVfModule" isMarkerVisible="true">

+        <dc:Bounds x="1128" y="368" width="50" height="50" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1092" y="336" width="124" height="22" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_212" bpmnElement="ExclusiveGateway_2" isMarkerVisible="true">

+        <dc:Bounds x="1408" y="368" width="50" height="50" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1395" y="329" width="75" height="36" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_36" bpmnElement="SequenceFlow_36" sourceElement="_BPMNShape_ExclusiveGateway_211" targetElement="_BPMNShape_ScriptTask_215">

+        <di:waypoint xsi:type="dc:Point" x="1153" y="418" />

+        <di:waypoint xsi:type="dc:Point" x="1153" y="562" />

+        <di:waypoint xsi:type="dc:Point" x="1224" y="562" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1122" y="450" width="20" height="22" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_39" bpmnElement="SequenceFlow_39" sourceElement="_BPMNShape_ExclusiveGateway_211" targetElement="_BPMNShape_ExclusiveGateway_212">

+        <di:waypoint xsi:type="dc:Point" x="1178" y="393" />

+        <di:waypoint xsi:type="dc:Point" x="1408" y="393" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1285" y="393" width="27" height="22" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_216" bpmnElement="PostProcessCreateAAIVfModule">

+        <dc:Bounds x="897" y="348" width="125" height="92" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_27" bpmnElement="SequenceFlow_27" sourceElement="_BPMNShape_ScriptTask_216" targetElement="_BPMNShape_ExclusiveGateway_211">

+        <di:waypoint xsi:type="dc:Point" x="1021" y="394" />

+        <di:waypoint xsi:type="dc:Point" x="1075" y="394" />

+        <di:waypoint xsi:type="dc:Point" x="1075" y="393" />

+        <di:waypoint xsi:type="dc:Point" x="1128" y="393" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1072" y="394" width="6" height="6" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_37" bpmnElement="SequenceFlow_37" sourceElement="_BPMNShape_ScriptTask_215" targetElement="_BPMNShape_ExclusiveGateway_212">

+        <di:waypoint xsi:type="dc:Point" x="1348" y="562" />

+        <di:waypoint xsi:type="dc:Point" x="1378" y="562" />

+        <di:waypoint xsi:type="dc:Point" x="1378" y="393" />

+        <di:waypoint xsi:type="dc:Point" x="1408" y="393" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1393" y="468" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_218" bpmnElement="ScriptTask_setSuccess">

+        <dc:Bounds x="1934" y="831" width="128" height="95" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ScriptTask_218" targetElement="_BPMNShape_EndEvent_175">

+        <di:waypoint xsi:type="dc:Point" x="2062" y="879" />

+        <di:waypoint xsi:type="dc:Point" x="2112" y="878" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="2087" y="863.5" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_254" bpmnElement="QueryCloudRegion">

+        <dc:Bounds x="101" y="440" width="134" height="81" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_40" bpmnElement="SequenceFlow_40" sourceElement="_BPMNShape_ExclusiveGateway_90" targetElement="_BPMNShape_ScriptTask_254">

+        <di:waypoint xsi:type="dc:Point" x="169" y="418" />

+        <di:waypoint xsi:type="dc:Point" x="169" y="429" />

+        <di:waypoint xsi:type="dc:Point" x="168" y="429" />

+        <di:waypoint xsi:type="dc:Point" x="168" y="440" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="180" y="417" width="27" height="22" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_43" bpmnElement="SequenceFlow_43" sourceElement="_BPMNShape_ScriptTask_254" targetElement="_BPMNShape_ScriptTask_172">

+        <di:waypoint xsi:type="dc:Point" x="168" y="520" />

+        <di:waypoint xsi:type="dc:Point" x="168" y="524" />

+        <di:waypoint xsi:type="dc:Point" x="168" y="581" />

+        <di:waypoint xsi:type="dc:Point" x="208" y="581" />

+        <di:waypoint xsi:type="dc:Point" x="209" y="581" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="165" y="574" width="6" height="6" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="_BPMNShape_SubProcess_21" bpmnElement="SubProcess_1" isExpanded="true">

+        <dc:Bounds x="29" y="1197" width="405" height="203" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_55" bpmnElement="StartEvent_2">

+        <dc:Bounds x="58" y="1281" width="36" height="36" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="76" y="1322" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_181" bpmnElement="EndEvent_2">

+        <dc:Bounds x="370" y="1281" width="36" height="36" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="388" y="1322" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_284" bpmnElement="ScriptTask_1">

+        <dc:Bounds x="165" y="1258" width="134" height="81" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_StartEvent_55" targetElement="_BPMNShape_ScriptTask_284">

+        <di:waypoint xsi:type="dc:Point" x="94" y="1299" />

+        <di:waypoint xsi:type="dc:Point" x="165" y="1298" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="118" y="1299" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_38" bpmnElement="SequenceFlow_38" sourceElement="_BPMNShape_ScriptTask_284" targetElement="_BPMNShape_EndEvent_181">

+        <di:waypoint xsi:type="dc:Point" x="299" y="1298" />

+        <di:waypoint xsi:type="dc:Point" x="370" y="1299" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="329" y="1298" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_156" bpmnElement="CreateAAIVfModule">

+        <dc:Bounds x="696" y="348" width="121" height="92" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_25" bpmnElement="SequenceFlow_25" sourceElement="_BPMNShape_ScriptTask_156" targetElement="_BPMNShape_ScriptTask_216">

+        <di:waypoint xsi:type="dc:Point" x="816" y="394" />

+        <di:waypoint xsi:type="dc:Point" x="897" y="394" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="857" y="369" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="ExclusiveGateway_183x8vk_di" bpmnElement="ExclusiveGateway_183x8vk" isMarkerVisible="true">

+        <dc:Bounds x="1565.9780439121755" y="696" width="50" height="50" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1546" y="746" width="89" height="36" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_1ushk1d_di" bpmnElement="SequenceFlow_1ushk1d">

+        <di:waypoint xsi:type="dc:Point" x="1513" y="720" />

+        <di:waypoint xsi:type="dc:Point" x="1566" y="721" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1540" y="705.5" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_0ery1pk_di" bpmnElement="SequenceFlow_0ery1pk">

+        <di:waypoint xsi:type="dc:Point" x="1591" y="696" />

+        <di:waypoint xsi:type="dc:Point" x="1591" y="616" />

+        <di:waypoint xsi:type="dc:Point" x="1621" y="616" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1558" y="658" width="18" height="12" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_0xfanpi_di" bpmnElement="SequenceFlow_0xfanpi">

+        <di:waypoint xsi:type="dc:Point" x="1616" y="721" />

+        <di:waypoint xsi:type="dc:Point" x="1771" y="719" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1688" y="695" width="12" height="12" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_0abffyj_di" bpmnElement="SequenceFlow_0abffyj">

+        <di:waypoint xsi:type="dc:Point" x="1721" y="616" />

+        <di:waypoint xsi:type="dc:Point" x="1746" y="616" />

+        <di:waypoint xsi:type="dc:Point" x="1746" y="719" />

+        <di:waypoint xsi:type="dc:Point" x="1771" y="719" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1761" y="667.5" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="ScriptTask_1dv7amn_di" bpmnElement="CreateNetworkPoliciesInAAI">

+        <dc:Bounds x="1621" y="576" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="ExclusiveGateway_0f54imv_di" bpmnElement="ExclusiveGateway_0f54imv" isMarkerVisible="true">

+        <dc:Bounds x="114.59500000000003" y="854" width="50" height="50" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="101" y="819" width="77" height="24" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="ExclusiveGateway_1edqxlf_di" bpmnElement="ExclusiveGateway_1edqxlf" isMarkerVisible="true">

+        <dc:Bounds x="482.595" y="854" width="50" height="50" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="508" y="904" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_0bi38s7_di" bpmnElement="SequenceFlow_0bi38s7">

+        <di:waypoint xsi:type="dc:Point" x="140" y="904" />

+        <di:waypoint xsi:type="dc:Point" x="140" y="1057" />

+        <di:waypoint xsi:type="dc:Point" x="193" y="1057" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="146" y="980.5" width="18" height="12" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_1qm81ym_di" bpmnElement="SequenceFlow_1qm81ym">

+        <di:waypoint xsi:type="dc:Point" x="293" y="1057" />

+        <di:waypoint xsi:type="dc:Point" x="329" y="1057" />

+        <di:waypoint xsi:type="dc:Point" x="329" y="1057" />

+        <di:waypoint xsi:type="dc:Point" x="365" y="1057" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="344" y="1057" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_112los9_di" bpmnElement="SequenceFlow_112los9">

+        <di:waypoint xsi:type="dc:Point" x="465" y="1057" />

+        <di:waypoint xsi:type="dc:Point" x="508" y="1057" />

+        <di:waypoint xsi:type="dc:Point" x="508" y="904" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="487" y="1042" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_1k5uku2_di" bpmnElement="SequenceFlow_1k5uku2">

+        <di:waypoint xsi:type="dc:Point" x="165" y="879" />

+        <di:waypoint xsi:type="dc:Point" x="483" y="879" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="318" y="864" width="12" height="12" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_1avfxsz_di" bpmnElement="SequenceFlow_1avfxsz">

+        <di:waypoint xsi:type="dc:Point" x="533" y="879" />

+        <di:waypoint xsi:type="dc:Point" x="571" y="879" />

+        <di:waypoint xsi:type="dc:Point" x="571" y="879" />

+        <di:waypoint xsi:type="dc:Point" x="609" y="879" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="586" y="879" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_0363dz7_di" bpmnElement="SequenceFlow_0363dz7">

+        <di:waypoint xsi:type="dc:Point" x="60" y="878" />

+        <di:waypoint xsi:type="dc:Point" x="115" y="879" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="88" y="853.5" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="ScriptTask_0o3bcyq_di" bpmnElement="PreProcessUpdateAAIGenericVnf">

+        <dc:Bounds x="193" y="1018" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="CallActivity_0j45ic9_di" bpmnElement="UpdateAAIGenericVNFTask">

+        <dc:Bounds x="365" y="1017" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_0zcfn2x_di" bpmnElement="SequenceFlow_0zcfn2x">

+        <di:waypoint xsi:type="dc:Point" x="1458" y="393" />

+        <di:waypoint xsi:type="dc:Point" x="2193" y="394" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1822" y="368.5010168687388" width="12" height="12" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_0m382su_di" bpmnElement="SequenceFlow_0m382su">

+        <di:waypoint xsi:type="dc:Point" x="1433" y="418" />

+        <di:waypoint xsi:type="dc:Point" x="1433" y="521" />

+        <di:waypoint xsi:type="dc:Point" x="1513" y="521" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1439" y="459.5" width="18" height="12" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_0g270u0_di" bpmnElement="SequenceFlow_0g270u0">

+        <di:waypoint xsi:type="dc:Point" x="1766" y="521" />

+        <di:waypoint xsi:type="dc:Point" x="1816" y="521" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1791" y="506" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_1yrlvgb_di" bpmnElement="SequenceFlow_1yrlvgb">

+        <di:waypoint xsi:type="dc:Point" x="1916" y="521" />

+        <di:waypoint xsi:type="dc:Point" x="1969" y="521" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1943" y="506" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="ScriptTask_1j22oyj_di" bpmnElement="PreProcessSDNCVnfGetRequest">

+        <dc:Bounds x="1666" y="481" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="CallActivity_10t4tix_di" bpmnElement="CallSDNCAdapterVNFTopologyGET">

+        <dc:Bounds x="1816" y="481" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="ScriptTask_09wgk9p_di" bpmnElement="PostProcessSDNCVnfGetRequest">

+        <dc:Bounds x="1969" y="481" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_0d00zqi_di" bpmnElement="SequenceFlow_0d00zqi">

+        <di:waypoint xsi:type="dc:Point" x="1613" y="521" />

+        <di:waypoint xsi:type="dc:Point" x="1666" y="521" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1640" y="506" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_170kw7h_di" bpmnElement="SequenceFlow_170kw7h">

+        <di:waypoint xsi:type="dc:Point" x="2069" y="521" />

+        <di:waypoint xsi:type="dc:Point" x="2131" y="521" />

+        <di:waypoint xsi:type="dc:Point" x="2131" y="394" />

+        <di:waypoint xsi:type="dc:Point" x="2193" y="394" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="2146" y="447.5" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="CallActivity_0xev9kl_di" bpmnElement="QueryVNF">

+        <dc:Bounds x="1513" y="481" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_1f53tby_di" bpmnElement="SequenceFlow_1f53tby">

+        <di:waypoint xsi:type="dc:Point" x="478" y="282" />

+        <di:waypoint xsi:type="dc:Point" x="548" y="282" />

+        <di:waypoint xsi:type="dc:Point" x="548" y="189" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="513" y="267" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="ExclusiveGateway_0ffvqla_di" bpmnElement="ExclusiveGateway_0ffvqla" isMarkerVisible="true">

+        <dc:Bounds x="294" y="145.86" width="50" height="50" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="276" y="97.86000000000001" width="86" height="36" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_0270n5c_di" bpmnElement="SequenceFlow_0270n5c">

+        <di:waypoint xsi:type="dc:Point" x="344" y="171" />

+        <di:waypoint xsi:type="dc:Point" x="530" y="171" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="401" y="145" width="18" height="12" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_05og7iw_di" bpmnElement="SequenceFlow_05og7iw">

+        <di:waypoint xsi:type="dc:Point" x="319" y="196" />

+        <di:waypoint xsi:type="dc:Point" x="319" y="282" />

+        <di:waypoint xsi:type="dc:Point" x="378" y="282" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="328" y="239" width="12" height="12" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="CallActivity_14nvmgk_di" bpmnElement="Task_0kuj2a1">

+        <dc:Bounds x="378" y="242" width="100" height="80" />

+      </bpmndi:BPMNShape>

+    </bpmndi:BPMNPlane>

+  </bpmndi:BPMNDiagram>

 </bpmn2:definitions>
\ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModuleRollback.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModuleRollback.bpmn
index 0444b69633..7a7f369e42 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModuleRollback.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModuleRollback.bpmn
@@ -17,8 +17,7 @@
 def dcvfmr = new DoCreateVfModuleRollback()
 dcvfmr.preProcessRequest(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:callActivity id="InvokePrepareUpdateAAIVfModule" name="Invoke
-&#10;PrepareUpdateAAIVfModule" calledElement="PrepareUpdateAAIVfModule">
+    <bpmn2:callActivity id="InvokePrepareUpdateAAIVfModule" name="Invoke
&#10;PrepareUpdateAAIVfModule" calledElement="PrepareUpdateAAIVfModule">
       <bpmn2:extensionElements>
         <camunda:in source="PrepareUpdateAAIVfModuleRequest" target="PrepareUpdateAAIVfModuleRequest" />
         <camunda:out source="WorkflowException" target="WorkflowException" />
@@ -40,8 +39,7 @@ dcvfmr.preProcessRequest(execution)]]></bpmn2:script>
       <bpmn2:outgoing>SequenceFlow_10</bpmn2:outgoing>
       <bpmn2:outgoing>SequenceFlow_15</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
-    <bpmn2:scriptTask id="VNFAdapterPrep" name="VNFAdapter
-&#10;Prep" scriptFormat="groovy">
+    <bpmn2:scriptTask id="VNFAdapterPrep" name="VNFAdapter
&#10;Prep" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1p0v6yk</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_16</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
@@ -49,8 +47,7 @@ def dcvfmr = new DoCreateVfModuleRollback()
 dcvfmr.prepVNFAdapterRequest(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_16" name="" sourceRef="VNFAdapterPrep" targetRef="InvokeVNFAdapterRestV1" />
-    <bpmn2:callActivity id="InvokeVNFAdapterRestV1" name="Invoke
-&#10;VNFAdapterRestV1" calledElement="vnfAdapterRestV1">
+    <bpmn2:callActivity id="InvokeVNFAdapterRestV1" name="Invoke
&#10;VNFAdapterRestV1" calledElement="vnfAdapterRestV1">
       <bpmn2:extensionElements>
         <camunda:out source="WorkflowException" target="WorkflowException" />
         <camunda:in source="vnfAdapterRestV1Request" target="vnfAdapterRestV1Request" />
@@ -67,8 +64,7 @@ dcvfmr.prepVNFAdapterRequest(execution)]]></bpmn2:script>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_11" name="" sourceRef="InvokeVNFAdapterRestV1" targetRef="ExclusiveGateway_3" />
     <bpmn2:sequenceFlow id="SequenceFlow_15" name="no" sourceRef="ExclusiveGateway_2" targetRef="ExclusiveGateway_0a0hroy" />
-    <bpmn2:scriptTask id="UpdateAAIVfModulePrep" name="UpdateAAIVfModule
-&#10;Prep" scriptFormat="groovy">
+    <bpmn2:scriptTask id="UpdateAAIVfModulePrep" name="UpdateAAIVfModule
&#10;Prep" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_13</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
@@ -76,8 +72,7 @@ def dcvfmr = new DoCreateVfModuleRollback()
 dcvfmr.prepUpdateAAIVfModule(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_14" name="" sourceRef="UpdateAAIVfModulePrep" targetRef="InvokeUpdateAAIVfModule" />
-    <bpmn2:callActivity id="InvokeUpdateAAIVfModule" name="Invoke
-&#10;UpdateAAIVfModule" calledElement="UpdateAAIVfModule">
+    <bpmn2:callActivity id="InvokeUpdateAAIVfModule" name="Invoke
&#10;UpdateAAIVfModule" calledElement="UpdateAAIVfModule">
       <bpmn2:extensionElements>
         <camunda:out source="WorkflowException" target="WorkflowException" />
         <camunda:in source="UpdateAAIVfModuleRequest" target="UpdateAAIVfModuleRequest" />
@@ -107,8 +102,7 @@ dcvfmr.prepUpdateAAIVfModule(execution)]]></bpmn2:script>
       <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFMR_rollbackSDNCRequestAssign") == "true" || execution.getVariable("DCVFMR_rollbackSDNCRequestActivate") == "true"}]]></bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_20" name="no" sourceRef="ExclusiveGateway_4" targetRef="ExclusiveGateway_5" />
-    <bpmn2:scriptTask id="SDNCAdapterPrep2" name="SDNCAdapter
-&#10;Prep" scriptFormat="groovy">
+    <bpmn2:scriptTask id="SDNCAdapterPrep2" name="SDNCAdapter
&#10;Prep" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_19</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_32</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
@@ -116,8 +110,7 @@ def dcvfmr = new DoCreateVfModuleRollback()
 dcvfmr.prepSDNCAdapterRequest(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_32" name="" sourceRef="SDNCAdapterPrep2" targetRef="InvokeSDNCAdapterV1_2" />
-    <bpmn2:callActivity id="InvokeSDNCAdapterV1_2" name="Invoke
-&#10;SDNCAdapterV1" calledElement="sdncAdapter">
+    <bpmn2:callActivity id="InvokeSDNCAdapterV1_2" name="Invoke
&#10;SDNCAdapterV1" calledElement="sdncAdapter">
       <bpmn2:extensionElements>
         <camunda:out source="WorkflowException" target="WorkflowException" />
         <camunda:in source="sdncAdapterWorkflowRequest" target="sdncAdapterWorkflowRequest" />
@@ -140,8 +133,7 @@ dcvfmr.prepSDNCAdapterRequest(execution)]]></bpmn2:script>
     <bpmn2:sequenceFlow id="SequenceFlow_24" name="yes" sourceRef="ExclusiveGateway_5" targetRef="DeleteAAIVfModulePrep">
       <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFMR_rollbackCreateAAIVfModule") == "true"}]]></bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
-    <bpmn2:callActivity id="InvokeDeleteAAIVfModule" name="Invoke
-&#10;DeleteAAIVfModule" calledElement="DeleteAAIVfModule">
+    <bpmn2:callActivity id="InvokeDeleteAAIVfModule" name="Invoke
&#10;DeleteAAIVfModule" calledElement="DeleteAAIVfModule">
       <bpmn2:extensionElements>
         <camunda:in source="DeleteAAIVfModuleRequest" target="DeleteAAIVfModuleRequest" />
         <camunda:in source="isVidRequest" target="isVidRequest" />
@@ -156,8 +148,7 @@ dcvfmr.prepSDNCAdapterRequest(execution)]]></bpmn2:script>
       <bpmn2:incoming>SequenceFlow_35</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_21</bpmn2:incoming>
     </bpmn2:endEvent>
-    <bpmn2:scriptTask id="DeleteAAIVfModulePrep" name="DeleteAAIVfModule
-&#10;Prep" scriptFormat="groovy">
+    <bpmn2:scriptTask id="DeleteAAIVfModulePrep" name="DeleteAAIVfModule
&#10;Prep" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_24</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_34</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
@@ -671,4 +662,4 @@ dcvfmr.preProcessUpdateAAIGenericVnf(execution)]]></bpmn2:script>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
-</bpmn2:definitions>
\ No newline at end of file
+</bpmn2:definitions>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnf.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnf.bpmn
index 91fca3d213..5e88527676 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnf.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnf.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="_DkzPAHB4EeaJwpcpVN5gXw" 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="_DkzPAHB4EeaJwpcpVN5gXw" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="DoCreateVnf" name="DoCreateVnf" isExecutable="true">
     <bpmn2:startEvent id="StartEvent_1">
       <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
@@ -8,8 +8,8 @@
     <bpmn2:scriptTask id="initialization" name="Initialization" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-DoCreateVnf createVnf = new DoCreateVnf()
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+DoCreateVnf createVnf = new DoCreateVnf()

 createVnf.preProcessRequest(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="initialization" targetRef="callGetService" />
@@ -87,8 +87,8 @@ exceptionUtil.buildWorkflowException(execution, 5000, "Generic Vnf Already Exist
     <bpmn2:scriptTask id="prepareCreateGenericVnf" name="Prepare&#10;&#10;Create Vnf Payload" scriptFormat="groovy">
       <bpmn2:incoming>vnfExistNo</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_11</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-DoCreateVnf createVnf = new DoCreateVnf()
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+DoCreateVnf createVnf = new DoCreateVnf()

 createVnf.prepareCreateGenericVnf(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_11" name="" sourceRef="prepareCreateGenericVnf" targetRef="callPutVnf" />
@@ -102,7 +102,7 @@ createVnf.prepareCreateGenericVnf(execution)]]></bpmn2:script>
         <camunda:in source="DoCVNF_type" target="GENPV_type" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_11</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_1acnwwu</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_0seif8n</bpmn2:outgoing>
     </bpmn2:callActivity>
     <bpmn2:subProcess id="javaErrorHandlingSubProcess" name="Java Exception Handling Sub Process" triggeredByEvent="true">
       <bpmn2:scriptTask id="processJavaError" name="Process Error" scriptFormat="groovy">
@@ -133,12 +133,11 @@ exceptionUtil.processJavaException(execution)]]></bpmn2:script>
     <bpmn2:sequenceFlow id="SequenceFlow_1lalmvp" sourceRef="preProcessSDNCActivateRequest" targetRef="callSDNCAdapterVNFTopologyActivate" />
     <bpmn2:sequenceFlow id="SequenceFlow_0eb41vb" sourceRef="callSDNCAdapterVNFTopologyActivate" targetRef="postProcessSDNCActivateRequest" />
     <bpmn2:sequenceFlow id="SequenceFlow_15z3gpq" sourceRef="postProcessSDNCActivateRequest" targetRef="EndEvent_3" />
-    <bpmn2:sequenceFlow id="SequenceFlow_1acnwwu" sourceRef="callPutVnf" targetRef="ExclusiveGateway_045rm8i" />
     <bpmn2:scriptTask id="preProcessSDNCAssignRequest" name="PreProcess SDNC Assign Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_0ttqcwx</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1q6udwm</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-DoCreateVnf createVnf = new DoCreateVnf()
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+DoCreateVnf createVnf = new DoCreateVnf()

 createVnf.preProcessSDNCAssignRequest(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:callActivity id="callSDNCAdapterVNFTopologyAssign" name="Call SDNC Adapter VNF Topology Assign" calledElement="sdncAdapter">
@@ -157,18 +156,18 @@ createVnf.preProcessSDNCAssignRequest(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="postProcessSDNCAssignRequest" name="PostProcess SDNC Assign Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_15knw0q</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0c5h00o</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-
-String response = execution.getVariable("DoCVNF_assignSDNCAdapterResponse")
-
-def createVnfInfra = new DoCreateVnf()
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+

+String response = execution.getVariable("DoCVNF_assignSDNCAdapterResponse")

+

+def createVnfInfra = new DoCreateVnf()

 createVnfInfra.validateSDNCResponse(execution, response, "assign")]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:scriptTask id="preProcessSDNCActivateRequest" name="PreProcess SDNC Activate Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_0c5h00o</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1lalmvp</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-DoCreateVnf createVnf = new DoCreateVnf()
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+DoCreateVnf createVnf = new DoCreateVnf()

 createVnf.preProcessSDNCActivateRequest(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:callActivity id="callSDNCAdapterVNFTopologyActivate" name="Call SDNC Adapter VNF Topology Activate" calledElement="sdncAdapter">
@@ -187,22 +186,31 @@ createVnf.preProcessSDNCActivateRequest(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="postProcessSDNCActivateRequest" name="PostProcess SDNC Activate Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_0eb41vb</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_15z3gpq</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-
-String response = execution.getVariable("DoCVNF_assignSDNCAdapterResponse")
-
-def createVnfInfra = new DoCreateVnf()
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+

+String response = execution.getVariable("DoCVNF_assignSDNCAdapterResponse")

+

+def createVnfInfra = new DoCreateVnf()

 createVnfInfra.validateSDNCResponse(execution, response, "activate")]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:exclusiveGateway id="ExclusiveGateway_045rm8i" name="Is SDNC Interaction Enabled?" default="SequenceFlow_0ay5l4b">
-      <bpmn2:incoming>SequenceFlow_1acnwwu</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_1gc18ih</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0ttqcwx</bpmn2:outgoing>
       <bpmn2:outgoing>SequenceFlow_0ay5l4b</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_0ttqcwx" name="yes" sourceRef="ExclusiveGateway_045rm8i" targetRef="preProcessSDNCAssignRequest">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("SDNCInteractionEnabled" ) == true}]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("sdncVersion" ) == '1707'}]]></bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_0ay5l4b" name="no" sourceRef="ExclusiveGateway_045rm8i" targetRef="EndEvent_3" />
+    <bpmn2:sequenceFlow id="SequenceFlow_0seif8n" sourceRef="callPutVnf" targetRef="postProcessCreateGenericVnf" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1gc18ih" sourceRef="postProcessCreateGenericVnf" targetRef="ExclusiveGateway_045rm8i" />
+    <bpmn2:scriptTask id="postProcessCreateGenericVnf" name="PostProcess Create Generic Vnf" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_0seif8n</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1gc18ih</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+DoCreateVnf createVnf = new DoCreateVnf()

+createVnf.postProcessCreateGenericVnf(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
   </bpmn2:process>
   <bpmn2:error id="Error_1" name="Java Lang Exception" errorCode="java.lang.Exception" />
   <bpmn2:error id="Error_2" name="MSO Workflow Exception" errorCode="MSOWorkflowException" />
@@ -420,13 +428,6 @@ createVnfInfra.validateSDNCResponse(execution, response, "activate")]]></bpmn2:s
           <dc:Bounds x="1088" y="540" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_1acnwwu_di" bpmnElement="SequenceFlow_1acnwwu">
-        <di:waypoint xsi:type="dc:Point" x="1180" y="240" />
-        <di:waypoint xsi:type="dc:Point" x="1288" y="240" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1234" y="225" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_01h1rx2_di" bpmnElement="preProcessSDNCAssignRequest">
         <dc:Bounds x="206" y="515" width="100" height="80" />
       </bpmndi:BPMNShape>
@@ -446,30 +447,46 @@ createVnfInfra.validateSDNCResponse(execution, response, "activate")]]></bpmn2:s
         <dc:Bounds x="949" y="515" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_045rm8i_di" bpmnElement="ExclusiveGateway_045rm8i" isMarkerVisible="true">
-        <dc:Bounds x="1288" y="215" width="50" height="50" />
+        <dc:Bounds x="1336" y="215" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1286" y="163" width="54" height="36" />
+          <dc:Bounds x="1334" y="163" width="54" height="36" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0ttqcwx_di" bpmnElement="SequenceFlow_0ttqcwx">
-        <di:waypoint xsi:type="dc:Point" x="1313" y="265" />
-        <di:waypoint xsi:type="dc:Point" x="1313" y="475" />
+        <di:waypoint xsi:type="dc:Point" x="1361" y="265" />
+        <di:waypoint xsi:type="dc:Point" x="1361" y="475" />
         <di:waypoint xsi:type="dc:Point" x="106" y="475" />
         <di:waypoint xsi:type="dc:Point" x="106" y="555" />
         <di:waypoint xsi:type="dc:Point" x="206" y="555" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="701" y="460" width="18" height="12" />
+          <dc:Bounds x="726" y="460" width="18" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0ay5l4b_di" bpmnElement="SequenceFlow_0ay5l4b">
-        <di:waypoint xsi:type="dc:Point" x="1338" y="240" />
-        <di:waypoint xsi:type="dc:Point" x="1391" y="240" />
-        <di:waypoint xsi:type="dc:Point" x="1391" y="555" />
+        <di:waypoint xsi:type="dc:Point" x="1361" y="265" />
+        <di:waypoint xsi:type="dc:Point" x="1361" y="555" />
         <di:waypoint xsi:type="dc:Point" x="1162" y="555" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1400" y="397.5" width="12" height="12" />
+          <dc:Bounds x="1400" y="398" width="12" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0seif8n_di" bpmnElement="SequenceFlow_0seif8n">
+        <di:waypoint xsi:type="dc:Point" x="1180" y="240" />
+        <di:waypoint xsi:type="dc:Point" x="1213" y="240" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1197" y="225" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1gc18ih_di" bpmnElement="SequenceFlow_1gc18ih">
+        <di:waypoint xsi:type="dc:Point" x="1313" y="240" />
+        <di:waypoint xsi:type="dc:Point" x="1336" y="240" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1325" y="225" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_0y55cyz_di" bpmnElement="postProcessCreateGenericVnf">
+        <dc:Bounds x="1213" y="200" width="100" height="80" />
+      </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn2:definitions>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn
index 58a88c2b56..433957572d 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn
@@ -29,12 +29,16 @@ doCreateVnfAndModules.preProcessRequest(execution)]]></bpmn:script>
         <camunda:in source="asdcServiceModelVersion" target="asdcServiceModelVersion" />
         <camunda:out source="vfModuleId" target="createdVfModuleId" />
         <camunda:out source="vfModuleOutputParams" target="createdVfModuleOutputParams" />
-        <camunda:out source="RollbackData" target="RollbackData" />
+        <camunda:out source="RollbackData" target="DCVAM_baseRollbackData" />
         <camunda:out source="WorkflowException" target="WorkflowException" />
         <camunda:in source="serviceInstanceId" target="serviceInstanceId" />
+        <camunda:in source="serviceModelInfo" target="serviceModelInfo" />
+        <camunda:in source="vnfModelInfo" target="vnfModelInfo" />
+        <camunda:in source="globalSubscriberId" target="globalSubscriberId" />
+        <camunda:in source="sdncVersion" target="sdncVersion" />
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_1hf7k7q</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_02oe9wx</bpmn:outgoing>
+      <bpmn:outgoing>SequenceFlow_1ixcnb6</bpmn:outgoing>
     </bpmn:callActivity>
     <bpmn:sequenceFlow id="SequenceFlow_0o4vuzt" sourceRef="StartEvent_1" targetRef="PreProcessRequest" />
     <bpmn:sequenceFlow id="SequenceFlow_1xd3ri5" sourceRef="PreProcessRequest" targetRef="CreateVNF" />
@@ -56,9 +60,13 @@ doCreateVnfAndModules.preProcessRequest(execution)]]></bpmn:script>
         <camunda:in source="asdcServiceModelVersion" target="asdcServiceModelVersion" />
         <camunda:out source="vfModuleId" target="createdVfModuleId" />
         <camunda:out source="vfModuleOutputParameters" target="createdVfModuleOutputParameters" />
-        <camunda:out source="RollbackData" target="RollbackData" />
+        <camunda:out source="RollbackData" target="DCVAM_addOnRollbackData" />
         <camunda:out source="WorkflowException" target="WorkflowException" />
         <camunda:in source="serviceInstanceId" target="serviceInstanceId" />
+        <camunda:in source="serviceModelInfo" target="serviceModelInfo" />
+        <camunda:in source="vnfModelInfo" target="vnfModelInfo" />
+        <camunda:in source="globalSubscriberId" target="globalSubscriberId" />
+        <camunda:in source="sdncVersion" target="sdncVersion" />
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_1lh21yl</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_1llbx0k</bpmn:outgoing>
@@ -81,8 +89,8 @@ doCreateVnfAndModules.validateAddOnModule(execution)]]></bpmn:script>
           <camunda:property />
         </camunda:properties>
       </bpmn:extensionElements>
-      <bpmn:incoming>SequenceFlow_02oe9wx</bpmn:incoming>
       <bpmn:incoming>SequenceFlow_07gl6gw</bpmn:incoming>
+      <bpmn:incoming>SequenceFlow_1a6wyuu</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_132bohl</bpmn:outgoing>
       <bpmn:outgoing>SequenceFlow_0jz6bqn</bpmn:outgoing>
     </bpmn:exclusiveGateway>
@@ -104,6 +112,9 @@ doCreateVnfAndModules.validateAddOnModule(execution)]]></bpmn:script>
         <camunda:out source="vnfOutputParams" target="vnfOutputParams" />
         <camunda:out source="RollbackData" target="RollbackData" />
         <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:in source="serviceModelInfo" target="serviceModelInfo" />
+        <camunda:in source="globalSubscriberId" target="globalSubscriberId" />
+        <camunda:in source="sdncVersion" target="sdncVersion" />
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_1xd3ri5</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_08i3uo6</bpmn:outgoing>
@@ -165,7 +176,6 @@ doCreateVnfAndModules.queryCatalogDB(execution)]]></bpmn:script>
       <bpmn:outgoing>SequenceFlow_1lh21yl</bpmn:outgoing>
     </bpmn:callActivity>
     <bpmn:sequenceFlow id="SequenceFlow_1lh21yl" sourceRef="GenerateAddOnModuleName" targetRef="CreateAddOnVfModule" />
-    <bpmn:sequenceFlow id="SequenceFlow_02oe9wx" sourceRef="CreateBaseVfModule" targetRef="ExclusiveGateway_1vyqr5o" />
     <bpmn:sequenceFlow id="SequenceFlow_12x4dvf" sourceRef="PreProcessAddOnModule" targetRef="ExclusiveGateway_1hx9s0y" />
     <bpmn:scriptTask id="FinishProcessingInitialCountDeployment" name="Finish Processing Initial Count Deployment" scriptFormat="groovy">
       <bpmn:incoming>SequenceFlow_1vrogpr</bpmn:incoming>
@@ -174,6 +184,15 @@ doCreateVnfAndModules.queryCatalogDB(execution)]]></bpmn:script>
 def doCreateVnfAndModules = new DoCreateVnfAndModules()
 doCreateVnfAndModules.finisthProcessingInitialCountDeployment(execution)]]></bpmn:script>
     </bpmn:scriptTask>
+    <bpmn:sequenceFlow id="SequenceFlow_1ixcnb6" sourceRef="CreateBaseVfModule" targetRef="Task_054rz9i" />
+    <bpmn:sequenceFlow id="SequenceFlow_1a6wyuu" sourceRef="Task_054rz9i" targetRef="ExclusiveGateway_1vyqr5o" />
+    <bpmn:scriptTask id="Task_054rz9i" name="Validate Create Base VF Module Response" scriptFormat="groovy">
+      <bpmn:incoming>SequenceFlow_1ixcnb6</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_1a6wyuu</bpmn:outgoing>
+      <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def doCreateVnfAndModules = new DoCreateVnfAndModules()
+doCreateVnfAndModules.validateBaseModule(execution)]]></bpmn:script>
+    </bpmn:scriptTask>
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateVnfAndModules">
@@ -204,44 +223,44 @@ doCreateVnfAndModules.finisthProcessingInitialCountDeployment(execution)]]></bpm
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="CallActivity_0auiwq0_di" bpmnElement="CreateAddOnVfModule">
-        <dc:Bounds x="1626" y="57" width="100" height="80" />
+        <dc:Bounds x="1749" y="57" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_1eeaxqn_di" bpmnElement="Task_1lfmdks">
-        <dc:Bounds x="1765" y="57" width="100" height="80" />
+        <dc:Bounds x="1888" y="57" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_1h41bs7_di" bpmnElement="EndEvent_0v6povc">
-        <dc:Bounds x="1888" y="147" width="36" height="36" />
+        <dc:Bounds x="2011" y="147" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1906" y="183" width="0" height="0" />
+          <dc:Bounds x="2029" y="183" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1llbx0k_di" bpmnElement="SequenceFlow_1llbx0k">
-        <di:waypoint xsi:type="dc:Point" x="1726" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="1765" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="1849" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="1888" y="97" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1746" y="82" width="0" height="0" />
+          <dc:Bounds x="1869" y="82" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_1vyqr5o_di" bpmnElement="ExclusiveGateway_1vyqr5o" isMarkerVisible="true">
-        <dc:Bounds x="1043" y="140" width="50" height="50" />
+        <dc:Bounds x="1166" y="140" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1027" y="190" width="84" height="24" />
+          <dc:Bounds x="1150" y="190" width="84" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_132bohl_di" bpmnElement="SequenceFlow_132bohl">
-        <di:waypoint xsi:type="dc:Point" x="1068" y="140" />
-        <di:waypoint xsi:type="dc:Point" x="1068" y="36" />
-        <di:waypoint xsi:type="dc:Point" x="1906" y="36" />
-        <di:waypoint xsi:type="dc:Point" x="1906" y="147" />
+        <di:waypoint xsi:type="dc:Point" x="1191" y="140" />
+        <di:waypoint xsi:type="dc:Point" x="1191" y="36" />
+        <di:waypoint xsi:type="dc:Point" x="2029" y="36" />
+        <di:waypoint xsi:type="dc:Point" x="2029" y="147" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1488" y="21" width="14" height="12" />
+          <dc:Bounds x="1612" y="21" width="14" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="CallActivity_0zr4ioh_di" bpmnElement="CreateVNF">
         <dc:Bounds x="430" y="125" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0tknqn1_di" bpmnElement="PreProcessAddOnModule">
-        <dc:Bounds x="1177" y="125" width="100" height="80" />
+        <dc:Bounds x="1300" y="125" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_1u6qcio_di" bpmnElement="QueryCatalogDB">
         <dc:Bounds x="590" y="125" width="100" height="80" />
@@ -254,51 +273,51 @@ doCreateVnfAndModules.finisthProcessingInitialCountDeployment(execution)]]></bpm
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_1hx9s0y_di" bpmnElement="ExclusiveGateway_1hx9s0y" isMarkerVisible="true">
-        <dc:Bounds x="1370" y="140" width="50" height="50" />
+        <dc:Bounds x="1493" y="140" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1366" y="190" width="58" height="24" />
+          <dc:Bounds x="1489" y="190" width="58" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0jz6bqn_di" bpmnElement="SequenceFlow_0jz6bqn">
-        <di:waypoint xsi:type="dc:Point" x="1093" y="165" />
-        <di:waypoint xsi:type="dc:Point" x="1135" y="165" />
-        <di:waypoint xsi:type="dc:Point" x="1135" y="165" />
-        <di:waypoint xsi:type="dc:Point" x="1175" y="165" />
+        <di:waypoint xsi:type="dc:Point" x="1216" y="165" />
+        <di:waypoint xsi:type="dc:Point" x="1258" y="165" />
+        <di:waypoint xsi:type="dc:Point" x="1258" y="165" />
+        <di:waypoint xsi:type="dc:Point" x="1298" y="165" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1095" y="147.2226828816689" width="18" height="12" />
+          <dc:Bounds x="1219" y="147" width="18" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0kld3qt_di" bpmnElement="SequenceFlow_0kld3qt">
-        <di:waypoint xsi:type="dc:Point" x="1395" y="140" />
-        <di:waypoint xsi:type="dc:Point" x="1395" y="89" />
-        <di:waypoint xsi:type="dc:Point" x="1478" y="89" />
+        <di:waypoint xsi:type="dc:Point" x="1518" y="140" />
+        <di:waypoint xsi:type="dc:Point" x="1518" y="89" />
+        <di:waypoint xsi:type="dc:Point" x="1601" y="89" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1411" y="96" width="18" height="12" />
+          <dc:Bounds x="1534" y="96" width="18" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1mguf2m_di" bpmnElement="SequenceFlow_1mguf2m">
-        <di:waypoint xsi:type="dc:Point" x="1815" y="137" />
-        <di:waypoint xsi:type="dc:Point" x="1815" y="165" />
-        <di:waypoint xsi:type="dc:Point" x="1420" y="165" />
+        <di:waypoint xsi:type="dc:Point" x="1938" y="137" />
+        <di:waypoint xsi:type="dc:Point" x="1938" y="165" />
+        <di:waypoint xsi:type="dc:Point" x="1543" y="165" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1830" y="151" width="0" height="0" />
+          <dc:Bounds x="1953" y="151" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1vrogpr_di" bpmnElement="SequenceFlow_1vrogpr">
-        <di:waypoint xsi:type="dc:Point" x="1395" y="190" />
-        <di:waypoint xsi:type="dc:Point" x="1395" y="221" />
-        <di:waypoint xsi:type="dc:Point" x="1395" y="221" />
-        <di:waypoint xsi:type="dc:Point" x="1395" y="258" />
+        <di:waypoint xsi:type="dc:Point" x="1518" y="190" />
+        <di:waypoint xsi:type="dc:Point" x="1518" y="221" />
+        <di:waypoint xsi:type="dc:Point" x="1518" y="221" />
+        <di:waypoint xsi:type="dc:Point" x="1518" y="258" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1404" y="221" width="12" height="12" />
+          <dc:Bounds x="1527" y="221" width="12" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_07gl6gw_di" bpmnElement="SequenceFlow_07gl6gw">
-        <di:waypoint xsi:type="dc:Point" x="1345" y="298" />
-        <di:waypoint xsi:type="dc:Point" x="1069" y="298" />
-        <di:waypoint xsi:type="dc:Point" x="1068" y="190" />
+        <di:waypoint xsi:type="dc:Point" x="1468" y="298" />
+        <di:waypoint xsi:type="dc:Point" x="1192" y="298" />
+        <di:waypoint xsi:type="dc:Point" x="1191" y="190" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1207" y="283" width="0" height="0" />
+          <dc:Bounds x="1330" y="283" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1ifw9tw_di" bpmnElement="SequenceFlow_1ifw9tw">
@@ -319,33 +338,41 @@ doCreateVnfAndModules.finisthProcessingInitialCountDeployment(execution)]]></bpm
         <dc:Bounds x="740" y="125" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_0otq8mo_di" bpmnElement="GenerateAddOnModuleName">
-        <dc:Bounds x="1478" y="57" width="100" height="80" />
+        <dc:Bounds x="1601" y="57" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1lh21yl_di" bpmnElement="SequenceFlow_1lh21yl">
-        <di:waypoint xsi:type="dc:Point" x="1578" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="1626" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="1701" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="1749" y="97" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1602" y="82" width="0" height="0" />
+          <dc:Bounds x="1725" y="82" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_02oe9wx_di" bpmnElement="SequenceFlow_02oe9wx">
+      <bpmndi:BPMNEdge id="SequenceFlow_12x4dvf_di" bpmnElement="SequenceFlow_12x4dvf">
+        <di:waypoint xsi:type="dc:Point" x="1400" y="165" />
+        <di:waypoint xsi:type="dc:Point" x="1493" y="165" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1447" y="140" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_144n0mg_di" bpmnElement="FinishProcessingInitialCountDeployment">
+        <dc:Bounds x="1468" y="258" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1ixcnb6_di" bpmnElement="SequenceFlow_1ixcnb6">
         <di:waypoint xsi:type="dc:Point" x="988" y="165" />
-        <di:waypoint xsi:type="dc:Point" x="1015" y="165" />
-        <di:waypoint xsi:type="dc:Point" x="1015" y="165" />
-        <di:waypoint xsi:type="dc:Point" x="1043" y="165" />
+        <di:waypoint xsi:type="dc:Point" x="1030" y="165" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1030" y="165" width="0" height="0" />
+          <dc:Bounds x="1009" y="150" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_12x4dvf_di" bpmnElement="SequenceFlow_12x4dvf">
-        <di:waypoint xsi:type="dc:Point" x="1277" y="165" />
-        <di:waypoint xsi:type="dc:Point" x="1370" y="165" />
+      <bpmndi:BPMNEdge id="SequenceFlow_1a6wyuu_di" bpmnElement="SequenceFlow_1a6wyuu">
+        <di:waypoint xsi:type="dc:Point" x="1130" y="165" />
+        <di:waypoint xsi:type="dc:Point" x="1166" y="165" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1324" y="140" width="0" height="0" />
+          <dc:Bounds x="1148" y="150" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ScriptTask_144n0mg_di" bpmnElement="FinishProcessingInitialCountDeployment">
-        <dc:Bounds x="1345" y="258" width="100" height="80" />
+      <bpmndi:BPMNShape id="ScriptTask_1obevnp_di" bpmnElement="Task_054rz9i">
+        <dc:Bounds x="1030" y="125" width="100" height="80" />
       </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModulesRollback.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModulesRollback.bpmn
new file mode 100644
index 0000000000..2fba166dc4
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModulesRollback.bpmn
@@ -0,0 +1,282 @@
+<?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="_Wblj8GyfEeWUWLTvug7ZOg" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+  <bpmn2:process id="DoCreateVnfAndModulesRollback" name="DoCreateVnfAndModulesRollback" isExecutable="true">
+    <bpmn2:subProcess id="SubProcess_1" name="Rollback Error Handling" triggeredByEvent="true">
+      <bpmn2:startEvent id="CatchExceptions" name="Catch Exceptions">
+        <bpmn2:outgoing>SequenceFlow_12</bpmn2:outgoing>
+        <bpmn2:errorEventDefinition id="ErrorEventDefinition_1" />
+      </bpmn2:startEvent>
+      <bpmn2:endEvent id="EndEvent_1">
+        <bpmn2:incoming>SequenceFlow_22</bpmn2:incoming>
+      </bpmn2:endEvent>
+      <bpmn2:sequenceFlow id="SequenceFlow_12" name="" sourceRef="CatchExceptions" targetRef="LogSaveWorkflowException" />
+      <bpmn2:scriptTask id="LogSaveWorkflowException" name="Log and Save Workflow Exception" scriptFormat="groovy">
+        <bpmn2:incoming>SequenceFlow_12</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_22</bpmn2:outgoing>
+        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def dcvfmr = new DoCreateVfModuleRollback()
+dcvfmr.logWorkflowException(execution, 'DoCreateVfModuleRollback caught an event')
+dcvfmr.saveWorkflowException(execution, 'DCVFMR_CaughtWorkflowException1')]]></bpmn2:script>
+      </bpmn2:scriptTask>
+      <bpmn2:sequenceFlow id="SequenceFlow_22" name="" sourceRef="LogSaveWorkflowException" targetRef="EndEvent_1" />
+    </bpmn2:subProcess>
+    <bpmn2:boundaryEvent id="BoundaryEvent_1" name="" attachedToRef="SubProcess_1">
+      <bpmn2:outgoing>SequenceFlow_23</bpmn2:outgoing>
+      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_86" />
+    </bpmn2:boundaryEvent>
+    <bpmn2:endEvent id="EndEvent_2">
+      <bpmn2:incoming>SequenceFlow_23</bpmn2:incoming>
+    </bpmn2:endEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_23" name="" sourceRef="BoundaryEvent_1" targetRef="EndEvent_2" />
+    <bpmn2:startEvent id="StartEvent_1gai4qr">
+      <bpmn2:outgoing>SequenceFlow_1537b7m</bpmn2:outgoing>
+    </bpmn2:startEvent>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_12v8g91" name="Are there VF Modules to roll back?" default="SequenceFlow_1r6wyy6">
+      <bpmn2:incoming>SequenceFlow_0bmsi5h</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_1srw52v</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1r6wyy6</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_0v85t87</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_09ajxqr" name="Delete VNF?" default="SequenceFlow_1yas9ol">
+      <bpmn2:incoming>SequenceFlow_1r6wyy6</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1kr0r4a</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_1yas9ol</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:endEvent id="EndEvent_1seag7u">
+      <bpmn2:incoming>SequenceFlow_04yd2yr</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_1yas9ol</bpmn2:incoming>
+    </bpmn2:endEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_1537b7m" sourceRef="StartEvent_1gai4qr" targetRef="PreProcessRequest" />
+    <bpmn2:scriptTask id="PreProcessRequest" name="PreProcess Request" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_1537b7m</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0bmsi5h</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def dcvamr = new DoCreateVnfAndModulesRollback()
+dcvamr.preProcessRequest(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_0bmsi5h" sourceRef="PreProcessRequest" targetRef="ExclusiveGateway_12v8g91" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1ycq005" sourceRef="Task_1sbxjc8" targetRef="Task_0ifyxgt" />
+    <bpmn2:scriptTask id="Task_1sbxjc8" name="Prepare Rollback Create VF Module Request" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_0v85t87</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1ycq005</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def dcvamr = new DoCreateVnfAndModulesRollback()
+dcvamr.preProcessCreateVfModuleRollback(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:callActivity id="Task_0ifyxgt" name="Rollback Create VF Module " calledElement="DoCreateVfModuleRollback">
+      <bpmn2:extensionElements>
+        <camunda:in source="DCVAMR_RollbackData" target="RollbackData" />
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:in source="&#34;true&#34;" target="isVidRequest" />
+        <camunda:in source="mso-request-id" target="mso-request-id" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_1ycq005</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_181hb2a</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:sequenceFlow id="SequenceFlow_1r6wyy6" name="no" sourceRef="ExclusiveGateway_12v8g91" targetRef="ExclusiveGateway_09ajxqr" />
+    <bpmn2:sequenceFlow id="SequenceFlow_0v85t87" name="yes" sourceRef="ExclusiveGateway_12v8g91" targetRef="Task_1sbxjc8">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVAMR_numOfModulesToDelete") > 0}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="SequenceFlow_1kr0r4a" name="yes" sourceRef="ExclusiveGateway_09ajxqr" targetRef="Task_0p8fmrm">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVAMR_vnfId") != null}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="SequenceFlow_04yd2yr" sourceRef="Task_0p8fmrm" targetRef="EndEvent_1seag7u" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1yas9ol" name="no" sourceRef="ExclusiveGateway_09ajxqr" targetRef="EndEvent_1seag7u" />
+    <bpmn2:callActivity id="Task_0p8fmrm" name="Delete VNF" calledElement="DoDeleteVnf">
+      <bpmn2:extensionElements>
+        <camunda:in source="DCVAMR_vnfId" target="vnfId" />
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_1kr0r4a</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_04yd2yr</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:sequenceFlow id="SequenceFlow_181hb2a" sourceRef="Task_0ifyxgt" targetRef="Task_0kf9oby" />
+    <bpmn2:scriptTask id="Task_0kf9oby" name="PostProcess Rollback Create VF Module" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_181hb2a</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1srw52v</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def dcvamr = new DoCreateVnfAndModulesRollback()
+dcvamr.postProcessCreateVfModuleRollback(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_1srw52v" sourceRef="Task_0kf9oby" targetRef="ExclusiveGateway_12v8g91" />
+  </bpmn2:process>
+  <bpmn2:error id="Error_1" name="MSO Workflow Exception" errorCode="MSOWorkflowException" />
+  <bpmn2:message id="Message_1" name="DoCreateVfModuleRollbackRequest" />
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateVnfAndModulesRollback">
+      <bpmndi:BPMNShape id="_BPMNShape_SubProcess_22" bpmnElement="SubProcess_1" isExpanded="true">
+        <dc:Bounds x="18" y="1012" width="469" height="150" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_59" bpmnElement="CatchExceptions">
+        <dc:Bounds x="36" y="1063" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="42" y="1108" width="85" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_281" bpmnElement="LogSaveWorkflowException">
+        <dc:Bounds x="174" y="1041" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_188" bpmnElement="EndEvent_1">
+        <dc:Bounds x="349" y="1062" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="367" y="1098" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_BoundaryEvent_55" bpmnElement="BoundaryEvent_1">
+        <dc:Bounds x="469" y="1058" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="487" y="1094" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_189" bpmnElement="EndEvent_2">
+        <dc:Bounds x="593" y="1058" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="611" y="1099" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_StartEvent_59" targetElement="_BPMNShape_ScriptTask_281">
+        <di:waypoint xsi:type="dc:Point" x="72" y="1081" />
+        <di:waypoint xsi:type="dc:Point" x="174" y="1081" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="120" y="1081" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_22" bpmnElement="SequenceFlow_22" sourceElement="_BPMNShape_ScriptTask_281" targetElement="_BPMNShape_EndEvent_188">
+        <di:waypoint xsi:type="dc:Point" x="274" y="1081" />
+        <di:waypoint xsi:type="dc:Point" x="311" y="1081" />
+        <di:waypoint xsi:type="dc:Point" x="311" y="1080" />
+        <di:waypoint xsi:type="dc:Point" x="349" y="1080" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="326" y="1071" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_23" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_BoundaryEvent_55" targetElement="_BPMNShape_EndEvent_189">
+        <di:waypoint xsi:type="dc:Point" x="505" y="1076" />
+        <di:waypoint xsi:type="dc:Point" x="593" y="1076" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="550" y="1051" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="StartEvent_1gai4qr_di" bpmnElement="StartEvent_1gai4qr">
+        <dc:Bounds x="7.752742616033771" y="654.7502109704641" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="26" y="690.7502109704641" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ExclusiveGateway_12v8g91_di" bpmnElement="ExclusiveGateway_12v8g91" isMarkerVisible="true">
+        <dc:Bounds x="284.2253164556962" y="648.1721518987342" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="273" y="698" width="73" height="36" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ExclusiveGateway_09ajxqr_di" bpmnElement="ExclusiveGateway_09ajxqr" isMarkerVisible="true">
+        <dc:Bounds x="833.4869198312236" y="648" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="828" y="698" width="62" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="EndEvent_1seag7u_di" bpmnElement="EndEvent_1seag7u">
+        <dc:Bounds x="1101.651476793249" y="655" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1120" y="691" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1537b7m_di" bpmnElement="SequenceFlow_1537b7m">
+        <di:waypoint xsi:type="dc:Point" x="44" y="673" />
+        <di:waypoint xsi:type="dc:Point" x="131" y="673" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="88" y="658" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_0fckboe_di" bpmnElement="PreProcessRequest">
+        <dc:Bounds x="131" y="633" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0bmsi5h_di" bpmnElement="SequenceFlow_0bmsi5h">
+        <di:waypoint xsi:type="dc:Point" x="231" y="673" />
+        <di:waypoint xsi:type="dc:Point" x="257" y="673" />
+        <di:waypoint xsi:type="dc:Point" x="257" y="673" />
+        <di:waypoint xsi:type="dc:Point" x="284" y="673" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="272" y="673" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1ycq005_di" bpmnElement="SequenceFlow_1ycq005">
+        <di:waypoint xsi:type="dc:Point" x="469" y="509" />
+        <di:waypoint xsi:type="dc:Point" x="502" y="510" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="486" y="494.5" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_1sc2oye_di" bpmnElement="Task_1sbxjc8">
+        <dc:Bounds x="369" y="470" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="CallActivity_1lj1iud_di" bpmnElement="Task_0ifyxgt">
+        <dc:Bounds x="502" y="470" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1r6wyy6_di" bpmnElement="SequenceFlow_1r6wyy6">
+        <di:waypoint xsi:type="dc:Point" x="309" y="698" />
+        <di:waypoint xsi:type="dc:Point" x="309" y="755" />
+        <di:waypoint xsi:type="dc:Point" x="769" y="755" />
+        <di:waypoint xsi:type="dc:Point" x="769" y="673" />
+        <di:waypoint xsi:type="dc:Point" x="833" y="673" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="533" y="740" width="12" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0v85t87_di" bpmnElement="SequenceFlow_0v85t87">
+        <di:waypoint xsi:type="dc:Point" x="309" y="648" />
+        <di:waypoint xsi:type="dc:Point" x="309" y="510" />
+        <di:waypoint xsi:type="dc:Point" x="369" y="510" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="315" y="579" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1kr0r4a_di" bpmnElement="SequenceFlow_1kr0r4a">
+        <di:waypoint xsi:type="dc:Point" x="858" y="648" />
+        <di:waypoint xsi:type="dc:Point" x="858" y="589" />
+        <di:waypoint xsi:type="dc:Point" x="945" y="589" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="864" y="619" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_04yd2yr_di" bpmnElement="SequenceFlow_04yd2yr">
+        <di:waypoint xsi:type="dc:Point" x="1045" y="589" />
+        <di:waypoint xsi:type="dc:Point" x="1120" y="589" />
+        <di:waypoint xsi:type="dc:Point" x="1120" y="655" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1083" y="574" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1yas9ol_di" bpmnElement="SequenceFlow_1yas9ol">
+        <di:waypoint xsi:type="dc:Point" x="883" y="673" />
+        <di:waypoint xsi:type="dc:Point" x="1102" y="673" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="987" y="658" width="12" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="CallActivity_01fs058_di" bpmnElement="Task_0p8fmrm">
+        <dc:Bounds x="945" y="549" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_181hb2a_di" bpmnElement="SequenceFlow_181hb2a">
+        <di:waypoint xsi:type="dc:Point" x="602" y="510" />
+        <di:waypoint xsi:type="dc:Point" x="641" y="510" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="622" y="495" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_196e1px_di" bpmnElement="Task_0kf9oby">
+        <dc:Bounds x="641" y="470" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1srw52v_di" bpmnElement="SequenceFlow_1srw52v">
+        <di:waypoint xsi:type="dc:Point" x="691" y="550" />
+        <di:waypoint xsi:type="dc:Point" x="691" y="673" />
+        <di:waypoint xsi:type="dc:Point" x="334" y="673" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="706" y="611.5" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</bpmn2:definitions>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteNetworkInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteNetworkInstance.bpmn
index 84b6d68149..3c581865cc 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteNetworkInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteNetworkInstance.bpmn
@@ -65,7 +65,6 @@ validateSDNCResponse.validateSDNCResponse(execution)
         <bpmn2:incoming>SequenceFlow_1yvnovn</bpmn2:incoming>
       </bpmn2:endEvent>
       <bpmn2:scriptTask id="ScriptTask_00lgy9f" name="PostProcess Response" scriptFormat="groovy">
-        <bpmn2:incoming>SequenceFlow_1loz6nk</bpmn2:incoming>
         <bpmn2:incoming>SequenceFlow_1nl99y6</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_1yvnovn</bpmn2:outgoing>
         <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
@@ -76,7 +75,6 @@ DoDeleteNetworkInstance.postProcessResponse(execution)
       <bpmn2:sequenceFlow id="SequenceFlow_1a51h25" sourceRef="subProcessStart_StartEvent" targetRef="Task_0026x4v" />
       <bpmn2:sequenceFlow id="SequenceFlow_1yvnovn" sourceRef="ScriptTask_00lgy9f" targetRef="EndEvent_2" />
       <bpmn2:scriptTask id="ScriptTask_0n4do0p" name="Prepare SDNC RPC Rollback Deactivate" scriptFormat="groovy">
-        <bpmn2:incoming>SequenceFlow_0jb7rws</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_1wif0e5</bpmn2:outgoing>
         <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
 def DoDeleteNetworkInstance = new DoDeleteNetworkInstance()
@@ -107,20 +105,19 @@ DoDeleteNetworkInstance.prepareRpcSDNCDeactivateRollback(execution)]]></bpmn2:sc
           <camunda:out source="wasDeleted" target="wasDeleted" />
         </bpmn2:extensionElements>
         <bpmn2:incoming>SequenceFlow_147vc14</bpmn2:incoming>
-        <bpmn2:outgoing>SequenceFlow_1loz6nk</bpmn2:outgoing>
       </bpmn2:callActivity>
-      <bpmn2:sequenceFlow id="SequenceFlow_1loz6nk" sourceRef="CallActivity_0lku52d" targetRef="ScriptTask_00lgy9f" />
       <bpmn2:exclusiveGateway id="ExclusiveGateway_1x7o5bo" name="is SDNC Rollback Needed? " default="SequenceFlow_1raa09h">
         <bpmn2:incoming>SequenceFlow_0tiz0kk</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_0jb7rws</bpmn2:outgoing>
         <bpmn2:outgoing>SequenceFlow_1raa09h</bpmn2:outgoing>
       </bpmn2:exclusiveGateway>
-      <bpmn2:sequenceFlow id="SequenceFlow_0jb7rws" name="Yes" sourceRef="ExclusiveGateway_1x7o5bo" targetRef="ScriptTask_0n4do0p">
+      <bpmn2:sequenceFlow id="SequenceFlow_0jb7rws" name="Yes" sourceRef="ExclusiveGateway_1x7o5bo" targetRef="ExclusiveGateway_01xin16">
         <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DELNWKI_isSdncDeactivateRollbackNeeded") == true}]]></bpmn2:conditionExpression>
       </bpmn2:sequenceFlow>
       <bpmn2:inclusiveGateway id="ExclusiveGateway_01xin16">
         <bpmn2:incoming>SequenceFlow_1suj1nc</bpmn2:incoming>
         <bpmn2:incoming>SequenceFlow_1raa09h</bpmn2:incoming>
+        <bpmn2:incoming>SequenceFlow_0jb7rws</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_1nl99y6</bpmn2:outgoing>
       </bpmn2:inclusiveGateway>
       <bpmn2:sequenceFlow id="SequenceFlow_1raa09h" sourceRef="ExclusiveGateway_1x7o5bo" targetRef="ExclusiveGateway_01xin16" />
@@ -142,6 +139,9 @@ DoDeleteNetworkInstance.prepareRollbackData(execution)]]></bpmn2:script>
 def DoDeleteNetworkInstance = new DoDeleteNetworkInstance()
 DoDeleteNetworkInstance.setExceptionFlag(execution)]]></bpmn2:script>
       </bpmn2:scriptTask>
+      <bpmn2:textAnnotation id="TextAnnotation_0i06ryl">      <bpmn2:text>Rollback Not Needed for Delete.</bpmn2:text>
+</bpmn2:textAnnotation>
+      <bpmn2:association id="Association_0gzsxad" sourceRef="CallActivity_0lku52d" targetRef="TextAnnotation_0i06ryl" />
     </bpmn2:subProcess>
     <bpmn2:exclusiveGateway id="isAAIQueryOk_ExclusiveGateway_2" name="Is AAI Query Ok?" default="querySuccessNo_SequenceFlow">
       <bpmn2:incoming>isRelationshipExistNo_SequenceFlow</bpmn2:incoming>
@@ -858,13 +858,6 @@ DoDeleteNetworkInstance.validateRpcSDNCDeactivateResponse(execution)]]></bpmn2:s
       <bpmndi:BPMNShape id="CallActivity_0lku52d_di" bpmnElement="CallActivity_0lku52d">
         <dc:Bounds x="523" y="665" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1loz6nk_di" bpmnElement="SequenceFlow_1loz6nk">
-        <di:waypoint xsi:type="dc:Point" x="623" y="705" />
-        <di:waypoint xsi:type="dc:Point" x="688" y="705" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="656" y="690" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_1x7o5bo_di" bpmnElement="ExclusiveGateway_1x7o5bo" isMarkerVisible="true">
         <dc:Bounds x="270" y="799" width="50" height="50" />
         <bpmndi:BPMNLabel>
@@ -874,10 +867,10 @@ DoDeleteNetworkInstance.validateRpcSDNCDeactivateResponse(execution)]]></bpmn2:s
       <bpmndi:BPMNEdge id="SequenceFlow_0jb7rws_di" bpmnElement="SequenceFlow_0jb7rws">
         <di:waypoint xsi:type="dc:Point" x="295" y="799" />
         <di:waypoint xsi:type="dc:Point" x="295" y="772" />
-        <di:waypoint xsi:type="dc:Point" x="295" y="772" />
-        <di:waypoint xsi:type="dc:Point" x="295" y="745" />
+        <di:waypoint xsi:type="dc:Point" x="437" y="772" />
+        <di:waypoint xsi:type="dc:Point" x="437" y="799" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="300" y="755.74" width="19" height="13" />
+          <dc:Bounds x="312" y="776.0384854424079" width="18" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="InclusiveGateway_17qke2s_di" bpmnElement="ExclusiveGateway_01xin16">
@@ -928,6 +921,13 @@ DoDeleteNetworkInstance.validateRpcSDNCDeactivateResponse(execution)]]></bpmn2:s
       <bpmndi:BPMNShape id="ScriptTask_1gtl61j_di" bpmnElement="Task_0026x4v">
         <dc:Bounds x="124" y="874" width="100" height="80" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="TextAnnotation_0i06ryl_di" bpmnElement="TextAnnotation_0i06ryl">
+        <dc:Bounds x="592" y="596" width="106" height="45" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="Association_0gzsxad_di" bpmnElement="Association_0gzsxad">
+        <di:waypoint xsi:type="dc:Point" x="606" y="665" />
+        <di:waypoint xsi:type="dc:Point" x="627" y="641" />
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn2:definitions>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteNetworkInstanceRollback.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteNetworkInstanceRollback.bpmn
index 17f5ce4a40..2c5fa5ae4b 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteNetworkInstanceRollback.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteNetworkInstanceRollback.bpmn
@@ -84,7 +84,7 @@ DoDeleteNetworkInstanceRollback.processJavaException(execution)]]></bpmn:script>
         <camunda:connector>
           <camunda:inputOutput>
             <camunda:inputParameter name="payload">${DELNWKIR_rollbackNetworkRequest}</camunda:inputParameter>
-            <camunda:inputParameter name="url">CRENWKIR_urlRollbackPoNetwork</camunda:inputParameter>
+            <camunda:inputParameter name="url">${URN_mso_adapters_network_rest_endpoint}</camunda:inputParameter>
             <camunda:inputParameter name="headers">
               <camunda:map>
                 <camunda:entry key="Authorization">#{BasicAuthHeaderValuePO}</camunda:entry>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteServiceInstance.bpmn
index c40f73d059..9d21cc8301 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteServiceInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteServiceInstance.bpmn
@@ -1,332 +1,332 @@
-<?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:process id="DoDeleteServiceInstance" name="DoDeleteServiceInstance" isExecutable="true">
-    <bpmn2:startEvent id="deleteSI_startEven" name="Start Flow">
-      <bpmn2:outgoing>SequenceFlow_0jfgn05</bpmn2:outgoing>
-    </bpmn2:startEvent>
-    <bpmn2:scriptTask id="preProcessRequest_ScriptTask" name="PreProcess Incoming Request" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_0jfgn05</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_1jqc16k</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def ddsi = new DoDeleteServiceInstance()
-ddsi.preProcessRequest(execution)
-]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:endEvent id="EndEvent_3">
-      <bpmn2:incoming>SequenceFlow_1wyvxwi</bpmn2:incoming>
-    </bpmn2:endEvent>
-    <bpmn2:callActivity id="callGenericDeleteService" name="Call AAI GenericDelete Service " calledElement="GenericDeleteService">
-      <bpmn2:extensionElements>
-        <camunda:in source="serviceInstanceId" target="GENDS_serviceInstanceId" />
-        <camunda:in source="subscriptionServiceType" target="GENDS_serviceType" />
-        <camunda:in source="globalSubscriberId" target="GENDS_globalCustomerId" />
-        <camunda:in sourceExpression="service-instance" target="GENDS_type" />
-        <camunda:out source="GENDS_FoundIndicator" target="GENDS_FoundIndicator" />
-        <camunda:in sourceExpression="&#34;&#34;" target="GENGS_serviceType" />
-        <camunda:out source="GENDS_SuccessIndicator" target="GENDS_SuccessIndicator" />
-        <camunda:out source="WorkflowException" target="WorkflowExcpeton" />
-      </bpmn2:extensionElements>
-      <bpmn2:incoming>SequenceFlow_1w8ao21</bpmn2:incoming>
-      <bpmn2:incoming>SequenceFlow_0riudmc</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_05wu9i7</bpmn2:outgoing>
-    </bpmn2:callActivity>
-    <bpmn2:sequenceFlow id="SequenceFlow_05wu9i7" sourceRef="callGenericDeleteService" targetRef="ScriptTask_1ybdq3e" />
-    <bpmn2:sequenceFlow id="SequenceFlow_0k28xib" sourceRef="CallActivity_0ak0ezb" targetRef="ScriptTask_1uxr0cx" />
-    <bpmn2:callActivity id="CallActivity_0ak0ezb" name="Call SDNC Service Topology Delete" calledElement="sdncAdapter">
-      <bpmn2:extensionElements>
-        <camunda:in source="sdncDelete" target="sdncAdapterWorkflowRequest" />
-        <camunda:in source="msoRequestId" target="mso-request-id" />
-        <camunda:in source="serviceInstanceId" target="mso-service-instance-id" />
-        <camunda:out source="WorkflowException" target="WorkflowException" />
-        <camunda:out source="sdncAdapterResponse" target="sdncAdapterResponse" />
-        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />
-      </bpmn2:extensionElements>
-      <bpmn2:incoming>SequenceFlow_0rtflal</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_0k28xib</bpmn2:outgoing>
-    </bpmn2:callActivity>
-    <bpmn2:scriptTask id="ScriptTask_1uxr0cx" name="Post Process SDNC Delete" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_0k28xib</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_1w8ao21</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def ddsi = new DoDeleteServiceInstance()
-ddsi.postProcessSDNCDelete(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_0jfgn05" sourceRef="deleteSI_startEven" targetRef="preProcessRequest_ScriptTask" />
-    <bpmn2:scriptTask id="ScriptTask_0xxwbdq" name="PreProcess SDNC Delete" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_1dwch0k</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_0rtflal</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def ddsi = new DoDeleteServiceInstance()
-ddsi.preProcessSDNCDelete(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_0rtflal" sourceRef="ScriptTask_0xxwbdq" targetRef="CallActivity_0ak0ezb" />
-    <bpmn2:exclusiveGateway id="ExclusiveGateway_0590oev" name="SI found in AAI" default="SequenceFlow_05jfuko">
-      <bpmn2:incoming>SequenceFlow_1up0j5r</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_1hcfvcj</bpmn2:outgoing>
-      <bpmn2:outgoing>SequenceFlow_05jfuko</bpmn2:outgoing>
-    </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="SequenceFlow_1hcfvcj" name="yes" sourceRef="ExclusiveGateway_0590oev" targetRef="ExclusiveGateway_1mrh7us">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("GENGS_FoundIndicator" ) == true}]]></bpmn2:conditionExpression>
-    </bpmn2:sequenceFlow>
-    <bpmn2:endEvent id="EndEvent_0ronxsz">
-      <bpmn2:incoming>SequenceFlow_05jfuko</bpmn2:incoming>
-    </bpmn2:endEvent>
-    <bpmn2:sequenceFlow id="SequenceFlow_05jfuko" name="no" sourceRef="ExclusiveGateway_0590oev" targetRef="EndEvent_0ronxsz" />
-    <bpmn2:sequenceFlow id="SequenceFlow_1w8ao21" sourceRef="ScriptTask_1uxr0cx" targetRef="callGenericDeleteService" />
-    <bpmn2:exclusiveGateway id="ExclusiveGateway_1mrh7us" name="sdncVersion is 1610 " default="SequenceFlow_1dwch0k">
-      <bpmn2:incoming>SequenceFlow_1hcfvcj</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_0riudmc</bpmn2:outgoing>
-      <bpmn2:outgoing>SequenceFlow_1dwch0k</bpmn2:outgoing>
-    </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="SequenceFlow_0riudmc" name="yes" sourceRef="ExclusiveGateway_1mrh7us" targetRef="callGenericDeleteService">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{ execution.getVariable("sdncVersion" )   == "1610" }]]></bpmn2:conditionExpression>
-    </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="SequenceFlow_1dwch0k" name="no" sourceRef="ExclusiveGateway_1mrh7us" targetRef="ScriptTask_0xxwbdq" />
-    <bpmn2:callActivity id="CallActivity_1s8pf0x" name="Call AAI Generic GetService" calledElement="GenericGetService">
-      <bpmn2:extensionElements>
-        <camunda:in source="serviceInstanceId" target="GENGS_serviceInstanceId" />
-        <camunda:in sourceExpression="service-instance" target="GENGS_type" />
-        <camunda:out source="GENGS_FoundIndicator" target="GENGS_FoundIndicator" />
-        <camunda:out source="GENGS_SuccessIndicator" target="GENGS_SuccessIndicator" />
-        <camunda:out source="WorkflowException" target="WorkflowException" />
-        <camunda:out source="GENGS_siResourceLink" target="GENGS_siResourceLink" />
-        <camunda:out source="GENGS_service" target="GENGS_service" />
-      </bpmn2:extensionElements>
-      <bpmn2:incoming>SequenceFlow_1jqc16k</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_1grea1r</bpmn2:outgoing>
-    </bpmn2:callActivity>
-    <bpmn2:sequenceFlow id="SequenceFlow_1jqc16k" sourceRef="preProcessRequest_ScriptTask" targetRef="CallActivity_1s8pf0x" />
-    <bpmn2:scriptTask id="ScriptTask_02da0lj" name="Post Process AAI GET" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_1grea1r</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_1up0j5r</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def ddsi = new DoDeleteServiceInstance()
-ddsi.postProcessAAIGET(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_1grea1r" sourceRef="CallActivity_1s8pf0x" targetRef="ScriptTask_02da0lj" />
-    <bpmn2:sequenceFlow id="SequenceFlow_1up0j5r" sourceRef="ScriptTask_02da0lj" targetRef="ExclusiveGateway_0590oev" />
-    <bpmn2:scriptTask id="ScriptTask_1ybdq3e" name="Post Process AAI Delete" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_05wu9i7</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_1wyvxwi</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def ddsi = new DoDeleteServiceInstance()
-ddsi.postProcessAAIDEL(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_1wyvxwi" sourceRef="ScriptTask_1ybdq3e" targetRef="EndEvent_3" />
-    <bpmn2:subProcess id="SubProcess_1jggn82" name="Sub-process for UnexpectedErrors" triggeredByEvent="true">
-      <bpmn2:startEvent id="StartEvent_1antv0y">
-        <bpmn2:outgoing>SequenceFlow_0u33vy6</bpmn2:outgoing>
-        <bpmn2:errorEventDefinition errorRef="Error_1" />
-      </bpmn2:startEvent>
-      <bpmn2:endEvent id="EndEvent_03iywf6">
-        <bpmn2:incoming>SequenceFlow_0hevfee</bpmn2:incoming>
-      </bpmn2:endEvent>
-      <bpmn2:scriptTask id="ScriptTask_1va95un" name="Log / Print Unexpected Error" scriptFormat="groovy">
-        <bpmn2:incoming>SequenceFlow_0u33vy6</bpmn2:incoming>
-        <bpmn2:outgoing>SequenceFlow_0hevfee</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
-ExceptionUtil ex = new ExceptionUtil()
-ex.processJavaException(execution)]]></bpmn2:script>
-      </bpmn2:scriptTask>
-      <bpmn2:sequenceFlow id="SequenceFlow_0u33vy6" name="" sourceRef="StartEvent_1antv0y" targetRef="ScriptTask_1va95un" />
-      <bpmn2:sequenceFlow id="SequenceFlow_0hevfee" name="" sourceRef="ScriptTask_1va95un" targetRef="EndEvent_03iywf6" />
-    </bpmn2:subProcess>
-  </bpmn2:process>
-  <bpmn2:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" />
-  <bpmn2:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" />
-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoDeleteServiceInstance">
-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="deleteSI_startEven">
-        <dc:Bounds x="-334" y="79" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="-340" y="120" width="49" height="13" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_61" bpmnElement="preProcessRequest_ScriptTask">
-        <dc:Bounds x="-229" y="57" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_177" bpmnElement="EndEvent_3">
-        <dc:Bounds x="1384" y="201" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1402" y="242" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="CallActivity_1md4kyb_di" bpmnElement="callGenericDeleteService">
-        <dc:Bounds x="1159" y="57" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_05wu9i7_di" bpmnElement="SequenceFlow_05wu9i7">
-        <di:waypoint xsi:type="dc:Point" x="1259" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="1350" y="97" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1305" y="82" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0k28xib_di" bpmnElement="SequenceFlow_0k28xib">
-        <di:waypoint xsi:type="dc:Point" x="902" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="972" y="97" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="937" y="82" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="CallActivity_0ak0ezb_di" bpmnElement="CallActivity_0ak0ezb">
-        <dc:Bounds x="802" y="57" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ScriptTask_1uxr0cx_di" bpmnElement="ScriptTask_1uxr0cx">
-        <dc:Bounds x="972" y="57" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_0jfgn05_di" bpmnElement="SequenceFlow_0jfgn05">
-        <di:waypoint xsi:type="dc:Point" x="-298" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="-262" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="-262" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="-229" y="97" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="-247" y="97" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ScriptTask_0xxwbdq_di" bpmnElement="ScriptTask_0xxwbdq">
-        <dc:Bounds x="617" y="57" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_0rtflal_di" bpmnElement="SequenceFlow_0rtflal">
-        <di:waypoint xsi:type="dc:Point" x="717" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="802" y="97" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="760" y="82" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ExclusiveGateway_0590oev_di" bpmnElement="ExclusiveGateway_0590oev" isMarkerVisible="true">
-        <dc:Bounds x="305" y="72" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="293" y="51" width="73" height="13" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1hcfvcj_di" bpmnElement="SequenceFlow_1hcfvcj">
-        <di:waypoint xsi:type="dc:Point" x="355" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="420" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="459" y="97" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="384" y="99.03416045409814" width="17" height="13" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="EndEvent_0ronxsz_di" bpmnElement="EndEvent_0ronxsz">
-        <dc:Bounds x="312" y="186" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="330" y="227" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_05jfuko_di" bpmnElement="SequenceFlow_05jfuko">
-        <di:waypoint xsi:type="dc:Point" x="330" y="122" />
-        <di:waypoint xsi:type="dc:Point" x="330" y="186" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="310" y="127.1200546314796" width="13" height="13" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_1w8ao21_di" bpmnElement="SequenceFlow_1w8ao21">
-        <di:waypoint xsi:type="dc:Point" x="1072" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="1127" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="1156" y="97" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1100" y="82" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ExclusiveGateway_1mrh7us_di" bpmnElement="ExclusiveGateway_1mrh7us" isMarkerVisible="true">
-        <dc:Bounds x="463" y="72" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="451" y="122" width="73" height="25" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_0riudmc_di" bpmnElement="SequenceFlow_0riudmc">
-        <di:waypoint xsi:type="dc:Point" x="488" y="72" />
-        <di:waypoint xsi:type="dc:Point" x="488" y="-20" />
-        <di:waypoint xsi:type="dc:Point" x="1209" y="-20" />
-        <di:waypoint xsi:type="dc:Point" x="1209" y="57" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="841" y="-35" width="17" height="13" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_1dwch0k_di" bpmnElement="SequenceFlow_1dwch0k">
-        <di:waypoint xsi:type="dc:Point" x="513" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="558" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="558" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="617" y="97" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="526" y="73" width="12" height="13" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="CallActivity_1s8pf0x_di" bpmnElement="CallActivity_1s8pf0x">
-        <dc:Bounds x="-64" y="57" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1jqc16k_di" bpmnElement="SequenceFlow_1jqc16k">
-        <di:waypoint xsi:type="dc:Point" x="-129" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="-100" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="-100" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="-64" y="97" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="-85" y="97" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ScriptTask_02da0lj_di" bpmnElement="ScriptTask_02da0lj">
-        <dc:Bounds x="107" y="57" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1grea1r_di" bpmnElement="SequenceFlow_1grea1r">
-        <di:waypoint xsi:type="dc:Point" x="36" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="73" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="73" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="107" y="97" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="88" y="97" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_1up0j5r_di" bpmnElement="SequenceFlow_1up0j5r">
-        <di:waypoint xsi:type="dc:Point" x="207" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="256" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="256" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="305" y="97" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="271" y="97" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ScriptTask_1ybdq3e_di" bpmnElement="ScriptTask_1ybdq3e">
-        <dc:Bounds x="1352" y="57" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1wyvxwi_di" bpmnElement="SequenceFlow_1wyvxwi">
-        <di:waypoint xsi:type="dc:Point" x="1402" y="137" />
-        <di:waypoint xsi:type="dc:Point" x="1402" y="201" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1417" y="169" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="SubProcess_1jggn82_di" bpmnElement="SubProcess_1jggn82" isExpanded="true">
-        <dc:Bounds x="266" y="409" width="467" height="193" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="StartEvent_1antv0y_di" bpmnElement="StartEvent_1antv0y">
-        <dc:Bounds x="334" y="475" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="352" y="516" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="EndEvent_03iywf6_di" bpmnElement="EndEvent_03iywf6">
-        <dc:Bounds x="627" y="475" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="645" y="516" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ScriptTask_1va95un_di" bpmnElement="ScriptTask_1va95un">
-        <dc:Bounds x="438" y="453" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_0u33vy6_di" bpmnElement="SequenceFlow_0u33vy6">
-        <di:waypoint xsi:type="dc:Point" x="370" y="493" />
-        <di:waypoint xsi:type="dc:Point" x="438" y="493" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="404" y="478" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0hevfee_di" bpmnElement="SequenceFlow_0hevfee">
-        <di:waypoint xsi:type="dc:Point" x="538" y="493" />
-        <di:waypoint xsi:type="dc:Point" x="627" y="493" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="583" y="478" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-    </bpmndi:BPMNPlane>
-  </bpmndi:BPMNDiagram>
-</bpmn2:definitions>
+<?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:process id="DoDeleteServiceInstance" name="DoDeleteServiceInstance" isExecutable="true">

+    <bpmn2:startEvent id="deleteSI_startEven" name="Start Flow">

+      <bpmn2:outgoing>SequenceFlow_0jfgn05</bpmn2:outgoing>

+    </bpmn2:startEvent>

+    <bpmn2:scriptTask id="preProcessRequest_ScriptTask" name="PreProcess Incoming Request" scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_0jfgn05</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_1jqc16k</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def ddsi = new DoDeleteServiceInstance()

+ddsi.preProcessRequest(execution)

+]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:endEvent id="EndEvent_3">

+      <bpmn2:incoming>SequenceFlow_1wyvxwi</bpmn2:incoming>

+    </bpmn2:endEvent>

+    <bpmn2:callActivity id="callGenericDeleteService" name="Call AAI GenericDelete Service " calledElement="GenericDeleteService">

+      <bpmn2:extensionElements>

+        <camunda:in source="serviceInstanceId" target="GENDS_serviceInstanceId" />

+        <camunda:in source="subscriptionServiceType" target="GENDS_serviceType" />

+        <camunda:in source="globalSubscriberId" target="GENDS_globalCustomerId" />

+        <camunda:in sourceExpression="service-instance" target="GENDS_type" />

+        <camunda:out source="GENDS_FoundIndicator" target="GENDS_FoundIndicator" />

+        <camunda:in sourceExpression="&#34;&#34;" target="GENGS_serviceType" />

+        <camunda:out source="GENDS_SuccessIndicator" target="GENDS_SuccessIndicator" />

+        <camunda:out source="WorkflowException" target="WorkflowExcpeton" />

+      </bpmn2:extensionElements>

+      <bpmn2:incoming>SequenceFlow_1w8ao21</bpmn2:incoming>

+      <bpmn2:incoming>SequenceFlow_0riudmc</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_05wu9i7</bpmn2:outgoing>

+    </bpmn2:callActivity>

+    <bpmn2:sequenceFlow id="SequenceFlow_05wu9i7" sourceRef="callGenericDeleteService" targetRef="ScriptTask_1ybdq3e" />

+    <bpmn2:sequenceFlow id="SequenceFlow_0k28xib" sourceRef="CallActivity_0ak0ezb" targetRef="ScriptTask_1uxr0cx" />

+    <bpmn2:callActivity id="CallActivity_0ak0ezb" name="Call SDNC Service Topology Delete" calledElement="sdncAdapter">

+      <bpmn2:extensionElements>

+        <camunda:in source="sdncDelete" target="sdncAdapterWorkflowRequest" />

+        <camunda:in source="msoRequestId" target="mso-request-id" />

+        <camunda:in source="serviceInstanceId" target="mso-service-instance-id" />

+        <camunda:out source="WorkflowException" target="WorkflowException" />

+        <camunda:out source="sdncAdapterResponse" target="sdncAdapterResponse" />

+        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />

+      </bpmn2:extensionElements>

+      <bpmn2:incoming>SequenceFlow_0rtflal</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_0k28xib</bpmn2:outgoing>

+    </bpmn2:callActivity>

+    <bpmn2:scriptTask id="ScriptTask_1uxr0cx" name="Post Process SDNC Delete" scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_0k28xib</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_1w8ao21</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def ddsi = new DoDeleteServiceInstance()

+ddsi.postProcessSDNCDelete(execution)]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:sequenceFlow id="SequenceFlow_0jfgn05" sourceRef="deleteSI_startEven" targetRef="preProcessRequest_ScriptTask" />

+    <bpmn2:scriptTask id="ScriptTask_0xxwbdq" name="PreProcess SDNC Delete" scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_1dwch0k</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_0rtflal</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def ddsi = new DoDeleteServiceInstance()

+ddsi.preProcessSDNCDelete(execution)]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:sequenceFlow id="SequenceFlow_0rtflal" sourceRef="ScriptTask_0xxwbdq" targetRef="CallActivity_0ak0ezb" />

+    <bpmn2:exclusiveGateway id="ExclusiveGateway_0590oev" name="SI found in AAI" default="SequenceFlow_05jfuko">

+      <bpmn2:incoming>SequenceFlow_1up0j5r</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_1hcfvcj</bpmn2:outgoing>

+      <bpmn2:outgoing>SequenceFlow_05jfuko</bpmn2:outgoing>

+    </bpmn2:exclusiveGateway>

+    <bpmn2:sequenceFlow id="SequenceFlow_1hcfvcj" name="yes" sourceRef="ExclusiveGateway_0590oev" targetRef="ExclusiveGateway_1mrh7us">

+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("GENGS_FoundIndicator" ) == true}]]></bpmn2:conditionExpression>

+    </bpmn2:sequenceFlow>

+    <bpmn2:endEvent id="EndEvent_0ronxsz">

+      <bpmn2:incoming>SequenceFlow_05jfuko</bpmn2:incoming>

+    </bpmn2:endEvent>

+    <bpmn2:sequenceFlow id="SequenceFlow_05jfuko" name="no" sourceRef="ExclusiveGateway_0590oev" targetRef="EndEvent_0ronxsz" />

+    <bpmn2:sequenceFlow id="SequenceFlow_1w8ao21" sourceRef="ScriptTask_1uxr0cx" targetRef="callGenericDeleteService" />

+    <bpmn2:exclusiveGateway id="ExclusiveGateway_1mrh7us" name="sdncVersion is 1610 " default="SequenceFlow_1dwch0k">

+      <bpmn2:incoming>SequenceFlow_1hcfvcj</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_0riudmc</bpmn2:outgoing>

+      <bpmn2:outgoing>SequenceFlow_1dwch0k</bpmn2:outgoing>

+    </bpmn2:exclusiveGateway>

+    <bpmn2:sequenceFlow id="SequenceFlow_0riudmc" name="yes" sourceRef="ExclusiveGateway_1mrh7us" targetRef="callGenericDeleteService">

+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{ execution.getVariable("sdncVersion" )   == "1610" }]]></bpmn2:conditionExpression>

+    </bpmn2:sequenceFlow>

+    <bpmn2:sequenceFlow id="SequenceFlow_1dwch0k" name="no" sourceRef="ExclusiveGateway_1mrh7us" targetRef="ScriptTask_0xxwbdq" />

+    <bpmn2:callActivity id="CallActivity_1s8pf0x" name="Call AAI Generic GetService" calledElement="GenericGetService">

+      <bpmn2:extensionElements>

+        <camunda:in source="serviceInstanceId" target="GENGS_serviceInstanceId" />

+        <camunda:in sourceExpression="service-instance" target="GENGS_type" />

+        <camunda:out source="GENGS_FoundIndicator" target="GENGS_FoundIndicator" />

+        <camunda:out source="GENGS_SuccessIndicator" target="GENGS_SuccessIndicator" />

+        <camunda:out source="WorkflowException" target="WorkflowException" />

+        <camunda:out source="GENGS_siResourceLink" target="GENGS_siResourceLink" />

+        <camunda:out source="GENGS_service" target="GENGS_service" />

+      </bpmn2:extensionElements>

+      <bpmn2:incoming>SequenceFlow_1jqc16k</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_1grea1r</bpmn2:outgoing>

+    </bpmn2:callActivity>

+    <bpmn2:sequenceFlow id="SequenceFlow_1jqc16k" sourceRef="preProcessRequest_ScriptTask" targetRef="CallActivity_1s8pf0x" />

+    <bpmn2:scriptTask id="ScriptTask_02da0lj" name="Post Process AAI GET" scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_1grea1r</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_1up0j5r</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def ddsi = new DoDeleteServiceInstance()

+ddsi.postProcessAAIGET(execution)]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:sequenceFlow id="SequenceFlow_1grea1r" sourceRef="CallActivity_1s8pf0x" targetRef="ScriptTask_02da0lj" />

+    <bpmn2:sequenceFlow id="SequenceFlow_1up0j5r" sourceRef="ScriptTask_02da0lj" targetRef="ExclusiveGateway_0590oev" />

+    <bpmn2:scriptTask id="ScriptTask_1ybdq3e" name="Post Process AAI Delete" scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_05wu9i7</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_1wyvxwi</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def ddsi = new DoDeleteServiceInstance()

+ddsi.postProcessAAIDEL(execution)]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:sequenceFlow id="SequenceFlow_1wyvxwi" sourceRef="ScriptTask_1ybdq3e" targetRef="EndEvent_3" />

+    <bpmn2:subProcess id="SubProcess_1jggn82" name="Sub-process for UnexpectedErrors" triggeredByEvent="true">

+      <bpmn2:startEvent id="StartEvent_1antv0y">

+        <bpmn2:outgoing>SequenceFlow_0u33vy6</bpmn2:outgoing>

+        <bpmn2:errorEventDefinition errorRef="Error_1" />

+      </bpmn2:startEvent>

+      <bpmn2:endEvent id="EndEvent_03iywf6">

+        <bpmn2:incoming>SequenceFlow_0hevfee</bpmn2:incoming>

+      </bpmn2:endEvent>

+      <bpmn2:scriptTask id="ScriptTask_1va95un" name="Log / Print Unexpected Error" scriptFormat="groovy">

+        <bpmn2:incoming>SequenceFlow_0u33vy6</bpmn2:incoming>

+        <bpmn2:outgoing>SequenceFlow_0hevfee</bpmn2:outgoing>

+        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

+ExceptionUtil ex = new ExceptionUtil()

+ex.processJavaException(execution)]]></bpmn2:script>

+      </bpmn2:scriptTask>

+      <bpmn2:sequenceFlow id="SequenceFlow_0u33vy6" name="" sourceRef="StartEvent_1antv0y" targetRef="ScriptTask_1va95un" />

+      <bpmn2:sequenceFlow id="SequenceFlow_0hevfee" name="" sourceRef="ScriptTask_1va95un" targetRef="EndEvent_03iywf6" />

+    </bpmn2:subProcess>

+  </bpmn2:process>

+  <bpmn2:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" />

+  <bpmn2:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" />

+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">

+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoDeleteServiceInstance">

+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="deleteSI_startEven">

+        <dc:Bounds x="-334" y="79" width="36" height="36" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="-340" y="120" width="49" height="13" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_61" bpmnElement="preProcessRequest_ScriptTask">

+        <dc:Bounds x="-229" y="57" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_177" bpmnElement="EndEvent_3">

+        <dc:Bounds x="1384" y="201" width="36" height="36" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1402" y="242" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="CallActivity_1md4kyb_di" bpmnElement="callGenericDeleteService">

+        <dc:Bounds x="1159" y="57" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_05wu9i7_di" bpmnElement="SequenceFlow_05wu9i7">

+        <di:waypoint xsi:type="dc:Point" x="1259" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="1350" y="97" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1305" y="82" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_0k28xib_di" bpmnElement="SequenceFlow_0k28xib">

+        <di:waypoint xsi:type="dc:Point" x="902" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="972" y="97" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="937" y="82" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="CallActivity_0ak0ezb_di" bpmnElement="CallActivity_0ak0ezb">

+        <dc:Bounds x="802" y="57" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="ScriptTask_1uxr0cx_di" bpmnElement="ScriptTask_1uxr0cx">

+        <dc:Bounds x="972" y="57" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_0jfgn05_di" bpmnElement="SequenceFlow_0jfgn05">

+        <di:waypoint xsi:type="dc:Point" x="-298" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="-262" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="-262" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="-229" y="97" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="-247" y="97" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="ScriptTask_0xxwbdq_di" bpmnElement="ScriptTask_0xxwbdq">

+        <dc:Bounds x="617" y="57" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_0rtflal_di" bpmnElement="SequenceFlow_0rtflal">

+        <di:waypoint xsi:type="dc:Point" x="717" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="802" y="97" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="760" y="82" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="ExclusiveGateway_0590oev_di" bpmnElement="ExclusiveGateway_0590oev" isMarkerVisible="true">

+        <dc:Bounds x="305" y="72" width="50" height="50" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="293" y="51" width="73" height="13" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_1hcfvcj_di" bpmnElement="SequenceFlow_1hcfvcj">

+        <di:waypoint xsi:type="dc:Point" x="355" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="420" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="459" y="97" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="384" y="99.03416045409814" width="17" height="13" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="EndEvent_0ronxsz_di" bpmnElement="EndEvent_0ronxsz">

+        <dc:Bounds x="312" y="186" width="36" height="36" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="330" y="227" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_05jfuko_di" bpmnElement="SequenceFlow_05jfuko">

+        <di:waypoint xsi:type="dc:Point" x="330" y="122" />

+        <di:waypoint xsi:type="dc:Point" x="330" y="186" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="310" y="127.1200546314796" width="13" height="13" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_1w8ao21_di" bpmnElement="SequenceFlow_1w8ao21">

+        <di:waypoint xsi:type="dc:Point" x="1072" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="1127" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="1156" y="97" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1100" y="82" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="ExclusiveGateway_1mrh7us_di" bpmnElement="ExclusiveGateway_1mrh7us" isMarkerVisible="true">

+        <dc:Bounds x="463" y="72" width="50" height="50" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="451" y="122" width="73" height="25" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_0riudmc_di" bpmnElement="SequenceFlow_0riudmc">

+        <di:waypoint xsi:type="dc:Point" x="488" y="72" />

+        <di:waypoint xsi:type="dc:Point" x="488" y="-20" />

+        <di:waypoint xsi:type="dc:Point" x="1209" y="-20" />

+        <di:waypoint xsi:type="dc:Point" x="1209" y="57" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="841" y="-35" width="17" height="13" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_1dwch0k_di" bpmnElement="SequenceFlow_1dwch0k">

+        <di:waypoint xsi:type="dc:Point" x="513" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="558" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="558" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="617" y="97" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="526" y="73" width="12" height="13" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="CallActivity_1s8pf0x_di" bpmnElement="CallActivity_1s8pf0x">

+        <dc:Bounds x="-64" y="57" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_1jqc16k_di" bpmnElement="SequenceFlow_1jqc16k">

+        <di:waypoint xsi:type="dc:Point" x="-129" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="-100" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="-100" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="-64" y="97" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="-85" y="97" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="ScriptTask_02da0lj_di" bpmnElement="ScriptTask_02da0lj">

+        <dc:Bounds x="107" y="57" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_1grea1r_di" bpmnElement="SequenceFlow_1grea1r">

+        <di:waypoint xsi:type="dc:Point" x="36" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="73" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="73" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="107" y="97" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="88" y="97" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_1up0j5r_di" bpmnElement="SequenceFlow_1up0j5r">

+        <di:waypoint xsi:type="dc:Point" x="207" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="256" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="256" y="97" />

+        <di:waypoint xsi:type="dc:Point" x="305" y="97" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="271" y="97" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="ScriptTask_1ybdq3e_di" bpmnElement="ScriptTask_1ybdq3e">

+        <dc:Bounds x="1352" y="57" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_1wyvxwi_di" bpmnElement="SequenceFlow_1wyvxwi">

+        <di:waypoint xsi:type="dc:Point" x="1402" y="137" />

+        <di:waypoint xsi:type="dc:Point" x="1402" y="201" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="1417" y="169" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="SubProcess_1jggn82_di" bpmnElement="SubProcess_1jggn82" isExpanded="true">

+        <dc:Bounds x="266" y="409" width="467" height="193" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="StartEvent_1antv0y_di" bpmnElement="StartEvent_1antv0y">

+        <dc:Bounds x="334" y="475" width="36" height="36" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="352" y="516" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="EndEvent_03iywf6_di" bpmnElement="EndEvent_03iywf6">

+        <dc:Bounds x="627" y="475" width="36" height="36" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="645" y="516" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="ScriptTask_1va95un_di" bpmnElement="ScriptTask_1va95un">

+        <dc:Bounds x="438" y="453" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_0u33vy6_di" bpmnElement="SequenceFlow_0u33vy6">

+        <di:waypoint xsi:type="dc:Point" x="370" y="493" />

+        <di:waypoint xsi:type="dc:Point" x="438" y="493" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="404" y="478" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_0hevfee_di" bpmnElement="SequenceFlow_0hevfee">

+        <di:waypoint xsi:type="dc:Point" x="538" y="493" />

+        <di:waypoint xsi:type="dc:Point" x="627" y="493" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="583" y="478" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+    </bpmndi:BPMNPlane>

+  </bpmndi:BPMNDiagram>

+</bpmn2:definitions>

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVnfAndModules.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVnfAndModules.bpmn
new file mode 100644
index 0000000000..127030d789
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVnfAndModules.bpmn
@@ -0,0 +1,263 @@
+<?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="_9MhrcHqVEea26OhQB97uCQ" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+  <bpmn2:process id="DoDeleteVnfAndModules" name="DoDeleteVnfAndModules" isExecutable="true">
+    <bpmn2:startEvent id="StartEvent_1">
+      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
+    </bpmn2:startEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="intialization" />
+    <bpmn2:scriptTask id="intialization" name="Intialization" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_08nd69s</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+DoDeleteVnfAndModules deleteVnfAndModules = new DoDeleteVnfAndModules()
+deleteVnfAndModules.preProcessRequest(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:subProcess id="javaErrorHandlingSubProcess" name="Java Exception Handling Sub Process" triggeredByEvent="true">
+      <bpmn2:endEvent id="EndEvent_4">
+        <bpmn2:incoming>SequenceFlow_19</bpmn2:incoming>
+      </bpmn2:endEvent>
+      <bpmn2:startEvent id="StartEvent_3">
+        <bpmn2:outgoing>SequenceFlow_18</bpmn2:outgoing>
+        <bpmn2:errorEventDefinition id="_ErrorEventDefinition_95" errorRef="Error_2" />
+      </bpmn2:startEvent>
+      <bpmn2:sequenceFlow id="SequenceFlow_18" name="" sourceRef="StartEvent_3" targetRef="processJavaException" />
+      <bpmn2:scriptTask id="processJavaException" name="Process Error" scriptFormat="groovy">
+        <bpmn2:incoming>SequenceFlow_18</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_19</bpmn2:outgoing>
+        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+ExceptionUtil exceptionUtil = new ExceptionUtil()
+exceptionUtil.processJavaException(execution)]]></bpmn2:script>
+      </bpmn2:scriptTask>
+      <bpmn2:sequenceFlow id="SequenceFlow_19" name="" sourceRef="processJavaException" targetRef="EndEvent_4" />
+    </bpmn2:subProcess>
+    <bpmn2:endEvent id="EndEvent_2">
+      <bpmn2:incoming>SequenceFlow_1uqlr6b</bpmn2:incoming>
+      <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_36" />
+    </bpmn2:endEvent>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_1amun4k" name="Are there VF modules to delete?" default="SequenceFlow_1936oc0">
+      <bpmn2:incoming>SequenceFlow_0t4yszi</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_0lu7b1v</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1qrkdn3</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_1936oc0</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:callActivity id="DeleteVNF" name="Delete VNF" calledElement="DoDeleteVnf">
+      <bpmn2:extensionElements>
+        <camunda:in source="IsDebugLogEnabled" target="IsDebugLogEnabled" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:in source="vnfId" target="vnfId" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_05ujwz8</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1uqlr6b</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:sequenceFlow id="SequenceFlow_08nd69s" sourceRef="intialization" targetRef="QueryVnf" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1qrkdn3" name="yes" sourceRef="ExclusiveGateway_1amun4k" targetRef="PrepareModuleList">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable("DDVAM_nextModule") < execution.getVariable("DDVAM_modulesSize")]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:callActivity id="DeleteVFModule" name="Delete VF Module" calledElement="DoDeleteVfModule">
+      <bpmn2:extensionElements>
+        <camunda:in source="requestId" target="requestId" />
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
+        <camunda:in source="vnfId" target="vnfId" />
+        <camunda:in source="DDVAM_vfModuleId" target="vfModuleId" />
+        <camunda:in source="serviceInstanceId" target="serviceInstanceId" />
+        <camunda:in source="DDVAM_vfModuleName" target="vfModuleName" />
+        <camunda:in source="DDVAM_vfModuleModelInfo" target="vfModuleModelInfo" />
+        <camunda:in source="cloudConfiguration" target="cloudConfiguration" />
+        <camunda:in source="&#34;1610&#34;" target="sdncVersion" />
+        <camunda:in source="&#34;true&#34;" target="isVidRequest" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_1qoor0l</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1p4ycii</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_0189gqf">
+      <bpmn2:incoming>SequenceFlow_1936oc0</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_05ujwz8</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_1p4ycii" sourceRef="DeleteVFModule" targetRef="PostProcessDeleteVfModule" />
+    <bpmn2:sequenceFlow id="SequenceFlow_0t4yszi" sourceRef="PostProcessDeleteVfModule" targetRef="ExclusiveGateway_1amun4k" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1936oc0" name="no" sourceRef="ExclusiveGateway_1amun4k" targetRef="ExclusiveGateway_0189gqf" />
+    <bpmn2:sequenceFlow id="SequenceFlow_05ujwz8" sourceRef="ExclusiveGateway_0189gqf" targetRef="DeleteVNF" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1uqlr6b" sourceRef="DeleteVNF" targetRef="EndEvent_2" />
+    <bpmn2:scriptTask id="QueryVnf" name="Query VNF" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_08nd69s</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0lu7b1v</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def ddvam = new DoDeleteVnfAndModules()
+ddvam.queryAAIVfModule(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:scriptTask id="PrepareModuleList" name="Prepare Next Module To Delete" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_1qrkdn3</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1qoor0l</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def ddvam = new DoDeleteVnfAndModules()
+ddvam.prepareNextModuleToDelete(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_0lu7b1v" sourceRef="QueryVnf" targetRef="ExclusiveGateway_1amun4k" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1qoor0l" sourceRef="PrepareModuleList" targetRef="DeleteVFModule" />
+    <bpmn2:scriptTask id="PostProcessDeleteVfModule" name="PostProcess Delete VF Module">
+      <bpmn2:incoming>SequenceFlow_1p4ycii</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0t4yszi</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+int nextModule = execution.getVariable("nextModule")
+			execution.setVariable("nextModule", nextModule + 1)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+  </bpmn2:process>
+  <bpmn2:error id="Error_1" name="MSO Workflow Exception" errorCode="MSOWorkflowException" />
+  <bpmn2:error id="Error_2" name="Java Lang Exception" errorCode="java.lang.Exception" />
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoDeleteVnfAndModules">
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_79" bpmnElement="StartEvent_1">
+        <dc:Bounds x="238" y="209" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="256" y="250" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_311" bpmnElement="intialization">
+        <dc:Bounds x="344" y="187" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_79" targetElement="_BPMNShape_ScriptTask_311">
+        <di:waypoint xsi:type="dc:Point" x="274" y="227" />
+        <di:waypoint xsi:type="dc:Point" x="344" y="228" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="309" y="212.5" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_237" bpmnElement="EndEvent_2">
+        <dc:Bounds x="1605" y="209" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1623" y="250" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_SubProcess_35" bpmnElement="javaErrorHandlingSubProcess" isExpanded="true">
+        <dc:Bounds x="226" y="401" width="431" height="157" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_81" bpmnElement="StartEvent_3">
+        <dc:Bounds x="374" y="462" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="392" y="503" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_239" bpmnElement="EndEvent_4">
+        <dc:Bounds x="590" y="462" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="608" y="503" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_319" bpmnElement="processJavaException">
+        <dc:Bounds x="444" y="440" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_20" bpmnElement="SequenceFlow_18" sourceElement="_BPMNShape_StartEvent_81" targetElement="_BPMNShape_ScriptTask_319">
+        <di:waypoint xsi:type="dc:Point" x="410" y="480" />
+        <di:waypoint xsi:type="dc:Point" x="444" y="480" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="427" y="465" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_21" bpmnElement="SequenceFlow_19" sourceElement="_BPMNShape_ScriptTask_319" targetElement="_BPMNShape_EndEvent_239">
+        <di:waypoint xsi:type="dc:Point" x="544" y="480" />
+        <di:waypoint xsi:type="dc:Point" x="590" y="480" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="567" y="465" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ExclusiveGateway_1amun4k_di" bpmnElement="ExclusiveGateway_1amun4k" isMarkerVisible="true">
+        <dc:Bounds x="691" y="202" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="683" y="252" width="65" height="36" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="CallActivity_0laaqvh_di" bpmnElement="DeleteVNF">
+        <dc:Bounds x="1436" y="187" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_08nd69s_di" bpmnElement="SequenceFlow_08nd69s">
+        <di:waypoint xsi:type="dc:Point" x="444" y="227" />
+        <di:waypoint xsi:type="dc:Point" x="512" y="227" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="478" y="212" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1qrkdn3_di" bpmnElement="SequenceFlow_1qrkdn3">
+        <di:waypoint xsi:type="dc:Point" x="716" y="202" />
+        <di:waypoint xsi:type="dc:Point" x="716" y="104" />
+        <di:waypoint xsi:type="dc:Point" x="788" y="104" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="722" y="156.4750449879038" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="CallActivity_0qmp9y5_di" bpmnElement="DeleteVFModule">
+        <dc:Bounds x="962" y="64" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ExclusiveGateway_0189gqf_di" bpmnElement="ExclusiveGateway_0189gqf" isMarkerVisible="true">
+        <dc:Bounds x="1304" y="202" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1329" y="252" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1p4ycii_di" bpmnElement="SequenceFlow_1p4ycii">
+        <di:waypoint xsi:type="dc:Point" x="1062" y="104" />
+        <di:waypoint xsi:type="dc:Point" x="1096" y="104" />
+        <di:waypoint xsi:type="dc:Point" x="1096" y="104" />
+        <di:waypoint xsi:type="dc:Point" x="1127" y="104" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1111" y="104" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0t4yszi_di" bpmnElement="SequenceFlow_0t4yszi">
+        <di:waypoint xsi:type="dc:Point" x="1177" y="144" />
+        <di:waypoint xsi:type="dc:Point" x="1177" y="227" />
+        <di:waypoint xsi:type="dc:Point" x="741" y="227" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1192" y="185.5" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1936oc0_di" bpmnElement="SequenceFlow_1936oc0">
+        <di:waypoint xsi:type="dc:Point" x="716" y="252" />
+        <di:waypoint xsi:type="dc:Point" x="716" y="301" />
+        <di:waypoint xsi:type="dc:Point" x="1329" y="301" />
+        <di:waypoint xsi:type="dc:Point" x="1329" y="252" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1017" y="286" width="12" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_05ujwz8_di" bpmnElement="SequenceFlow_05ujwz8">
+        <di:waypoint xsi:type="dc:Point" x="1354" y="227" />
+        <di:waypoint xsi:type="dc:Point" x="1436" y="227" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1395" y="202" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1uqlr6b_di" bpmnElement="SequenceFlow_1uqlr6b">
+        <di:waypoint xsi:type="dc:Point" x="1536" y="227" />
+        <di:waypoint xsi:type="dc:Point" x="1605" y="227" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1571" y="212" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_12xsp2f_di" bpmnElement="QueryVnf">
+        <dc:Bounds x="512" y="187" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ScriptTask_01c9qas_di" bpmnElement="PrepareModuleList">
+        <dc:Bounds x="788" y="64" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0lu7b1v_di" bpmnElement="SequenceFlow_0lu7b1v">
+        <di:waypoint xsi:type="dc:Point" x="612" y="227" />
+        <di:waypoint xsi:type="dc:Point" x="691" y="227" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="652" y="202" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1qoor0l_di" bpmnElement="SequenceFlow_1qoor0l">
+        <di:waypoint xsi:type="dc:Point" x="888" y="104" />
+        <di:waypoint xsi:type="dc:Point" x="928" y="104" />
+        <di:waypoint xsi:type="dc:Point" x="928" y="104" />
+        <di:waypoint xsi:type="dc:Point" x="962" y="104" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="943" y="104" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_11i0rnd_di" bpmnElement="PostProcessDeleteVfModule">
+        <dc:Bounds x="1127" y="64" width="100" height="80" />
+      </bpmndi:BPMNShape>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</bpmn2:definitions>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateNetworkInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateNetworkInstance.bpmn
new file mode 100644
index 0000000000..45e1a49f8a
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateNetworkInstance.bpmn
@@ -0,0 +1,847 @@
+<?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.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+  <bpmn2:process id="DoUpdateNetworkInstance" name="DoUpdateNetworkInstance" isExecutable="true">
+    <bpmn2:startEvent id="updateNetwork_startEvent" name="Start Flow">
+      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
+    </bpmn2:startEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="updateNetwork_startEvent" targetRef="preProcessRequest_ScriptTask" />
+    <bpmn2:scriptTask id="prepareSDNCTopoRequest_ScriptTask" name="Prepare SDNC Topology Request" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_32</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_11</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
+DoUpdateNetworkInstance.prepareSDNCRequest(execution)
+]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_11" name="" sourceRef="prepareSDNCTopoRequest_ScriptTask" targetRef="callAssignSDNCAdapter_CallActivity" />
+    <bpmn2:scriptTask id="validateSDNCResponse_ScriptTask" name="Validate SDNC Response" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_12</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
+DoUpdateNetworkInstance.validateSDNCResponse(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:exclusiveGateway id="isSdncTopoOk_ExclusiveGateway" name="Is SDNC Ok?" default="sdncTopoNo_SequenceFlow">
+      <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>
+      <bpmn2:outgoing>sdncTopoNo_SequenceFlow</bpmn2:outgoing>
+      <bpmn2:outgoing>sdncTopoYes_SequenceFlow</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="sdncTopoNo_SequenceFlow" name="No" sourceRef="isSdncTopoOk_ExclusiveGateway" targetRef="sndcError_EndEvent" />
+    <bpmn2:sequenceFlow id="sdncTopoYes_SequenceFlow" name="Yes" sourceRef="isSdncTopoOk_ExclusiveGateway" targetRef="callRESTReQuery1NetworkID_ScriptTask">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("UPDNETI_sdncResponseSuccess" ) == true}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="validateSDNCResponse_ScriptTask" targetRef="isSdncTopoOk_ExclusiveGateway" />
+    <bpmn2:boundaryEvent id="BoundaryEvent_4" name="" attachedToRef="validateSDNCResponse_ScriptTask">
+      <bpmn2:outgoing>SequenceFlow_34</bpmn2:outgoing>
+      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_84" errorRef="Error_2" />
+    </bpmn2:boundaryEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_34" name="" sourceRef="BoundaryEvent_4" targetRef="sndcError_EndEvent" />
+    <bpmn2:endEvent id="sndcError_EndEvent" name="SNDC Error">
+      <bpmn2:incoming>sdncTopoNo_SequenceFlow</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_34</bpmn2:incoming>
+      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_57" errorRef="Error_2" />
+    </bpmn2:endEvent>
+    <bpmn2:callActivity id="callAssignSDNCAdapter_CallActivity" name="Call SDNC ChangeAssign Adapter V1 Sub-process" calledElement="sdncAdapter">
+      <bpmn2:extensionElements>
+        <camunda:in source="UPDNETI_changeAssignSDNCRequest" target="sdncAdapterWorkflowRequest" />
+        <camunda:out source="sdncAdapterResponse" target="UPDNETI_changeAssignSDNCResponse" />
+        <camunda:out source="SDNCA_ResponseCode" target="UPDNETI_sdncReturnCode" />
+        <camunda:in source="mso-request-id" target="mso-request-id" />
+        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
+        <camunda:out source="WorkflowException" target="UPDNETI_WorkflowException" />
+        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />
+        <camunda:in variables="all" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_11</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_12</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:sequenceFlow id="SequenceFlow_12" name="" sourceRef="callAssignSDNCAdapter_CallActivity" targetRef="validateSDNCResponse_ScriptTask" />
+    <bpmn2:scriptTask id="postProcessAndCompletionRequest_ScriptTask" name="Post Process Response" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_46</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_29</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
+DoUpdateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_29" name="" sourceRef="postProcessAndCompletionRequest_ScriptTask" targetRef="EndEvent_3" />
+    <bpmn2:subProcess id="subProcessException_SubProcess" name="Subprocess For Exception" triggeredByEvent="true">
+      <bpmn2:exclusiveGateway id="isRollbackOn_Network_ExclusiveGateway" name="Is Rollback On?" default="isRollbackOn_NoNetwork_SequenceFlow">
+        <bpmn2:incoming>SequenceFlow_053re4q</bpmn2:incoming>
+        <bpmn2:outgoing>isRollbackOn_YesNetwork_SequenceFlow</bpmn2:outgoing>
+        <bpmn2:outgoing>isRollbackOn_NoNetwork_SequenceFlow</bpmn2:outgoing>
+      </bpmn2:exclusiveGateway>
+      <bpmn2:sequenceFlow id="isRollbackOn_YesNetwork_SequenceFlow" name="Yes" sourceRef="isRollbackOn_Network_ExclusiveGateway" targetRef="isPONR_ExclusiveGateway">
+        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("UPDNETI_rollbackEnabled") == true}]]></bpmn2:conditionExpression>
+      </bpmn2:sequenceFlow>
+      <bpmn2:sequenceFlow id="isRollbackOn_NoNetwork_SequenceFlow" name="No" sourceRef="isRollbackOn_Network_ExclusiveGateway" targetRef="ExclusiveGateway_1dcb5p2" />
+      <bpmn2:startEvent id="subProcessStart_StartEvent" name="Fault Start">
+        <bpmn2:outgoing>SequenceFlow_23</bpmn2:outgoing>
+        <bpmn2:errorEventDefinition id="ErrorEventDefinition_1" errorRef="Error_2" />
+      </bpmn2:startEvent>
+      <bpmn2:sequenceFlow id="SequenceFlow_23" name="" sourceRef="subProcessStart_StartEvent" targetRef="ScriptTask_1gedbow" />
+      <bpmn2:exclusiveGateway id="isPONR_ExclusiveGateway" name="isPONR?" default="isPONR_No_SequenceFlow">
+        <bpmn2:incoming>isRollbackOn_YesNetwork_SequenceFlow</bpmn2:incoming>
+        <bpmn2:outgoing>isPONR_Yes_SequenceFlow</bpmn2:outgoing>
+        <bpmn2:outgoing>isPONR_No_SequenceFlow</bpmn2:outgoing>
+      </bpmn2:exclusiveGateway>
+      <bpmn2:sequenceFlow id="isPONR_Yes_SequenceFlow" name="Yes" sourceRef="isPONR_ExclusiveGateway" targetRef="ExclusiveGateway_1dcb5p2">
+        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("UPDNETI_isPONR") == true}]]></bpmn2:conditionExpression>
+      </bpmn2:sequenceFlow>
+      <bpmn2:sequenceFlow id="isPONR_No_SequenceFlow" name="No" sourceRef="isPONR_ExclusiveGateway" targetRef="ExclusiveGateway_1dcb5p2" />
+      <bpmn2:exclusiveGateway id="sdncOk_ExclusiveGateway" name="is Sdnc Ok?" default="sdncOk_No_ExclusiveGateway">
+        <bpmn2:incoming>SequenceFlow_0nrc66n</bpmn2:incoming>
+        <bpmn2:outgoing>sdncOk_Yeso_ExclusiveGateway</bpmn2:outgoing>
+        <bpmn2:outgoing>sdncOk_No_ExclusiveGateway</bpmn2:outgoing>
+      </bpmn2:exclusiveGateway>
+      <bpmn2:sequenceFlow id="sdncOk_Yeso_ExclusiveGateway" name="Yes" sourceRef="sdncOk_ExclusiveGateway" targetRef="prepareSDNCRollbackRequest_ScriptTask">
+        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("UPDNETI_isSdncRollbackNeeded" ) == true}]]></bpmn2:conditionExpression>
+      </bpmn2:sequenceFlow>
+      <bpmn2:sequenceFlow id="sdncOk_No_ExclusiveGateway" name="No" sourceRef="sdncOk_ExclusiveGateway" targetRef="InclusiveGateway_6" />
+      <bpmn2:scriptTask id="prepareSDNCRollbackRequest_ScriptTask" name="Prepare SDNCRollback Request" scriptFormat="groovy">
+        <bpmn2:incoming>sdncOk_Yeso_ExclusiveGateway</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_53</bpmn2:outgoing>
+        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
+DoUpdateNetworkInstance.prepareSDNCRollbackRequest(execution)]]></bpmn2:script>
+      </bpmn2:scriptTask>
+      <bpmn2:sequenceFlow id="SequenceFlow_53" name="" sourceRef="prepareSDNCRollbackRequest_ScriptTask" targetRef="InclusiveGateway_6" />
+      <bpmn2:endEvent id="EndEvent_4">
+        <bpmn2:incoming>SequenceFlow_04rdjfi</bpmn2:incoming>
+      </bpmn2:endEvent>
+      <bpmn2:inclusiveGateway id="InclusiveGateway_6">
+        <bpmn2:incoming>SequenceFlow_53</bpmn2:incoming>
+        <bpmn2:incoming>sdncOk_No_ExclusiveGateway</bpmn2:incoming>
+        <bpmn2:incoming>SequenceFlow_0srdlf3</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_47</bpmn2:outgoing>
+      </bpmn2:inclusiveGateway>
+      <bpmn2:sequenceFlow id="SequenceFlow_47" name="" sourceRef="InclusiveGateway_6" targetRef="ScriptTask_1p6n2yy" />
+      <bpmn2:scriptTask id="ScriptTask_1p6n2yy" name="Prepare RollbackData" scriptFormat="groovy">
+        <bpmn2:incoming>SequenceFlow_47</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_0qr4es6</bpmn2:outgoing>
+        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
+DoUpdateNetworkInstance.prepareRollbackData(execution)]]></bpmn2:script>
+      </bpmn2:scriptTask>
+      <bpmn2:callActivity id="CallActivity_1kid5y0" name="DoUpdate&#10;NetworkInstanceRollback&#10;" calledElement="DoCreateNetworkInstanceRollback">
+        <bpmn2:extensionElements>
+          <camunda:in source="msoRequestId" target="msoRequestId" />
+          <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
+          <camunda:in source="serviceInstanceId" target="serviceInstanceId" />
+          <camunda:in source="rollbackData" target="rollbackData" />
+          <camunda:in source="mso-request-id" target="mso-request-id" />
+          <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
+          <camunda:in source="WorkflowException" target="WorkflowException" />
+          <camunda:in source="sdncVersion" target="sdncVersion" />
+          <camunda:out source="wasDeleted" target="wasDeleted" />
+          <camunda:out source="rolledBack" target="rolledBack" />
+          <camunda:out source="WorkflowException" target="WorkflowException" />
+          <camunda:out source="workflowException" target="workflowException" />
+          <camunda:in source="SavedWorkflowException1" target="SavedWorkflowException1" />
+        </bpmn2:extensionElements>
+        <bpmn2:incoming>SequenceFlow_0qr4es6</bpmn2:incoming>
+      </bpmn2:callActivity>
+      <bpmn2:scriptTask id="ScriptTask_0voqz6r" name="Post Process Response" scriptFormat="groovy">
+        <bpmn2:incoming>SequenceFlow_0ze5k6c</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_04rdjfi</bpmn2:outgoing>
+        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
+DoUpdateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script>
+      </bpmn2:scriptTask>
+      <bpmn2:sequenceFlow id="SequenceFlow_0qr4es6" sourceRef="ScriptTask_1p6n2yy" targetRef="CallActivity_1kid5y0" />
+      <bpmn2:sequenceFlow id="SequenceFlow_04rdjfi" sourceRef="ScriptTask_0voqz6r" targetRef="EndEvent_4" />
+      <bpmn2:exclusiveGateway id="ExclusiveGateway_1kjh92x" name="is &#39;1702&#39; SNDC Call?">
+        <bpmn2:outgoing>SequenceFlow_0nrc66n</bpmn2:outgoing>
+        <bpmn2:outgoing>SequenceFlow_0srdlf3</bpmn2:outgoing>
+      </bpmn2:exclusiveGateway>
+      <bpmn2:sequenceFlow id="SequenceFlow_0nrc66n" name="No" sourceRef="ExclusiveGateway_1kjh92x" targetRef="sdncOk_ExclusiveGateway" />
+      <bpmn2:sequenceFlow id="SequenceFlow_0srdlf3" name="Yes" sourceRef="ExclusiveGateway_1kjh92x" targetRef="InclusiveGateway_6">
+        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("sdncVersion") == '1702'} ]]></bpmn2:conditionExpression>
+      </bpmn2:sequenceFlow>
+      <bpmn2:scriptTask id="ScriptTask_1gedbow" name="Set Exception Flag" scriptFormat="groovy">
+        <bpmn2:incoming>SequenceFlow_23</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_053re4q</bpmn2:outgoing>
+        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
+DoUpdateNetworkInstance.setExceptionFlag(execution)]]></bpmn2:script>
+      </bpmn2:scriptTask>
+      <bpmn2:sequenceFlow id="SequenceFlow_053re4q" sourceRef="ScriptTask_1gedbow" targetRef="isRollbackOn_Network_ExclusiveGateway" />
+      <bpmn2:inclusiveGateway id="ExclusiveGateway_1dcb5p2">
+        <bpmn2:incoming>isPONR_Yes_SequenceFlow</bpmn2:incoming>
+        <bpmn2:incoming>isRollbackOn_NoNetwork_SequenceFlow</bpmn2:incoming>
+        <bpmn2:incoming>isPONR_No_SequenceFlow</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_0ze5k6c</bpmn2:outgoing>
+      </bpmn2:inclusiveGateway>
+      <bpmn2:sequenceFlow id="SequenceFlow_0ze5k6c" sourceRef="ExclusiveGateway_1dcb5p2" targetRef="ScriptTask_0voqz6r" />
+      <bpmn2:textAnnotation id="TextAnnotation_0qx19b9">      <bpmn2:text>Note: Rollback is not needed for UpdateNetwork,</bpmn2:text>
+</bpmn2:textAnnotation>
+      <bpmn2:association id="Association_10dk4x3" sourceRef="CallActivity_1kid5y0" targetRef="TextAnnotation_0qx19b9" />
+    </bpmn2:subProcess>
+    <bpmn2:scriptTask id="callRESTReQuery2NetworkID_ScriptTask" name="Call REST ReQuery2 Network Id in AAI" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_13</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_35</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
+DoUpdateNetworkInstance.callRESTReQueryAAINetworkId(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_35" name="" sourceRef="callRESTReQuery2NetworkID_ScriptTask" targetRef="callRESTUpdateContrailNetwork_ScriptTask" />
+    <bpmn2:scriptTask id="callRESTUpdateContrailNetwork_ScriptTask" name="Call REST Update Contrail Network in AAI" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_35</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_46</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
+DoUpdateNetworkInstance.callRESTUpdateContrailAAINetwork(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_46" name="PONR" sourceRef="callRESTUpdateContrailNetwork_ScriptTask" targetRef="postProcessAndCompletionRequest_ScriptTask" />
+    <bpmn2:endEvent id="EndEvent_3">
+      <bpmn2:incoming>SequenceFlow_29</bpmn2:incoming>
+    </bpmn2:endEvent>
+    <bpmn2:subProcess id="unexpectedErrors_SubProcess" name="Sub-process for UnexpectedErrors" triggeredByEvent="true">
+      <bpmn2:scriptTask id="ScriptTask_1" name="Log / Print Unexpected Error" scriptFormat="groovy">
+        <bpmn2:incoming>SequenceFlow_10</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>
+        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
+DoUpdateNetworkInstance.processJavaException(execution)]]></bpmn2:script>
+      </bpmn2:scriptTask>
+      <bpmn2:sequenceFlow id="SequenceFlow_14" name="" sourceRef="ScriptTask_1" targetRef="EndEvent_1" />
+      <bpmn2:startEvent id="StartEvent_1">
+        <bpmn2:outgoing>SequenceFlow_10</bpmn2:outgoing>
+        <bpmn2:errorEventDefinition id="ErrorEventDefinition_2" errorRef="Error_1" />
+      </bpmn2:startEvent>
+      <bpmn2:sequenceFlow id="SequenceFlow_10" name="" sourceRef="StartEvent_1" targetRef="ScriptTask_1" />
+      <bpmn2:endEvent id="EndEvent_1">
+        <bpmn2:incoming>SequenceFlow_14</bpmn2:incoming>
+      </bpmn2:endEvent>
+    </bpmn2:subProcess>
+    <bpmn2:scriptTask id="preProcessRequest_ScriptTask" name="PreProcess Incoming Request" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
+DoUpdateNetworkInstance.preProcessRequest(execution)
+]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="preProcessRequest_ScriptTask" targetRef="callGetServiceInstance" />
+    <bpmn2:scriptTask id="callRESTQueryCloudRegion_ScriptTask" name="Call REST Query Cloud Region " scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_24</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_32</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
+DoUpdateNetworkInstance.callRESTQueryAAICloudRegion(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_32" name="" sourceRef="callRESTQueryCloudRegion_ScriptTask" targetRef="prepareSDNCTopoRequest_ScriptTask" />
+    <bpmn2:scriptTask id="callRESTQueryNetworkId_ScriptTask" name="Call REST Query Network Id In AAI" scriptFormat="groovy">
+      <bpmn2:incoming>siFoundYes</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_24</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
+DoUpdateNetworkInstance.callRESTQueryAAINetworkId(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_24" name="" sourceRef="callRESTQueryNetworkId_ScriptTask" targetRef="callRESTQueryCloudRegion_ScriptTask" />
+    <bpmn2:endEvent id="EndEvent_2">
+      <bpmn2:incoming>SequenceFlow_30</bpmn2:incoming>
+      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_97" errorRef="Error_2" />
+    </bpmn2:endEvent>
+    <bpmn2:scriptTask id="workflowExceptionSINotFound" name="Create Workflow Exception" scriptFormat="groovy">
+      <bpmn2:incoming>siFoundNo</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_30</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.utils.*
+ExceptionUtil exceptionUtil = new ExceptionUtil()
+exceptionUtil.buildWorkflowException(execution, 404, "Service Instance Not Found")]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_30" name="" sourceRef="workflowExceptionSINotFound" targetRef="EndEvent_2" />
+    <bpmn2:exclusiveGateway id="siFoundCheck" name="is SI Found?" default="siFoundNo">
+      <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>
+      <bpmn2:outgoing>siFoundYes</bpmn2:outgoing>
+      <bpmn2:outgoing>siFoundNo</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="siFoundYes" name="Yes" sourceRef="siFoundCheck" targetRef="callRESTQueryNetworkId_ScriptTask">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("GENGSI_FoundIndicator" ) == true && execution.getVariable("GENGSI_SuccessIndicator" ) == true}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="siFoundNo" name="No" sourceRef="siFoundCheck" targetRef="workflowExceptionSINotFound" />
+    <bpmn2:callActivity id="callGetServiceInstance" name="Get
&#10;Service
&#10;Instance" calledElement="GenericGetService">
+      <bpmn2:extensionElements>
+        <camunda:in source="UPDNETI_serviceInstanceId" target="GENGS_serviceInstanceId" />
+        <camunda:out source="GENGS_serviceInstance" target="UPDNETI_serviceInstanceId" />
+        <camunda:out source="GENGS_FoundIndicator" target="GENGSI_FoundIndicator" />
+        <camunda:out source="GENGS_SuccessIndicator" target="GENGSI_SuccessIndicator" />
+        <camunda:out source="GENGS_siResourceLink" target="GENGSI_siResourceLink" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:in source="GENGS_type" target="GENGS_type" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="callGetServiceInstance" targetRef="siFoundCheck" />
+    <bpmn2:scriptTask id="validateUpdatePONetwork_ScriptTask" name="Validate Update PO Network" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_59</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_13</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
+DoUpdateNetworkInstance.validateUpdateNetworkResponse(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_13" name="" sourceRef="validateUpdatePONetwork_ScriptTask" targetRef="callRESTReQuery2NetworkID_ScriptTask" />
+    <bpmn2:serviceTask id="callUpdateNetwork_ServiceTask" name="Call Update Network">
+      <bpmn2:extensionElements>
+        <camunda:connector>
+          <camunda:inputOutput>
+            <camunda:inputParameter name="payload">${UPDNETI_updateNetworkRequest}</camunda:inputParameter>
+            <camunda:inputParameter name="url">${URN_mso_adapters_network_rest_endpoint}/${UPDNETI_networkId}</camunda:inputParameter>
+            <camunda:inputParameter name="headers">
+              <camunda:map>
+                <camunda:entry key="Authorization">#{BasicAuthHeaderValuePO}</camunda:entry>
+                <camunda:entry key="content-type">application/xml</camunda:entry>
+              </camunda:map>
+            </camunda:inputParameter>
+            <camunda:inputParameter name="method">PUT</camunda:inputParameter>
+            <camunda:outputParameter name="UPDNETI_networkReturnCode">${statusCode}</camunda:outputParameter>
+            <camunda:outputParameter name="UPDNETI_updateNetworkResponse">${response}</camunda:outputParameter>
+          </camunda:inputOutput>
+          <camunda:connectorId>http-connector</camunda:connectorId>
+        </camunda:connector>
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_61</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_59</bpmn2:outgoing>
+    </bpmn2:serviceTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_59" name="" sourceRef="callUpdateNetwork_ServiceTask" targetRef="validateUpdatePONetwork_ScriptTask" />
+    <bpmn2:scriptTask id="prepareNetworkRequest_ScriptTask" name="Prepare Create Network Request" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_61</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
+DoUpdateNetworkInstance.prepareUpdateNetworkRequest(execution)
+]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_61" name="" sourceRef="prepareNetworkRequest_ScriptTask" targetRef="callUpdateNetwork_ServiceTask" />
+    <bpmn2:scriptTask id="callRESTQueryNetworkTableRef_ScriptTask" name="Call REST Query Network TableRef in AAI" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_38</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
+DoUpdateNetworkInstance.callRESTQueryAAINetworkTableRef(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="callRESTQueryNetworkTableRef_ScriptTask" targetRef="prepareNetworkRequest_ScriptTask" />
+    <bpmn2:scriptTask id="callRESTReQuery1NetworkID_ScriptTask" name="Call REST ReQuery1 Network Id in AAI" scriptFormat="groovy">
+      <bpmn2:incoming>sdncTopoYes_SequenceFlow</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
+DoUpdateNetworkInstance.callRESTReQueryAAINetworkId(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="callRESTReQuery1NetworkID_ScriptTask" targetRef="callRESTQueryVpnBinding_ScriptTask" />
+    <bpmn2:scriptTask id="callRESTQueryVpnBinding_ScriptTask" name="Call REST Query Vpn Binding in AAI" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_6</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_15</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
+DoUpdateNetworkInstance.callRESTQueryAAINetworkVpnBinding(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_15" name="" sourceRef="callRESTQueryVpnBinding_ScriptTask" targetRef="callRESTQueryNetworkPolicy_ScriptTask" />
+    <bpmn2:scriptTask id="callRESTQueryNetworkPolicy_ScriptTask" name="Call REST Query Network Policy in AAI" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_15</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_38</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
+DoUpdateNetworkInstance.callRESTQueryAAINetworkPolicy(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_38" name="" sourceRef="callRESTQueryNetworkPolicy_ScriptTask" targetRef="callRESTQueryNetworkTableRef_ScriptTask" />
+  </bpmn2:process>
+  <bpmn2:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" />
+  <bpmn2:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" />
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoUpdateNetworkInstance">
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="updateNetwork_startEvent">
+        <dc:Bounds x="286" y="185" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="279" y="226" width="49" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_61" bpmnElement="preProcessRequest_ScriptTask">
+        <dc:Bounds x="472" y="163" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_47" targetElement="_BPMNShape_ScriptTask_61">
+        <di:waypoint xsi:type="dc:Point" x="322" y="203" />
+        <di:waypoint xsi:type="dc:Point" x="472" y="203" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="397" y="188" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_63" bpmnElement="validateUpdatePONetwork_ScriptTask">
+        <dc:Bounds x="1343" y="1311" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ServiceTask_83" bpmnElement="callUpdateNetwork_ServiceTask">
+        <dc:Bounds x="1342" y="1176" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_67" bpmnElement="prepareSDNCTopoRequest_ScriptTask">
+        <dc:Bounds x="1519" y="100" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_SubProcess_16" bpmnElement="subProcessException_SubProcess" isExpanded="true">
+        <dc:Bounds x="-153" y="594" width="1288" height="701" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_50" bpmnElement="subProcessStart_StartEvent">
+        <dc:Bounds x="-103" y="1160" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="-109" y="1201" width="50" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_67" bpmnElement="isSdncTopoOk_ExclusiveGateway" isMarkerVisible="true">
+        <dc:Bounds x="1544" y="521" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1535" y="577" width="67" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_26" bpmnElement="sdncTopoNo_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_67" targetElement="_BPMNShape_EndEvent_124">
+        <di:waypoint xsi:type="dc:Point" x="1594" y="546" />
+        <di:waypoint xsi:type="dc:Point" x="1682" y="546" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1600" y="546.8622891951518" width="14" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_28" bpmnElement="sdncTopoYes_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_67" targetElement="_BPMNShape_ScriptTask_336">
+        <di:waypoint xsi:type="dc:Point" x="1544" y="546" />
+        <di:waypoint xsi:type="dc:Point" x="1393" y="546" />
+        <di:waypoint xsi:type="dc:Point" x="1393" y="576" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1526" y="546" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_80" bpmnElement="postProcessAndCompletionRequest_ScriptTask">
+        <dc:Bounds x="743" y="1390" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_124" bpmnElement="sndcError_EndEvent">
+        <dc:Bounds x="1682" y="528" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1663" y="569" width="74" height="22" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_CallActivity_19" bpmnElement="callAssignSDNCAdapter_CallActivity">
+        <dc:Bounds x="1519" y="242" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_24" bpmnElement="SequenceFlow_11" sourceElement="_BPMNShape_ScriptTask_67" targetElement="_BPMNShape_CallActivity_19">
+        <di:waypoint xsi:type="dc:Point" x="1569" y="180" />
+        <di:waypoint xsi:type="dc:Point" x="1569" y="242" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1584" y="211" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_29" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_CallActivity_19" targetElement="_BPMNShape_ScriptTask_131">
+        <di:waypoint xsi:type="dc:Point" x="1569" y="322" />
+        <di:waypoint xsi:type="dc:Point" x="1569" y="373" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1584" y="347.5" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ScriptTask_61">
+        <di:waypoint xsi:type="dc:Point" x="572" y="203" />
+        <di:waypoint xsi:type="dc:Point" x="686" y="203" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="629" y="188" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_35" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_StartEvent_50" targetElement="_BPMNShape_ExclusiveGateway_90">
+        <di:waypoint xsi:type="dc:Point" x="-67" y="1178" />
+        <di:waypoint xsi:type="dc:Point" x="-40" y="1178" />
+        <di:waypoint xsi:type="dc:Point" x="-11" y="1178" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="-53" y="1163" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_131" bpmnElement="validateSDNCResponse_ScriptTask">
+        <dc:Bounds x="1519" y="373" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ScriptTask_131" targetElement="_BPMNShape_ExclusiveGateway_67">
+        <di:waypoint xsi:type="dc:Point" x="1569" y="453" />
+        <di:waypoint xsi:type="dc:Point" x="1569" y="521" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1584" y="487" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_42" bpmnElement="SequenceFlow_29" sourceElement="_BPMNShape_ScriptTask_80">
+        <di:waypoint xsi:type="dc:Point" x="743" y="1430" />
+        <di:waypoint xsi:type="dc:Point" x="635" y="1430" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="689" y="1415" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_133" bpmnElement="callRESTQueryNetworkId_ScriptTask">
+        <dc:Bounds x="984" y="100" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_134" bpmnElement="callRESTReQuery2NetworkID_ScriptTask">
+        <dc:Bounds x="1176" y="1390" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_135" bpmnElement="callRESTUpdateContrailNetwork_ScriptTask">
+        <dc:Bounds x="984" y="1390" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_54" bpmnElement="SequenceFlow_35" sourceElement="_BPMNShape_ScriptTask_134" targetElement="_BPMNShape_ScriptTask_135">
+        <di:waypoint xsi:type="dc:Point" x="1176" y="1430" />
+        <di:waypoint xsi:type="dc:Point" x="1084" y="1430" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1130" y="1415" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_65" bpmnElement="SequenceFlow_46" sourceElement="_BPMNShape_ScriptTask_135">
+        <di:waypoint xsi:type="dc:Point" x="984" y="1430" />
+        <di:waypoint xsi:type="dc:Point" x="843" y="1430" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="935" y="1431.2411831373652" width="32" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_156" bpmnElement="callRESTQueryVpnBinding_ScriptTask">
+        <dc:Bounds x="1341" y="688" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="SequenceFlow_15" sourceElement="_BPMNShape_ScriptTask_156" targetElement="_BPMNShape_ScriptTask_215">
+        <di:waypoint xsi:type="dc:Point" x="1391" y="768" />
+        <di:waypoint xsi:type="dc:Point" x="1391" y="810" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1388" y="781" width="6" height="6" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_87" bpmnElement="SequenceFlow_59" sourceElement="_BPMNShape_ServiceTask_83" targetElement="_BPMNShape_ScriptTask_63">
+        <di:waypoint xsi:type="dc:Point" x="1392" y="1256" />
+        <di:waypoint xsi:type="dc:Point" x="1393" y="1311" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1390" y="1284" width="6" height="6" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_157" bpmnElement="prepareNetworkRequest_ScriptTask">
+        <dc:Bounds x="1342" y="1052" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_89" bpmnElement="SequenceFlow_61" sourceElement="_BPMNShape_ScriptTask_157" targetElement="_BPMNShape_ServiceTask_83">
+        <di:waypoint xsi:type="dc:Point" x="1392" y="1132" />
+        <di:waypoint xsi:type="dc:Point" x="1392" y="1176" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1389" y="1159" width="6" height="6" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_90" bpmnElement="isRollbackOn_Network_ExclusiveGateway" isMarkerVisible="true">
+        <dc:Bounds x="156" y="1153" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="143" y="1213" width="78" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_25" bpmnElement="isRollbackOn_YesNetwork_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_90" targetElement="_BPMNShape_ExclusiveGateway_215">
+        <di:waypoint xsi:type="dc:Point" x="181" y="1153" />
+        <di:waypoint xsi:type="dc:Point" x="181" y="1089" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="187" y="1133.4787123394708" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_34" bpmnElement="isRollbackOn_NoNetwork_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_90" targetElement="_BPMNShape_InclusiveGateway_24">
+        <di:waypoint xsi:type="dc:Point" x="206" y="1178" />
+        <di:waypoint xsi:type="dc:Point" x="372" y="1178" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="206" y="1182.7278101950883" width="14" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_215" bpmnElement="callRESTQueryNetworkPolicy_ScriptTask">
+        <dc:Bounds x="1341" y="810" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_60" bpmnElement="SequenceFlow_38" sourceElement="_BPMNShape_ScriptTask_215" targetElement="_BPMNShape_ScriptTask_335">
+        <di:waypoint xsi:type="dc:Point" x="1391" y="890" />
+        <di:waypoint xsi:type="dc:Point" x="1391" y="926" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1388" y="900" width="6" height="6" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_InclusiveGateway_24" bpmnElement="InclusiveGateway_6">
+        <dc:Bounds x="626" y="859" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="651" y="914" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_215" bpmnElement="isPONR_ExclusiveGateway" isMarkerVisible="true">
+        <dc:Bounds x="156" y="1039" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="90" y="1054" width="46" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_77" bpmnElement="isPONR_Yes_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_215" targetElement="_BPMNShape_InclusiveGateway_24">
+        <di:waypoint xsi:type="dc:Point" x="206" y="1064" />
+        <di:waypoint xsi:type="dc:Point" x="397" y="1064" />
+        <di:waypoint xsi:type="dc:Point" x="397" y="1153" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="213" y="1067.6448598130842" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_85" bpmnElement="isPONR_No_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_215">
+        <di:waypoint xsi:type="dc:Point" x="181" y="1039" />
+        <di:waypoint xsi:type="dc:Point" x="181" y="971" />
+        <di:waypoint xsi:type="dc:Point" x="397" y="971" />
+        <di:waypoint xsi:type="dc:Point" x="397" y="1153" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="185" y="1027.872131147541" width="14" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_217" bpmnElement="sdncOk_ExclusiveGateway" isMarkerVisible="true">
+        <dc:Bounds x="493" y="709" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="488" y="683" width="60" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_92" bpmnElement="sdncOk_Yeso_ExclusiveGateway" sourceElement="_BPMNShape_ExclusiveGateway_217" targetElement="_BPMNShape_ScriptTask_261">
+        <di:waypoint xsi:type="dc:Point" x="543" y="734" />
+        <di:waypoint xsi:type="dc:Point" x="601" y="733" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="545" y="737.2172362208834" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_93" bpmnElement="sdncOk_No_ExclusiveGateway" sourceElement="_BPMNShape_ExclusiveGateway_217">
+        <di:waypoint xsi:type="dc:Point" x="517" y="758" />
+        <di:waypoint xsi:type="dc:Point" x="517" y="884" />
+        <di:waypoint xsi:type="dc:Point" x="626" y="884" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="526" y="761.1171067354646" width="14" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_177" bpmnElement="EndEvent_3">
+        <dc:Bounds x="599" y="1412" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="617" y="1453" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_178" bpmnElement="EndEvent_4">
+        <dc:Bounds x="1029" y="968" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1047" y="1009" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_245" bpmnElement="callRESTQueryCloudRegion_ScriptTask">
+        <dc:Bounds x="1200" y="100" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_53" bpmnElement="SequenceFlow_32" sourceElement="_BPMNShape_ScriptTask_245" targetElement="_BPMNShape_ScriptTask_67">
+        <di:waypoint xsi:type="dc:Point" x="1300" y="140" />
+        <di:waypoint xsi:type="dc:Point" x="1519" y="140" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1410" y="125" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_BoundaryEvent_38" bpmnElement="BoundaryEvent_4">
+        <dc:Bounds x="1601" y="355" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1619" y="391" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_69" bpmnElement="SequenceFlow_34" sourceElement="_BPMNShape_BoundaryEvent_38" targetElement="_BPMNShape_EndEvent_124">
+        <di:waypoint xsi:type="dc:Point" x="1637" y="373" />
+        <di:waypoint xsi:type="dc:Point" x="1700" y="373" />
+        <di:waypoint xsi:type="dc:Point" x="1700" y="528" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1669" y="358" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_261" bpmnElement="prepareSDNCRollbackRequest_ScriptTask">
+        <dc:Bounds x="601" y="694" width="100" height="79" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_76" bpmnElement="SequenceFlow_47" sourceElement="_BPMNShape_InclusiveGateway_24">
+        <di:waypoint xsi:type="dc:Point" x="651" y="909" />
+        <di:waypoint xsi:type="dc:Point" x="651" y="946" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="666" y="927.5" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_84" bpmnElement="SequenceFlow_53" sourceElement="_BPMNShape_ScriptTask_261">
+        <di:waypoint xsi:type="dc:Point" x="651" y="773" />
+        <di:waypoint xsi:type="dc:Point" x="651" y="859" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="666" y="816" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_19" bpmnElement="SequenceFlow_13" sourceElement="_BPMNShape_ScriptTask_63" targetElement="_BPMNShape_ScriptTask_134">
+        <di:waypoint xsi:type="dc:Point" x="1393" y="1391" />
+        <di:waypoint xsi:type="dc:Point" x="1393" y="1430" />
+        <di:waypoint xsi:type="dc:Point" x="1310" y="1430" />
+        <di:waypoint xsi:type="dc:Point" x="1276" y="1430" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1390" y="1425" width="6" height="6" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_SubProcess_28" bpmnElement="unexpectedErrors_SubProcess" isExpanded="true">
+        <dc:Bounds x="-62" y="375" width="394" height="188" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_71" bpmnElement="StartEvent_1">
+        <dc:Bounds x="-29" y="452" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="-11" y="493" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_270" bpmnElement="ScriptTask_1">
+        <dc:Bounds x="86" y="430" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_220" bpmnElement="EndEvent_1">
+        <dc:Bounds x="247" y="452" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="265" y="493" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_StartEvent_71" targetElement="_BPMNShape_ScriptTask_270">
+        <di:waypoint xsi:type="dc:Point" x="7" y="470" />
+        <di:waypoint xsi:type="dc:Point" x="86" y="470" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="49" y="470" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_ScriptTask_270" targetElement="_BPMNShape_EndEvent_220">
+        <di:waypoint xsi:type="dc:Point" x="186" y="470" />
+        <di:waypoint xsi:type="dc:Point" x="247" y="470" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="221" y="470" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_CallActivity_72" bpmnElement="callGetServiceInstance">
+        <dc:Bounds x="686" y="163" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_244" bpmnElement="siFoundCheck" isMarkerVisible="true">
+        <dc:Bounds x="836" y="177" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="891" y="195" width="79" height="22" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_CallActivity_72" targetElement="_BPMNShape_ExclusiveGateway_244">
+        <di:waypoint xsi:type="dc:Point" x="786" y="203" />
+        <di:waypoint xsi:type="dc:Point" x="805" y="203" />
+        <di:waypoint xsi:type="dc:Point" x="805" y="202" />
+        <di:waypoint xsi:type="dc:Point" x="836" y="202" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="799" y="203" width="6" height="6" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_17" bpmnElement="siFoundYes" sourceElement="_BPMNShape_ExclusiveGateway_244" targetElement="_BPMNShape_ScriptTask_133">
+        <di:waypoint xsi:type="dc:Point" x="861" y="177" />
+        <di:waypoint xsi:type="dc:Point" x="861" y="140" />
+        <di:waypoint xsi:type="dc:Point" x="910" y="140" />
+        <di:waypoint xsi:type="dc:Point" x="984" y="140" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="868" y="157" width="29" height="22" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_247" bpmnElement="EndEvent_2">
+        <dc:Bounds x="1155" y="278" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1173" y="319" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_331" bpmnElement="workflowExceptionSINotFound">
+        <dc:Bounds x="984" y="256" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_20" bpmnElement="siFoundNo" sourceElement="_BPMNShape_ExclusiveGateway_244" targetElement="_BPMNShape_ScriptTask_331">
+        <di:waypoint xsi:type="dc:Point" x="861" y="227" />
+        <di:waypoint xsi:type="dc:Point" x="861" y="296" />
+        <di:waypoint xsi:type="dc:Point" x="984" y="296" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="871" y="233" width="22" height="22" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_21" bpmnElement="SequenceFlow_30" sourceElement="_BPMNShape_ScriptTask_331" targetElement="_BPMNShape_EndEvent_247">
+        <di:waypoint xsi:type="dc:Point" x="1084" y="296" />
+        <di:waypoint xsi:type="dc:Point" x="1155" y="296" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1103" y="296" width="6" height="6" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_22" bpmnElement="SequenceFlow_24" sourceElement="_BPMNShape_ScriptTask_133" targetElement="_BPMNShape_ScriptTask_245">
+        <di:waypoint xsi:type="dc:Point" x="1084" y="140" />
+        <di:waypoint xsi:type="dc:Point" x="1200" y="140" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1127" y="140" width="6" height="6" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_335" bpmnElement="callRESTQueryNetworkTableRef_ScriptTask">
+        <dc:Bounds x="1341" y="926" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_335" targetElement="_BPMNShape_ScriptTask_157">
+        <di:waypoint xsi:type="dc:Point" x="1391" y="1006" />
+        <di:waypoint xsi:type="dc:Point" x="1392" y="1052" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1388" y="1028" width="6" height="6" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_336" bpmnElement="callRESTReQuery1NetworkID_ScriptTask">
+        <dc:Bounds x="1343" y="576" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_ScriptTask_336" targetElement="_BPMNShape_ScriptTask_156">
+        <di:waypoint xsi:type="dc:Point" x="1393" y="656" />
+        <di:waypoint xsi:type="dc:Point" x="1393" y="672" />
+        <di:waypoint xsi:type="dc:Point" x="1391" y="672" />
+        <di:waypoint xsi:type="dc:Point" x="1391" y="688" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1390" y="666" width="6" height="6" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_1p6n2yy_di" bpmnElement="ScriptTask_1p6n2yy">
+        <dc:Bounds x="601" y="946" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="CallActivity_1kid5y0_di" bpmnElement="CallActivity_1kid5y0">
+        <dc:Bounds x="739" y="946" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ScriptTask_0voqz6r_di" bpmnElement="ScriptTask_0voqz6r">
+        <dc:Bounds x="883" y="946" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0qr4es6_di" bpmnElement="SequenceFlow_0qr4es6">
+        <di:waypoint xsi:type="dc:Point" x="701" y="986" />
+        <di:waypoint xsi:type="dc:Point" x="739" y="986" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="720" y="971" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_04rdjfi_di" bpmnElement="SequenceFlow_04rdjfi">
+        <di:waypoint xsi:type="dc:Point" x="983" y="986" />
+        <di:waypoint xsi:type="dc:Point" x="1029" y="986" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1006" y="961" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ExclusiveGateway_1kjh92x_di" bpmnElement="ExclusiveGateway_1kjh92x" isMarkerVisible="true">
+        <dc:Bounds x="372" y="709" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="368" y="672" width="76" height="24" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0nrc66n_di" bpmnElement="SequenceFlow_0nrc66n">
+        <di:waypoint xsi:type="dc:Point" x="422" y="734" />
+        <di:waypoint xsi:type="dc:Point" x="493" y="734" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="427" y="735" width="14" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0srdlf3_di" bpmnElement="SequenceFlow_0srdlf3">
+        <di:waypoint xsi:type="dc:Point" x="397" y="759" />
+        <di:waypoint xsi:type="dc:Point" x="397" y="884" />
+        <di:waypoint xsi:type="dc:Point" x="626" y="884" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="402" y="760" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_1gedbow_di" bpmnElement="ScriptTask_1gedbow">
+        <dc:Bounds x="-11" y="1138" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_053re4q_di" bpmnElement="SequenceFlow_053re4q">
+        <di:waypoint xsi:type="dc:Point" x="89" y="1178" />
+        <di:waypoint xsi:type="dc:Point" x="156" y="1178" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="123" y="1163" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="InclusiveGateway_1adrta3_di" bpmnElement="ExclusiveGateway_1dcb5p2">
+        <dc:Bounds x="372" y="1153" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="397" y="1203" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0ze5k6c_di" bpmnElement="SequenceFlow_0ze5k6c">
+        <di:waypoint xsi:type="dc:Point" x="422" y="1178" />
+        <di:waypoint xsi:type="dc:Point" x="933" y="1178" />
+        <di:waypoint xsi:type="dc:Point" x="933" y="1026" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="678" y="1163" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="TextAnnotation_0qx19b9_di" bpmnElement="TextAnnotation_0qx19b9">
+        <dc:Bounds x="736" y="808" width="168" height="39" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="Association_10dk4x3_di" bpmnElement="Association_10dk4x3">
+        <di:waypoint xsi:type="dc:Point" x="797" y="946" />
+        <di:waypoint xsi:type="dc:Point" x="816" y="847" />
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</bpmn2:definitions>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateNetworkInstanceRollback.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateNetworkInstanceRollback.bpmn
new file mode 100644
index 0000000000..6fd0565f3a
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateNetworkInstanceRollback.bpmn
@@ -0,0 +1,373 @@
+<?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" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0">
+  <bpmn:process id="DoUpdateNetworkInstanceRollback" name="DoUpdateNetworkInstanceRollback" isExecutable="true">
+    <bpmn:startEvent id="StartEvent_1">
+      <bpmn:outgoing>SequenceFlow_1krl2dg</bpmn:outgoing>
+    </bpmn:startEvent>
+    <bpmn:scriptTask id="Task_0whino1" name="PreProcess Incoming Data" scriptFormat="groovy">
+      <bpmn:incoming>SequenceFlow_1krl2dg</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_0u41iz2</bpmn:outgoing>
+      <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def DoUpdateNetworkInstanceRollback = new DoUpdateNetworkInstanceRollback()
+DoUpdateNetworkInstanceRollback.preProcessRequest(execution)]]></bpmn:script>
+    </bpmn:scriptTask>
+    <bpmn:sequenceFlow id="SequenceFlow_1krl2dg" sourceRef="StartEvent_1" targetRef="Task_0whino1" />
+    <bpmn:sequenceFlow id="SequenceFlow_0u41iz2" sourceRef="Task_0whino1" targetRef="ExclusiveGateway_0v0en47" />
+    <bpmn:serviceTask id="ServiceTask_0bqh5yl" name="Call Rollback Network">
+      <bpmn:extensionElements>
+        <camunda:connector>
+          <camunda:inputOutput>
+            <camunda:inputParameter name="payload">${UPDNETIR_rollbackNetworkRequest}</camunda:inputParameter>
+            <camunda:inputParameter name="url">${URN_mso_adapters_network_rest_endpoint}</camunda:inputParameter>
+            <camunda:inputParameter name="headers">
+              <camunda:map>
+                <camunda:entry key="Authorization">#{BasicAuthHeaderValuePO}</camunda:entry>
+                <camunda:entry key="content-type">application/xml</camunda:entry>
+              </camunda:map>
+            </camunda:inputParameter>
+            <camunda:inputParameter name="method">PUT</camunda:inputParameter>
+            <camunda:outputParameter name="UPDNETIR_rollbackNetworkReturnCode">${statusCode}</camunda:outputParameter>
+            <camunda:outputParameter name="UPDNETIR_rollbackNetworkResponse">${response}</camunda:outputParameter>
+          </camunda:inputOutput>
+          <camunda:connectorId>http-connector</camunda:connectorId>
+        </camunda:connector>
+      </bpmn:extensionElements>
+      <bpmn:incoming>SequenceFlow_0e1uixp</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_17o4w67</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:exclusiveGateway id="ExclusiveGateway_0v0en47" name="is PO Network Rollback?" default="SequenceFlow_1lteduj">
+      <bpmn:incoming>SequenceFlow_0u41iz2</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_0e1uixp</bpmn:outgoing>
+      <bpmn:outgoing>SequenceFlow_1lteduj</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:callActivity id="CallActivity_1xilevb" name="Call Rollback SDNC Adapter" calledElement="sdncAdapter">
+      <bpmn:extensionElements>
+        <camunda:in source="UPDNETIR_rollbackSDNCRequest" target="sdncAdapterWorkflowRequest" />
+        <camunda:in source="mso-request-id" target="mso-request-id" />
+        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
+        <camunda:out source="SDNCA_ResponseCode" target="UPDNETIR_rollbackSDNCReturnCode" />
+        <camunda:out source="sdncAdapterResponse" target="UPDNETIR_rollbackSDNCResponse" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />
+      </bpmn:extensionElements>
+      <bpmn:incoming>SequenceFlow_101y57s</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_0790olb</bpmn:outgoing>
+    </bpmn:callActivity>
+    <bpmn:exclusiveGateway id="ExclusiveGateway_17g4q5c" name="is RSRC SDNC?" default="SequenceFlow_101y57s">
+      <bpmn:incoming>SequenceFlow_0virkpu</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_101y57s</bpmn:outgoing>
+      <bpmn:outgoing>SequenceFlow_0mw0dgd</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:scriptTask id="ScriptTask_1ggaxfu" name="Validate Rollback Responses" scriptFormat="groovy">
+      <bpmn:incoming>SequenceFlow_0qc4v9t</bpmn:incoming>
+      <bpmn:incoming>SequenceFlow_0el8yzs</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_0yto4gz</bpmn:outgoing>
+      <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def DoUpdateNetworkInstanceRollback = new DoUpdateNetworkInstanceRollback()
+DoUpdateNetworkInstanceRollback.validateRollbackResponses(execution)]]></bpmn:script>
+    </bpmn:scriptTask>
+    <bpmn:exclusiveGateway id="ExclusiveGateway_1n5jck8" name="is SDNC Rollback?" default="SequenceFlow_0qc4v9t">
+      <bpmn:incoming>SequenceFlow_1lteduj</bpmn:incoming>
+      <bpmn:incoming>SequenceFlow_17o4w67</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_0virkpu</bpmn:outgoing>
+      <bpmn:outgoing>SequenceFlow_0qc4v9t</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:sequenceFlow id="SequenceFlow_0e1uixp" name="Yes" sourceRef="ExclusiveGateway_0v0en47" targetRef="ServiceTask_0bqh5yl">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("UPDNETIR_rollbackNetworkRequest") != null}]]></bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="SequenceFlow_1lteduj" name="No" sourceRef="ExclusiveGateway_0v0en47" targetRef="ExclusiveGateway_1n5jck8" />
+    <bpmn:sequenceFlow id="SequenceFlow_0virkpu" name="Yes" sourceRef="ExclusiveGateway_1n5jck8" targetRef="ExclusiveGateway_17g4q5c">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("UPDNETIR_rollbackSDNCRequest") != null}]]></bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="SequenceFlow_17o4w67" sourceRef="ServiceTask_0bqh5yl" targetRef="ExclusiveGateway_1n5jck8" />
+    <bpmn:sequenceFlow id="SequenceFlow_101y57s" name="No" sourceRef="ExclusiveGateway_17g4q5c" targetRef="CallActivity_1xilevb" />
+    <bpmn:sequenceFlow id="SequenceFlow_0mw0dgd" name="Yes" sourceRef="ExclusiveGateway_17g4q5c" targetRef="ExclusiveGateway_0b9kbop">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("sdncVersion") == '1702'} ]]></bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:endEvent id="EndEvent_1fvr7ad">
+      <bpmn:incoming>SequenceFlow_0yto4gz</bpmn:incoming>
+    </bpmn:endEvent>
+    <bpmn:sequenceFlow id="SequenceFlow_0qc4v9t" name="No" sourceRef="ExclusiveGateway_1n5jck8" targetRef="ScriptTask_1ggaxfu" />
+    <bpmn:sequenceFlow id="SequenceFlow_0790olb" sourceRef="CallActivity_1xilevb" targetRef="ExclusiveGateway_0b9kbop" />
+    <bpmn:subProcess id="SubProcess_1p4663w" name="Sub-process for UnexpectedErrors" triggeredByEvent="true">
+      <bpmn:scriptTask id="ScriptTask_0by1uwk" name="Log / Print Unexpected Error" scriptFormat="groovy">
+        <bpmn:incoming>SequenceFlow_0xktw7v</bpmn:incoming>
+        <bpmn:outgoing>SequenceFlow_0soe5t3</bpmn:outgoing>
+        <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def DoUpdateNetworkInstanceRollback = new DoUpdateNetworkInstanceRollback()
+DoUpdateNetworkInstanceRollback.processJavaException(execution)]]></bpmn:script>
+      </bpmn:scriptTask>
+      <bpmn:startEvent id="StartEvent_1j0eixl">
+        <bpmn:outgoing>SequenceFlow_0xktw7v</bpmn:outgoing>
+        <bpmn:errorEventDefinition />
+      </bpmn:startEvent>
+      <bpmn:endEvent id="EndEvent_0jxh015">
+        <bpmn:incoming>SequenceFlow_0soe5t3</bpmn:incoming>
+      </bpmn:endEvent>
+      <bpmn:sequenceFlow id="SequenceFlow_0xktw7v" name="" sourceRef="StartEvent_1j0eixl" targetRef="ScriptTask_0by1uwk" />
+      <bpmn:sequenceFlow id="SequenceFlow_0soe5t3" name="" sourceRef="ScriptTask_0by1uwk" targetRef="EndEvent_0jxh015" />
+    </bpmn:subProcess>
+    <bpmn:inclusiveGateway id="ExclusiveGateway_0b9kbop">
+      <bpmn:incoming>SequenceFlow_0790olb</bpmn:incoming>
+      <bpmn:incoming>SequenceFlow_0mw0dgd</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_0el8yzs</bpmn:outgoing>
+    </bpmn:inclusiveGateway>
+    <bpmn:sequenceFlow id="SequenceFlow_0el8yzs" sourceRef="ExclusiveGateway_0b9kbop" targetRef="ScriptTask_1ggaxfu" />
+    <bpmn:sequenceFlow id="SequenceFlow_0yto4gz" sourceRef="ScriptTask_1ggaxfu" targetRef="EndEvent_1fvr7ad" />
+    <bpmn:subProcess id="SubProcess_1b8rnqv" name="Sub-process for UnexpectedErrors" triggeredByEvent="true">
+      <bpmn:scriptTask id="ScriptTask_02d3i14" name="Catch Exception">
+        <bpmn:incoming>SequenceFlow_07kf49j</bpmn:incoming>
+        <bpmn:outgoing>SequenceFlow_01syg1x</bpmn:outgoing>
+        <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+execution.setVariable("workflowException", execution.getVariable("WorkflowException")]]></bpmn:script>
+      </bpmn:scriptTask>
+      <bpmn:startEvent id="StartEvent_0e8yrgo">
+        <bpmn:outgoing>SequenceFlow_07kf49j</bpmn:outgoing>
+        <bpmn:errorEventDefinition />
+      </bpmn:startEvent>
+      <bpmn:endEvent id="EndEvent_1cmovvm">
+        <bpmn:incoming>SequenceFlow_01syg1x</bpmn:incoming>
+      </bpmn:endEvent>
+      <bpmn:sequenceFlow id="SequenceFlow_07kf49j" name="" sourceRef="StartEvent_0e8yrgo" targetRef="ScriptTask_02d3i14" />
+      <bpmn:sequenceFlow id="SequenceFlow_01syg1x" name="" sourceRef="ScriptTask_02d3i14" targetRef="EndEvent_1cmovvm" />
+    </bpmn:subProcess>
+    <bpmn:textAnnotation id="TextAnnotation_000ap15">    <bpmn:text><![CDATA[Include ONLY inputs/varrables:  
+rollbackData, as Map
+-rollbackSDNCRequest
+-rollbackNetworkRequest
+WorkflowException
+ 
+]]></bpmn:text>
+</bpmn:textAnnotation>
+    <bpmn:association id="Association_0ybkmal" sourceRef="Task_0whino1" targetRef="TextAnnotation_000ap15" />
+    <bpmn:textAnnotation id="TextAnnotation_0vwyo82">    <bpmn:text><![CDATA[set value for:
+WorkflowException
+rolledBack
+wasDeleted
+]]></bpmn:text>
+</bpmn:textAnnotation>
+    <bpmn:association id="Association_1gx121b" sourceRef="ScriptTask_1ggaxfu" targetRef="TextAnnotation_0vwyo82" />
+  </bpmn:process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateNetworkInstanceRollback">
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
+        <dc:Bounds x="240" y="354" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="258" y="390" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ScriptTask_1dqe09s_di" bpmnElement="Task_0whino1">
+        <dc:Bounds x="403" y="332" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1krl2dg_di" bpmnElement="SequenceFlow_1krl2dg">
+        <di:waypoint xsi:type="dc:Point" x="276" y="372" />
+        <di:waypoint xsi:type="dc:Point" x="382" y="372" />
+        <di:waypoint xsi:type="dc:Point" x="382" y="372" />
+        <di:waypoint xsi:type="dc:Point" x="403" y="372" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="397" y="372" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0u41iz2_di" bpmnElement="SequenceFlow_0u41iz2">
+        <di:waypoint xsi:type="dc:Point" x="503" y="372" />
+        <di:waypoint xsi:type="dc:Point" x="660" y="372" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="582" y="357" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ServiceTask_0bqh5yl_di" bpmnElement="ServiceTask_0bqh5yl">
+        <dc:Bounds x="635" y="481" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ExclusiveGateway_0v0en47_di" bpmnElement="ExclusiveGateway_0v0en47" isMarkerVisible="true">
+        <dc:Bounds x="660" y="347" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="648" y="312" width="74" height="24" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="TextAnnotation_000ap15_di" bpmnElement="TextAnnotation_000ap15">
+        <dc:Bounds x="469" y="133" width="277" height="115" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="Association_0ybkmal_di" bpmnElement="Association_0ybkmal">
+        <di:waypoint xsi:type="dc:Point" x="487" y="332" />
+        <di:waypoint xsi:type="dc:Point" x="559" y="248" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="CallActivity_1xilevb_di" bpmnElement="CallActivity_1xilevb">
+        <dc:Bounds x="995" y="610" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ExclusiveGateway_17g4q5c_di" bpmnElement="ExclusiveGateway_17g4q5c" isMarkerVisible="true">
+        <dc:Bounds x="879" y="496" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="926" y="474" width="82" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ScriptTask_1ggaxfu_di" bpmnElement="ScriptTask_1ggaxfu">
+        <dc:Bounds x="1123" y="332" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ExclusiveGateway_1n5jck8_di" bpmnElement="ExclusiveGateway_1n5jck8" isMarkerVisible="true">
+        <dc:Bounds x="879" y="347" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="880" y="308" width="48" height="24" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="TextAnnotation_0vwyo82_di" bpmnElement="TextAnnotation_0vwyo82">
+        <dc:Bounds x="1287" y="410" width="165" height="60" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="Association_1gx121b_di" bpmnElement="Association_1gx121b">
+        <di:waypoint xsi:type="dc:Point" x="1223" y="389" />
+        <di:waypoint xsi:type="dc:Point" x="1287" y="412" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0e1uixp_di" bpmnElement="SequenceFlow_0e1uixp">
+        <di:waypoint xsi:type="dc:Point" x="685" y="397" />
+        <di:waypoint xsi:type="dc:Point" x="685" y="439" />
+        <di:waypoint xsi:type="dc:Point" x="685" y="439" />
+        <di:waypoint xsi:type="dc:Point" x="685" y="481" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="693" y="395" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1lteduj_di" bpmnElement="SequenceFlow_1lteduj">
+        <di:waypoint xsi:type="dc:Point" x="710" y="372" />
+        <di:waypoint xsi:type="dc:Point" x="879" y="372" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="716" y="350" width="14" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0virkpu_di" bpmnElement="SequenceFlow_0virkpu">
+        <di:waypoint xsi:type="dc:Point" x="904" y="397" />
+        <di:waypoint xsi:type="dc:Point" x="904" y="496" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="914" y="392.7469456247061" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_17o4w67_di" bpmnElement="SequenceFlow_17o4w67">
+        <di:waypoint xsi:type="dc:Point" x="735" y="521" />
+        <di:waypoint xsi:type="dc:Point" x="817" y="521" />
+        <di:waypoint xsi:type="dc:Point" x="817" y="372" />
+        <di:waypoint xsi:type="dc:Point" x="879" y="372" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="832" y="446.5" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_101y57s_di" bpmnElement="SequenceFlow_101y57s">
+        <di:waypoint xsi:type="dc:Point" x="904" y="546" />
+        <di:waypoint xsi:type="dc:Point" x="904" y="650" />
+        <di:waypoint xsi:type="dc:Point" x="995" y="650" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="913" y="544.0784313725491" width="14" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0mw0dgd_di" bpmnElement="SequenceFlow_0mw0dgd">
+        <di:waypoint xsi:type="dc:Point" x="929" y="521" />
+        <di:waypoint xsi:type="dc:Point" x="1148" y="521" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="937" y="500" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="EndEvent_1fvr7ad_di" bpmnElement="EndEvent_1fvr7ad">
+        <dc:Bounds x="1352" y="354" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1370" y="390" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0qc4v9t_di" bpmnElement="SequenceFlow_0qc4v9t">
+        <di:waypoint xsi:type="dc:Point" x="929" y="372" />
+        <di:waypoint xsi:type="dc:Point" x="1123" y="372" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="941" y="351.1191898360114" width="14" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0790olb_di" bpmnElement="SequenceFlow_0790olb">
+        <di:waypoint xsi:type="dc:Point" x="1095" y="650" />
+        <di:waypoint xsi:type="dc:Point" x="1173" y="650" />
+        <di:waypoint xsi:type="dc:Point" x="1173" y="546" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1134" y="635" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="SubProcess_1p4663w_di" bpmnElement="SubProcess_1p4663w" isExpanded="true">
+        <dc:Bounds x="61" y="668" width="394" height="188" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ScriptTask_0by1uwk_di" bpmnElement="ScriptTask_0by1uwk">
+        <dc:Bounds x="209" y="723" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="StartEvent_1j0eixl_di" bpmnElement="StartEvent_1j0eixl">
+        <dc:Bounds x="94" y="745" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="112" y="786" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="EndEvent_0jxh015_di" bpmnElement="EndEvent_0jxh015">
+        <dc:Bounds x="370" y="745" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="388" y="786" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0xktw7v_di" bpmnElement="SequenceFlow_0xktw7v">
+        <di:waypoint xsi:type="dc:Point" x="130" y="763" />
+        <di:waypoint xsi:type="dc:Point" x="209" y="763" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="172" y="763" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0soe5t3_di" bpmnElement="SequenceFlow_0soe5t3">
+        <di:waypoint xsi:type="dc:Point" x="309" y="763" />
+        <di:waypoint xsi:type="dc:Point" x="370" y="763" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="344" y="763" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="InclusiveGateway_0dot6c9_di" bpmnElement="ExclusiveGateway_0b9kbop">
+        <dc:Bounds x="1148" y="496" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1173" y="546" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0el8yzs_di" bpmnElement="SequenceFlow_0el8yzs">
+        <di:waypoint xsi:type="dc:Point" x="1173" y="496" />
+        <di:waypoint xsi:type="dc:Point" x="1173" y="412" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1188" y="444" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0yto4gz_di" bpmnElement="SequenceFlow_0yto4gz">
+        <di:waypoint xsi:type="dc:Point" x="1223" y="372" />
+        <di:waypoint xsi:type="dc:Point" x="1352" y="372" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1288" y="357" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="SubProcess_1b8rnqv_di" bpmnElement="SubProcess_1b8rnqv" isExpanded="true">
+        <dc:Bounds x="61" y="916" width="394" height="188" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ScriptTask_02d3i14_di" bpmnElement="ScriptTask_02d3i14">
+        <dc:Bounds x="209" y="971" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="StartEvent_0e8yrgo_di" bpmnElement="StartEvent_0e8yrgo">
+        <dc:Bounds x="94" y="993" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="112" y="1034" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="EndEvent_1cmovvm_di" bpmnElement="EndEvent_1cmovvm">
+        <dc:Bounds x="370" y="993" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="388" y="1034" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_07kf49j_di" bpmnElement="SequenceFlow_07kf49j">
+        <di:waypoint xsi:type="dc:Point" x="130" y="1011" />
+        <di:waypoint xsi:type="dc:Point" x="209" y="1011" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="172" y="1011" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_01syg1x_di" bpmnElement="SequenceFlow_01syg1x">
+        <di:waypoint xsi:type="dc:Point" x="309" y="1011" />
+        <di:waypoint xsi:type="dc:Point" x="370" y="1011" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="344" y="1011" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</bpmn:definitions>
\ No newline at end of file