diff options
| author |   Seshu Kumar M <seshu.kumar.m@huawei.com> | 2017-10-12 05:35:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-10-12 05:35:08 +0000 |
| commit | 6fda60ab1b44f70348e8f9142b8d6ad5f9dd6a1d (patch) | |
| tree | 1a07800d041be3d1fcb3ad167b5ebb516328ffd0 /bpmn/MSOInfrastructureBPMN/src/main/resources | |
| parent | 9cebc7162dcb995f5cb47006a1d315abbc2abb73 (diff) | |
| parent | 015b92c3d96fb42f80b018fdf8f639f1cf3298c3 (diff) | |
Merge "Add junit test coverage and fix bugs in VCPE"
Diffstat (limited to 'bpmn/MSOInfrastructureBPMN/src/main/resources')
6 files changed, 297 insertions, 384 deletions
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVcpeResCustService.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVcpeResCustService.bpmn index c893690f79..02f7f4815a 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVcpeResCustService.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVcpeResCustService.bpmn @@ -164,7 +164,7 @@ CreateVcpeResCustService.prepareFalloutRequest(execution)]]></bpmn2:script> <bpmn2:extensionElements> <camunda:in source="DCRESI_rollbackData" target="rollbackData" /> <camunda:in source="msoRequestId" target="msoRequestId" /> - <camunda:out source="rollbackSuccessful" target="DCRESI_rollbackSuccessful" /> + <camunda:out source="rolledBack" target="DCRESI_rolledBack" /> <camunda:out source="rollbackError" target="DCRESI_rollbackError" /> <camunda:in source="sdncVersion" target="sdncVersion" /> </bpmn2:extensionElements> @@ -221,8 +221,8 @@ CreateVcpeResCustService.postProcessRollback(execution)]]></bpmn2:script> <camunda:in source="msoRequestId" target="msoRequestId" /> <camunda:in source="DCARBRG_rollbackData" target="rollbackData" /> <camunda:in source="sdncVersion" target="sdncVersion" /> - <camunda:out source="rollbackSuccessful" target="DCARCR_rollbackSuccessful" /> - <camunda:out source="rollbackError" target="DCARCR_rollbackError" /> + <camunda:out source="rolledBack" target="DCARBRG_rolledBack" /> + <camunda:out source="rollbackError" target="DCARBRG_rollbackError" /> </bpmn2:extensionElements> <bpmn2:incoming>SequenceFlow_0orpdrl</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_1t3cnnx</bpmn2:outgoing> @@ -254,7 +254,7 @@ CreateVcpeResCustService.postProcessRollback(execution)]]></bpmn2:script> <bpmn2:outgoing>SequenceFlow_0dr2fem</bpmn2:outgoing> </bpmn2:exclusiveGateway> <bpmn2:sequenceFlow id="SequenceFlow_1sim44y" name="Yes" sourceRef="ExclusiveGateway_1mjdcct" targetRef="InclusiveGateway_131ozdf"> - <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{ execution.getVariable("DCARBRG_rollbackSuccessful") == true }]]></bpmn2:conditionExpression> + <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{ execution.getVariable("DCARBRG_rolledBack") == true }]]></bpmn2:conditionExpression> </bpmn2:sequenceFlow> <bpmn2:sequenceFlow id="SequenceFlow_0dr2fem" name="No" sourceRef="ExclusiveGateway_1mjdcct" targetRef="InclusiveGateway_1xenadu" /> <bpmn2:exclusiveGateway id="ExclusiveGateway_05dg1m1" name="Rollback success?" default="SequenceFlow_1mbymcu"> @@ -263,7 +263,7 @@ CreateVcpeResCustService.postProcessRollback(execution)]]></bpmn2:script> <bpmn2:outgoing>SequenceFlow_1mbymcu</bpmn2:outgoing> </bpmn2:exclusiveGateway> <bpmn2:sequenceFlow id="SequenceFlow_1quvahv" name="Yes" sourceRef="ExclusiveGateway_05dg1m1" targetRef="InclusiveGateway_142br6v"> - <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{ execution.getVariable("DCRENI_rollbackData") != null }]]></bpmn2:conditionExpression> + <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{ execution.getVariable("DCVAM_rolledBack") ==true }]]></bpmn2:conditionExpression> </bpmn2:sequenceFlow> <bpmn2:sequenceFlow id="SequenceFlow_1mbymcu" name="No" sourceRef="ExclusiveGateway_05dg1m1" targetRef="InclusiveGateway_0m9f5ka" /> <bpmn2:exclusiveGateway id="ExclusiveGateway_0y7gtd9" name="rollback failed?" default="SequenceFlow_12dakwh"> @@ -291,8 +291,8 @@ CreateVcpeResCustService.postProcessRollback(execution)]]></bpmn2:script> <camunda:in source="msoRequestId" target="msoRequestId" /> <camunda:in source="DCARTXC_rollbackData" target="rollbackData" /> <camunda:in source="sdncVersion" target="sdncVersion" /> - <camunda:out source="rollbackSuccessful" target="DCARBRG_rollbackSuccessful" /> - <camunda:out source="rollbackError" target="DCARBRG_rollbackError" /> + <camunda:out source="rolledBack" target="DCARTXC_rolledBack" /> + <camunda:out source="rollbackError" target="DCARTXC_rollbackError" /> </bpmn2:extensionElements> <bpmn2:incoming>SequenceFlow_1sl79hn</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_0ne9n0g</bpmn2:outgoing> @@ -300,7 +300,7 @@ CreateVcpeResCustService.postProcessRollback(execution)]]></bpmn2:script> <bpmn2:sequenceFlow id="SequenceFlow_1sl79hn" name="Yes" sourceRef="ExclusiveGateway_1kvn1pz" targetRef="CallActivity_071yaf8"> <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCARTXC_rollbackData") != null }]]></bpmn2:conditionExpression> </bpmn2:sequenceFlow> - <bpmn2:exclusiveGateway id="ExclusiveGateway_0y158bb" name="Rollback success?"> + <bpmn2:exclusiveGateway id="ExclusiveGateway_0y158bb" name="Rollback success?" default="SequenceFlow_00by7l7"> <bpmn2:incoming>SequenceFlow_0ne9n0g</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_00by7l7</bpmn2:outgoing> <bpmn2:outgoing>SequenceFlow_17cz98f</bpmn2:outgoing> @@ -311,13 +311,13 @@ CreateVcpeResCustService.postProcessRollback(execution)]]></bpmn2:script> </bpmn2:sequenceFlow> <bpmn2:sequenceFlow id="SequenceFlow_00by7l7" name="No" sourceRef="ExclusiveGateway_0y158bb" targetRef="InclusiveGateway_0m9f5ka" /> <bpmn2:sequenceFlow id="SequenceFlow_17cz98f" name="Yes" sourceRef="ExclusiveGateway_0y158bb" targetRef="ExclusiveGateway_05indeh"> - <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{ execution.getVariable("DCARTXC_rollbackSuccessful") == true }]]></bpmn2:conditionExpression> + <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{ execution.getVariable("DCARTXC_rolledBack") == true }]]></bpmn2:conditionExpression> </bpmn2:sequenceFlow> <bpmn2:callActivity id="CallActivity_1cl4iu4" name="DoRollback VNF and Modules " calledElement="DoCreateVnfAndModulesRollback"> <bpmn2:extensionElements> <camunda:in source="msoRequestId" target="msoRequestId" /> <camunda:in source="DCVAM_rollbackData" target="rollbackData" /> - <camunda:out source="rollbackSuccessful" target="DCVAM_rollbackSuccessful" /> + <camunda:out source="rolledBack" target="DCVAM_rolledBack" /> <camunda:out source="rollbackError" target="DCVAM_rollbackError" /> <camunda:in source="sdncVersion" target="sdncVersion" /> </bpmn2:extensionElements> @@ -369,7 +369,7 @@ CreateVcpeResCustService.prepareCreateServiceInstance(execution)]]></bpmn2:scrip <bpmn2:outgoing>SequenceFlow_13uceka</bpmn2:outgoing> </bpmn2:serviceTask> <bpmn2:sequenceFlow id="SequenceFlow_13uceka" sourceRef="updateInfraRequest" targetRef="IntermediateThrowEvent_1as6hoa" /> - <bpmn2:scriptTask id="ScriptTask_1qd3uwb" name="PostProcess Create Service " scriptFormat="groovy"> + <bpmn2:scriptTask id="ScriptTask_1qd3uwb" name="Post Process Create Service " scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_1ky2sv9</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_0vj46ej</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.vcpe.scripts.*
@@ -448,11 +448,11 @@ CreateVcpeResCustService.prepareCreateAllottedResourceTXC(execution)]]></bpmn2:s <camunda:in source="serviceDecomposition" target="serviceDecomposition" /> <camunda:in source="subscriberInfo" target="subscriberInfo" /> </bpmn2:extensionElements> - <bpmn2:incoming>SequenceFlow_17g05fd</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_11efpvh</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_1jbuf1t</bpmn2:outgoing> </bpmn2:callActivity> <bpmn2:sequenceFlow id="SequenceFlow_1jbuf1t" sourceRef="Task_1l0uvof" targetRef="IntermediateThrowEvent_0prlju0" /> - <bpmn2:sequenceFlow id="SequenceFlow_17g05fd" sourceRef="DecomposeService" targetRef="Task_1l0uvof" /> + <bpmn2:sequenceFlow id="SequenceFlow_17g05fd" sourceRef="DecomposeService" targetRef="ScriptTask_0lpv2da" /> <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_17pzn7m" name="CreateAllottedResourcesBRG"> <bpmn2:outgoing>SequenceFlow_15vce9o</bpmn2:outgoing> <bpmn2:linkEventDefinition name="CreateAllottedResourcesBRG" /> @@ -542,7 +542,7 @@ CreateVcpeResCustService.prepareCreateAllottedResourceBRG(execution)]]></bpmn2:s <bpmn2:scriptTask id="ScriptTask_0n1k77c" name="Prepare to Create VNF" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_0p75l97</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_0ws7fjn</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infra.scripts.* + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.vcpe.scripts.* def CreateVcpeResCustService= new CreateVcpeResCustService() CreateVcpeResCustService.prepareVnfAndModulesCreate(execution)]]></bpmn2:script> </bpmn2:scriptTask> @@ -560,12 +560,12 @@ CreateVcpeResCustService.prepareVnfAndModulesCreate(execution)]]></bpmn2:script> <bpmn2:outgoing>SequenceFlow_13iuk3s</bpmn2:outgoing> </bpmn2:exclusiveGateway> <bpmn2:exclusiveGateway id="ExclusiveGateway_1hlbkue"> - <bpmn2:incoming>SequenceFlow_1mkdhw9</bpmn2:incoming> <bpmn2:incoming>SequenceFlow_13iuk3s</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_0k5vcuu</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_1ufio7c</bpmn2:outgoing> </bpmn2:exclusiveGateway> <bpmn2:sequenceFlow id="SequenceFlow_0ws7fjn" sourceRef="ScriptTask_0n1k77c" targetRef="CallActivity_1els13v" /> - <bpmn2:sequenceFlow id="SequenceFlow_1mkdhw9" name="in 1702 scope only one VNF will be created - if needed" sourceRef="CallActivity_1els13v" targetRef="ExclusiveGateway_1hlbkue"> + <bpmn2:sequenceFlow id="SequenceFlow_1mkdhw9" name="in 1702 scope only one VNF will be created - if needed" sourceRef="CallActivity_1els13v" targetRef="ScriptTask_18w0jud"> <bpmn2:documentation>in 1702 scope only one VNF will be created</bpmn2:documentation> </bpmn2:sequenceFlow> <bpmn2:sequenceFlow id="SequenceFlow_0p75l97" name="Yes" sourceRef="ExclusiveGateway_0yae9sb" targetRef="ScriptTask_0n1k77c"> @@ -600,6 +600,22 @@ CreateVcpeResCustService.prepareVnfAndModulesCreate(execution)]]></bpmn2:script> <bpmn2:outgoing>SequenceFlow_1cgpklo</bpmn2:outgoing> </bpmn2:callActivity> <bpmn2:sequenceFlow id="SequenceFlow_1cgpklo" sourceRef="CallActivity_1ymzucb" targetRef="ExclusiveGateway_074qh5g" /> + <bpmn2:scriptTask id="ScriptTask_0lpv2da" name="PostProcess Decompose Service " scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_17g05fd</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_11efpvh</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.vcpe.scripts.* +def CreateVcpeResCustService = new CreateVcpeResCustService() +CreateVcpeResCustService.processDecomposition(execution)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:sequenceFlow id="SequenceFlow_11efpvh" sourceRef="ScriptTask_0lpv2da" targetRef="Task_1l0uvof" /> + <bpmn2:scriptTask id="ScriptTask_18w0jud" name="Post Process Create VNF" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_1mkdhw9</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_0k5vcuu</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.vcpe.scripts.* +def CreateVcpeResCustService= new CreateVcpeResCustService() +CreateVcpeResCustService.validateVnfCreate(execution)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:sequenceFlow id="SequenceFlow_0k5vcuu" sourceRef="ScriptTask_18w0jud" targetRef="ExclusiveGateway_1hlbkue" /> </bpmn2:process> <bpmn2:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" /> <bpmn2:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" /> @@ -730,82 +746,82 @@ CreateVcpeResCustService.prepareVnfAndModulesCreate(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="SubProcess_0s6hpty_di" bpmnElement="SubProcess_0s6hpty" isExpanded="true"> - <dc:Bounds x="-261" y="1650" width="1482" height="1528" /> + <dc:Bounds x="-266" y="1649" width="1482" height="1528" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ExclusiveGateway_1vwgs6p_di" bpmnElement="ExclusiveGateway_1vwgs6p" isMarkerVisible="true"> - <dc:Bounds x="55" y="2972" width="50" height="50" /> + <dc:Bounds x="50" y="2971" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="42" y="3032" width="79" height="12" /> + <dc:Bounds x="38" y="3031" width="78" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="StartEvent_1bwmffk_di" bpmnElement="StartEvent_1bwmffk"> - <dc:Bounds x="-58" y="2980" width="36" height="36" /> + <dc:Bounds x="-63" y="2979" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="-65" y="3021" width="53" height="12" /> + <dc:Bounds x="-69" y="3020" width="51" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ExclusiveGateway_0ydrtdx_di" bpmnElement="ExclusiveGateway_0ydrtdx" isMarkerVisible="true"> - <dc:Bounds x="55" y="2889" width="50" height="50" /> + <dc:Bounds x="50" y="2888" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="-11" y="2904" width="48" height="12" /> + <dc:Bounds x="-15" y="2903" width="46" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ExclusiveGateway_1kvn1pz_di" bpmnElement="ExclusiveGateway_1kvn1pz" isMarkerVisible="true"> - <dc:Bounds x="182" y="1822" width="50" height="50" /> + <dc:Bounds x="177" y="1821" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="114" y="1816" width="80" height="12" /> + <dc:Bounds x="110" y="1815" width="78" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="CallActivity_0jw5tqa_di" bpmnElement="CallActivity_0jw5tqa"> - <dc:Bounds x="1028" y="2946" width="100" height="80" /> + <dc:Bounds x="1023" y="2945" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="EndEvent_04xute7_di" bpmnElement="EndEvent_04xute7"> - <dc:Bounds x="1165" y="2968" width="36" height="36" /> + <dc:Bounds x="1160" y="2967" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1138" y="3009" width="90" height="0" /> + <dc:Bounds x="1133" y="3008" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_0yk02h3_di" bpmnElement="ScriptTask_0yk02h3"> - <dc:Bounds x="896" y="2946" width="100" height="80" /> + <dc:Bounds x="891" y="2945" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0zpbskl_di" bpmnElement="SequenceFlow_0zpbskl"> - <di:waypoint xsi:type="dc:Point" x="80" y="2972" /> - <di:waypoint xsi:type="dc:Point" x="80" y="2939" /> + <di:waypoint xsi:type="dc:Point" x="75" y="2971" /> + <di:waypoint xsi:type="dc:Point" x="75" y="2938" /> <bpmndi:BPMNLabel> - <dc:Bounds x="85" y="2959" width="21" height="12" /> + <dc:Bounds x="81" y="2958" width="19" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0dhf2js_di" bpmnElement="SequenceFlow_0dhf2js"> - <di:waypoint xsi:type="dc:Point" x="105" y="2997" /> - <di:waypoint xsi:type="dc:Point" x="739" y="2997" /> - <di:waypoint xsi:type="dc:Point" x="739" y="2939" /> + <di:waypoint xsi:type="dc:Point" x="100" y="2996" /> + <di:waypoint xsi:type="dc:Point" x="734" y="2996" /> + <di:waypoint xsi:type="dc:Point" x="734" y="2938" /> <bpmndi:BPMNLabel> - <dc:Bounds x="144" y="3002" width="16" height="12" /> + <dc:Bounds x="140" y="3001" width="14" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1sx5llu_di" bpmnElement="SequenceFlow_1sx5llu"> - <di:waypoint xsi:type="dc:Point" x="105" y="2914" /> - <di:waypoint xsi:type="dc:Point" x="410" y="2914" /> - <di:waypoint xsi:type="dc:Point" x="410" y="2914" /> - <di:waypoint xsi:type="dc:Point" x="714" y="2914" /> + <di:waypoint xsi:type="dc:Point" x="100" y="2913" /> + <di:waypoint xsi:type="dc:Point" x="405" y="2913" /> + <di:waypoint xsi:type="dc:Point" x="405" y="2913" /> + <di:waypoint xsi:type="dc:Point" x="709" y="2913" /> <bpmndi:BPMNLabel> - <dc:Bounds x="423" y="2918" width="21" height="12" /> + <dc:Bounds x="419" y="2917" width="19" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_02o4yqx_di" bpmnElement="SequenceFlow_02o4yqx"> - <di:waypoint xsi:type="dc:Point" x="80" y="2889" /> - <di:waypoint xsi:type="dc:Point" x="80" y="2867" /> + <di:waypoint xsi:type="dc:Point" x="75" y="2888" /> + <di:waypoint xsi:type="dc:Point" x="75" y="2866" /> <bpmndi:BPMNLabel> - <dc:Bounds x="90" y="2872" width="16" height="12" /> + <dc:Bounds x="86" y="2871" width="14" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_19mxskt_di" bpmnElement="SequenceFlow_19mxskt"> - <di:waypoint xsi:type="dc:Point" x="207" y="1822" /> - <di:waypoint xsi:type="dc:Point" x="207" y="1726" /> - <di:waypoint xsi:type="dc:Point" x="686" y="1726" /> - <di:waypoint xsi:type="dc:Point" x="686" y="1942" /> + <di:waypoint xsi:type="dc:Point" x="202" y="1821" /> + <di:waypoint xsi:type="dc:Point" x="202" y="1725" /> + <di:waypoint xsi:type="dc:Point" x="681" y="1725" /> + <di:waypoint xsi:type="dc:Point" x="681" y="1941" /> <bpmndi:BPMNLabel> - <dc:Bounds x="395.6421052631579" y="1705" width="16" height="12" /> + <dc:Bounds x="392" y="1704" width="14" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_1gacz45_di" bpmnElement="prepareCreateService_scriptTask"> @@ -830,41 +846,41 @@ CreateVcpeResCustService.prepareVnfAndModulesCreate(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="CallActivity_0oh7wzu_di" bpmnElement="DoRollbackService_CallActivity"> - <dc:Bounds x="981" y="1927" width="100" height="80" /> + <dc:Bounds x="976" y="1926" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="InclusiveGateway_0foywso_di" bpmnElement="InclusiveGateway_0foywso"> - <dc:Bounds x="714" y="2889" width="50" height="50" /> + <dc:Bounds x="709" y="2888" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="694" y="2944" width="90" height="0" /> + <dc:Bounds x="689" y="2943" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1f1hd3l_di" bpmnElement="SequenceFlow_1f1hd3l"> - <di:waypoint xsi:type="dc:Point" x="1031" y="2007" /> - <di:waypoint xsi:type="dc:Point" x="1031" y="2104" /> + <di:waypoint xsi:type="dc:Point" x="1026" y="2006" /> + <di:waypoint xsi:type="dc:Point" x="1026" y="2103" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1001" y="2056" width="90" height="0" /> + <dc:Bounds x="996" y="2055" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0jg47xm_di" bpmnElement="SequenceFlow_0jg47xm"> - <di:waypoint xsi:type="dc:Point" x="764" y="2914" /> - <di:waypoint xsi:type="dc:Point" x="946" y="2914" /> - <di:waypoint xsi:type="dc:Point" x="946" y="2946" /> + <di:waypoint xsi:type="dc:Point" x="759" y="2913" /> + <di:waypoint xsi:type="dc:Point" x="941" y="2913" /> + <di:waypoint xsi:type="dc:Point" x="941" y="2945" /> <bpmndi:BPMNLabel> - <dc:Bounds x="810" y="2899" width="90" height="0" /> + <dc:Bounds x="805" y="2898" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0807ukc_di" bpmnElement="SequenceFlow_0807ukc"> - <di:waypoint xsi:type="dc:Point" x="996" y="2986" /> - <di:waypoint xsi:type="dc:Point" x="1028" y="2986" /> + <di:waypoint xsi:type="dc:Point" x="991" y="2985" /> + <di:waypoint xsi:type="dc:Point" x="1023" y="2985" /> <bpmndi:BPMNLabel> - <dc:Bounds x="967" y="2971" width="90" height="0" /> + <dc:Bounds x="962" y="2970" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_19yywk8_di" bpmnElement="SequenceFlow_19yywk8"> - <di:waypoint xsi:type="dc:Point" x="1128" y="2986" /> - <di:waypoint xsi:type="dc:Point" x="1165" y="2986" /> + <di:waypoint xsi:type="dc:Point" x="1123" y="2985" /> + <di:waypoint xsi:type="dc:Point" x="1160" y="2985" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1102" y="2971" width="90" height="0" /> + <dc:Bounds x="1097" y="2970" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="IntermediateThrowEvent_0prlju0_di" bpmnElement="IntermediateThrowEvent_0prlju0"> @@ -881,17 +897,17 @@ CreateVcpeResCustService.prepareVnfAndModulesCreate(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ExclusiveGateway_05indeh_di" bpmnElement="ExclusiveGateway_05indeh" isMarkerVisible="true"> - <dc:Bounds x="661" y="1942" width="50" height="50" /> + <dc:Bounds x="656" y="1941" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="721" y="1924" width="85" height="24" /> + <dc:Bounds x="718" y="1923" width="82" height="24" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0sezboq_di" bpmnElement="SequenceFlow_0sezboq"> - <di:waypoint xsi:type="dc:Point" x="686" y="1992" /> - <di:waypoint xsi:type="dc:Point" x="686" y="2129" /> - <di:waypoint xsi:type="dc:Point" x="1006" y="2129" /> + <di:waypoint xsi:type="dc:Point" x="681" y="1991" /> + <di:waypoint xsi:type="dc:Point" x="681" y="2128" /> + <di:waypoint xsi:type="dc:Point" x="1001" y="2128" /> <bpmndi:BPMNLabel> - <dc:Bounds x="693" y="2046" width="16" height="12" /> + <dc:Bounds x="689" y="2045" width="14" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ServiceTask_16yhzej_di" bpmnElement="updateInfraRequest"> @@ -922,31 +938,31 @@ CreateVcpeResCustService.prepareVnfAndModulesCreate(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_17doerz_di" bpmnElement="ScriptTask_17doerz"> - <dc:Bounds x="30" y="2787" width="100" height="80" /> + <dc:Bounds x="25" y="2786" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0zq7i3q_di" bpmnElement="SequenceFlow_0zq7i3q"> - <di:waypoint xsi:type="dc:Point" x="-22" y="2998" /> - <di:waypoint xsi:type="dc:Point" x="25" y="2998" /> - <di:waypoint xsi:type="dc:Point" x="25" y="2997" /> - <di:waypoint xsi:type="dc:Point" x="55" y="2997" /> + <di:waypoint xsi:type="dc:Point" x="-27" y="2997" /> + <di:waypoint xsi:type="dc:Point" x="20" y="2997" /> + <di:waypoint xsi:type="dc:Point" x="20" y="2996" /> + <di:waypoint xsi:type="dc:Point" x="50" y="2996" /> <bpmndi:BPMNLabel> - <dc:Bounds x="-51" y="2999" width="90" height="0" /> + <dc:Bounds x="-56" y="2998" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="InclusiveGateway_0m9f5ka_di" bpmnElement="InclusiveGateway_0m9f5ka"> - <dc:Bounds x="1006" y="2104" width="50" height="50" /> + <dc:Bounds x="1001" y="2103" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="986" y="2159" width="90" height="0" /> + <dc:Bounds x="981" y="2158" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_0wyub4x_di" bpmnElement="ScriptTask_0wyub4x"> - <dc:Bounds x="689" y="2787" width="100" height="80" /> + <dc:Bounds x="684" y="2786" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1rabks0_di" bpmnElement="SequenceFlow_1rabks0"> - <di:waypoint xsi:type="dc:Point" x="739" y="2867" /> - <di:waypoint xsi:type="dc:Point" x="739" y="2889" /> + <di:waypoint xsi:type="dc:Point" x="734" y="2866" /> + <di:waypoint xsi:type="dc:Point" x="734" y="2888" /> <bpmndi:BPMNLabel> - <dc:Bounds x="709" y="2878" width="90" height="0" /> + <dc:Bounds x="704" y="2877" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="CallActivity_0w2alah_di" bpmnElement="DecomposeService"> @@ -986,42 +1002,42 @@ CreateVcpeResCustService.prepareVnfAndModulesCreate(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ExclusiveGateway_06gq6em_di" bpmnElement="ExclusiveGateway_06gq6em" isMarkerVisible="true"> - <dc:Bounds x="55" y="2604" width="50" height="50" /> + <dc:Bounds x="50" y="2603" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="-33" y="2619" width="82" height="12" /> + <dc:Bounds x="-37" y="2618" width="80" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="CallActivity_1bpuf2p_di" bpmnElement="CallActivity_1bpuf2p"> - <dc:Bounds x="157" y="2519" width="100" height="80" /> + <dc:Bounds x="152" y="2518" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="InclusiveGateway_131ozdf_di" bpmnElement="InclusiveGateway_131ozdf"> - <dc:Bounds x="55" y="2432" width="50" height="50" /> + <dc:Bounds x="50" y="2431" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="35" y="2487" width="90" height="0" /> + <dc:Bounds x="30" y="2486" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0orpdrl_di" bpmnElement="SequenceFlow_0orpdrl"> - <di:waypoint xsi:type="dc:Point" x="105" y="2629" /> - <di:waypoint xsi:type="dc:Point" x="207" y="2629" /> - <di:waypoint xsi:type="dc:Point" x="207" y="2599" /> + <di:waypoint xsi:type="dc:Point" x="100" y="2628" /> + <di:waypoint xsi:type="dc:Point" x="202" y="2628" /> + <di:waypoint xsi:type="dc:Point" x="202" y="2598" /> <bpmndi:BPMNLabel> - <dc:Bounds x="145" y="2614" width="21" height="12" /> + <dc:Bounds x="141" y="2613" width="19" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1t3cnnx_di" bpmnElement="SequenceFlow_1t3cnnx"> - <di:waypoint xsi:type="dc:Point" x="207" y="2519" /> - <di:waypoint xsi:type="dc:Point" x="207" y="2482" /> + <di:waypoint xsi:type="dc:Point" x="202" y="2518" /> + <di:waypoint xsi:type="dc:Point" x="202" y="2481" /> <bpmndi:BPMNLabel> - <dc:Bounds x="177" y="2501" width="90" height="0" /> + <dc:Bounds x="172" y="2500" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0ya1cr3_di" bpmnElement="SequenceFlow_0ya1cr3"> - <di:waypoint xsi:type="dc:Point" x="80" y="2604" /> - <di:waypoint xsi:type="dc:Point" x="80" y="2543" /> - <di:waypoint xsi:type="dc:Point" x="80" y="2543" /> - <di:waypoint xsi:type="dc:Point" x="80" y="2482" /> + <di:waypoint xsi:type="dc:Point" x="75" y="2603" /> + <di:waypoint xsi:type="dc:Point" x="75" y="2542" /> + <di:waypoint xsi:type="dc:Point" x="75" y="2542" /> + <di:waypoint xsi:type="dc:Point" x="75" y="2481" /> <bpmndi:BPMNLabel> - <dc:Bounds x="92" y="2509" width="16" height="12" /> + <dc:Bounds x="88" y="2508" width="14" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ExclusiveGateway_1oudh6l_di" bpmnElement="ExclusiveGateway_1oudh6l" isMarkerVisible="true"> @@ -1061,63 +1077,63 @@ CreateVcpeResCustService.prepareVnfAndModulesCreate(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ExclusiveGateway_14tl857_di" bpmnElement="ExclusiveGateway_14tl857" isMarkerVisible="true"> - <dc:Bounds x="55" y="2283" width="50" height="50" /> + <dc:Bounds x="50" y="2282" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="-31" y="2298" width="80" height="12" /> + <dc:Bounds x="-24" y="2297" width="57" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="InclusiveGateway_142br6v_di" bpmnElement="InclusiveGateway_142br6v"> - <dc:Bounds x="55" y="2104" width="50" height="50" /> + <dc:Bounds x="50" y="2103" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="35" y="2159" width="90" height="0" /> + <dc:Bounds x="30" y="2158" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1kpdu1j_di" bpmnElement="SequenceFlow_1kpdu1j"> - <di:waypoint xsi:type="dc:Point" x="80" y="2283" /> - <di:waypoint xsi:type="dc:Point" x="80" y="2154" /> + <di:waypoint xsi:type="dc:Point" x="75" y="2282" /> + <di:waypoint xsi:type="dc:Point" x="75" y="2153" /> <bpmndi:BPMNLabel> - <dc:Bounds x="87" y="2219" width="16" height="12" /> + <dc:Bounds x="83" y="2218" width="14" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ExclusiveGateway_1mjdcct_di" bpmnElement="ExclusiveGateway_1mjdcct" isMarkerVisible="true"> - <dc:Bounds x="182" y="2432" width="50" height="50" /> + <dc:Bounds x="177" y="2431" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="183" y="2394" width="48" height="24" /> + <dc:Bounds x="178" y="2393" width="48" height="24" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1sim44y_di" bpmnElement="SequenceFlow_1sim44y"> - <di:waypoint xsi:type="dc:Point" x="182" y="2457" /> - <di:waypoint xsi:type="dc:Point" x="105" y="2457" /> + <di:waypoint xsi:type="dc:Point" x="177" y="2456" /> + <di:waypoint xsi:type="dc:Point" x="100" y="2456" /> <bpmndi:BPMNLabel> - <dc:Bounds x="111" y="2432" width="21" height="12" /> + <dc:Bounds x="107" y="2431" width="19" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0dr2fem_di" bpmnElement="SequenceFlow_0dr2fem"> - <di:waypoint xsi:type="dc:Point" x="231" y="2458" /> - <di:waypoint xsi:type="dc:Point" x="739" y="2458" /> - <di:waypoint xsi:type="dc:Point" x="739" y="2696" /> + <di:waypoint xsi:type="dc:Point" x="226" y="2457" /> + <di:waypoint xsi:type="dc:Point" x="734" y="2457" /> + <di:waypoint xsi:type="dc:Point" x="734" y="2695" /> <bpmndi:BPMNLabel> - <dc:Bounds x="320" y="2437" width="16" height="12" /> + <dc:Bounds x="316" y="2436" width="14" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ExclusiveGateway_05dg1m1_di" bpmnElement="ExclusiveGateway_05dg1m1" isMarkerVisible="true"> - <dc:Bounds x="182" y="2104" width="50" height="50" /> + <dc:Bounds x="177" y="2103" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="183" y="2065" width="48" height="24" /> + <dc:Bounds x="178" y="2064" width="48" height="24" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1quvahv_di" bpmnElement="SequenceFlow_1quvahv"> - <di:waypoint xsi:type="dc:Point" x="182" y="2129" /> - <di:waypoint xsi:type="dc:Point" x="105" y="2129" /> + <di:waypoint xsi:type="dc:Point" x="177" y="2128" /> + <di:waypoint xsi:type="dc:Point" x="100" y="2128" /> <bpmndi:BPMNLabel> - <dc:Bounds x="133" y="2104" width="21" height="12" /> + <dc:Bounds x="129" y="2103" width="19" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1mbymcu_di" bpmnElement="SequenceFlow_1mbymcu"> - <di:waypoint xsi:type="dc:Point" x="232" y="2129" /> - <di:waypoint xsi:type="dc:Point" x="1006" y="2129" /> + <di:waypoint xsi:type="dc:Point" x="227" y="2128" /> + <di:waypoint xsi:type="dc:Point" x="1001" y="2128" /> <bpmndi:BPMNLabel> - <dc:Bounds x="294" y="2098" width="16" height="12" /> + <dc:Bounds x="290" y="2097" width="14" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="IntermediateCatchEvent_1i1nwfx_di" bpmnElement="IntermediateCatchEvent_1i1nwfx"> @@ -1140,85 +1156,85 @@ CreateVcpeResCustService.prepareVnfAndModulesCreate(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="CallActivity_07nu6s6_di" bpmnElement="Task_1l0uvof"> - <dc:Bounds x="687" y="348" width="100" height="80" /> + <dc:Bounds x="856" y="348" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1jbuf1t_di" bpmnElement="SequenceFlow_1jbuf1t"> - <di:waypoint xsi:type="dc:Point" x="787" y="388" /> + <di:waypoint xsi:type="dc:Point" x="956" y="388" /> <di:waypoint xsi:type="dc:Point" x="1056" y="388" /> <bpmndi:BPMNLabel> - <dc:Bounds x="922" y="373" width="0" height="0" /> + <dc:Bounds x="961" y="373" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_17g05fd_di" bpmnElement="SequenceFlow_17g05fd"> <di:waypoint xsi:type="dc:Point" x="567" y="388" /> - <di:waypoint xsi:type="dc:Point" x="687" y="388" /> + <di:waypoint xsi:type="dc:Point" x="658" y="388" /> <bpmndi:BPMNLabel> - <dc:Bounds x="627" y="373" width="0" height="0" /> + <dc:Bounds x="567.5" y="373" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ExclusiveGateway_0y7gtd9_di" bpmnElement="ExclusiveGateway_0y7gtd9" isMarkerVisible="true"> - <dc:Bounds x="55" y="2696" width="50" height="50" /> + <dc:Bounds x="50" y="2695" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="-36" y="2709" width="76" height="12" /> + <dc:Bounds x="-39" y="2708" width="72" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0ftzjjm_di" bpmnElement="SequenceFlow_0ftzjjm"> - <di:waypoint xsi:type="dc:Point" x="80" y="2787" /> - <di:waypoint xsi:type="dc:Point" x="80" y="2746" /> + <di:waypoint xsi:type="dc:Point" x="75" y="2786" /> + <di:waypoint xsi:type="dc:Point" x="75" y="2745" /> <bpmndi:BPMNLabel> - <dc:Bounds x="50" y="2767" width="90" height="0" /> + <dc:Bounds x="45" y="2766" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_12dakwh_di" bpmnElement="SequenceFlow_12dakwh"> - <di:waypoint xsi:type="dc:Point" x="80" y="2696" /> - <di:waypoint xsi:type="dc:Point" x="80" y="2654" /> + <di:waypoint xsi:type="dc:Point" x="75" y="2695" /> + <di:waypoint xsi:type="dc:Point" x="75" y="2653" /> <bpmndi:BPMNLabel> - <dc:Bounds x="87" y="2667" width="16" height="12" /> + <dc:Bounds x="83" y="2666" width="14" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="InclusiveGateway_1xenadu_di" bpmnElement="InclusiveGateway_1xenadu"> - <dc:Bounds x="714" y="2696" width="50" height="50" /> + <dc:Bounds x="709" y="2695" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="694" y="2751" width="90" height="0" /> + <dc:Bounds x="689" y="2750" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1lv5ld6_di" bpmnElement="SequenceFlow_1lv5ld6"> - <di:waypoint xsi:type="dc:Point" x="1031" y="2154" /> - <di:waypoint xsi:type="dc:Point" x="1031" y="2721" /> - <di:waypoint xsi:type="dc:Point" x="764" y="2721" /> + <di:waypoint xsi:type="dc:Point" x="1026" y="2153" /> + <di:waypoint xsi:type="dc:Point" x="1026" y="2720" /> + <di:waypoint xsi:type="dc:Point" x="759" y="2720" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1001" y="2438" width="90" height="0" /> + <dc:Bounds x="996" y="2437" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0dvsqpp_di" bpmnElement="SequenceFlow_0dvsqpp"> - <di:waypoint xsi:type="dc:Point" x="739" y="2746" /> - <di:waypoint xsi:type="dc:Point" x="739" y="2787" /> + <di:waypoint xsi:type="dc:Point" x="734" y="2745" /> + <di:waypoint xsi:type="dc:Point" x="734" y="2786" /> <bpmndi:BPMNLabel> - <dc:Bounds x="709" y="2767" width="90" height="0" /> + <dc:Bounds x="704" y="2766" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_09nn9a9_di" bpmnElement="SequenceFlow_09nn9a9"> - <di:waypoint xsi:type="dc:Point" x="105" y="2721" /> - <di:waypoint xsi:type="dc:Point" x="428" y="2721" /> - <di:waypoint xsi:type="dc:Point" x="428" y="2721" /> - <di:waypoint xsi:type="dc:Point" x="714" y="2721" /> + <di:waypoint xsi:type="dc:Point" x="100" y="2720" /> + <di:waypoint xsi:type="dc:Point" x="423" y="2720" /> + <di:waypoint xsi:type="dc:Point" x="423" y="2720" /> + <di:waypoint xsi:type="dc:Point" x="709" y="2720" /> <bpmndi:BPMNLabel> - <dc:Bounds x="148" y="2694" width="21" height="12" /> + <dc:Bounds x="144" y="2693" width="19" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_027lz43_di" bpmnElement="SequenceFlow_027lz43"> - <di:waypoint xsi:type="dc:Point" x="80" y="2432" /> - <di:waypoint xsi:type="dc:Point" x="80" y="2333" /> + <di:waypoint xsi:type="dc:Point" x="75" y="2431" /> + <di:waypoint xsi:type="dc:Point" x="75" y="2332" /> <bpmndi:BPMNLabel> - <dc:Bounds x="50" y="2373" width="90" height="0" /> + <dc:Bounds x="45" y="2372" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0t3mtod_di" bpmnElement="SequenceFlow_0t3mtod"> - <di:waypoint xsi:type="dc:Point" x="80" y="2104" /> - <di:waypoint xsi:type="dc:Point" x="80" y="1847" /> - <di:waypoint xsi:type="dc:Point" x="182" y="1847" /> + <di:waypoint xsi:type="dc:Point" x="75" y="2103" /> + <di:waypoint xsi:type="dc:Point" x="75" y="1846" /> + <di:waypoint xsi:type="dc:Point" x="177" y="1846" /> <bpmndi:BPMNLabel> - <dc:Bounds x="50" y="1966" width="90" height="0" /> + <dc:Bounds x="45" y="1965" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="IntermediateCatchEvent_17pzn7m_di" bpmnElement="IntermediateCatchEvent_17pzn7m"> @@ -1313,10 +1329,10 @@ CreateVcpeResCustService.prepareVnfAndModulesCreate(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="CallActivity_1els13v_di" bpmnElement="CallActivity_1els13v"> - <dc:Bounds x="617" y="942" width="100" height="80" /> + <dc:Bounds x="586" y="942" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_0n1k77c_di" bpmnElement="ScriptTask_0n1k77c"> - <dc:Bounds x="450" y="942" width="100" height="80" /> + <dc:Bounds x="413" y="942" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="IntermediateThrowEvent_1xsowxp_di" bpmnElement="IntermediateThrowEvent_1xsowxp"> <dc:Bounds x="1027" y="1031" width="36" height="36" /> @@ -1343,28 +1359,25 @@ CreateVcpeResCustService.prepareVnfAndModulesCreate(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0ws7fjn_di" bpmnElement="SequenceFlow_0ws7fjn"> - <di:waypoint xsi:type="dc:Point" x="550" y="983" /> - <di:waypoint xsi:type="dc:Point" x="580" y="983" /> - <di:waypoint xsi:type="dc:Point" x="580" y="981" /> - <di:waypoint xsi:type="dc:Point" x="617" y="981" /> + <di:waypoint xsi:type="dc:Point" x="513" y="982" /> + <di:waypoint xsi:type="dc:Point" x="586" y="982" /> <bpmndi:BPMNLabel> - <dc:Bounds x="550" y="982" width="0" height="12" /> + <dc:Bounds x="504.5" y="961" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1mkdhw9_di" bpmnElement="SequenceFlow_1mkdhw9"> - <di:waypoint xsi:type="dc:Point" x="717" y="982" /> - <di:waypoint xsi:type="dc:Point" x="917" y="982" /> - <di:waypoint xsi:type="dc:Point" x="917" y="1024" /> + <di:waypoint xsi:type="dc:Point" x="686" y="982" /> + <di:waypoint xsi:type="dc:Point" x="749" y="982" /> <bpmndi:BPMNLabel> - <dc:Bounds x="803" y="929" width="87" height="48" /> + <dc:Bounds x="888.7571646117599" y="923.4934735403681" width="84" height="48" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0p75l97_di" bpmnElement="SequenceFlow_0p75l97"> <di:waypoint xsi:type="dc:Point" x="351" y="1040" /> <di:waypoint xsi:type="dc:Point" x="351" y="982" /> - <di:waypoint xsi:type="dc:Point" x="450" y="982" /> + <di:waypoint xsi:type="dc:Point" x="413" y="982" /> <bpmndi:BPMNLabel> - <dc:Bounds x="361" y="1015" width="21" height="12" /> + <dc:Bounds x="362" y="1015" width="19" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1ufio7c_di" bpmnElement="SequenceFlow_1ufio7c"> @@ -1391,69 +1404,68 @@ CreateVcpeResCustService.prepareVnfAndModulesCreate(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="CallActivity_071yaf8_di" bpmnElement="CallActivity_071yaf8"> - <dc:Bounds x="326" y="1807" width="100" height="80" /> + <dc:Bounds x="321" y="1806" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1sl79hn_di" bpmnElement="SequenceFlow_1sl79hn"> - <di:waypoint xsi:type="dc:Point" x="232" y="1847" /> - <di:waypoint xsi:type="dc:Point" x="261" y="1847" /> - <di:waypoint xsi:type="dc:Point" x="261" y="1847" /> - <di:waypoint xsi:type="dc:Point" x="326" y="1847" /> + <di:waypoint xsi:type="dc:Point" x="227" y="1846" /> + <di:waypoint xsi:type="dc:Point" x="256" y="1846" /> + <di:waypoint xsi:type="dc:Point" x="256" y="1846" /> + <di:waypoint xsi:type="dc:Point" x="321" y="1846" /> <bpmndi:BPMNLabel> - <dc:Bounds x="275.2413793103448" y="1827" width="21" height="12" /> + <dc:Bounds x="271" y="1826" width="19" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ExclusiveGateway_0y158bb_di" bpmnElement="ExclusiveGateway_0y158bb" isMarkerVisible="true"> - <dc:Bounds x="526" y="1822" width="50" height="50" /> + <dc:Bounds x="521" y="1821" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="527" y="1783" width="48" height="24" /> + <dc:Bounds x="522" y="1782" width="48" height="24" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0ne9n0g_di" bpmnElement="SequenceFlow_0ne9n0g"> - <di:waypoint xsi:type="dc:Point" x="426" y="1847" /> - <di:waypoint xsi:type="dc:Point" x="526" y="1847" /> + <di:waypoint xsi:type="dc:Point" x="421" y="1846" /> + <di:waypoint xsi:type="dc:Point" x="521" y="1846" /> <bpmndi:BPMNLabel> - <dc:Bounds x="476" y="1826" width="0" height="12" /> + <dc:Bounds x="426" y="1825" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1a7e8l1_di" bpmnElement="SequenceFlow_1a7e8l1"> - <di:waypoint xsi:type="dc:Point" x="711" y="1967" /> - <di:waypoint xsi:type="dc:Point" x="981" y="1967" /> + <di:waypoint xsi:type="dc:Point" x="706" y="1966" /> + <di:waypoint xsi:type="dc:Point" x="976" y="1966" /> <bpmndi:BPMNLabel> - <dc:Bounds x="836" y="1946" width="21" height="12" /> + <dc:Bounds x="832" y="1945" width="19" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_00by7l7_di" bpmnElement="SequenceFlow_00by7l7"> - <di:waypoint xsi:type="dc:Point" x="551" y="1872" /> - <di:waypoint xsi:type="dc:Point" x="551" y="2129" /> - <di:waypoint xsi:type="dc:Point" x="1006" y="2129" /> + <di:waypoint xsi:type="dc:Point" x="546" y="1871" /> + <di:waypoint xsi:type="dc:Point" x="546" y="2128" /> + <di:waypoint xsi:type="dc:Point" x="1001" y="2128" /> <bpmndi:BPMNLabel> - <dc:Bounds x="558" y="1995" width="16" height="12" /> + <dc:Bounds x="554" y="1994" width="14" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_17cz98f_di" bpmnElement="SequenceFlow_17cz98f"> - <di:waypoint xsi:type="dc:Point" x="551" y="1872" /> - <di:waypoint xsi:type="dc:Point" x="551" y="1967" /> - <di:waypoint xsi:type="dc:Point" x="661" y="1967" /> + <di:waypoint xsi:type="dc:Point" x="559" y="1858" /> + <di:waypoint xsi:type="dc:Point" x="668" y="1954" /> <bpmndi:BPMNLabel> - <dc:Bounds x="556" y="1914" width="21" height="12" /> + <dc:Bounds x="614.8182269768699" y="1888.8734385586085" width="19" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="CallActivity_1cl4iu4_di" bpmnElement="CallActivity_1cl4iu4"> - <dc:Bounds x="157" y="2194" width="100" height="80" /> + <dc:Bounds x="152" y="2193" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1mpsdaj_di" bpmnElement="SequenceFlow_1mpsdaj"> - <di:waypoint xsi:type="dc:Point" x="207" y="2194" /> - <di:waypoint xsi:type="dc:Point" x="207" y="2154" /> + <di:waypoint xsi:type="dc:Point" x="202" y="2193" /> + <di:waypoint xsi:type="dc:Point" x="202" y="2153" /> <bpmndi:BPMNLabel> - <dc:Bounds x="222" y="2168" width="0" height="12" /> + <dc:Bounds x="172" y="2167" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_007p8k3_di" bpmnElement="SequenceFlow_007p8k3"> - <di:waypoint xsi:type="dc:Point" x="105" y="2308" /> - <di:waypoint xsi:type="dc:Point" x="207" y="2308" /> - <di:waypoint xsi:type="dc:Point" x="207" y="2274" /> + <di:waypoint xsi:type="dc:Point" x="100" y="2307" /> + <di:waypoint xsi:type="dc:Point" x="202" y="2307" /> + <di:waypoint xsi:type="dc:Point" x="202" y="2273" /> <bpmndi:BPMNLabel> - <dc:Bounds x="146" y="2287" width="21" height="12" /> + <dc:Bounds x="142" y="2286" width="19" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="CallActivity_1ymzucb_di" bpmnElement="CallActivity_1ymzucb"> @@ -1467,6 +1479,27 @@ CreateVcpeResCustService.prepareVnfAndModulesCreate(execution)]]></bpmn2:script> <dc:Bounds x="474" y="715" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ScriptTask_0lpv2da_di" bpmnElement="ScriptTask_0lpv2da"> + <dc:Bounds x="658" y="348" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_11efpvh_di" bpmnElement="SequenceFlow_11efpvh"> + <di:waypoint xsi:type="dc:Point" x="758" y="388" /> + <di:waypoint xsi:type="dc:Point" x="856" y="388" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="807" y="367" width="0" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ScriptTask_18w0jud_di" bpmnElement="ScriptTask_18w0jud"> + <dc:Bounds x="749" y="942" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_0k5vcuu_di" bpmnElement="SequenceFlow_0k5vcuu"> + <di:waypoint xsi:type="dc:Point" x="849" y="982" /> + <di:waypoint xsi:type="dc:Point" x="917" y="982" /> + <di:waypoint xsi:type="dc:Point" x="917" y="1024" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="883" y="961" width="0" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> </bpmndi:BPMNPlane> </bpmndi:BPMNDiagram> </bpmn2:definitions> diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVcpeResCustService.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVcpeResCustService.bpmn index 39fcd66c60..38e1d43910 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVcpeResCustService.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVcpeResCustService.bpmn @@ -22,9 +22,9 @@ DeleteVcpeResCustService.preProcessRequest(execution) ]]></bpmn2:script> </bpmn2:scriptTask> <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="preProcessRequest_ScriptTask" targetRef="sendSyncAckResponse_ScriptTask" /> - <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_3" name="vCPE-CUSREST"> + <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_3" name="vCPE-RESCUST"> <bpmn2:outgoing>SequenceFlow_10o22u2</bpmn2:outgoing> - <bpmn2:linkEventDefinition id="_LinkEventDefinition_37" name="vCPE-CUSREST" /> + <bpmn2:linkEventDefinition id="_LinkEventDefinition_37" name="vCPE-RESCUST" /> </bpmn2:intermediateCatchEvent> <bpmn2:scriptTask id="postProcessAndCompletionRequest_ScriptTask" name="Post Process & Completion Request" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_12ilko1</bpmn2:incoming> @@ -38,7 +38,7 @@ DeleteVcpeResCustService.postProcessResponse(execution)]]></bpmn2:script> <bpmn2:extensionElements> <camunda:in variables="all" /> <camunda:out variables="all" /> - <camunda:in source="DELVAS_CompleteMsoProcessRequest" target="CompleteMsoProcessRequest" /> + <camunda:in source="DVRCS_CompleteMsoProcessRequest" target="CompleteMsoProcessRequest" /> <camunda:in source="requestId" target="requestId" /> <camunda:in source="serviceInstanceId" target="serviceInstanceId" /> <camunda:out source="CMSO_ResponseCode" target="CMSO_ResponseCode" /> @@ -73,8 +73,8 @@ execution.setVariable("DeleteVcpeResCustServiceSuccessIndicator", true)]]></bpmn <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.vcpe.scripts.* -def DeleteServiceInstanceInfra = new DeleteServiceInstanceInfra() -DeleteServiceInstanceInfra.processJavaException(execution)]]></bpmn2:script> +def DeleteVcpeResCustService = new DeleteVcpeResCustService() +DeleteVcpeResCustService.processJavaException(execution)]]></bpmn2:script> </bpmn2:scriptTask> <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="ScriptTask_1" targetRef="EndEvent_1" /> </bpmn2:subProcess> @@ -108,7 +108,7 @@ DeleteServiceInstanceInfra.processJavaException(execution)]]></bpmn2:script> </bpmn2:startEvent> <bpmn2:callActivity id="CallActivity_0jw5tqa" name="Call FalloutHandlerV1" calledElement="FalloutHandler"> <bpmn2:extensionElements> - <camunda:in source="DELVAS_falloutRequest" target="FalloutHandlerRequest" /> + <camunda:in source="DVRCS_falloutRequest" target="FalloutHandlerRequest" /> <camunda:in source="msoRequestId" target="mso-request-id" /> <camunda:in source="serviceInstanceId" target="mso-service-instance-id" /> <camunda:out source="FH_ResponseCode" target="FH_ResponseCode" /> @@ -185,9 +185,9 @@ DeleteVcpeResCustService.prepareServiceDelete(execution)]]></bpmn2:script> <bpmn2:incoming>SequenceFlow_05cjs89</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_0snq0kw</bpmn2:outgoing> </bpmn2:callActivity> - <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_0i8bmrc" name="GoToVCPE-CUSREST"> + <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_0i8bmrc" name="GoToVCPE-RESCUST"> <bpmn2:incoming>SequenceFlow_0zaircn</bpmn2:incoming> - <bpmn2:linkEventDefinition name="vCPE-CUSREST" /> + <bpmn2:linkEventDefinition name="vCPE-RESCUST" /> </bpmn2:intermediateThrowEvent> <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_04bw3vy" name="DeleteBRG"> <bpmn2:outgoing>SequenceFlow_09i2jj0</bpmn2:outgoing> @@ -214,7 +214,7 @@ DeleteVcpeResCustService.prepareServiceDelete(execution)]]></bpmn2:script> <bpmn2:outgoing>SequenceFlow_0zaircn</bpmn2:outgoing> </bpmn2:exclusiveGateway> <bpmn2:sequenceFlow id="SequenceFlow_05cjs89" name="Yes" sourceRef="ExclusiveGateway_0gw5gmo" targetRef="CallActivity_1yap348"> - <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{ execution.getVariable("DELVAS_BRG") == null || execution.getVariable("DELVAS_BRG") == true }]]></bpmn2:conditionExpression> + <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{ execution.getVariable("DVRCS_BRG") == null || execution.getVariable("DVRCS_BRG") == true }]]></bpmn2:conditionExpression> </bpmn2:sequenceFlow> <bpmn2:sequenceFlow id="SequenceFlow_0snq0kw" sourceRef="CallActivity_1yap348" targetRef="ExclusiveGateway_1hmeube" /> <bpmn2:sequenceFlow id="SequenceFlow_09i2jj0" sourceRef="IntermediateCatchEvent_04bw3vy" targetRef="ExclusiveGateway_0gw5gmo" /> @@ -223,7 +223,7 @@ DeleteVcpeResCustService.prepareServiceDelete(execution)]]></bpmn2:script> <bpmn2:sequenceFlow id="SequenceFlow_1jjh8rv" sourceRef="ExclusiveGateway_1hmeube" targetRef="IntermediateThrowEvent_19nq9li" /> <bpmn2:sequenceFlow id="SequenceFlow_0nk8vsb" name="No" sourceRef="ExclusiveGateway_12i24vc" targetRef="ExclusiveGateway_0190r3n" /> <bpmn2:sequenceFlow id="SequenceFlow_0npvfo3" name="Yes" sourceRef="ExclusiveGateway_12i24vc" targetRef="CallActivity_00g5q0n"> - <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{ execution.getVariable("DELVAS_TunnelXConn") == null || execution.getVariable("DELVAS_TunnelXConn") == true }]]></bpmn2:conditionExpression> + <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{ execution.getVariable("DVRCS_TunnelXConn") == null || execution.getVariable("DVRCS_TunnelXConn") == true }]]></bpmn2:conditionExpression> </bpmn2:sequenceFlow> <bpmn2:callActivity id="CallActivity_00g5q0n" name="Delete TXC Allotted Resources " calledElement="DoDeleteAllottedResourceTXC"> <bpmn2:extensionElements> @@ -261,9 +261,9 @@ DeleteVcpeResCustService.prepareServiceDelete(execution)]]></bpmn2:script> <bpmn2:incoming>SequenceFlow_1yamcyn</bpmn2:incoming> <bpmn2:incoming>SequenceFlow_19cxgtm</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_128485i</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infra.scripts.* -def DeleteGenericMacroServiceNetworkVnf= new DeleteGenericMacroServiceNetworkVnf() -DeleteGenericMacroServiceNetworkVnf.prepareVnfAndModulesDelete(execution)]]></bpmn2:script> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.vcpe.scripts.* +def DeleteVcpeResCustService= new DeleteVcpeResCustService() +DeleteVcpeResCustService.prepareVnfAndModulesDelete(execution)]]></bpmn2:script> </bpmn2:scriptTask> <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_1ks536f" name="GoToDeleteTXC"> <bpmn2:incoming>SequenceFlow_1lfph6u</bpmn2:incoming> @@ -286,9 +286,9 @@ DeleteGenericMacroServiceNetworkVnf.prepareVnfAndModulesDelete(execution)]]></bp <bpmn2:scriptTask id="ScriptTask_0wqfeak" name="Validate VNF delete" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_04fys47</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_1o5cutr</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infra.scripts.* -def DeleteGenericMacroServiceNetworkVnf= new DeleteGenericMacroServiceNetworkVnf() -DeleteGenericMacroServiceNetworkVnf.validateVnfDelete(execution)]]></bpmn2:script> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.vcpe.scripts.* +def DeleteVcpeResCustService= new DeleteVcpeResCustService() +DeleteVcpeResCustService.validateVnfDelete(execution)]]></bpmn2:script> </bpmn2:scriptTask> <bpmn2:exclusiveGateway id="ExclusiveGateway_14hjmu4" name="Delete Additional VNFs?" default="SequenceFlow_10scc5r"> <bpmn2:incoming>SequenceFlow_1o5cutr</bpmn2:incoming> @@ -298,10 +298,10 @@ DeleteGenericMacroServiceNetworkVnf.validateVnfDelete(execution)]]></bpmn2:scrip <bpmn2:sequenceFlow id="SequenceFlow_128485i" sourceRef="ScriptTask_1csw2q1" targetRef="CallActivity_14j22w3" /> <bpmn2:sequenceFlow id="SequenceFlow_04fys47" sourceRef="CallActivity_14j22w3" targetRef="ScriptTask_0wqfeak" /> <bpmn2:sequenceFlow id="SequenceFlow_1yamcyn" name="Yes" sourceRef="ExclusiveGateway_0io2vo5" targetRef="ScriptTask_1csw2q1"> - <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DELGMSNV_vnfsCount") > 0}]]></bpmn2:conditionExpression> + <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DVRCS_vnfsCount") > 0}]]></bpmn2:conditionExpression> </bpmn2:sequenceFlow> <bpmn2:sequenceFlow id="SequenceFlow_19cxgtm" name="Yes" sourceRef="ExclusiveGateway_14hjmu4" targetRef="ScriptTask_1csw2q1"> - <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DELGMSNV_vnfsDeletedCountt") < execution.getVariable("DELGMSNV_vnfsCount")}]]></bpmn2:conditionExpression> + <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DVRCS_vnfsDeletedCount") < execution.getVariable("DVRCS_vnfsCount")}]]></bpmn2:conditionExpression> </bpmn2:sequenceFlow> <bpmn2:sequenceFlow id="SequenceFlow_1lfph6u" sourceRef="ExclusiveGateway_1bm1vby" targetRef="IntermediateThrowEvent_1ks536f" /> <bpmn2:sequenceFlow id="SequenceFlow_1ofw0fi" sourceRef="IntermediateCatchEvent_0hy32qu" targetRef="ExclusiveGateway_0io2vo5" /> @@ -748,7 +748,7 @@ DeleteGenericMacroServiceNetworkVnf.validateVnfDelete(execution)]]></bpmn2:scrip <di:waypoint xsi:type="dc:Point" x="974" y="866" /> <di:waypoint xsi:type="dc:Point" x="1059" y="866" /> <bpmndi:BPMNLabel> - <dc:Bounds x="972.5" y="841" width="0" height="12" /> + <dc:Bounds x="971.5" y="845" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1ofw0fi_di" bpmnElement="SequenceFlow_1ofw0fi"> diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateAllottedResourceBRG.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateAllottedResourceBRG.bpmn index c1cb102e47..a35371e97c 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateAllottedResourceBRG.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateAllottedResourceBRG.bpmn @@ -16,7 +16,7 @@ dcar.preProcessRequest(execution)]]></bpmn2:script> <bpmn2:scriptTask id="buildWorkflowException" name="Create Workflow Exception" scriptFormat="groovy"> <bpmn2:incoming>notFound</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.utils.* + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.* ExceptionUtil exceptionUtil = new ExceptionUtil() exceptionUtil.buildWorkflowException(execution, 404, "Input Service Instance Id Not Found in AAI")]]></bpmn2:script> </bpmn2:scriptTask> @@ -207,7 +207,7 @@ dcar.validateSDNCResp(execution, response, "activate" )]]></bpmn2:script> <bpmn2:scriptTask id="ScriptTask_1hzsbck" name="Create Workflow Exception" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_0f7u5pu</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_16o7col</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.utils.* + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.* ExceptionUtil exceptionUtil = new ExceptionUtil() exceptionUtil.buildWorkflowException(execution, 404, "BRG alloted resource Parent ServiceInstance:" + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateAllottedResourceBRGRollback.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateAllottedResourceBRGRollback.bpmn index 380f4fdfa7..698c7b76f6 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateAllottedResourceBRGRollback.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateAllottedResourceBRGRollback.bpmn @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_DkzPAHB4EeaJwpcpVN5gXw" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd"> +<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_DkzPAHB4EeaJwpcpVN5gXw" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.9.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd"> <bpmn2:process id="DoCreateAllottedResourceBRGRollback" name="DoCreateAllottedResourceBRGRollback" isExecutable="true"> <bpmn2:startEvent id="StartEvent_1"> <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing> @@ -55,7 +55,6 @@ rbk.validateSDNCResp(execution, response, "deactivate" )]]></bpmn2:script> </bpmn2:callActivity> <bpmn2:scriptTask id="postProcessSDNCDelete" name="PostProcess SDNC Delete" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_0eb41vb</bpmn2:incoming> - <bpmn2:incoming>SequenceFlow_149adfw</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_0sh1u69</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.vcpe.scripts.* @@ -78,7 +77,6 @@ rbk.validateSDNCResp(execution, response, "delete" )]]></bpmn2:script> </bpmn2:callActivity> <bpmn2:scriptTask id="PostProcessSDNCUnassign" name="PostProcess SDNC Unassign" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_1s7yieq</bpmn2:incoming> - <bpmn2:incoming>SequenceFlow_041l824</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_00i7x43</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.vcpe.scripts.* @@ -110,6 +108,7 @@ rbk.processRollbackException(execution)]]></bpmn2:script> <bpmn2:scriptTask id="DeleteAAIAR" name="Delete AAI AR " scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_00i7x43</bpmn2:incoming> <bpmn2:incoming>SequenceFlow_13mhe5h</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_0m483td</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_03bkrg4</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.vcpe.scripts.* @@ -118,6 +117,7 @@ rbk.deleteAaiAR(execution)]]></bpmn2:script> </bpmn2:scriptTask> <bpmn2:exclusiveGateway id="DeleteSDNC" name="Delete SDNC? " default="SequenceFlow_0m483st"> <bpmn2:incoming>SequenceFlow_0c5h00o</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_0dzz8fp</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_0m483rd</bpmn2:outgoing> <bpmn2:outgoing>SequenceFlow_0m483st</bpmn2:outgoing> </bpmn2:exclusiveGateway> @@ -143,7 +143,7 @@ rbk.updateAaiAROrchStatus(execution, "PendingDelete")]]></bpmn2:script> <bpmn2:sequenceFlow id="SequenceFlow_0m483rd" name="Yes" sourceRef="DeleteSDNC" targetRef="SDNCDelete"> <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("deleteSdnc" ) == "true"}]]></bpmn2:conditionExpression> </bpmn2:sequenceFlow> - <bpmn2:sequenceFlow id="SequenceFlow_0m483st" name="No" sourceRef="DeleteSDNC" targetRef="IntermediateThrowEvent_0apj7jy" /> + <bpmn2:sequenceFlow id="SequenceFlow_0m483st" name="No" sourceRef="DeleteSDNC" targetRef="ExclusiveGateway_0mys1pj" /> <bpmn2:sequenceFlow id="SequenceFlow_0bfuk6l" sourceRef="initialization" targetRef="ExclusiveGateway_1txpz34" /> <bpmn2:sequenceFlow id="SequenceFlow_0xm9g9s" name="No" sourceRef="ExclusiveGateway_1086eg7" targetRef="IntermediateThrowEvent_0lwqzlv" /> <bpmn2:subProcess id="SubProcess_0g5bd80" name="Java Exception Handling Sub Process" triggeredByEvent="true"> @@ -175,6 +175,7 @@ rbk.postProcessRequest(execution)]]></bpmn2:script> </bpmn2:scriptTask> <bpmn2:exclusiveGateway id="ExclusiveGateway_0mys1pj" name="Unassign SDNC?" default="SequenceFlow_0m483td"> <bpmn2:incoming>SequenceFlow_0sh1u69</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_0m483st</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_04hdt5s</bpmn2:outgoing> <bpmn2:outgoing>SequenceFlow_0m483td</bpmn2:outgoing> </bpmn2:exclusiveGateway> @@ -195,11 +196,7 @@ rbk.postProcessRequest(execution)]]></bpmn2:script> <bpmn2:incoming>SequenceFlow_0xm9g9s</bpmn2:incoming> <bpmn2:linkEventDefinition name="AAI Delete" /> </bpmn2:intermediateThrowEvent> - <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_0mdm7ig" name="To AAI Delete"> - <bpmn2:incoming>SequenceFlow_0m483td</bpmn2:incoming> - <bpmn2:linkEventDefinition name="AAI Delete" /> - </bpmn2:intermediateThrowEvent> - <bpmn2:sequenceFlow id="SequenceFlow_0m483td" name="No" sourceRef="ExclusiveGateway_0mys1pj" targetRef="IntermediateThrowEvent_0mdm7ig" /> + <bpmn2:sequenceFlow id="SequenceFlow_0m483td" name="No" sourceRef="ExclusiveGateway_0mys1pj" targetRef="DeleteAAIAR" /> <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_0kdn6a5" name="AAI Delete"> <bpmn2:outgoing>SequenceFlow_13mhe5h</bpmn2:outgoing> <bpmn2:linkEventDefinition name="AAI Delete" /> @@ -222,25 +219,7 @@ rbk.postProcessRequest(execution)]]></bpmn2:script> <bpmn2:sequenceFlow id="SequenceFlow_1fvfplx" name="Yes" sourceRef="ExclusiveGateway_0vw18rq" targetRef="SDNCDeactivate"> <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("deactivateSdnc" ) == "true"}]]></bpmn2:conditionExpression> </bpmn2:sequenceFlow> - <bpmn2:sequenceFlow id="SequenceFlow_0dzz8fp" name="No" sourceRef="ExclusiveGateway_0vw18rq" targetRef="IntermediateThrowEvent_1vkyj76" /> - <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_1vkyj76" name="To SDNC Delete"> - <bpmn2:incoming>SequenceFlow_0dzz8fp</bpmn2:incoming> - <bpmn2:linkEventDefinition name="SDNC Delete" /> - </bpmn2:intermediateThrowEvent> - <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_0apj7jy" name="To SDNC Unassign"> - <bpmn2:incoming>SequenceFlow_0m483st</bpmn2:incoming> - <bpmn2:linkEventDefinition name="SDNC Unassign" /> - </bpmn2:intermediateThrowEvent> - <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_1dkzo0o" name="SDNC Delete"> - <bpmn2:outgoing>SequenceFlow_149adfw</bpmn2:outgoing> - <bpmn2:linkEventDefinition name="SDNC Delete" /> - </bpmn2:intermediateCatchEvent> - <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_0vz52ri" name="SDNC Unassign"> - <bpmn2:outgoing>SequenceFlow_041l824</bpmn2:outgoing> - <bpmn2:linkEventDefinition name="SDNC Unassign" /> - </bpmn2:intermediateCatchEvent> - <bpmn2:sequenceFlow id="SequenceFlow_149adfw" sourceRef="IntermediateCatchEvent_1dkzo0o" targetRef="postProcessSDNCDelete" /> - <bpmn2:sequenceFlow id="SequenceFlow_041l824" sourceRef="IntermediateCatchEvent_0vz52ri" targetRef="PostProcessSDNCUnassign" /> + <bpmn2:sequenceFlow id="SequenceFlow_0dzz8fp" name="No" sourceRef="ExclusiveGateway_0vw18rq" targetRef="DeleteSDNC" /> </bpmn2:process> <bpmn2:error id="Error_1" name="Java Lang Exception" errorCode="java.lang.Exception" /> <bpmn2:error id="Error_2" name="MSO Workflow Exception" errorCode="MSOWorkflowException" /> @@ -413,11 +392,12 @@ rbk.postProcessRequest(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0ue1x4e_di" bpmnElement="SequenceFlow_0m483st"> - <di:waypoint xsi:type="dc:Point" x="223" y="810" /> - <di:waypoint xsi:type="dc:Point" x="224" y="836" /> - <di:waypoint xsi:type="dc:Point" x="224" y="868" /> + <di:waypoint xsi:type="dc:Point" x="222" y="811" /> + <di:waypoint xsi:type="dc:Point" x="222" y="889" /> + <di:waypoint xsi:type="dc:Point" x="355" y="889" /> + <di:waypoint xsi:type="dc:Point" x="481" y="796" /> <bpmndi:BPMNLabel> - <dc:Bounds x="205" y="825.0864835800907" width="14" height="14" /> + <dc:Bounds x="227.96243516445685" y="823.5028190473831" width="14" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0bfuk6l_di" bpmnElement="SequenceFlow_0bfuk6l"> @@ -522,17 +502,13 @@ rbk.postProcessRequest(execution)]]></bpmn2:script> <dc:Bounds x="473" y="277" width="67" height="14" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="IntermediateThrowEvent_0mdm7ig_di" bpmnElement="IntermediateThrowEvent_0mdm7ig"> - <dc:Bounds x="476" y="872" width="36" height="36" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="460" y="911" width="67" height="14" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0m483td_di" bpmnElement="SequenceFlow_0m483td"> <di:waypoint xsi:type="dc:Point" x="495" y="810" /> - <di:waypoint xsi:type="dc:Point" x="494" y="872" /> + <di:waypoint xsi:type="dc:Point" x="495" y="890" /> + <di:waypoint xsi:type="dc:Point" x="640" y="890" /> + <di:waypoint xsi:type="dc:Point" x="787" y="809" /> <bpmndi:BPMNLabel> - <dc:Bounds x="510" y="803" width="14" height="14" /> + <dc:Bounds x="502.01898797901157" y="825.6730723011344" width="14" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="IntermediateCatchEvent_0kdn6a5_di" bpmnElement="IntermediateCatchEvent_0kdn6a5"> @@ -587,47 +563,11 @@ rbk.postProcessRequest(execution)]]></bpmn2:script> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0dzz8fp_di" bpmnElement="SequenceFlow_0dzz8fp"> <di:waypoint xsi:type="dc:Point" x="-54" y="810" /> - <di:waypoint xsi:type="dc:Point" x="-54" y="863" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="-46" y="792.5" width="14" height="14" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="IntermediateThrowEvent_1vkyj76_di" bpmnElement="IntermediateThrowEvent_1vkyj76"> - <dc:Bounds x="-72" y="863" width="36" height="36" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="-78" y="901" width="79" height="14" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="IntermediateThrowEvent_0apj7jy_di" bpmnElement="IntermediateThrowEvent_0apj7jy"> - <dc:Bounds x="206" y="871" width="36" height="36" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="200" y="908" width="47" height="26" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="IntermediateCatchEvent_1dkzo0o_di" bpmnElement="IntermediateCatchEvent_1dkzo0o"> - <dc:Bounds x="341" y="876" width="36" height="36" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="325" y="916" width="65" height="14" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="IntermediateCatchEvent_0vz52ri_di" bpmnElement="IntermediateCatchEvent_0vz52ri"> - <dc:Bounds x="622" y="872" width="36" height="36" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="599" y="912" width="80" height="14" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="SequenceFlow_149adfw_di" bpmnElement="SequenceFlow_149adfw"> - <di:waypoint xsi:type="dc:Point" x="359" y="876" /> - <di:waypoint xsi:type="dc:Point" x="359" y="825" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="374" y="850.5" width="0" height="0" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="SequenceFlow_041l824_di" bpmnElement="SequenceFlow_041l824"> - <di:waypoint xsi:type="dc:Point" x="640" y="872" /> - <di:waypoint xsi:type="dc:Point" x="640" y="825" /> + <di:waypoint xsi:type="dc:Point" x="-54" y="894" /> + <di:waypoint xsi:type="dc:Point" x="93" y="894" /> + <di:waypoint xsi:type="dc:Point" x="208" y="797" /> <bpmndi:BPMNLabel> - <dc:Bounds x="655" y="848.5" width="0" height="0" /> + <dc:Bounds x="-43.999999999999986" y="825" width="14" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> </bpmndi:BPMNPlane> diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateAllottedResourceTXC.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateAllottedResourceTXC.bpmn index 7978ea6220..178534f797 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateAllottedResourceTXC.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateAllottedResourceTXC.bpmn @@ -16,7 +16,7 @@ dcar.preProcessRequest(execution)]]></bpmn2:script> <bpmn2:scriptTask id="buildWorkflowException" name="Create Workflow Exception" scriptFormat="groovy"> <bpmn2:incoming>notFound</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.utils.* + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.* ExceptionUtil exceptionUtil = new ExceptionUtil() exceptionUtil.buildWorkflowException(execution, 404, "Input Service Instance Id Not Found in AAI")]]></bpmn2:script> </bpmn2:scriptTask> @@ -207,7 +207,7 @@ dcar.validateSDNCResp(execution, response, "activate" )]]></bpmn2:script> <bpmn2:scriptTask id="ScriptTask_1hzsbck" name="Create Workflow Exception" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_0f7u5pu</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_16o7col</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.utils.* + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.* ExceptionUtil exceptionUtil = new ExceptionUtil() exceptionUtil.buildWorkflowException(execution, 404, "TunnelXConn alloted resource Parent ServiceInstance:" + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateAllottedResourceTXCRollback.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateAllottedResourceTXCRollback.bpmn index 1c31913e4e..595d7f5628 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateAllottedResourceTXCRollback.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateAllottedResourceTXCRollback.bpmn @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_DkzPAHB4EeaJwpcpVN5gXw" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd"> +<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_DkzPAHB4EeaJwpcpVN5gXw" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.9.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd"> <bpmn2:process id="DoCreateAllottedResourceTXCRollback" name="DoCreateAllottedResourceTXCRollback" isExecutable="true"> <bpmn2:startEvent id="StartEvent_1"> <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing> @@ -55,7 +55,6 @@ rbk.validateSDNCResp(execution, response, "deactivate" )]]></bpmn2:script> </bpmn2:callActivity> <bpmn2:scriptTask id="postProcessSDNCDelete" name="PostProcess SDNC Delete" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_0eb41vb</bpmn2:incoming> - <bpmn2:incoming>SequenceFlow_149adfw</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_0sh1u69</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.vcpe.scripts.* @@ -78,7 +77,6 @@ rbk.validateSDNCResp(execution, response, "delete" )]]></bpmn2:script> </bpmn2:callActivity> <bpmn2:scriptTask id="PostProcessSDNCUnassign" name="PostProcess SDNC Unassign" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_1s7yieq</bpmn2:incoming> - <bpmn2:incoming>SequenceFlow_041l824</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_00i7x43</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.vcpe.scripts.* @@ -110,6 +108,7 @@ rbk.processRollbackException(execution)]]></bpmn2:script> <bpmn2:scriptTask id="DeleteAAIAR" name="Delete AAI AR " scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_00i7x43</bpmn2:incoming> <bpmn2:incoming>SequenceFlow_13mhe5h</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_0m483td</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_03bkrg4</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.vcpe.scripts.* @@ -118,6 +117,7 @@ rbk.deleteAaiAR(execution)]]></bpmn2:script> </bpmn2:scriptTask> <bpmn2:exclusiveGateway id="DeleteSDNC" name="Delete SDNC? " default="SequenceFlow_0m483st"> <bpmn2:incoming>SequenceFlow_0c5h00o</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_0dzz8fp</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_0m483rd</bpmn2:outgoing> <bpmn2:outgoing>SequenceFlow_0m483st</bpmn2:outgoing> </bpmn2:exclusiveGateway> @@ -143,7 +143,7 @@ rbk.updateAaiAROrchStatus(execution, "PendingDelete")]]></bpmn2:script> <bpmn2:sequenceFlow id="SequenceFlow_0m483rd" name="Yes" sourceRef="DeleteSDNC" targetRef="SDNCDelete"> <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("deleteSdnc" ) == "true"}]]></bpmn2:conditionExpression> </bpmn2:sequenceFlow> - <bpmn2:sequenceFlow id="SequenceFlow_0m483st" name="No" sourceRef="DeleteSDNC" targetRef="IntermediateThrowEvent_0apj7jy" /> + <bpmn2:sequenceFlow id="SequenceFlow_0m483st" name="No" sourceRef="DeleteSDNC" targetRef="ExclusiveGateway_0mys1pj" /> <bpmn2:sequenceFlow id="SequenceFlow_0bfuk6l" sourceRef="initialization" targetRef="ExclusiveGateway_1txpz34" /> <bpmn2:sequenceFlow id="SequenceFlow_0xm9g9s" name="No" sourceRef="ExclusiveGateway_1086eg7" targetRef="IntermediateThrowEvent_0lwqzlv" /> <bpmn2:subProcess id="SubProcess_0g5bd80" name="Java Exception Handling Sub Process" triggeredByEvent="true"> @@ -175,6 +175,7 @@ rbk.postProcessRequest(execution)]]></bpmn2:script> </bpmn2:scriptTask> <bpmn2:exclusiveGateway id="ExclusiveGateway_0mys1pj" name="Unassign SDNC?" default="SequenceFlow_0m483td"> <bpmn2:incoming>SequenceFlow_0sh1u69</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_0m483st</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_04hdt5s</bpmn2:outgoing> <bpmn2:outgoing>SequenceFlow_0m483td</bpmn2:outgoing> </bpmn2:exclusiveGateway> @@ -195,11 +196,7 @@ rbk.postProcessRequest(execution)]]></bpmn2:script> <bpmn2:incoming>SequenceFlow_0xm9g9s</bpmn2:incoming> <bpmn2:linkEventDefinition name="AAI Delete" /> </bpmn2:intermediateThrowEvent> - <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_0mdm7ig" name="To AAI Delete"> - <bpmn2:incoming>SequenceFlow_0m483td</bpmn2:incoming> - <bpmn2:linkEventDefinition name="AAI Delete" /> - </bpmn2:intermediateThrowEvent> - <bpmn2:sequenceFlow id="SequenceFlow_0m483td" name="No" sourceRef="ExclusiveGateway_0mys1pj" targetRef="IntermediateThrowEvent_0mdm7ig" /> + <bpmn2:sequenceFlow id="SequenceFlow_0m483td" name="No" sourceRef="ExclusiveGateway_0mys1pj" targetRef="DeleteAAIAR" /> <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_0kdn6a5" name="AAI Delete"> <bpmn2:outgoing>SequenceFlow_13mhe5h</bpmn2:outgoing> <bpmn2:linkEventDefinition name="AAI Delete" /> @@ -222,25 +219,7 @@ rbk.postProcessRequest(execution)]]></bpmn2:script> <bpmn2:sequenceFlow id="SequenceFlow_1fvfplx" name="Yes" sourceRef="ExclusiveGateway_0vw18rq" targetRef="SDNCDeactivate"> <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("deactivateSdnc" ) == "true"}]]></bpmn2:conditionExpression> </bpmn2:sequenceFlow> - <bpmn2:sequenceFlow id="SequenceFlow_0dzz8fp" name="No" sourceRef="ExclusiveGateway_0vw18rq" targetRef="IntermediateThrowEvent_1vkyj76" /> - <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_1vkyj76" name="To SDNC Delete"> - <bpmn2:incoming>SequenceFlow_0dzz8fp</bpmn2:incoming> - <bpmn2:linkEventDefinition name="SDNC Delete" /> - </bpmn2:intermediateThrowEvent> - <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_0apj7jy" name="To SDNC Unassign"> - <bpmn2:incoming>SequenceFlow_0m483st</bpmn2:incoming> - <bpmn2:linkEventDefinition name="SDNC Unassign" /> - </bpmn2:intermediateThrowEvent> - <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_1dkzo0o" name="SDNC Delete"> - <bpmn2:outgoing>SequenceFlow_149adfw</bpmn2:outgoing> - <bpmn2:linkEventDefinition name="SDNC Delete" /> - </bpmn2:intermediateCatchEvent> - <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_0vz52ri" name="SDNC Unassign"> - <bpmn2:outgoing>SequenceFlow_041l824</bpmn2:outgoing> - <bpmn2:linkEventDefinition name="SDNC Unassign" /> - </bpmn2:intermediateCatchEvent> - <bpmn2:sequenceFlow id="SequenceFlow_149adfw" sourceRef="IntermediateCatchEvent_1dkzo0o" targetRef="postProcessSDNCDelete" /> - <bpmn2:sequenceFlow id="SequenceFlow_041l824" sourceRef="IntermediateCatchEvent_0vz52ri" targetRef="PostProcessSDNCUnassign" /> + <bpmn2:sequenceFlow id="SequenceFlow_0dzz8fp" name="No" sourceRef="ExclusiveGateway_0vw18rq" targetRef="DeleteSDNC" /> </bpmn2:process> <bpmn2:error id="Error_1" name="Java Lang Exception" errorCode="java.lang.Exception" /> <bpmn2:error id="Error_2" name="MSO Workflow Exception" errorCode="MSOWorkflowException" /> @@ -413,11 +392,12 @@ rbk.postProcessRequest(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0ue1x4e_di" bpmnElement="SequenceFlow_0m483st"> - <di:waypoint xsi:type="dc:Point" x="223" y="810" /> - <di:waypoint xsi:type="dc:Point" x="224" y="836" /> - <di:waypoint xsi:type="dc:Point" x="224" y="868" /> + <di:waypoint xsi:type="dc:Point" x="222" y="811" /> + <di:waypoint xsi:type="dc:Point" x="222" y="891" /> + <di:waypoint xsi:type="dc:Point" x="358" y="891" /> + <di:waypoint xsi:type="dc:Point" x="481" y="796" /> <bpmndi:BPMNLabel> - <dc:Bounds x="205" y="825.0864835800907" width="14" height="14" /> + <dc:Bounds x="232.20103151493018" y="822.2200886262924" width="14" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0bfuk6l_di" bpmnElement="SequenceFlow_0bfuk6l"> @@ -522,17 +502,13 @@ rbk.postProcessRequest(execution)]]></bpmn2:script> <dc:Bounds x="473" y="277" width="67" height="14" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="IntermediateThrowEvent_0mdm7ig_di" bpmnElement="IntermediateThrowEvent_0mdm7ig"> - <dc:Bounds x="476" y="872" width="36" height="36" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="460" y="911" width="67" height="14" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0m483td_di" bpmnElement="SequenceFlow_0m483td"> <di:waypoint xsi:type="dc:Point" x="495" y="810" /> - <di:waypoint xsi:type="dc:Point" x="494" y="872" /> + <di:waypoint xsi:type="dc:Point" x="495" y="890" /> + <di:waypoint xsi:type="dc:Point" x="639" y="890" /> + <di:waypoint xsi:type="dc:Point" x="787" y="802" /> <bpmndi:BPMNLabel> - <dc:Bounds x="510" y="803" width="14" height="14" /> + <dc:Bounds x="503.0189879790115" y="823.6755392339563" width="14" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="IntermediateCatchEvent_0kdn6a5_di" bpmnElement="IntermediateCatchEvent_0kdn6a5"> @@ -587,47 +563,11 @@ rbk.postProcessRequest(execution)]]></bpmn2:script> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0dzz8fp_di" bpmnElement="SequenceFlow_0dzz8fp"> <di:waypoint xsi:type="dc:Point" x="-54" y="810" /> - <di:waypoint xsi:type="dc:Point" x="-54" y="863" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="-46" y="792.5" width="14" height="14" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="IntermediateThrowEvent_1vkyj76_di" bpmnElement="IntermediateThrowEvent_1vkyj76"> - <dc:Bounds x="-72" y="863" width="36" height="36" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="-78" y="901" width="79" height="14" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="IntermediateThrowEvent_0apj7jy_di" bpmnElement="IntermediateThrowEvent_0apj7jy"> - <dc:Bounds x="206" y="871" width="36" height="36" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="200" y="908" width="47" height="26" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="IntermediateCatchEvent_1dkzo0o_di" bpmnElement="IntermediateCatchEvent_1dkzo0o"> - <dc:Bounds x="341" y="876" width="36" height="36" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="325" y="916" width="65" height="14" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="IntermediateCatchEvent_0vz52ri_di" bpmnElement="IntermediateCatchEvent_0vz52ri"> - <dc:Bounds x="622" y="872" width="36" height="36" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="599" y="912" width="80" height="14" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="SequenceFlow_149adfw_di" bpmnElement="SequenceFlow_149adfw"> - <di:waypoint xsi:type="dc:Point" x="359" y="876" /> - <di:waypoint xsi:type="dc:Point" x="359" y="825" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="374" y="850.5" width="0" height="0" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="SequenceFlow_041l824_di" bpmnElement="SequenceFlow_041l824"> - <di:waypoint xsi:type="dc:Point" x="640" y="872" /> - <di:waypoint xsi:type="dc:Point" x="640" y="825" /> + <di:waypoint xsi:type="dc:Point" x="-54" y="892" /> + <di:waypoint xsi:type="dc:Point" x="92" y="892" /> + <di:waypoint xsi:type="dc:Point" x="208" y="797" /> <bpmndi:BPMNLabel> - <dc:Bounds x="655" y="848.5" width="0" height="0" /> + <dc:Bounds x="-48.00000000000003" y="827" width="14" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> </bpmndi:BPMNPlane> |