Merge "Fix createSDNCResource bpmn"

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateSDNCNetworkResource.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateSDNCNetworkResource.bpmn
index 9d48af5..ceb1371 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateSDNCNetworkResource.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateSDNCNetworkResource.bpmn
@@ -113,10 +113,6 @@ dcsi.prepareUpdateBeforeCreateSDNCResource(execution)</bpmn:script>
 def csi = new  CreateSDNCNetworkResource()
 csi.sendSyncResponse(execution)</bpmn:script>
     </bpmn:scriptTask>
-    <bpmn:subProcess id="Task_0bga3e8" name="call Activate SDNC network Resource">
-      <bpmn:incoming>SequenceFlow_1dww8ye</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_05niqbf</bpmn:outgoing>
-    </bpmn:subProcess>
     <bpmn:exclusiveGateway id="ExclusiveGateway_0cdulnk" name="is activate required">
       <bpmn:incoming>SequenceFlow_0o7h0ag</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_1dww8ye</bpmn:outgoing>
@@ -138,6 +134,10 @@ dcsi.prepareUpdateAfterCreateSDNCResource(execution)</bpmn:script>
     <bpmn:sequenceFlow id="SequenceFlow_05niqbf" sourceRef="Task_0bga3e8" targetRef="Task_0uwlr22" />
     <bpmn:sequenceFlow id="SequenceFlow_1cd8ujq" sourceRef="Task_0uwlr22" targetRef="ScriptTask_1g5zyi6" />
     <bpmn:sequenceFlow id="SequenceFlow_0auvfvm" sourceRef="ScriptTask_1g5zyi6" targetRef="EndEvent_1x6k78c" />
+    <bpmn:callActivity id="Task_0bga3e8" name="call Activate SDNC network Resource" calledElement="ActivateSDNCNetworkResource">
+      <bpmn:incoming>SequenceFlow_1dww8ye</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_05niqbf</bpmn:outgoing>
+    </bpmn:callActivity>
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="CreateSDNCNetworkResource">
@@ -228,9 +228,6 @@ dcsi.prepareUpdateAfterCreateSDNCResource(execution)</bpmn:script>
       <bpmndi:BPMNShape id="ScriptTask_1g5zyi6_di" bpmnElement="ScriptTask_1g5zyi6">
         <dc:Bounds x="890" y="295" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="SubProcess_0j34fnb_di" bpmnElement="Task_0bga3e8">
-        <dc:Bounds x="608" y="431" width="100" height="80" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_0cdulnk_di" bpmnElement="ExclusiveGateway_0cdulnk" isMarkerVisible="true">
         <dc:Bounds x="539" y="310" width="50" height="50" />
         <bpmndi:BPMNLabel>
@@ -280,6 +277,9 @@ dcsi.prepareUpdateAfterCreateSDNCResource(execution)</bpmn:script>
         <di:waypoint x="990" y="335" />
         <di:waypoint x="1046" y="335" />
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="CallActivity_0aywvn3_di" bpmnElement="Task_0bga3e8">
+        <dc:Bounds x="608" y="431" width="100" height="80" />
+      </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn:definitions>