Merge "Added informing dmaap client in pnf-ready workflow"

1 files changed, 81 insertions, 58 deletions

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateAndActivatePnfResource.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateAndActivatePnfResource.bpmn
index 262e08689d..7d8863892d 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateAndActivatePnfResource.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateAndActivatePnfResource.bpmn
@@ -8,6 +8,7 @@
     <bpmn:messageFlow id="MessageFlow_09ibv5a" sourceRef="CheckAiiForCorrelationId" targetRef="Participant_0atuyq0" />
     <bpmn:messageFlow id="MessageFlow_0vjul4t" sourceRef="Participant_0atuyq0" targetRef="CheckAiiForCorrelationId" />
     <bpmn:messageFlow id="MessageFlow_1vrcp2d" sourceRef="Participant_19w87ws" targetRef="WaitForDmaapPnfReadyNotification" />
+    <bpmn:messageFlow id="MessageFlow_0tg4hw9" sourceRef="InformDmaapClient" targetRef="Participant_19w87ws" />
   </bpmn:collaboration>
   <bpmn:process id="CreateAndActivatePnfResource" name="CreateAndActivatePnfResource" isExecutable="true">
     <bpmn:sequenceFlow id="SequenceFlow_1ls8pua" name="No" sourceRef="DoesAaiContainInfoAboutIp" targetRef="AaiEntryExists">
@@ -34,9 +35,10 @@
     <bpmn:startEvent id="CreateAndActivatePnf_StartEvent">
       <bpmn:outgoing>SequenceFlow_0j5ksz1</bpmn:outgoing>
     </bpmn:startEvent>
-    <bpmn:sequenceFlow id="SequenceFlow_17s9025" sourceRef="AaiEntryExists" targetRef="WaitForDmaapPnfReadyNotification" />
+    <bpmn:sequenceFlow id="SequenceFlow_17s9025" sourceRef="AaiEntryExists" targetRef="InformDmaapClient" />
     <bpmn:sequenceFlow id="SequenceFlow_1kc34bc" sourceRef="WaitForDmaapTimeout" targetRef="ThrowTimeoutException" />
     <bpmn:sequenceFlow id="SequenceFlow_0p09qgm" sourceRef="WaitForDmaapPnfReadyNotification" targetRef="AaiEntryUpdated" />
+    <bpmn:sequenceFlow id="SequenceFlow_1o8od8e" sourceRef="InformDmaapClient" targetRef="WaitForDmaapPnfReadyNotification" />
     <bpmn:serviceTask id="CheckAiiForCorrelationId" name="Check AAI for correlation_id" camunda:delegateExpression="${checkAaiForCorrelationIdDelegate}">
       <bpmn:incoming>SequenceFlow_0j5ksz1</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_1j4r3zt</bpmn:outgoing>
@@ -61,7 +63,7 @@
       <bpmn:outgoing>SequenceFlow_17s9025</bpmn:outgoing>
     </bpmn:intermediateThrowEvent>
     <bpmn:receiveTask id="WaitForDmaapPnfReadyNotification" name="Wait for DMAAP pnf-ready notification" messageRef="Message_13h1tlo">
-      <bpmn:incoming>SequenceFlow_17s9025</bpmn:incoming>
+      <bpmn:incoming>SequenceFlow_1o8od8e</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0p09qgm</bpmn:outgoing>
     </bpmn:receiveTask>
     <bpmn:boundaryEvent id="WaitForDmaapTimeout" name="Timeout" attachedToRef="WaitForDmaapPnfReadyNotification">
@@ -74,6 +76,10 @@
       <bpmn:incoming>SequenceFlow_1kc34bc</bpmn:incoming>
       <bpmn:errorEventDefinition errorRef="Error_1" />
     </bpmn:endEvent>
+    <bpmn:serviceTask id="InformDmaapClient" name="Inform DmaapClient about business key and corresponding pnf-id" camunda:delegateExpression="${informDmaapClient}">
+      <bpmn:incoming>SequenceFlow_17s9025</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_1o8od8e</bpmn:outgoing>
+    </bpmn:serviceTask>
     <bpmn:association id="Association_0d7oxnz" sourceRef="CreateAndActivatePnf_StartEvent" targetRef="TextAnnotation_1eyzes8" />
     <bpmn:textAnnotation id="TextAnnotation_1eyzes8">
       <bpmn:text><![CDATA[Inputs:
@@ -90,15 +96,15 @@
         <dc:Bounds x="0" y="0" width="1482" height="353" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_1cttgdo_di" bpmnElement="DoesAaiContainInfoAboutPnf" isMarkerVisible="true">
-        <dc:Bounds x="408" y="230" width="50" height="50" />
+        <dc:Bounds x="354" y="230" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="388" y="283" width="85" height="20" />
+          <dc:Bounds x="334" y="283" width="85" height="20" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_0yamdfm_di" bpmnElement="DoesAaiContainInfoAboutIp" isMarkerVisible="true">
-        <dc:Bounds x="786" y="41" width="50" height="50" />
+        <dc:Bounds x="678" y="41" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="767" y="5" width="87" height="30" />
+          <dc:Bounds x="659" y="5" width="87" height="30" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_0k52gr7_di" bpmnElement="AaiEntryUpdated">
@@ -114,92 +120,92 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_0a5uk9o_di" bpmnElement="CheckAiiForCorrelationId">
-        <dc:Bounds x="194" y="215" width="100" height="80" />
+        <dc:Bounds x="167" y="215" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_0iimk5v_di" bpmnElement="CreateAndActivatePnf_CreateAaiEntry">
-        <dc:Bounds x="572" y="215" width="100" height="80" />
+        <dc:Bounds x="491" y="215" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1j4r3zt_di" bpmnElement="SequenceFlow_1j4r3zt">
-        <di:waypoint xsi:type="dc:Point" x="294" y="255" />
-        <di:waypoint xsi:type="dc:Point" x="408" y="255" />
+        <di:waypoint xsi:type="dc:Point" x="267" y="255" />
+        <di:waypoint xsi:type="dc:Point" x="354" y="255" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="306" y="235" width="90" height="10" />
+          <dc:Bounds x="265.5" y="235" width="90" height="10" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1l1t6ak_di" bpmnElement="SequenceFlow_1l1t6ak">
-        <di:waypoint xsi:type="dc:Point" x="433" y="230" />
-        <di:waypoint xsi:type="dc:Point" x="433" y="66" />
-        <di:waypoint xsi:type="dc:Point" x="786" y="66" />
+        <di:waypoint xsi:type="dc:Point" x="379" y="230" />
+        <di:waypoint xsi:type="dc:Point" x="379" y="66" />
+        <di:waypoint xsi:type="dc:Point" x="678" y="66" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="438" y="206" width="19" height="10" />
+          <dc:Bounds x="384" y="206" width="19" height="10" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0v5ffpe_di" bpmnElement="SequenceFlow_0v5ffpe">
-        <di:waypoint xsi:type="dc:Point" x="458" y="255" />
-        <di:waypoint xsi:type="dc:Point" x="572" y="255" />
+        <di:waypoint xsi:type="dc:Point" x="404" y="255" />
+        <di:waypoint xsi:type="dc:Point" x="491" y="255" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="471.6714285714286" y="237" width="15" height="10" />
+          <dc:Bounds x="412.9078947368421" y="237" width="15" height="10" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1h6yz62_di" bpmnElement="SequenceFlow_1h6yz62">
-        <di:waypoint xsi:type="dc:Point" x="836" y="66" />
+        <di:waypoint xsi:type="dc:Point" x="728" y="66" />
         <di:waypoint xsi:type="dc:Point" x="1312" y="66" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="842.76953125" y="51" width="19" height="10" />
+          <dc:Bounds x="738.7436974789916" y="51" width="19" height="10" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1ls8pua_di" bpmnElement="SequenceFlow_1ls8pua">
-        <di:waypoint xsi:type="dc:Point" x="811" y="91" />
-        <di:waypoint xsi:type="dc:Point" x="811" y="237" />
+        <di:waypoint xsi:type="dc:Point" x="703" y="91" />
+        <di:waypoint xsi:type="dc:Point" x="703" y="237" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="821" y="119.69863013698631" width="15" height="10" />
+          <dc:Bounds x="713" y="124.1917808219178" width="15" height="10" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1qr6cmf_di" bpmnElement="SequenceFlow_1qr6cmf">
-        <di:waypoint xsi:type="dc:Point" x="672" y="255" />
-        <di:waypoint xsi:type="dc:Point" x="793" y="255" />
+        <di:waypoint xsi:type="dc:Point" x="591" y="255" />
+        <di:waypoint xsi:type="dc:Point" x="685" y="255" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="687.5" y="235" width="90" height="10" />
+          <dc:Bounds x="593" y="235" width="90" height="10" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0j5ksz1_di" bpmnElement="SequenceFlow_0j5ksz1">
         <di:waypoint xsi:type="dc:Point" x="85" y="255" />
-        <di:waypoint xsi:type="dc:Point" x="194" y="255" />
+        <di:waypoint xsi:type="dc:Point" x="167" y="255" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="94.5" y="235" width="90" height="10" />
+          <dc:Bounds x="81" y="235" width="90" height="10" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="Participant_0i9ban2_di" bpmnElement="Participant_0atuyq0">
-        <dc:Bounds x="123" y="538" width="1222" height="60" />
+        <dc:Bounds x="123" y="415" width="502" height="60" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="MessageFlow_1h3xu88_di" bpmnElement="MessageFlow_1h3xu88">
-        <di:waypoint xsi:type="dc:Point" x="622" y="295" />
-        <di:waypoint xsi:type="dc:Point" x="622" y="538" />
+        <di:waypoint xsi:type="dc:Point" x="541" y="295" />
+        <di:waypoint xsi:type="dc:Point" x="541" y="415" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="592" y="411.5" width="90" height="10" />
+          <dc:Bounds x="511" y="350" width="90" height="10" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="MessageFlow_09ibv5a_di" bpmnElement="MessageFlow_09ibv5a">
-        <di:waypoint xsi:type="dc:Point" x="225" y="295" />
-        <di:waypoint xsi:type="dc:Point" x="225" y="538" />
+        <di:waypoint xsi:type="dc:Point" x="198" y="295" />
+        <di:waypoint xsi:type="dc:Point" x="198" y="415" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="195" y="411.5" width="90" height="10" />
+          <dc:Bounds x="168" y="350" width="90" height="10" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="MessageFlow_0vjul4t_di" bpmnElement="MessageFlow_0vjul4t">
-        <di:waypoint xsi:type="dc:Point" x="264" y="538" />
-        <di:waypoint xsi:type="dc:Point" x="264" y="295" />
+        <di:waypoint xsi:type="dc:Point" x="237" y="415" />
+        <di:waypoint xsi:type="dc:Point" x="237" y="295" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="234" y="411.5" width="90" height="10" />
+          <dc:Bounds x="207" y="350" width="90" height="10" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="Participant_0vmrrhf_di" bpmnElement="Participant_19w87ws">
-        <dc:Bounds x="767" y="414" width="300" height="62" />
+        <dc:Bounds x="804" y="415" width="300" height="62" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_0wbx6tt_di" bpmnElement="ThrowTimeoutException">
-        <dc:Bounds x="1164" y="135" width="36" height="36" />
+        <dc:Bounds x="1189" y="135" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1157" y="172" width="70" height="20" />
+          <dc:Bounds x="1182" y="172" width="70" height="20" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_00cy7r0_di" bpmnElement="AaiEntryAlreadyUpToDate">
@@ -209,9 +215,9 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="IntermediateThrowEvent_0fjcdy4_di" bpmnElement="AaiEntryExists">
-        <dc:Bounds x="793" y="237" width="36" height="36" />
+        <dc:Bounds x="685" y="237" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="771" y="283" width="80" height="20" />
+          <dc:Bounds x="663" y="283" width="80" height="20" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="TextAnnotation_1eyzes8_di" bpmnElement="TextAnnotation_1eyzes8">
@@ -222,43 +228,60 @@
         <di:waypoint xsi:type="dc:Point" x="67" y="124" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="MessageFlow_1vrcp2d_di" bpmnElement="MessageFlow_1vrcp2d">
-        <di:waypoint xsi:type="dc:Point" x="1002" y="414" />
-        <di:waypoint xsi:type="dc:Point" x="1002" y="295" />
+        <di:waypoint xsi:type="dc:Point" x="1054" y="415" />
+        <di:waypoint xsi:type="dc:Point" x="1054" y="295" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="972" y="349.5" width="90" height="10" />
+          <dc:Bounds x="1024" y="350" width="90" height="10" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_17s9025_di" bpmnElement="SequenceFlow_17s9025">
-        <di:waypoint xsi:type="dc:Point" x="829" y="255" />
-        <di:waypoint xsi:type="dc:Point" x="950" y="255" />
+        <di:waypoint xsi:type="dc:Point" x="721" y="255" />
+        <di:waypoint xsi:type="dc:Point" x="815" y="255" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="844.5" y="235" width="90" height="10" />
+          <dc:Bounds x="723" y="235" width="90" height="10" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="BoundaryEvent_15eo1k9_di" bpmnElement="WaitForDmaapTimeout">
-        <dc:Bounds x="1004" y="197" width="36" height="36" />
+        <dc:Bounds x="1056" y="197" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1035" y="192" width="40" height="10" />
+          <dc:Bounds x="1087" y="192" width="40" height="10" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1kc34bc_di" bpmnElement="SequenceFlow_1kc34bc">
-        <di:waypoint xsi:type="dc:Point" x="1022" y="197" />
-        <di:waypoint xsi:type="dc:Point" x="1022" y="153" />
-        <di:waypoint xsi:type="dc:Point" x="1164" y="153" />
+        <di:waypoint xsi:type="dc:Point" x="1074" y="197" />
+        <di:waypoint xsi:type="dc:Point" x="1074" y="153" />
+        <di:waypoint xsi:type="dc:Point" x="1189" y="153" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="992" y="170" width="90" height="10" />
+          <dc:Bounds x="1044" y="170" width="90" height="10" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ReceiveTask_1sfysua_di" bpmnElement="WaitForDmaapPnfReadyNotification">
-        <dc:Bounds x="950" y="215" width="100" height="80" />
+        <dc:Bounds x="1002" y="215" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0p09qgm_di" bpmnElement="SequenceFlow_0p09qgm">
-        <di:waypoint xsi:type="dc:Point" x="1050" y="255" />
+        <di:waypoint xsi:type="dc:Point" x="1102" y="255" />
         <di:waypoint xsi:type="dc:Point" x="1312" y="255" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1181" y="235" width="0" height="10" />
+          <dc:Bounds x="1162" y="235" width="90" height="10" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1o8od8e_di" bpmnElement="SequenceFlow_1o8od8e">
+        <di:waypoint xsi:type="dc:Point" x="915" y="255" />
+        <di:waypoint xsi:type="dc:Point" x="1002" y="255" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="913.5" y="235" width="90" height="10" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="MessageFlow_0tg4hw9_di" bpmnElement="MessageFlow_0tg4hw9">
+        <di:waypoint xsi:type="dc:Point" x="865" y="295" />
+        <di:waypoint xsi:type="dc:Point" x="865" y="415" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="835" y="350" width="90" height="10" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ServiceTask_1iax11n_di" bpmnElement="InformDmaapClient">
+        <dc:Bounds x="815" y="215" width="100" height="80" />
+      </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn:definitions>