diff options
| author |   Yulian Han <elaine.hanyulian@huawei.com> | 2018-04-20 16:30:45 +0800 |
|---|---|---|
| committer | Yulian Han <elaine.hanyulian@huawei.com> | 2018-04-20 08:51:18 +0000 |
| commit | b3641c2450c642aab3e4df638a3b79d54fc09022 (patch) | |
| tree | 61d4c33b14767768c167dec2c172e575c3e871d1 /bpmn/MSOInfrastructureBPMN/src/main/resources | |
| parent | 02caddbf25efe5b4a917cdeb13a3bb25976ce2a1 (diff) | |
move comparemodel before syncresponse updateE2E
deleteE2EServiceInstance excution param type def
Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f064306
Issue-ID: SO-578
Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>
Diffstat (limited to 'bpmn/MSOInfrastructureBPMN/src/main/resources')
2 files changed, 667 insertions, 540 deletions
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateCustomE2EServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateCustomE2EServiceInstance.bpmn index 3071d1c20d..6451dc6ca0 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateCustomE2EServiceInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateCustomE2EServiceInstance.bpmn @@ -8,8 +8,8 @@ <bpmn:scriptTask id="ScriptTask_0u3lw39" name="Handle Unexpected Error" scriptFormat="groovy"> <bpmn:incoming>SequenceFlow_1dsbjjb</bpmn:incoming> <bpmn:outgoing>SequenceFlow_1yay321</bpmn:outgoing> - <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
-ExceptionUtil ex = new ExceptionUtil()
+ <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.* +ExceptionUtil ex = new ExceptionUtil() ex.processJavaException(execution)]]></bpmn:script> </bpmn:scriptTask> <bpmn:startEvent id="StartEvent_0v1ffn4"> @@ -33,7 +33,6 @@ ex.processJavaException(execution)]]></bpmn:script> <camunda:in source="disableRollback" target="disableRollback" /> <camunda:in source="uuiRequest" target="uuiRequest" /> <camunda:out source="rolledBack" target="rolledBack" /> - <camunda:out source="serviceInstanceName" target="serviceInstanceName" /> <camunda:in source="failIfExists" target="failIfExists" /> <camunda:in source="globalSubscriberId" target="globalSubscriberId" /> <camunda:in source="serviceType" target="serviceType" /> @@ -41,8 +40,12 @@ ex.processJavaException(execution)]]></bpmn:script> <camunda:in source="operationId" target="operationId" /> <camunda:in source="operationType" target="operationType" /> <camunda:in source="URN_mso_adapters_openecomp_db_endpoint" target="URN_mso_adapters_openecomp_db_endpoint" /> + <camunda:in source="serviceDecomposition_Target" target="serviceDecomposition_Target" /> + <camunda:in source="serviceDecomposition_Original" target="serviceDecomposition_Original" /> + <camunda:in source="addResourceList" target="addResourceList" /> + <camunda:in source="delResourceList" target="delResourceList" /> </bpmn:extensionElements> - <bpmn:incoming>SequenceFlow_19eilro</bpmn:incoming> + <bpmn:incoming>SequenceFlow_04qwbbf</bpmn:incoming> <bpmn:outgoing>SequenceFlow_0klbpxx</bpmn:outgoing> </bpmn:callActivity> <bpmn:endEvent id="EndEvent_0bpd6c0" name="End"> @@ -50,16 +53,16 @@ ex.processJavaException(execution)]]></bpmn:script> </bpmn:endEvent> <bpmn:scriptTask id="ScriptTask_1s09c7d" name="Pre Process Incoming Request" scriptFormat="groovy"> <bpmn:incoming>SequenceFlow_0s2spoq</bpmn:incoming> - <bpmn:outgoing>SequenceFlow_0z4faf9</bpmn:outgoing> - <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def csi= new UpdateCustomE2EServiceInstance()
+ <bpmn:outgoing>SequenceFlow_0az1n4y</bpmn:outgoing> + <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def csi= new UpdateCustomE2EServiceInstance() csi.preProcessRequest(execution)]]></bpmn:script> </bpmn:scriptTask> <bpmn:scriptTask id="ScriptTask_0ttvn8r" name="Prepare Completion Request" scriptFormat="groovy"> <bpmn:incoming>SequenceFlow_14zu6wr</bpmn:incoming> <bpmn:outgoing>SequenceFlow_0je30si</bpmn:outgoing> - <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def csi = new UpdateCustomE2EServiceInstance()
+ <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def csi = new UpdateCustomE2EServiceInstance() csi.prepareCompletionRequest(execution)]]></bpmn:script> </bpmn:scriptTask> <bpmn:callActivity id="CallActivity_02fyxz0" name="Call CompleteMsoProcess" calledElement="CompleteMsoProcess"> @@ -85,8 +88,8 @@ csi.prepareCompletionRequest(execution)]]></bpmn:script> <bpmn:scriptTask id="ScriptTask_0u8o9p2" name="Prepare Fallout Request" scriptFormat="groovy"> <bpmn:incoming>SequenceFlow_0n9pexp</bpmn:incoming> <bpmn:outgoing>SequenceFlow_01umodj</bpmn:outgoing> - <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def csi = new UpdateCustomE2EServiceInstance()
+ <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def csi = new UpdateCustomE2EServiceInstance() csi.prepareFalloutRequest(execution)]]></bpmn:script> </bpmn:scriptTask> <bpmn:callActivity id="CallActivity_1ang7q8" name="Call FalloutHandler" calledElement="FalloutHandler"> @@ -102,22 +105,57 @@ csi.prepareFalloutRequest(execution)]]></bpmn:script> <bpmn:outgoing>SequenceFlow_1ysapam</bpmn:outgoing> </bpmn:callActivity> <bpmn:scriptTask id="ScriptTask_1rn6nqi" name="Send Error Response"> - <bpmn:incoming>SequenceFlow_0e1r62n</bpmn:incoming> + <bpmn:incoming>SequenceFlow_06o383f</bpmn:incoming> <bpmn:outgoing>SequenceFlow_0n9pexp</bpmn:outgoing> - <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def csi = new UpdateCustomE2EServiceInstance()
+ <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def csi = new UpdateCustomE2EServiceInstance() csi.sendSyncError(execution)]]></bpmn:script> </bpmn:scriptTask> - <bpmn:sequenceFlow id="SequenceFlow_0e1r62n" sourceRef="StartEvent_0dug28e" targetRef="ScriptTask_1rn6nqi" /> + <bpmn:sequenceFlow id="SequenceFlow_0e1r62n" sourceRef="StartEvent_0dug28e" targetRef="ScriptTask_14kqo0r" /> <bpmn:sequenceFlow id="SequenceFlow_1ysapam" sourceRef="CallActivity_1ang7q8" targetRef="EndEvent_03wysuk" /> <bpmn:sequenceFlow id="SequenceFlow_0n9pexp" sourceRef="ScriptTask_1rn6nqi" targetRef="ScriptTask_0u8o9p2" /> <bpmn:sequenceFlow id="SequenceFlow_01umodj" sourceRef="ScriptTask_0u8o9p2" targetRef="CallActivity_1ang7q8" /> + <bpmn:scriptTask id="ScriptTask_14kqo0r" name="Prepare Update Service Oper Status(error)" scriptFormat="groovy"> + <bpmn:incoming>SequenceFlow_0e1r62n</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_0t4nds2</bpmn:outgoing> + <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* + execution.setVariable("progress", "100") + execution.setVariable("operationStatus", "Finished") + execution.setVariable("operationResult", "Error") + execution.setVariable("operationReason", "Exception happened") + def ddsi = new UpdateCustomE2EServiceInstance() + ddsi.preUpdateServiceOperationStatus(execution)]]></bpmn:script> + </bpmn:scriptTask> + <bpmn:sequenceFlow id="SequenceFlow_0t4nds2" sourceRef="ScriptTask_14kqo0r" targetRef="ServiceTask_1af6rwh" /> + <bpmn:serviceTask id="ServiceTask_1af6rwh" name="Update Service Oper Status"> + <bpmn:extensionElements> + <camunda:connector> + <camunda:inputOutput> + <camunda:inputParameter name="url">${URN_mso_openecomp_adapters_db_endpoint}</camunda:inputParameter> + <camunda:inputParameter name="headers"> + <camunda:map> + <camunda:entry key="content-type">application/soap+xml</camunda:entry> + <camunda:entry key="Authorization">Basic QlBFTENsaWVudDpwYXNzd29yZDEk</camunda:entry> + </camunda:map> + </camunda:inputParameter> + <camunda:inputParameter name="payload">${CVFMI_updateServiceOperStatusRequest}</camunda:inputParameter> + <camunda:inputParameter name="method">POST</camunda:inputParameter> + <camunda:outputParameter name="CVFMI_dbResponseCode">${statusCode}</camunda:outputParameter> + <camunda:outputParameter name="CVFMI_dbResponse">${response}</camunda:outputParameter> + </camunda:inputOutput> + <camunda:connectorId>http-connector</camunda:connectorId> + </camunda:connector> + </bpmn:extensionElements> + <bpmn:incoming>SequenceFlow_0t4nds2</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_06o383f</bpmn:outgoing> + </bpmn:serviceTask> + <bpmn:sequenceFlow id="SequenceFlow_06o383f" sourceRef="ServiceTask_1af6rwh" targetRef="ScriptTask_1rn6nqi" /> </bpmn:subProcess> <bpmn:scriptTask id="ScriptTask_0xupxj9" name="Send Sync Ack Response" scriptFormat="groovy"> - <bpmn:incoming>SequenceFlow_1853xxi</bpmn:incoming> - <bpmn:outgoing>SequenceFlow_19eilro</bpmn:outgoing> - <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def csi = new UpdateCustomE2EServiceInstance()
+ <bpmn:incoming>SequenceFlow_12dou7o</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_0secadm</bpmn:outgoing> + <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def csi = new UpdateCustomE2EServiceInstance() csi.sendSyncResponse(execution)]]></bpmn:script> </bpmn:scriptTask> <bpmn:exclusiveGateway id="ExclusiveGateway_0aqn64l" name="Success?"> @@ -130,10 +168,8 @@ csi.sendSyncResponse(execution)]]></bpmn:script> <bpmn:errorEventDefinition errorRef="Error_0nbdy47" /> </bpmn:endEvent> <bpmn:sequenceFlow id="SequenceFlow_0s2spoq" sourceRef="StartEvent_00qj6ro" targetRef="ScriptTask_1s09c7d" /> - <bpmn:sequenceFlow id="SequenceFlow_19eilro" sourceRef="ScriptTask_0xupxj9" targetRef="DoUpdateE2EServiceInstance" /> <bpmn:sequenceFlow id="SequenceFlow_0klbpxx" sourceRef="DoUpdateE2EServiceInstance" targetRef="ExclusiveGateway_0aqn64l" /> <bpmn:sequenceFlow id="SequenceFlow_0yayvrf" sourceRef="CallActivity_02fyxz0" targetRef="EndEvent_0bpd6c0" /> - <bpmn:sequenceFlow id="SequenceFlow_0z4faf9" sourceRef="ScriptTask_1s09c7d" targetRef="ScriptTask_09rx901" /> <bpmn:sequenceFlow id="SequenceFlow_14zu6wr" name="yes" sourceRef="ExclusiveGateway_0aqn64l" targetRef="ScriptTask_0ttvn8r"> <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("WorkflowException") == null}]]></bpmn:conditionExpression> </bpmn:sequenceFlow> @@ -141,14 +177,85 @@ csi.sendSyncResponse(execution)]]></bpmn:script> <bpmn:sequenceFlow id="SequenceFlow_1fueo69" name="no" sourceRef="ExclusiveGateway_0aqn64l" targetRef="EndEvent_07uk5iy"> <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("WorkflowException") != null}]]></bpmn:conditionExpression> </bpmn:sequenceFlow> - <bpmn:scriptTask id="ScriptTask_09rx901" name="Init Service Operation Status" scriptFormat="groovy"> - <bpmn:incoming>SequenceFlow_0z4faf9</bpmn:incoming> - <bpmn:outgoing>SequenceFlow_0utlsnd</bpmn:outgoing> + <bpmn:callActivity id="CallActivity_1vejucv" name="Call AAI Generic GetService" calledElement="GenericGetService"> + <bpmn:extensionElements> + <camunda:in source="serviceInstanceId" target="GENGS_serviceInstanceId" /> + <camunda:in sourceExpression="service-instance" target="GENGS_type" /> + <camunda:out source="GENGS_FoundIndicator" target="GENGS_FoundIndicator" /> + <camunda:out source="GENGS_SuccessIndicator" target="GENGS_SuccessIndicator" /> + <camunda:out source="WorkflowException" target="WorkflowException" /> + <camunda:out source="GENGS_siResourceLink" target="GENGS_siResourceLink" /> + <camunda:out source="GENGS_service" target="GENGS_service" /> + <camunda:in source="globalSubscriberId" target="GENGS_globalCustomerId" /> + <camunda:in source="serviceType" target="GENGS_serviceType" /> + </bpmn:extensionElements> + <bpmn:incoming>SequenceFlow_0az1n4y</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_1bd4711</bpmn:outgoing> + </bpmn:callActivity> + <bpmn:scriptTask id="ScriptTask_0cx1y0g" name="Post Process AAI GET" scriptFormat="groovy"> + <bpmn:incoming>SequenceFlow_1bd4711</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_03i6zhx</bpmn:outgoing> + <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def dcsi = new UpdateCustomE2EServiceInstance() +dcsi.postProcessAAIGET(execution)]]></bpmn:script> + </bpmn:scriptTask> + <bpmn:sequenceFlow id="SequenceFlow_1bd4711" sourceRef="CallActivity_1vejucv" targetRef="ScriptTask_0cx1y0g" /> + <bpmn:scriptTask id="ScriptTask_11y3uq6" name="Post for Compare Model Versions" scriptFormat="groovy"> + <bpmn:incoming>SequenceFlow_0xhbobd</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_0t7zinj</bpmn:outgoing> + <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def csi = new UpdateCustomE2EServiceInstance() +csi.postCompareModelVersions(execution)]]></bpmn:script> + </bpmn:scriptTask> + <bpmn:scriptTask id="ScriptTask_0hixtxc" name="Prepare for Compare Model Versions" scriptFormat="groovy"> + <bpmn:incoming>SequenceFlow_03i6zhx</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_1pdv4qj</bpmn:outgoing> + <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def ddsi = new UpdateCustomE2EServiceInstance() +ddsi.preCompareModelVersions(execution)]]></bpmn:script> + </bpmn:scriptTask> + <bpmn:callActivity id="CallActivity_1rkoyc5" name="Call DoCompareModelVersions" calledElement="DoCompareModelVersions"> + <bpmn:extensionElements> + <camunda:in source="msoRequestId" target="msoRequestId" /> + <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" /> + <camunda:in source="model-invariant-id-target" target="model-invariant-id-target" /> + <camunda:in source="model-version-id-target" target="model-version-id-target" /> + <camunda:in source="model-invariant-id-original" target="model-invariant-id-original" /> + <camunda:in source="model-version-id-original" target="model-version-id-original" /> + <camunda:out source="serviceDecomposition_Target" target="serviceDecomposition_Target" /> + <camunda:out source="serviceDecomposition_Original" target="serviceDecomposition_Original" /> + <camunda:out source="addResourceList" target="addResourceList" /> + <camunda:out source="delResourceList" target="delResourceList" /> + </bpmn:extensionElements> + <bpmn:incoming>SequenceFlow_1pdv4qj</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_0xhbobd</bpmn:outgoing> + </bpmn:callActivity> + <bpmn:sequenceFlow id="SequenceFlow_03i6zhx" sourceRef="ScriptTask_0cx1y0g" targetRef="ScriptTask_0hixtxc" /> + <bpmn:sequenceFlow id="SequenceFlow_1pdv4qj" sourceRef="ScriptTask_0hixtxc" targetRef="CallActivity_1rkoyc5" /> + <bpmn:sequenceFlow id="SequenceFlow_0xhbobd" sourceRef="CallActivity_1rkoyc5" targetRef="ScriptTask_11y3uq6" /> + <bpmn:exclusiveGateway id="ExclusiveGateway_0mc34qe" name="HasResourcetoUpdate?"> + <bpmn:incoming>SequenceFlow_0secadm</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_1n8h3zt</bpmn:outgoing> + <bpmn:outgoing>SequenceFlow_0zmd4rt</bpmn:outgoing> + </bpmn:exclusiveGateway> + <bpmn:sequenceFlow id="SequenceFlow_0az1n4y" sourceRef="ScriptTask_1s09c7d" targetRef="CallActivity_1vejucv" /> + <bpmn:intermediateCatchEvent id="IntermediateCatchEvent_0m01dm3" name="StartDoUpdate"> + <bpmn:outgoing>SequenceFlow_04qwbbf</bpmn:outgoing> + <bpmn:linkEventDefinition name="StartDoUpdate" /> + </bpmn:intermediateCatchEvent> + <bpmn:sequenceFlow id="SequenceFlow_0secadm" sourceRef="ScriptTask_0xupxj9" targetRef="ExclusiveGateway_0mc34qe" /> + <bpmn:sequenceFlow id="SequenceFlow_04qwbbf" sourceRef="IntermediateCatchEvent_0m01dm3" targetRef="DoUpdateE2EServiceInstance" /> + <bpmn:endEvent id="EndEvent_1jvqhkf" name="End"> + <bpmn:incoming>SequenceFlow_0kvl23y</bpmn:incoming> + </bpmn:endEvent> + <bpmn:scriptTask id="ScriptTask_16sgdqw" name="Init Service Operation Status" scriptFormat="groovy"> + <bpmn:incoming>SequenceFlow_1bddzne</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_1e3vtyq</bpmn:outgoing> <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* def csi= new UpdateCustomE2EServiceInstance() csi.prepareInitServiceOperationStatus(execution)]]></bpmn:script> </bpmn:scriptTask> - <bpmn:serviceTask id="ServiceTask_0mr5k9q" name="Update Service Operation Status"> + <bpmn:serviceTask id="ServiceTask_0qjpd5v" name="Update Service Operation Status"> <bpmn:extensionElements> <camunda:connector> <camunda:inputOutput> @@ -167,11 +274,64 @@ csi.prepareInitServiceOperationStatus(execution)]]></bpmn:script> <camunda:connectorId>http-connector</camunda:connectorId> </camunda:connector> </bpmn:extensionElements> - <bpmn:incoming>SequenceFlow_0utlsnd</bpmn:incoming> - <bpmn:outgoing>SequenceFlow_1853xxi</bpmn:outgoing> + <bpmn:incoming>SequenceFlow_1e3vtyq</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_12dou7o</bpmn:outgoing> </bpmn:serviceTask> - <bpmn:sequenceFlow id="SequenceFlow_0utlsnd" sourceRef="ScriptTask_09rx901" targetRef="ServiceTask_0mr5k9q" /> - <bpmn:sequenceFlow id="SequenceFlow_1853xxi" sourceRef="ServiceTask_0mr5k9q" targetRef="ScriptTask_0xupxj9" /> + <bpmn:sequenceFlow id="SequenceFlow_1e3vtyq" sourceRef="ScriptTask_16sgdqw" targetRef="ServiceTask_0qjpd5v" /> + <bpmn:sequenceFlow id="SequenceFlow_12dou7o" sourceRef="ServiceTask_0qjpd5v" targetRef="ScriptTask_0xupxj9" /> + <bpmn:serviceTask id="ServiceTask_0mj3kf2" name="Update Service Operation Status"> + <bpmn:extensionElements> + <camunda:connector> + <camunda:inputOutput> + <camunda:inputParameter name="url">${CVFMI_dbAdapterEndpoint}</camunda:inputParameter> + <camunda:inputParameter name="headers"> + <camunda:map> + <camunda:entry key="content-type">application/soap+xml</camunda:entry> + <camunda:entry key="Authorization">Basic QlBFTENsaWVudDpwYXNzd29yZDEk</camunda:entry> + </camunda:map> + </camunda:inputParameter> + <camunda:inputParameter name="payload">${CVFMI_updateServiceOperStatusRequest}</camunda:inputParameter> + <camunda:inputParameter name="method">POST</camunda:inputParameter> + <camunda:outputParameter name="CVFMI_dbResponseCode">${statusCode}</camunda:outputParameter> + <camunda:outputParameter name="CVFMI_dbResponse">${response}</camunda:outputParameter> + </camunda:inputOutput> + <camunda:connectorId>http-connector</camunda:connectorId> + </camunda:connector> + </bpmn:extensionElements> + <bpmn:incoming>SequenceFlow_1wzk6tu</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_0kvl23y</bpmn:outgoing> + </bpmn:serviceTask> + <bpmn:sequenceFlow id="SequenceFlow_1n8h3zt" name="No" sourceRef="ExclusiveGateway_0mc34qe" targetRef="ScriptTask_04a0t3p"> + <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("hasResourcetoUpdate")== false}]]></bpmn:conditionExpression> + </bpmn:sequenceFlow> + <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_08mk8h9" name="GoToOperStatusInit"> + <bpmn:incoming>SequenceFlow_0t7zinj</bpmn:incoming> + <bpmn:linkEventDefinition name="StartOperStatusInit" /> + </bpmn:intermediateThrowEvent> + <bpmn:sequenceFlow id="SequenceFlow_0t7zinj" sourceRef="ScriptTask_11y3uq6" targetRef="IntermediateThrowEvent_08mk8h9" /> + <bpmn:intermediateCatchEvent id="IntermediateCatchEvent_14w7v9s" name="StartOperStatusInit"> + <bpmn:outgoing>SequenceFlow_1bddzne</bpmn:outgoing> + <bpmn:linkEventDefinition name="StartOperStatusInit" /> + </bpmn:intermediateCatchEvent> + <bpmn:sequenceFlow id="SequenceFlow_1bddzne" sourceRef="IntermediateCatchEvent_14w7v9s" targetRef="ScriptTask_16sgdqw" /> + <bpmn:scriptTask id="ScriptTask_04a0t3p" name="Prepare Update Service Oper Status(100%)" scriptFormat="groovy"> + <bpmn:incoming>SequenceFlow_1n8h3zt</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_1wzk6tu</bpmn:outgoing> + <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +execution.setVariable("progress", "100") +execution.setVariable("operationStatus", "Finished") +execution.setVariable("operationResult", "End") +execution.setVariable("operationReason", "No resource to add or delete") +def ddsi = new UpdateCustomE2EServiceInstance() +ddsi.preUpdateServiceOperationStatus(execution)]]></bpmn:script> + </bpmn:scriptTask> + <bpmn:sequenceFlow id="SequenceFlow_1wzk6tu" sourceRef="ScriptTask_04a0t3p" targetRef="ServiceTask_0mj3kf2" /> + <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_1k72hze" name="GoToDoUpdate"> + <bpmn:incoming>SequenceFlow_0zmd4rt</bpmn:incoming> + <bpmn:linkEventDefinition name="StartDoUpdate" /> + </bpmn:intermediateThrowEvent> + <bpmn:sequenceFlow id="SequenceFlow_0kvl23y" sourceRef="ServiceTask_0mj3kf2" targetRef="EndEvent_1jvqhkf" /> + <bpmn:sequenceFlow id="SequenceFlow_0zmd4rt" name="Yes" sourceRef="ExclusiveGateway_0mc34qe" targetRef="IntermediateThrowEvent_1k72hze" /> </bpmn:process> <bpmn:error id="Error_0nbdy47" name="MSOWorkflowException" errorCode="MSOWorkflowException" /> <bpmndi:BPMNDiagram id="BPMNDiagram_1"> @@ -183,42 +343,42 @@ csi.prepareInitServiceOperationStatus(execution)]]></bpmn:script> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="SubProcess_0ka59nc_di" bpmnElement="SubProcess_0ka59nc" isExpanded="true"> - <dc:Bounds x="463" y="632" width="394" height="188" /> + <dc:Bounds x="439" y="1170" width="394" height="188" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="CallActivity_0rhljy8_di" bpmnElement="DoUpdateE2EServiceInstance"> - <dc:Bounds x="767" y="158" width="100" height="80" /> + <dc:Bounds x="284" y="585" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="EndEvent_0bpd6c0_di" bpmnElement="EndEvent_0bpd6c0"> - <dc:Bounds x="1258" y="286" width="36" height="36" /> + <dc:Bounds x="1192" y="607" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1268" y="322" width="22" height="12" /> + <dc:Bounds x="1204" y="643" width="19" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_1s09c7d_di" bpmnElement="ScriptTask_1s09c7d"> <dc:Bounds x="105" y="158" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_0ttvn8r_di" bpmnElement="ScriptTask_0ttvn8r"> - <dc:Bounds x="1073" y="158" width="100" height="80" /> + <dc:Bounds x="782" y="585" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="CallActivity_02fyxz0_di" bpmnElement="CallActivity_02fyxz0"> - <dc:Bounds x="1226" y="158" width="100" height="80" /> + <dc:Bounds x="959" y="585" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="SubProcess_0vaws86_di" bpmnElement="SubProcess_0vaws86" isExpanded="true"> - <dc:Bounds x="348" y="370" width="679" height="194" /> + <dc:Bounds x="-61" y="908" width="1322" height="164" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_0xupxj9_di" bpmnElement="ScriptTask_0xupxj9"> - <dc:Bounds x="600" y="158" width="100" height="80" /> + <dc:Bounds x="451" y="337" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ExclusiveGateway_0aqn64l_di" bpmnElement="ExclusiveGateway_0aqn64l" isMarkerVisible="true"> - <dc:Bounds x="942" y="173" width="50" height="50" /> + <dc:Bounds x="639" y="600" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="943" y="145" width="49" height="12" /> + <dc:Bounds x="640" y="572" width="49" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="EndEvent_07uk5iy_di" bpmnElement="EndEvent_07uk5iy"> - <dc:Bounds x="949" y="286" width="36" height="36" /> + <dc:Bounds x="646" y="713" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="877" y="322" width="90" height="12" /> + <dc:Bounds x="527" y="1016" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0s2spoq_di" bpmnElement="SequenceFlow_0s2spoq"> @@ -228,157 +388,305 @@ csi.prepareInitServiceOperationStatus(execution)]]></bpmn:script> <dc:Bounds x="22.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="700" y="198" /> - <di:waypoint xsi:type="dc:Point" x="767" y="198" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="688.5" y="177" width="90" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0klbpxx_di" bpmnElement="SequenceFlow_0klbpxx"> - <di:waypoint xsi:type="dc:Point" x="867" y="198" /> - <di:waypoint xsi:type="dc:Point" x="942" y="198" /> + <di:waypoint xsi:type="dc:Point" x="384" y="625" /> + <di:waypoint xsi:type="dc:Point" x="639" y="625" /> <bpmndi:BPMNLabel> - <dc:Bounds x="859.5" y="177" width="90" height="12" /> + <dc:Bounds x="466.5" y="604" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0yayvrf_di" bpmnElement="SequenceFlow_0yayvrf"> - <di:waypoint xsi:type="dc:Point" x="1276" y="238" /> - <di:waypoint xsi:type="dc:Point" x="1276" y="286" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="1246" y="262" width="0" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="SequenceFlow_0z4faf9_di" bpmnElement="SequenceFlow_0z4faf9"> - <di:waypoint xsi:type="dc:Point" x="205" y="198" /> - <di:waypoint xsi:type="dc:Point" x="274" y="198" /> + <di:waypoint xsi:type="dc:Point" x="1059" y="625" /> + <di:waypoint xsi:type="dc:Point" x="1192" y="625" /> <bpmndi:BPMNLabel> - <dc:Bounds x="194.5" y="177" width="90" height="12" /> + <dc:Bounds x="1080.5" y="604" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_14zu6wr_di" bpmnElement="SequenceFlow_14zu6wr"> - <di:waypoint xsi:type="dc:Point" x="992" y="198" /> - <di:waypoint xsi:type="dc:Point" x="1073" y="198" /> + <di:waypoint xsi:type="dc:Point" x="689" y="625" /> + <di:waypoint xsi:type="dc:Point" x="782" y="625" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1023.5062499999999" y="195" width="19" height="12" /> + <dc:Bounds x="727.1481481481482" y="622" width="19" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0je30si_di" bpmnElement="SequenceFlow_0je30si"> - <di:waypoint xsi:type="dc:Point" x="1173" y="198" /> - <di:waypoint xsi:type="dc:Point" x="1226" y="198" /> + <di:waypoint xsi:type="dc:Point" x="882" y="625" /> + <di:waypoint xsi:type="dc:Point" x="959" y="625" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1154.5" y="177" width="90" height="12" /> + <dc:Bounds x="875.5" y="604" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1fueo69_di" bpmnElement="SequenceFlow_1fueo69"> - <di:waypoint xsi:type="dc:Point" x="967" y="223" /> - <di:waypoint xsi:type="dc:Point" x="967" y="250" /> - <di:waypoint xsi:type="dc:Point" x="967" y="250" /> - <di:waypoint xsi:type="dc:Point" x="967" y="286" /> + <di:waypoint xsi:type="dc:Point" x="664" y="650" /> + <di:waypoint xsi:type="dc:Point" x="664" y="713" /> <bpmndi:BPMNLabel> - <dc:Bounds x="942" y="228" width="12" height="12" /> + <dc:Bounds x="639" y="677" width="12" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_0u3lw39_di" bpmnElement="ScriptTask_0u3lw39"> - <dc:Bounds x="611" y="687" width="100" height="80" /> + <dc:Bounds x="587" y="1225" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="StartEvent_0v1ffn4_di" bpmnElement="StartEvent_0v1ffn4"> - <dc:Bounds x="496" y="709" width="36" height="36" /> + <dc:Bounds x="472" y="1247" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="469" y="750" width="0" height="12" /> + <dc:Bounds x="400" y="1288" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="EndEvent_0eznq6x_di" bpmnElement="EndEvent_0eznq6x"> - <dc:Bounds x="772" y="709" width="36" height="36" /> + <dc:Bounds x="748" y="1247" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="745" y="750" width="0" height="12" /> + <dc:Bounds x="676" y="1288" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="StartEvent_0dug28e_di" bpmnElement="StartEvent_0dug28e"> - <dc:Bounds x="363" y="456" width="36" height="36" /> + <dc:Bounds x="-20" y="994" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="336" y="497" width="0" height="12" /> + <dc:Bounds x="-92" y="1035" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="EndEvent_03wysuk_di" bpmnElement="EndEvent_03wysuk"> - <dc:Bounds x="942" y="456" width="36" height="36" /> + <dc:Bounds x="1194" y="994" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="915" y="497" width="0" height="12" /> + <dc:Bounds x="1122" y="1035" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_0u8o9p2_di" bpmnElement="ScriptTask_0u8o9p2"> - <dc:Bounds x="621" y="434" width="100" height="80" /> + <dc:Bounds x="777" y="972" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="CallActivity_1ang7q8_di" bpmnElement="CallActivity_1ang7q8"> - <dc:Bounds x="798" y="434" width="100" height="80" /> + <dc:Bounds x="963" y="972" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_1rn6nqi_di" bpmnElement="ScriptTask_1rn6nqi"> - <dc:Bounds x="443" y="434" width="100" height="80" /> + <dc:Bounds x="577" y="972" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1dsbjjb_di" bpmnElement="SequenceFlow_1dsbjjb"> - <di:waypoint xsi:type="dc:Point" x="532" y="727" /> - <di:waypoint xsi:type="dc:Point" x="611" y="727" /> + <di:waypoint xsi:type="dc:Point" x="508" y="1265" /> + <di:waypoint xsi:type="dc:Point" x="587" y="1265" /> <bpmndi:BPMNLabel> - <dc:Bounds x="529.5" y="727" width="0" height="12" /> + <dc:Bounds x="461" y="1265" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1yay321_di" bpmnElement="SequenceFlow_1yay321"> - <di:waypoint xsi:type="dc:Point" x="711" y="727" /> - <di:waypoint xsi:type="dc:Point" x="772" y="727" /> + <di:waypoint xsi:type="dc:Point" x="687" y="1265" /> + <di:waypoint xsi:type="dc:Point" x="748" y="1265" /> <bpmndi:BPMNLabel> - <dc:Bounds x="701.5" y="727" width="0" height="12" /> + <dc:Bounds x="633" y="1265" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0e1r62n_di" bpmnElement="SequenceFlow_0e1r62n"> - <di:waypoint xsi:type="dc:Point" x="399" y="474" /> - <di:waypoint xsi:type="dc:Point" x="421" y="474" /> - <di:waypoint xsi:type="dc:Point" x="421" y="474" /> - <di:waypoint xsi:type="dc:Point" x="442" y="474" /> + <di:waypoint xsi:type="dc:Point" x="16" y="1012" /> + <di:waypoint xsi:type="dc:Point" x="122" y="1012" /> <bpmndi:BPMNLabel> - <dc:Bounds x="391" y="474" width="0" height="12" /> + <dc:Bounds x="24" y="991" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1ysapam_di" bpmnElement="SequenceFlow_1ysapam"> - <di:waypoint xsi:type="dc:Point" x="898" y="474" /> - <di:waypoint xsi:type="dc:Point" x="942" y="474" /> + <di:waypoint xsi:type="dc:Point" x="1063" y="1012" /> + <di:waypoint xsi:type="dc:Point" x="1194" y="1012" /> <bpmndi:BPMNLabel> - <dc:Bounds x="875" y="459" width="0" height="12" /> + <dc:Bounds x="1083.5" y="991" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0n9pexp_di" bpmnElement="SequenceFlow_0n9pexp"> - <di:waypoint xsi:type="dc:Point" x="543" y="474" /> - <di:waypoint xsi:type="dc:Point" x="570" y="474" /> - <di:waypoint xsi:type="dc:Point" x="570" y="474" /> - <di:waypoint xsi:type="dc:Point" x="621" y="474" /> + <di:waypoint xsi:type="dc:Point" x="677" y="1012" /> + <di:waypoint xsi:type="dc:Point" x="777" y="1012" /> <bpmndi:BPMNLabel> - <dc:Bounds x="540" y="474" width="0" height="12" /> + <dc:Bounds x="682" y="991" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_01umodj_di" bpmnElement="SequenceFlow_01umodj"> - <di:waypoint xsi:type="dc:Point" x="721" y="474" /> - <di:waypoint xsi:type="dc:Point" x="798" y="474" /> + <di:waypoint xsi:type="dc:Point" x="877" y="1012" /> + <di:waypoint xsi:type="dc:Point" x="963" y="1012" /> <bpmndi:BPMNLabel> - <dc:Bounds x="715.5" y="459" width="0" height="12" /> + <dc:Bounds x="875" y="991" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="ScriptTask_09rx901_di" bpmnElement="ScriptTask_09rx901"> + <bpmndi:BPMNShape id="CallActivity_1vejucv_di" bpmnElement="CallActivity_1vejucv"> <dc:Bounds x="274" y="158" width="100" height="80" /> </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="ServiceTask_0mr5k9q_di" bpmnElement="ServiceTask_0mr5k9q"> - <dc:Bounds x="444" y="158" width="100" height="80" /> + <bpmndi:BPMNShape id="ScriptTask_0cx1y0g_di" bpmnElement="ScriptTask_0cx1y0g"> + <dc:Bounds x="451" y="158" width="100" height="80" /> </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="SequenceFlow_0utlsnd_di" bpmnElement="SequenceFlow_0utlsnd"> + <bpmndi:BPMNEdge id="SequenceFlow_1bd4711_di" bpmnElement="SequenceFlow_1bd4711"> <di:waypoint xsi:type="dc:Point" x="374" y="198" /> - <di:waypoint xsi:type="dc:Point" x="444" y="198" /> + <di:waypoint xsi:type="dc:Point" x="451" y="198" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="367.5" y="177" width="90" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ScriptTask_11y3uq6_di" bpmnElement="ScriptTask_11y3uq6"> + <dc:Bounds x="959" y="158" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ScriptTask_0hixtxc_di" bpmnElement="ScriptTask_0hixtxc"> + <dc:Bounds x="614" y="158" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="CallActivity_1rkoyc5_di" bpmnElement="CallActivity_1rkoyc5"> + <dc:Bounds x="782" y="158" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_03i6zhx_di" bpmnElement="SequenceFlow_03i6zhx"> + <di:waypoint xsi:type="dc:Point" x="551" y="198" /> + <di:waypoint xsi:type="dc:Point" x="614" y="198" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="537.5" y="177" width="90" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1pdv4qj_di" bpmnElement="SequenceFlow_1pdv4qj"> + <di:waypoint xsi:type="dc:Point" x="714" y="198" /> + <di:waypoint xsi:type="dc:Point" x="782" y="198" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="703" y="177" width="90" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_0xhbobd_di" bpmnElement="SequenceFlow_0xhbobd"> + <di:waypoint xsi:type="dc:Point" x="882" y="198" /> + <di:waypoint xsi:type="dc:Point" x="959" y="198" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="875.5" y="177" width="90" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ExclusiveGateway_0mc34qe_di" bpmnElement="ExclusiveGateway_0mc34qe" isMarkerVisible="true"> + <dc:Bounds x="639" y="352" width="50" height="50" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="622" y="324" width="85" height="24" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_0az1n4y_di" bpmnElement="SequenceFlow_0az1n4y"> + <di:waypoint xsi:type="dc:Point" x="205" y="198" /> + <di:waypoint xsi:type="dc:Point" x="274" y="198" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="239.5" y="177" width="0" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="IntermediateCatchEvent_0m01dm3_di" bpmnElement="IntermediateCatchEvent_0m01dm3"> + <dc:Bounds x="-6" y="607" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="-21" y="669" width="72" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_0secadm_di" bpmnElement="SequenceFlow_0secadm"> + <di:waypoint xsi:type="dc:Point" x="551" y="377" /> + <di:waypoint xsi:type="dc:Point" x="639" y="377" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="550" y="356" width="90" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_04qwbbf_di" bpmnElement="SequenceFlow_04qwbbf"> + <di:waypoint xsi:type="dc:Point" x="30" y="625" /> + <di:waypoint xsi:type="dc:Point" x="284" y="625" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="112" y="604" width="90" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="EndEvent_1jvqhkf_di" bpmnElement="EndEvent_1jvqhkf"> + <dc:Bounds x="1192" y="359" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1200" y="404" width="19" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ScriptTask_16sgdqw_di" bpmnElement="ScriptTask_16sgdqw"> + <dc:Bounds x="97" y="337" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ServiceTask_0qjpd5v_di" bpmnElement="ServiceTask_0qjpd5v"> + <dc:Bounds x="274" y="337" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1e3vtyq_di" bpmnElement="SequenceFlow_1e3vtyq"> + <di:waypoint xsi:type="dc:Point" x="197" y="377" /> + <di:waypoint xsi:type="dc:Point" x="274" y="377" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="235.5" y="356" width="0" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_12dou7o_di" bpmnElement="SequenceFlow_12dou7o"> + <di:waypoint xsi:type="dc:Point" x="374" y="377" /> + <di:waypoint xsi:type="dc:Point" x="451" y="377" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="412.5" y="356" width="0" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ServiceTask_0mj3kf2_di" bpmnElement="ServiceTask_0mj3kf2"> + <dc:Bounds x="959" y="337" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1n8h3zt_di" bpmnElement="SequenceFlow_1n8h3zt"> + <di:waypoint xsi:type="dc:Point" x="689" y="377" /> + <di:waypoint xsi:type="dc:Point" x="782" y="377" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="729" y="356" width="14" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="IntermediateThrowEvent_08mk8h9_di" bpmnElement="IntermediateThrowEvent_08mk8h9"> + <dc:Bounds x="1192" y="180" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1175" y="220" width="86" height="24" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_0t7zinj_di" bpmnElement="SequenceFlow_0t7zinj"> + <di:waypoint xsi:type="dc:Point" x="1059" y="198" /> + <di:waypoint xsi:type="dc:Point" x="1192" y="198" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1125.5" y="177" width="0" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="IntermediateCatchEvent_14w7v9s_di" bpmnElement="IntermediateCatchEvent_14w7v9s"> + <dc:Bounds x="-6" y="359" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="-29" y="421" width="88" height="24" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1bddzne_di" bpmnElement="SequenceFlow_1bddzne"> + <di:waypoint xsi:type="dc:Point" x="30" y="377" /> + <di:waypoint xsi:type="dc:Point" x="97" y="377" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="63.5" y="356" width="0" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ScriptTask_14kqo0r_di" bpmnElement="ScriptTask_14kqo0r"> + <dc:Bounds x="122" y="972" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ServiceTask_1af6rwh_di" bpmnElement="ServiceTask_1af6rwh"> + <dc:Bounds x="350" y="972" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_0t4nds2_di" bpmnElement="SequenceFlow_0t4nds2"> + <di:waypoint xsi:type="dc:Point" x="222" y="1012" /> + <di:waypoint xsi:type="dc:Point" x="350" y="1012" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="286" y="991" width="0" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_06o383f_di" bpmnElement="SequenceFlow_06o383f"> + <di:waypoint xsi:type="dc:Point" x="450" y="1012" /> + <di:waypoint xsi:type="dc:Point" x="577" y="1012" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="513.5" y="991" width="0" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ScriptTask_04a0t3p_di" bpmnElement="ScriptTask_04a0t3p"> + <dc:Bounds x="782" y="337" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1wzk6tu_di" bpmnElement="SequenceFlow_1wzk6tu"> + <di:waypoint xsi:type="dc:Point" x="882" y="377" /> + <di:waypoint xsi:type="dc:Point" x="959" y="377" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="920.5" y="356" width="0" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="IntermediateThrowEvent_1k72hze_di" bpmnElement="IntermediateThrowEvent_1k72hze"> + <dc:Bounds x="646" y="447" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="631" y="487" width="76" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_0kvl23y_di" bpmnElement="SequenceFlow_0kvl23y"> + <di:waypoint xsi:type="dc:Point" x="1059" y="377" /> + <di:waypoint xsi:type="dc:Point" x="1192" y="377" /> <bpmndi:BPMNLabel> - <dc:Bounds x="409" y="177" width="0" height="12" /> + <dc:Bounds x="1125.5" y="356" width="0" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="SequenceFlow_1853xxi_di" bpmnElement="SequenceFlow_1853xxi"> - <di:waypoint xsi:type="dc:Point" x="544" y="198" /> - <di:waypoint xsi:type="dc:Point" x="600" y="198" /> + <bpmndi:BPMNEdge id="SequenceFlow_0zmd4rt_di" bpmnElement="SequenceFlow_0zmd4rt"> + <di:waypoint xsi:type="dc:Point" x="664" y="402" /> + <di:waypoint xsi:type="dc:Point" x="664" y="447" /> <bpmndi:BPMNLabel> - <dc:Bounds x="572" y="177" width="0" height="12" /> + <dc:Bounds x="670" y="419" width="19" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> </bpmndi:BPMNPlane> diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateE2EServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateE2EServiceInstance.bpmn index 7735b192dc..ca43c00952 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateE2EServiceInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateE2EServiceInstance.bpmn @@ -7,20 +7,12 @@ <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="createSI_startEvent" targetRef="preProcessRequest_ScriptTask" /> <bpmn2:scriptTask id="preProcessRequest_ScriptTask" name="PreProcess Incoming Request" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing> + <bpmn2:outgoing>SequenceFlow_04xlw7s</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* def dcsi = new DoUpdateE2EServiceInstance() dcsi.preProcessRequest(execution) ]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="preProcessRequest_ScriptTask" targetRef="CallActivity_18nvmnn" /> - <bpmn2:scriptTask id="ScriptTask_0i8cqdy_PostProcessAAIGET" name="Post Process AAI GET" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_0qg0uyn</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_167wc99</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* -def dcsi = new DoUpdateE2EServiceInstance() -dcsi.postProcessAAIGET(execution)]]></bpmn2:script> - </bpmn2:scriptTask> <bpmn2:scriptTask id="Task_09laxun" name="PreProcess for Add Resources" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_115mdln</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_0yztz2p</bpmn2:outgoing> @@ -28,42 +20,19 @@ dcsi.postProcessAAIGET(execution)]]></bpmn2:script> def csi = new DoUpdateE2EServiceInstance() csi.preProcessForAddResource(execution)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:callActivity id="Task_1wyyy33" name="Call DoCreateResources" calledElement="DoCreateResources"> - <bpmn2:extensionElements> - <camunda:in source="serviceInstanceName" target="serviceInstanceName" /> - <camunda:in source="serviceDescription" target="nsServiceDescription" /> - <camunda:in source="serviceInstanceId" target="serviceInstanceId" /> - <camunda:in source="globalSubscriberId" target="globalSubscriberId" /> - <camunda:in source="serviceType" target="serviceType" /> - <camunda:in source="msoRequestId" target="msoRequestId" /> - <camunda:in source="operationId" target="operationId" /> - <camunda:in source="resourceType" target="resourceType" /> - <camunda:in source="uuiRequest" target="uuiRequest" /> - <camunda:in source="serviceDecomposition_Target" target="serviceDecomposition" /> - <camunda:in source="operationType" target="operationType" /> - <camunda:in source="addResourceList" target="addResourceList" /> - </bpmn2:extensionElements> - <bpmn2:incoming>SequenceFlow_0yztz2p</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_0lblyhi</bpmn2:outgoing> - </bpmn2:callActivity> <bpmn2:scriptTask id="Task_0ag30bf" name="PostProcess for Add Resource" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_0lblyhi</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_1nqfgvs</bpmn2:outgoing> + <bpmn2:incoming>SequenceFlow_1wwjugw</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_177wo8z</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* def csi = new DoUpdateE2EServiceInstance() csi.postProcessForAddResource(execution)]]></bpmn2:script> </bpmn2:scriptTask> <bpmn2:intermediateCatchEvent id="StartEvent_StartResource" name="StartAddResources"> <bpmn2:outgoing>SequenceFlow_115mdln</bpmn2:outgoing> - <bpmn2:linkEventDefinition name="StartAddResource" /> + <bpmn2:linkEventDefinition name="StartAddResources" /> </bpmn2:intermediateCatchEvent> - <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_1dwg5lz" name="GoToStartCompareModelVersions"> - <bpmn2:incoming>SequenceFlow_167wc99</bpmn2:incoming> - <bpmn2:linkEventDefinition name="StartCompareModelVersions" /> - </bpmn2:intermediateThrowEvent> <bpmn2:sequenceFlow id="SequenceFlow_115mdln" sourceRef="StartEvent_StartResource" targetRef="Task_09laxun" /> - <bpmn2:sequenceFlow id="SequenceFlow_0yztz2p" sourceRef="Task_09laxun" targetRef="Task_1wyyy33" /> - <bpmn2:sequenceFlow id="SequenceFlow_0lblyhi" sourceRef="Task_1wyyy33" targetRef="Task_0ag30bf" /> + <bpmn2:sequenceFlow id="SequenceFlow_0yztz2p" sourceRef="Task_09laxun" targetRef="ExclusiveGateway_06gj84t" /> <bpmn2:scriptTask id="ScriptTask_1xxvnst" name="PreProcess for Delete Resources" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_1qn0865</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_14rubz2</bpmn2:outgoing> @@ -71,24 +40,8 @@ csi.postProcessForAddResource(execution)]]></bpmn2:script> def csi = new DoUpdateE2EServiceInstance() csi.preProcessForDeleteResource(execution)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:callActivity id="CallActivity_0yphqzk" name="Call DoDeleteResources" calledElement="DoDeleteResources"> - <bpmn2:extensionElements> - <camunda:in source="serviceInstanceName" target="serviceInstanceName" /> - <camunda:in source="serviceInstanceId" target="serviceInstanceId" /> - <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="serviceDecomposition_Original" target="serviceDecomposition" /> - <camunda:in source="operationType" target="operationType" /> - <camunda:in source="delResourceList" target="delResourceList" /> - <camunda:in source="serviceRelationShip" target="serviceRelationShip" /> - </bpmn2:extensionElements> - <bpmn2:incoming>SequenceFlow_14rubz2</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_0tm9bw9</bpmn2:outgoing> - </bpmn2:callActivity> <bpmn2:scriptTask id="ScriptTask_00wgfrc" name="PostProcess for Delete Resource" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_0tm9bw9</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_0w4t4ao</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_1uu6uiu</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* def csi = new DoUpdateE2EServiceInstance() @@ -99,63 +52,9 @@ csi.postProcessForDeleteResource(execution)]]></bpmn2:script> <bpmn2:linkEventDefinition name="StartDeleteResources" /> </bpmn2:intermediateCatchEvent> <bpmn2:sequenceFlow id="SequenceFlow_1qn0865" sourceRef="IntermediateCatchEvent_0h6d9jb" targetRef="ScriptTask_1xxvnst" /> - <bpmn2:sequenceFlow id="SequenceFlow_14rubz2" sourceRef="ScriptTask_1xxvnst" targetRef="CallActivity_0yphqzk" /> - <bpmn2:sequenceFlow id="SequenceFlow_0tm9bw9" sourceRef="CallActivity_0yphqzk" targetRef="ScriptTask_00wgfrc" /> - <bpmn2:scriptTask id="ScriptTask_0wl77h6" name="Post for Compare Model Versions" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_02d5ibj</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_0l4gosl</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* -def csi = new DoUpdateE2EServiceInstance() -csi.postCompareModelVersions(execution)]]></bpmn2:script> - </bpmn2:scriptTask> - <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_0gk8ige" name="StartCompareModelVersions"> - <bpmn2:outgoing>SequenceFlow_1vtlt1v</bpmn2:outgoing> - <bpmn2:linkEventDefinition name="StartCompareModelVersions" /> - </bpmn2:intermediateCatchEvent> - <bpmn2:scriptTask id="ScriptTask_1afvv50" name="Prepare for Compare Model Versions" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_1vtlt1v</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_0h40pn8</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* -def ddsi = new DoUpdateE2EServiceInstance() -ddsi.preCompareModelVersions(execution)]]></bpmn2:script> - </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_02d5ibj" sourceRef="ServiceTask_02u5iza" targetRef="ScriptTask_0wl77h6" /> - <bpmn2:sequenceFlow id="SequenceFlow_1vtlt1v" sourceRef="IntermediateCatchEvent_0gk8ige" targetRef="ScriptTask_1afvv50" /> - <bpmn2:sequenceFlow id="SequenceFlow_0h40pn8" sourceRef="ScriptTask_1afvv50" targetRef="ServiceTask_02u5iza" /> - <bpmn2:callActivity id="ServiceTask_02u5iza" name="Call DoCompareModelVersions" calledElement="DoCompareModelVersions"> - <bpmn2:extensionElements> - <camunda:in source="msoRequestId" target="msoRequestId" /> - <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" /> - <camunda:in source="model-invariant-id-target" target="model-invariant-id-target" /> - <camunda:in source="model-version-id-target" target="model-version-id-target" /> - <camunda:in source="model-invariant-id-original" target="model-invariant-id-original" /> - <camunda:in source="model-version-id-original" target="model-version-id-original" /> - <camunda:out source="serviceDecomposition_Target" target="serviceDecomposition_Target" /> - <camunda:out source="serviceDecomposition_Original" target="serviceDecomposition_Original" /> - <camunda:out source="addResourceList" target="addResourceList" /> - <camunda:out source="delResourceList" target="delResourceList" /> - </bpmn2:extensionElements> - <bpmn2:incoming>SequenceFlow_0h40pn8</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_02d5ibj</bpmn2:outgoing> - </bpmn2:callActivity> - <bpmn2:callActivity id="CallActivity_18nvmnn" name="Call AAI Generic GetService" calledElement="GenericGetService"> - <bpmn2:extensionElements> - <camunda:in source="serviceInstanceId" target="GENGS_serviceInstanceId" /> - <camunda:in sourceExpression="service-instance" target="GENGS_type" /> - <camunda:out source="GENGS_FoundIndicator" target="GENGS_FoundIndicator" /> - <camunda:out source="GENGS_SuccessIndicator" target="GENGS_SuccessIndicator" /> - <camunda:out source="WorkflowException" target="WorkflowException" /> - <camunda:out source="GENGS_siResourceLink" target="GENGS_siResourceLink" /> - <camunda:out source="GENGS_service" target="GENGS_service" /> - <camunda:in source="globalSubscriberId" target="GENGS_globalCustomerId" /> - <camunda:in source="serviceType" target="GENGS_serviceType" /> - </bpmn2:extensionElements> - <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_0qg0uyn</bpmn2:outgoing> - </bpmn2:callActivity> - <bpmn2:sequenceFlow id="SequenceFlow_0qg0uyn" sourceRef="CallActivity_18nvmnn" targetRef="ScriptTask_0i8cqdy_PostProcessAAIGET" /> + <bpmn2:sequenceFlow id="SequenceFlow_14rubz2" sourceRef="ScriptTask_1xxvnst" targetRef="ExclusiveGateway_0ae22y8" /> <bpmn2:scriptTask id="ScriptTask_0acnvkp" name="Prepare Resource Oper Status" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_0l4gosl</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_04xlw7s</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_0r6c0ci</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* def ddsi = new DoUpdateE2EServiceInstance() @@ -183,17 +82,10 @@ ddsi.preInitResourcesOperStatus(execution)]]></bpmn2:script> <bpmn2:incoming>SequenceFlow_0r6c0ci</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_1muxopq</bpmn2:outgoing> </bpmn2:serviceTask> - <bpmn2:scriptTask id="ScriptTask_0r74c3c" name="Post Resource Oper Status" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_1muxopq</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_1sgsysh</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* -def dcsi = new DoUpdateE2EServiceInstance() -dcsi.postResourcesOperStatus(execution)]]></bpmn2:script> - </bpmn2:scriptTask> <bpmn2:sequenceFlow id="SequenceFlow_0r6c0ci" sourceRef="ScriptTask_0acnvkp" targetRef="ServiceTask_17u9q9u" /> - <bpmn2:sequenceFlow id="SequenceFlow_1muxopq" sourceRef="ServiceTask_17u9q9u" targetRef="ScriptTask_0r74c3c" /> + <bpmn2:sequenceFlow id="SequenceFlow_1muxopq" sourceRef="ServiceTask_17u9q9u" targetRef="IntermediateThrowEvent_09ur9ds" /> <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_0vneaao" name="GoTo StartDeleteResources"> - <bpmn2:incoming>SequenceFlow_1nqfgvs</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_177wo8z</bpmn2:incoming> <bpmn2:linkEventDefinition name="StartDeleteResources" /> </bpmn2:intermediateThrowEvent> <bpmn2:callActivity id="CallActivity_1nm9zq7" name="Call Custom E2E Put Service" calledElement="CustomE2EPutService"> @@ -224,7 +116,7 @@ ddsi.postProcessAAIPUT(execution)]]></bpmn2:script> <bpmn2:sequenceFlow id="SequenceFlow_1demy08" sourceRef="IntermediateCatchEvent_0a9bdjw" targetRef="ScriptTask_195nptq" /> <bpmn2:sequenceFlow id="SequenceFlow_0f76thv" sourceRef="CallActivity_1nm9zq7" targetRef="ScriptTask_0xtabf8" /> <bpmn2:scriptTask id="ScriptTask_19v8l1w" name="Post Config Service Instance Update" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_0h3kdi2</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_0ku36oy</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_07aa121</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* def csi = new DoUpdateE2EServiceInstance() @@ -237,41 +129,8 @@ csi.postConfigRequest(execution)]]></bpmn2:script> <bpmn2:endEvent id="EndEvent_0exzmfn"> <bpmn2:incoming>SequenceFlow_07aa121</bpmn2:incoming> </bpmn2:endEvent> - <bpmn2:scriptTask id="ScriptTask_0jsblrq" name="Prepare Update Service Oper Status(100%)" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_0ku36oy</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_0mwh16g</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* -execution.setVariable("progress", "100") -execution.setVariable("operationStatus", "End") -def ddsi = new DoUpdateE2EServiceInstance() -ddsi.preUpdateServiceOperationStatus(execution)]]></bpmn2:script> - </bpmn2:scriptTask> - <bpmn2:serviceTask id="ServiceTask_1ydxyw0" name="Update Service Oper Status"> - <bpmn2:extensionElements> - <camunda:connector> - <camunda:inputOutput> - <camunda:inputParameter name="url">${URN_mso_openecomp_adapters_db_endpoint}</camunda:inputParameter> - <camunda:inputParameter name="headers"> - <camunda:map> - <camunda:entry key="content-type">application/soap+xml</camunda:entry> - <camunda:entry key="Authorization">Basic QlBFTENsaWVudDpwYXNzd29yZDEk</camunda:entry> - </camunda:map> - </camunda:inputParameter> - <camunda:inputParameter name="payload">${CVFMI_updateServiceOperStatusRequest}</camunda:inputParameter> - <camunda:inputParameter name="method">POST</camunda:inputParameter> - <camunda:outputParameter name="CVFMI_dbResponseCode">${statusCode}</camunda:outputParameter> - <camunda:outputParameter name="CVFMI_dbResponse">${response}</camunda:outputParameter> - </camunda:inputOutput> - <camunda:connectorId>http-connector</camunda:connectorId> - </camunda:connector> - </bpmn2:extensionElements> - <bpmn2:incoming>SequenceFlow_0mwh16g</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_0h3kdi2</bpmn2:outgoing> - </bpmn2:serviceTask> - <bpmn2:sequenceFlow id="SequenceFlow_0h3kdi2" sourceRef="ServiceTask_1ydxyw0" targetRef="ScriptTask_19v8l1w" /> <bpmn2:sequenceFlow id="SequenceFlow_07aa121" sourceRef="ScriptTask_19v8l1w" targetRef="EndEvent_0exzmfn" /> - <bpmn2:sequenceFlow id="SequenceFlow_0ku36oy" sourceRef="IntermediateCatchEvent_0z04o3s" targetRef="ScriptTask_0jsblrq" /> - <bpmn2:sequenceFlow id="SequenceFlow_0mwh16g" sourceRef="ScriptTask_0jsblrq" targetRef="ServiceTask_1ydxyw0" /> + <bpmn2:sequenceFlow id="SequenceFlow_0ku36oy" sourceRef="IntermediateCatchEvent_0z04o3s" targetRef="ScriptTask_19v8l1w" /> <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_06lo96a" name="GoTo UpdateAAI"> <bpmn2:incoming>SequenceFlow_1uu6uiu</bpmn2:incoming> <bpmn2:linkEventDefinition name="UpdateAAI" /> @@ -281,14 +140,10 @@ ddsi.preUpdateServiceOperationStatus(execution)]]></bpmn2:script> <bpmn2:linkEventDefinition name="FinishProcess" /> </bpmn2:intermediateThrowEvent> <bpmn2:sequenceFlow id="SequenceFlow_0x0mhlj" sourceRef="ScriptTask_0xtabf8" targetRef="IntermediateThrowEvent_0hucdtk" /> - <bpmn2:sequenceFlow id="SequenceFlow_167wc99" sourceRef="ScriptTask_0i8cqdy_PostProcessAAIGET" targetRef="IntermediateThrowEvent_1dwg5lz" /> <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_09ur9ds" name="GoTo StartAddResources"> - <bpmn2:incoming>SequenceFlow_1sgsysh</bpmn2:incoming> - <bpmn2:linkEventDefinition name="StartAddResource" /> + <bpmn2:incoming>SequenceFlow_1muxopq</bpmn2:incoming> + <bpmn2:linkEventDefinition name="StartAddResources" /> </bpmn2:intermediateThrowEvent> - <bpmn2:sequenceFlow id="SequenceFlow_0l4gosl" sourceRef="ScriptTask_0wl77h6" targetRef="ScriptTask_0acnvkp" /> - <bpmn2:sequenceFlow id="SequenceFlow_1sgsysh" sourceRef="ScriptTask_0r74c3c" targetRef="IntermediateThrowEvent_09ur9ds" /> - <bpmn2:sequenceFlow id="SequenceFlow_1nqfgvs" sourceRef="Task_0ag30bf" targetRef="IntermediateThrowEvent_0vneaao" /> <bpmn2:sequenceFlow id="SequenceFlow_1uu6uiu" sourceRef="ScriptTask_00wgfrc" targetRef="IntermediateThrowEvent_06lo96a" /> <bpmn2:subProcess id="SubProcess_0jo0nms" name="Sub-process for Application Errors" triggeredByEvent="true"> <bpmn2:startEvent id="StartEvent_06768u3"> @@ -298,7 +153,7 @@ ddsi.preUpdateServiceOperationStatus(execution)]]></bpmn2:script> <bpmn2:endEvent id="EndEvent_014jyvb"> <bpmn2:incoming>SequenceFlow_02znk15</bpmn2:incoming> </bpmn2:endEvent> - <bpmn2:scriptTask id="ScriptTask_1awrp72" name="Pre Process Rollback" scriptFormat="groovy"> + <bpmn2:scriptTask id="ScriptTask_1awrp72" name="Pre Process Exception" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_05j3sat</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_19ly8h7</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
@@ -306,8 +161,8 @@ def dcsi = new DoCreateResources() dcsi.preProcessRollback(execution)
]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:scriptTask id="ScriptTask_0vc9jgo" name="Post Process Rollback" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_0utvwkh</bpmn2:incoming> + <bpmn2:scriptTask id="ScriptTask_0vc9jgo" name="Post Process Exception" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_19ly8h7</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_02znk15</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
def dcsi = new DoCreateResources()
@@ -316,46 +171,14 @@ dcsi.postProcessRollback(execution) </bpmn2:scriptTask> <bpmn2:sequenceFlow id="SequenceFlow_05j3sat" sourceRef="StartEvent_06768u3" targetRef="ScriptTask_1awrp72" /> <bpmn2:sequenceFlow id="SequenceFlow_02znk15" sourceRef="ScriptTask_0vc9jgo" targetRef="EndEvent_014jyvb" /> - <bpmn2:sequenceFlow id="SequenceFlow_19ly8h7" sourceRef="ScriptTask_1awrp72" targetRef="ScriptTask_1bb9adn" /> - <bpmn2:serviceTask id="ServiceTask_1kw189j" name="Update Service Oper Status"> - <bpmn2:extensionElements> - <camunda:connector> - <camunda:inputOutput> - <camunda:inputParameter name="url">${URN_mso_openecomp_adapters_db_endpoint}</camunda:inputParameter> - <camunda:inputParameter name="headers"> - <camunda:map> - <camunda:entry key="content-type">application/soap+xml</camunda:entry> - <camunda:entry key="Authorization">Basic QlBFTENsaWVudDpwYXNzd29yZDEk</camunda:entry> - </camunda:map> - </camunda:inputParameter> - <camunda:inputParameter name="payload">${CVFMI_updateServiceOperStatusRequest}</camunda:inputParameter> - <camunda:inputParameter name="method">POST</camunda:inputParameter> - <camunda:outputParameter name="CVFMI_dbResponseCode">${statusCode}</camunda:outputParameter> - <camunda:outputParameter name="CVFMI_dbResponse">${response}</camunda:outputParameter> - </camunda:inputOutput> - <camunda:connectorId>http-connector</camunda:connectorId> - </camunda:connector> - </bpmn2:extensionElements> - <bpmn2:incoming>SequenceFlow_1lqzi94</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_0utvwkh</bpmn2:outgoing> - </bpmn2:serviceTask> - <bpmn2:sequenceFlow id="SequenceFlow_0utvwkh" sourceRef="ServiceTask_1kw189j" targetRef="ScriptTask_0vc9jgo" /> - <bpmn2:scriptTask id="ScriptTask_1bb9adn" name="Prepare Update Service Oper Status(error)" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_19ly8h7</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_1lqzi94</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* -execution.setVariable("operationStatus", "error") -def ddsi = new DoUpdateE2EServiceInstance() -ddsi.preUpdateServiceOperationStatus(execution)]]></bpmn2:script> - </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_1lqzi94" sourceRef="ScriptTask_1bb9adn" targetRef="ServiceTask_1kw189j" /> + <bpmn2:sequenceFlow id="SequenceFlow_19ly8h7" sourceRef="ScriptTask_1awrp72" targetRef="ScriptTask_0vc9jgo" /> </bpmn2:subProcess> - <bpmn2:scriptTask id="ScriptTask_195nptq" name="Pre Process AAI GET 2" scriptFormat="groovy"> + <bpmn2:scriptTask id="ScriptTask_195nptq" name="Pre Process AAI GET" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_1demy08</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_1cy5gq2</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* def dcsi = new DoUpdateE2EServiceInstance() -dcsi.preProcessAAIGET2(execution)]]></bpmn2:script> +dcsi.preProcessAAIGET(execution)]]></bpmn2:script> </bpmn2:scriptTask> <bpmn2:sequenceFlow id="SequenceFlow_1cy5gq2" sourceRef="ScriptTask_195nptq" targetRef="CallActivity_069o6fn" /> <bpmn2:callActivity id="CallActivity_069o6fn" name="Call AAI Generic GetService" calledElement="GenericGetService"> @@ -373,12 +196,12 @@ dcsi.preProcessAAIGET2(execution)]]></bpmn2:script> <bpmn2:incoming>SequenceFlow_1cy5gq2</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_1vy856f</bpmn2:outgoing> </bpmn2:callActivity> - <bpmn2:scriptTask id="ScriptTask_0lp9y03" name="Post Process AAI GET 2" scriptFormat="groovy"> + <bpmn2:scriptTask id="ScriptTask_0lp9y03" name="Post Process AAI GET" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_1vy856f</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_14ggluy</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* def dcsi = new DoUpdateE2EServiceInstance() -dcsi.postProcessAAIGET2(execution)]]></bpmn2:script> +dcsi.postProcessAAIGET(execution)]]></bpmn2:script> </bpmn2:scriptTask> <bpmn2:sequenceFlow id="SequenceFlow_1vy856f" sourceRef="CallActivity_069o6fn" targetRef="ScriptTask_0lp9y03" /> <bpmn2:sequenceFlow id="SequenceFlow_14ggluy" sourceRef="ScriptTask_0lp9y03" targetRef="ScriptTask_0sis7k0" /> @@ -390,45 +213,99 @@ def dcsi = new DoUpdateE2EServiceInstance() dcsi.preProcessAAIPUT(execution)]]></bpmn2:script> </bpmn2:scriptTask> <bpmn2:sequenceFlow id="SequenceFlow_1kx5ke9" sourceRef="ScriptTask_0sis7k0" targetRef="CallActivity_1nm9zq7" /> + <bpmn2:sequenceFlow id="SequenceFlow_04xlw7s" sourceRef="preProcessRequest_ScriptTask" targetRef="ScriptTask_0acnvkp" /> + <bpmn2:exclusiveGateway id="ExclusiveGateway_06gj84t" name="HasResourcetoAdd?"> + <bpmn2:incoming>SequenceFlow_0yztz2p</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_0ttlte0</bpmn2:outgoing> + <bpmn2:outgoing>SequenceFlow_01po987</bpmn2:outgoing> + </bpmn2:exclusiveGateway> + <bpmn2:sequenceFlow id="SequenceFlow_0ttlte0" name="Yes" sourceRef="ExclusiveGateway_06gj84t" targetRef="CallActivity_07pl1uw" /> + <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_0xny7on" name="GoTo StartDeleteResources"> + <bpmn2:incoming>SequenceFlow_01po987</bpmn2:incoming> + <bpmn2:linkEventDefinition name="StartDeleteResources" /> + </bpmn2:intermediateThrowEvent> + <bpmn2:sequenceFlow id="SequenceFlow_01po987" name="No" sourceRef="ExclusiveGateway_06gj84t" targetRef="IntermediateThrowEvent_0xny7on"> + <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("hasResourcetoAdd")== false}]]></bpmn2:conditionExpression> + </bpmn2:sequenceFlow> + <bpmn2:exclusiveGateway id="ExclusiveGateway_0ae22y8" name="HasResourcetoDelete?"> + <bpmn2:incoming>SequenceFlow_14rubz2</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_0vjx5a2</bpmn2:outgoing> + <bpmn2:outgoing>SequenceFlow_1do7kq0</bpmn2:outgoing> + </bpmn2:exclusiveGateway> + <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_0y1ii4i" name="GoTo UpdateAAI"> + <bpmn2:incoming>SequenceFlow_1do7kq0</bpmn2:incoming> + <bpmn2:linkEventDefinition name="UpdateAAI" /> + </bpmn2:intermediateThrowEvent> + <bpmn2:sequenceFlow id="SequenceFlow_177wo8z" sourceRef="Task_0ag30bf" targetRef="IntermediateThrowEvent_0vneaao" /> + <bpmn2:sequenceFlow id="SequenceFlow_0vjx5a2" name="Yes" sourceRef="ExclusiveGateway_0ae22y8" targetRef="CallActivity_11obqi0" /> + <bpmn2:sequenceFlow id="SequenceFlow_1do7kq0" name="No" sourceRef="ExclusiveGateway_0ae22y8" targetRef="IntermediateThrowEvent_0y1ii4i"> + <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("hasResourcetoDelete")== false}]]></bpmn2:conditionExpression> + </bpmn2:sequenceFlow> + <bpmn2:callActivity id="CallActivity_11obqi0" name="Call DoDeleteResources" calledElement="DoDeleteResourcesV1"> + <bpmn2:extensionElements> + <camunda:in source="msoRequestId" target="msoRequestId" /> + <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" /> + <camunda:in source="globalSubscriberId" target="globalSubscriberId" /> + <camunda:in source="serviceType" target="serviceType" /> + <camunda:in source="serviceInstanceId" target="serviceInstanceId" /> + <camunda:in source="URN_mso_workflow_sdncadapter_callback" target="URN_mso_workflow_sdncadapter_callback" /> + <camunda:in source="serviceInputParams" target="serviceInputParams" /> + <camunda:in source="deleteResourceList" target="deleteResourceList" /> + <camunda:in source="resourceInstanceIDs" target="resourceInstanceIDs" /> + <camunda:in source="operationType" target="operationType" /> + </bpmn2:extensionElements> + <bpmn2:incoming>SequenceFlow_0vjx5a2</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_0w4t4ao</bpmn2:outgoing> + </bpmn2:callActivity> + <bpmn2:sequenceFlow id="SequenceFlow_0w4t4ao" sourceRef="CallActivity_11obqi0" targetRef="ScriptTask_00wgfrc" /> + <bpmn2:callActivity id="CallActivity_07pl1uw" name="Call DoCreateResources" calledElement="DoCreateResourcesV3"> + <bpmn2:extensionElements> + <camunda:in source="nsServiceName" target="nsServiceName" /> + <camunda:in source="serviceDescription" target="nsServiceDescription" /> + <camunda:in source="globalSubscriberId" target="globalSubscriberId" /> + <camunda:in source="serviceType" target="serviceType" /> + <camunda:in source="serviceInstanceId" target="serviceInstanceId" /> + <camunda:in source="operationId" target="operationId" /> + <camunda:in source="resourceType" target="resourceType" /> + <camunda:in source="resourceUUID" target="resourceUUID" /> + <camunda:in source="resourceParameters" target="resourceParameters" /> + <camunda:in source="operationType" target="operationType" /> + <camunda:in source="addResourceList" target="addResourceList" /> + <camunda:in source="serviceInstanceName" target="serviceInstanceName" /> + <camunda:in source="serviceDecomposition_Target" target="serviceDecomposition" /> + <camunda:in source="uuiRequest" target="uuiRequest" /> + <camunda:in source="msoRequestId" target="msoRequestId" /> + </bpmn2:extensionElements> + <bpmn2:incoming>SequenceFlow_0ttlte0</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_1wwjugw</bpmn2:outgoing> + </bpmn2:callActivity> + <bpmn2:sequenceFlow id="SequenceFlow_1wwjugw" sourceRef="CallActivity_07pl1uw" targetRef="Task_0ag30bf" /> </bpmn2:process> <bpmn2:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" /> <bpmn2:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" /> <bpmndi:BPMNDiagram id="BPMNDiagram_1"> <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoUpdateE2EServiceInstance"> <bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="createSI_startEvent"> - <dc:Bounds x="74" y="404" width="36" height="36" /> + <dc:Bounds x="74" y="622" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="68" y="445" width="50" height="12" /> + <dc:Bounds x="68" y="663" width="50" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_61" bpmnElement="preProcessRequest_ScriptTask"> - <dc:Bounds x="293" y="382" width="100" height="80" /> + <dc:Bounds x="293" y="600" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_47" targetElement="_BPMNShape_ScriptTask_61"> - <di:waypoint xsi:type="dc:Point" x="110" y="422" /> - <di:waypoint xsi:type="dc:Point" x="293" y="422" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="156.5" y="407" width="90" height="0" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_61" targetElement="CallActivity_18nvmnn_di"> - <di:waypoint xsi:type="dc:Point" x="393" y="422" /> - <di:waypoint xsi:type="dc:Point" x="581" y="420" /> + <di:waypoint xsi:type="dc:Point" x="110" y="640" /> + <di:waypoint xsi:type="dc:Point" x="293" y="640" /> <bpmndi:BPMNLabel> - <dc:Bounds x="442" y="406" width="90" height="0" /> + <dc:Bounds x="156.5" y="625" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="ScriptTask_0i8cqdy_di" bpmnElement="ScriptTask_0i8cqdy_PostProcessAAIGET"> - <dc:Bounds x="858" y="382" width="100" height="80" /> - </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_1azssf7_di" bpmnElement="Task_09laxun"> <dc:Bounds x="293" y="828" width="100" height="80" /> </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="CallActivity_1v57nb9_di" bpmnElement="Task_1wyyy33"> - <dc:Bounds x="589" y="828" width="100" height="80" /> - </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_1fj89ew_di" bpmnElement="Task_0ag30bf"> - <dc:Bounds x="858" y="828" width="100" height="80" /> + <dc:Bounds x="1229" y="828" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="IntermediateCatchEvent_0jks7by_di" bpmnElement="StartEvent_StartResource"> <dc:Bounds x="74" y="850" width="36" height="36" /> @@ -436,12 +313,6 @@ dcsi.preProcessAAIPUT(execution)]]></bpmn2:script> <dc:Bounds x="50" y="895" width="84" height="24" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="IntermediateThrowEvent_0ys6800_di" bpmnElement="IntermediateThrowEvent_1dwg5lz"> - <dc:Bounds x="1951" y="404" width="36" height="36" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="1925" y="444" width="90" height="24" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_115mdln_di" bpmnElement="SequenceFlow_115mdln"> <di:waypoint xsi:type="dc:Point" x="110" y="868" /> <di:waypoint xsi:type="dc:Point" x="293" y="868" /> @@ -451,26 +322,16 @@ dcsi.preProcessAAIPUT(execution)]]></bpmn2:script> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0yztz2p_di" bpmnElement="SequenceFlow_0yztz2p"> <di:waypoint xsi:type="dc:Point" x="393" y="868" /> - <di:waypoint xsi:type="dc:Point" x="589" y="868" /> + <di:waypoint xsi:type="dc:Point" x="590" y="868" /> <bpmndi:BPMNLabel> - <dc:Bounds x="446" y="847" width="90" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="SequenceFlow_0lblyhi_di" bpmnElement="SequenceFlow_0lblyhi"> - <di:waypoint xsi:type="dc:Point" x="689" y="868" /> - <di:waypoint xsi:type="dc:Point" x="858" y="868" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="728.5" y="847" width="90" height="12" /> + <dc:Bounds x="446.5" y="847" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_1xxvnst_di" bpmnElement="ScriptTask_1xxvnst"> <dc:Bounds x="293" y="1081" width="100" height="80" /> </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="CallActivity_0yphqzk_di" bpmnElement="CallActivity_0yphqzk"> - <dc:Bounds x="589" y="1081" width="100" height="80" /> - </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_00wgfrc_di" bpmnElement="ScriptTask_00wgfrc"> - <dc:Bounds x="858" y="1081" width="100" height="80" /> + <dc:Bounds x="1240" y="1081" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="IntermediateCatchEvent_0h6d9jb_di" bpmnElement="IntermediateCatchEvent_0h6d9jb"> <dc:Bounds x="74" y="1103" width="36" height="36" /> @@ -489,100 +350,44 @@ dcsi.preProcessAAIPUT(execution)]]></bpmn2:script> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_14rubz2_di" bpmnElement="SequenceFlow_14rubz2"> <di:waypoint xsi:type="dc:Point" x="393" y="1121" /> - <di:waypoint xsi:type="dc:Point" x="589" y="1121" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="446" y="1100" width="90" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="SequenceFlow_0tm9bw9_di" bpmnElement="SequenceFlow_0tm9bw9"> - <di:waypoint xsi:type="dc:Point" x="689" y="1121" /> - <di:waypoint xsi:type="dc:Point" x="858" y="1121" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="728.5" y="1100" width="90" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="ScriptTask_0wl77h6_di" bpmnElement="ScriptTask_0wl77h6"> - <dc:Bounds x="858" y="600" width="100" height="80" /> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="IntermediateCatchEvent_0gk8ige_di" bpmnElement="IntermediateCatchEvent_0gk8ige"> - <dc:Bounds x="74" y="622" width="36" height="36" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="50" y="684" width="89" height="24" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="ScriptTask_1afvv50_di" bpmnElement="ScriptTask_1afvv50"> - <dc:Bounds x="293" y="600" width="100" height="80" /> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="SequenceFlow_02d5ibj_di" bpmnElement="SequenceFlow_02d5ibj"> - <di:waypoint xsi:type="dc:Point" x="689" y="640" /> - <di:waypoint xsi:type="dc:Point" x="774" y="640" /> - <di:waypoint xsi:type="dc:Point" x="774" y="640" /> - <di:waypoint xsi:type="dc:Point" x="858" y="640" /> + <di:waypoint xsi:type="dc:Point" x="590" y="1121" /> <bpmndi:BPMNLabel> - <dc:Bounds x="744" y="593" width="90" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="SequenceFlow_1vtlt1v_di" bpmnElement="SequenceFlow_1vtlt1v"> - <di:waypoint xsi:type="dc:Point" x="110" y="640" /> - <di:waypoint xsi:type="dc:Point" x="293" y="640" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="156.5" y="619" width="90" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="SequenceFlow_0h40pn8_di" bpmnElement="SequenceFlow_0h40pn8"> - <di:waypoint xsi:type="dc:Point" x="393" y="640" /> - <di:waypoint xsi:type="dc:Point" x="589" y="640" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="446" y="578" width="90" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="CallActivity_00ftzjj_di" bpmnElement="ServiceTask_02u5iza"> - <dc:Bounds x="589" y="600" width="100" height="80" /> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="CallActivity_18nvmnn_di" bpmnElement="CallActivity_18nvmnn"> - <dc:Bounds x="581" y="380" width="100" height="80" /> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="SequenceFlow_0qg0uyn_di" bpmnElement="SequenceFlow_0qg0uyn"> - <di:waypoint xsi:type="dc:Point" x="681" y="420" /> - <di:waypoint xsi:type="dc:Point" x="858" y="422" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="724.5" y="400" width="90" height="12" /> + <dc:Bounds x="446.5" y="1100" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_0acnvkp_di" bpmnElement="ScriptTask_0acnvkp"> - <dc:Bounds x="1152" y="600" width="100" height="80" /> + <dc:Bounds x="589" y="600" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ServiceTask_17u9q9u_di" bpmnElement="ServiceTask_17u9q9u"> - <dc:Bounds x="1421" y="600" width="100" height="80" /> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="ScriptTask_0r74c3c_di" bpmnElement="ScriptTask_0r74c3c"> - <dc:Bounds x="1675" y="600" width="100" height="80" /> + <dc:Bounds x="872" y="600" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0r6c0ci_di" bpmnElement="SequenceFlow_0r6c0ci"> - <di:waypoint xsi:type="dc:Point" x="1252" y="640" /> - <di:waypoint xsi:type="dc:Point" x="1421" y="640" /> + <di:waypoint xsi:type="dc:Point" x="689" y="640" /> + <di:waypoint xsi:type="dc:Point" x="774" y="640" /> + <di:waypoint xsi:type="dc:Point" x="774" y="640" /> + <di:waypoint xsi:type="dc:Point" x="872" y="640" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1291.5" y="619" width="90" height="12" /> + <dc:Bounds x="744" y="634" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1muxopq_di" bpmnElement="SequenceFlow_1muxopq"> - <di:waypoint xsi:type="dc:Point" x="1521" y="640" /> - <di:waypoint xsi:type="dc:Point" x="1675" y="640" /> + <di:waypoint xsi:type="dc:Point" x="972" y="640" /> + <di:waypoint xsi:type="dc:Point" x="1762" y="640" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1553" y="619" width="90" height="12" /> + <dc:Bounds x="1322" y="619" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="IntermediateThrowEvent_0vneaao_di" bpmnElement="IntermediateThrowEvent_0vneaao"> - <dc:Bounds x="1951" y="850" width="36" height="36" /> + <dc:Bounds x="1762" y="850" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1925" y="890" width="90" height="24" /> + <dc:Bounds x="1738" y="890" width="86" height="36" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="CallActivity_1nm9zq7_di" bpmnElement="CallActivity_1nm9zq7"> - <dc:Bounds x="1410" y="1333" width="100" height="80" /> + <dc:Bounds x="1229" y="1333" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_0xtabf8_di" bpmnElement="ScriptTask_0xtabf8"> - <dc:Bounds x="1666" y="1333" width="100" height="80" /> + <dc:Bounds x="1473" y="1333" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="IntermediateCatchEvent_0a9bdjw_di" bpmnElement="IntermediateCatchEvent_0a9bdjw"> <dc:Bounds x="74" y="1355" width="36" height="36" /> @@ -600,123 +405,71 @@ dcsi.preProcessAAIPUT(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0f76thv_di" bpmnElement="SequenceFlow_0f76thv"> - <di:waypoint xsi:type="dc:Point" x="1510" y="1373" /> - <di:waypoint xsi:type="dc:Point" x="1594" y="1373" /> - <di:waypoint xsi:type="dc:Point" x="1594" y="1373" /> - <di:waypoint xsi:type="dc:Point" x="1666" y="1373" /> + <di:waypoint xsi:type="dc:Point" x="1329" y="1373" /> + <di:waypoint xsi:type="dc:Point" x="1473" y="1373" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1609" y="1367" width="0" height="12" /> + <dc:Bounds x="1356" y="1352" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_19v8l1w_di" bpmnElement="ScriptTask_19v8l1w"> - <dc:Bounds x="1460" y="1474" width="100" height="80" /> + <dc:Bounds x="858" y="1579" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="IntermediateCatchEvent_0z04o3s_di" bpmnElement="IntermediateCatchEvent_0z04o3s"> - <dc:Bounds x="74" y="1496" width="36" height="36" /> + <dc:Bounds x="74" y="1601" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="57" y="1536" width="70" height="12" /> + <dc:Bounds x="57" y="1641" width="70" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="EndEvent_0exzmfn_di" bpmnElement="EndEvent_0exzmfn"> - <dc:Bounds x="1951" y="1496" width="36" height="36" /> + <dc:Bounds x="1772" y="1601" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1924" y="1536" width="0" height="12" /> + <dc:Bounds x="1700" y="1641" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="ScriptTask_0jsblrq_di" bpmnElement="ScriptTask_0jsblrq"> - <dc:Bounds x="283" y="1474" width="100" height="80" /> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="ServiceTask_1ydxyw0_di" bpmnElement="ServiceTask_1ydxyw0"> - <dc:Bounds x="858" y="1474" width="100" height="80" /> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="SequenceFlow_0h3kdi2_di" bpmnElement="SequenceFlow_0h3kdi2"> - <di:waypoint xsi:type="dc:Point" x="958" y="1514" /> - <di:waypoint xsi:type="dc:Point" x="1460" y="1514" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="1209" y="1493" width="0" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_07aa121_di" bpmnElement="SequenceFlow_07aa121"> - <di:waypoint xsi:type="dc:Point" x="1560" y="1514" /> - <di:waypoint xsi:type="dc:Point" x="1951" y="1514" /> + <di:waypoint xsi:type="dc:Point" x="958" y="1619" /> + <di:waypoint xsi:type="dc:Point" x="1772" y="1619" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1755.5" y="1493" width="0" height="12" /> + <dc:Bounds x="1320" y="1598" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0ku36oy_di" bpmnElement="SequenceFlow_0ku36oy"> - <di:waypoint xsi:type="dc:Point" x="110" y="1514" /> - <di:waypoint xsi:type="dc:Point" x="283" y="1514" /> + <di:waypoint xsi:type="dc:Point" x="110" y="1619" /> + <di:waypoint xsi:type="dc:Point" x="858" y="1619" /> <bpmndi:BPMNLabel> - <dc:Bounds x="196.5" y="1493" width="0" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="SequenceFlow_0mwh16g_di" bpmnElement="SequenceFlow_0mwh16g"> - <di:waypoint xsi:type="dc:Point" x="383" y="1514" /> - <di:waypoint xsi:type="dc:Point" x="858" y="1514" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="620.5" y="1493" width="0" height="12" /> + <dc:Bounds x="439" y="1598" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="IntermediateThrowEvent_06lo96a_di" bpmnElement="IntermediateThrowEvent_06lo96a"> - <dc:Bounds x="1951" y="1103" width="36" height="36" /> + <dc:Bounds x="1762" y="1103" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1939" y="1143" width="82" height="12" /> + <dc:Bounds x="1750" y="1143" width="82" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="IntermediateThrowEvent_0hucdtk_di" bpmnElement="IntermediateThrowEvent_0hucdtk"> - <dc:Bounds x="1951" y="1355" width="36" height="36" /> + <dc:Bounds x="1762" y="1355" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1945" y="1395" width="70" height="24" /> + <dc:Bounds x="1756" y="1395" width="70" height="24" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0x0mhlj_di" bpmnElement="SequenceFlow_0x0mhlj"> - <di:waypoint xsi:type="dc:Point" x="1766" y="1373" /> - <di:waypoint xsi:type="dc:Point" x="1863" y="1373" /> - <di:waypoint xsi:type="dc:Point" x="1863" y="1373" /> - <di:waypoint xsi:type="dc:Point" x="1951" y="1373" /> + <di:waypoint xsi:type="dc:Point" x="1573" y="1373" /> + <di:waypoint xsi:type="dc:Point" x="1762" y="1373" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1878" y="1367" width="0" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="SequenceFlow_167wc99_di" bpmnElement="SequenceFlow_167wc99"> - <di:waypoint xsi:type="dc:Point" x="958" y="422" /> - <di:waypoint xsi:type="dc:Point" x="1951" y="422" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="1409.5" y="401" width="90" height="12" /> + <dc:Bounds x="1622.5" y="1352" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="IntermediateThrowEvent_09ur9ds_di" bpmnElement="IntermediateThrowEvent_09ur9ds"> - <dc:Bounds x="1951" y="622" width="36" height="36" /> + <dc:Bounds x="1762" y="622" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1927" y="663" width="84" height="36" /> + <dc:Bounds x="1738" y="663" width="84" height="36" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="SequenceFlow_0l4gosl_di" bpmnElement="SequenceFlow_0l4gosl"> - <di:waypoint xsi:type="dc:Point" x="958" y="640" /> - <di:waypoint xsi:type="dc:Point" x="1152" y="640" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="1010" y="619" width="90" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="SequenceFlow_1sgsysh_di" bpmnElement="SequenceFlow_1sgsysh"> - <di:waypoint xsi:type="dc:Point" x="1775" y="640" /> - <di:waypoint xsi:type="dc:Point" x="1951" y="640" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="1863" y="619" width="0" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="SequenceFlow_1nqfgvs_di" bpmnElement="SequenceFlow_1nqfgvs"> - <di:waypoint xsi:type="dc:Point" x="958" y="868" /> - <di:waypoint xsi:type="dc:Point" x="1951" y="868" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="1409.5" y="847" width="90" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1uu6uiu_di" bpmnElement="SequenceFlow_1uu6uiu"> - <di:waypoint xsi:type="dc:Point" x="958" y="1121" /> - <di:waypoint xsi:type="dc:Point" x="1951" y="1121" /> + <di:waypoint xsi:type="dc:Point" x="1340" y="1121" /> + <di:waypoint xsi:type="dc:Point" x="1762" y="1121" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1409.5" y="1100" width="90" height="12" /> + <dc:Bounds x="1506" y="1100" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="SubProcess_0jo0nms_di" bpmnElement="SubProcess_0jo0nms" isExpanded="true"> @@ -725,13 +478,13 @@ dcsi.preProcessAAIPUT(execution)]]></bpmn2:script> <bpmndi:BPMNShape id="StartEvent_06768u3_di" bpmnElement="StartEvent_06768u3"> <dc:Bounds x="266" y="1895" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="239" y="1936" width="0" height="12" /> + <dc:Bounds x="194" y="1936" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="EndEvent_014jyvb_di" bpmnElement="EndEvent_014jyvb"> <dc:Bounds x="1581" y="1895" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1554" y="1936" width="0" height="12" /> + <dc:Bounds x="1509" y="1936" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_1awrp72_di" bpmnElement="ScriptTask_1awrp72"> @@ -744,21 +497,21 @@ dcsi.preProcessAAIPUT(execution)]]></bpmn2:script> <di:waypoint xsi:type="dc:Point" x="302" y="1913" /> <di:waypoint xsi:type="dc:Point" x="557" y="1913" /> <bpmndi:BPMNLabel> - <dc:Bounds x="384.5" y="1892" width="90" height="12" /> + <dc:Bounds x="385" y="1892" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_02znk15_di" bpmnElement="SequenceFlow_02znk15"> <di:waypoint xsi:type="dc:Point" x="1348" y="1913" /> <di:waypoint xsi:type="dc:Point" x="1581" y="1913" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1420.5" y="1898" width="0" height="12" /> + <dc:Bounds x="1376" y="1898" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_19ly8h7_di" bpmnElement="SequenceFlow_19ly8h7"> <di:waypoint xsi:type="dc:Point" x="657" y="1913" /> - <di:waypoint xsi:type="dc:Point" x="786" y="1913" /> + <di:waypoint xsi:type="dc:Point" x="1248" y="1913" /> <bpmndi:BPMNLabel> - <dc:Bounds x="676.5" y="1892" width="90" height="12" /> + <dc:Bounds x="907.5" y="1892" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_195nptq_di" bpmnElement="ScriptTask_195nptq"> @@ -766,63 +519,129 @@ dcsi.preProcessAAIPUT(execution)]]></bpmn2:script> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1cy5gq2_di" bpmnElement="SequenceFlow_1cy5gq2"> <di:waypoint xsi:type="dc:Point" x="393" y="1373" /> - <di:waypoint xsi:type="dc:Point" x="589" y="1373" /> + <di:waypoint xsi:type="dc:Point" x="495" y="1373" /> <bpmndi:BPMNLabel> - <dc:Bounds x="491" y="1352" width="0" height="12" /> + <dc:Bounds x="399" y="1352" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="CallActivity_069o6fn_di" bpmnElement="CallActivity_069o6fn"> - <dc:Bounds x="589" y="1333" width="100" height="80" /> + <dc:Bounds x="495" y="1333" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_0lp9y03_di" bpmnElement="ScriptTask_0lp9y03"> - <dc:Bounds x="858" y="1333" width="100" height="80" /> + <dc:Bounds x="724" y="1333" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1vy856f_di" bpmnElement="SequenceFlow_1vy856f"> - <di:waypoint xsi:type="dc:Point" x="689" y="1373" /> - <di:waypoint xsi:type="dc:Point" x="806" y="1373" /> - <di:waypoint xsi:type="dc:Point" x="806" y="1373" /> - <di:waypoint xsi:type="dc:Point" x="858" y="1373" /> + <di:waypoint xsi:type="dc:Point" x="595" y="1373" /> + <di:waypoint xsi:type="dc:Point" x="724" y="1373" /> <bpmndi:BPMNLabel> - <dc:Bounds x="821" y="1367" width="0" height="12" /> + <dc:Bounds x="614.5" y="1352" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_14ggluy_di" bpmnElement="SequenceFlow_14ggluy"> - <di:waypoint xsi:type="dc:Point" x="958" y="1373" /> - <di:waypoint xsi:type="dc:Point" x="1055" y="1373" /> - <di:waypoint xsi:type="dc:Point" x="1055" y="1373" /> - <di:waypoint xsi:type="dc:Point" x="1152" y="1373" /> + <di:waypoint xsi:type="dc:Point" x="824" y="1373" /> + <di:waypoint xsi:type="dc:Point" x="978" y="1373" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1070" y="1367" width="0" height="12" /> + <dc:Bounds x="856" y="1352" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_0sis7k0_di" bpmnElement="ScriptTask_0sis7k0"> - <dc:Bounds x="1152" y="1333" width="100" height="80" /> + <dc:Bounds x="978" y="1333" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1kx5ke9_di" bpmnElement="SequenceFlow_1kx5ke9"> - <di:waypoint xsi:type="dc:Point" x="1252" y="1373" /> - <di:waypoint xsi:type="dc:Point" x="1410" y="1373" /> + <di:waypoint xsi:type="dc:Point" x="1078" y="1373" /> + <di:waypoint xsi:type="dc:Point" x="1229" y="1373" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1108.5" y="1352" width="90" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_04xlw7s_di" bpmnElement="SequenceFlow_04xlw7s"> + <di:waypoint xsi:type="dc:Point" x="393" y="640" /> + <di:waypoint xsi:type="dc:Point" x="589" y="640" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1331" y="1352" width="0" height="12" /> + <dc:Bounds x="491" y="619" width="0" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="ServiceTask_1kw189j_di" bpmnElement="ServiceTask_1kw189j"> - <dc:Bounds x="1005" y="1873" width="100" height="80" /> + <bpmndi:BPMNShape id="ExclusiveGateway_06gj84t_di" bpmnElement="ExclusiveGateway_06gj84t" isMarkerVisible="true"> + <dc:Bounds x="590" y="843" width="50" height="50" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="573" y="815" width="85" height="24" /> + </bpmndi:BPMNLabel> </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="SequenceFlow_0utvwkh_di" bpmnElement="SequenceFlow_0utvwkh"> - <di:waypoint xsi:type="dc:Point" x="1105" y="1913" /> - <di:waypoint xsi:type="dc:Point" x="1248" y="1913" /> + <bpmndi:BPMNEdge id="SequenceFlow_0ttlte0_di" bpmnElement="SequenceFlow_0ttlte0"> + <di:waypoint xsi:type="dc:Point" x="640" y="868" /> + <di:waypoint xsi:type="dc:Point" x="756" y="868" /> + <di:waypoint xsi:type="dc:Point" x="756" y="868" /> + <di:waypoint xsi:type="dc:Point" x="858" y="868" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="750" y="845" width="19" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="IntermediateThrowEvent_0xny7on_di" bpmnElement="IntermediateThrowEvent_0xny7on"> + <dc:Bounds x="597" y="955" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="573" y="995" width="86" height="36" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_01po987_di" bpmnElement="SequenceFlow_01po987"> + <di:waypoint xsi:type="dc:Point" x="615" y="893" /> + <di:waypoint xsi:type="dc:Point" x="615" y="955" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="623" y="918" width="14" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ExclusiveGateway_0ae22y8_di" bpmnElement="ExclusiveGateway_0ae22y8" isMarkerVisible="true"> + <dc:Bounds x="590" y="1096" width="50" height="50" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="573" y="1068" width="85" height="24" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="IntermediateThrowEvent_0y1ii4i_di" bpmnElement="IntermediateThrowEvent_0y1ii4i"> + <dc:Bounds x="597" y="1218" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="585" y="1258" width="82" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_177wo8z_di" bpmnElement="SequenceFlow_177wo8z"> + <di:waypoint xsi:type="dc:Point" x="1329" y="868" /> + <di:waypoint xsi:type="dc:Point" x="1762" y="868" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1545.5" y="847" width="0" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_0vjx5a2_di" bpmnElement="SequenceFlow_0vjx5a2"> + <di:waypoint xsi:type="dc:Point" x="640" y="1121" /> + <di:waypoint xsi:type="dc:Point" x="872" y="1121" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="747" y="1100" width="19" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1do7kq0_di" bpmnElement="SequenceFlow_1do7kq0"> + <di:waypoint xsi:type="dc:Point" x="615" y="1146" /> + <di:waypoint xsi:type="dc:Point" x="615" y="1218" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1176.5" y="1892" width="0" height="12" /> + <dc:Bounds x="623" y="1176" width="14" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="ScriptTask_1bb9adn_di" bpmnElement="ScriptTask_1bb9adn"> - <dc:Bounds x="786" y="1873" width="100" height="80" /> + <bpmndi:BPMNShape id="CallActivity_11obqi0_di" bpmnElement="CallActivity_11obqi0"> + <dc:Bounds x="872" y="1081" width="100" height="80" /> </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="SequenceFlow_1lqzi94_di" bpmnElement="SequenceFlow_1lqzi94"> - <di:waypoint xsi:type="dc:Point" x="886" y="1913" /> - <di:waypoint xsi:type="dc:Point" x="1005" y="1913" /> + <bpmndi:BPMNEdge id="SequenceFlow_0w4t4ao_di" bpmnElement="SequenceFlow_0w4t4ao"> + <di:waypoint xsi:type="dc:Point" x="972" y="1121" /> + <di:waypoint xsi:type="dc:Point" x="1240" y="1121" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1106" y="1100" width="0" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="CallActivity_07pl1uw_di" bpmnElement="CallActivity_07pl1uw"> + <dc:Bounds x="858" y="828" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1wwjugw_di" bpmnElement="SequenceFlow_1wwjugw"> + <di:waypoint xsi:type="dc:Point" x="958" y="868" /> + <di:waypoint xsi:type="dc:Point" x="1101" y="868" /> + <di:waypoint xsi:type="dc:Point" x="1101" y="868" /> + <di:waypoint xsi:type="dc:Point" x="1229" y="868" /> <bpmndi:BPMNLabel> - <dc:Bounds x="945.5" y="1892" width="0" height="12" /> + <dc:Bounds x="1116" y="862" width="0" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> </bpmndi:BPMNPlane> |