X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=bpmn%2Fso-bpmn-building-blocks%2Fsrc%2Fmain%2Fresources%2Fsubprocess%2FBuildingBlock%2FCnfInstantiateBB.bpmn;h=6e1996acd887cc1b236dcba194dca469e31d0c1c;hb=fa660d2d8a9b2b6f3190bf5c3c26dcf4fa15c146;hp=a94e6aa2ca21125d0ce3e2301b74912e70131f2e;hpb=1a6b1ef83417efbbb8ec7cfe204c105e49e7e1f2;p=so.git

diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CnfInstantiateBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CnfInstantiateBB.bpmn
index a94e6aa2ca..6e1996acd8 100644
--- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CnfInstantiateBB.bpmn
+++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CnfInstantiateBB.bpmn
@@ -6,13 +6,13 @@
     </bpmn:startEvent>
     <bpmn:sequenceFlow id="SequenceFlow_016sgof" sourceRef="StartEvent_0ru3x55" targetRef="ServiceTask_11" />
     <bpmn:endEvent id="EndEvent_001k15i">
-      <bpmn:incoming>Flow_1xcu3yl</bpmn:incoming>
+      <bpmn:incoming>Flow_149m8py</bpmn:incoming>
     </bpmn:endEvent>
-    <bpmn:serviceTask id="ServiceTask_11" name="Create &#10;CreateAsRequest" camunda:asyncAfter="true" camunda:expression="${CnfInstantiateTask.createCreateAsRequest(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
+    <bpmn:serviceTask id="ServiceTask_11" name="Create &#10;CreateAsRequest" camunda:expression="${CnfInstantiateTask.createCreateAsRequest(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
       <bpmn:incoming>SequenceFlow_016sgof</bpmn:incoming>
       <bpmn:outgoing>Flow_1s7gtbc</bpmn:outgoing>
     </bpmn:serviceTask>
-    <bpmn:serviceTask id="Activity_1y5x7jl" name="Invoke CNFM" camunda:asyncAfter="true" camunda:expression="${CnfInstantiateTask.invokeCnfmWithCreateAsRequest(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
+    <bpmn:serviceTask id="Activity_1y5x7jl" name="Invoke CNFM" camunda:expression="${CnfInstantiateTask.invokeCnfmWithCreateAsRequest(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
       <bpmn:incoming>Flow_1s7gtbc</bpmn:incoming>
       <bpmn:outgoing>Flow_1luy180</bpmn:outgoing>
     </bpmn:serviceTask>
@@ -22,52 +22,72 @@
       <bpmn:incoming>Flow_0xq0uda</bpmn:incoming>
       <bpmn:outgoing>Flow_1xcu3yl</bpmn:outgoing>
     </bpmn:serviceTask>
-    <bpmn:serviceTask id="Activity_0oa5fst" name="Create&#10;AsInstance Request" camunda:asyncAfter="true" camunda:expression="${CnfInstantiateTask.createAsInstanceRequest(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
+    <bpmn:serviceTask id="Activity_0oa5fst" name="Create&#10;AsInstance Request" camunda:expression="${CnfInstantiateTask.createAsInstanceRequest(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
       <bpmn:incoming>Flow_1luy180</bpmn:incoming>
       <bpmn:outgoing>Flow_0xq0uda</bpmn:outgoing>
     </bpmn:serviceTask>
     <bpmn:sequenceFlow id="Flow_0xq0uda" sourceRef="Activity_0oa5fst" targetRef="Activity_00w0lnj" />
-    <bpmn:sequenceFlow id="Flow_1xcu3yl" sourceRef="Activity_00w0lnj" targetRef="EndEvent_001k15i" />
+    <bpmn:sequenceFlow id="Flow_1xcu3yl" sourceRef="Activity_00w0lnj" targetRef="CallActivity_0fuqfru" />
+    <bpmn:callActivity id="CallActivity_0fuqfru" name="Monitor Instantiation Job" calledElement="MonitorCnfmJob">
+      <bpmn:extensionElements>
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:in source="mso-request-id" target="mso-request-id" />
+        <camunda:in source="gBuildingBlockExecution" target="gBuildingBlockExecution" />
+        <camunda:out source="gBuildingBlockExecution" target="gBuildingBlockExecution" />
+        <camunda:in source="CnfmStatusCheckUrl" target="CnfmStatusCheckUrl" />
+        <camunda:out source="WorkflowExceptionErrorMessage" target="WorkflowExceptionErrorMessage" />
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_1xcu3yl</bpmn:incoming>
+      <bpmn:outgoing>Flow_149m8py</bpmn:outgoing>
+    </bpmn:callActivity>
+    <bpmn:sequenceFlow id="Flow_149m8py" sourceRef="CallActivity_0fuqfru" targetRef="EndEvent_001k15i" />
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="CnfInstantiateBB">
+      <bpmndi:BPMNEdge id="Flow_1xcu3yl_di" bpmnElement="Flow_1xcu3yl">
+        <di:waypoint x="840" y="117" />
+        <di:waypoint x="900" y="117" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0xq0uda_di" bpmnElement="Flow_0xq0uda">
+        <di:waypoint x="670" y="117" />
+        <di:waypoint x="740" y="117" />
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1luy180_di" bpmnElement="Flow_1luy180">
-        <di:waypoint x="550" y="117" />
-        <di:waypoint x="620" y="117" />
+        <di:waypoint x="510" y="117" />
+        <di:waypoint x="570" y="117" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1s7gtbc_di" bpmnElement="Flow_1s7gtbc">
-        <di:waypoint x="400" y="117" />
-        <di:waypoint x="450" y="117" />
+        <di:waypoint x="340" y="117" />
+        <di:waypoint x="410" y="117" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_016sgof_di" bpmnElement="SequenceFlow_016sgof">
-        <di:waypoint x="218" y="117" />
-        <di:waypoint x="300" y="117" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0xq0uda_di" bpmnElement="Flow_0xq0uda">
-        <di:waypoint x="720" y="117" />
-        <di:waypoint x="770" y="117" />
+        <di:waypoint x="178" y="117" />
+        <di:waypoint x="240" y="117" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1xcu3yl_di" bpmnElement="Flow_1xcu3yl">
-        <di:waypoint x="870" y="117" />
-        <di:waypoint x="912" y="117" />
+      <bpmndi:BPMNEdge id="Flow_149m8py_di" bpmnElement="Flow_149m8py">
+        <di:waypoint x="1000" y="117" />
+        <di:waypoint x="1062" y="117" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="StartEvent_0ru3x55_di" bpmnElement="StartEvent_0ru3x55">
-        <dc:Bounds x="182" y="99" width="36" height="36" />
+        <dc:Bounds x="142" y="99" width="36" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_1jf7hlc_di" bpmnElement="ServiceTask_11">
-        <dc:Bounds x="300" y="77" width="100" height="80" />
+        <dc:Bounds x="240" y="77" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1y5x7jl_di" bpmnElement="Activity_1y5x7jl">
-        <dc:Bounds x="450" y="77" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="EndEvent_001k15i_di" bpmnElement="EndEvent_001k15i">
-        <dc:Bounds x="912" y="99" width="36" height="36" />
+        <dc:Bounds x="410" y="77" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_0oa5fst_di" bpmnElement="Activity_0oa5fst">
-        <dc:Bounds x="620" y="77" width="100" height="80" />
+        <dc:Bounds x="570" y="77" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_00w0lnj_di" bpmnElement="Activity_00w0lnj">
-        <dc:Bounds x="770" y="77" width="100" height="80" />
+        <dc:Bounds x="740" y="77" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="CallActivity_0fuqfru_di" bpmnElement="CallActivity_0fuqfru">
+        <dc:Bounds x="900" y="77" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="EndEvent_001k15i_di" bpmnElement="EndEvent_001k15i">
+        <dc:Bounds x="1062" y="99" width="36" height="36" />
       </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>