[MSO-8] Additional fixes for the second rebase

DB fixes + BPMN flows and groovy fixes + Fix issue with CloudConfig file
not reloaded properly when it's wrong (JSON error or model hierarchy
mistake) at MSO startup

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

[MSO-8] Restore files removed in patch set 2

Those groovy files must be there

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

1 files changed, 290 insertions, 65 deletions

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVnfAndModules.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVnfAndModules.bpmn
index 127030d789..078e0107ba 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVnfAndModules.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVnfAndModules.bpmn
@@ -36,22 +36,24 @@ exceptionUtil.processJavaException(execution)]]></bpmn2:script>
     </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:incoming>SequenceFlow_1tt31qu</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_1fccvli</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: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:incoming>SequenceFlow_1x25m7t</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:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable("DDVAM_nextModule") < execution.getVariable("DDVAM_moduleCount")]]></bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:callActivity id="DeleteVFModule" name="Delete VF Module" calledElement="DoDeleteVfModule">
       <bpmn2:extensionElements>
@@ -63,20 +65,22 @@ exceptionUtil.processJavaException(execution)]]></bpmn2:script>
         <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="DDVAM_sdncVersion" target="sdncVersion" />
         <camunda:in source="&#34;true&#34;" target="isVidRequest" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
       </bpmn2:extensionElements>
-      <bpmn2:incoming>SequenceFlow_1qoor0l</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_1xujrk5</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1p4ycii</bpmn2:outgoing>
     </bpmn2:callActivity>
-    <bpmn2:exclusiveGateway id="ExclusiveGateway_0189gqf">
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_0189gqf" name="Is SDNC Interaction Enabled?" default="SequenceFlow_05ujwz8">
       <bpmn2:incoming>SequenceFlow_1936oc0</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_05ujwz8</bpmn2:outgoing>
+      <bpmn2:outgoing>SDNCInteractionEnabled2</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_05ujwz8" name="no" 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>
@@ -92,15 +96,115 @@ ddvam.queryAAIVfModule(execution)]]></bpmn2:script>
 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:sequenceFlow id="SequenceFlow_0lu7b1v" sourceRef="QueryVnf" targetRef="ExclusiveGateway_027lai5" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1qoor0l" sourceRef="PrepareModuleList" targetRef="ExclusiveGateway_0b36mti" />
+    <bpmn2:scriptTask id="PostProcessDeleteVfModule" name="PostProcess Delete VF Module" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1p4ycii</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_0xl033m</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>
+int nextModule = execution.getVariable("DDVAM_nextModule")
+			execution.setVariable("DDVAM_nextModule", nextModule + 1)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_027lai5" name="Is SDNC Interaction Enabled?" default="SequenceFlow_1tt31qu">
+      <bpmn2:incoming>SequenceFlow_0lu7b1v</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1tt31qu</bpmn2:outgoing>
+      <bpmn2:outgoing>SDNCInteractionEnabled1</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_1tt31qu" name="no" sourceRef="ExclusiveGateway_027lai5" targetRef="ExclusiveGateway_1amun4k" />
+    <bpmn2:sequenceFlow id="SDNCInteractionEnabled1" name="yes" sourceRef="ExclusiveGateway_027lai5" targetRef="preProcessSDNCDeactivateRequest">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DDVAM_sdncVersion" ) != '1702'}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="SequenceFlow_0fhhsyo" sourceRef="preProcessSDNCDeactivateRequest" targetRef="callSDNCAdapterTopologyDeactivate" />
+    <bpmn2:sequenceFlow id="SequenceFlow_0qdn8k4" sourceRef="callSDNCAdapterTopologyDeactivate" targetRef="postProcessSDNCDeactivateRequest" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1fccvli" sourceRef="postProcessSDNCDeactivateRequest" targetRef="ExclusiveGateway_1amun4k" />
+    <bpmn2:scriptTask id="preProcessSDNCDeactivateRequest" name="PreProcess SDNC Deactivate Request" scriptFormat="groovy">
+      <bpmn2:incoming>SDNCInteractionEnabled1</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0fhhsyo</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def ddvam = new DoDeleteVnfAndModules()
+ddvam.preProcessSDNCDeactivateRequest(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
+    <bpmn2:scriptTask id="postProcessSDNCDeactivateRequest" name="PostProcess SDNC Deactivate Request" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_0qdn8k4</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1fccvli</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def ddvam = new DoDeleteVnfAndModules()
+String response = execution.getVariable("DDVAM_deactivateSDNCAdapterResponse")
+ddvam.validateSDNCResponse(execution, response, "deactivate")]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:callActivity id="callSDNCAdapterTopologyDeactivate" name="Call SDNC Adapter Topology Deactivate" calledElement="sdncAdapter">
+      <bpmn2:extensionElements>
+        <camunda:in source="DDVAM_deactivateSDNCRequest" 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="DDVAM_deactivateSDNCAdapterResponse" />
+        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_0fhhsyo</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0qdn8k4</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:sequenceFlow id="SDNCInteractionEnabled2" name="yes" sourceRef="ExclusiveGateway_0189gqf" targetRef="preProcessSDNCUnassignRequest">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DDVAM_sdncVersion" ) != '1702'}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="SequenceFlow_001uxa1" sourceRef="preProcessSDNCUnassignRequest" targetRef="callSDNCAdapterTopologyUnassign" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1x29mht" sourceRef="callSDNCAdapterTopologyUnassign" targetRef="postProcessSDNCUnassignRequest" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1x25m7t" sourceRef="postProcessSDNCUnassignRequest" targetRef="DeleteVNF" />
+    <bpmn2:scriptTask id="preProcessSDNCUnassignRequest" name="PreProcess SDNC Unassign Request" scriptFormat="groovy">
+      <bpmn2:incoming>SDNCInteractionEnabled2</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_001uxa1</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def ddvam = new DoDeleteVnfAndModules()
+ddvam.preProcessSDNCUnassignRequest(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:callActivity id="callSDNCAdapterTopologyUnassign" name="Call SDNC Adapter Topology Unassign" calledElement="sdncAdapter">
+      <bpmn2:extensionElements>
+        <camunda:in source="DDVAM_unassignSDNCRequest" 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="DDVAM_unassignSDNCAdapterResponse" />
+        <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_001uxa1</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1x29mht</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:scriptTask id="postProcessSDNCUnassignRequest" name="PostProcess SDNC Unassign Request" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_1x29mht</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1x25m7t</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def ddvam = new DoDeleteVnfAndModules()
+String response = execution.getVariable("DDVAM_unassignSDNCAdapterResponse")
+ddvam.validateSDNCResponse(execution, response, "unassign")]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_0b36mti" name="Is SDNC Interaction Enabled?" default="SequenceFlow_1xujrk5">
+      <bpmn2:incoming>SequenceFlow_1qoor0l</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1xujrk5</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_1laeenc</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:callActivity id="DoDeleteVfModuleFromVnf" name="Deiete VF Module From VNF" calledElement="DoDeleteVfModuleFromVnf">
+      <bpmn2:extensionElements>
+        <camunda:in source="msoRequestId" target="msoRequestId" />
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
+        <camunda:in source="serviceInstanceId" target="serviceInstanceId" />
+        <camunda:in source="vnfId" target="vnfId" />
+        <camunda:in source="lcpCloudRegionId" target="lcpCloudRegionId" />
+        <camunda:in source="tenantId" target="tenantId" />
+        <camunda:in source="DDVAM_sdncVersion" target="sdncVersion" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:in source="DDVAM_vfModuleId" target="vfModuleId" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_1laeenc</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0xl033m</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:sequenceFlow id="SequenceFlow_1xujrk5" name="no" sourceRef="ExclusiveGateway_0b36mti" targetRef="DeleteVFModule" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1laeenc" name="yes" sourceRef="ExclusiveGateway_0b36mti" targetRef="DoDeleteVfModuleFromVnf">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DDVAM_sdncVersion" ) != '1702'}]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="SequenceFlow_0xl033m" sourceRef="DoDeleteVfModuleFromVnf" targetRef="PostProcessDeleteVfModule" />
   </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" />
@@ -123,51 +227,51 @@ int nextModule = execution.getVariable("nextModule")
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_237" bpmnElement="EndEvent_2">
-        <dc:Bounds x="1605" y="209" width="36" height="36" />
+        <dc:Bounds x="1983" y="372" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1623" y="250" width="0" height="0" />
+          <dc:Bounds x="2001" y="413" 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" />
+        <dc:Bounds x="229" y="616" 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" />
+        <dc:Bounds x="377" y="677" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="392" y="503" width="0" height="0" />
+          <dc:Bounds x="395" y="718" 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" />
+        <dc:Bounds x="593" y="677" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="608" y="503" width="0" height="0" />
+          <dc:Bounds x="611" y="718" 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" />
+        <dc:Bounds x="447" y="655" 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" />
+        <di:waypoint xsi:type="dc:Point" x="413" y="695" />
+        <di:waypoint xsi:type="dc:Point" x="447" y="695" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="427" y="465" width="0" height="0" />
+          <dc:Bounds x="430" y="680" 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" />
+        <di:waypoint xsi:type="dc:Point" x="547" y="695" />
+        <di:waypoint xsi:type="dc:Point" x="593" y="695" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="567" y="465" width="0" height="0" />
+          <dc:Bounds x="570" y="680" 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" />
+        <dc:Bounds x="1271" y="200" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="683" y="252" width="65" height="36" />
+          <dc:Bounds x="1263" y="250" 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" />
+        <dc:Bounds x="1812" y="350" 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" />
@@ -177,87 +281,208 @@ int nextModule = execution.getVariable("nextModule")
         </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" />
+        <di:waypoint xsi:type="dc:Point" x="1296" y="200" />
+        <di:waypoint xsi:type="dc:Point" x="1296" y="102" />
+        <di:waypoint xsi:type="dc:Point" x="1368" y="102" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="722" y="156.4750449879038" width="18" height="12" />
+          <dc:Bounds x="1302" y="154" 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" />
+        <dc:Bounds x="1648" y="-9" 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" />
+        <dc:Bounds x="1271" y="365" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1329" y="252" width="0" height="0" />
+          <dc:Bounds x="1302" y="319" width="54" height="36" />
         </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" />
+        <di:waypoint xsi:type="dc:Point" x="1748" y="31" />
+        <di:waypoint xsi:type="dc:Point" x="1904" y="31" />
+        <di:waypoint xsi:type="dc:Point" x="1904" y="62" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1111" y="104" width="0" height="0" />
+          <dc:Bounds x="1826" y="16" 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" />
+        <di:waypoint xsi:type="dc:Point" x="1904" y="142" />
+        <di:waypoint xsi:type="dc:Point" x="1904" y="225" />
+        <di:waypoint xsi:type="dc:Point" x="1321" y="225" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1192" y="185.5" width="0" height="0" />
+          <dc:Bounds x="1919" y="183.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" />
+        <di:waypoint xsi:type="dc:Point" x="1296" y="250" />
+        <di:waypoint xsi:type="dc:Point" x="1296" y="365" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1017" y="286" width="12" height="12" />
+          <dc:Bounds x="1270" y="305.40625" 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" />
+        <di:waypoint xsi:type="dc:Point" x="1321" y="390" />
+        <di:waypoint xsi:type="dc:Point" x="1812" y="390" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1395" y="202" width="0" height="0" />
+          <dc:Bounds x="1361" y="362" width="12" height="12" />
         </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" />
+        <di:waypoint xsi:type="dc:Point" x="1912" y="390" />
+        <di:waypoint xsi:type="dc:Point" x="1983" y="390" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1571" y="212" width="0" height="0" />
+          <dc:Bounds x="1948" y="375" 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" />
+        <dc:Bounds x="1368" y="62" 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" />
+        <di:waypoint xsi:type="dc:Point" x="701" y="227" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="652" y="202" width="0" height="0" />
+          <dc:Bounds x="657" y="212" 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" />
+        <di:waypoint xsi:type="dc:Point" x="1468" y="102" />
+        <di:waypoint xsi:type="dc:Point" x="1525" y="102" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="943" y="104" width="0" height="0" />
+          <dc:Bounds x="1497" y="87" 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" />
+        <dc:Bounds x="1854" y="62" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ExclusiveGateway_027lai5_di" bpmnElement="ExclusiveGateway_027lai5" isMarkerVisible="true">
+        <dc:Bounds x="701" y="202" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="699" y="145" width="54" height="36" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1tt31qu_di" bpmnElement="SequenceFlow_1tt31qu">
+        <di:waypoint xsi:type="dc:Point" x="751" y="227" />
+        <di:waypoint xsi:type="dc:Point" x="1271" y="225" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1005" y="201" width="12" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_04lnhgt_di" bpmnElement="SDNCInteractionEnabled1">
+        <di:waypoint xsi:type="dc:Point" x="726" y="252" />
+        <di:waypoint xsi:type="dc:Point" x="726" y="337" />
+        <di:waypoint xsi:type="dc:Point" x="776" y="337" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="694" y="280.5" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0fhhsyo_di" bpmnElement="SequenceFlow_0fhhsyo">
+        <di:waypoint xsi:type="dc:Point" x="876" y="337" />
+        <di:waypoint xsi:type="dc:Point" x="926" y="337" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="901" y="322" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0qdn8k4_di" bpmnElement="SequenceFlow_0qdn8k4">
+        <di:waypoint xsi:type="dc:Point" x="1026" y="337" />
+        <di:waypoint xsi:type="dc:Point" x="1070" y="337" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1048" y="322" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1fccvli_di" bpmnElement="SequenceFlow_1fccvli">
+        <di:waypoint xsi:type="dc:Point" x="1170" y="337" />
+        <di:waypoint xsi:type="dc:Point" x="1225" y="337" />
+        <di:waypoint xsi:type="dc:Point" x="1225" y="225" />
+        <di:waypoint xsi:type="dc:Point" x="1271" y="225" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1240" y="281" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_1cj4pgd_di" bpmnElement="preProcessSDNCDeactivateRequest">
+        <dc:Bounds x="776" y="297" width="100" height="80" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ScriptTask_1nug5hb_di" bpmnElement="postProcessSDNCDeactivateRequest">
+        <dc:Bounds x="1070" y="297" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="CallActivity_0sl24xf_di" bpmnElement="callSDNCAdapterTopologyDeactivate">
+        <dc:Bounds x="926" y="297" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0ftrgor_di" bpmnElement="SDNCInteractionEnabled2">
+        <di:waypoint xsi:type="dc:Point" x="1296" y="415" />
+        <di:waypoint xsi:type="dc:Point" x="1296" y="501" />
+        <di:waypoint xsi:type="dc:Point" x="1356" y="501" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1266" y="445.36046511627904" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_001uxa1_di" bpmnElement="SequenceFlow_001uxa1">
+        <di:waypoint xsi:type="dc:Point" x="1456" y="501" />
+        <di:waypoint xsi:type="dc:Point" x="1517" y="501" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1487" y="486" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1x29mht_di" bpmnElement="SequenceFlow_1x29mht">
+        <di:waypoint xsi:type="dc:Point" x="1617" y="501" />
+        <di:waypoint xsi:type="dc:Point" x="1678" y="501" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1648" y="486" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1x25m7t_di" bpmnElement="SequenceFlow_1x25m7t">
+        <di:waypoint xsi:type="dc:Point" x="1778" y="501" />
+        <di:waypoint xsi:type="dc:Point" x="1862" y="501" />
+        <di:waypoint xsi:type="dc:Point" x="1862" y="430" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1820" y="486" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_167oslm_di" bpmnElement="preProcessSDNCUnassignRequest">
+        <dc:Bounds x="1356" y="461" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="CallActivity_0cv258c_di" bpmnElement="callSDNCAdapterTopologyUnassign">
+        <dc:Bounds x="1517" y="461" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ScriptTask_1gb4lqf_di" bpmnElement="postProcessSDNCUnassignRequest">
+        <dc:Bounds x="1678" y="461" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ExclusiveGateway_0b36mti_di" bpmnElement="ExclusiveGateway_0b36mti" isMarkerVisible="true">
+        <dc:Bounds x="1525" y="77" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1581" y="84" width="54" height="36" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="CallActivity_1y4alqc_di" bpmnElement="DoDeleteVfModuleFromVnf">
+        <dc:Bounds x="1648" y="121" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1xujrk5_di" bpmnElement="SequenceFlow_1xujrk5">
+        <di:waypoint xsi:type="dc:Point" x="1550" y="77" />
+        <di:waypoint xsi:type="dc:Point" x="1550" y="31" />
+        <di:waypoint xsi:type="dc:Point" x="1648" y="31" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1524" y="42" width="12" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1laeenc_di" bpmnElement="SequenceFlow_1laeenc">
+        <di:waypoint xsi:type="dc:Point" x="1550" y="127" />
+        <di:waypoint xsi:type="dc:Point" x="1550" y="161" />
+        <di:waypoint xsi:type="dc:Point" x="1648" y="161" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1523" y="135" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0xl033m_di" bpmnElement="SequenceFlow_0xl033m">
+        <di:waypoint xsi:type="dc:Point" x="1748" y="161" />
+        <di:waypoint xsi:type="dc:Point" x="1828" y="161" />
+        <di:waypoint xsi:type="dc:Point" x="1828" y="102" />
+        <di:waypoint xsi:type="dc:Point" x="1854" y="102" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1843" y="131.5" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn2:definitions>