diff options
Diffstat (limited to 'bpmn/MSOInfrastructureBPMN')
4 files changed, 185 insertions, 71 deletions
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy index 7505eed348..b053b4e7d8 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy @@ -179,7 +179,7 @@ public class DoCreateE2EServiceInstance extends AbstractServiceTaskProcessor { execution.setVariable("modelVersion", modelVersion) execution.setVariable("modelUuid", modelUuid) execution.setVariable("modelName", modelName) - + StringBuilder sbParams = new StringBuilder() Map<String, String> paramsMap = execution.getVariable("serviceInputParams") if (paramsMap != null) @@ -666,4 +666,36 @@ public class DoCreateE2EServiceInstance extends AbstractServiceTaskProcessor { utils.log("DEBUG", "======== COMPLETED preInitResourcesOperStatus Process ======== ", isDebugEnabled) } + /** + * prepare resource create request + */ + public void preResourceRequest(execution, resourceName){ + def isDebugEnabled=execution.getVariable("isDebugLogEnabled") + String serviceInstanceName = execution.getVariable("serviceInstanceName") + String nsServiceName = nsName + "_" + serviceInstanceName + String nsServiceDescription = execution.getVariable("serviceInstanceDescription") + execution.setVariable("nsServiceName", nsServiceName) + utils.log("DEBUG", "Prepare VFC Request nsServiceName:" + nsServiceName, isDebugEnabled) + execution.setVariable("nsServiceDescription", nsServiceDescription) + utils.log("DEBUG", "Prepare VFC Request nsServiceDescription:" + nsServiceDescription, isDebugEnabled) + String globalSubscriberId = execution.getVariable("globalSubscriberId") + String serviceType = execution.getVariable("serviceType") + String serviceId = execution.getVariable("serviceId") + String operationId = execution.getVariable("operationId") + String incomingRequest = execution.getVariable("bpmnRequest") + Map serviceReq = jsonSlurper.parseText(incomingRequest) + def segmentList = serviceReq.service.parameters.segments + if (segmentList != null) { + segmentList.each { + if(StringUtils.containsIgnoreCase(it.resourceName, nsName)){ + String resourceActualName = it.resourceName + String resourceUUID = it.resourceUUID + String resourceParameters = it.nsParameters + execution.setVariable("resourceName", resourceActualName) + execution.setVariable("resourceUUID", resourceUUID) + execution.setVariable("resourceParameters", resourceParameters) + } + } + } + } } diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVFCNetworkServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVFCNetworkServiceInstance.groovy index b346faf4c6..6c0dedfe78 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVFCNetworkServiceInstance.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVFCNetworkServiceInstance.groovy @@ -80,7 +80,7 @@ public class DoCreateVFCNetworkServiceInstance extends AbstractServiceTaskProces utils.log("DEBUG", "serviceId:" + serviceId, isDebugEnabled)
String operationId = execution.getVariable("operationId")
utils.log("DEBUG", "serviceType:" + serviceType, isDebugEnabled)
- String nodeTemplateUUID = execution.getVariable("nodeTemplateUUID")
+ String nodeTemplateUUID = execution.getVariable("resourceUUID")
utils.log("DEBUG", "nodeTemplateUUID:" + nodeTemplateUUID, isDebugEnabled)
/*
* segmentInformation needed as a object of segment
@@ -93,13 +93,13 @@ public class DoCreateVFCNetworkServiceInstance extends AbstractServiceTaskProces * }
* }
*/
- String siRequest = execution.getVariable("segmentInformation")
+ String nsParameters = execution.getVariable("resourceParamters")
utils.log("DEBUG", "Input Request:" + siRequest, isDebugEnabled)
String nsOperationKey = "{\"globalSubscriberId\":\"" + globalSubscriberId + "\",\"serviceType:\""
+ serviceType + "\",\"serviceId\":\"" + serviceId + "\",\"operationId\":\"" + operationId
+"\",\"nodeTemplateUUID\":\"" + nodeTemplateUUID + "\"}";
execution.setVariable("nsOperationKey", nsOperationKey);
- execution.setVariable("nsParameters", jsonUtil.getJsonValue(siRequest, "nsParameters"))
+ execution.setVariable("nsParameters", nsParameters)
} catch (BpmnError e) {
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateCustomE2EServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateCustomE2EServiceInstance.bpmn index 0a80602705..b9d5e2c1d2 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateCustomE2EServiceInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateCustomE2EServiceInstance.bpmn @@ -113,7 +113,7 @@ csi.sendSyncError(execution)]]></bpmn:script> <bpmn:sequenceFlow id="SequenceFlow_01umodj" sourceRef="ScriptTask_0u8o9p2" targetRef="CallActivity_1ang7q8" /> </bpmn:subProcess> <bpmn:scriptTask id="ScriptTask_0xupxj9" name="Send Sync Ack Response" scriptFormat="groovy"> - <bpmn:incoming>SequenceFlow_081z8l2</bpmn:incoming> + <bpmn:incoming>SequenceFlow_194rnud</bpmn:incoming> <bpmn:outgoing>SequenceFlow_19eilro</bpmn:outgoing> <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* def csi = new CreateCustomE2EServiceInstance() @@ -148,7 +148,7 @@ csi.sendSyncResponse(execution)]]></bpmn:script> def csi= new CreateCustomE2EServiceInstance() csi.InitServiceOperationStatus(execution)]]></bpmn:script> </bpmn:scriptTask> - <bpmn:sequenceFlow id="SequenceFlow_081z8l2" sourceRef="Task_19mxcw3" targetRef="ScriptTask_0xupxj9" /> + <bpmn:sequenceFlow id="SequenceFlow_081z8l2" sourceRef="Task_19mxcw3" targetRef="Task_0in343a" /> <bpmn:serviceTask id="Task_19mxcw3" name="Update Service Operation Status"> <bpmn:extensionElements> <camunda:connector> @@ -171,6 +171,12 @@ csi.InitServiceOperationStatus(execution)]]></bpmn:script> <bpmn:incoming>SequenceFlow_1euqjsp</bpmn:incoming> <bpmn:outgoing>SequenceFlow_081z8l2</bpmn:outgoing> </bpmn:serviceTask> + <bpmn:sequenceFlow id="SequenceFlow_194rnud" sourceRef="Task_0in343a" targetRef="ScriptTask_0xupxj9" /> + <bpmn:scriptTask id="Task_0in343a" name="Send SDNC Service" scriptFormat="java"> + <bpmn:incoming>SequenceFlow_081z8l2</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_194rnud</bpmn:outgoing> + <bpmn:script></bpmn:script> + </bpmn:scriptTask> </bpmn:process> <bpmn:error id="Error_0nbdy47" name="MSOWorkflowException" errorCode="MSOWorkflowException" /> <bpmndi:BPMNDiagram id="BPMNDiagram_1"> @@ -194,7 +200,7 @@ csi.InitServiceOperationStatus(execution)]]></bpmn:script> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_1s09c7d_di" bpmnElement="ScriptTask_1s09c7d"> - <dc:Bounds x="158" y="158" width="100" height="80" /> + <dc:Bounds x="129" y="158" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_0ttvn8r_di" bpmnElement="ScriptTask_0ttvn8r"> <dc:Bounds x="1038" y="158" width="100" height="80" /> @@ -206,7 +212,7 @@ csi.InitServiceOperationStatus(execution)]]></bpmn:script> <dc:Bounds x="348" y="370" width="679" height="194" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_0xupxj9_di" bpmnElement="ScriptTask_0xupxj9"> - <dc:Bounds x="550" y="158" width="100" height="80" /> + <dc:Bounds x="577" y="158" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ExclusiveGateway_0aqn64l_di" bpmnElement="ExclusiveGateway_0aqn64l" isMarkerVisible="true"> <dc:Bounds x="903" y="173" width="50" height="50" /> @@ -222,16 +228,16 @@ csi.InitServiceOperationStatus(execution)]]></bpmn:script> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0s2spoq_di" bpmnElement="SequenceFlow_0s2spoq"> <di:waypoint xsi:type="dc:Point" x="118" y="198" /> - <di:waypoint xsi:type="dc:Point" x="158" y="198" /> + <di:waypoint xsi:type="dc:Point" x="129" y="198" /> <bpmndi:BPMNLabel> - <dc:Bounds x="93" y="177" width="90" height="12" /> + <dc:Bounds x="78.5" y="177" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_19eilro_di" bpmnElement="SequenceFlow_19eilro"> - <di:waypoint xsi:type="dc:Point" x="650" y="198" /> + <di:waypoint xsi:type="dc:Point" x="677" y="198" /> <di:waypoint xsi:type="dc:Point" x="701" y="198" /> <bpmndi:BPMNLabel> - <dc:Bounds x="630.5" y="177" width="90" height="12" /> + <dc:Bounds x="644" y="177" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0klbpxx_di" bpmnElement="SequenceFlow_0klbpxx"> @@ -249,10 +255,10 @@ csi.InitServiceOperationStatus(execution)]]></bpmn:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0z4faf9_di" bpmnElement="SequenceFlow_0z4faf9"> - <di:waypoint xsi:type="dc:Point" x="258" y="198" /> - <di:waypoint xsi:type="dc:Point" x="298" y="198" /> + <di:waypoint xsi:type="dc:Point" x="229" y="198" /> + <di:waypoint xsi:type="dc:Point" x="245" y="198" /> <bpmndi:BPMNLabel> - <dc:Bounds x="233" y="177" width="90" height="12" /> + <dc:Bounds x="192" y="177" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_14zu6wr_di" bpmnElement="SequenceFlow_14zu6wr"> @@ -363,24 +369,34 @@ csi.InitServiceOperationStatus(execution)]]></bpmn:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1euqjsp_di" bpmnElement="SequenceFlow_1euqjsp"> - <di:waypoint xsi:type="dc:Point" x="398" y="198" /> - <di:waypoint xsi:type="dc:Point" x="425.46307385229545" y="198" /> + <di:waypoint xsi:type="dc:Point" x="345" y="198" /> + <di:waypoint xsi:type="dc:Point" x="371" y="198" /> <bpmndi:BPMNLabel> - <dc:Bounds x="411.7315369261477" y="177" width="0" height="12" /> + <dc:Bounds x="358" y="177" width="0" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_1a3vwas_di" bpmnElement="Task_1tqjch6"> - <dc:Bounds x="298" y="158" width="100" height="80" /> + <dc:Bounds x="245" y="158" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_081z8l2_di" bpmnElement="SequenceFlow_081z8l2"> - <di:waypoint xsi:type="dc:Point" x="525.4630738522955" y="198" /> - <di:waypoint xsi:type="dc:Point" x="550" y="198" /> + <di:waypoint xsi:type="dc:Point" x="497" y="198" /> + <di:waypoint xsi:type="dc:Point" x="522" y="198" /> <bpmndi:BPMNLabel> - <dc:Bounds x="537.7315369261478" y="177" width="0" height="12" /> + <dc:Bounds x="509.5" y="177" width="0" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ServiceTask_1afiuuq_di" bpmnElement="Task_19mxcw3"> - <dc:Bounds x="426" y="158" width="100" height="80" /> + <dc:Bounds x="371" y="158" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_194rnud_di" bpmnElement="SequenceFlow_194rnud"> + <di:waypoint xsi:type="dc:Point" x="597" y="198" /> + <di:waypoint xsi:type="dc:Point" x="627" y="198" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="612" y="177" width="0" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ScriptTask_1u5yu0n_di" bpmnElement="Task_0in343a"> + <dc:Bounds x="476" y="158" width="100" height="80" /> </bpmndi:BPMNShape> </bpmndi:BPMNPlane> </bpmndi:BPMNDiagram> diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn index 2e996e20d5..a76036668c 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn @@ -128,24 +128,45 @@ ddsi.postProcessAAIPUT(execution)]]></bpmn2:script> </bpmn2:scriptTask> <bpmn2:sequenceFlow id="SequenceFlow_1dd86x8" sourceRef="ScriptTask_0q37vn9" targetRef="ExclusiveGateway_1nk6aol" /> <bpmn2:scriptTask id="ScriptTask_0081lne" name="Prepare SDN-C Adaptor Data Request" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_0k4q7jm</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_1hgiln0</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_0ofqw6v</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* def csi = new DoCreateE2EServiceInstance() csi.preSDNCRequest(execution)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:scriptTask id="ScriptTask_0wvq4t8" name="Prepare VF-C Adaptor Data Request" scriptFormat="groovy"> + <bpmn2:scriptTask id="ScriptTask_0wvq4t8" name="Prepare Resource Request for vEPC" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_05gdjox</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_15zgrcq</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +String resourceName= "vEPC" def csi = new DoCreateE2EServiceInstance() -csi.preVFCRequest(execution)]]></bpmn2:script> +csi.preResourceRequest(execution, resourceName)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:callActivity id="CallActivity_09c3ajg" name="Call DoCreateE2ENetworkInstance" calledElement="DoCreateE2ENetworkInstance"> + <bpmn2:callActivity id="CallActivity_09c3ajg" name="Call DoCreateE2ENetworkInstance" calledElement="DoCreateWANNetworkInstance"> + <bpmn2:extensionElements> + <camunda:in source="serviceId" target="serviceId" /> + <camunda:in source="operationId" target="operationId" /> + <camunda:in source="operationType" target="operationType" /> + <camunda:in source="resourceTemplateUUID" target="resourceTemplateUUID" /> + <camunda:in source="resourceName" target="resourceName" /> + <camunda:in source="resoureceNodeType" target="resoureceNodeType" /> + <camunda:in source="resourceReqJson" target="resourceReqJson" /> + </bpmn2:extensionElements> <bpmn2:incoming>SequenceFlow_0ofqw6v</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_1vvdkcs</bpmn2:outgoing> </bpmn2:callActivity> - <bpmn2:callActivity id="CallActivity_0uwm4l1" name="Call DoCreateVFCNetworkServiceInstance" calledElement="DoCreateVFCNetworkServiceInstance"> + <bpmn2:callActivity id="CallActivity_0uwm4l1" name="Call DoCreateVFCNetworkServiceInstance For vEPC" calledElement="DoCreateVFCNetworkServiceInstance"> + <bpmn2:extensionElements> + <camunda:in source="nsServiceName" target="nsServiceName" /> + <camunda:in source="nsServiceDescription" target="nsServiceDescription" /> + <camunda:in source="globalSubscriberId" target="globalSubscriberId" /> + <camunda:in source="serviceType" target="serviceType" /> + <camunda:in source="serviceId" target="serviceId" /> + <camunda:in source="operationId" target="operationId" /> + <camunda:in source="resourceName" target="resourceName" /> + <camunda:in source="resourceUUID" target="resourceUUID" /> + <camunda:in source="resourceParameters" target="resourceParameters" /> + </bpmn2:extensionElements> <bpmn2:incoming>SequenceFlow_15zgrcq</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_0k4q7jm</bpmn2:outgoing> </bpmn2:callActivity> @@ -164,7 +185,7 @@ csi.postConfigRequest(execution)]]></bpmn2:script> <bpmn2:endEvent id="EndEvent_0kbbt94"> <bpmn2:incoming>SequenceFlow_092ghvu</bpmn2:incoming> </bpmn2:endEvent> - <bpmn2:sequenceFlow id="SequenceFlow_0k4q7jm" sourceRef="CallActivity_0uwm4l1" targetRef="ScriptTask_0081lne" /> + <bpmn2:sequenceFlow id="SequenceFlow_0k4q7jm" sourceRef="CallActivity_0uwm4l1" targetRef="Task_0aidjmp" /> <bpmn2:sequenceFlow id="SequenceFlow_1qctzm0" sourceRef="Task_0uiekmn" targetRef="Task_0raqlqc" /> <bpmn2:scriptTask id="Task_0uiekmn" name="Prepare Resource Oper Status"> <bpmn2:incoming>SequenceFlow_1170ztf</bpmn2:incoming> @@ -196,6 +217,31 @@ ddsi.preInitResourcesOperStatus(execution)]]></bpmn2:script> <bpmn2:incoming>SequenceFlow_1qctzm0</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_05gdjox</bpmn2:outgoing> </bpmn2:serviceTask> + <bpmn2:sequenceFlow id="SequenceFlow_0ua1bbk" sourceRef="Task_0aidjmp" targetRef="Task_03n6y9h" /> + <bpmn2:scriptTask id="Task_0aidjmp" name="Prepare Resource Request For vIMS" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_0k4q7jm</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_0ua1bbk</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +String nsName = "vIMS" +def csi = new DoCreateE2EServiceInstance() +csi.preResourceRequest(execution, nsName)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:sequenceFlow id="SequenceFlow_1hgiln0" sourceRef="Task_03n6y9h" targetRef="ScriptTask_0081lne" /> + <bpmn2:callActivity id="Task_03n6y9h" name="Call DoCreateVFCNetworkServiceInstance For vIMS" calledElement="DoCreateVFCNetworkServiceInstance"> + <bpmn2:extensionElements> + <camunda:in source="nsServiceName" target="nsServiceName" /> + <camunda:in source="nsServiceDescription" target="nsServiceDescription" /> + <camunda:in source="globalSubscriberId" target="globalSubscriberId" /> + <camunda:in source="serviceType" target="serviceType" /> + <camunda:in source="serviceId" target="serviceId" /> + <camunda:in source="operationId" target="operationId" /> + <camunda:in source="resourceName" target="resourceName" /> + <camunda:in source="resourceUUID" target="resourceUUID" /> + <camunda:in source="resourceParameters" target="resourceParameters" /> + </bpmn2:extensionElements> + <bpmn2:incoming>SequenceFlow_0ua1bbk</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_1hgiln0</bpmn2:outgoing> + </bpmn2:callActivity> </bpmn2:process> <bpmn2:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" /> <bpmn2:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" /> @@ -276,35 +322,35 @@ ddsi.preInitResourcesOperStatus(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="SubProcess_06d8lk8_di" bpmnElement="SubProcess_06d8lk8" isExpanded="true"> - <dc:Bounds x="-329" y="412" width="783" height="195" /> + <dc:Bounds x="-155" y="387" width="783" height="195" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="StartEvent_0yljq9y_di" bpmnElement="StartEvent_0yljq9y"> - <dc:Bounds x="-233" y="489" width="36" height="36" /> + <dc:Bounds x="-59" y="464" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="-260" y="530" width="90" height="0" /> + <dc:Bounds x="-86" y="505" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="EndEvent_117lkk3_di" bpmnElement="EndEvent_117lkk3"> - <dc:Bounds x="400" y="489" width="36" height="36" /> + <dc:Bounds x="574" y="464" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="373" y="530" width="90" height="0" /> + <dc:Bounds x="547" y="505" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="CallActivity_1srx6p6_di" bpmnElement="CallActivity_1srx6p6"> - <dc:Bounds x="65" y="467" width="100" height="80" /> + <dc:Bounds x="239" y="442" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0eumzpf_di" bpmnElement="SequenceFlow_0eumzpf"> - <di:waypoint xsi:type="dc:Point" x="165" y="507" /> - <di:waypoint xsi:type="dc:Point" x="233" y="507" /> + <di:waypoint xsi:type="dc:Point" x="339" y="482" /> + <di:waypoint xsi:type="dc:Point" x="407" y="482" /> <bpmndi:BPMNLabel> - <dc:Bounds x="154" y="492" width="90" height="0" /> + <dc:Bounds x="328" y="467" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0tgrn11_di" bpmnElement="SequenceFlow_0tgrn11"> - <di:waypoint xsi:type="dc:Point" x="-197" y="507" /> - <di:waypoint xsi:type="dc:Point" x="-98" y="507" /> + <di:waypoint xsi:type="dc:Point" x="-23" y="482" /> + <di:waypoint xsi:type="dc:Point" x="76" y="482" /> <bpmndi:BPMNLabel> - <dc:Bounds x="-192" y="492" width="90" height="0" /> + <dc:Bounds x="-18" y="467" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ExclusiveGateway_1nk6aol_di" bpmnElement="ExclusiveGateway_1nk6aol" isMarkerVisible="true"> @@ -349,68 +395,68 @@ ddsi.preInitResourcesOperStatus(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_0ocetux_di" bpmnElement="ScriptTask_0ocetux"> - <dc:Bounds x="-98" y="467" width="100" height="80" /> + <dc:Bounds x="76" y="442" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1lqktwf_di" bpmnElement="SequenceFlow_1lqktwf"> - <di:waypoint xsi:type="dc:Point" x="2" y="507" /> - <di:waypoint xsi:type="dc:Point" x="65" y="507" /> + <di:waypoint xsi:type="dc:Point" x="176" y="482" /> + <di:waypoint xsi:type="dc:Point" x="239" y="482" /> <bpmndi:BPMNLabel> - <dc:Bounds x="-11" y="492" width="90" height="0" /> + <dc:Bounds x="163" y="467" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_1p0vyip_di" bpmnElement="ScriptTask_1p0vyip"> - <dc:Bounds x="233" y="467" width="100" height="80" /> + <dc:Bounds x="407" y="442" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1xzgv5k_di" bpmnElement="SequenceFlow_1xzgv5k"> - <di:waypoint xsi:type="dc:Point" x="333" y="507" /> - <di:waypoint xsi:type="dc:Point" x="365" y="507" /> - <di:waypoint xsi:type="dc:Point" x="365" y="507" /> - <di:waypoint xsi:type="dc:Point" x="400" y="507" /> + <di:waypoint xsi:type="dc:Point" x="507" y="482" /> + <di:waypoint xsi:type="dc:Point" x="539" y="482" /> + <di:waypoint xsi:type="dc:Point" x="539" y="482" /> + <di:waypoint xsi:type="dc:Point" x="574" y="482" /> <bpmndi:BPMNLabel> - <dc:Bounds x="335" y="507" width="90" height="0" /> + <dc:Bounds x="509" y="482" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_0081lne_di" bpmnElement="ScriptTask_0081lne"> - <dc:Bounds x="477" y="819" width="100" height="80" /> + <dc:Bounds x="211" y="819" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_0wvq4t8_di" bpmnElement="ScriptTask_0wvq4t8"> - <dc:Bounds x="848" y="819" width="100" height="80" /> + <dc:Bounds x="789" y="819" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="CallActivity_09c3ajg_di" bpmnElement="CallActivity_09c3ajg"> - <dc:Bounds x="295" y="819" width="100" height="80" /> + <dc:Bounds x="43" y="819" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="CallActivity_0uwm4l1_di" bpmnElement="CallActivity_0uwm4l1"> <dc:Bounds x="632" y="819" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_1xdjlzm_di" bpmnElement="ScriptTask_1xdjlzm"> - <dc:Bounds x="101" y="819" width="100" height="80" /> + <dc:Bounds x="-152" y="819" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0ofqw6v_di" bpmnElement="SequenceFlow_0ofqw6v"> - <di:waypoint xsi:type="dc:Point" x="477" y="859" /> - <di:waypoint xsi:type="dc:Point" x="395" y="859" /> + <di:waypoint xsi:type="dc:Point" x="211" y="859" /> + <di:waypoint xsi:type="dc:Point" x="143" y="859" /> <bpmndi:BPMNLabel> - <dc:Bounds x="391" y="838" width="90" height="12" /> + <dc:Bounds x="132" y="838" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_15zgrcq_di" bpmnElement="SequenceFlow_15zgrcq"> - <di:waypoint xsi:type="dc:Point" x="848" y="859" /> + <di:waypoint xsi:type="dc:Point" x="789" y="859" /> <di:waypoint xsi:type="dc:Point" x="732" y="859" /> <bpmndi:BPMNLabel> - <dc:Bounds x="745" y="838" width="90" height="12" /> + <dc:Bounds x="715.5" y="838" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1vvdkcs_di" bpmnElement="SequenceFlow_1vvdkcs"> - <di:waypoint xsi:type="dc:Point" x="295" y="859" /> - <di:waypoint xsi:type="dc:Point" x="201" y="859" /> + <di:waypoint xsi:type="dc:Point" x="43" y="859" /> + <di:waypoint xsi:type="dc:Point" x="-52" y="859" /> <bpmndi:BPMNLabel> - <dc:Bounds x="203" y="838" width="90" height="12" /> + <dc:Bounds x="-49.5" y="838" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_092ghvu_di" bpmnElement="SequenceFlow_092ghvu"> - <di:waypoint xsi:type="dc:Point" x="101" y="859" /> - <di:waypoint xsi:type="dc:Point" x="11" y="859" /> + <di:waypoint xsi:type="dc:Point" x="-152" y="859" /> + <di:waypoint xsi:type="dc:Point" x="-191" y="859" /> <bpmndi:BPMNLabel> - <dc:Bounds x="11" y="838" width="90" height="12" /> + <dc:Bounds x="-216.5" y="838" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1170ztf_di" bpmnElement="SequenceFlow_1170ztf"> @@ -421,16 +467,16 @@ ddsi.preInitResourcesOperStatus(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="EndEvent_01p249c_di" bpmnElement="EndEvent_0kbbt94"> - <dc:Bounds x="-25" y="841" width="36" height="36" /> + <dc:Bounds x="-227" y="841" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="-143" y="881" width="90" height="12" /> + <dc:Bounds x="-345" y="881" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0k4q7jm_di" bpmnElement="SequenceFlow_0k4q7jm"> <di:waypoint xsi:type="dc:Point" x="632" y="859" /> - <di:waypoint xsi:type="dc:Point" x="577" y="859" /> + <di:waypoint xsi:type="dc:Point" x="596" y="859" /> <bpmndi:BPMNLabel> - <dc:Bounds x="559.5" y="838" width="90" height="12" /> + <dc:Bounds x="569" y="838" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1qctzm0_di" bpmnElement="SequenceFlow_1qctzm0"> @@ -446,7 +492,7 @@ ddsi.preInitResourcesOperStatus(execution)]]></bpmn2:script> <bpmndi:BPMNEdge id="SequenceFlow_05gdjox_di" bpmnElement="SequenceFlow_05gdjox"> <di:waypoint xsi:type="dc:Point" x="1022" y="784" /> <di:waypoint xsi:type="dc:Point" x="1022" y="859" /> - <di:waypoint xsi:type="dc:Point" x="948" y="859" /> + <di:waypoint xsi:type="dc:Point" x="889" y="859" /> <bpmndi:BPMNLabel> <dc:Bounds x="1037" y="815.5" width="0" height="12" /> </bpmndi:BPMNLabel> @@ -454,6 +500,26 @@ ddsi.preInitResourcesOperStatus(execution)]]></bpmn2:script> <bpmndi:BPMNShape id="ServiceTask_14tnuxf_di" bpmnElement="Task_0raqlqc"> <dc:Bounds x="972" y="704" width="100" height="80" /> </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_0ua1bbk_di" bpmnElement="SequenceFlow_0ua1bbk"> + <di:waypoint xsi:type="dc:Point" x="496" y="859" /> + <di:waypoint xsi:type="dc:Point" x="458" y="859" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="477" y="838" width="0" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ScriptTask_0ue196s_di" bpmnElement="Task_0aidjmp"> + <dc:Bounds x="496" y="819" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1hgiln0_di" bpmnElement="SequenceFlow_1hgiln0"> + <di:waypoint xsi:type="dc:Point" x="358" y="859" /> + <di:waypoint xsi:type="dc:Point" x="311" y="859" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="334.5" y="838" width="0" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="CallActivity_1hcdpgq_di" bpmnElement="Task_03n6y9h"> + <dc:Bounds x="358" y="819" width="100" height="80" /> + </bpmndi:BPMNShape> </bpmndi:BPMNPlane> </bpmndi:BPMNDiagram> </bpmn2:definitions> |