From 94ee92559b051f2f82ed681f841f4f13016842ed Mon Sep 17 00:00:00 2001
From: "Determe, Sebastien (sd378r)" <sd378r@intl.att.com>
Date: Tue, 2 May 2017 03:53:18 -0700
Subject: [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>
---
 .../subprocess/DoCreateVnfAndModules.bpmn          | 145 ++++++++++++---------
 1 file changed, 86 insertions(+), 59 deletions(-)

(limited to 'bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn')

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>
-- 
cgit 1.2.3-korg