diff options
Diffstat (limited to 'bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess')
20 files changed, 2939 insertions, 1489 deletions
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateNetworkInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateNetworkInstance.bpmn index 5488350afc..24ccc4d514 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateNetworkInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateNetworkInstance.bpmn @@ -158,13 +158,13 @@ DoCreateNetworkInstance.prepareSDNCRollbackRequest(execution)]]></bpmn2:script> <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("CRENWKI_isSdncActivateRollbackNeeded" ) == true}]]></bpmn2:conditionExpression> </bpmn2:sequenceFlow> <bpmn2:sequenceFlow id="SequenceFlow_12tlymf" name="No" sourceRef="isSDNCActivate_ExclusiveGateway" targetRef="ExclusiveGateway_1bk0tqd" /> - <bpmn2:exclusiveGateway id="isSdncRpc4_ExclusiveGateway4" name="is '1702' SNDC Call?" default="isSdncRpc4No_SequenceFlow4"> + <bpmn2:exclusiveGateway id="isSdncRpc4_ExclusiveGateway4" name="is not '1610' SNDC Call?" default="isSdncRpc4No_SequenceFlow4"> <bpmn2:incoming>sdncOk_Yeso_ExclusiveGateway</bpmn2:incoming> <bpmn2:outgoing>isSdncRpc4Yes_SequenceFlow4</bpmn2:outgoing> <bpmn2:outgoing>isSdncRpc4No_SequenceFlow4</bpmn2:outgoing> </bpmn2:exclusiveGateway> <bpmn2:sequenceFlow id="isSdncRpc4Yes_SequenceFlow4" name="Yes" sourceRef="isSdncRpc4_ExclusiveGateway4" targetRef="Task_0q6pzpn"> - <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("sdncVersion") == '1702'} ]]></bpmn2:conditionExpression> + <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("sdncVersion") != '1610'} ]]></bpmn2:conditionExpression> </bpmn2:sequenceFlow> <bpmn2:sequenceFlow id="isSdncRpc4No_SequenceFlow4" name="No" sourceRef="isSdncRpc4_ExclusiveGateway4" targetRef="prepareSDNCRollbackRequest_ScriptTask" /> <bpmn2:scriptTask id="Task_0q6pzpn" name="Prepare RSRC SDNCRollback Request" scriptFormat="groovy"> @@ -364,16 +364,11 @@ DoCreateNetworkInstance.callRESTQueryAAINetworkName(execution)]]></bpmn2:script> <bpmn2:sequenceFlow id="siFoundNo" name="No" sourceRef="siFoundCheck" targetRef="workflowExceptionSINotFound" /> <bpmn2:scriptTask id="workflowExceptionSINotFound" name="Create Workflow Exception" scriptFormat="groovy"> <bpmn2:incoming>siFoundNo</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_30</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.utils.* + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.* ExceptionUtil exceptionUtil = new ExceptionUtil() -exceptionUtil.buildWorkflowException(execution, 404, "Service Instance Not Found")]]></bpmn2:script> +exceptionUtil.buildAndThrowWorkflowException(execution, 404, "Service Instance Not Found") +]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_30" name="" sourceRef="workflowExceptionSINotFound" targetRef="EndEvent_2" /> - <bpmn2:endEvent id="EndEvent_2"> - <bpmn2:incoming>SequenceFlow_30</bpmn2:incoming> - <bpmn2:errorEventDefinition id="_ErrorEventDefinition_97" errorRef="Error_2" /> - </bpmn2:endEvent> <bpmn2:scriptTask id="callRESTQueryVpnBinding_ScriptTask" name="Call REST Query Vpn Binding in AAI" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_16</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_15</bpmn2:outgoing> @@ -474,14 +469,14 @@ DoCreateNetworkInstance.validateRpcSDNCActivateResponse(execution)]]></bpmn2:scr <bpmn2:incoming>SequenceFlow_0s51ns0</bpmn2:incoming> <bpmn2:errorEventDefinition errorRef="Error_2" /> </bpmn2:endEvent> - <bpmn2:exclusiveGateway id="isSdncRpc1_ExclusiveGateway1" name="is '1702' SNDC Call?" default="isSdncRpc1No_SequenceFlow1"> + <bpmn2:exclusiveGateway id="isSdncRpc1_ExclusiveGateway1" name="is not '1610' SNDC Call?" default="isSdncRpc1No_SequenceFlow1"> <bpmn2:incoming>SequenceFlow_32</bpmn2:incoming> <bpmn2:outgoing>isSdncRpc1No_SequenceFlow1</bpmn2:outgoing> <bpmn2:outgoing>isSdncRpc1Yes_SequenceFlow1</bpmn2:outgoing> </bpmn2:exclusiveGateway> <bpmn2:sequenceFlow id="isSdncRpc1No_SequenceFlow1" name="No" sourceRef="isSdncRpc1_ExclusiveGateway1" targetRef="prepareSDNCTopoRequest_ScriptTask" /> <bpmn2:sequenceFlow id="isSdncRpc1Yes_SequenceFlow1" name="Yes" sourceRef="isSdncRpc1_ExclusiveGateway1" targetRef="Task_10lubzj"> - <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("sdncVersion") == '1702'} ]]></bpmn2:conditionExpression> + <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("sdncVersion") != '1610'} ]]></bpmn2:conditionExpression> </bpmn2:sequenceFlow> <bpmn2:callActivity id="Task_0pbtywn" name="Call SDNC RSRC Assign Adapter V1 " calledElement="sdncAdapter"> <bpmn2:extensionElements> @@ -498,13 +493,13 @@ DoCreateNetworkInstance.validateRpcSDNCActivateResponse(execution)]]></bpmn2:scr </bpmn2:callActivity> <bpmn2:sequenceFlow id="SequenceFlow_0j8bxnb" sourceRef="Task_10lubzj" targetRef="Task_0pbtywn" /> <bpmn2:sequenceFlow id="SequenceFlow_0d93bqw" sourceRef="Task_0pbtywn" targetRef="validateSDNCResponse_ScriptTask" /> - <bpmn2:exclusiveGateway id="isSdncRpc2_ExclusiveGateway2" name="is '1702' SNDC Call?" default="isSdncRpc2No_SequenceFlow2"> + <bpmn2:exclusiveGateway id="isSdncRpc2_ExclusiveGateway2" name="is not '1610' SNDC Call?" default="isSdncRpc2No_SequenceFlow2"> <bpmn2:incoming>SequenceFlow_1ipz2ze</bpmn2:incoming> <bpmn2:outgoing>isSdncRpc2Yes_SequenceFlow2</bpmn2:outgoing> <bpmn2:outgoing>isSdncRpc2No_SequenceFlow2</bpmn2:outgoing> </bpmn2:exclusiveGateway> <bpmn2:sequenceFlow id="isSdncRpc2Yes_SequenceFlow2" name="Yes" sourceRef="isSdncRpc2_ExclusiveGateway2" targetRef="Task_1rd6dg6"> - <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("sdncVersion") == '1702'} ]]></bpmn2:conditionExpression> + <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("sdncVersion") != '1610'} ]]></bpmn2:conditionExpression> </bpmn2:sequenceFlow> <bpmn2:sequenceFlow id="isSdncRpc2No_SequenceFlow2" name="No" sourceRef="isSdncRpc2_ExclusiveGateway2" targetRef="Task_0zzobg6" /> <bpmn2:scriptTask id="Task_10lubzj" name="Prepare Assign SDNC RPC Request" scriptFormat="groovy"> @@ -925,12 +920,6 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script> <dc:Bounds x="851" y="319" width="18" height="13" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="_BPMNShape_EndEvent_247" bpmnElement="EndEvent_2"> - <dc:Bounds x="791" y="527" width="36" height="36" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="809" y="568" width="0" height="0" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_331" bpmnElement="workflowExceptionSINotFound"> <dc:Bounds x="759" y="395" width="100" height="80" /> </bpmndi:BPMNShape> @@ -941,13 +930,6 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script> <dc:Bounds x="823" y="340.55618916742606" width="14" height="13" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_21" bpmnElement="SequenceFlow_30" sourceElement="_BPMNShape_ScriptTask_331" targetElement="_BPMNShape_EndEvent_247"> - <di:waypoint xsi:type="dc:Point" x="809" y="475" /> - <di:waypoint xsi:type="dc:Point" x="809" y="527" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="824" y="501" width="0" height="0" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_333" bpmnElement="callRESTQueryNetworkTableRef_ScriptTask"> <dc:Bounds x="1454" y="879" width="100" height="80" /> </bpmndi:BPMNShape> @@ -1097,7 +1079,7 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script> <bpmndi:BPMNShape id="ExclusiveGateway_1ts3ph0_di" bpmnElement="isSdncRpc1_ExclusiveGateway1" isMarkerVisible="true"> <dc:Bounds x="1337.228" y="291" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1394" y="304" width="76" height="24" /> + <dc:Bounds x="1401" y="304" width="61" height="24" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1r5sja0_di" bpmnElement="isSdncRpc1No_SequenceFlow1"> @@ -1135,7 +1117,7 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script> <bpmndi:BPMNShape id="ExclusiveGateway_00dh41t_di" bpmnElement="isSdncRpc4_ExclusiveGateway4" isMarkerVisible="true"> <dc:Bounds x="713" y="751" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="707" y="710" width="76" height="24" /> + <dc:Bounds x="714" y="710" width="61" height="24" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0suu90e_di" bpmnElement="isSdncRpc4Yes_SequenceFlow4"> @@ -1156,7 +1138,7 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script> <bpmndi:BPMNShape id="ExclusiveGateway_1gghe34_di" bpmnElement="isSdncRpc2_ExclusiveGateway2" isMarkerVisible="true"> <dc:Bounds x="1360" y="1553" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1347" y="1619" width="76" height="24" /> + <dc:Bounds x="1343" y="1619" width="83" height="36" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1lphs99_di" bpmnElement="isSdncRpc2Yes_SequenceFlow2"> diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateNetworkInstanceRollback.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateNetworkInstanceRollback.bpmn index 00ef41c168..eb60d42c2b 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateNetworkInstanceRollback.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateNetworkInstanceRollback.bpmn @@ -97,7 +97,7 @@ DoCreateNetworkInstanceRollback.validateRollbackResponses(execution)]]></bpmn:sc <bpmn:sequenceFlow id="SequenceFlow_17o4w67" sourceRef="ServiceTask_0bqh5yl" targetRef="ExclusiveGateway_1n5jck8" /> <bpmn:sequenceFlow id="SequenceFlow_101y57s" name="No" sourceRef="ExclusiveGateway_17g4q5c" targetRef="CallActivity_1xilevb" /> <bpmn:sequenceFlow id="SequenceFlow_0mw0dgd" name="Yes" sourceRef="ExclusiveGateway_17g4q5c" targetRef="CallActivity_0kbwa1x"> - <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("sdncVersion") == '1702'} ]]></bpmn:conditionExpression> + <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("sdncVersion") != '1610'} ]]></bpmn:conditionExpression> </bpmn:sequenceFlow> <bpmn:endEvent id="EndEvent_1fvr7ad"> <bpmn:incoming>SequenceFlow_0yto4gz</bpmn:incoming> @@ -514,4 +514,4 @@ wasDeleted </bpmndi:BPMNShape> </bpmndi:BPMNPlane> </bpmndi:BPMNDiagram> -</bpmn:definitions> +</bpmn:definitions>
\ No newline at end of file diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModule.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModule.bpmn index fecb720666..5383dc871e 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModule.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModule.bpmn @@ -37,9 +37,7 @@ <bpmn2:outgoing>SequenceFlow_21</bpmn2:outgoing>
</bpmn2:exclusiveGateway>
<bpmn2:sequenceFlow id="SequenceFlow_19" name="yes" sourceRef="IsVolumeGroupNameSpecified" targetRef="ConfirmVolumeName">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def doCreateVfModule = new DoCreateVfModule()
-return doCreateVfModule.isVolumeGroupNamePresent(execution)]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFM_volumeGroupName") != null && execution.getVariable("DCVFM_volumeGroupName") != "" }]]></bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:sequenceFlow id="SequenceFlow_21" name="no" sourceRef="IsVolumeGroupNameSpecified" targetRef="ExclusiveGateway_4" />
<bpmn2:callActivity id="ConfirmVolumeName" name="Confirm Volume Group Name" calledElement="ConfirmVolumeGroupName">
@@ -180,9 +178,7 @@ doCreateVfModule.validateSDNCResponse(execution, response, "activate")]]></bpmn2 <bpmn2:outgoing>SequenceFlow_30</bpmn2:outgoing>
</bpmn2:exclusiveGateway>
<bpmn2:sequenceFlow id="SequenceFlow_28" name="yes" sourceRef="ExclusiveGateway_5" targetRef="PrepareCreateAAIVfModuleVolumeGroupRequest">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def doCreateVfModule = new DoCreateVfModule()
-return doCreateVfModule.isVolumeGroupIdPresent(execution)]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFM_volumeGroupId") != null && execution.getVariable("DCVFM_volumeGroupId") != "" }]]></bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:sequenceFlow id="SequenceFlow_30" name="no" sourceRef="ExclusiveGateway_5" targetRef="ExclusiveGateway_6" />
<bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="PreProcessUpdateAAIVfModule_1" targetRef="UpdateAAIVfModule_1" />
@@ -314,29 +310,9 @@ def doCreateVfModule = new DoCreateVfModule() return doCreateVfModule.queryCloudRegion(execution)]]></bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_40" name="yes" sourceRef="IsVolumeGroupIdSpecified" targetRef="QueryCloudRegion">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def doCreateVfModule = new DoCreateVfModule()
-return doCreateVfModule.isVolumeGroupIdPresent(execution)]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFM_volumeGroupId") != null && execution.getVariable("DCVFM_volumeGroupId") != "" }]]></bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:sequenceFlow id="SequenceFlow_43" name="" sourceRef="QueryCloudRegion" targetRef="ConfirmVolumeGroupTenant" />
- <bpmn2:subProcess id="SubProcess_1" name="Error Handling Sub Process" triggeredByEvent="true">
- <bpmn2:scriptTask id="ScriptTask_1" name="Process Error" scriptFormat="groovy">
- <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming>
- <bpmn2:outgoing>SequenceFlow_38</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.processBPMNException(execution)]]></bpmn2:script>
- </bpmn2:scriptTask>
- <bpmn2:sequenceFlow id="SequenceFlow_38" name="" sourceRef="ScriptTask_1" targetRef="EndEvent_2" />
- <bpmn2:startEvent id="StartEvent_2">
- <bpmn2:outgoing>SequenceFlow_9</bpmn2:outgoing>
- <bpmn2:errorEventDefinition id="ErrorEventDefinition_1" />
- </bpmn2:startEvent>
- <bpmn2:sequenceFlow id="SequenceFlow_9" name="" sourceRef="StartEvent_2" targetRef="ScriptTask_1" />
- <bpmn2:endEvent id="EndEvent_2">
- <bpmn2:incoming>SequenceFlow_38</bpmn2:incoming>
- </bpmn2:endEvent>
- </bpmn2:subProcess>
<bpmn2:scriptTask id="PreProcessRequest" name="Pre-Process Request" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
@@ -354,7 +330,7 @@ doCreateVfModule.preProcessRequest(execution)]]></bpmn2:script> <bpmn2:extensionElements>
<camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
<camunda:in source="isVidRequest" target="isVidRequest" />
- <camunda:in source="newVfModuleId" target="newVfModuleId" />
+ <camunda:in source="DCVFM_vfModuleId" target="newVfModuleId" />
<camunda:out source="WorkflowException" target="WorkflowException" />
<camunda:out source="CreateAAIVfModuleResponse" target="DCVFM_createVfModuleResponse" />
<camunda:in source="DCVFM_vnfId" target="vnfId" />
@@ -498,6 +474,64 @@ doCreateVfModule.validateSDNCResponse(execution, response, "get")]]></bpmn2:scri <bpmn2:incoming>SequenceFlow_05og7iw</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_1f53tby</bpmn2:outgoing>
</bpmn2:callActivity>
+ <bpmn2:subProcess id="SubProcess_0ltzufk" name="Sub-process for Application Errors" triggeredByEvent="true">
+ <bpmn2:startEvent id="StartEvent_18lzc5m">
+ <bpmn2:outgoing>SequenceFlow_02lc25j</bpmn2:outgoing>
+ <bpmn2:errorEventDefinition errorRef="Error_1" />
+ </bpmn2:startEvent>
+ <bpmn2:endEvent id="EndEvent_0wsdptv">
+ <bpmn2:incoming>SequenceFlow_0z2rczk</bpmn2:incoming>
+ <bpmn2:incoming>SequenceFlow_1pgo10r</bpmn2:incoming>
+ </bpmn2:endEvent>
+ <bpmn2:callActivity id="CallDoCreateVfModuleRollback" name="Call DoCreateVfModuleRollback" calledElement="DoCreateVfModuleRollback">
+ <bpmn2:extensionElements>
+ <camunda:in source="rollbackData" target="rollbackData" />
+ <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
+ <camunda:in source="isVidRequest" target="isVidRequest" />
+ <camunda:out source="rolledBack" target="rolledBack" />
+ <camunda:out source="rollbackError" target="rollbackError" />
+ <camunda:in source="disableRollback" target="disableRollback" />
+ <camunda:in source="sdncVersion" target="sdncVersion" />
+ </bpmn2:extensionElements>
+ <bpmn2:incoming>SequenceFlow_1i1q78e</bpmn2:incoming>
+ <bpmn2:outgoing>SequenceFlow_0112l2c</bpmn2:outgoing>
+ </bpmn2:callActivity>
+ <bpmn2:scriptTask id="PreProcessRollback" name="Pre Process Rollback" scriptFormat="groovy">
+ <bpmn2:incoming>SequenceFlow_04bd5in</bpmn2:incoming>
+ <bpmn2:outgoing>SequenceFlow_1i1q78e</bpmn2:outgoing>
+ <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def doCreateVfModule = new DoCreateVfModule()
+doCreateVfModule.preProcessRollback(execution)]]></bpmn2:script>
+ </bpmn2:scriptTask>
+ <bpmn2:scriptTask id="PostProcessRollback" name="Post Process Rollback" scriptFormat="groovy">
+ <bpmn2:incoming>SequenceFlow_0112l2c</bpmn2:incoming>
+ <bpmn2:outgoing>SequenceFlow_0z2rczk</bpmn2:outgoing>
+ <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def doCreateVfModule = new DoCreateVfModule()
+doCreateVfModule.postProcessRollback(execution)]]></bpmn2:script>
+ </bpmn2:scriptTask>
+ <bpmn2:sequenceFlow id="SequenceFlow_02lc25j" sourceRef="StartEvent_18lzc5m" targetRef="ExclusiveGateway_039bib8" />
+ <bpmn2:sequenceFlow id="SequenceFlow_0z2rczk" sourceRef="PostProcessRollback" targetRef="EndEvent_0wsdptv" />
+ <bpmn2:sequenceFlow id="SequenceFlow_1i1q78e" sourceRef="PreProcessRollback" targetRef="CallDoCreateVfModuleRollback" />
+ <bpmn2:sequenceFlow id="SequenceFlow_0112l2c" sourceRef="CallDoCreateVfModuleRollback" targetRef="PostProcessRollback" />
+ <bpmn2:exclusiveGateway id="ExclusiveGateway_039bib8" name="Disable Rollback?" default="SequenceFlow_04bd5in">
+ <bpmn2:incoming>SequenceFlow_02lc25j</bpmn2:incoming>
+ <bpmn2:outgoing>SequenceFlow_04bd5in</bpmn2:outgoing>
+ <bpmn2:outgoing>SequenceFlow_1nh7m8d</bpmn2:outgoing>
+ </bpmn2:exclusiveGateway>
+ <bpmn2:sequenceFlow id="SequenceFlow_04bd5in" name="no" sourceRef="ExclusiveGateway_039bib8" targetRef="PreProcessRollback" />
+ <bpmn2:sequenceFlow id="SequenceFlow_1nh7m8d" name="yes" sourceRef="ExclusiveGateway_039bib8" targetRef="Task_1fm09pi">
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("disableRollback" ) == true}]]></bpmn2:conditionExpression>
+ </bpmn2:sequenceFlow>
+ <bpmn2:scriptTask id="Task_1fm09pi" name="Process Error" scriptFormat="groovy">
+ <bpmn2:incoming>SequenceFlow_1nh7m8d</bpmn2:incoming>
+ <bpmn2:outgoing>SequenceFlow_1pgo10r</bpmn2:outgoing>
+ <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def doCreateVfModule = new DoCreateVfModule()
+doCreateVfModule.processBPMNException(execution)]]></bpmn2:script>
+ </bpmn2:scriptTask>
+ <bpmn2:sequenceFlow id="SequenceFlow_1pgo10r" sourceRef="Task_1fm09pi" targetRef="EndEvent_0wsdptv" />
+ </bpmn2:subProcess>
</bpmn2:process>
<bpmn2:message id="Message_1" name="DoCreateVfModuleRequest" />
<bpmn2:error id="Error_1" name="MSOWorkflowException" errorCode="MSOWorkflowException" />
@@ -925,38 +959,6 @@ doCreateVfModule.validateSDNCResponse(execution, response, "get")]]></bpmn2:scri <dc:Bounds x="165" y="574" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="_BPMNShape_SubProcess_21" bpmnElement="SubProcess_1" isExpanded="true">
- <dc:Bounds x="29" y="1197" width="405" height="203" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="_BPMNShape_StartEvent_55" bpmnElement="StartEvent_2">
- <dc:Bounds x="58" y="1281" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="76" y="1322" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="_BPMNShape_EndEvent_181" bpmnElement="EndEvent_2">
- <dc:Bounds x="370" y="1281" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="388" y="1322" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_284" bpmnElement="ScriptTask_1">
- <dc:Bounds x="165" y="1258" width="134" height="81" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_StartEvent_55" targetElement="_BPMNShape_ScriptTask_284">
- <di:waypoint xsi:type="dc:Point" x="94" y="1299" />
- <di:waypoint xsi:type="dc:Point" x="165" y="1298" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="118" y="1299" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_38" bpmnElement="SequenceFlow_38" sourceElement="_BPMNShape_ScriptTask_284" targetElement="_BPMNShape_EndEvent_181">
- <di:waypoint xsi:type="dc:Point" x="299" y="1298" />
- <di:waypoint xsi:type="dc:Point" x="370" y="1299" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="329" y="1298" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_156" bpmnElement="CreateAAIVfModule">
<dc:Bounds x="696" y="348" width="121" height="92" />
</bpmndi:BPMNShape>
@@ -1162,6 +1164,92 @@ doCreateVfModule.validateSDNCResponse(execution, response, "get")]]></bpmn2:scri <bpmndi:BPMNShape id="CallActivity_14nvmgk_di" bpmnElement="Task_0kuj2a1">
<dc:Bounds x="378" y="242" width="100" height="80" />
</bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="SubProcess_0ltzufk_di" bpmnElement="SubProcess_0ltzufk" isExpanded="true">
+ <dc:Bounds x="-50" y="1190" width="1047" height="338" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="StartEvent_18lzc5m_di" bpmnElement="StartEvent_18lzc5m">
+ <dc:Bounds x="93" y="1294" width="36" height="36" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="111" y="1335" width="0" height="0" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="EndEvent_0wsdptv_di" bpmnElement="EndEvent_0wsdptv">
+ <dc:Bounds x="861" y="1294" width="36" height="36" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="879" y="1335" width="0" height="0" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="CallActivity_1ehr5kq_di" bpmnElement="CallDoCreateVfModuleRollback">
+ <dc:Bounds x="509" y="1272" width="100" height="80" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="ScriptTask_0upatdd_di" bpmnElement="PreProcessRollback">
+ <dc:Bounds x="329" y="1272" width="100" height="80" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="ScriptTask_0o1zc29_di" bpmnElement="PostProcessRollback">
+ <dc:Bounds x="694" y="1272" width="100" height="80" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_02lc25j_di" bpmnElement="SequenceFlow_02lc25j">
+ <di:waypoint xsi:type="dc:Point" x="129" y="1312" />
+ <di:waypoint xsi:type="dc:Point" x="196" y="1312" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="163" y="1297" width="0" height="0" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="SequenceFlow_0z2rczk_di" bpmnElement="SequenceFlow_0z2rczk">
+ <di:waypoint xsi:type="dc:Point" x="794" y="1312" />
+ <di:waypoint xsi:type="dc:Point" x="826" y="1312" />
+ <di:waypoint xsi:type="dc:Point" x="826" y="1312" />
+ <di:waypoint xsi:type="dc:Point" x="861" y="1312" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="841" y="1312" width="0" height="0" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="SequenceFlow_1i1q78e_di" bpmnElement="SequenceFlow_1i1q78e">
+ <di:waypoint xsi:type="dc:Point" x="429" y="1312" />
+ <di:waypoint xsi:type="dc:Point" x="509" y="1312" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="469" y="1297" width="0" height="0" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="SequenceFlow_0112l2c_di" bpmnElement="SequenceFlow_0112l2c">
+ <di:waypoint xsi:type="dc:Point" x="609" y="1312" />
+ <di:waypoint xsi:type="dc:Point" x="694" y="1312" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="652" y="1297" width="0" height="0" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="ExclusiveGateway_039bib8_di" bpmnElement="ExclusiveGateway_039bib8" isMarkerVisible="true">
+ <dc:Bounds x="196" y="1287" width="50" height="50" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="177" y="1259" width="87" height="12" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_04bd5in_di" bpmnElement="SequenceFlow_04bd5in">
+ <di:waypoint xsi:type="dc:Point" x="246" y="1312" />
+ <di:waypoint xsi:type="dc:Point" x="329" y="1312" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="282" y="1297" width="12" height="12" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="SequenceFlow_1nh7m8d_di" bpmnElement="SequenceFlow_1nh7m8d">
+ <di:waypoint xsi:type="dc:Point" x="221" y="1337" />
+ <di:waypoint xsi:type="dc:Point" x="221" y="1436" />
+ <di:waypoint xsi:type="dc:Point" x="509" y="1436" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="227" y="1386.5" width="18" height="12" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="ScriptTask_05v20n0_di" bpmnElement="Task_1fm09pi">
+ <dc:Bounds x="509" y="1396" width="100" height="80" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_1pgo10r_di" bpmnElement="SequenceFlow_1pgo10r">
+ <di:waypoint xsi:type="dc:Point" x="609" y="1436" />
+ <di:waypoint xsi:type="dc:Point" x="879" y="1436" />
+ <di:waypoint xsi:type="dc:Point" x="879" y="1330" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="744" y="1421" width="0" height="0" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</bpmn2:definitions>
\ No newline at end of file diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModuleRollback.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModuleRollback.bpmn index 7a7f369e42..cb6538c73a 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModuleRollback.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModuleRollback.bpmn @@ -6,7 +6,7 @@ </bpmn2:startEvent> <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="InitializeVariables" /> <bpmn2:exclusiveGateway id="ExclusiveGateway_1" name="Rollback PrepareUpdateAAIVfModule?" default="SequenceFlow_9"> - <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_11er1t8</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing> <bpmn2:outgoing>SequenceFlow_9</bpmn2:outgoing> </bpmn2:exclusiveGateway> @@ -17,7 +17,7 @@ def dcvfmr = new DoCreateVfModuleRollback() dcvfmr.preProcessRequest(execution)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:callActivity id="InvokePrepareUpdateAAIVfModule" name="Invoke
PrepareUpdateAAIVfModule" calledElement="PrepareUpdateAAIVfModule"> + <bpmn2:callActivity id="InvokePrepareUpdateAAIVfModule" name="Invoke PrepareUpdateAAIVfModule" calledElement="PrepareUpdateAAIVfModule"> <bpmn2:extensionElements> <camunda:in source="PrepareUpdateAAIVfModuleRequest" target="PrepareUpdateAAIVfModuleRequest" /> <camunda:out source="WorkflowException" target="WorkflowException" /> @@ -33,13 +33,13 @@ dcvfmr.preProcessRequest(execution)]]></bpmn2:script> <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="PrepareUpdateAAIVfModulePrep" targetRef="InvokePrepareUpdateAAIVfModule" /> <bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="InvokePrepareUpdateAAIVfModule" targetRef="ExclusiveGateway_2" /> <bpmn2:sequenceFlow id="SequenceFlow_9" name="no" sourceRef="ExclusiveGateway_1" targetRef="ExclusiveGateway_2" /> - <bpmn2:exclusiveGateway id="ExclusiveGateway_2" name="Rollback Network Policies Creation?" default="SequenceFlow_15"> + <bpmn2:exclusiveGateway id="ExclusiveGateway_2" name="Rollback 1707 SDNC Activate?" default="SequenceFlow_15"> <bpmn2:incoming>SequenceFlow_8</bpmn2:incoming> <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_10</bpmn2:outgoing> <bpmn2:outgoing>SequenceFlow_15</bpmn2:outgoing> </bpmn2:exclusiveGateway> - <bpmn2:scriptTask id="VNFAdapterPrep" name="VNFAdapter
Prep" scriptFormat="groovy"> + <bpmn2:scriptTask id="VNFAdapterPrep" name="VNFAdapter Prep" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_1p0v6yk</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_16</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* @@ -47,7 +47,7 @@ def dcvfmr = new DoCreateVfModuleRollback() dcvfmr.prepVNFAdapterRequest(execution)]]></bpmn2:script> </bpmn2:scriptTask> <bpmn2:sequenceFlow id="SequenceFlow_16" name="" sourceRef="VNFAdapterPrep" targetRef="InvokeVNFAdapterRestV1" /> - <bpmn2:callActivity id="InvokeVNFAdapterRestV1" name="Invoke
VNFAdapterRestV1" calledElement="vnfAdapterRestV1"> + <bpmn2:callActivity id="InvokeVNFAdapterRestV1" name="Invoke VNFAdapterRestV1" calledElement="vnfAdapterRestV1"> <bpmn2:extensionElements> <camunda:out source="WorkflowException" target="WorkflowException" /> <camunda:in source="vnfAdapterRestV1Request" target="vnfAdapterRestV1Request" /> @@ -59,12 +59,12 @@ dcvfmr.prepVNFAdapterRequest(execution)]]></bpmn2:script> <bpmn2:incoming>SequenceFlow_16</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_11</bpmn2:outgoing> </bpmn2:callActivity> - <bpmn2:sequenceFlow id="SequenceFlow_10" name="yes" sourceRef="ExclusiveGateway_2" targetRef="Task_08csf14"> - <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFMR_rollbackCreateNetworkPoliciesAAI") == "true"}]]></bpmn2:conditionExpression> + <bpmn2:sequenceFlow id="SequenceFlow_10" name="yes" sourceRef="ExclusiveGateway_2" targetRef="PrepareSDNCDeactivateRequest"> + <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFMR_rollbackSDNCRequestActivate") == "true" && execution.getVariable("sdncVersion") == "1707"}]]></bpmn2:conditionExpression> </bpmn2:sequenceFlow> <bpmn2:sequenceFlow id="SequenceFlow_11" name="" sourceRef="InvokeVNFAdapterRestV1" targetRef="ExclusiveGateway_3" /> - <bpmn2:sequenceFlow id="SequenceFlow_15" name="no" sourceRef="ExclusiveGateway_2" targetRef="ExclusiveGateway_0a0hroy" /> - <bpmn2:scriptTask id="UpdateAAIVfModulePrep" name="UpdateAAIVfModule
Prep" scriptFormat="groovy"> + <bpmn2:sequenceFlow id="SequenceFlow_15" name="no" sourceRef="ExclusiveGateway_2" targetRef="ExclusiveGateway_1938vz9" /> + <bpmn2:scriptTask id="UpdateAAIVfModulePrep" name="UpdateAAIVfModule Prep" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_13</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* @@ -72,7 +72,7 @@ def dcvfmr = new DoCreateVfModuleRollback() dcvfmr.prepUpdateAAIVfModule(execution)]]></bpmn2:script> </bpmn2:scriptTask> <bpmn2:sequenceFlow id="SequenceFlow_14" name="" sourceRef="UpdateAAIVfModulePrep" targetRef="InvokeUpdateAAIVfModule" /> - <bpmn2:callActivity id="InvokeUpdateAAIVfModule" name="Invoke
UpdateAAIVfModule" calledElement="UpdateAAIVfModule"> + <bpmn2:callActivity id="InvokeUpdateAAIVfModule" name="Invoke UpdateAAIVfModule" calledElement="UpdateAAIVfModule"> <bpmn2:extensionElements> <camunda:out source="WorkflowException" target="WorkflowException" /> <camunda:in source="UpdateAAIVfModuleRequest" target="UpdateAAIVfModuleRequest" /> @@ -98,19 +98,19 @@ dcvfmr.prepUpdateAAIVfModule(execution)]]></bpmn2:script> <bpmn2:outgoing>SequenceFlow_19</bpmn2:outgoing> <bpmn2:outgoing>SequenceFlow_20</bpmn2:outgoing> </bpmn2:exclusiveGateway> - <bpmn2:sequenceFlow id="SequenceFlow_19" name="yes" sourceRef="ExclusiveGateway_4" targetRef="SDNCAdapterPrep2"> + <bpmn2:sequenceFlow id="SequenceFlow_19" name="yes" sourceRef="ExclusiveGateway_4" targetRef="ExclusiveGateway_1h87hhh"> <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFMR_rollbackSDNCRequestAssign") == "true" || execution.getVariable("DCVFMR_rollbackSDNCRequestActivate") == "true"}]]></bpmn2:conditionExpression> </bpmn2:sequenceFlow> <bpmn2:sequenceFlow id="SequenceFlow_20" name="no" sourceRef="ExclusiveGateway_4" targetRef="ExclusiveGateway_5" /> - <bpmn2:scriptTask id="SDNCAdapterPrep2" name="SDNCAdapter
Prep" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_19</bpmn2:incoming> + <bpmn2:scriptTask id="SDNCAdapterPrep2" name="SDNCAdapter Prep" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_1rpg6ac</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_32</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* def dcvfmr = new DoCreateVfModuleRollback() dcvfmr.prepSDNCAdapterRequest(execution)]]></bpmn2:script> </bpmn2:scriptTask> <bpmn2:sequenceFlow id="SequenceFlow_32" name="" sourceRef="SDNCAdapterPrep2" targetRef="InvokeSDNCAdapterV1_2" /> - <bpmn2:callActivity id="InvokeSDNCAdapterV1_2" name="Invoke
SDNCAdapterV1" calledElement="sdncAdapter"> + <bpmn2:callActivity id="InvokeSDNCAdapterV1_2" name="Invoke SDNCAdapterV1" calledElement="sdncAdapter"> <bpmn2:extensionElements> <camunda:out source="WorkflowException" target="WorkflowException" /> <camunda:in source="sdncAdapterWorkflowRequest" target="sdncAdapterWorkflowRequest" /> @@ -126,14 +126,15 @@ dcvfmr.prepSDNCAdapterRequest(execution)]]></bpmn2:script> <bpmn2:exclusiveGateway id="ExclusiveGateway_5" name="Delete AAI VF Modlue?" default="SequenceFlow_21"> <bpmn2:incoming>SequenceFlow_20</bpmn2:incoming> <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_12otwa4</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_21</bpmn2:outgoing> <bpmn2:outgoing>SequenceFlow_24</bpmn2:outgoing> </bpmn2:exclusiveGateway> - <bpmn2:sequenceFlow id="SequenceFlow_21" name="no" sourceRef="ExclusiveGateway_5" targetRef="EndEvent_9" /> + <bpmn2:sequenceFlow id="SequenceFlow_21" name="no" sourceRef="ExclusiveGateway_5" targetRef="SetSuccessfulRollbackStatus" /> <bpmn2:sequenceFlow id="SequenceFlow_24" name="yes" sourceRef="ExclusiveGateway_5" targetRef="DeleteAAIVfModulePrep"> <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFMR_rollbackCreateAAIVfModule") == "true"}]]></bpmn2:conditionExpression> </bpmn2:sequenceFlow> - <bpmn2:callActivity id="InvokeDeleteAAIVfModule" name="Invoke
DeleteAAIVfModule" calledElement="DeleteAAIVfModule"> + <bpmn2:callActivity id="InvokeDeleteAAIVfModule" name="Invoke DeleteAAIVfModule" calledElement="DeleteAAIVfModule"> <bpmn2:extensionElements> <camunda:in source="DeleteAAIVfModuleRequest" target="DeleteAAIVfModuleRequest" /> <camunda:in source="isVidRequest" target="isVidRequest" /> @@ -143,12 +144,12 @@ dcvfmr.prepSDNCAdapterRequest(execution)]]></bpmn2:script> <bpmn2:incoming>SequenceFlow_34</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_35</bpmn2:outgoing> </bpmn2:callActivity> - <bpmn2:sequenceFlow id="SequenceFlow_35" name="" sourceRef="InvokeDeleteAAIVfModule" targetRef="EndEvent_9" /> + <bpmn2:sequenceFlow id="SequenceFlow_35" name="" sourceRef="InvokeDeleteAAIVfModule" targetRef="SetSuccessfulRollbackStatus" /> <bpmn2:endEvent id="EndEvent_9"> - <bpmn2:incoming>SequenceFlow_35</bpmn2:incoming> - <bpmn2:incoming>SequenceFlow_21</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_0ggp8wz</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_1h8ve60</bpmn2:incoming> </bpmn2:endEvent> - <bpmn2:scriptTask id="DeleteAAIVfModulePrep" name="DeleteAAIVfModule
Prep" scriptFormat="groovy"> + <bpmn2:scriptTask id="DeleteAAIVfModulePrep" name="DeleteAAIVfModule Prep" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_24</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_34</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* @@ -173,16 +174,24 @@ dcvfmr.sdncValidateResponse(execution, DCVFMR_DoCreateVfModuleRollbackResponse)] <bpmn2:endEvent id="EndEvent_1"> <bpmn2:incoming>SequenceFlow_22</bpmn2:incoming> </bpmn2:endEvent> - <bpmn2:sequenceFlow id="SequenceFlow_12" name="" sourceRef="CatchExceptions" targetRef="LogSaveWorkflowException" /> + <bpmn2:sequenceFlow id="SequenceFlow_22" name="" sourceRef="LogSaveWorkflowException" targetRef="EndEvent_1" /> + <bpmn2:sequenceFlow id="SequenceFlow_12" name="" sourceRef="CatchExceptions" targetRef="SetFailedRollbackStatus" /> <bpmn2:scriptTask id="LogSaveWorkflowException" name="Log and Save Workflow Exception" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_12</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_02fx6z6</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_22</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* def dcvfmr = new DoCreateVfModuleRollback() dcvfmr.logWorkflowException(execution, 'DoCreateVfModuleRollback caught an event') dcvfmr.saveWorkflowException(execution, 'DCVFMR_CaughtWorkflowException1')]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_22" name="" sourceRef="LogSaveWorkflowException" targetRef="EndEvent_1" /> + <bpmn2:sequenceFlow id="SequenceFlow_02fx6z6" sourceRef="SetFailedRollbackStatus" targetRef="LogSaveWorkflowException" /> + <bpmn2:scriptTask id="SetFailedRollbackStatus" name="Set Failed Rollback Status" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_12</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_02fx6z6</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def dcvfmr = new DoCreateVfModuleRollback() +dcvfmr.setFailedRollbackStatus(execution)]]></bpmn2:script> + </bpmn2:scriptTask> </bpmn2:subProcess> <bpmn2:boundaryEvent id="BoundaryEvent_1" name="" attachedToRef="SubProcess_1"> <bpmn2:outgoing>SequenceFlow_23</bpmn2:outgoing> @@ -199,15 +208,15 @@ dcvfmr.saveWorkflowException(execution, 'DCVFMR_CaughtWorkflowException1')]]></b def dcvfmr = new DoCreateVfModuleRollback() dcvfmr.preProcessRequest(execution)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="InitializeVariables" targetRef="ExclusiveGateway_1" /> + <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="InitializeVariables" targetRef="ExclusiveGateway_1yozzae" /> <bpmn2:exclusiveGateway id="ExclusiveGateway_0a0hroy" name="Rollback Update AAI Generic VNF?" default="SequenceFlow_185bo77"> <bpmn2:incoming>SequenceFlow_0djpj3r</bpmn2:incoming> - <bpmn2:incoming>SequenceFlow_15</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_0n58kg1</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_185bo77</bpmn2:outgoing> <bpmn2:outgoing>SequenceFlow_111l1he</bpmn2:outgoing> </bpmn2:exclusiveGateway> <bpmn2:scriptTask id="Task_08csf14" name="Delete Network Policies from AAI" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_10</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_0unumxv</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_0djpj3r</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* def dcvfmr = new DoCreateVfModuleRollback() @@ -248,6 +257,105 @@ dcvfmr.preProcessUpdateAAIGenericVnf(execution)]]></bpmn2:script> <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFMR_rollbackVnfAdapterCreate") == "true"}]]></bpmn2:conditionExpression> </bpmn2:sequenceFlow> <bpmn2:sequenceFlow id="SequenceFlow_03i4czf" name="no" sourceRef="ExclusiveGateway_0uvarlv" targetRef="ExclusiveGateway_3" /> + <bpmn2:exclusiveGateway id="ExclusiveGateway_1yozzae" name="Skip Rollback?" default="SequenceFlow_11er1t8"> + <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_11er1t8</bpmn2:outgoing> + <bpmn2:outgoing>SequenceFlow_0ggp8wz</bpmn2:outgoing> + </bpmn2:exclusiveGateway> + <bpmn2:sequenceFlow id="SequenceFlow_11er1t8" name="no" sourceRef="ExclusiveGateway_1yozzae" targetRef="ExclusiveGateway_1" /> + <bpmn2:sequenceFlow id="SequenceFlow_0ggp8wz" name="yes" sourceRef="ExclusiveGateway_1yozzae" targetRef="EndEvent_9"> + <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("skipRollback" ) == true}]]></bpmn2:conditionExpression> + </bpmn2:sequenceFlow> + <bpmn2:exclusiveGateway id="ExclusiveGateway_1938vz9" name="Rollback Network Policies Creation?" default="SequenceFlow_0n58kg1"> + <bpmn2:incoming>SequenceFlow_06rm0hg</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_15</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_0n58kg1</bpmn2:outgoing> + <bpmn2:outgoing>SequenceFlow_0unumxv</bpmn2:outgoing> + </bpmn2:exclusiveGateway> + <bpmn2:scriptTask id="PrepareSDNCDeactivateRequest" name="Prepare SDNC Deactivate Request" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_10</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_0ugalf8</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def dcvfmr = new DoCreateVfModuleRollback() +dcvfmr.preProcessSDNCDeactivateRequest(execution)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:callActivity id="CallSDNCDeactivate" name="Call SDNC Adapter Deactivate" calledElement="sdncAdapter"> + <bpmn2:extensionElements> + <camunda:in source="DCVFMR_deactivateSDNCRequest" target="sdncAdapterWorkflowRequest" /> + <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" /> + <camunda:in source="mso-request-id" target="mso-request-id" /> + <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" /> + <camunda:out source="WorkflowException" target="WorkflowException" /> + <camunda:out source="sdncAdapterResponse" target="DCVFMR_deactivateSDNCAdapterResponse" /> + <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" /> + </bpmn2:extensionElements> + <bpmn2:incoming>SequenceFlow_0ugalf8</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_0n78x37</bpmn2:outgoing> + </bpmn2:callActivity> + <bpmn2:scriptTask id="PostProcessSDNCDeactivateRequest" name="PostProcess SDNC Deactivate Request" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_0n78x37</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_06rm0hg</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def dcvfmr = new DoCreateVfModuleRollback() +String response = execution.getVariable("DCVFMR_deactivateSDNCAdapterResponse") +dcvfmr.sdncValidateResponse(execution, response)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:sequenceFlow id="SequenceFlow_0ugalf8" sourceRef="PrepareSDNCDeactivateRequest" targetRef="CallSDNCDeactivate" /> + <bpmn2:sequenceFlow id="SequenceFlow_0n78x37" sourceRef="CallSDNCDeactivate" targetRef="PostProcessSDNCDeactivateRequest" /> + <bpmn2:sequenceFlow id="SequenceFlow_06rm0hg" sourceRef="PostProcessSDNCDeactivateRequest" targetRef="ExclusiveGateway_1938vz9" /> + <bpmn2:sequenceFlow id="SequenceFlow_0n58kg1" name="no" sourceRef="ExclusiveGateway_1938vz9" targetRef="ExclusiveGateway_0a0hroy" /> + <bpmn2:sequenceFlow id="SequenceFlow_0unumxv" name="yes" sourceRef="ExclusiveGateway_1938vz9" targetRef="Task_08csf14"> + <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFMR_rollbackCreateNetworkPoliciesAAI") == "true"}]]></bpmn2:conditionExpression> + </bpmn2:sequenceFlow> + <bpmn2:sequenceFlow id="SequenceFlow_1iufuuu" sourceRef="PrepareSDNCUnassignRequest" targetRef="CallSDNCAdapterUnassign" /> + <bpmn2:sequenceFlow id="SequenceFlow_1l4n37b" sourceRef="CallSDNCAdapterUnassign" targetRef="PostProcessSDNCUnassignRequest" /> + <bpmn2:scriptTask id="PrepareSDNCUnassignRequest" name="Prepare SDNC Unassign Request" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_16ghmax</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_1iufuuu</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def dcvfmr = new DoCreateVfModuleRollback() +dcvfmr.preProcessSDNCUnassignRequest(execution)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:callActivity id="CallSDNCAdapterUnassign" name="Call SDNC Adapter Unassign" calledElement="sdncAdapter"> + <bpmn2:extensionElements> + <camunda:in source="DCVFMR_unassignSDNCRequest" target="sdncAdapterWorkflowRequest" /> + <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" /> + <camunda:in source="mso-request-id" target="mso-request-id" /> + <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" /> + <camunda:out source="WorkflowException" target="WorkflowException" /> + <camunda:out source="sdncAdapterResponse" target="DCVFMR_unassignSDNCAdapterResponse" /> + <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" /> + </bpmn2:extensionElements> + <bpmn2:incoming>SequenceFlow_1iufuuu</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_1l4n37b</bpmn2:outgoing> + </bpmn2:callActivity> + <bpmn2:scriptTask id="PostProcessSDNCUnassignRequest" name="PostProcess SDNC Unassign Request" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_1l4n37b</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_12otwa4</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def dcvfmr = new DoCreateVfModuleRollback() +String response = execution.getVariable("DCVFMR_unassignSDNCAdapterResponse") +dcvfmr.sdncValidateResponse(execution, response)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:exclusiveGateway id="ExclusiveGateway_1h87hhh" name="Rollback 1707 SDNC Activate?" default="SequenceFlow_1rpg6ac"> + <bpmn2:incoming>SequenceFlow_19</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_1rpg6ac</bpmn2:outgoing> + <bpmn2:outgoing>SequenceFlow_16ghmax</bpmn2:outgoing> + </bpmn2:exclusiveGateway> + <bpmn2:sequenceFlow id="SequenceFlow_1rpg6ac" name="no" sourceRef="ExclusiveGateway_1h87hhh" targetRef="SDNCAdapterPrep2" /> + <bpmn2:sequenceFlow id="SequenceFlow_16ghmax" name="yes" sourceRef="ExclusiveGateway_1h87hhh" targetRef="PrepareSDNCUnassignRequest"> + <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFMR_rollbackSDNCRequestAssign") == "true" && execution.getVariable("sdncVersion") == "1707"}]]></bpmn2:conditionExpression> + </bpmn2:sequenceFlow> + <bpmn2:sequenceFlow id="SequenceFlow_12otwa4" sourceRef="PostProcessSDNCUnassignRequest" targetRef="ExclusiveGateway_5" /> + <bpmn2:sequenceFlow id="SequenceFlow_1h8ve60" sourceRef="SetSuccessfulRollbackStatus" targetRef="EndEvent_9" /> + <bpmn2:scriptTask id="SetSuccessfulRollbackStatus" name="Set Successful Rollback Status" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_21</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_35</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_1h8ve60</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def dcvfmr = new DoCreateVfModuleRollback() +dcvfmr.setSuccessfulRollbackStatus(execution)]]></bpmn2:script> + </bpmn2:scriptTask> </bpmn2:process> <bpmn2:error id="Error_1" name="MSO Workflow Exception" errorCode="MSOWorkflowException" /> <bpmn2:message id="Message_1" name="DoCreateVfModuleRollbackRequest" /> @@ -260,13 +368,13 @@ dcvfmr.preProcessUpdateAAIGenericVnf(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_22" bpmnElement="InitializeVariables"> - <dc:Bounds x="203" y="78" width="100" height="80" /> + <dc:Bounds x="115" y="78" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_37" targetElement="_BPMNShape_ScriptTask_22"> <di:waypoint xsi:type="dc:Point" x="49" y="118" /> - <di:waypoint xsi:type="dc:Point" x="203" y="118" /> + <di:waypoint xsi:type="dc:Point" x="115" y="118" /> <bpmndi:BPMNLabel> - <dc:Bounds x="74" y="118" width="6" height="6" /> + <dc:Bounds x="82" y="103" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_160" bpmnElement="InvokePrepareUpdateAAIVfModule"> @@ -276,62 +384,62 @@ dcvfmr.preProcessUpdateAAIGenericVnf(execution)]]></bpmn2:script> <dc:Bounds x="552" y="23" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_170" bpmnElement="VNFAdapterPrep"> - <dc:Bounds x="95" y="507" width="100" height="80" /> + <dc:Bounds x="104" y="763" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_CallActivity_13" bpmnElement="InvokeVNFAdapterRestV1"> - <dc:Bounds x="253" y="507" width="100" height="80" /> + <dc:Bounds x="262" y="763" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_16" bpmnElement="SequenceFlow_16" sourceElement="_BPMNShape_ScriptTask_170" targetElement="_BPMNShape_CallActivity_13"> - <di:waypoint xsi:type="dc:Point" x="195" y="547" /> - <di:waypoint xsi:type="dc:Point" x="253" y="547" /> + <di:waypoint xsi:type="dc:Point" x="204" y="803" /> + <di:waypoint xsi:type="dc:Point" x="262" y="803" /> <bpmndi:BPMNLabel> - <dc:Bounds x="216" y="547" width="0" height="0" /> + <dc:Bounds x="225" y="803" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_171" bpmnElement="UpdateAAIVfModulePrep"> - <dc:Bounds x="543" y="502" width="100" height="80" /> + <dc:Bounds x="552" y="758" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_CallActivity_14" bpmnElement="InvokeUpdateAAIVfModule"> - <dc:Bounds x="723" y="502" width="100" height="80" /> + <dc:Bounds x="732" y="758" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_172" bpmnElement="SDNCAdapterPrep2"> - <dc:Bounds x="65" y="742" width="100" height="80" /> + <dc:Bounds x="187" y="995" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_CallActivity_15" bpmnElement="InvokeSDNCAdapterV1_2"> - <dc:Bounds x="205" y="742" width="100" height="80" /> + <dc:Bounds x="327" y="995" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_173" bpmnElement="DeleteAAIVfModulePrep"> - <dc:Bounds x="582" y="745" width="100" height="80" /> + <dc:Bounds x="704" y="998" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_CallActivity_16" bpmnElement="InvokeDeleteAAIVfModule"> - <dc:Bounds x="738" y="745" width="100" height="80" /> + <dc:Bounds x="860" y="998" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_32" bpmnElement="SequenceFlow_32" sourceElement="_BPMNShape_ScriptTask_172" targetElement="_BPMNShape_CallActivity_15"> - <di:waypoint xsi:type="dc:Point" x="165" y="782" /> - <di:waypoint xsi:type="dc:Point" x="205" y="782" /> + <di:waypoint xsi:type="dc:Point" x="287" y="1035" /> + <di:waypoint xsi:type="dc:Point" x="327" y="1035" /> <bpmndi:BPMNLabel> - <dc:Bounds x="185" y="782" width="0" height="0" /> + <dc:Bounds x="307" y="1035" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_34" bpmnElement="SequenceFlow_34" sourceElement="_BPMNShape_ScriptTask_173" targetElement="_BPMNShape_CallActivity_16"> - <di:waypoint xsi:type="dc:Point" x="682" y="785" /> - <di:waypoint xsi:type="dc:Point" x="738" y="785" /> + <di:waypoint xsi:type="dc:Point" x="804" y="1038" /> + <di:waypoint xsi:type="dc:Point" x="860" y="1038" /> <bpmndi:BPMNLabel> - <dc:Bounds x="698" y="785" width="0" height="0" /> + <dc:Bounds x="820" y="1038" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_EndEvent_169" bpmnElement="EndEvent_9"> - <dc:Bounds x="920" y="853" width="36" height="36" /> + <dc:Bounds x="1159" y="1105" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="938" y="894" width="0" height="0" /> + <dc:Bounds x="1177" y="1146" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_35" bpmnElement="SequenceFlow_35" sourceElement="_BPMNShape_CallActivity_16" targetElement="_BPMNShape_EndEvent_169"> - <di:waypoint xsi:type="dc:Point" x="838" y="785" /> - <di:waypoint xsi:type="dc:Point" x="938" y="785" /> - <di:waypoint xsi:type="dc:Point" x="938" y="853" /> + <di:waypoint xsi:type="dc:Point" x="960" y="1038" /> + <di:waypoint xsi:type="dc:Point" x="1078" y="1038" /> + <di:waypoint xsi:type="dc:Point" x="1078" y="1083" /> <bpmndi:BPMNLabel> - <dc:Bounds x="866" y="785" width="0" height="0" /> + <dc:Bounds x="1019" y="1023" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_223" bpmnElement="ExclusiveGateway_1" isMarkerVisible="true"> @@ -341,18 +449,16 @@ dcvfmr.preProcessUpdateAAIGenericVnf(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ScriptTask_22" targetElement="_BPMNShape_ExclusiveGateway_223"> - <di:waypoint xsi:type="dc:Point" x="303" y="118" /> - <di:waypoint xsi:type="dc:Point" x="383" y="118" /> - <di:waypoint xsi:type="dc:Point" x="383" y="117" /> - <di:waypoint xsi:type="dc:Point" x="404" y="117" /> + <di:waypoint xsi:type="dc:Point" x="215" y="118" /> + <di:waypoint xsi:type="dc:Point" x="278" y="118" /> <bpmndi:BPMNLabel> - <dc:Bounds x="323" y="118" width="6" height="6" /> + <dc:Bounds x="247" y="103" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_224" bpmnElement="ExclusiveGateway_2" isMarkerVisible="true"> <dc:Bounds x="912" y="92" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="892" y="152" width="90" height="25" /> + <dc:Bounds x="897" y="152" width="79" height="24" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_ExclusiveGateway_223" targetElement="_BPMNShape_ScriptTask_168"> @@ -388,47 +494,47 @@ dcvfmr.preProcessUpdateAAIGenericVnf(execution)]]></bpmn2:script> <di:waypoint xsi:type="dc:Point" x="937" y="142" /> <di:waypoint xsi:type="dc:Point" x="937" y="229" /> <di:waypoint xsi:type="dc:Point" x="29" y="229" /> - <di:waypoint xsi:type="dc:Point" x="29" y="291" /> - <di:waypoint xsi:type="dc:Point" x="203" y="291" /> + <di:waypoint xsi:type="dc:Point" x="29" y="321" /> + <di:waypoint xsi:type="dc:Point" x="203" y="321" /> <bpmndi:BPMNLabel> - <dc:Bounds x="496" y="233" width="18" height="13" /> + <dc:Bounds x="501" y="235" width="18" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_225" bpmnElement="ExclusiveGateway_3" isMarkerVisible="true"> - <dc:Bounds x="405" y="581" width="50" height="50" /> + <dc:Bounds x="414" y="837" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="389" y="636" width="83" height="25" /> + <dc:Bounds x="398" y="892" width="84" height="26" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_11" sourceElement="_BPMNShape_CallActivity_13" targetElement="_BPMNShape_ExclusiveGateway_225"> - <di:waypoint xsi:type="dc:Point" x="353" y="547" /> - <di:waypoint xsi:type="dc:Point" x="374" y="547" /> - <di:waypoint xsi:type="dc:Point" x="430" y="547" /> - <di:waypoint xsi:type="dc:Point" x="430" y="581" /> + <di:waypoint xsi:type="dc:Point" x="362" y="803" /> + <di:waypoint xsi:type="dc:Point" x="383" y="803" /> + <di:waypoint xsi:type="dc:Point" x="439" y="803" /> + <di:waypoint xsi:type="dc:Point" x="439" y="837" /> <bpmndi:BPMNLabel> - <dc:Bounds x="415" y="547" width="0" height="0" /> + <dc:Bounds x="424" y="803" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="SequenceFlow_13" sourceElement="_BPMNShape_ExclusiveGateway_225" targetElement="_BPMNShape_ScriptTask_171"> - <di:waypoint xsi:type="dc:Point" x="455" y="606" /> - <di:waypoint xsi:type="dc:Point" x="476" y="606" /> - <di:waypoint xsi:type="dc:Point" x="476" y="542" /> - <di:waypoint xsi:type="dc:Point" x="543" y="542" /> + <di:waypoint xsi:type="dc:Point" x="464" y="862" /> + <di:waypoint xsi:type="dc:Point" x="485" y="862" /> + <di:waypoint xsi:type="dc:Point" x="485" y="798" /> + <di:waypoint xsi:type="dc:Point" x="552" y="798" /> <bpmndi:BPMNLabel> - <dc:Bounds x="498" y="547" width="17" height="13" /> + <dc:Bounds x="507" y="803" width="18" height="14" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_14" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_ScriptTask_171" targetElement="_BPMNShape_CallActivity_14"> - <di:waypoint xsi:type="dc:Point" x="643" y="542" /> - <di:waypoint xsi:type="dc:Point" x="723" y="542" /> + <di:waypoint xsi:type="dc:Point" x="652" y="798" /> + <di:waypoint xsi:type="dc:Point" x="732" y="798" /> <bpmndi:BPMNLabel> - <dc:Bounds x="654" y="542" width="0" height="0" /> + <dc:Bounds x="663" y="798" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_226" bpmnElement="ExclusiveGateway_4" isMarkerVisible="true"> - <dc:Bounds x="903" y="581" width="50" height="50" /> + <dc:Bounds x="912" y="837" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="890" y="636" width="78" height="25" /> + <dc:Bounds x="898" y="892" width="80" height="26" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_15" bpmnElement="SequenceFlow_15" sourceElement="_BPMNShape_ExclusiveGateway_224" targetElement="_BPMNShape_ExclusiveGateway_225"> @@ -436,230 +542,380 @@ dcvfmr.preProcessUpdateAAIGenericVnf(execution)]]></bpmn2:script> <di:waypoint xsi:type="dc:Point" x="1025" y="117" /> <di:waypoint xsi:type="dc:Point" x="1025" y="212" /> <di:waypoint xsi:type="dc:Point" x="19" y="212" /> - <di:waypoint xsi:type="dc:Point" x="19" y="357" /> - <di:waypoint xsi:type="dc:Point" x="405" y="357" /> + <di:waypoint xsi:type="dc:Point" x="19" y="382" /> + <di:waypoint xsi:type="dc:Point" x="922" y="382" /> <bpmndi:BPMNLabel> - <dc:Bounds x="501" y="187" width="12" height="13" /> + <dc:Bounds x="501" y="187" width="12" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_17" bpmnElement="SequenceFlow_17" sourceElement="_BPMNShape_ExclusiveGateway_225" targetElement="_BPMNShape_ExclusiveGateway_226"> - <di:waypoint xsi:type="dc:Point" x="455" y="606" /> - <di:waypoint xsi:type="dc:Point" x="903" y="606" /> + <di:waypoint xsi:type="dc:Point" x="464" y="862" /> + <di:waypoint xsi:type="dc:Point" x="912" y="862" /> <bpmndi:BPMNLabel> - <dc:Bounds x="665" y="606" width="13" height="13" /> + <dc:Bounds x="675" y="862" width="12" height="14" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="SequenceFlow_18" sourceElement="_BPMNShape_CallActivity_14" targetElement="_BPMNShape_ExclusiveGateway_226"> - <di:waypoint xsi:type="dc:Point" x="823" y="542" /> - <di:waypoint xsi:type="dc:Point" x="928" y="542" /> - <di:waypoint xsi:type="dc:Point" x="928" y="581" /> + <di:waypoint xsi:type="dc:Point" x="832" y="798" /> + <di:waypoint xsi:type="dc:Point" x="937" y="798" /> + <di:waypoint xsi:type="dc:Point" x="937" y="837" /> <bpmndi:BPMNLabel> - <dc:Bounds x="901" y="542" width="0" height="0" /> + <dc:Bounds x="910" y="798" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_19" bpmnElement="SequenceFlow_19" sourceElement="_BPMNShape_ExclusiveGateway_226" targetElement="_BPMNShape_ScriptTask_172"> - <di:waypoint xsi:type="dc:Point" x="928" y="631" /> - <di:waypoint xsi:type="dc:Point" x="928" y="702" /> - <di:waypoint xsi:type="dc:Point" x="474" y="702" /> - <di:waypoint xsi:type="dc:Point" x="25" y="702" /> - <di:waypoint xsi:type="dc:Point" x="25" y="782" /> - <di:waypoint xsi:type="dc:Point" x="65" y="782" /> + <di:waypoint xsi:type="dc:Point" x="937" y="887" /> + <di:waypoint xsi:type="dc:Point" x="937" y="958" /> + <di:waypoint xsi:type="dc:Point" x="34" y="958" /> + <di:waypoint xsi:type="dc:Point" x="34" y="1103" /> + <di:waypoint xsi:type="dc:Point" x="54" y="1103" /> <bpmndi:BPMNLabel> - <dc:Bounds x="564" y="702" width="17" height="13" /> + <dc:Bounds x="222" y="958" width="18" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_227" bpmnElement="ExclusiveGateway_5" isMarkerVisible="true"> - <dc:Bounds x="467" y="845" width="50" height="50" /> + <dc:Bounds x="589" y="1098" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="456" y="900" width="71" height="25" /> + <dc:Bounds x="578" y="1153" width="71" height="24" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_20" bpmnElement="SequenceFlow_20" sourceElement="_BPMNShape_ExclusiveGateway_226" targetElement="_BPMNShape_ExclusiveGateway_227"> - <di:waypoint xsi:type="dc:Point" x="953" y="606" /> - <di:waypoint xsi:type="dc:Point" x="1020" y="606" /> - <di:waypoint xsi:type="dc:Point" x="1020" y="686" /> - <di:waypoint xsi:type="dc:Point" x="16" y="686" /> - <di:waypoint xsi:type="dc:Point" x="16" y="870" /> - <di:waypoint xsi:type="dc:Point" x="467" y="870" /> + <di:waypoint xsi:type="dc:Point" x="962" y="862" /> + <di:waypoint xsi:type="dc:Point" x="1029" y="862" /> + <di:waypoint xsi:type="dc:Point" x="1029" y="942" /> + <di:waypoint xsi:type="dc:Point" x="25" y="942" /> + <di:waypoint xsi:type="dc:Point" x="25" y="1246" /> + <di:waypoint xsi:type="dc:Point" x="614" y="1246" /> + <di:waypoint xsi:type="dc:Point" x="614" y="1148" /> <bpmndi:BPMNLabel> - <dc:Bounds x="786" y="656" width="13" height="13" /> + <dc:Bounds x="796" y="912" width="12" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_21" bpmnElement="SequenceFlow_21" sourceElement="_BPMNShape_ExclusiveGateway_227" targetElement="_BPMNShape_EndEvent_169"> - <di:waypoint xsi:type="dc:Point" x="517" y="870" /> - <di:waypoint xsi:type="dc:Point" x="772" y="870" /> - <di:waypoint xsi:type="dc:Point" x="772" y="871" /> - <di:waypoint xsi:type="dc:Point" x="920" y="871" /> + <di:waypoint xsi:type="dc:Point" x="639" y="1123" /> + <di:waypoint xsi:type="dc:Point" x="1028" y="1123" /> <bpmndi:BPMNLabel> - <dc:Bounds x="750" y="870" width="13" height="13" /> + <dc:Bounds x="811" y="1123" width="12" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_24" bpmnElement="SequenceFlow_24" sourceElement="_BPMNShape_ExclusiveGateway_227" targetElement="_BPMNShape_ScriptTask_173"> - <di:waypoint xsi:type="dc:Point" x="517" y="870" /> - <di:waypoint xsi:type="dc:Point" x="542" y="870" /> - <di:waypoint xsi:type="dc:Point" x="542" y="814" /> - <di:waypoint xsi:type="dc:Point" x="542" y="785" /> - <di:waypoint xsi:type="dc:Point" x="582" y="785" /> + <di:waypoint xsi:type="dc:Point" x="639" y="1123" /> + <di:waypoint xsi:type="dc:Point" x="664" y="1123" /> + <di:waypoint xsi:type="dc:Point" x="664" y="1067" /> + <di:waypoint xsi:type="dc:Point" x="664" y="1038" /> + <di:waypoint xsi:type="dc:Point" x="704" y="1038" /> <bpmndi:BPMNLabel> - <dc:Bounds x="557" y="791" width="17" height="13" /> + <dc:Bounds x="679" y="1044" width="18" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_255" bpmnElement="ScriptTask_1"> - <dc:Bounds x="339" y="742" width="100" height="80" /> + <dc:Bounds x="461" y="995" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_CallActivity_15" targetElement="_BPMNShape_ScriptTask_255"> - <di:waypoint xsi:type="dc:Point" x="305" y="782" /> - <di:waypoint xsi:type="dc:Point" x="339" y="782" /> + <di:waypoint xsi:type="dc:Point" x="427" y="1035" /> + <di:waypoint xsi:type="dc:Point" x="461" y="1035" /> <bpmndi:BPMNLabel> - <dc:Bounds x="324" y="782" width="0" height="0" /> + <dc:Bounds x="446" y="1035" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_ScriptTask_255" targetElement="_BPMNShape_ExclusiveGateway_227"> - <di:waypoint xsi:type="dc:Point" x="439" y="782" /> - <di:waypoint xsi:type="dc:Point" x="492" y="782" /> - <di:waypoint xsi:type="dc:Point" x="492" y="845" /> + <di:waypoint xsi:type="dc:Point" x="561" y="1035" /> + <di:waypoint xsi:type="dc:Point" x="614" y="1035" /> + <di:waypoint xsi:type="dc:Point" x="614" y="1098" /> <bpmndi:BPMNLabel> - <dc:Bounds x="492" y="787" width="0" height="0" /> + <dc:Bounds x="614" y="1040" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_SubProcess_22" bpmnElement="SubProcess_1" isExpanded="true"> - <dc:Bounds x="18" y="1012" width="469" height="150" /> + <dc:Bounds x="0" y="1362" width="699" height="159" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_StartEvent_59" bpmnElement="CatchExceptions"> - <dc:Bounds x="36" y="1063" width="36" height="36" /> + <dc:Bounds x="20" y="1413" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="42" y="1108" width="85" height="12" /> + <dc:Bounds x="26" y="1458" width="86" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_281" bpmnElement="LogSaveWorkflowException"> - <dc:Bounds x="174" y="1041" width="100" height="80" /> + <dc:Bounds x="364" y="1391" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_EndEvent_188" bpmnElement="EndEvent_1"> - <dc:Bounds x="349" y="1062" width="36" height="36" /> + <dc:Bounds x="538" y="1413" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="367" y="1098" width="0" height="0" /> + <dc:Bounds x="556" y="1449" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_BoundaryEvent_55" bpmnElement="BoundaryEvent_1"> - <dc:Bounds x="469" y="1058" width="36" height="36" /> + <dc:Bounds x="681" y="1412" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="487" y="1094" width="0" height="0" /> + <dc:Bounds x="699" y="1448" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_EndEvent_189" bpmnElement="EndEvent_2"> - <dc:Bounds x="593" y="1058" width="36" height="36" /> + <dc:Bounds x="835" y="1412" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="611" y="1099" width="0" height="0" /> + <dc:Bounds x="853" y="1453" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_StartEvent_59" targetElement="_BPMNShape_ScriptTask_281"> - <di:waypoint xsi:type="dc:Point" x="72" y="1081" /> - <di:waypoint xsi:type="dc:Point" x="174" y="1081" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="120" y="1081" width="0" height="0" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_22" bpmnElement="SequenceFlow_22" sourceElement="_BPMNShape_ScriptTask_281" targetElement="_BPMNShape_EndEvent_188"> - <di:waypoint xsi:type="dc:Point" x="274" y="1081" /> - <di:waypoint xsi:type="dc:Point" x="311" y="1081" /> - <di:waypoint xsi:type="dc:Point" x="311" y="1080" /> - <di:waypoint xsi:type="dc:Point" x="349" y="1080" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="326" y="1071" width="0" height="0" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_23" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_BoundaryEvent_55" targetElement="_BPMNShape_EndEvent_189"> - <di:waypoint xsi:type="dc:Point" x="505" y="1076" /> - <di:waypoint xsi:type="dc:Point" x="593" y="1076" /> + <di:waypoint xsi:type="dc:Point" x="717" y="1430" /> + <di:waypoint xsi:type="dc:Point" x="835" y="1430" /> <bpmndi:BPMNLabel> - <dc:Bounds x="550" y="1051" width="0" height="0" /> + <dc:Bounds x="776" y="1415" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ExclusiveGateway_0a0hroy_di" bpmnElement="ExclusiveGateway_0a0hroy" isMarkerVisible="true"> - <dc:Bounds x="404.308277027027" y="332.23902027027026" width="50" height="50" /> + <dc:Bounds x="413" y="588" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="388" y="382.23902027027026" width="84" height="37" /> + <dc:Bounds x="397" y="638" width="84" height="38" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_0mnb4d7_di" bpmnElement="Task_08csf14"> - <dc:Bounds x="203" y="251" width="100" height="80" /> + <dc:Bounds x="212" y="507" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_1shi2a6_di" bpmnElement="Task_18r7u02"> - <dc:Bounds x="543" y="251" width="100" height="80" /> + <dc:Bounds x="552" y="507" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="CallActivity_0zvct4i_di" bpmnElement="Task_01ajtiy"> - <dc:Bounds x="738" y="251" width="100" height="80" /> + <dc:Bounds x="747" y="507" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0djpj3r_di" bpmnElement="SequenceFlow_0djpj3r"> - <di:waypoint xsi:type="dc:Point" x="303" y="291" /> - <di:waypoint xsi:type="dc:Point" x="429" y="291" /> - <di:waypoint xsi:type="dc:Point" x="429" y="333" /> + <di:waypoint xsi:type="dc:Point" x="312" y="547" /> + <di:waypoint xsi:type="dc:Point" x="438" y="547" /> + <di:waypoint xsi:type="dc:Point" x="438" y="589" /> <bpmndi:BPMNLabel> - <dc:Bounds x="366" y="276" width="0" height="0" /> + <dc:Bounds x="375" y="532" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ExclusiveGateway_0uvarlv_di" bpmnElement="ExclusiveGateway_0uvarlv" isMarkerVisible="true"> - <dc:Bounds x="912" y="332.4552364864865" width="50" height="50" /> + <dc:Bounds x="921" y="588" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="897" y="382.4552364864865" width="80" height="25" /> + <dc:Bounds x="907" y="638" width="78" height="26" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_185bo77_di" bpmnElement="SequenceFlow_185bo77"> - <di:waypoint xsi:type="dc:Point" x="454" y="357" /> - <di:waypoint xsi:type="dc:Point" x="683" y="357" /> - <di:waypoint xsi:type="dc:Point" x="683" y="357" /> - <di:waypoint xsi:type="dc:Point" x="912" y="357" /> + <di:waypoint xsi:type="dc:Point" x="463" y="613" /> + <di:waypoint xsi:type="dc:Point" x="692" y="613" /> + <di:waypoint xsi:type="dc:Point" x="692" y="613" /> + <di:waypoint xsi:type="dc:Point" x="921" y="613" /> <bpmndi:BPMNLabel> - <dc:Bounds x="692" y="357" width="12" height="13" /> + <dc:Bounds x="701" y="613" width="12" height="14" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_111l1he_di" bpmnElement="SequenceFlow_111l1he"> - <di:waypoint xsi:type="dc:Point" x="454" y="357" /> - <di:waypoint xsi:type="dc:Point" x="484" y="357" /> - <di:waypoint xsi:type="dc:Point" x="484" y="291" /> - <di:waypoint xsi:type="dc:Point" x="543" y="291" /> + <di:waypoint xsi:type="dc:Point" x="463" y="613" /> + <di:waypoint xsi:type="dc:Point" x="493" y="613" /> + <di:waypoint xsi:type="dc:Point" x="493" y="547" /> + <di:waypoint xsi:type="dc:Point" x="552" y="547" /> <bpmndi:BPMNLabel> - <dc:Bounds x="499" y="297" width="18" height="13" /> + <dc:Bounds x="508" y="553" width="18" height="14" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0ca4brn_di" bpmnElement="SequenceFlow_0ca4brn"> - <di:waypoint xsi:type="dc:Point" x="643" y="291" /> - <di:waypoint xsi:type="dc:Point" x="684" y="291" /> - <di:waypoint xsi:type="dc:Point" x="684" y="291" /> - <di:waypoint xsi:type="dc:Point" x="738" y="291" /> + <di:waypoint xsi:type="dc:Point" x="652" y="547" /> + <di:waypoint xsi:type="dc:Point" x="693" y="547" /> + <di:waypoint xsi:type="dc:Point" x="693" y="547" /> + <di:waypoint xsi:type="dc:Point" x="747" y="547" /> <bpmndi:BPMNLabel> - <dc:Bounds x="699" y="291" width="0" height="0" /> + <dc:Bounds x="708" y="547" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_19r2uus_di" bpmnElement="SequenceFlow_19r2uus"> - <di:waypoint xsi:type="dc:Point" x="838" y="291" /> - <di:waypoint xsi:type="dc:Point" x="937" y="291" /> - <di:waypoint xsi:type="dc:Point" x="937" y="332" /> + <di:waypoint xsi:type="dc:Point" x="847" y="547" /> + <di:waypoint xsi:type="dc:Point" x="946" y="547" /> + <di:waypoint xsi:type="dc:Point" x="946" y="588" /> <bpmndi:BPMNLabel> - <dc:Bounds x="888" y="276" width="0" height="0" /> + <dc:Bounds x="897" y="532" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1p0v6yk_di" bpmnElement="SequenceFlow_1p0v6yk"> - <di:waypoint xsi:type="dc:Point" x="937" y="382" /> - <di:waypoint xsi:type="dc:Point" x="937" y="468" /> - <di:waypoint xsi:type="dc:Point" x="38" y="468" /> - <di:waypoint xsi:type="dc:Point" x="38" y="547" /> - <di:waypoint xsi:type="dc:Point" x="95" y="547" /> + <di:waypoint xsi:type="dc:Point" x="946" y="638" /> + <di:waypoint xsi:type="dc:Point" x="946" y="724" /> + <di:waypoint xsi:type="dc:Point" x="47" y="724" /> + <di:waypoint xsi:type="dc:Point" x="47" y="803" /> + <di:waypoint xsi:type="dc:Point" x="104" y="803" /> <bpmndi:BPMNLabel> - <dc:Bounds x="498" y="476" width="18" height="13" /> + <dc:Bounds x="507" y="732" width="18" height="14" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_03i4czf_di" bpmnElement="SequenceFlow_03i4czf"> - <di:waypoint xsi:type="dc:Point" x="962" y="357" /> - <di:waypoint xsi:type="dc:Point" x="1027" y="357" /> - <di:waypoint xsi:type="dc:Point" x="1027" y="453" /> - <di:waypoint xsi:type="dc:Point" x="21" y="453" /> - <di:waypoint xsi:type="dc:Point" x="21" y="606" /> - <di:waypoint xsi:type="dc:Point" x="405" y="606" /> + <di:waypoint xsi:type="dc:Point" x="971" y="613" /> + <di:waypoint xsi:type="dc:Point" x="1036" y="613" /> + <di:waypoint xsi:type="dc:Point" x="1036" y="709" /> + <di:waypoint xsi:type="dc:Point" x="30" y="709" /> + <di:waypoint xsi:type="dc:Point" x="30" y="862" /> + <di:waypoint xsi:type="dc:Point" x="414" y="862" /> <bpmndi:BPMNLabel> - <dc:Bounds x="499" y="427" width="12" height="13" /> + <dc:Bounds x="508" y="683" width="12" height="14" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ExclusiveGateway_1yozzae_di" bpmnElement="ExclusiveGateway_1yozzae" isMarkerVisible="true"> + <dc:Bounds x="278" y="93" width="50" height="50" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="267" y="143" width="72" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_11er1t8_di" bpmnElement="SequenceFlow_11er1t8"> + <di:waypoint xsi:type="dc:Point" x="328" y="118" /> + <di:waypoint xsi:type="dc:Point" x="404" y="117" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="360" y="93.5" width="12" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_0ggp8wz_di" bpmnElement="SequenceFlow_0ggp8wz"> + <di:waypoint xsi:type="dc:Point" x="303" y="93" /> + <di:waypoint xsi:type="dc:Point" x="303" y="-11" /> + <di:waypoint xsi:type="dc:Point" x="1152" y="-11" /> + <di:waypoint xsi:type="dc:Point" x="1177" y="1105" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="719" y="-26" width="18" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_22" bpmnElement="SequenceFlow_22" sourceElement="_BPMNShape_ScriptTask_281" targetElement="_BPMNShape_EndEvent_188"> + <di:waypoint xsi:type="dc:Point" x="464" y="1431" /> + <di:waypoint xsi:type="dc:Point" x="538" y="1431" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="501" y="1416" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_StartEvent_59" targetElement="_BPMNShape_ScriptTask_281"> + <di:waypoint xsi:type="dc:Point" x="56" y="1431" /> + <di:waypoint xsi:type="dc:Point" x="171" y="1431" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="114" y="1416" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ExclusiveGateway_1938vz9_di" bpmnElement="ExclusiveGateway_1938vz9" isMarkerVisible="true"> + <dc:Bounds x="921.561377245509" y="357" width="50" height="50" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="902" y="407" width="90" height="24" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ScriptTask_17dmaj7_di" bpmnElement="PrepareSDNCDeactivateRequest"> + <dc:Bounds x="204" y="281" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="CallActivity_0ouj5y6_di" bpmnElement="CallSDNCDeactivate"> + <dc:Bounds x="401" y="280" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ScriptTask_1fmh02z_di" bpmnElement="PostProcessSDNCDeactivateRequest"> + <dc:Bounds x="613" y="280" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_0ugalf8_di" bpmnElement="SequenceFlow_0ugalf8"> + <di:waypoint xsi:type="dc:Point" x="304" y="321" /> + <di:waypoint xsi:type="dc:Point" x="401" y="320" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="353" y="295.5" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_0n78x37_di" bpmnElement="SequenceFlow_0n78x37"> + <di:waypoint xsi:type="dc:Point" x="501" y="320" /> + <di:waypoint xsi:type="dc:Point" x="613" y="320" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="557" y="295" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_06rm0hg_di" bpmnElement="SequenceFlow_06rm0hg"> + <di:waypoint xsi:type="dc:Point" x="713" y="320" /> + <di:waypoint xsi:type="dc:Point" x="947" y="320" /> + <di:waypoint xsi:type="dc:Point" x="947" y="357" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="830" y="305" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_0n58kg1_di" bpmnElement="SequenceFlow_0n58kg1"> + <di:waypoint xsi:type="dc:Point" x="972" y="382" /> + <di:waypoint xsi:type="dc:Point" x="1033" y="382" /> + <di:waypoint xsi:type="dc:Point" x="1033" y="466" /> + <di:waypoint xsi:type="dc:Point" x="14" y="466" /> + <di:waypoint xsi:type="dc:Point" x="14" y="613" /> + <di:waypoint xsi:type="dc:Point" x="413" y="613" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="508" y="444" width="12" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_0unumxv_di" bpmnElement="SequenceFlow_0unumxv"> + <di:waypoint xsi:type="dc:Point" x="947" y="407" /> + <di:waypoint xsi:type="dc:Point" x="947" y="482" /> + <di:waypoint xsi:type="dc:Point" x="32" y="482" /> + <di:waypoint xsi:type="dc:Point" x="32" y="547" /> + <di:waypoint xsi:type="dc:Point" x="211" y="547" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="506" y="493" width="18" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1iufuuu_di" bpmnElement="SequenceFlow_1iufuuu"> + <di:waypoint xsi:type="dc:Point" x="287" y="1177" /> + <di:waypoint xsi:type="dc:Point" x="328" y="1177" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="308" y="1162" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1l4n37b_di" bpmnElement="SequenceFlow_1l4n37b"> + <di:waypoint xsi:type="dc:Point" x="428" y="1177" /> + <di:waypoint xsi:type="dc:Point" x="469" y="1176" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="449" y="1161.5" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ScriptTask_0qvylv2_di" bpmnElement="PrepareSDNCUnassignRequest"> + <dc:Bounds x="187" y="1138" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="CallActivity_1stidyk_di" bpmnElement="CallSDNCAdapterUnassign"> + <dc:Bounds x="328" y="1137" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ScriptTask_1ub9z2k_di" bpmnElement="PostProcessSDNCUnassignRequest"> + <dc:Bounds x="469" y="1136" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ExclusiveGateway_1h87hhh_di" bpmnElement="ExclusiveGateway_1h87hhh" isMarkerVisible="true"> + <dc:Bounds x="55.989141164856846" y="1077.9259624876604" width="50" height="50" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="41" y="1127.9259624876604" width="79" height="24" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1rpg6ac_di" bpmnElement="SequenceFlow_1rpg6ac"> + <di:waypoint xsi:type="dc:Point" x="81" y="1078" /> + <di:waypoint xsi:type="dc:Point" x="81" y="1035" /> + <di:waypoint xsi:type="dc:Point" x="187" y="1035" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="100" y="1010.5" width="12" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_16ghmax_di" bpmnElement="SequenceFlow_16ghmax"> + <di:waypoint xsi:type="dc:Point" x="81" y="1128" /> + <di:waypoint xsi:type="dc:Point" x="81" y="1178" /> + <di:waypoint xsi:type="dc:Point" x="187" y="1178" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="92" y="1182" width="18" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_12otwa4_di" bpmnElement="SequenceFlow_12otwa4"> + <di:waypoint xsi:type="dc:Point" x="569" y="1176" /> + <di:waypoint xsi:type="dc:Point" x="579" y="1176" /> + <di:waypoint xsi:type="dc:Point" x="579" y="1123" /> + <di:waypoint xsi:type="dc:Point" x="589" y="1123" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="594" y="1139.5" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1h8ve60_di" bpmnElement="SequenceFlow_1h8ve60"> + <di:waypoint xsi:type="dc:Point" x="1128" y="1123" /> + <di:waypoint xsi:type="dc:Point" x="1159" y="1123" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1144" y="1108" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ScriptTask_0lrbhgj_di" bpmnElement="SetSuccessfulRollbackStatus"> + <dc:Bounds x="1028" y="1083" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_02fx6z6_di" bpmnElement="SequenceFlow_02fx6z6"> + <di:waypoint xsi:type="dc:Point" x="271" y="1431" /> + <di:waypoint xsi:type="dc:Point" x="364" y="1431" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="318" y="1416" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ScriptTask_0cd144f_di" bpmnElement="SetFailedRollbackStatus"> + <dc:Bounds x="171" y="1391" width="100" height="80" /> + </bpmndi:BPMNShape> </bpmndi:BPMNPlane> </bpmndi:BPMNDiagram> -</bpmn2:definitions> +</bpmn2:definitions>
\ No newline at end of file diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModuleVolumeRollback.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModuleVolumeRollback.bpmn new file mode 100644 index 0000000000..fd2889f642 --- /dev/null +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModuleVolumeRollback.bpmn @@ -0,0 +1,247 @@ +<?xml version="1.0" encoding="UTF-8"?> +<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0"> + <bpmn:process id="DoCreateVfModuleVolumeRollback" name="DoCreateVfModuleVolumeRollback" isExecutable="true"> + <bpmn:subProcess id="SubProcess_1p4663w" name="Sub-process for UnexpectedErrors" triggeredByEvent="true"> + <bpmn:scriptTask id="ScriptTask_0by1uwk" name="Log / Print Unexpected Error" scriptFormat="groovy"> + <bpmn:incoming>SequenceFlow_0xktw7v</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_0soe5t3</bpmn:outgoing> + <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def doCreateVfModuleVolumeRollback = new DoCreateVfModuleVolumeRollback() +doCreateVfModuleVolumeRollback.processJavaException(execution)]]></bpmn:script> + </bpmn:scriptTask> + <bpmn:startEvent id="StartEvent_1j0eixl"> + <bpmn:outgoing>SequenceFlow_0xktw7v</bpmn:outgoing> + <bpmn:errorEventDefinition /> + </bpmn:startEvent> + <bpmn:endEvent id="EndEvent_0jxh015"> + <bpmn:incoming>SequenceFlow_0soe5t3</bpmn:incoming> + </bpmn:endEvent> + <bpmn:sequenceFlow id="SequenceFlow_0xktw7v" name="" sourceRef="StartEvent_1j0eixl" targetRef="ScriptTask_0by1uwk" /> + <bpmn:sequenceFlow id="SequenceFlow_0soe5t3" name="" sourceRef="ScriptTask_0by1uwk" targetRef="EndEvent_0jxh015" /> + </bpmn:subProcess> + <bpmn:startEvent id="StartEvent_0128tti" name="Fault Start"> + <bpmn:outgoing>SequenceFlow_0qreiaa</bpmn:outgoing> + <bpmn:errorEventDefinition /> + </bpmn:startEvent> + <bpmn:exclusiveGateway id="ExclusiveGateway_128ycfs" name="Is RollBack On?" default="SequenceFlow_1wberw3"> + <bpmn:incoming>SequenceFlow_1xah9es</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_11y7faf</bpmn:outgoing> + <bpmn:outgoing>SequenceFlow_1wberw3</bpmn:outgoing> + </bpmn:exclusiveGateway> + <bpmn:exclusiveGateway id="ExclusiveGateway_03qps8q" name="Is Vnf Ok?" default="SequenceFlow_10dawse"> + <bpmn:incoming>SequenceFlow_11y7faf</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_0h7k68j</bpmn:outgoing> + <bpmn:outgoing>SequenceFlow_10dawse</bpmn:outgoing> + </bpmn:exclusiveGateway> + <bpmn:callActivity id="CallActivity_03pmk7v" name="Call VNF Adapter Rollback" calledElement="vnfAdapterRestV1"> + <bpmn:extensionElements> + <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" /> + <camunda:in source="DCVFMODVOLRBK_rollbackVnfARequest" target="vnfAdapterRestV1Request" /> + <camunda:out source="workflowException" target="workflowException" /> + <camunda:in source="mso-request-id" target="mso-request-id" /> + <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" /> + </bpmn:extensionElements> + <bpmn:incoming>SequenceFlow_0h7k68j</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_0bv04qn</bpmn:outgoing> + </bpmn:callActivity> + <bpmn:sequenceFlow id="SequenceFlow_0h7k68j" sourceRef="ExclusiveGateway_03qps8q" targetRef="CallActivity_03pmk7v"> + <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFMODVOLRBK_isCreateVnfRollbackNeeded") == "true"}]]></bpmn:conditionExpression> + </bpmn:sequenceFlow> + <bpmn:scriptTask id="ScriptTask_1numqm0" name="Delete Volume Group" scriptFormat="groovy"> + <bpmn:incoming>SequenceFlow_0bv04qn</bpmn:incoming> + <bpmn:incoming>SequenceFlow_17k6oyz</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_13nb3n0</bpmn:outgoing> + <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def doCreateVfModuleVolumeRollback = new DoCreateVfModuleVolumeRollback() +doCreateVfModuleVolumeRollback.executeMethod('callRESTDeleteAAIVolumeGroup', execution, isDebugLogEnabled)]]></bpmn:script> + </bpmn:scriptTask> + <bpmn:sequenceFlow id="SequenceFlow_0bv04qn" sourceRef="CallActivity_03pmk7v" targetRef="ScriptTask_1numqm0" /> + <bpmn:sequenceFlow id="SequenceFlow_10dawse" sourceRef="ExclusiveGateway_03qps8q" targetRef="ExclusiveGateway_1dzejtx" /> + <bpmn:sequenceFlow id="SequenceFlow_13nb3n0" sourceRef="ScriptTask_1numqm0" targetRef="EndEvent_11duf9p" /> + <bpmn:exclusiveGateway id="ExclusiveGateway_1dzejtx" name="Is AAI Ok?" default="SequenceFlow_1do0853"> + <bpmn:incoming>SequenceFlow_10dawse</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_17k6oyz</bpmn:outgoing> + <bpmn:outgoing>SequenceFlow_1do0853</bpmn:outgoing> + </bpmn:exclusiveGateway> + <bpmn:sequenceFlow id="SequenceFlow_17k6oyz" sourceRef="ExclusiveGateway_1dzejtx" targetRef="ScriptTask_1numqm0"> + <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFMODVOLRBK_isAAIRollbackNeeded" ) == "true"}]]></bpmn:conditionExpression> + </bpmn:sequenceFlow> + <bpmn:sequenceFlow id="SequenceFlow_1do0853" sourceRef="ExclusiveGateway_1dzejtx" targetRef="EndEvent_1ddbl39" /> + <bpmn:endEvent id="EndEvent_1ddbl39"> + <bpmn:incoming>SequenceFlow_1do0853</bpmn:incoming> + <bpmn:incoming>SequenceFlow_1wberw3</bpmn:incoming> + </bpmn:endEvent> + <bpmn:endEvent id="EndEvent_11duf9p"> + <bpmn:incoming>SequenceFlow_13nb3n0</bpmn:incoming> + </bpmn:endEvent> + <bpmn:sequenceFlow id="SequenceFlow_11y7faf" sourceRef="ExclusiveGateway_128ycfs" targetRef="ExclusiveGateway_03qps8q"> + <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFMODVOLRBK_backoutOnFailure") != "false"}]]></bpmn:conditionExpression> + </bpmn:sequenceFlow> + <bpmn:scriptTask id="ScriptTask_0uhy9lc" name="Pre process" scriptFormat="groovy"> + <bpmn:incoming>SequenceFlow_0qreiaa</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_1xah9es</bpmn:outgoing> + <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def doCreateVfModuleVolumeRollback = new DoCreateVfModuleVolumeRollback() +doCreateVfModuleVolumeRollback.preProcessRequest(execution)]]></bpmn:script> + </bpmn:scriptTask> + <bpmn:sequenceFlow id="SequenceFlow_1wberw3" sourceRef="ExclusiveGateway_128ycfs" targetRef="EndEvent_1ddbl39" /> + <bpmn:sequenceFlow id="SequenceFlow_0qreiaa" sourceRef="StartEvent_0128tti" targetRef="ScriptTask_0uhy9lc" /> + <bpmn:sequenceFlow id="SequenceFlow_1xah9es" sourceRef="ScriptTask_0uhy9lc" targetRef="ExclusiveGateway_128ycfs" /> + </bpmn:process> + <bpmndi:BPMNDiagram id="BPMNDiagram_1"> + <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateVfModuleVolumeRollback"> + <bpmndi:BPMNShape id="SubProcess_1p4663w_di" bpmnElement="SubProcess_1p4663w" isExpanded="true"> + <dc:Bounds x="293" y="165" width="394" height="188" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ScriptTask_0by1uwk_di" bpmnElement="ScriptTask_0by1uwk"> + <dc:Bounds x="441" y="220" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="StartEvent_1j0eixl_di" bpmnElement="StartEvent_1j0eixl"> + <dc:Bounds x="326" y="242" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="344" y="283" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="EndEvent_0jxh015_di" bpmnElement="EndEvent_0jxh015"> + <dc:Bounds x="602" y="242" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="620" y="283" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_0xktw7v_di" bpmnElement="SequenceFlow_0xktw7v"> + <di:waypoint xsi:type="dc:Point" x="362" y="260" /> + <di:waypoint xsi:type="dc:Point" x="441" y="260" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="404" y="260" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_0soe5t3_di" bpmnElement="SequenceFlow_0soe5t3"> + <di:waypoint xsi:type="dc:Point" x="541" y="260" /> + <di:waypoint xsi:type="dc:Point" x="602" y="260" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="576" y="260" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="StartEvent_0128tti_di" bpmnElement="StartEvent_0128tti"> + <dc:Bounds x="173" y="-93" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="167" y="-52" width="50" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ExclusiveGateway_128ycfs_di" bpmnElement="ExclusiveGateway_128ycfs" isMarkerVisible="true"> + <dc:Bounds x="465" y="-100" width="50" height="50" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="450" y="-50" width="79" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ExclusiveGateway_03qps8q_di" bpmnElement="ExclusiveGateway_03qps8q" isMarkerVisible="true"> + <dc:Bounds x="607" y="-100" width="50" height="50" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="606" y="-50" width="52" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="CallActivity_03pmk7v_di" bpmnElement="CallActivity_03pmk7v"> + <dc:Bounds x="786" y="-115" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_0h7k68j_di" bpmnElement="SequenceFlow_0h7k68j"> + <di:waypoint xsi:type="dc:Point" x="657" y="-75" /> + <di:waypoint xsi:type="dc:Point" x="786" y="-75" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="722" y="-90" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ScriptTask_1numqm0_di" bpmnElement="ScriptTask_1numqm0"> + <dc:Bounds x="998" y="-115" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_0bv04qn_di" bpmnElement="SequenceFlow_0bv04qn"> + <di:waypoint xsi:type="dc:Point" x="886" y="-75" /> + <di:waypoint xsi:type="dc:Point" x="937" y="-75" /> + <di:waypoint xsi:type="dc:Point" x="937" y="-75" /> + <di:waypoint xsi:type="dc:Point" x="998" y="-75" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="952" y="-75" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_10dawse_di" bpmnElement="SequenceFlow_10dawse"> + <di:waypoint xsi:type="dc:Point" x="632" y="-50" /> + <di:waypoint xsi:type="dc:Point" x="632" y="40" /> + <di:waypoint xsi:type="dc:Point" x="811" y="40" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="648" y="-5" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_13nb3n0_di" bpmnElement="SequenceFlow_13nb3n0"> + <di:waypoint xsi:type="dc:Point" x="1098" y="-75" /> + <di:waypoint xsi:type="dc:Point" x="1151" y="-75" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1125" y="-90" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ExclusiveGateway_1dzejtx_di" bpmnElement="ExclusiveGateway_1dzejtx" isMarkerVisible="true"> + <dc:Bounds x="811" y="15" width="50" height="50" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="809" y="65" width="53" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_17k6oyz_di" bpmnElement="SequenceFlow_17k6oyz"> + <di:waypoint xsi:type="dc:Point" x="861" y="40" /> + <di:waypoint xsi:type="dc:Point" x="1048" y="40" /> + <di:waypoint xsi:type="dc:Point" x="1048" y="-35" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="955" y="25" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1do0853_di" bpmnElement="SequenceFlow_1do0853"> + <di:waypoint xsi:type="dc:Point" x="836" y="65" /> + <di:waypoint xsi:type="dc:Point" x="836" y="99" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="851" y="82" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="EndEvent_0le8wga_di" bpmnElement="EndEvent_1ddbl39"> + <dc:Bounds x="818" y="99" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="836" y="135" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="EndEvent_1iibjyo_di" bpmnElement="EndEvent_11duf9p"> + <dc:Bounds x="1151" y="-93" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1169" y="-57" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_11y7faf_di" bpmnElement="SequenceFlow_11y7faf"> + <di:waypoint xsi:type="dc:Point" x="515" y="-75" /> + <di:waypoint xsi:type="dc:Point" x="607" y="-75" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="561" y="-90" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ScriptTask_0uhy9lc_di" bpmnElement="ScriptTask_0uhy9lc"> + <dc:Bounds x="288" y="-115" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1wberw3_di" bpmnElement="SequenceFlow_1wberw3"> + <di:waypoint xsi:type="dc:Point" x="490" y="-50" /> + <di:waypoint xsi:type="dc:Point" x="490" y="117" /> + <di:waypoint xsi:type="dc:Point" x="818" y="117" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="505" y="23.5" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_0qreiaa_di" bpmnElement="SequenceFlow_0qreiaa"> + <di:waypoint xsi:type="dc:Point" x="209" y="-75" /> + <di:waypoint xsi:type="dc:Point" x="288" y="-75" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="249" y="-100" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1xah9es_di" bpmnElement="SequenceFlow_1xah9es"> + <di:waypoint xsi:type="dc:Point" x="388" y="-75" /> + <di:waypoint xsi:type="dc:Point" x="465" y="-75" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="427" y="-100" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + </bpmndi:BPMNPlane> + </bpmndi:BPMNDiagram> +</bpmn:definitions> diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModuleVolumeV1.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModuleVolumeV1.bpmn deleted file mode 100644 index de88284db6..0000000000 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModuleVolumeV1.bpmn +++ /dev/null @@ -1,675 +0,0 @@ -<?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" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_FhrCQG2BEeaNdqnn65BT4A" exporter="camunda modeler" exporterVersion="2.7.0" targetNamespace="http://camunda.org/schema/1.0/bpmn"> - <bpmn2:process id="DoCreateVfModuleVolumeV1" name="DoCreateVfModuleVolumeV1" isExecutable="true"> - <bpmn2:scriptTask id="ScriptTask_preProcessRequest" name="Preprocess Request" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_22</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* -def doCreateVfModuleVolumeV1 = new DoCreateVfModuleVolumeV1() -doCreateVfModuleVolumeV1.executeMethod('preProcessRequest', execution, isDebugLogEnabled)]]></bpmn2:script> - </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_22" name="" sourceRef="ScriptTask_preProcessRequest" targetRef="ScriptTask_callRestAaiCloudRegion"/> - <bpmn2:scriptTask id="ScriptTask_callRestAaiCloudRegion" name="Call REST AAI Cloud Region" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_22</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_23</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* -def doCreateVfModuleVolumeV1 = new DoCreateVfModuleVolumeV1() -doCreateVfModuleVolumeV1.executeMethod('callRESTQueryAAICloudRegion', execution, isDebugLogEnabled)]]></bpmn2:script> - </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_23" name="" sourceRef="ScriptTask_callRestAaiCloudRegion" targetRef="ScriptTask_callRestAaiQueryGenericVnf"/> - <bpmn2:scriptTask id="ScriptTask_createVolGrpExistsException" name="Build Workflow Exception" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_volGrpName404No</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* -def doCreateVfModuleVolumeV1 = new DoCreateVfModuleVolumeV1() -doCreateVfModuleVolumeV1.executeMethod('buildWorkflowException', execution, 2500, "Volume group $DCVFMODVOLV1_volumeGroupName already exists in the system.", isDebugLogEnabled)]]></bpmn2:script> - </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="ScriptTask_createVolGrpExistsException" targetRef="EndEvent_6"/> - <bpmn2:exclusiveGateway id="ExclusiveGateway_aaiReturnCode404" name="AAI Return Code is 404?" default="SequenceFlow_volGrpName404No"> - <bpmn2:incoming>SequenceFlow_19</bpmn2:incoming> - <bpmn2:incoming>SequenceFlow_6</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_volGrpName404Yes</bpmn2:outgoing> - <bpmn2:outgoing>SequenceFlow_volGrpName404No</bpmn2:outgoing> - </bpmn2:exclusiveGateway> - <bpmn2:sequenceFlow id="SequenceFlow_volGrpName404Yes" name="Yes" sourceRef="ExclusiveGateway_aaiReturnCode404" targetRef="ScriptTask_callRestAaiCreateVolumeGrp"> - <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{DCVFMODVOLV1_AaiReturnCode == '404'}</bpmn2:conditionExpression> - </bpmn2:sequenceFlow> - <bpmn2:sequenceFlow id="SequenceFlow_volGrpName404No" name="No" sourceRef="ExclusiveGateway_aaiReturnCode404" targetRef="ScriptTask_createVolGrpExistsException"/> - <bpmn2:scriptTask id="ScriptTask_callRestAaiQueryGenericVnf" name="Call REST AAI Query Generic VNF" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_23</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* -def doCreateVfModuleVolumeV1 = new DoCreateVfModuleVolumeV1() -doCreateVfModuleVolumeV1.executeMethod('callRESTQueryAAIGenericVnf', execution, isDebugLogEnabled)]]></bpmn2:script> - </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_14" name="" sourceRef="ScriptTask_callRestAaiQueryGenericVnf" targetRef="ScriptTask_callRestAaiQueryVolGrpName"/> - <bpmn2:boundaryEvent id="BoundaryEvent_catchAaiError" name="" attachedToRef="ScriptTask_callRestAaiQueryVolGrpName"> - <bpmn2:outgoing>SequenceFlow_19</bpmn2:outgoing> - <bpmn2:errorEventDefinition id="ErrorEventDefinition_3" errorRef="Error_1"/> - </bpmn2:boundaryEvent> - <bpmn2:sequenceFlow id="SequenceFlow_19" name="" sourceRef="BoundaryEvent_catchAaiError" targetRef="ExclusiveGateway_aaiReturnCode404"/> - <bpmn2:scriptTask id="ScriptTask_callRestAaiQueryVolGrpName" name="Call REST AAI Query Volume Grp Name" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_14</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* -def doCreateVfModuleVolumeV1 = new DoCreateVfModuleVolumeV1() -doCreateVfModuleVolumeV1.executeMethod('callRESTQueryAAIVolGrpName', execution, isDebugLogEnabled)]]></bpmn2:script> - </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="ScriptTask_callRestAaiQueryVolGrpName" targetRef="ExclusiveGateway_aaiReturnCode404"/> - <bpmn2:scriptTask id="ScriptTask_callRestAaiCreateVolumeGrp" name="Call REST AAI Create Volume Group" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_volGrpName404Yes</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_9</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* -def doCreateVfModuleVolumeV1 = new DoCreateVfModuleVolumeV1() -doCreateVfModuleVolumeV1.executeMethod('callRESTCreateAAIVolGrpName', execution, isDebugLogEnabled)]]></bpmn2:script> - </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_9" name="" sourceRef="ScriptTask_callRestAaiCreateVolumeGrp" targetRef="ScriptTask_prepareVnfAdapterCreate"/> - <bpmn2:callActivity id="CallActivity_callVnfAdapterCreate" name="Call VNF Adapter Create" calledElement="vnfAdapterRestV1"> - <bpmn2:extensionElements> - <camunda:in source="DCVFMODVOLV1_createVnfARequest" target="vnfAdapterRestV1Request"/> - <camunda:in source="mso-request-id" target="mso-request-id"/> - <camunda:in source="mso-service-instance-id" target="mso-service-instance-id"/> - <camunda:out source="vnfAdapterRestV1Response" target="DCVFMODVOLV1_createVnfAResponse"/> - <camunda:out source="WorkflowException" target="WorkflowException"/> - <camunda:out source="VNFREST_vnfAdapterStatusCode" target="DCVFMODVOLV1_createVnfAReturnCode"/> - <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled"/> - <camunda:out source="VNFREST_SuccessIndicator" target="VNFREST_SuccessIndicator"/> - </bpmn2:extensionElements> - <bpmn2:incoming>SequenceFlow_10</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing> - </bpmn2:callActivity> - <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="CallActivity_callVnfAdapterCreate" targetRef="ExclusiveGateway_isVnfAdaptyerCallSuccess"/> - <bpmn2:boundaryEvent id="BoundaryEvent_5" name="" attachedToRef="ScriptTask_callRestAaiVolumeGrp"> - <bpmn2:outgoing>SequenceFlow_11</bpmn2:outgoing> - <bpmn2:errorEventDefinition id="ErrorEventDefinition_5"/> - </bpmn2:boundaryEvent> - <bpmn2:sequenceFlow id="SequenceFlow_11" name="" sourceRef="BoundaryEvent_5" targetRef="ExclusiveGateway_isRollbakcEnabled1"/> - <bpmn2:exclusiveGateway id="ExclusiveGateway_isVnfAdaptyerCallSuccess" name="Is VNF Adapter call success?" default="SequenceFlow_vnfAdapterFail"> - <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_vnfAdapterFail</bpmn2:outgoing> - <bpmn2:outgoing>SequenceFlow_vnfAdapterSuccess</bpmn2:outgoing> - </bpmn2:exclusiveGateway> - <bpmn2:sequenceFlow id="SequenceFlow_vnfAdapterFail" name="No" sourceRef="ExclusiveGateway_isVnfAdaptyerCallSuccess" targetRef="ExclusiveGateway_isRollbackEnabled2"/> - <bpmn2:sequenceFlow id="SequenceFlow_vnfAdapterSuccess" name="Yes" sourceRef="ExclusiveGateway_isVnfAdaptyerCallSuccess" targetRef="ScriptTask_callRestAaiRequeryVolGrpNm"> - <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{VNFREST_SuccessIndicator == true}</bpmn2:conditionExpression> - </bpmn2:sequenceFlow> - <bpmn2:scriptTask id="ScriptTask_callRestAaiRequeryVolGrpNm" name="Call REST AAI Requery Volume Group Name" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_vnfAdapterSuccess</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_28</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* -def doCreateVfModuleVolumeV1 = new DoCreateVfModuleVolumeV1() -doCreateVfModuleVolumeV1.executeMethod('callRESTQueryAAIVolGrpName', execution, isDebugLogEnabled)]]></bpmn2:script> - </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_28" name="" sourceRef="ScriptTask_callRestAaiRequeryVolGrpNm" targetRef="ScriptTask_callRestAaiVolumeGrp"/> - <bpmn2:boundaryEvent id="BoundaryEvent_compensateCreateVolGrp" name="" attachedToRef="ScriptTask_callRestAaiCreateVolumeGrp"> - <bpmn2:compensateEventDefinition id="CompensateEventDefinition_2" waitForCompletion="true"/> - </bpmn2:boundaryEvent> - <bpmn2:scriptTask id="ScriptTask_prepareDbInfraRequest" name="Set Success Indicator" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* -def doCreateVfModuleVolumeV1 = new DoCreateVfModuleVolumeV1() -doCreateVfModuleVolumeV1.executeMethod('setSuccessIndicator', execution, true)]]></bpmn2:script> - </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="ScriptTask_prepareDbInfraRequest" targetRef="EndEvent_1"/> - <bpmn2:scriptTask id="ScriptTask_deleteVolumeGroup" name="Delete Volume Group" isForCompensation="true" scriptFormat="groovy"> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* -def doCreateVfModuleVolumeV1 = new DoCreateVfModuleVolumeV1() -doCreateVfModuleVolumeV1.executeMethod('callRESTDeleteAAIVolumeGroup', execution, isDebugLogEnabled)]]></bpmn2:script> - </bpmn2:scriptTask> - <bpmn2:scriptTask id="ScriptTask_callRestAaiVolumeGrp" name="Call REST AAI Update Volume Group" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_28</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* -def doCreateVfModuleVolumeV1 = new DoCreateVfModuleVolumeV1() -doCreateVfModuleVolumeV1.executeMethod('callRESTUpdateCreatedVolGrpName', execution, isDebugLogEnabled)]]></bpmn2:script> - </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="ScriptTask_callRestAaiVolumeGrp" targetRef="ScriptTask_prepareDbInfraRequest"/> - <bpmn2:endEvent id="EndEvent_1" name="End"> - <bpmn2:incoming>SequenceFlow_8</bpmn2:incoming> - </bpmn2:endEvent> - <bpmn2:scriptTask id="ScriptTask_prepareVnfAdapterCreate" name="Prepare VNF Adapter Create Request" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_10</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* -def doCreateVfModuleVolumeV1 = new DoCreateVfModuleVolumeV1() -doCreateVfModuleVolumeV1.executeMethod('prepareVnfAdapterCreateRequest', execution, isDebugLogEnabled)]]></bpmn2:script> - </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_10" name="" sourceRef="ScriptTask_prepareVnfAdapterCreate" targetRef="CallActivity_callVnfAdapterCreate"/> - <bpmn2:boundaryEvent id="BoundaryEvent_compensateVnfAdapterCreate" name="" attachedToRef="CallActivity_callVnfAdapterCreate"> - <bpmn2:compensateEventDefinition id="CompensateEventDefinition_1" waitForCompletion="true"/> - </bpmn2:boundaryEvent> - <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_rollbackAaiCreateVolumeGroup" name="Rollback AAI Create Volume Group"> - <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_12</bpmn2:outgoing> - <bpmn2:compensateEventDefinition id="CompensateEventDefinition_rollbackAaiCreateVolumeGroup" activityRef="ScriptTask_callRestAaiCreateVolumeGrp" waitForCompletion="true"/> - </bpmn2:intermediateThrowEvent> - <bpmn2:sequenceFlow id="SequenceFlow_12" name="" sourceRef="IntermediateThrowEvent_rollbackAaiCreateVolumeGroup" targetRef="EndEvent_4"/> - <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_rollbackVnfAdapterCreate" name="Rollback VNF Adapter Create"> - <bpmn2:incoming>SequenceFlow_rollbackIsEnabled1</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing> - <bpmn2:compensateEventDefinition id="CompensateEventDefinition_3" activityRef="CallActivity_callVnfAdapterCreate" waitForCompletion="true"/> - </bpmn2:intermediateThrowEvent> - <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="IntermediateThrowEvent_rollbackVnfAdapterCreate" targetRef="IntermediateThrowEvent_rollbackAaiCreateVolumeGroup"/> - <bpmn2:exclusiveGateway id="ExclusiveGateway_isRollbakcEnabled1" name="Is rollback enabled?" default="SequenceFlow_rollbackIsNotEnabled1"> - <bpmn2:incoming>SequenceFlow_11</bpmn2:incoming> - <bpmn2:incoming>SequenceFlow_17</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_rollbackIsEnabled1</bpmn2:outgoing> - <bpmn2:outgoing>SequenceFlow_rollbackIsNotEnabled1</bpmn2:outgoing> - </bpmn2:exclusiveGateway> - <bpmn2:sequenceFlow id="SequenceFlow_rollbackIsEnabled1" name="Yes" sourceRef="ExclusiveGateway_isRollbakcEnabled1" targetRef="IntermediateThrowEvent_rollbackVnfAdapterCreate"> - <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{DCVFMODVOLV1_rollbackEnabled == true}</bpmn2:conditionExpression> - </bpmn2:sequenceFlow> - <bpmn2:sequenceFlow id="SequenceFlow_rollbackIsNotEnabled1" name="No" sourceRef="ExclusiveGateway_isRollbakcEnabled1" targetRef="EndEvent_4"/> - <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_rollbackCreateVolGrpFromCallVnf" name="Rollback AAI Create Volume Group"> - <bpmn2:incoming>SequenceFlow_rollbackIsEnabled2</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_15</bpmn2:outgoing> - <bpmn2:compensateEventDefinition id="CompensateEventDefinition_rollbackCreateVolGrpName1" activityRef="ScriptTask_callRestAaiCreateVolumeGrp" waitForCompletion="true"/> - </bpmn2:intermediateThrowEvent> - <bpmn2:sequenceFlow id="SequenceFlow_15" name="" sourceRef="IntermediateThrowEvent_rollbackCreateVolGrpFromCallVnf" targetRef="EndEvent_5"/> - <bpmn2:exclusiveGateway id="ExclusiveGateway_isRollbackEnabled2" name="Is rollback enabled?" default="SequenceFlow_rollbackIsNotEnabled2"> - <bpmn2:incoming>SequenceFlow_vnfAdapterFail</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_rollbackIsEnabled2</bpmn2:outgoing> - <bpmn2:outgoing>SequenceFlow_rollbackIsNotEnabled2</bpmn2:outgoing> - </bpmn2:exclusiveGateway> - <bpmn2:sequenceFlow id="SequenceFlow_rollbackIsEnabled2" name="Yes" sourceRef="ExclusiveGateway_isRollbackEnabled2" targetRef="IntermediateThrowEvent_rollbackCreateVolGrpFromCallVnf"> - <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{DCVFMODVOLV1_rollbackEnabled == true}</bpmn2:conditionExpression> - </bpmn2:sequenceFlow> - <bpmn2:sequenceFlow id="SequenceFlow_rollbackIsNotEnabled2" name="No" sourceRef="ExclusiveGateway_isRollbackEnabled2" targetRef="EndEvent_5"/> - <bpmn2:startEvent id="StartEvent_doCreateVfModuleVolume" name="Start"> - <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing> - </bpmn2:startEvent> - <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_doCreateVfModuleVolume" targetRef="ScriptTask_preProcessRequest"/> - <bpmn2:callActivity id="CallActivity_callVnfAdapterCallback" name="Call VNF Adapter Rollback" isForCompensation="true" calledElement="vnfAdapterRestV1"> - <bpmn2:extensionElements> - <camunda:in source="DCVFMODVOLV1_rollbackVnfARequest" target="vnfAdapterRestV1Request"/> - <camunda:in source="mso-request-id" target="mso-request-id"/> - <camunda:in source="mso-service-instance-id" target="mso-service-instance-id"/> - <camunda:out source="vnfAdapterRestV1Response" target="CCINVOL_rollbackVnfAResponse"/> - <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled"/> - </bpmn2:extensionElements> - </bpmn2:callActivity> - <bpmn2:subProcess id="SubProcess_catchTriggeredException" name="Catch Triggered MsoException" triggeredByEvent="true"> - <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_rollbackAaiCreateVolume21" name="Rollback Create AAi Volume Group"> - <bpmn2:incoming>SequenceFlow_rollbackEnabledYes91</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_16</bpmn2:outgoing> - <bpmn2:compensateEventDefinition id="CompensateEventDefinition_rollbackdreateVolume21" activityRef="ScriptTask_callRestAaiCreateVolumeGrp" waitForCompletion="true"/> - </bpmn2:intermediateThrowEvent> - <bpmn2:sequenceFlow id="SequenceFlow_16" name="" sourceRef="IntermediateThrowEvent_rollbackAaiCreateVolume21" targetRef="EndEvent_3"/> - <bpmn2:exclusiveGateway id="ExclusiveGateway_isRolbackEnabled90" name="Is Rollback Enabled?" default="SequenceFlow_rollbackNotEnabled92"> - <bpmn2:incoming>SequenceFlow_13</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_rollbackEnabledYes91</bpmn2:outgoing> - <bpmn2:outgoing>SequenceFlow_rollbackNotEnabled92</bpmn2:outgoing> - </bpmn2:exclusiveGateway> - <bpmn2:sequenceFlow id="SequenceFlow_rollbackEnabledYes91" name="Yes" sourceRef="ExclusiveGateway_isRolbackEnabled90" targetRef="IntermediateThrowEvent_rollbackAaiCreateVolume21"> - <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{DCVFMODVOLV1_rollbackEnabled == true}</bpmn2:conditionExpression> - </bpmn2:sequenceFlow> - <bpmn2:sequenceFlow id="SequenceFlow_rollbackNotEnabled92" name="No" sourceRef="ExclusiveGateway_isRolbackEnabled90" targetRef="EndEvent_3"/> - <bpmn2:startEvent id="StartEvent_catchAllErrors" name="Catch MsoException"> - <bpmn2:outgoing>SequenceFlow_13</bpmn2:outgoing> - <bpmn2:errorEventDefinition id="ErrorEventDefinition_4" errorRef="Error_2"/> - </bpmn2:startEvent> - <bpmn2:sequenceFlow id="SequenceFlow_13" name="" sourceRef="StartEvent_catchAllErrors" targetRef="ExclusiveGateway_isRolbackEnabled90"/> - <bpmn2:endEvent id="EndEvent_3"> - <bpmn2:incoming>SequenceFlow_16</bpmn2:incoming> - <bpmn2:incoming>SequenceFlow_rollbackNotEnabled92</bpmn2:incoming> - </bpmn2:endEvent> - </bpmn2:subProcess> - <bpmn2:boundaryEvent id="BoundaryEvent_catchError2" name="" attachedToRef="ScriptTask_callRestAaiRequeryVolGrpNm"> - <bpmn2:outgoing>SequenceFlow_17</bpmn2:outgoing> - <bpmn2:errorEventDefinition id="ErrorEventDefinition_9"/> - </bpmn2:boundaryEvent> - <bpmn2:sequenceFlow id="SequenceFlow_17" name="" sourceRef="BoundaryEvent_catchError2" targetRef="ExclusiveGateway_isRollbakcEnabled1"/> - <bpmn2:endEvent id="EndEvent_4" name="End"> - <bpmn2:incoming>SequenceFlow_rollbackIsNotEnabled1</bpmn2:incoming> - <bpmn2:incoming>SequenceFlow_12</bpmn2:incoming> - </bpmn2:endEvent> - <bpmn2:endEvent id="EndEvent_5" name="End"> - <bpmn2:incoming>SequenceFlow_rollbackIsNotEnabled2</bpmn2:incoming> - <bpmn2:incoming>SequenceFlow_15</bpmn2:incoming> - </bpmn2:endEvent> - <bpmn2:endEvent id="EndEvent_6" name="End"> - <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming> - </bpmn2:endEvent> - <bpmn2:textAnnotation id="TextAnnotation_2"> - <bpmn2:text>WorkflowException should already have been created in VNF create subflow</bpmn2:text> - </bpmn2:textAnnotation> - <bpmn2:association id="Association_2" sourceRef="TextAnnotation_2" targetRef="EndEvent_5"/> - <bpmn2:association id="Association_3" sourceRef="BoundaryEvent_compensateCreateVolGrp" targetRef="ScriptTask_deleteVolumeGroup"/> - <bpmn2:association id="Association_1" sourceRef="BoundaryEvent_compensateVnfAdapterCreate" targetRef="CallActivity_callVnfAdapterCallback"/> - <bpmn2:textAnnotation id="TextAnnotation_1"> - <bpmn2:text>Catch MsoException triggered by Plugin. The vnfAdapterRest subflow is currently not directly throwing the BPMNError(MSOException.</bpmn2:text> - </bpmn2:textAnnotation> - <bpmn2:association id="Association_4" sourceRef="TextAnnotation_1" targetRef="SubProcess_catchTriggeredException"/> - </bpmn2:process> - <bpmn2:error id="Error_1" errorCode="MSOWorkflowException" name="MSOWorkflowException"/> - <bpmn2:error id="Error_2" errorCode="MSOWorkflowException" name="MSOWorkflowException"/> - <bpmndi:BPMNDiagram id="BPMNDiagram_1"> - <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateVfModuleVolumeV1"> - <bpmndi:BPMNShape id="_BPMNShape_StartEvent_65" bpmnElement="StartEvent_doCreateVfModuleVolume"> - <dc:Bounds height="36.0" width="36.0" x="252.0" y="129.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="22.0" width="34.0" x="253.0" y="170.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_285" bpmnElement="ScriptTask_preProcessRequest"> - <dc:Bounds height="80.0" width="100.0" x="420.0" y="107.0"/> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_287" bpmnElement="ScriptTask_callRestAaiCloudRegion"> - <dc:Bounds height="80.0" width="100.0" x="588.0" y="106.0"/> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_288" bpmnElement="ScriptTask_callRestAaiQueryVolGrpName"> - <dc:Bounds height="80.0" width="100.0" x="937.0" y="107.0"/> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_247" bpmnElement="ExclusiveGateway_aaiReturnCode404" isMarkerVisible="true"> - <dc:Bounds height="50.0" width="50.0" x="1118.0" y="121.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="22.0" width="128.0" x="1079.0" y="176.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_289" bpmnElement="ScriptTask_callRestAaiCreateVolumeGrp"> - <dc:Bounds height="80.0" width="100.0" x="252.0" y="396.0"/> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_290" bpmnElement="ScriptTask_prepareVnfAdapterCreate"> - <dc:Bounds height="80.0" width="100.0" x="420.0" y="396.0"/> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="_BPMNShape_CallActivity_32" bpmnElement="CallActivity_callVnfAdapterCreate"> - <dc:Bounds height="80.0" width="100.0" x="576.0" y="396.0"/> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_292" bpmnElement="ScriptTask_callRestAaiRequeryVolGrpNm"> - <dc:Bounds height="80.0" width="100.0" x="923.0" y="396.0"/> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_293" bpmnElement="ScriptTask_callRestAaiVolumeGrp"> - <dc:Bounds height="80.0" width="100.0" x="1068.0" y="396.0"/> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_294" bpmnElement="ScriptTask_prepareDbInfraRequest"> - <dc:Bounds height="80.0" width="100.0" x="1068.0" y="648.0"/> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="_BPMNShape_EndEvent_226" bpmnElement="EndEvent_1"> - <dc:Bounds height="36.0" width="36.0" x="1100.0" y="782.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="22.0" width="29.0" x="1104.0" y="823.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_65" targetElement="_BPMNShape_ScriptTask_285"> - <di:waypoint xsi:type="dc:Point" x="288.0" y="147.0"/> - <di:waypoint xsi:type="dc:Point" x="420.0" y="147.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="315.0" y="147.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_volGrpName404Yes" sourceElement="_BPMNShape_ExclusiveGateway_247" targetElement="_BPMNShape_ScriptTask_289"> - <di:waypoint xsi:type="dc:Point" x="1143.0" y="171.0"/> - <di:waypoint xsi:type="dc:Point" x="1144.0" y="232.0"/> - <di:waypoint xsi:type="dc:Point" x="811.0" y="232.0"/> - <di:waypoint xsi:type="dc:Point" x="301.0" y="232.0"/> - <di:waypoint xsi:type="dc:Point" x="302.0" y="396.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="22.0" width="29.0" x="573.0" y="232.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_ScriptTask_289" targetElement="_BPMNShape_ScriptTask_290"> - <di:waypoint xsi:type="dc:Point" x="352.0" y="436.0"/> - <di:waypoint xsi:type="dc:Point" x="420.0" y="436.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="383.0" y="544.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_ScriptTask_290" targetElement="_BPMNShape_CallActivity_32"> - <di:waypoint xsi:type="dc:Point" x="520.0" y="436.0"/> - <di:waypoint xsi:type="dc:Point" x="576.0" y="436.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="545.0" y="544.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_22" bpmnElement="SequenceFlow_22" sourceElement="_BPMNShape_ScriptTask_285" targetElement="_BPMNShape_ScriptTask_287"> - <di:waypoint xsi:type="dc:Point" x="520.0" y="147.0"/> - <di:waypoint xsi:type="dc:Point" x="560.0" y="147.0"/> - <di:waypoint xsi:type="dc:Point" x="560.0" y="146.0"/> - <di:waypoint xsi:type="dc:Point" x="588.0" y="146.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="557.0" y="147.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_23" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_ScriptTask_287" targetElement="_BPMNShape_ScriptTask_311"> - <di:waypoint xsi:type="dc:Point" x="688.0" y="146.0"/> - <di:waypoint xsi:type="dc:Point" x="720.0" y="146.0"/> - <di:waypoint xsi:type="dc:Point" x="720.0" y="147.0"/> - <di:waypoint xsi:type="dc:Point" x="750.0" y="147.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="713.0" y="146.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_248" bpmnElement="ExclusiveGateway_isVnfAdaptyerCallSuccess" isMarkerVisible="true"> - <dc:Bounds height="50.0" width="50.0" x="768.0" y="410.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="22.0" width="179.0" x="704.0" y="465.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_CallActivity_32" targetElement="_BPMNShape_ExclusiveGateway_248"> - <di:waypoint xsi:type="dc:Point" x="676.0" y="436.0"/> - <di:waypoint xsi:type="dc:Point" x="715.0" y="436.0"/> - <di:waypoint xsi:type="dc:Point" x="715.0" y="435.0"/> - <di:waypoint xsi:type="dc:Point" x="768.0" y="435.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="712.0" y="435.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_296" bpmnElement="ScriptTask_createVolGrpExistsException"> - <dc:Bounds height="80.0" width="100.0" x="1248.0" y="106.0"/> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ScriptTask_296" targetElement="_BPMNShape_EndEvent_241"> - <di:waypoint xsi:type="dc:Point" x="1348.0" y="146.0"/> - <di:waypoint xsi:type="dc:Point" x="1414.0" y="146.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="1373.0" y="146.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_19" bpmnElement="SequenceFlow_19" sourceElement="_BPMNShape_BoundaryEvent_62" targetElement="_BPMNShape_ExclusiveGateway_247"> - <di:waypoint xsi:type="dc:Point" x="1037.0" y="89.0"/> - <di:waypoint xsi:type="dc:Point" x="1037.0" y="59.0"/> - <di:waypoint xsi:type="dc:Point" x="1143.0" y="59.0"/> - <di:waypoint xsi:type="dc:Point" x="1143.0" y="121.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="1050.0" y="59.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_21" bpmnElement="SequenceFlow_volGrpName404No" sourceElement="_BPMNShape_ExclusiveGateway_247" targetElement="_BPMNShape_ScriptTask_296"> - <di:waypoint xsi:type="dc:Point" x="1168.0" y="146.0"/> - <di:waypoint xsi:type="dc:Point" x="1248.0" y="146.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="22.0" width="29.0" x="1196.0" y="146.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_26" bpmnElement="SequenceFlow_vnfAdapterFail" sourceElement="_BPMNShape_ExclusiveGateway_248" targetElement="_BPMNShape_ExclusiveGateway_253"> - <di:waypoint xsi:type="dc:Point" x="793.0" y="460.0"/> - <di:waypoint xsi:type="dc:Point" x="793.0" y="538.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="22.0" width="22.0" x="786.0" y="495.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_27" bpmnElement="SequenceFlow_vnfAdapterSuccess" sourceElement="_BPMNShape_ExclusiveGateway_248" targetElement="_BPMNShape_ScriptTask_292"> - <di:waypoint xsi:type="dc:Point" x="818.0" y="435.0"/> - <di:waypoint xsi:type="dc:Point" x="870.0" y="435.0"/> - <di:waypoint xsi:type="dc:Point" x="870.0" y="436.0"/> - <di:waypoint xsi:type="dc:Point" x="923.0" y="436.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="22.0" width="29.0" x="856.0" y="436.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_28" bpmnElement="SequenceFlow_28" sourceElement="_BPMNShape_ScriptTask_292" targetElement="_BPMNShape_ScriptTask_293"> - <di:waypoint xsi:type="dc:Point" x="1023.0" y="436.0"/> - <di:waypoint xsi:type="dc:Point" x="1068.0" y="436.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="1043.0" y="436.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="_BPMNShape_TextAnnotation_3" bpmnElement="TextAnnotation_2"> - <dc:Bounds height="73.0" width="152.0" x="573.0" y="759.0"/> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="BPMNEdge_Association_2" bpmnElement="Association_2" sourceElement="_BPMNShape_TextAnnotation_3" targetElement="_BPMNShape_EndEvent_240"> - <di:waypoint xsi:type="dc:Point" x="725.0" y="806.0"/> - <di:waypoint xsi:type="dc:Point" x="775.0" y="813.0"/> - </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_299" bpmnElement="ScriptTask_deleteVolumeGroup"> - <dc:Bounds height="80.0" width="100.0" x="372.0" y="518.0"/> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="_BPMNShape_BoundaryEvent_57" bpmnElement="BoundaryEvent_compensateCreateVolGrp"> - <dc:Bounds height="36.0" width="36.0" x="334.0" y="458.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="349.0" y="499.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="BPMNEdge_Association_3" bpmnElement="Association_3" sourceElement="_BPMNShape_BoundaryEvent_57" targetElement="_BPMNShape_ScriptTask_299"> - <di:waypoint xsi:type="dc:Point" x="367.0" y="494.0"/> - <di:waypoint xsi:type="dc:Point" x="388.0" y="518.0"/> - </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="_BPMNShape_IntermediateThrowEvent_3" bpmnElement="IntermediateThrowEvent_rollbackAaiCreateVolumeGroup"> - <dc:Bounds height="36.0" width="36.0" x="1370.0" y="555.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="22.0" width="210.0" x="1283.0" y="596.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="_BPMNShape_BoundaryEvent_60" bpmnElement="BoundaryEvent_5"> - <dc:Bounds height="36.0" width="36.0" x="1150.0" y="378.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="1165.0" y="419.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_11" sourceElement="_BPMNShape_BoundaryEvent_60" targetElement="_BPMNShape_ExclusiveGateway_252"> - <di:waypoint xsi:type="dc:Point" x="1168.0" y="378.0"/> - <di:waypoint xsi:type="dc:Point" x="1168.0" y="347.0"/> - <di:waypoint xsi:type="dc:Point" x="1364.0" y="347.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="1193.0" y="387.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_IntermediateThrowEvent_3" targetElement="_BPMNShape_EndEvent_239"> - <di:waypoint xsi:type="dc:Point" x="1388.0" y="591.0"/> - <di:waypoint xsi:type="dc:Point" x="1388.0" y="717.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="1383.0" y="715.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="_BPMNShape_CallActivity_35" bpmnElement="CallActivity_callVnfAdapterCallback"> - <dc:Bounds height="80.0" width="100.0" x="537.0" y="518.0"/> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="_BPMNShape_BoundaryEvent_61" bpmnElement="BoundaryEvent_compensateVnfAdapterCreate"> - <dc:Bounds height="36.0" width="36.0" x="583.0" y="458.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="598.0" y="499.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="BPMNEdge_Association_1" bpmnElement="Association_1" sourceElement="_BPMNShape_BoundaryEvent_61" targetElement="_BPMNShape_CallActivity_35"> - <di:waypoint xsi:type="dc:Point" x="598.0" y="494.0"/> - <di:waypoint xsi:type="dc:Point" x="594.0" y="518.0"/> - </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="_BPMNShape_IntermediateThrowEvent_4" bpmnElement="IntermediateThrowEvent_rollbackVnfAdapterCreate"> - <dc:Bounds height="36.0" width="36.0" x="1370.0" y="458.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="22.0" width="177.0" x="1300.0" y="499.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_IntermediateThrowEvent_4" targetElement="_BPMNShape_IntermediateThrowEvent_3"> - <di:waypoint xsi:type="dc:Point" x="1388.0" y="494.0"/> - <di:waypoint xsi:type="dc:Point" x="1388.0" y="555.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="1385.0" y="534.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ScriptTask_293" targetElement="_BPMNShape_ScriptTask_294"> - <di:waypoint xsi:type="dc:Point" x="1118.0" y="476.0"/> - <di:waypoint xsi:type="dc:Point" x="1118.0" y="648.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="1115.0" y="670.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_ScriptTask_294" targetElement="_BPMNShape_EndEvent_226"> - <di:waypoint xsi:type="dc:Point" x="1118.0" y="728.0"/> - <di:waypoint xsi:type="dc:Point" x="1118.0" y="782.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="1115.0" y="863.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_311" bpmnElement="ScriptTask_callRestAaiQueryGenericVnf"> - <dc:Bounds height="80.0" width="100.0" x="750.0" y="106.0"/> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_15" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_ScriptTask_311" targetElement="_BPMNShape_ScriptTask_288"> - <di:waypoint xsi:type="dc:Point" x="850.0" y="146.0"/> - <di:waypoint xsi:type="dc:Point" x="886.0" y="146.0"/> - <di:waypoint xsi:type="dc:Point" x="886.0" y="147.0"/> - <di:waypoint xsi:type="dc:Point" x="937.0" y="147.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="883.0" y="147.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="_BPMNShape_BoundaryEvent_62" bpmnElement="BoundaryEvent_catchAaiError"> - <dc:Bounds height="36.0" width="36.0" x="1019.0" y="89.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="1034.0" y="130.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_ScriptTask_288" targetElement="_BPMNShape_ExclusiveGateway_247"> - <di:waypoint xsi:type="dc:Point" x="1037.0" y="147.0"/> - <di:waypoint xsi:type="dc:Point" x="1077.0" y="147.0"/> - <di:waypoint xsi:type="dc:Point" x="1077.0" y="146.0"/> - <di:waypoint xsi:type="dc:Point" x="1118.0" y="146.0"/> - </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="_BPMNShape_IntermediateThrowEvent_5" bpmnElement="IntermediateThrowEvent_rollbackCreateVolGrpFromCallVnf"> - <dc:Bounds height="36.0" width="36.0" x="775.0" y="648.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="22.0" width="210.0" x="818.0" y="656.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_16" bpmnElement="SequenceFlow_15" sourceElement="_BPMNShape_IntermediateThrowEvent_5" targetElement="_BPMNShape_EndEvent_240"> - <di:waypoint xsi:type="dc:Point" x="793.0" y="684.0"/> - <di:waypoint xsi:type="dc:Point" x="793.0" y="798.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="790.0" y="732.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_252" bpmnElement="ExclusiveGateway_isRollbakcEnabled1" isMarkerVisible="true"> - <dc:Bounds height="50.0" width="50.0" x="1364.0" y="322.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="22.0" width="121.0" x="1329.0" y="377.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_14" bpmnElement="SequenceFlow_rollbackIsEnabled1" sourceElement="_BPMNShape_ExclusiveGateway_252" targetElement="_BPMNShape_IntermediateThrowEvent_4"> - <di:waypoint xsi:type="dc:Point" x="1389.0" y="372.0"/> - <di:waypoint xsi:type="dc:Point" x="1389.0" y="412.0"/> - <di:waypoint xsi:type="dc:Point" x="1388.0" y="412.0"/> - <di:waypoint xsi:type="dc:Point" x="1388.0" y="458.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="1385.0" y="433.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_17" bpmnElement="SequenceFlow_rollbackIsNotEnabled1" sourceElement="_BPMNShape_ExclusiveGateway_252" targetElement="_BPMNShape_EndEvent_239"> - <di:waypoint xsi:type="dc:Point" x="1414.0" y="347.0"/> - <di:waypoint xsi:type="dc:Point" x="1524.0" y="347.0"/> - <di:waypoint xsi:type="dc:Point" x="1524.0" y="550.0"/> - <di:waypoint xsi:type="dc:Point" x="1524.0" y="735.0"/> - <di:waypoint xsi:type="dc:Point" x="1406.0" y="735.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="22.0" width="22.0" x="1513.0" y="392.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_253" bpmnElement="ExclusiveGateway_isRollbackEnabled2" isMarkerVisible="true"> - <dc:Bounds height="50.0" width="50.0" x="768.0" y="538.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="0.0" width="0.0" x="793.0" y="593.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="SequenceFlow_rollbackIsEnabled2" sourceElement="_BPMNShape_ExclusiveGateway_253" targetElement="_BPMNShape_IntermediateThrowEvent_5"> - <di:waypoint xsi:type="dc:Point" x="793.0" y="588.0"/> - <di:waypoint xsi:type="dc:Point" x="793.0" y="648.0"/> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_20" bpmnElement="SequenceFlow_rollbackIsNotEnabled2" sourceElement="_BPMNShape_ExclusiveGateway_253" targetElement="_BPMNShape_EndEvent_240"> - <di:waypoint xsi:type="dc:Point" x="818.0" y="563.0"/> - <di:waypoint xsi:type="dc:Point" x="906.0" y="563.0"/> - <di:waypoint xsi:type="dc:Point" x="906.0" y="815.0"/> - <di:waypoint xsi:type="dc:Point" x="811.0" y="816.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="22.0" width="22.0" x="768.0" y="695.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="_BPMNShape_SubProcess_2" bpmnElement="SubProcess_catchTriggeredException" isExpanded="true"> - <dc:Bounds height="337.0" width="608.0" x="287.0" y="936.0"/> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="_BPMNShape_StartEvent_66" bpmnElement="StartEvent_catchAllErrors"> - <dc:Bounds height="36.0" width="36.0" x="348.0" y="1112.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="22.0" width="127.0" x="303.0" y="1153.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="_BPMNShape_IntermediateThrowEvent_6" bpmnElement="IntermediateThrowEvent_rollbackAaiCreateVolume21"> - <dc:Bounds height="36.0" width="36.0" x="540.0" y="1008.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="22.0" width="210.0" x="453.0" y="1049.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_24" bpmnElement="SequenceFlow_13" sourceElement="_BPMNShape_StartEvent_66" targetElement="_BPMNShape_ExclusiveGateway_256"> - <di:waypoint xsi:type="dc:Point" x="384.0" y="1130.0"/> - <di:waypoint xsi:type="dc:Point" x="454.0" y="1130.0"/> - <di:waypoint xsi:type="dc:Point" x="454.0" y="1129.0"/> - <di:waypoint xsi:type="dc:Point" x="532.0" y="1129.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="409.0" y="1130.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_25" bpmnElement="SequenceFlow_16" sourceElement="_BPMNShape_IntermediateThrowEvent_6" targetElement="_BPMNShape_EndEvent_238"> - <di:waypoint xsi:type="dc:Point" x="576.0" y="1026.0"/> - <di:waypoint xsi:type="dc:Point" x="804.0" y="1026.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="729.0" y="1026.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="_BPMNShape_TextAnnotation_4" bpmnElement="TextAnnotation_1"> - <dc:Bounds height="97.0" width="229.0" x="123.0" y="792.0"/> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="BPMNEdge_Association_4" bpmnElement="Association_4" sourceElement="_BPMNShape_TextAnnotation_4" targetElement="_BPMNShape_SubProcess_2"> - <di:waypoint xsi:type="dc:Point" x="301.0" y="888.0"/> - <di:waypoint xsi:type="dc:Point" x="366.0" y="936.0"/> - </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="_BPMNShape_BoundaryEvent_64" bpmnElement="BoundaryEvent_catchError2"> - <dc:Bounds height="36.0" width="36.0" x="1005.0" y="378.0"/> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_29" bpmnElement="SequenceFlow_17" sourceElement="_BPMNShape_BoundaryEvent_64" targetElement="_BPMNShape_ExclusiveGateway_252"> - <di:waypoint xsi:type="dc:Point" x="1023.0" y="378.0"/> - <di:waypoint xsi:type="dc:Point" x="1023.0" y="290.0"/> - <di:waypoint xsi:type="dc:Point" x="1389.0" y="294.0"/> - <di:waypoint xsi:type="dc:Point" x="1389.0" y="322.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="1118.0" y="291.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_256" bpmnElement="ExclusiveGateway_isRolbackEnabled90" isMarkerVisible="true"> - <dc:Bounds height="50.0" width="50.0" x="532.0" y="1104.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="22.0" width="128.0" x="493.0" y="1159.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_rollbackEnabledYes91" sourceElement="_BPMNShape_ExclusiveGateway_256" targetElement="_BPMNShape_IntermediateThrowEvent_6"> - <di:waypoint xsi:type="dc:Point" x="557.0" y="1104.0"/> - <di:waypoint xsi:type="dc:Point" x="557.0" y="1074.0"/> - <di:waypoint xsi:type="dc:Point" x="558.0" y="1074.0"/> - <di:waypoint xsi:type="dc:Point" x="558.0" y="1044.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="22.0" width="29.0" x="564.0" y="1084.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_30" bpmnElement="SequenceFlow_rollbackNotEnabled92" sourceElement="_BPMNShape_ExclusiveGateway_256" targetElement="_BPMNShape_EndEvent_238"> - <di:waypoint xsi:type="dc:Point" x="582.0" y="1129.0"/> - <di:waypoint xsi:type="dc:Point" x="657.0" y="1129.0"/> - <di:waypoint xsi:type="dc:Point" x="822.0" y="1129.0"/> - <di:waypoint xsi:type="dc:Point" x="822.0" y="1044.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="22.0" width="22.0" x="636.0" y="1134.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="_BPMNShape_EndEvent_238" bpmnElement="EndEvent_3"> - <dc:Bounds height="36.0" width="36.0" x="804.0" y="1008.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="0.0" width="0.0" x="822.0" y="1049.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="_BPMNShape_EndEvent_239" bpmnElement="EndEvent_4"> - <dc:Bounds height="36.0" width="36.0" x="1370.0" y="717.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="22.0" width="29.0" x="1374.0" y="758.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="_BPMNShape_EndEvent_240" bpmnElement="EndEvent_5"> - <dc:Bounds height="36.0" width="36.0" x="775.0" y="798.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="0.0" width="0.0" x="793.0" y="839.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="_BPMNShape_EndEvent_241" bpmnElement="EndEvent_6"> - <dc:Bounds height="36.0" width="36.0" x="1414.0" y="128.0"/> - <bpmndi:BPMNLabel> - <dc:Bounds height="22.0" width="29.0" x="1418.0" y="169.0"/> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - </bpmndi:BPMNPlane> - </bpmndi:BPMNDiagram> -</bpmn2:definitions>
\ No newline at end of file diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModuleVolumeV2.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModuleVolumeV2.bpmn new file mode 100644 index 0000000000..693fd36575 --- /dev/null +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModuleVolumeV2.bpmn @@ -0,0 +1,362 @@ +<?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="_FhrCQG2BEeaNdqnn65BT4A" 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:process id="DoCreateVfModuleVolumeV2" name="DoCreateVfModuleVolumeV2" isExecutable="true"> + <bpmn2:scriptTask id="ScriptTask_preProcessRequest" name="Preprocess Request" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_1wi1cf9</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2() +doCreateVfModuleVolumeV2.executeMethod('preProcessRequest', execution, isDebugLogEnabled)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:scriptTask id="ScriptTask_callRestAaiCloudRegion" name="Call REST AAI Cloud Region" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_1dpt7ul</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_23</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2() +doCreateVfModuleVolumeV2.executeMethod('callRESTQueryAAICloudRegion', execution, isDebugLogEnabled)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:sequenceFlow id="SequenceFlow_23" name="" sourceRef="ScriptTask_callRestAaiCloudRegion" targetRef="ScriptTask_callRestAaiQueryGenericVnf" /> + <bpmn2:scriptTask id="ScriptTask_createVolGrpExistsException" name="Build Workflow Exception" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_volGrpName404No</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2() +doCreateVfModuleVolumeV2.executeMethod('buildWorkflowException', execution, 2500, "Volume group $DCVFMODVOLV2_volumeGroupName already exists in the system.", isDebugLogEnabled)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="ScriptTask_createVolGrpExistsException" targetRef="EndEvent_6" /> + <bpmn2:exclusiveGateway id="ExclusiveGateway_aaiReturnCode404" name="AAI Return Code is 404?" default="SequenceFlow_volGrpName404No"> + <bpmn2:incoming>SequenceFlow_19</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_6</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_volGrpName404Yes</bpmn2:outgoing> + <bpmn2:outgoing>SequenceFlow_volGrpName404No</bpmn2:outgoing> + </bpmn2:exclusiveGateway> + <bpmn2:sequenceFlow id="SequenceFlow_volGrpName404Yes" name="Yes" sourceRef="ExclusiveGateway_aaiReturnCode404" targetRef="ScriptTask_callRestAaiCreateVolumeGrp"> + <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{DCVFMODVOLV2_AaiReturnCode == '404'}]]></bpmn2:conditionExpression> + </bpmn2:sequenceFlow> + <bpmn2:sequenceFlow id="SequenceFlow_volGrpName404No" name="No" sourceRef="ExclusiveGateway_aaiReturnCode404" targetRef="ScriptTask_createVolGrpExistsException" /> + <bpmn2:scriptTask id="ScriptTask_callRestAaiQueryGenericVnf" name="Call REST AAI Query Generic VNF" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_23</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2() +doCreateVfModuleVolumeV2.executeMethod('callRESTQueryAAIGenericVnf', execution, isDebugLogEnabled)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:sequenceFlow id="SequenceFlow_14" name="" sourceRef="ScriptTask_callRestAaiQueryGenericVnf" targetRef="ScriptTask_callRestAaiQueryVolGrpName" /> + <bpmn2:boundaryEvent id="BoundaryEvent_catchAaiError" name="" attachedToRef="ScriptTask_callRestAaiQueryVolGrpName"> + <bpmn2:outgoing>SequenceFlow_19</bpmn2:outgoing> + <bpmn2:errorEventDefinition id="ErrorEventDefinition_3" errorRef="Error_1" /> + </bpmn2:boundaryEvent> + <bpmn2:sequenceFlow id="SequenceFlow_19" name="" sourceRef="BoundaryEvent_catchAaiError" targetRef="ExclusiveGateway_aaiReturnCode404" /> + <bpmn2:scriptTask id="ScriptTask_callRestAaiQueryVolGrpName" name="Call REST AAI Query Volume Grp Name" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_14</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2() +doCreateVfModuleVolumeV2.executeMethod('callRESTQueryAAIVolGrpName', execution, isDebugLogEnabled)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="ScriptTask_callRestAaiQueryVolGrpName" targetRef="ExclusiveGateway_aaiReturnCode404" /> + <bpmn2:scriptTask id="ScriptTask_callRestAaiCreateVolumeGrp" name="Call REST AAI Create Volume Group" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_volGrpName404Yes</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_9</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2() +doCreateVfModuleVolumeV2.executeMethod('callRESTCreateAAIVolGrpName', execution, isDebugLogEnabled)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:sequenceFlow id="SequenceFlow_9" name="" sourceRef="ScriptTask_callRestAaiCreateVolumeGrp" targetRef="ScriptTask_prepareVnfAdapterCreate" /> + <bpmn2:callActivity id="CallActivity_callVnfAdapterCreate" name="Call VNF Adapter Create" calledElement="vnfAdapterRestV1"> + <bpmn2:extensionElements> + <camunda:in source="DCVFMODVOLV2_createVnfARequest" target="vnfAdapterRestV1Request" /> + <camunda:in source="msoRequestId" target="mso-request-id" /> + <camunda:in source="serviceInstanceId" target="mso-service-instance-id" /> + <camunda:out source="vnfAdapterRestV1Response" target="DCVFMODVOLV2_createVnfAResponse" /> + <camunda:out source="WorkflowException" target="WorkflowException" /> + <camunda:out source="VNFREST_vnfAdapterStatusCode" target="DCVFMODVOLV2_createVnfAReturnCode" /> + <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" /> + <camunda:out source="VNFREST_SuccessIndicator" target="VNFREST_SuccessIndicator" /> + </bpmn2:extensionElements> + <bpmn2:incoming>SequenceFlow_10</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_1qwurc5</bpmn2:outgoing> + </bpmn2:callActivity> + <bpmn2:scriptTask id="ScriptTask_callRestAaiRequeryVolGrpNm" name="Call REST AAI Requery Volume Group Name" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_1gbt2n5</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_28</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2() +doCreateVfModuleVolumeV2.executeMethod('callRESTQueryAAIVolGrpName', execution, isDebugLogEnabled)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:sequenceFlow id="SequenceFlow_28" name="" sourceRef="ScriptTask_callRestAaiRequeryVolGrpNm" targetRef="ScriptTask_callRestAaiVolumeGrp" /> + <bpmn2:scriptTask id="ScriptTask_prepareDbInfraRequest" name="Set Success Indicator" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2() +doCreateVfModuleVolumeV2.executeMethod('setSuccessIndicator', execution, true)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="ScriptTask_prepareDbInfraRequest" targetRef="EndEvent_1" /> + <bpmn2:scriptTask id="ScriptTask_callRestAaiVolumeGrp" name="Call REST AAI Update Volume Group" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_28</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2() +doCreateVfModuleVolumeV2.executeMethod('callRESTUpdateCreatedVolGrpName', execution, isDebugLogEnabled)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="ScriptTask_callRestAaiVolumeGrp" targetRef="ScriptTask_prepareDbInfraRequest" /> + <bpmn2:endEvent id="EndEvent_1" name="End"> + <bpmn2:incoming>SequenceFlow_8</bpmn2:incoming> + </bpmn2:endEvent> + <bpmn2:scriptTask id="ScriptTask_prepareVnfAdapterCreate" name="Prepare VNF Adapter Create Request" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_10</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2() +doCreateVfModuleVolumeV2.executeMethod('prepareVnfAdapterCreateRequest', execution, isDebugLogEnabled)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:sequenceFlow id="SequenceFlow_10" name="" sourceRef="ScriptTask_prepareVnfAdapterCreate" targetRef="CallActivity_callVnfAdapterCreate" /> + <bpmn2:startEvent id="StartEvent_doCreateVfModuleVolume" name="Start"> + <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing> + </bpmn2:startEvent> + <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_doCreateVfModuleVolume" targetRef="ScriptTask_preProcessRequest" /> + <bpmn2:endEvent id="EndEvent_6" name="End"> + <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming> + </bpmn2:endEvent> + <bpmn2:scriptTask id="Task_07psich" name="Validate VNF Response" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_1qwurc5</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_1gbt2n5</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2() +doCreateVfModuleVolumeV2.executeMethod('validateVnfResponse', execution, isDebugLogEnabled)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:sequenceFlow id="SequenceFlow_1qwurc5" sourceRef="CallActivity_callVnfAdapterCreate" targetRef="Task_07psich" /> + <bpmn2:sequenceFlow id="SequenceFlow_1gbt2n5" sourceRef="Task_07psich" targetRef="ScriptTask_callRestAaiRequeryVolGrpNm" /> + <bpmn2:callActivity id="Task_1u766ge" name="Call Generic Get Service instance" calledElement="GenericGetService"> + <bpmn2:extensionElements> + <camunda:in source="serviceInstanceId" target="GENGS_serviceInstanceId" /> + <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" /> + <camunda:in source="GENGS_type" target="GENGS_type" /> + <camunda:out source="GENGS_FoundIndicator" target="GENGS_FoundIndicator" /> + <camunda:out source="GENGS_SuccessIndicator" target="GENGS_SuccessIndicator" /> + </bpmn2:extensionElements> + <bpmn2:incoming>SequenceFlow_1wi1cf9</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_1vmbvy8</bpmn2:outgoing> + </bpmn2:callActivity> + <bpmn2:scriptTask id="Task_0qbm5cz" name="Validate Get Service Instance Call" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_1vmbvy8</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_1dpt7ul</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2() +doCreateVfModuleVolumeV2.executeMethod('validateGetServiceInstanceCall', execution, isDebugLogEnabled)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:sequenceFlow id="SequenceFlow_1wi1cf9" sourceRef="ScriptTask_preProcessRequest" targetRef="Task_1u766ge" /> + <bpmn2:sequenceFlow id="SequenceFlow_1vmbvy8" sourceRef="Task_1u766ge" targetRef="Task_0qbm5cz" /> + <bpmn2:sequenceFlow id="SequenceFlow_1dpt7ul" sourceRef="Task_0qbm5cz" targetRef="ScriptTask_callRestAaiCloudRegion" /> + </bpmn2:process> + <bpmn2:error id="Error_1" name="MSOWorkflowException" errorCode="MSOWorkflowException" /> + <bpmn2:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" /> + <bpmndi:BPMNDiagram id="BPMNDiagram_1"> + <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateVfModuleVolumeV2"> + <bpmndi:BPMNShape id="_BPMNShape_StartEvent_65" bpmnElement="StartEvent_doCreateVfModuleVolume"> + <dc:Bounds x="270" y="128" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="276" y="169" width="23" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_285" bpmnElement="ScriptTask_preProcessRequest"> + <dc:Bounds x="369" y="106" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_287" bpmnElement="ScriptTask_callRestAaiCloudRegion"> + <dc:Bounds x="768" y="106" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_288" bpmnElement="ScriptTask_callRestAaiQueryVolGrpName"> + <dc:Bounds x="1045" y="106" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_247" bpmnElement="ExclusiveGateway_aaiReturnCode404" isMarkerVisible="true"> + <dc:Bounds x="1242" y="121" width="50" height="50" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1224" y="176" width="85" height="24" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_289" bpmnElement="ScriptTask_callRestAaiCreateVolumeGrp"> + <dc:Bounds x="256" y="307" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_290" bpmnElement="ScriptTask_prepareVnfAdapterCreate"> + <dc:Bounds x="420" y="307" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="_BPMNShape_CallActivity_32" bpmnElement="CallActivity_callVnfAdapterCreate"> + <dc:Bounds x="576" y="307" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_292" bpmnElement="ScriptTask_callRestAaiRequeryVolGrpNm"> + <dc:Bounds x="857" y="307" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_293" bpmnElement="ScriptTask_callRestAaiVolumeGrp"> + <dc:Bounds x="995" y="307" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_294" bpmnElement="ScriptTask_prepareDbInfraRequest"> + <dc:Bounds x="1142" y="307" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="_BPMNShape_EndEvent_226" bpmnElement="EndEvent_1"> + <dc:Bounds x="1283" y="328" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1292" y="369" width="19" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_65" targetElement="_BPMNShape_ScriptTask_285"> + <di:waypoint xsi:type="dc:Point" x="306" y="146" /> + <di:waypoint xsi:type="dc:Point" x="369" y="146" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="338" y="131" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_volGrpName404Yes" sourceElement="_BPMNShape_ExclusiveGateway_247" targetElement="_BPMNShape_ScriptTask_289"> + <di:waypoint xsi:type="dc:Point" x="1267" y="171" /> + <di:waypoint xsi:type="dc:Point" x="1267" y="232" /> + <di:waypoint xsi:type="dc:Point" x="811" y="232" /> + <di:waypoint xsi:type="dc:Point" x="306" y="232" /> + <di:waypoint xsi:type="dc:Point" x="306" y="307" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="582" y="232" width="18" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_ScriptTask_289" targetElement="_BPMNShape_ScriptTask_290"> + <di:waypoint xsi:type="dc:Point" x="356" y="347" /> + <di:waypoint xsi:type="dc:Point" x="420" y="347" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="388" y="332" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_ScriptTask_290" targetElement="_BPMNShape_CallActivity_32"> + <di:waypoint xsi:type="dc:Point" x="520" y="347" /> + <di:waypoint xsi:type="dc:Point" x="576" y="347" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="548" y="455" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_23" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_ScriptTask_287" targetElement="_BPMNShape_ScriptTask_311"> + <di:waypoint xsi:type="dc:Point" x="868" y="146" /> + <di:waypoint xsi:type="dc:Point" x="911" y="147" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="890" y="132" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_296" bpmnElement="ScriptTask_createVolGrpExistsException"> + <dc:Bounds x="1355" y="106" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ScriptTask_296" targetElement="_BPMNShape_EndEvent_241"> + <di:waypoint xsi:type="dc:Point" x="1455" y="146" /> + <di:waypoint xsi:type="dc:Point" x="1493" y="146" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1474" y="131" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_19" bpmnElement="SequenceFlow_19" sourceElement="_BPMNShape_BoundaryEvent_62" targetElement="_BPMNShape_ExclusiveGateway_247"> + <di:waypoint xsi:type="dc:Point" x="1145" y="88" /> + <di:waypoint xsi:type="dc:Point" x="1145" y="59" /> + <di:waypoint xsi:type="dc:Point" x="1267" y="59" /> + <di:waypoint xsi:type="dc:Point" x="1267" y="121" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1206" y="44" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_21" bpmnElement="SequenceFlow_volGrpName404No" sourceElement="_BPMNShape_ExclusiveGateway_247" targetElement="_BPMNShape_ScriptTask_296"> + <di:waypoint xsi:type="dc:Point" x="1292" y="146" /> + <di:waypoint xsi:type="dc:Point" x="1355" y="146" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1320" y="146" width="14" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_28" bpmnElement="SequenceFlow_28" sourceElement="_BPMNShape_ScriptTask_292" targetElement="_BPMNShape_ScriptTask_293"> + <di:waypoint xsi:type="dc:Point" x="957" y="347" /> + <di:waypoint xsi:type="dc:Point" x="995" y="347" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="976" y="332" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ScriptTask_293" targetElement="_BPMNShape_ScriptTask_294"> + <di:waypoint xsi:type="dc:Point" x="1095" y="347" /> + <di:waypoint xsi:type="dc:Point" x="1142" y="347" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1119" y="332" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_ScriptTask_294" targetElement="_BPMNShape_EndEvent_226"> + <di:waypoint xsi:type="dc:Point" x="1242" y="347" /> + <di:waypoint xsi:type="dc:Point" x="1283" y="346" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1263" y="332" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_311" bpmnElement="ScriptTask_callRestAaiQueryGenericVnf"> + <dc:Bounds x="911" y="106" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_15" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_ScriptTask_311" targetElement="_BPMNShape_ScriptTask_288"> + <di:waypoint xsi:type="dc:Point" x="1011" y="146" /> + <di:waypoint xsi:type="dc:Point" x="1045" y="146" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1028" y="131" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="_BPMNShape_BoundaryEvent_62" bpmnElement="BoundaryEvent_catchAaiError"> + <dc:Bounds x="1127" y="88" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1145" y="129" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_ScriptTask_288" targetElement="_BPMNShape_ExclusiveGateway_247"> + <di:waypoint xsi:type="dc:Point" x="1145" y="146" /> + <di:waypoint xsi:type="dc:Point" x="1242" y="146" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1194" y="131" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="_BPMNShape_EndEvent_241" bpmnElement="EndEvent_6"> + <dc:Bounds x="1493" y="128" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1502" y="169" width="19" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ScriptTask_00lua86_di" bpmnElement="Task_07psich"> + <dc:Bounds x="716" y="307" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1qwurc5_di" bpmnElement="SequenceFlow_1qwurc5"> + <di:waypoint xsi:type="dc:Point" x="676" y="347" /> + <di:waypoint xsi:type="dc:Point" x="716" y="347" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="696" y="322" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1gbt2n5_di" bpmnElement="SequenceFlow_1gbt2n5"> + <di:waypoint xsi:type="dc:Point" x="816" y="347" /> + <di:waypoint xsi:type="dc:Point" x="857" y="347" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="837" y="322" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="CallActivity_1u596hd_di" bpmnElement="Task_1u766ge"> + <dc:Bounds x="506" y="106" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ScriptTask_1n9cmka_di" bpmnElement="Task_0qbm5cz"> + <dc:Bounds x="640" y="106" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1wi1cf9_di" bpmnElement="SequenceFlow_1wi1cf9"> + <di:waypoint xsi:type="dc:Point" x="469" y="146" /> + <di:waypoint xsi:type="dc:Point" x="506" y="146" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="488" y="121" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1vmbvy8_di" bpmnElement="SequenceFlow_1vmbvy8"> + <di:waypoint xsi:type="dc:Point" x="606" y="146" /> + <di:waypoint xsi:type="dc:Point" x="640" y="146" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="623" y="121" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1dpt7ul_di" bpmnElement="SequenceFlow_1dpt7ul"> + <di:waypoint xsi:type="dc:Point" x="740" y="146" /> + <di:waypoint xsi:type="dc:Point" x="768" y="146" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="754" y="121" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + </bpmndi:BPMNPlane> + </bpmndi:BPMNDiagram> +</bpmn2:definitions> diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnf.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnf.bpmn index 8411c56bef..5aa4d22b0c 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnf.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnf.bpmn @@ -8,7 +8,7 @@ <bpmn2:scriptTask id="initialization" name="Initialization" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+ <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* DoCreateVnf createVnf = new DoCreateVnf() createVnf.preProcessRequest(execution)]]></bpmn2:script> </bpmn2:scriptTask> @@ -88,7 +88,7 @@ exceptionUtil.buildWorkflowException(execution, 5000, "Generic Vnf Already Exist <bpmn2:incoming>vnfExistNo</bpmn2:incoming> <bpmn2:incoming>VnfNameNotSpecified1</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_11</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+ <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* DoCreateVnf createVnf = new DoCreateVnf() createVnf.prepareCreateGenericVnf(execution)]]></bpmn2:script> </bpmn2:scriptTask> @@ -136,7 +136,7 @@ exceptionUtil.processJavaException(execution)]]></bpmn2:script> <bpmn2:scriptTask id="preProcessSDNCAssignRequest" name="PreProcess SDNC Assign Request" scriptFormat="groovy"> <bpmn2:incoming>SdncInteractionEnabled</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_1q6udwm</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+ <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* DoCreateVnf createVnf = new DoCreateVnf() createVnf.preProcessSDNCAssignRequest(execution)]]></bpmn2:script> </bpmn2:scriptTask> @@ -155,9 +155,8 @@ createVnf.preProcessSDNCAssignRequest(execution)]]></bpmn2:script> </bpmn2:callActivity> <bpmn2:scriptTask id="postProcessSDNCAssignRequest" name="PostProcess SDNC Assign Request" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_15knw0q</bpmn2:incoming> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
<bpmn2:outgoing>SequenceFlow_0lnh79j</bpmn2:outgoing> - + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* String response = execution.getVariable("DoCVNF_assignSDNCAdapterResponse") def createVnfInfra = new DoCreateVnf() @@ -167,7 +166,7 @@ createVnfInfra.validateSDNCResponse(execution, response, "assign")]]></bpmn2:scr <bpmn2:incoming>SequenceFlow_1q1poly</bpmn2:incoming> <bpmn2:incoming>VnfNameSpecified2</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_1lalmvp</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+ <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* DoCreateVnf createVnf = new DoCreateVnf() createVnf.preProcessSDNCActivateRequest(execution)]]></bpmn2:script> </bpmn2:scriptTask> @@ -187,7 +186,7 @@ createVnf.preProcessSDNCActivateRequest(execution)]]></bpmn2:script> <bpmn2:scriptTask id="postProcessSDNCActivateRequest" name="PostProcess SDNC Activate Request" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_0eb41vb</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_15z3gpq</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+ <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* String response = execution.getVariable("DoCVNF_assignSDNCAdapterResponse") @@ -208,7 +207,7 @@ createVnfInfra.validateSDNCResponse(execution, response, "activate")]]></bpmn2:s <bpmn2:scriptTask id="postProcessCreateGenericVnf" name="PostProcess Create Generic Vnf" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_0seif8n</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_1gc18ih</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+ <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* DoCreateVnf createVnf = new DoCreateVnf() createVnf.postProcessCreateGenericVnf(execution)]]></bpmn2:script> </bpmn2:scriptTask> @@ -655,4 +654,4 @@ doCreateVnf.prepUpdateAAIGenericVnf(execution)]]></bpmn2:script> </bpmndi:BPMNShape> </bpmndi:BPMNPlane> </bpmndi:BPMNDiagram> -</bpmn2:definitions> +</bpmn2:definitions>
\ No newline at end of file diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn index be54119bda..a90c816bc3 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn @@ -25,11 +25,11 @@ doCreateVnfAndModules.preProcessRequest(execution)]]></bpmn:script> <camunda:in source="volumeGroupName" target="volumeGroupName" /> <camunda:in source="baseVfModuleId" target="vfModuleId" /> <camunda:in source="baseVfModuleModelInfo" target="vfModuleModelInfo" /> - <camunda:in source=""true"" target="isBaseVfModule" /> + <camunda:in source="isBaseVfModule" target="isBaseVfModule" /> <camunda:in source="asdcServiceModelVersion" target="asdcServiceModelVersion" /> <camunda:out source="vfModuleId" target="createdVfModuleId" /> <camunda:out source="vfModuleOutputParams" target="createdVfModuleOutputParams" /> - <camunda:out source="RollbackData" target="DCVAM_baseRollbackData" /> + <camunda:out source="rollbackData" target="DCVAM_baseRollbackData" /> <camunda:out source="WorkflowException" target="WorkflowException" /> <camunda:in source="serviceInstanceId" target="serviceInstanceId" /> <camunda:in source="serviceModelInfo" target="serviceModelInfo" /> @@ -44,7 +44,7 @@ doCreateVnfAndModules.preProcessRequest(execution)]]></bpmn:script> <bpmn:outgoing>SequenceFlow_1ixcnb6</bpmn:outgoing> </bpmn:callActivity> <bpmn:sequenceFlow id="SequenceFlow_0o4vuzt" sourceRef="StartEvent_1" targetRef="PreProcessRequest" /> - <bpmn:sequenceFlow id="SequenceFlow_1xd3ri5" sourceRef="PreProcessRequest" targetRef="CreateVNF" /> + <bpmn:sequenceFlow id="SequenceFlow_1xd3ri5" sourceRef="PreProcessRequest" targetRef="QueryCatalogDB" /> <bpmn:callActivity id="CreateAddOnVfModule" name="Create Add-On VF Module" calledElement="DoCreateVfModule"> <bpmn:extensionElements> <camunda:in source="msoRequestId" target="msoRequestId" /> @@ -59,11 +59,11 @@ doCreateVnfAndModules.preProcessRequest(execution)]]></bpmn:script> <camunda:in source="volumeGroupId" target="volumeGroupId" /> <camunda:in source="volumeGroupName" target="volumeGroupName" /> <camunda:in source="addOnVfModuleModelInfo" target="vfModuleModelInfo" /> - <camunda:in source=""false"" target="isBaseVfModule" /> + <camunda:in source="isBaseVfModule" target="isBaseVfModule" /> <camunda:in source="asdcServiceModelVersion" target="asdcServiceModelVersion" /> <camunda:out source="vfModuleId" target="createdVfModuleId" /> <camunda:out source="vfModuleOutputParameters" target="createdVfModuleOutputParameters" /> - <camunda:out source="RollbackData" target="DCVAM_addOnRollbackData" /> + <camunda:out source="rollbackData" target="DCVAM_addOnRollbackData" /> <camunda:out source="WorkflowException" target="WorkflowException" /> <camunda:in source="serviceInstanceId" target="serviceInstanceId" /> <camunda:in source="serviceModelInfo" target="serviceModelInfo" /> @@ -95,8 +95,8 @@ doCreateVnfAndModules.validateAddOnModule(execution)]]></bpmn:script> <camunda:property /> </camunda:properties> </bpmn:extensionElements> - <bpmn:incoming>SequenceFlow_07gl6gw</bpmn:incoming> <bpmn:incoming>SequenceFlow_1a6wyuu</bpmn:incoming> + <bpmn:incoming>SequenceFlow_0j52dxv</bpmn:incoming> <bpmn:outgoing>SequenceFlow_132bohl</bpmn:outgoing> <bpmn:outgoing>SequenceFlow_0jz6bqn</bpmn:outgoing> </bpmn:exclusiveGateway> @@ -115,7 +115,7 @@ doCreateVnfAndModules.validateAddOnModule(execution)]]></bpmn:script> <camunda:in source="productFamilyId" target="productFamilyId" /> <camunda:out source="vnfId" target="vnfId" /> <camunda:out source="vnfOutputParams" target="vnfOutputParams" /> - <camunda:out source="RollbackData" target="RollbackData" /> + <camunda:out source="rollbackData" target="rollbackData" /> <camunda:out source="WorkflowException" target="WorkflowException" /> <camunda:in source="serviceModelInfo" target="serviceModelInfo" /> <camunda:in source="globalSubscriberId" target="globalSubscriberId" /> @@ -123,9 +123,11 @@ doCreateVnfAndModules.validateAddOnModule(execution)]]></bpmn:script> <camunda:out source="vnfName" target="vnfName" /> <camunda:in source="lcpCloudRegionId" target="lcpCloudRegionId" /> <camunda:in source="tenantId" target="tenantId" /> + <camunda:in source="rollbackData" target="rollbackData" /> + <camunda:in source="vnfResourceDecomposition" target="vnfResourceDecomposition" /> </bpmn:extensionElements> - <bpmn:incoming>SequenceFlow_1xd3ri5</bpmn:incoming> - <bpmn:outgoing>SequenceFlow_08i3uo6</bpmn:outgoing> + <bpmn:incoming>SequenceFlow_19ohb1a</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_07u8e3l</bpmn:outgoing> </bpmn:callActivity> <bpmn:scriptTask id="PreProcessAddOnModule" name="PreProcess Add-On Module" scriptFormat="groovy"> <bpmn:incoming>SequenceFlow_0jz6bqn</bpmn:incoming> @@ -135,13 +137,12 @@ def doCreateVnfAndModules = new DoCreateVnfAndModules() doCreateVnfAndModules.preProcessAddOnModule(execution)]]></bpmn:script> </bpmn:scriptTask> <bpmn:scriptTask id="QueryCatalogDB" name="Query Catalog DB for VF Modules" scriptFormat="groovy"> - <bpmn:incoming>SequenceFlow_08i3uo6</bpmn:incoming> - <bpmn:outgoing>SequenceFlow_1ifw9tw</bpmn:outgoing> + <bpmn:incoming>SequenceFlow_1xd3ri5</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_19ohb1a</bpmn:outgoing> <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* def doCreateVnfAndModules = new DoCreateVnfAndModules() doCreateVnfAndModules.queryCatalogDB(execution)]]></bpmn:script> </bpmn:scriptTask> - <bpmn:sequenceFlow id="SequenceFlow_08i3uo6" sourceRef="CreateVNF" targetRef="QueryCatalogDB" /> <bpmn:exclusiveGateway id="ExclusiveGateway_1hx9s0y" name="Less than initialCount?" default="SequenceFlow_1vrogpr"> <bpmn:incoming>SequenceFlow_1mguf2m</bpmn:incoming> <bpmn:incoming>SequenceFlow_12x4dvf</bpmn:incoming> @@ -155,9 +156,7 @@ doCreateVnfAndModules.queryCatalogDB(execution)]]></bpmn:script> <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("instancesOfThisModuleDeployed") < execution.getVariable("initialCount")}]]></bpmn:conditionExpression> </bpmn:sequenceFlow> <bpmn:sequenceFlow id="SequenceFlow_1mguf2m" sourceRef="Task_1lfmdks" targetRef="ExclusiveGateway_1hx9s0y" /> - <bpmn:sequenceFlow id="SequenceFlow_1vrogpr" name="no" sourceRef="ExclusiveGateway_1hx9s0y" targetRef="FinishProcessingInitialCountDeployment" /> - <bpmn:sequenceFlow id="SequenceFlow_07gl6gw" sourceRef="FinishProcessingInitialCountDeployment" targetRef="ExclusiveGateway_1vyqr5o" /> - <bpmn:sequenceFlow id="SequenceFlow_1ifw9tw" sourceRef="QueryCatalogDB" targetRef="GenerateBaseModuleName" /> + <bpmn:sequenceFlow id="SequenceFlow_1vrogpr" name="no" sourceRef="ExclusiveGateway_1hx9s0y" targetRef="PostProcessAddOnModule" /> <bpmn:sequenceFlow id="SequenceFlow_1hf7k7q" sourceRef="GenerateBaseModuleName" targetRef="CreateBaseVfModule" /> <bpmn:callActivity id="GenerateBaseModuleName" name="Generate Base Module Name" calledElement="GenerateVfModuleName"> <bpmn:extensionElements> @@ -169,7 +168,7 @@ doCreateVnfAndModules.queryCatalogDB(execution)]]></bpmn:script> <camunda:out source="WorkflowException" target="WorkflowException" /> <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" /> </bpmn:extensionElements> - <bpmn:incoming>SequenceFlow_1ifw9tw</bpmn:incoming> + <bpmn:incoming>SequenceFlow_07u8e3l</bpmn:incoming> <bpmn:outgoing>SequenceFlow_1hf7k7q</bpmn:outgoing> </bpmn:callActivity> <bpmn:callActivity id="GenerateAddOnModuleName" name="Generate Add-On Module Name" calledElement="GenerateVfModuleName"> @@ -187,13 +186,6 @@ doCreateVnfAndModules.queryCatalogDB(execution)]]></bpmn:script> </bpmn:callActivity> <bpmn:sequenceFlow id="SequenceFlow_1lh21yl" sourceRef="GenerateAddOnModuleName" targetRef="CreateAddOnVfModule" /> <bpmn:sequenceFlow id="SequenceFlow_12x4dvf" sourceRef="PreProcessAddOnModule" targetRef="ExclusiveGateway_1hx9s0y" /> - <bpmn:scriptTask id="FinishProcessingInitialCountDeployment" name="Finish Processing Initial Count Deployment" scriptFormat="groovy"> - <bpmn:incoming>SequenceFlow_1vrogpr</bpmn:incoming> - <bpmn:outgoing>SequenceFlow_07gl6gw</bpmn:outgoing> - <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* -def doCreateVnfAndModules = new DoCreateVnfAndModules() -doCreateVnfAndModules.finisthProcessingInitialCountDeployment(execution)]]></bpmn:script> - </bpmn:scriptTask> <bpmn:sequenceFlow id="SequenceFlow_1ixcnb6" sourceRef="CreateBaseVfModule" targetRef="Task_054rz9i" /> <bpmn:sequenceFlow id="SequenceFlow_1a6wyuu" sourceRef="Task_054rz9i" targetRef="ExclusiveGateway_1vyqr5o" /> <bpmn:scriptTask id="Task_054rz9i" name="Validate Create Base VF Module Response" scriptFormat="groovy"> @@ -203,24 +195,55 @@ doCreateVnfAndModules.finisthProcessingInitialCountDeployment(execution)]]></bpm def doCreateVnfAndModules = new DoCreateVnfAndModules() doCreateVnfAndModules.validateBaseModule(execution)]]></bpmn:script> </bpmn:scriptTask> - <bpmn:subProcess id="SubProcess_1ktx0cx" name="Java Exception Handling Sub Process" triggeredByEvent="true"> - <bpmn:scriptTask id="processJavaError" name="Process Error" scriptFormat="groovy"> - <bpmn:incoming>SequenceFlow_11bmhi4</bpmn:incoming> - <bpmn:outgoing>SequenceFlow_1kjlzrn</bpmn:outgoing> - <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.* -ExceptionUtil exceptionUtil = new ExceptionUtil() -exceptionUtil.processJavaException(execution)]]></bpmn:script> - </bpmn:scriptTask> - <bpmn:endEvent id="EndEvent_2"> - <bpmn:incoming>SequenceFlow_1kjlzrn</bpmn:incoming> + <bpmn:subProcess id="SubProcess_0u7tbb2" name="Sub-process for Application Errors" triggeredByEvent="true"> + <bpmn:endEvent id="EndEvent_16s0a3q"> + <bpmn:incoming>SequenceFlow_1h74w1v</bpmn:incoming> </bpmn:endEvent> - <bpmn:startEvent id="StartEvent_2"> - <bpmn:outgoing>SequenceFlow_11bmhi4</bpmn:outgoing> - <bpmn:errorEventDefinition errorRef="Error_1" /> + <bpmn:callActivity id="CallActivity_0gtajjm" name="Call DoCreateVnfAndModulesRollback" calledElement="DoCreateVnfAndModulesRollback"> + <bpmn:extensionElements> + <camunda:in source="msoRequestId" target="msoRequestId" /> + <camunda:in source="rollbackData" target="rollbackData" /> + <camunda:in source="disableRollback" target="disableRollback" /> + <camunda:out source="rolledBack" target="rolledBack" /> + <camunda:out source="rollbackError" target="rollbackError" /> + <camunda:in source="sdncVersion" target="sdncVersion" /> + </bpmn:extensionElements> + <bpmn:incoming>SequenceFlow_03v8mmc</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_0yu0im2</bpmn:outgoing> + </bpmn:callActivity> + <bpmn:scriptTask id="PreProcessRollback" name="Pre Process Rollback" scriptFormat="groovy"> + <bpmn:incoming>SequenceFlow_1l0rxnh</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_03v8mmc</bpmn:outgoing> + <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def dcvam = new DoCreateVnfAndModules() +dcvam.preProcessRollback(execution)]]></bpmn:script> + </bpmn:scriptTask> + <bpmn:scriptTask id="PostProcessRollback" name="Post Process Rollback" scriptFormat="groovy"> + <bpmn:incoming>SequenceFlow_0yu0im2</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_1h74w1v</bpmn:outgoing> + <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def dcvam = new DoCreateVnfAndModules() +dcvam.postProcessRollback(execution)]]></bpmn:script> + </bpmn:scriptTask> + <bpmn:sequenceFlow id="SequenceFlow_1l0rxnh" sourceRef="StartEvent_1nbwxby" targetRef="PreProcessRollback" /> + <bpmn:sequenceFlow id="SequenceFlow_1h74w1v" sourceRef="PostProcessRollback" targetRef="EndEvent_16s0a3q" /> + <bpmn:sequenceFlow id="SequenceFlow_03v8mmc" sourceRef="PreProcessRollback" targetRef="CallActivity_0gtajjm" /> + <bpmn:sequenceFlow id="SequenceFlow_0yu0im2" sourceRef="CallActivity_0gtajjm" targetRef="PostProcessRollback" /> + <bpmn:startEvent id="StartEvent_1nbwxby"> + <bpmn:outgoing>SequenceFlow_1l0rxnh</bpmn:outgoing> + <bpmn:errorEventDefinition errorRef="Error_2" /> </bpmn:startEvent> - <bpmn:sequenceFlow id="SequenceFlow_11bmhi4" name="" sourceRef="StartEvent_2" targetRef="processJavaError" /> - <bpmn:sequenceFlow id="SequenceFlow_1kjlzrn" name="" sourceRef="processJavaError" targetRef="EndEvent_2" /> </bpmn:subProcess> + <bpmn:sequenceFlow id="SequenceFlow_19ohb1a" sourceRef="QueryCatalogDB" targetRef="CreateVNF" /> + <bpmn:sequenceFlow id="SequenceFlow_07u8e3l" sourceRef="CreateVNF" targetRef="GenerateBaseModuleName" /> + <bpmn:sequenceFlow id="SequenceFlow_0j52dxv" sourceRef="PostProcessAddOnModule" targetRef="ExclusiveGateway_1vyqr5o" /> + <bpmn:scriptTask id="PostProcessAddOnModule" name="PostProcess Add-On Module" scriptFormat="groovy"> + <bpmn:incoming>SequenceFlow_1vrogpr</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_0j52dxv</bpmn:outgoing> + <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def doCreateVnfAndModules = new DoCreateVnfAndModules() +doCreateVnfAndModules.postProcessAddOnModule(execution)]]></bpmn:script> + </bpmn:scriptTask> </bpmn:process> <bpmn:error id="Error_1" name="Java Lang Exception" errorCode="java.lang.Exception" /> <bpmn:error id="Error_2" name="MSO Workflow Exception" errorCode="MSOWorkflowException" /> @@ -247,9 +270,9 @@ exceptionUtil.processJavaException(execution)]]></bpmn:script> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1xd3ri5_di" bpmnElement="SequenceFlow_1xd3ri5"> <di:waypoint xsi:type="dc:Point" x="356" y="165" /> - <di:waypoint xsi:type="dc:Point" x="430" y="165" /> + <di:waypoint xsi:type="dc:Point" x="418" y="165" /> <bpmndi:BPMNLabel> - <dc:Bounds x="393" y="150" width="0" height="0" /> + <dc:Bounds x="387" y="150" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="CallActivity_0auiwq0_di" bpmnElement="CreateAddOnVfModule"> @@ -287,21 +310,14 @@ exceptionUtil.processJavaException(execution)]]></bpmn:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="CallActivity_0zr4ioh_di" bpmnElement="CreateVNF"> - <dc:Bounds x="430" y="125" width="100" height="80" /> + <dc:Bounds x="574" y="125" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_0tknqn1_di" bpmnElement="PreProcessAddOnModule"> <dc:Bounds x="1300" y="125" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_1u6qcio_di" bpmnElement="QueryCatalogDB"> - <dc:Bounds x="590" y="125" width="100" height="80" /> + <dc:Bounds x="418" y="125" width="100" height="80" /> </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="SequenceFlow_08i3uo6_di" bpmnElement="SequenceFlow_08i3uo6"> - <di:waypoint xsi:type="dc:Point" x="530" y="165" /> - <di:waypoint xsi:type="dc:Point" x="590" y="165" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="560" y="150" width="0" height="0" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ExclusiveGateway_1hx9s0y_di" bpmnElement="ExclusiveGateway_1hx9s0y" isMarkerVisible="true"> <dc:Bounds x="1493" y="140" width="50" height="50" /> <bpmndi:BPMNLabel> @@ -337,24 +353,10 @@ exceptionUtil.processJavaException(execution)]]></bpmn:script> <di:waypoint xsi:type="dc:Point" x="1518" y="190" /> <di:waypoint xsi:type="dc:Point" x="1518" y="221" /> <di:waypoint xsi:type="dc:Point" x="1518" y="221" /> - <di:waypoint xsi:type="dc:Point" x="1518" y="258" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="1527" y="221" width="12" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="SequenceFlow_07gl6gw_di" bpmnElement="SequenceFlow_07gl6gw"> - <di:waypoint xsi:type="dc:Point" x="1468" y="298" /> - <di:waypoint xsi:type="dc:Point" x="1192" y="298" /> - <di:waypoint xsi:type="dc:Point" x="1191" y="190" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="1330" y="283" width="0" height="0" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="SequenceFlow_1ifw9tw_di" bpmnElement="SequenceFlow_1ifw9tw"> - <di:waypoint xsi:type="dc:Point" x="690" y="165" /> - <di:waypoint xsi:type="dc:Point" x="740" y="165" /> + <di:waypoint xsi:type="dc:Point" x="1518" y="301" /> + <di:waypoint xsi:type="dc:Point" x="1400" y="301" /> <bpmndi:BPMNLabel> - <dc:Bounds x="715" y="150" width="0" height="0" /> + <dc:Bounds x="1528" y="247.2077922077922" width="12" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1hf7k7q_di" bpmnElement="SequenceFlow_1hf7k7q"> @@ -384,9 +386,6 @@ exceptionUtil.processJavaException(execution)]]></bpmn:script> <dc:Bounds x="1447" y="140" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="ScriptTask_144n0mg_di" bpmnElement="FinishProcessingInitialCountDeployment"> - <dc:Bounds x="1468" y="258" width="100" height="80" /> - </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1ixcnb6_di" bpmnElement="SequenceFlow_1ixcnb6"> <di:waypoint xsi:type="dc:Point" x="988" y="165" /> <di:waypoint xsi:type="dc:Point" x="1030" y="165" /> @@ -404,38 +403,85 @@ exceptionUtil.processJavaException(execution)]]></bpmn:script> <bpmndi:BPMNShape id="ScriptTask_1obevnp_di" bpmnElement="Task_054rz9i"> <dc:Bounds x="1030" y="125" width="100" height="80" /> </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="SubProcess_1ktx0cx_di" bpmnElement="SubProcess_1ktx0cx" isExpanded="true"> - <dc:Bounds x="208" y="438" width="313" height="169" /> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="ScriptTask_1j93kr8_di" bpmnElement="processJavaError"> - <dc:Bounds x="316" y="484" width="100" height="80" /> + <bpmndi:BPMNShape id="SubProcess_0u7tbb2_di" bpmnElement="SubProcess_0u7tbb2" isExpanded="true"> + <dc:Bounds x="113" y="382" width="783" height="195" /> </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="EndEvent_1s63ccl_di" bpmnElement="EndEvent_2"> - <dc:Bounds x="461" y="506" width="36" height="36" /> + <bpmndi:BPMNShape id="EndEvent_16s0a3q_di" bpmnElement="EndEvent_16s0a3q"> + <dc:Bounds x="843" y="460" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="479" y="547" width="0" height="0" /> + <dc:Bounds x="861" y="501" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="StartEvent_028j51v_di" bpmnElement="StartEvent_2"> - <dc:Bounds x="233" y="506" width="36" height="36" /> + <bpmndi:BPMNShape id="CallActivity_0gtajjm_di" bpmnElement="CallActivity_0gtajjm"> + <dc:Bounds x="508" y="438" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ScriptTask_12g5tld_di" bpmnElement="PreProcessRollback"> + <dc:Bounds x="345" y="438" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ScriptTask_1nk6apr_di" bpmnElement="PostProcessRollback"> + <dc:Bounds x="676" y="438" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1l0rxnh_di" bpmnElement="SequenceFlow_1l0rxnh"> + <di:waypoint xsi:type="dc:Point" x="246" y="478" /> + <di:waypoint xsi:type="dc:Point" x="345" y="478" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="296" y="463" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1h74w1v_di" bpmnElement="SequenceFlow_1h74w1v"> + <di:waypoint xsi:type="dc:Point" x="776" y="478" /> + <di:waypoint xsi:type="dc:Point" x="808" y="478" /> + <di:waypoint xsi:type="dc:Point" x="808" y="478" /> + <di:waypoint xsi:type="dc:Point" x="843" y="478" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="823" y="478" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_03v8mmc_di" bpmnElement="SequenceFlow_03v8mmc"> + <di:waypoint xsi:type="dc:Point" x="445" y="478" /> + <di:waypoint xsi:type="dc:Point" x="508" y="478" /> <bpmndi:BPMNLabel> - <dc:Bounds x="251" y="547" width="0" height="0" /> + <dc:Bounds x="477" y="463" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_0yu0im2_di" bpmnElement="SequenceFlow_0yu0im2"> + <di:waypoint xsi:type="dc:Point" x="608" y="478" /> + <di:waypoint xsi:type="dc:Point" x="676" y="478" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="642" y="463" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="StartEvent_00jdkur_di" bpmnElement="StartEvent_1nbwxby"> + <dc:Bounds x="210" y="460" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="228" y="501" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="SequenceFlow_11bmhi4_di" bpmnElement="SequenceFlow_11bmhi4"> - <di:waypoint xsi:type="dc:Point" x="269" y="524" /> - <di:waypoint xsi:type="dc:Point" x="316" y="524" /> + <bpmndi:BPMNEdge id="SequenceFlow_19ohb1a_di" bpmnElement="SequenceFlow_19ohb1a"> + <di:waypoint xsi:type="dc:Point" x="518" y="165" /> + <di:waypoint xsi:type="dc:Point" x="574" y="165" /> <bpmndi:BPMNLabel> - <dc:Bounds x="290" y="524" width="0" height="0" /> + <dc:Bounds x="546" y="140" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="SequenceFlow_1kjlzrn_di" bpmnElement="SequenceFlow_1kjlzrn"> - <di:waypoint xsi:type="dc:Point" x="416" y="524" /> - <di:waypoint xsi:type="dc:Point" x="461" y="524" /> + <bpmndi:BPMNEdge id="SequenceFlow_07u8e3l_di" bpmnElement="SequenceFlow_07u8e3l"> + <di:waypoint xsi:type="dc:Point" x="674" y="165" /> + <di:waypoint xsi:type="dc:Point" x="740" y="165" /> <bpmndi:BPMNLabel> - <dc:Bounds x="436" y="524" width="0" height="0" /> + <dc:Bounds x="707" y="140" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_0j52dxv_di" bpmnElement="SequenceFlow_0j52dxv"> + <di:waypoint xsi:type="dc:Point" x="1300" y="301" /> + <di:waypoint xsi:type="dc:Point" x="1192" y="301" /> + <di:waypoint xsi:type="dc:Point" x="1191" y="190" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1246" y="286" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ScriptTask_0srhar8_di" bpmnElement="PostProcessAddOnModule"> + <dc:Bounds x="1300" y="262" width="100" height="80" /> + </bpmndi:BPMNShape> </bpmndi:BPMNPlane> </bpmndi:BPMNDiagram> -</bpmn:definitions> +</bpmn:definitions>
\ No newline at end of file diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModulesRollback.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModulesRollback.bpmn index 2fba166dc4..aa362021e0 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModulesRollback.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModulesRollback.bpmn @@ -9,9 +9,9 @@ <bpmn2:endEvent id="EndEvent_1"> <bpmn2:incoming>SequenceFlow_22</bpmn2:incoming> </bpmn2:endEvent> - <bpmn2:sequenceFlow id="SequenceFlow_12" name="" sourceRef="CatchExceptions" targetRef="LogSaveWorkflowException" /> + <bpmn2:sequenceFlow id="SequenceFlow_12" name="" sourceRef="CatchExceptions" targetRef="SetFailedRollbackStatus" /> <bpmn2:scriptTask id="LogSaveWorkflowException" name="Log and Save Workflow Exception" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_12</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_1wch84s</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_22</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* def dcvfmr = new DoCreateVfModuleRollback() @@ -19,6 +19,14 @@ dcvfmr.logWorkflowException(execution, 'DoCreateVfModuleRollback caught an event dcvfmr.saveWorkflowException(execution, 'DCVFMR_CaughtWorkflowException1')]]></bpmn2:script> </bpmn2:scriptTask> <bpmn2:sequenceFlow id="SequenceFlow_22" name="" sourceRef="LogSaveWorkflowException" targetRef="EndEvent_1" /> + <bpmn2:sequenceFlow id="SequenceFlow_1wch84s" sourceRef="SetFailedRollbackStatus" targetRef="LogSaveWorkflowException" /> + <bpmn2:scriptTask id="SetFailedRollbackStatus" name="Set Failed Rollback Status" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_12</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_1wch84s</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def dcvamr= new DoCreateVnfAndModulesRollback() +dcvamr.setFailedRollbackStatus(execution)]]></bpmn2:script> + </bpmn2:scriptTask> </bpmn2:subProcess> <bpmn2:boundaryEvent id="BoundaryEvent_1" name="" attachedToRef="SubProcess_1"> <bpmn2:outgoing>SequenceFlow_23</bpmn2:outgoing> @@ -32,19 +40,21 @@ dcvfmr.saveWorkflowException(execution, 'DCVFMR_CaughtWorkflowException1')]]></b <bpmn2:outgoing>SequenceFlow_1537b7m</bpmn2:outgoing> </bpmn2:startEvent> <bpmn2:exclusiveGateway id="ExclusiveGateway_12v8g91" name="Are there VF Modules to roll back?" default="SequenceFlow_1r6wyy6"> - <bpmn2:incoming>SequenceFlow_0bmsi5h</bpmn2:incoming> <bpmn2:incoming>SequenceFlow_1srw52v</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_0zjzorm</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_19xaddm</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_1r6wyy6</bpmn2:outgoing> <bpmn2:outgoing>SequenceFlow_0v85t87</bpmn2:outgoing> </bpmn2:exclusiveGateway> <bpmn2:exclusiveGateway id="ExclusiveGateway_09ajxqr" name="Delete VNF?" default="SequenceFlow_1yas9ol"> - <bpmn2:incoming>SequenceFlow_1r6wyy6</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_1g6psjt</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_152tazp</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_1kr0r4a</bpmn2:outgoing> <bpmn2:outgoing>SequenceFlow_1yas9ol</bpmn2:outgoing> </bpmn2:exclusiveGateway> <bpmn2:endEvent id="EndEvent_1seag7u"> - <bpmn2:incoming>SequenceFlow_04yd2yr</bpmn2:incoming> - <bpmn2:incoming>SequenceFlow_1yas9ol</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_0mk9lrj</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_03cc9y6</bpmn2:incoming> </bpmn2:endEvent> <bpmn2:sequenceFlow id="SequenceFlow_1537b7m" sourceRef="StartEvent_1gai4qr" targetRef="PreProcessRequest" /> <bpmn2:scriptTask id="PreProcessRequest" name="PreProcess Request" scriptFormat="groovy"> @@ -54,8 +64,8 @@ dcvfmr.saveWorkflowException(execution, 'DCVFMR_CaughtWorkflowException1')]]></b def dcvamr = new DoCreateVnfAndModulesRollback() dcvamr.preProcessRequest(execution)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_0bmsi5h" sourceRef="PreProcessRequest" targetRef="ExclusiveGateway_12v8g91" /> - <bpmn2:sequenceFlow id="SequenceFlow_1ycq005" sourceRef="Task_1sbxjc8" targetRef="Task_0ifyxgt" /> + <bpmn2:sequenceFlow id="SequenceFlow_0bmsi5h" sourceRef="PreProcessRequest" targetRef="ExclusiveGateway_01o1lkn" /> + <bpmn2:sequenceFlow id="SequenceFlow_1ycq005" sourceRef="Task_1sbxjc8" targetRef="RollbackCreateVFModule" /> <bpmn2:scriptTask id="Task_1sbxjc8" name="Prepare Rollback Create VF Module Request" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_0v85t87</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_1ycq005</bpmn2:outgoing> @@ -63,26 +73,30 @@ dcvamr.preProcessRequest(execution)]]></bpmn2:script> def dcvamr = new DoCreateVnfAndModulesRollback() dcvamr.preProcessCreateVfModuleRollback(execution)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:callActivity id="Task_0ifyxgt" name="Rollback Create VF Module " calledElement="DoCreateVfModuleRollback"> + <bpmn2:callActivity id="RollbackCreateVFModule" name="Rollback Create VF Module " calledElement="DoCreateVfModuleRollback"> <bpmn2:extensionElements> - <camunda:in source="DCVAMR_RollbackData" target="RollbackData" /> + <camunda:in source="DCVAMR_RollbackData" target="rollbackData" /> <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" /> <camunda:out source="WorkflowException" target="WorkflowException" /> <camunda:in source=""true"" target="isVidRequest" /> <camunda:in source="mso-request-id" target="mso-request-id" /> + <camunda:in source="disableRollback" target="disableRollback" /> + <camunda:in source="sdncVersion" target="sdncVersion" /> + <camunda:out source="rolledBack" target="DCVM_rolledBack" /> + <camunda:out source="rollbackError" target="rollbackError" /> </bpmn2:extensionElements> <bpmn2:incoming>SequenceFlow_1ycq005</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_181hb2a</bpmn2:outgoing> </bpmn2:callActivity> - <bpmn2:sequenceFlow id="SequenceFlow_1r6wyy6" name="no" sourceRef="ExclusiveGateway_12v8g91" targetRef="ExclusiveGateway_09ajxqr" /> + <bpmn2:sequenceFlow id="SequenceFlow_1r6wyy6" name="no" sourceRef="ExclusiveGateway_12v8g91" targetRef="ExclusiveGateway_07kr3gt" /> <bpmn2:sequenceFlow id="SequenceFlow_0v85t87" name="yes" sourceRef="ExclusiveGateway_12v8g91" targetRef="Task_1sbxjc8"> <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVAMR_numOfModulesToDelete") > 0}]]></bpmn2:conditionExpression> </bpmn2:sequenceFlow> <bpmn2:sequenceFlow id="SequenceFlow_1kr0r4a" name="yes" sourceRef="ExclusiveGateway_09ajxqr" targetRef="Task_0p8fmrm"> - <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVAMR_vnfId") != null}]]></bpmn2:conditionExpression> + <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVAMR_rollbackVnfCreate") == "true"}]]></bpmn2:conditionExpression> </bpmn2:sequenceFlow> - <bpmn2:sequenceFlow id="SequenceFlow_04yd2yr" sourceRef="Task_0p8fmrm" targetRef="EndEvent_1seag7u" /> - <bpmn2:sequenceFlow id="SequenceFlow_1yas9ol" name="no" sourceRef="ExclusiveGateway_09ajxqr" targetRef="EndEvent_1seag7u" /> + <bpmn2:sequenceFlow id="SequenceFlow_04yd2yr" sourceRef="Task_0p8fmrm" targetRef="SetSuccessfulRollbackStatus" /> + <bpmn2:sequenceFlow id="SequenceFlow_1yas9ol" name="no" sourceRef="ExclusiveGateway_09ajxqr" targetRef="SetSuccessfulRollbackStatus" /> <bpmn2:callActivity id="Task_0p8fmrm" name="Delete VNF" calledElement="DoDeleteVnf"> <bpmn2:extensionElements> <camunda:in source="DCVAMR_vnfId" target="vnfId" /> @@ -92,7 +106,7 @@ dcvamr.preProcessCreateVfModuleRollback(execution)]]></bpmn2:script> <bpmn2:incoming>SequenceFlow_1kr0r4a</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_04yd2yr</bpmn2:outgoing> </bpmn2:callActivity> - <bpmn2:sequenceFlow id="SequenceFlow_181hb2a" sourceRef="Task_0ifyxgt" targetRef="Task_0kf9oby" /> + <bpmn2:sequenceFlow id="SequenceFlow_181hb2a" sourceRef="RollbackCreateVFModule" targetRef="Task_0kf9oby" /> <bpmn2:scriptTask id="Task_0kf9oby" name="PostProcess Rollback Create VF Module" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_181hb2a</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_1srw52v</bpmn2:outgoing> @@ -101,13 +115,111 @@ def dcvamr = new DoCreateVnfAndModulesRollback() dcvamr.postProcessCreateVfModuleRollback(execution)]]></bpmn2:script> </bpmn2:scriptTask> <bpmn2:sequenceFlow id="SequenceFlow_1srw52v" sourceRef="Task_0kf9oby" targetRef="ExclusiveGateway_12v8g91" /> + <bpmn2:scriptTask id="PreProcessSDNCDeactivateRequest" name="PreProcess SDNC Deactivate Request" scriptFormat="groovy"> + <bpmn2:incoming>SDNCDeactivateYes</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_0nysmc9</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def dcvamr= new DoCreateVnfAndModulesRollback() +dcvamr.preProcessSDNCDeactivateRequest(execution)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:scriptTask id="ScriptTask_1ug98j4" name="PostProcess SDNC Deactivate Request" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_1hc04x2</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_19xaddm</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def dcvamr = new DoDeleteVnfAndModules() +String response = execution.getVariable("DCVAMR_deactivateSDNCAdapterResponse") +dcvamr.validateSDNCResponse(execution, response, "deactivate")]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:callActivity id="SDNCAdapterTopologyDeactivate" name="Call SDNC Adapter Topology Deactivate" calledElement="sdncAdapter"> + <bpmn2:extensionElements> + <camunda:in source="DCVAMR_deactivateSDNCRequest" target="sdncAdapterWorkflowRequest" /> + <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" /> + <camunda:in source="mso-request-id" target="mso-request-id" /> + <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" /> + <camunda:out source="WorkflowException" target="WorkflowException" /> + <camunda:out source="sdncAdapterResponse" target="DCVAMR_deactivateSDNCAdapterResponse" /> + <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" /> + </bpmn2:extensionElements> + <bpmn2:incoming>SequenceFlow_0nysmc9</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_1hc04x2</bpmn2:outgoing> + </bpmn2:callActivity> + <bpmn2:sequenceFlow id="SequenceFlow_0nysmc9" sourceRef="PreProcessSDNCDeactivateRequest" targetRef="SDNCAdapterTopologyDeactivate" /> + <bpmn2:sequenceFlow id="SequenceFlow_1hc04x2" sourceRef="SDNCAdapterTopologyDeactivate" targetRef="ScriptTask_1ug98j4" /> + <bpmn2:exclusiveGateway id="ExclusiveGateway_1sr014x" name="Send SDNC Deactivate?" default="SequenceFlow_0zjzorm"> + <bpmn2:incoming>SequenceFlow_1rezswi</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_0zjzorm</bpmn2:outgoing> + <bpmn2:outgoing>SDNCDeactivateYes</bpmn2:outgoing> + </bpmn2:exclusiveGateway> + <bpmn2:sequenceFlow id="SequenceFlow_0zjzorm" name="no" sourceRef="ExclusiveGateway_1sr014x" targetRef="ExclusiveGateway_12v8g91" /> + <bpmn2:sequenceFlow id="SDNCDeactivateYes" name="yes" sourceRef="ExclusiveGateway_1sr014x" targetRef="PreProcessSDNCDeactivateRequest"> + <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVAMR_rollbackSDNCActivate") == "true"}]]></bpmn2:conditionExpression> + </bpmn2:sequenceFlow> + <bpmn2:sequenceFlow id="SequenceFlow_19xaddm" sourceRef="ScriptTask_1ug98j4" targetRef="ExclusiveGateway_12v8g91" /> + <bpmn2:exclusiveGateway id="ExclusiveGateway_07kr3gt" name="Send SDNC Unassign?" default="SequenceFlow_1g6psjt"> + <bpmn2:incoming>SequenceFlow_1r6wyy6</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_1g6psjt</bpmn2:outgoing> + <bpmn2:outgoing>SequenceFlow_01am36p</bpmn2:outgoing> + </bpmn2:exclusiveGateway> + <bpmn2:sequenceFlow id="SequenceFlow_1g6psjt" name="no" sourceRef="ExclusiveGateway_07kr3gt" targetRef="ExclusiveGateway_09ajxqr" /> + <bpmn2:scriptTask id="ScriptTask_1ma7nvr" name="PreProcess SDNC Unassign Request" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_01am36p</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_0a5ecvu</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def dcvamr= new DoCreateVnfAndModulesRollback() +dcvamr.preProcessSDNCUnassignRequest(execution)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:callActivity id="CallActivity_018fqnd" name="Call SDNC Adapter Topology Unassign" calledElement="sdncAdapter"> + <bpmn2:extensionElements> + <camunda:in source="DCVAMR_unassignSDNCRequest" target="sdncAdapterWorkflowRequest" /> + <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" /> + <camunda:in source="mso-request-id" target="mso-request-id" /> + <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" /> + <camunda:out source="WorkflowException" target="WorkflowException" /> + <camunda:out source="sdncAdapterResponse" target="DCVAMR_unassignSDNCAdapterResponse" /> + <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" /> + </bpmn2:extensionElements> + <bpmn2:incoming>SequenceFlow_0a5ecvu</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_1ilok6u</bpmn2:outgoing> + </bpmn2:callActivity> + <bpmn2:scriptTask id="ScriptTask_0b3jyb7" name="PostProcess SDNC Unassign Request" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_1ilok6u</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_152tazp</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def dcvamr = new DoDeleteVnfAndModules() +String response = execution.getVariable("DCVAMR_unassignSDNCAdapterResponse") +dcvamr.validateSDNCResponse(execution, response, "unassign")]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:sequenceFlow id="SequenceFlow_0a5ecvu" sourceRef="ScriptTask_1ma7nvr" targetRef="CallActivity_018fqnd" /> + <bpmn2:sequenceFlow id="SequenceFlow_1ilok6u" sourceRef="CallActivity_018fqnd" targetRef="ScriptTask_0b3jyb7" /> + <bpmn2:sequenceFlow id="SequenceFlow_152tazp" sourceRef="ScriptTask_0b3jyb7" targetRef="ExclusiveGateway_09ajxqr" /> + <bpmn2:sequenceFlow id="SequenceFlow_01am36p" name="yes" sourceRef="ExclusiveGateway_07kr3gt" targetRef="ScriptTask_1ma7nvr"> + <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVAMR_rollbackSDNCAssign") == "true"}]]></bpmn2:conditionExpression> + </bpmn2:sequenceFlow> + <bpmn2:exclusiveGateway id="ExclusiveGateway_01o1lkn" name="Skip rollback?" default="SequenceFlow_1rezswi"> + <bpmn2:incoming>SequenceFlow_0bmsi5h</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_1rezswi</bpmn2:outgoing> + <bpmn2:outgoing>SequenceFlow_0mk9lrj</bpmn2:outgoing> + </bpmn2:exclusiveGateway> + <bpmn2:sequenceFlow id="SequenceFlow_1rezswi" name="no" sourceRef="ExclusiveGateway_01o1lkn" targetRef="ExclusiveGateway_1sr014x" /> + <bpmn2:sequenceFlow id="SequenceFlow_0mk9lrj" name="yes" sourceRef="ExclusiveGateway_01o1lkn" targetRef="EndEvent_1seag7u"> + <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("skipRollback" ) == true}]]></bpmn2:conditionExpression> + </bpmn2:sequenceFlow> + <bpmn2:sequenceFlow id="SequenceFlow_03cc9y6" sourceRef="SetSuccessfulRollbackStatus" targetRef="EndEvent_1seag7u" /> + <bpmn2:scriptTask id="SetSuccessfulRollbackStatus" name="Set Successful Rollback Status" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_1yas9ol</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_04yd2yr</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_03cc9y6</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def dcvamr= new DoCreateVnfAndModulesRollback() +dcvamr.setSuccessfulRollbackStatus(execution)]]></bpmn2:script> + </bpmn2:scriptTask> </bpmn2:process> <bpmn2:error id="Error_1" name="MSO Workflow Exception" errorCode="MSOWorkflowException" /> <bpmn2:message id="Message_1" name="DoCreateVfModuleRollbackRequest" /> <bpmndi:BPMNDiagram id="BPMNDiagram_1"> <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateVnfAndModulesRollback"> <bpmndi:BPMNShape id="_BPMNShape_SubProcess_22" bpmnElement="SubProcess_1" isExpanded="true"> - <dc:Bounds x="18" y="1012" width="469" height="150" /> + <dc:Bounds x="16" y="1012" width="621" height="152" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_StartEvent_59" bpmnElement="CatchExceptions"> <dc:Bounds x="36" y="1063" width="36" height="36" /> @@ -116,167 +228,313 @@ dcvamr.postProcessCreateVfModuleRollback(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_281" bpmnElement="LogSaveWorkflowException"> - <dc:Bounds x="174" y="1041" width="100" height="80" /> + <dc:Bounds x="361" y="1041" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_EndEvent_188" bpmnElement="EndEvent_1"> - <dc:Bounds x="349" y="1062" width="36" height="36" /> + <dc:Bounds x="537" y="1063" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="367" y="1098" width="0" height="0" /> + <dc:Bounds x="555" y="1099" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_BoundaryEvent_55" bpmnElement="BoundaryEvent_1"> - <dc:Bounds x="469" y="1058" width="36" height="36" /> + <dc:Bounds x="619" y="1059" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="487" y="1094" width="0" height="0" /> + <dc:Bounds x="637" y="1095" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_EndEvent_189" bpmnElement="EndEvent_2"> - <dc:Bounds x="593" y="1058" width="36" height="36" /> + <dc:Bounds x="710" y="1058" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="611" y="1099" width="0" height="0" /> + <dc:Bounds x="728" y="1099" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_StartEvent_59" targetElement="_BPMNShape_ScriptTask_281"> <di:waypoint xsi:type="dc:Point" x="72" y="1081" /> - <di:waypoint xsi:type="dc:Point" x="174" y="1081" /> + <di:waypoint xsi:type="dc:Point" x="161" y="1081" /> <bpmndi:BPMNLabel> - <dc:Bounds x="120" y="1081" width="0" height="0" /> + <dc:Bounds x="117" y="1066" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_22" bpmnElement="SequenceFlow_22" sourceElement="_BPMNShape_ScriptTask_281" targetElement="_BPMNShape_EndEvent_188"> - <di:waypoint xsi:type="dc:Point" x="274" y="1081" /> - <di:waypoint xsi:type="dc:Point" x="311" y="1081" /> - <di:waypoint xsi:type="dc:Point" x="311" y="1080" /> - <di:waypoint xsi:type="dc:Point" x="349" y="1080" /> + <di:waypoint xsi:type="dc:Point" x="461" y="1081" /> + <di:waypoint xsi:type="dc:Point" x="537" y="1081" /> <bpmndi:BPMNLabel> - <dc:Bounds x="326" y="1071" width="0" height="0" /> + <dc:Bounds x="499" y="1066" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_23" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_BoundaryEvent_55" targetElement="_BPMNShape_EndEvent_189"> - <di:waypoint xsi:type="dc:Point" x="505" y="1076" /> - <di:waypoint xsi:type="dc:Point" x="593" y="1076" /> + <di:waypoint xsi:type="dc:Point" x="655" y="1077" /> + <di:waypoint xsi:type="dc:Point" x="710" y="1076" /> <bpmndi:BPMNLabel> - <dc:Bounds x="550" y="1051" width="0" height="0" /> + <dc:Bounds x="683" y="1061.5" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="StartEvent_1gai4qr_di" bpmnElement="StartEvent_1gai4qr"> - <dc:Bounds x="7.752742616033771" y="654.7502109704641" width="36" height="36" /> + <dc:Bounds x="-91" y="655" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="26" y="690.7502109704641" width="0" height="0" /> + <dc:Bounds x="-73" y="691" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ExclusiveGateway_12v8g91_di" bpmnElement="ExclusiveGateway_12v8g91" isMarkerVisible="true"> - <dc:Bounds x="284.2253164556962" y="648.1721518987342" width="50" height="50" /> + <dc:Bounds x="806" y="648" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="273" y="698" width="73" height="36" /> + <dc:Bounds x="753" y="619" width="73" height="36" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ExclusiveGateway_09ajxqr_di" bpmnElement="ExclusiveGateway_09ajxqr" isMarkerVisible="true"> - <dc:Bounds x="833.4869198312236" y="648" width="50" height="50" /> + <dc:Bounds x="1291" y="799" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="828" y="698" width="62" height="12" /> + <dc:Bounds x="1241" y="786" width="62" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="EndEvent_1seag7u_di" bpmnElement="EndEvent_1seag7u"> - <dc:Bounds x="1101.651476793249" y="655" width="36" height="36" /> + <dc:Bounds x="1678" y="806" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1120" y="691" width="0" height="0" /> + <dc:Bounds x="2135" y="827" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1537b7m_di" bpmnElement="SequenceFlow_1537b7m"> - <di:waypoint xsi:type="dc:Point" x="44" y="673" /> - <di:waypoint xsi:type="dc:Point" x="131" y="673" /> + <di:waypoint xsi:type="dc:Point" x="-55" y="673" /> + <di:waypoint xsi:type="dc:Point" x="-3" y="673" /> <bpmndi:BPMNLabel> - <dc:Bounds x="88" y="658" width="0" height="0" /> + <dc:Bounds x="-29" y="658" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_0fckboe_di" bpmnElement="PreProcessRequest"> - <dc:Bounds x="131" y="633" width="100" height="80" /> + <dc:Bounds x="-3" y="633" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0bmsi5h_di" bpmnElement="SequenceFlow_0bmsi5h"> - <di:waypoint xsi:type="dc:Point" x="231" y="673" /> - <di:waypoint xsi:type="dc:Point" x="257" y="673" /> - <di:waypoint xsi:type="dc:Point" x="257" y="673" /> - <di:waypoint xsi:type="dc:Point" x="284" y="673" /> + <di:waypoint xsi:type="dc:Point" x="97" y="673" /> + <di:waypoint xsi:type="dc:Point" x="124" y="673" /> + <di:waypoint xsi:type="dc:Point" x="124" y="673" /> + <di:waypoint xsi:type="dc:Point" x="150" y="673" /> <bpmndi:BPMNLabel> - <dc:Bounds x="272" y="673" width="0" height="0" /> + <dc:Bounds x="139" y="673" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1ycq005_di" bpmnElement="SequenceFlow_1ycq005"> - <di:waypoint xsi:type="dc:Point" x="469" y="509" /> - <di:waypoint xsi:type="dc:Point" x="502" y="510" /> + <di:waypoint xsi:type="dc:Point" x="983" y="494" /> + <di:waypoint xsi:type="dc:Point" x="1016" y="495" /> <bpmndi:BPMNLabel> - <dc:Bounds x="486" y="494.5" width="0" height="0" /> + <dc:Bounds x="1000" y="480" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_1sc2oye_di" bpmnElement="Task_1sbxjc8"> - <dc:Bounds x="369" y="470" width="100" height="80" /> + <dc:Bounds x="883" y="455" width="100" height="80" /> </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="CallActivity_1lj1iud_di" bpmnElement="Task_0ifyxgt"> - <dc:Bounds x="502" y="470" width="100" height="80" /> + <bpmndi:BPMNShape id="CallActivity_1lj1iud_di" bpmnElement="RollbackCreateVFModule"> + <dc:Bounds x="1016" y="455" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1r6wyy6_di" bpmnElement="SequenceFlow_1r6wyy6"> - <di:waypoint xsi:type="dc:Point" x="309" y="698" /> - <di:waypoint xsi:type="dc:Point" x="309" y="755" /> - <di:waypoint xsi:type="dc:Point" x="769" y="755" /> - <di:waypoint xsi:type="dc:Point" x="769" y="673" /> - <di:waypoint xsi:type="dc:Point" x="833" y="673" /> + <di:waypoint xsi:type="dc:Point" x="831" y="698" /> + <di:waypoint xsi:type="dc:Point" x="831" y="799" /> <bpmndi:BPMNLabel> - <dc:Bounds x="533" y="740" width="12" height="12" /> + <dc:Bounds x="838" y="759.6519350414114" width="12" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0v85t87_di" bpmnElement="SequenceFlow_0v85t87"> - <di:waypoint xsi:type="dc:Point" x="309" y="648" /> - <di:waypoint xsi:type="dc:Point" x="309" y="510" /> - <di:waypoint xsi:type="dc:Point" x="369" y="510" /> + <di:waypoint xsi:type="dc:Point" x="831" y="648" /> + <di:waypoint xsi:type="dc:Point" x="831" y="495" /> + <di:waypoint xsi:type="dc:Point" x="883" y="495" /> <bpmndi:BPMNLabel> - <dc:Bounds x="315" y="579" width="18" height="12" /> + <dc:Bounds x="837" y="572.1521739130435" width="18" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1kr0r4a_di" bpmnElement="SequenceFlow_1kr0r4a"> - <di:waypoint xsi:type="dc:Point" x="858" y="648" /> - <di:waypoint xsi:type="dc:Point" x="858" y="589" /> - <di:waypoint xsi:type="dc:Point" x="945" y="589" /> + <di:waypoint xsi:type="dc:Point" x="1316" y="799" /> + <di:waypoint xsi:type="dc:Point" x="1316" y="733" /> + <di:waypoint xsi:type="dc:Point" x="1390" y="733" /> <bpmndi:BPMNLabel> - <dc:Bounds x="864" y="619" width="18" height="12" /> + <dc:Bounds x="1322" y="765.8928772635815" width="18" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_04yd2yr_di" bpmnElement="SequenceFlow_04yd2yr"> - <di:waypoint xsi:type="dc:Point" x="1045" y="589" /> - <di:waypoint xsi:type="dc:Point" x="1120" y="589" /> - <di:waypoint xsi:type="dc:Point" x="1120" y="655" /> + <di:waypoint xsi:type="dc:Point" x="1490" y="733" /> + <di:waypoint xsi:type="dc:Point" x="1592" y="733" /> + <di:waypoint xsi:type="dc:Point" x="1592" y="784" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1083" y="574" width="0" height="0" /> + <dc:Bounds x="1541" y="718" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1yas9ol_di" bpmnElement="SequenceFlow_1yas9ol"> - <di:waypoint xsi:type="dc:Point" x="883" y="673" /> - <di:waypoint xsi:type="dc:Point" x="1102" y="673" /> + <di:waypoint xsi:type="dc:Point" x="1341" y="824" /> + <di:waypoint xsi:type="dc:Point" x="1542" y="824" /> <bpmndi:BPMNLabel> - <dc:Bounds x="987" y="658" width="12" height="12" /> + <dc:Bounds x="1503" y="807" width="12" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="CallActivity_01fs058_di" bpmnElement="Task_0p8fmrm"> - <dc:Bounds x="945" y="549" width="100" height="80" /> + <dc:Bounds x="1390" y="693" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_181hb2a_di" bpmnElement="SequenceFlow_181hb2a"> - <di:waypoint xsi:type="dc:Point" x="602" y="510" /> - <di:waypoint xsi:type="dc:Point" x="641" y="510" /> + <di:waypoint xsi:type="dc:Point" x="1116" y="495" /> + <di:waypoint xsi:type="dc:Point" x="1155" y="495" /> <bpmndi:BPMNLabel> - <dc:Bounds x="622" y="495" width="0" height="0" /> + <dc:Bounds x="1136" y="480" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_196e1px_di" bpmnElement="Task_0kf9oby"> - <dc:Bounds x="641" y="470" width="100" height="80" /> + <dc:Bounds x="1155" y="455" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1srw52v_di" bpmnElement="SequenceFlow_1srw52v"> - <di:waypoint xsi:type="dc:Point" x="691" y="550" /> - <di:waypoint xsi:type="dc:Point" x="691" y="673" /> - <di:waypoint xsi:type="dc:Point" x="334" y="673" /> + <di:waypoint xsi:type="dc:Point" x="1205" y="535" /> + <di:waypoint xsi:type="dc:Point" x="1205" y="673" /> + <di:waypoint xsi:type="dc:Point" x="856" y="673" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1220" y="604" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ScriptTask_12w53bf_di" bpmnElement="PreProcessSDNCDeactivateRequest"> + <dc:Bounds x="323" y="795" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ScriptTask_1ug98j4_di" bpmnElement="ScriptTask_1ug98j4"> + <dc:Bounds x="617" y="795" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="CallActivity_1gvc90m_di" bpmnElement="SDNCAdapterTopologyDeactivate"> + <dc:Bounds x="473" y="795" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_0nysmc9_di" bpmnElement="SequenceFlow_0nysmc9"> + <di:waypoint xsi:type="dc:Point" x="423" y="835" /> + <di:waypoint xsi:type="dc:Point" x="473" y="835" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="449" y="820" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1hc04x2_di" bpmnElement="SequenceFlow_1hc04x2"> + <di:waypoint xsi:type="dc:Point" x="573" y="835" /> + <di:waypoint xsi:type="dc:Point" x="617" y="835" /> <bpmndi:BPMNLabel> - <dc:Bounds x="706" y="611.5" width="0" height="0" /> + <dc:Bounds x="595" y="820" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ExclusiveGateway_1sr014x_di" bpmnElement="ExclusiveGateway_1sr014x" isMarkerVisible="true"> + <dc:Bounds x="277" y="648" width="50" height="50" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="271" y="608" width="62" height="24" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_0zjzorm_di" bpmnElement="SequenceFlow_0zjzorm"> + <di:waypoint xsi:type="dc:Point" x="327" y="673" /> + <di:waypoint xsi:type="dc:Point" x="806" y="673" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="561" y="658" width="12" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1tgi77m_di" bpmnElement="SDNCDeactivateYes"> + <di:waypoint xsi:type="dc:Point" x="302" y="698" /> + <di:waypoint xsi:type="dc:Point" x="302" y="835" /> + <di:waypoint xsi:type="dc:Point" x="323" y="835" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="308" y="756.5" width="18" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_19xaddm_di" bpmnElement="SequenceFlow_19xaddm"> + <di:waypoint xsi:type="dc:Point" x="717" y="835" /> + <di:waypoint xsi:type="dc:Point" x="781" y="835" /> + <di:waypoint xsi:type="dc:Point" x="781" y="673" /> + <di:waypoint xsi:type="dc:Point" x="806" y="673" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="796" y="754" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ExclusiveGateway_07kr3gt_di" bpmnElement="ExclusiveGateway_07kr3gt" isMarkerVisible="true"> + <dc:Bounds x="806" y="799" width="50" height="50" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="841" y="858" width="62" height="24" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1g6psjt_di" bpmnElement="SequenceFlow_1g6psjt"> + <di:waypoint xsi:type="dc:Point" x="856" y="824" /> + <di:waypoint xsi:type="dc:Point" x="1074" y="824" /> + <di:waypoint xsi:type="dc:Point" x="1074" y="824" /> + <di:waypoint xsi:type="dc:Point" x="1291" y="824" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1083" y="824" width="12" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ScriptTask_1ma7nvr_di" bpmnElement="ScriptTask_1ma7nvr"> + <dc:Bounds x="873" y="905" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="CallActivity_018fqnd_di" bpmnElement="CallActivity_018fqnd"> + <dc:Bounds x="1034" y="905" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ScriptTask_0b3jyb7_di" bpmnElement="ScriptTask_0b3jyb7"> + <dc:Bounds x="1195" y="905" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_0a5ecvu_di" bpmnElement="SequenceFlow_0a5ecvu"> + <di:waypoint xsi:type="dc:Point" x="973" y="945" /> + <di:waypoint xsi:type="dc:Point" x="1034" y="945" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1004" y="930" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1ilok6u_di" bpmnElement="SequenceFlow_1ilok6u"> + <di:waypoint xsi:type="dc:Point" x="1134" y="945" /> + <di:waypoint xsi:type="dc:Point" x="1195" y="945" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1165" y="930" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_152tazp_di" bpmnElement="SequenceFlow_152tazp"> + <di:waypoint xsi:type="dc:Point" x="1295" y="945" /> + <di:waypoint xsi:type="dc:Point" x="1316" y="945" /> + <di:waypoint xsi:type="dc:Point" x="1316" y="849" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1306" y="920" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_01am36p_di" bpmnElement="SequenceFlow_01am36p"> + <di:waypoint xsi:type="dc:Point" x="831" y="849" /> + <di:waypoint xsi:type="dc:Point" x="831" y="945" /> + <di:waypoint xsi:type="dc:Point" x="873" y="945" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="838" y="897" width="18" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ExclusiveGateway_01o1lkn_di" bpmnElement="ExclusiveGateway_01o1lkn" isMarkerVisible="true"> + <dc:Bounds x="150" y="648" width="50" height="50" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="136" y="614" width="68" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1rezswi_di" bpmnElement="SequenceFlow_1rezswi"> + <di:waypoint xsi:type="dc:Point" x="200" y="673" /> + <di:waypoint xsi:type="dc:Point" x="239" y="673" /> + <di:waypoint xsi:type="dc:Point" x="239" y="673" /> + <di:waypoint xsi:type="dc:Point" x="277" y="673" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="214" y="648" width="12" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_0mk9lrj_di" bpmnElement="SequenceFlow_0mk9lrj"> + <di:waypoint xsi:type="dc:Point" x="175" y="698" /> + <di:waypoint xsi:type="dc:Point" x="175" y="991" /> + <di:waypoint xsi:type="dc:Point" x="1696" y="1002" /> + <di:waypoint xsi:type="dc:Point" x="1696" y="842" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="147" y="775" width="18" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_03cc9y6_di" bpmnElement="SequenceFlow_03cc9y6"> + <di:waypoint xsi:type="dc:Point" x="1642" y="824" /> + <di:waypoint xsi:type="dc:Point" x="1678" y="824" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1660" y="809" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ScriptTask_1a3lghn_di" bpmnElement="SetSuccessfulRollbackStatus"> + <dc:Bounds x="1542" y="784" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1wch84s_di" bpmnElement="SequenceFlow_1wch84s"> + <di:waypoint xsi:type="dc:Point" x="261" y="1081" /> + <di:waypoint xsi:type="dc:Point" x="361" y="1081" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="311" y="1066" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ScriptTask_1od8f5n_di" bpmnElement="SetFailedRollbackStatus"> + <dc:Bounds x="161" y="1041" width="100" height="80" /> + </bpmndi:BPMNShape> </bpmndi:BPMNPlane> </bpmndi:BPMNDiagram> -</bpmn2:definitions> +</bpmn2:definitions>
\ No newline at end of file diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteNetworkInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteNetworkInstance.bpmn index 3c581865cc..6f58f62476 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteNetworkInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteNetworkInstance.bpmn @@ -268,7 +268,7 @@ DoDeleteNetworkInstance.postProcessResponse(execution) </bpmn2:scriptTask> <bpmn2:sequenceFlow id="SequenceFlow_1pbgnr2" sourceRef="ScriptTask_01xjfhu" targetRef="EndEvent_3" /> <bpmn2:sequenceFlow id="SequenceFlow_1pdp4d2" sourceRef="prepareSDNCTopoRequest_ScriptTask" targetRef="callDeleteSDNCAdapter_CallActivity" /> - <bpmn2:exclusiveGateway id="ExclusiveGateway_02t94x3" name="is '1702' SNDC Call?" default="SequenceFlow_0r3pvf8"> + <bpmn2:exclusiveGateway id="ExclusiveGateway_02t94x3" name="is not '1610' SNDC Call?" default="SequenceFlow_0r3pvf8"> <bpmn2:incoming>SequenceFlow_20</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_0r3pvf8</bpmn2:outgoing> <bpmn2:outgoing>SequenceFlow_0kqnddy</bpmn2:outgoing> @@ -298,7 +298,7 @@ prepareSDNCRequest.prepareRpcSDNCRequest(execution) <bpmn2:sequenceFlow id="SequenceFlow_1jnva78" sourceRef="CallActivity_03wzdas" targetRef="validateSDNCResponse_ScriptTask" /> <bpmn2:sequenceFlow id="SequenceFlow_0zlbzad" sourceRef="ScriptTask_0iqzbz6" targetRef="CallActivity_03wzdas" /> <bpmn2:sequenceFlow id="SequenceFlow_0kqnddy" name="Yes" sourceRef="ExclusiveGateway_02t94x3" targetRef="ScriptTask_1wf192s"> - <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("sdncVersion") == '1702'} ]]></bpmn2:conditionExpression> + <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("sdncVersion") != '1610'} ]]></bpmn2:conditionExpression> </bpmn2:sequenceFlow> <bpmn2:scriptTask id="ScriptTask_01w2cd9" name="PreProcess Incoming Request" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming> @@ -699,7 +699,7 @@ DoDeleteNetworkInstance.validateRpcSDNCDeactivateResponse(execution)]]></bpmn2:s <bpmndi:BPMNShape id="ExclusiveGateway_02t94x3_di" bpmnElement="ExclusiveGateway_02t94x3" isMarkerVisible="true"> <dc:Bounds x="1156" y="648" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1143" y="707" width="76" height="24" /> + <dc:Bounds x="1150" y="707" width="61" height="24" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0r3pvf8_di" bpmnElement="SequenceFlow_0r3pvf8"> @@ -930,4 +930,4 @@ DoDeleteNetworkInstance.validateRpcSDNCDeactivateResponse(execution)]]></bpmn2:s </bpmndi:BPMNEdge> </bpmndi:BPMNPlane> </bpmndi:BPMNDiagram> -</bpmn2:definitions> +</bpmn2:definitions>
\ No newline at end of file diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteNetworkInstanceRollback.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteNetworkInstanceRollback.bpmn index 2c5fa5ae4b..fabcb5e2e5 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteNetworkInstanceRollback.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteNetworkInstanceRollback.bpmn @@ -121,7 +121,7 @@ DoDeleteNetworkInstanceRollback.processJavaException(execution)]]></bpmn:script> </bpmn:sequenceFlow> <bpmn:sequenceFlow id="SequenceFlow_1wy1aba" name="No" sourceRef="ExclusiveGateway_1ga27si" targetRef="Task_00chyig" /> <bpmn:sequenceFlow id="SequenceFlow_1yltkyg" name="Yes" sourceRef="ExclusiveGateway_1ga27si" targetRef="Task_1iuumxi"> - <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("sdncVersion") == '1702'} ]]></bpmn:conditionExpression> + <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("sdncVersion") != '1610'} ]]></bpmn:conditionExpression> </bpmn:sequenceFlow> <bpmn:sequenceFlow id="SequenceFlow_1hcmrh9" sourceRef="Task_1iuumxi" targetRef="ExclusiveGateway_0798yby" /> <bpmn:sequenceFlow id="SequenceFlow_1pi168e" sourceRef="Task_00chyig" targetRef="ExclusiveGateway_0798yby" /> @@ -543,4 +543,4 @@ wasDeleted </bpmndi:BPMNEdge> </bpmndi:BPMNPlane> </bpmndi:BPMNDiagram> -</bpmn:definitions> +</bpmn:definitions>
\ No newline at end of file diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteServiceInstance.bpmn index 49274bd8a6..10f688b30f 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteServiceInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteServiceInstance.bpmn @@ -7,7 +7,7 @@ <bpmn2:scriptTask id="preProcessRequest_ScriptTask" name="PreProcess Incoming Request" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_0jfgn05</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_1jqc16k</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+ <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* def ddsi = new DoDeleteServiceInstance() ddsi.preProcessRequest(execution) ]]></bpmn2:script> @@ -41,13 +41,13 @@ ddsi.preProcessRequest(execution) <camunda:out source="sdncAdapterResponse" target="sdncDeactivateResponse" /> <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" /> </bpmn2:extensionElements> - <bpmn2:incoming>SequenceFlow_0rtflal</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_0yohjl7</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_0k28xib</bpmn2:outgoing> </bpmn2:callActivity> <bpmn2:scriptTask id="ScriptTask_1uxr0cx" name="Post Process SDNC Deactivate" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_0k28xib</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_1w8ao21</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+ <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* String response = execution.getVariable("sdncDeactivateResponse") def ddsi = new DoDeleteServiceInstance() @@ -56,12 +56,11 @@ ddsi.postProcessSDNCDelete(execution, response, "deactivate")]]></bpmn2:script> <bpmn2:sequenceFlow id="SequenceFlow_0jfgn05" sourceRef="deleteSI_startEven" targetRef="preProcessRequest_ScriptTask" /> <bpmn2:scriptTask id="ScriptTask_0xxwbdq" name="PreProcess SDNC Delete" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_1dwch0k</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_0rtflal</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+ <bpmn2:outgoing>SequenceFlow_1ju26o1</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* def ddsi = new DoDeleteServiceInstance() ddsi.preProcessSDNCDelete(execution)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_0rtflal" sourceRef="ScriptTask_0xxwbdq" targetRef="CallActivity_0ak0ezb" /> <bpmn2:exclusiveGateway id="ExclusiveGateway_0590oev" name="SI found in AAI" default="SequenceFlow_05jfuko"> <bpmn2:incoming>SequenceFlow_1up0j5r</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_1hcfvcj</bpmn2:outgoing> @@ -101,7 +100,7 @@ ddsi.preProcessSDNCDelete(execution)]]></bpmn2:script> <bpmn2:scriptTask id="ScriptTask_02da0lj" name="Post Process AAI GET" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_1grea1r</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_1up0j5r</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+ <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* def ddsi = new DoDeleteServiceInstance() ddsi.postProcessAAIGET(execution)]]></bpmn2:script> </bpmn2:scriptTask> @@ -110,7 +109,7 @@ ddsi.postProcessAAIGET(execution)]]></bpmn2:script> <bpmn2:scriptTask id="ScriptTask_1ybdq3e" name="Post Process AAI Delete" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_05wu9i7</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_1wyvxwi</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+ <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* def ddsi = new DoDeleteServiceInstance() ddsi.postProcessAAIDEL(execution)]]></bpmn2:script> </bpmn2:scriptTask> @@ -126,7 +125,7 @@ ddsi.postProcessAAIDEL(execution)]]></bpmn2:script> <bpmn2:scriptTask id="ScriptTask_1va95un" name="Log / Print Unexpected Error" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_0u33vy6</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_0hevfee</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+ <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.* ExceptionUtil ex = new ExceptionUtil() ex.processJavaException(execution)]]></bpmn2:script> </bpmn2:scriptTask> @@ -143,6 +142,7 @@ ex.processJavaException(execution)]]></bpmn2:script> <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" /> </bpmn2:extensionElements> <bpmn2:incoming>SequenceFlow_1w8ao21</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_1swzrij</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_14x55db</bpmn2:outgoing> </bpmn2:callActivity> <bpmn2:scriptTask id="ScriptTask_0lc115e" name="Post Process SDNC Delete" scriptFormat="groovy"> @@ -156,6 +156,16 @@ ddsi.postProcessSDNCDelete(execution, response, "delete")]]></bpmn2:script> </bpmn2:scriptTask> <bpmn2:sequenceFlow id="SequenceFlow_14x55db" sourceRef="CallActivity_1c5wru8" targetRef="ScriptTask_0lc115e" /> <bpmn2:sequenceFlow id="SequenceFlow_0znbzxu" sourceRef="ScriptTask_0lc115e" targetRef="callGenericDeleteService" /> + <bpmn2:exclusiveGateway id="ExclusiveGateway_1xbefi3" name="skipDeactivate for TRANSPORT" default="SequenceFlow_0yohjl7"> + <bpmn2:incoming>SequenceFlow_1ju26o1</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_0yohjl7</bpmn2:outgoing> + <bpmn2:outgoing>SequenceFlow_1swzrij</bpmn2:outgoing> + </bpmn2:exclusiveGateway> + <bpmn2:sequenceFlow id="SequenceFlow_1ju26o1" sourceRef="ScriptTask_0xxwbdq" targetRef="ExclusiveGateway_1xbefi3" /> + <bpmn2:sequenceFlow id="SequenceFlow_0yohjl7" name="no" sourceRef="ExclusiveGateway_1xbefi3" targetRef="CallActivity_0ak0ezb" /> + <bpmn2:sequenceFlow id="SequenceFlow_1swzrij" name="yes" sourceRef="ExclusiveGateway_1xbefi3" targetRef="CallActivity_1c5wru8"> + <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{ execution.getVariable("skipDeactivate" ) == true }]]></bpmn2:conditionExpression> + </bpmn2:sequenceFlow> </bpmn2:process> <bpmn2:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" /> <bpmn2:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" /> @@ -168,7 +178,7 @@ ddsi.postProcessSDNCDelete(execution, response, "delete")]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_61" bpmnElement="preProcessRequest_ScriptTask"> - <dc:Bounds x="-229" y="57" width="100" height="80" /> + <dc:Bounds x="-265" y="57" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_EndEvent_177" bpmnElement="EndEvent_3"> <dc:Bounds x="1384" y="201" width="36" height="36" /> @@ -187,61 +197,52 @@ ddsi.postProcessSDNCDelete(execution, response, "delete")]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0k28xib_di" bpmnElement="SequenceFlow_0k28xib"> - <di:waypoint xsi:type="dc:Point" x="738" y="97" /> + <di:waypoint xsi:type="dc:Point" x="713" y="97" /> <di:waypoint xsi:type="dc:Point" x="776" y="97" /> <bpmndi:BPMNLabel> - <dc:Bounds x="757" y="82" width="0" height="0" /> + <dc:Bounds x="745" y="82" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="CallActivity_0ak0ezb_di" bpmnElement="CallActivity_0ak0ezb"> - <dc:Bounds x="638" y="57" width="100" height="80" /> + <dc:Bounds x="613" y="57" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_1uxr0cx_di" bpmnElement="ScriptTask_1uxr0cx"> <dc:Bounds x="776" y="57" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0jfgn05_di" bpmnElement="SequenceFlow_0jfgn05"> <di:waypoint xsi:type="dc:Point" x="-298" y="97" /> - <di:waypoint xsi:type="dc:Point" x="-262" y="97" /> - <di:waypoint xsi:type="dc:Point" x="-262" y="97" /> - <di:waypoint xsi:type="dc:Point" x="-229" y="97" /> + <di:waypoint xsi:type="dc:Point" x="-265" y="97" /> <bpmndi:BPMNLabel> - <dc:Bounds x="-247" y="97" width="0" height="0" /> + <dc:Bounds x="-281" y="82" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_0xxwbdq_di" bpmnElement="ScriptTask_0xxwbdq"> - <dc:Bounds x="492" y="57" width="100" height="80" /> + <dc:Bounds x="354" y="57" width="100" height="80" /> </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="SequenceFlow_0rtflal_di" bpmnElement="SequenceFlow_0rtflal"> - <di:waypoint xsi:type="dc:Point" x="592" y="97" /> - <di:waypoint xsi:type="dc:Point" x="638" y="97" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="615" y="82" width="0" height="0" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ExclusiveGateway_0590oev_di" bpmnElement="ExclusiveGateway_0590oev" isMarkerVisible="true"> - <dc:Bounds x="305" y="72" width="50" height="50" /> + <dc:Bounds x="150" y="72" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="293" y="51" width="73" height="13" /> + <dc:Bounds x="138" y="51" width="74" height="14" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1hcfvcj_di" bpmnElement="SequenceFlow_1hcfvcj"> - <di:waypoint xsi:type="dc:Point" x="355" y="97" /> - <di:waypoint xsi:type="dc:Point" x="403" y="97" /> + <di:waypoint xsi:type="dc:Point" x="200" y="97" /> + <di:waypoint xsi:type="dc:Point" x="236" y="97" /> <bpmndi:BPMNLabel> - <dc:Bounds x="384" y="99" width="18" height="12" /> + <dc:Bounds x="222" y="99" width="18" height="14" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="EndEvent_0ronxsz_di" bpmnElement="EndEvent_0ronxsz"> - <dc:Bounds x="312" y="186" width="36" height="36" /> + <dc:Bounds x="157" y="221" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="330" y="227" width="0" height="0" /> + <dc:Bounds x="175" y="262" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_05jfuko_di" bpmnElement="SequenceFlow_05jfuko"> - <di:waypoint xsi:type="dc:Point" x="330" y="122" /> - <di:waypoint xsi:type="dc:Point" x="330" y="186" /> + <di:waypoint xsi:type="dc:Point" x="175" y="122" /> + <di:waypoint xsi:type="dc:Point" x="175" y="221" /> <bpmndi:BPMNLabel> - <dc:Bounds x="310" y="127.1200546314796" width="13" height="13" /> + <dc:Bounds x="156" y="137.69226916562667" width="12" height="14" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1w8ao21_di" bpmnElement="SequenceFlow_1w8ao21"> @@ -252,58 +253,53 @@ ddsi.postProcessSDNCDelete(execution, response, "delete")]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ExclusiveGateway_1mrh7us_di" bpmnElement="ExclusiveGateway_1mrh7us" isMarkerVisible="true"> - <dc:Bounds x="403" y="72" width="50" height="50" /> + <dc:Bounds x="236" y="72" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="390" y="122" width="75" height="24" /> + <dc:Bounds x="227" y="126" width="76" height="26" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0riudmc_di" bpmnElement="SequenceFlow_0riudmc"> - <di:waypoint xsi:type="dc:Point" x="428" y="72" /> - <di:waypoint xsi:type="dc:Point" x="428" y="-20" /> + <di:waypoint xsi:type="dc:Point" x="261" y="72" /> + <di:waypoint xsi:type="dc:Point" x="261" y="-20" /> <di:waypoint xsi:type="dc:Point" x="1252" y="-20" /> <di:waypoint xsi:type="dc:Point" x="1252" y="57" /> <bpmndi:BPMNLabel> - <dc:Bounds x="834" y="-35" width="18" height="12" /> + <dc:Bounds x="753" y="-35" width="18" height="14" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1dwch0k_di" bpmnElement="SequenceFlow_1dwch0k"> - <di:waypoint xsi:type="dc:Point" x="453" y="97" /> - <di:waypoint xsi:type="dc:Point" x="492" y="97" /> + <di:waypoint xsi:type="dc:Point" x="286" y="97" /> + <di:waypoint xsi:type="dc:Point" x="310" y="97" /> + <di:waypoint xsi:type="dc:Point" x="353" y="97" /> <bpmndi:BPMNLabel> - <dc:Bounds x="464" y="73" width="12" height="12" /> + <dc:Bounds x="308" y="101.4811676034096" width="13" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="CallActivity_1s8pf0x_di" bpmnElement="CallActivity_1s8pf0x"> - <dc:Bounds x="-64" y="57" width="100" height="80" /> + <dc:Bounds x="-121" y="57" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1jqc16k_di" bpmnElement="SequenceFlow_1jqc16k"> - <di:waypoint xsi:type="dc:Point" x="-129" y="97" /> - <di:waypoint xsi:type="dc:Point" x="-100" y="97" /> - <di:waypoint xsi:type="dc:Point" x="-100" y="97" /> - <di:waypoint xsi:type="dc:Point" x="-64" y="97" /> + <di:waypoint xsi:type="dc:Point" x="-165" y="97" /> + <di:waypoint xsi:type="dc:Point" x="-121" y="97" /> <bpmndi:BPMNLabel> - <dc:Bounds x="-85" y="97" width="0" height="0" /> + <dc:Bounds x="-143" y="82" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_02da0lj_di" bpmnElement="ScriptTask_02da0lj"> - <dc:Bounds x="107" y="57" width="100" height="80" /> + <dc:Bounds x="20" y="57" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1grea1r_di" bpmnElement="SequenceFlow_1grea1r"> - <di:waypoint xsi:type="dc:Point" x="36" y="97" /> - <di:waypoint xsi:type="dc:Point" x="73" y="97" /> - <di:waypoint xsi:type="dc:Point" x="73" y="97" /> - <di:waypoint xsi:type="dc:Point" x="107" y="97" /> + <di:waypoint xsi:type="dc:Point" x="-21" y="97" /> + <di:waypoint xsi:type="dc:Point" x="20" y="97" /> <bpmndi:BPMNLabel> - <dc:Bounds x="88" y="97" width="0" height="0" /> + <dc:Bounds x="0" y="82" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1up0j5r_di" bpmnElement="SequenceFlow_1up0j5r"> - <di:waypoint xsi:type="dc:Point" x="207" y="97" /> - <di:waypoint xsi:type="dc:Point" x="256" y="97" /> - <di:waypoint xsi:type="dc:Point" x="256" y="97" /> - <di:waypoint xsi:type="dc:Point" x="305" y="97" /> + <di:waypoint xsi:type="dc:Point" x="120" y="97" /> + <di:waypoint xsi:type="dc:Point" x="150" y="97" /> <bpmndi:BPMNLabel> - <dc:Bounds x="271" y="97" width="0" height="0" /> + <dc:Bounds x="135" y="82" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_1ybdq3e_di" bpmnElement="ScriptTask_1ybdq3e"> @@ -368,6 +364,35 @@ ddsi.postProcessSDNCDelete(execution, response, "delete")]]></bpmn2:script> <dc:Bounds x="1180" y="82" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ExclusiveGateway_1xbefi3_di" bpmnElement="ExclusiveGateway_1xbefi3" isMarkerVisible="true"> + <dc:Bounds x="508" y="72" width="50" height="50" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="495" y="126" width="84" height="25" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1ju26o1_di" bpmnElement="SequenceFlow_1ju26o1"> + <di:waypoint xsi:type="dc:Point" x="454" y="97" /> + <di:waypoint xsi:type="dc:Point" x="508" y="97" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="481" y="82" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_0yohjl7_di" bpmnElement="SequenceFlow_0yohjl7"> + <di:waypoint xsi:type="dc:Point" x="558" y="97" /> + <di:waypoint xsi:type="dc:Point" x="613" y="97" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="580" y="72" width="12" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1swzrij_di" bpmnElement="SequenceFlow_1swzrij"> + <di:waypoint xsi:type="dc:Point" x="533" y="72" /> + <di:waypoint xsi:type="dc:Point" x="533" y="26" /> + <di:waypoint xsi:type="dc:Point" x="967" y="26" /> + <di:waypoint xsi:type="dc:Point" x="967" y="57" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="741" y="11" width="18" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> </bpmndi:BPMNPlane> </bpmndi:BPMNDiagram> </bpmn2:definitions> diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVfModuleFromVnf.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVfModuleFromVnf.bpmn new file mode 100644 index 0000000000..bc42e6094b --- /dev/null +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVfModuleFromVnf.bpmn @@ -0,0 +1,396 @@ +<?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="_Wblj8GyfEeWUWLTvug7ZOg" 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:process id="DoDeleteVfModuleFromVnf" name="DoDeleteVfModuleFromVnf" isExecutable="true"> + <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="VNFAdapterPrep" targetRef="InvokeVNFAdapterRestV1" /> + <bpmn2:callActivity id="callSDNCAdapterTopologyUnassign" name="Call SDNC Adapter Topology Unassign" calledElement="sdncAdapter"> + <bpmn2:extensionElements> + <camunda:out source="WorkflowException" target="WorkflowException" /> + <camunda:in source="DDVMFV_unassignSDNCRequest" target="sdncAdapterWorkflowRequest" /> + <camunda:in source="mso-request-id" target="mso-request-id" /> + <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" /> + <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" /> + <camunda:out source="sdncAdapterResponse" target="DoDVfMod_doDeleteVfModuleResponse" /> + <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" /> + </bpmn2:extensionElements> + <bpmn2:incoming>SequenceFlow_32</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_33</bpmn2:outgoing> + </bpmn2:callActivity> + <bpmn2:sequenceFlow id="SequenceFlow_33" name="" sourceRef="callSDNCAdapterTopologyUnassign" targetRef="validateSDNCResponse" /> + <bpmn2:scriptTask id="VNFAdapterPrep" name="VNFAdapter
Prep" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_0kx9e3s</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def ddvmfv = new DoDeleteVfModuleFromVnf() +ddvmfv.prepVNFAdapterRequest(execution)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:scriptTask id="SDNCAdapterPrep2" name="SDNCAdapter
Prep" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_0ltm4jt</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_32</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def ddvmfv = new DoDeleteVfModuleFromVnf() +ddvmfv.preProcessSDNCUnassignRequest(execution)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:sequenceFlow id="SequenceFlow_32" name="" sourceRef="SDNCAdapterPrep2" targetRef="callSDNCAdapterTopologyUnassign" /> + <bpmn2:callActivity id="InvokeVNFAdapterRestV1" name="Invoke
VNFAdapterRestV1" calledElement="vnfAdapterRestV1"> + <bpmn2:extensionElements> + <camunda:out source="WorkflowException" target="WorkflowException" /> + <camunda:in source="vnfAdapterRestV1Request" target="vnfAdapterRestV1Request" /> + <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" /> + <camunda:out source="vnfAdapterRestV1Response" target="DDVMFV_doDeleteVfModuleResponse" /> + <camunda:in source="mso-request-id" target="mso-request-id" /> + <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" /> + </bpmn2:extensionElements> + <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_0hia88a</bpmn2:outgoing> + </bpmn2:callActivity> + <bpmn2:endEvent id="EndEvent_9"> + <bpmn2:incoming>SequenceFlow_1eemrjp</bpmn2:incoming> + </bpmn2:endEvent> + <bpmn2:scriptTask id="validateSDNCResponse" name="PostProcess SDNC Adapter Unassign Request" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_33</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def ddvmfv = new DoDeleteVfModuleFromVnf() +String response = execution.getVariable("DDVMFV_deactivateSDNCAdapterResponse") +ddvmfv.validateSDNCResponse(execution, response, "unassign")]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="validateSDNCResponse" targetRef="DeleteAAIVfModulePrep" /> + <bpmn2:scriptTask id="InitializeVariables" name="Initialize Variables" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_0qbjihn</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def ddvmfv = new DoDeleteVfModuleFromVnf() +ddvmfv.preProcessRequest(execution)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="InitializeVariables" /> + <bpmn2:scriptTask id="DeleteNetworkPoliciesFromAAI" name="Delete Network Policies from AAI" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_0coa90m</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_0ltm4jt</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def ddvmfv = new DoDeleteVfModuleFromVnf() +ddvmfv.deleteNetworkPoliciesFromAAI(execution)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:scriptTask id="PostProcessVNFAdapterRequest" name="PostProcess VNFAdapter Request" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_0hia88a</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_0coa90m</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def ddvmfv = new DoDeleteVfModuleFromVnf() +ddvmfv.postProcessVNFAdapterRequest(execution)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:sequenceFlow id="SequenceFlow_0coa90m" sourceRef="PostProcessVNFAdapterRequest" targetRef="DeleteNetworkPoliciesFromAAI" /> + <bpmn2:startEvent id="StartEvent_1"> + <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing> + </bpmn2:startEvent> + <bpmn2:sequenceFlow id="SequenceFlow_0y4td40" sourceRef="preProcessSDNCDeactivateRequest" targetRef="callSDNCAdapterTopologyDeactivate" /> + <bpmn2:sequenceFlow id="SequenceFlow_12q2r4i" sourceRef="callSDNCAdapterTopologyDeactivate" targetRef="postProcessSDNCDeactivateRequest" /> + <bpmn2:sequenceFlow id="SequenceFlow_0hia88a" sourceRef="InvokeVNFAdapterRestV1" targetRef="PostProcessVNFAdapterRequest" /> + <bpmn2:sequenceFlow id="SequenceFlow_0kx9e3s" sourceRef="postProcessSDNCDeactivateRequest" targetRef="VNFAdapterPrep" /> + <bpmn2:sequenceFlow id="SequenceFlow_0ltm4jt" sourceRef="DeleteNetworkPoliciesFromAAI" targetRef="SDNCAdapterPrep2" /> + <bpmn2:scriptTask id="preProcessSDNCDeactivateRequest" name="PreProcess SDNC Deactivate Request" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_1igsfgk</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_0y4td40</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def ddvmfv = new DoDeleteVfModuleFromVnf() +ddvmfv.preProcessSDNCDeactivateRequest(execution)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:callActivity id="callSDNCAdapterTopologyDeactivate" name="Call SDNC Adapter Topology Deactivate" calledElement="sdncAdapter"> + <bpmn2:extensionElements> + <camunda:in source="DDVMFV_deactivateSDNCRequest" target="sdncAdapterWorkflowRequest" /> + <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" /> + <camunda:in source="mso-request-id" target="mso-request-id" /> + <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" /> + <camunda:out source="WorkflowException" target="WorkflowException" /> + <camunda:out source="sdncAdapterResponse" target="DDVMFV_deactivateSDNCAdapterResponse" /> + <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" /> + </bpmn2:extensionElements> + <bpmn2:incoming>SequenceFlow_0y4td40</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_12q2r4i</bpmn2:outgoing> + </bpmn2:callActivity> + <bpmn2:scriptTask id="postProcessSDNCDeactivateRequest" name="PostProcess SDNC Adapter Deactivate Request" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_12q2r4i</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_0kx9e3s</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def ddvmfv = new DoDeleteVfModuleFromVnf() +String response = execution.getVariable("DDVMFV_deactivateSDNCAdapterResponse") +ddvmfv.validateSDNCResponse(execution, response, "deactivate")]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:sequenceFlow id="SequenceFlow_0qbjihn" sourceRef="InitializeVariables" targetRef="QueryAAIForVfModule" /> + <bpmn2:sequenceFlow id="SequenceFlow_1c2lvlc" sourceRef="QueryAAIForVfModule" targetRef="ValidateVfModule" /> + <bpmn2:scriptTask id="QueryAAIForVfModule" name="Query AAI for VF Module" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_0qbjihn</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_1c2lvlc</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def ddvmfv = new DoDeleteVfModuleFromVnf() +ddvmfv.queryAAIForVfModule(execution)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:sequenceFlow id="SequenceFlow_1igsfgk" sourceRef="ValidateVfModule" targetRef="preProcessSDNCDeactivateRequest" /> + <bpmn2:scriptTask id="ValidateVfModule" name="Validate VF Module" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_1c2lvlc</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_1igsfgk</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def ddvmfv = new DoDeleteVfModuleFromVnf() +ddvmfv.validateVfModule(execution)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:subProcess id="SubProcess_1r8unf9" name="Sub-process for UnexpectedErrors" triggeredByEvent="true"> + <bpmn2:startEvent id="StartEvent_1ebrix6"> + <bpmn2:outgoing>SequenceFlow_095634c</bpmn2:outgoing> + <bpmn2:errorEventDefinition errorRef="Error_15yfom3" /> + </bpmn2:startEvent> + <bpmn2:endEvent id="EndEvent_0yb2lmo"> + <bpmn2:incoming>SequenceFlow_0yvjvhu</bpmn2:incoming> + </bpmn2:endEvent> + <bpmn2:scriptTask id="ScriptTask_1ypch9x" name="Log / Print Unexpected Error" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_095634c</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_0yvjvhu</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.* +ExceptionUtil ex = new ExceptionUtil() +ex.processJavaException(execution)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:sequenceFlow id="SequenceFlow_095634c" name="" sourceRef="StartEvent_1ebrix6" targetRef="ScriptTask_1ypch9x" /> + <bpmn2:sequenceFlow id="SequenceFlow_0yvjvhu" name="" sourceRef="ScriptTask_1ypch9x" targetRef="EndEvent_0yb2lmo" /> + </bpmn2:subProcess> + <bpmn2:callActivity id="DeleteAAIVfModule" name="Invoke
DeleteAAIVfModule" calledElement="DeleteAAIVfModule"> + <bpmn2:extensionElements> + <camunda:in source="DeleteAAIVfModuleRequest" target="DeleteAAIVfModuleRequest" /> + <camunda:in source="isVidRequest" target="isVidRequest" /> + <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" /> + <camunda:out source="WorkflowException" target="WorkflowException" /> + </bpmn2:extensionElements> + <bpmn2:incoming>SequenceFlow_092kvy3</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_1eemrjp</bpmn2:outgoing> + </bpmn2:callActivity> + <bpmn2:scriptTask id="DeleteAAIVfModulePrep" name="DeleteAAIVfModule
Prep" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_092kvy3</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def ddvmfv = new DoDeleteVfModuleFromVnf() +ddvmfv.prepDeleteAAIVfModule(execution)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:sequenceFlow id="SequenceFlow_092kvy3" name="" sourceRef="DeleteAAIVfModulePrep" targetRef="DeleteAAIVfModule" /> + <bpmn2:sequenceFlow id="SequenceFlow_1eemrjp" sourceRef="DeleteAAIVfModule" targetRef="EndEvent_9" /> + </bpmn2:process> + <bpmn2:error id="Error_1" name="MSO Workflow Exception" errorCode="MSOWorkflowException" /> + <bpmn2:message id="Message_1" name="DoDeleteVfModuleRequest" /> + <bpmn2:error id="Error_15yfom3" name="java.lang.Exception" errorCode="java.lang.Exception" /> + <bpmndi:BPMNDiagram id="BPMNDiagram_1"> + <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoDeleteVfModuleFromVnf"> + <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_22" bpmnElement="InitializeVariables"> + <dc:Bounds x="144" y="36" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" targetElement="_BPMNShape_ScriptTask_22"> + <di:waypoint xsi:type="dc:Point" x="70" y="75" /> + <di:waypoint xsi:type="dc:Point" x="144" y="76" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="107" y="60.5" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_170" bpmnElement="VNFAdapterPrep"> + <dc:Bounds x="125" y="330" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="_BPMNShape_CallActivity_13" bpmnElement="InvokeVNFAdapterRestV1"> + <dc:Bounds x="281" y="330" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_172" bpmnElement="SDNCAdapterPrep2"> + <dc:Bounds x="129" y="487" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="_BPMNShape_CallActivity_15" bpmnElement="callSDNCAdapterTopologyUnassign"> + <dc:Bounds x="281" y="487" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_32" bpmnElement="SequenceFlow_32" sourceElement="_BPMNShape_ScriptTask_172" targetElement="_BPMNShape_CallActivity_15"> + <di:waypoint xsi:type="dc:Point" x="229" y="527" /> + <di:waypoint xsi:type="dc:Point" x="281" y="528" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="255" y="512.5" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_33" bpmnElement="SequenceFlow_33" sourceElement="_BPMNShape_CallActivity_15" targetElement="_BPMNShape_ScriptTask_251"> + <di:waypoint xsi:type="dc:Point" x="381" y="527" /> + <di:waypoint xsi:type="dc:Point" x="425" y="527" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="403" y="512" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="_BPMNShape_EndEvent_169" bpmnElement="EndEvent_9"> + <dc:Bounds x="873" y="509" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="891" y="550" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_4" targetElement="_BPMNShape_ScriptTask_170"> + <di:waypoint xsi:type="dc:Point" x="225" y="370" /> + <di:waypoint xsi:type="dc:Point" x="281" y="370" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="253" y="355" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_251" bpmnElement="validateSDNCResponse"> + <dc:Bounds x="425" y="487" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_251"> + <di:waypoint xsi:type="dc:Point" x="525" y="527" /> + <di:waypoint xsi:type="dc:Point" x="548" y="527" /> + <di:waypoint xsi:type="dc:Point" x="548" y="527" /> + <di:waypoint xsi:type="dc:Point" x="570" y="527" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="563" y="527" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ScriptTask_0la8haz_di" bpmnElement="DeleteNetworkPoliciesFromAAI"> + <dc:Bounds x="581" y="330" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ScriptTask_0lewl6b_di" bpmnElement="PostProcessVNFAdapterRequest"> + <dc:Bounds x="430" y="330" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_0coa90m_di" bpmnElement="SequenceFlow_0coa90m"> + <di:waypoint xsi:type="dc:Point" x="530" y="370" /> + <di:waypoint xsi:type="dc:Point" x="581" y="370" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="556" y="355" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="StartEvent_1mifg2p_di" bpmnElement="StartEvent_1"> + <dc:Bounds x="34" y="57" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="52" y="98" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_0y4td40_di" bpmnElement="SequenceFlow_0y4td40"> + <di:waypoint xsi:type="dc:Point" x="268" y="219" /> + <di:waypoint xsi:type="dc:Point" x="288" y="219" /> + <di:waypoint xsi:type="dc:Point" x="288" y="219" /> + <di:waypoint xsi:type="dc:Point" x="316" y="219" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="303" y="219" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_12q2r4i_di" bpmnElement="SequenceFlow_12q2r4i"> + <di:waypoint xsi:type="dc:Point" x="416" y="219" /> + <di:waypoint xsi:type="dc:Point" x="464" y="219" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="440" y="204" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_0hia88a_di" bpmnElement="SequenceFlow_0hia88a"> + <di:waypoint xsi:type="dc:Point" x="381" y="370" /> + <di:waypoint xsi:type="dc:Point" x="430" y="370" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="406" y="345" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_0kx9e3s_di" bpmnElement="SequenceFlow_0kx9e3s"> + <di:waypoint xsi:type="dc:Point" x="564" y="219" /> + <di:waypoint xsi:type="dc:Point" x="763" y="219" /> + <di:waypoint xsi:type="dc:Point" x="763" y="293" /> + <di:waypoint xsi:type="dc:Point" x="39" y="293" /> + <di:waypoint xsi:type="dc:Point" x="39" y="370" /> + <di:waypoint xsi:type="dc:Point" x="125" y="370" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="401" y="278" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_0ltm4jt_di" bpmnElement="SequenceFlow_0ltm4jt"> + <di:waypoint xsi:type="dc:Point" x="681" y="370" /> + <di:waypoint xsi:type="dc:Point" x="759" y="370" /> + <di:waypoint xsi:type="dc:Point" x="759" y="442" /> + <di:waypoint xsi:type="dc:Point" x="51" y="442" /> + <di:waypoint xsi:type="dc:Point" x="51" y="527" /> + <di:waypoint xsi:type="dc:Point" x="129" y="527" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="405" y="427" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ScriptTask_1boza4q_di" bpmnElement="preProcessSDNCDeactivateRequest"> + <dc:Bounds x="168" y="179" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="CallActivity_0xpc0da_di" bpmnElement="callSDNCAdapterTopologyDeactivate"> + <dc:Bounds x="316" y="179" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ScriptTask_1kkyngh_di" bpmnElement="postProcessSDNCDeactivateRequest"> + <dc:Bounds x="464" y="179" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_0qbjihn_di" bpmnElement="SequenceFlow_0qbjihn"> + <di:waypoint xsi:type="dc:Point" x="244" y="76" /> + <di:waypoint xsi:type="dc:Point" x="316" y="76" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="280" y="61" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1c2lvlc_di" bpmnElement="SequenceFlow_1c2lvlc"> + <di:waypoint xsi:type="dc:Point" x="416" y="76" /> + <di:waypoint xsi:type="dc:Point" x="473" y="76" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="445" y="61" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ScriptTask_1gf22c0_di" bpmnElement="QueryAAIForVfModule"> + <dc:Bounds x="316" y="36" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1igsfgk_di" bpmnElement="SequenceFlow_1igsfgk"> + <di:waypoint xsi:type="dc:Point" x="573" y="76" /> + <di:waypoint xsi:type="dc:Point" x="760" y="76" /> + <di:waypoint xsi:type="dc:Point" x="760" y="145" /> + <di:waypoint xsi:type="dc:Point" x="34" y="145" /> + <di:waypoint xsi:type="dc:Point" x="34" y="218" /> + <di:waypoint xsi:type="dc:Point" x="168" y="219" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="397" y="130" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ScriptTask_1jgeknl_di" bpmnElement="ValidateVfModule"> + <dc:Bounds x="473" y="36" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="SubProcess_1r8unf9_di" bpmnElement="SubProcess_1r8unf9" isExpanded="true"> + <dc:Bounds x="43" y="622" width="467" height="193" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="StartEvent_1ebrix6_di" bpmnElement="StartEvent_1ebrix6"> + <dc:Bounds x="111" y="689" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="129" y="730" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="EndEvent_0yb2lmo_di" bpmnElement="EndEvent_0yb2lmo"> + <dc:Bounds x="404" y="689" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="422" y="730" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ScriptTask_1ypch9x_di" bpmnElement="ScriptTask_1ypch9x"> + <dc:Bounds x="215" y="667" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_095634c_di" bpmnElement="SequenceFlow_095634c"> + <di:waypoint xsi:type="dc:Point" x="147" y="707" /> + <di:waypoint xsi:type="dc:Point" x="215" y="707" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="181" y="692" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_0yvjvhu_di" bpmnElement="SequenceFlow_0yvjvhu"> + <di:waypoint xsi:type="dc:Point" x="315" y="707" /> + <di:waypoint xsi:type="dc:Point" x="404" y="707" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="360" y="692" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="CallActivity_10td9ns_di" bpmnElement="DeleteAAIVfModule"> + <dc:Bounds x="713" y="487" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ScriptTask_1rcw5x3_di" bpmnElement="DeleteAAIVfModulePrep"> + <dc:Bounds x="570" y="487" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_092kvy3_di" bpmnElement="SequenceFlow_092kvy3"> + <di:waypoint xsi:type="dc:Point" x="670" y="527" /> + <di:waypoint xsi:type="dc:Point" x="713" y="527" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="692" y="512" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1eemrjp_di" bpmnElement="SequenceFlow_1eemrjp"> + <di:waypoint xsi:type="dc:Point" x="813" y="527" /> + <di:waypoint xsi:type="dc:Point" x="873" y="527" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="843" y="502" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + </bpmndi:BPMNPlane> + </bpmndi:BPMNDiagram> +</bpmn2:definitions> diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVfModuleVolumeV2.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVfModuleVolumeV2.bpmn new file mode 100644 index 0000000000..fec3f93521 --- /dev/null +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVfModuleVolumeV2.bpmn @@ -0,0 +1,208 @@ +<?xml version="1.0" encoding="UTF-8"?> +<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0"> + <bpmn:process id="DoDeleteVfModuleVolumeV2" name="DoDeleteVfModuleVolumeV2" isExecutable="true"> + <bpmn:startEvent id="StartEvent_1" name="Start"> + <bpmn:outgoing>SequenceFlow_1gvfdp4</bpmn:outgoing> + </bpmn:startEvent> + <bpmn:scriptTask id="Task_06u1lr0" name="Call REST AAI Query Cloud Region" scriptFormat="groovy"> + <bpmn:incoming>SequenceFlow_1vy2ojp</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_1dlcqmc</bpmn:outgoing> + <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def delVfModuleVol = new DoDeleteVfModuleVolumeV2() +delVfModuleVol.executeMethod('callRESTQueryAAICloudRegion', execution, isDebugLogEnabled)]]></bpmn:script> + </bpmn:scriptTask> + <bpmn:scriptTask id="Task_1woqfjw" name="Call REST AAI Query for Volume Group" scriptFormat="groovy"> + <bpmn:incoming>SequenceFlow_1dlcqmc</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_1kjccf1</bpmn:outgoing> + <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def deleteVfMod = new DoDeleteVfModuleVolumeV2() +deleteVfMod.executeMethod('callRESTQueryAAIForVolumeGroup', execution, isDebugLogEnabled)]]></bpmn:script> + </bpmn:scriptTask> + <bpmn:scriptTask id="Task_0yjx0p2" name="Prepare VNF Adapter Delete" scriptFormat="groovy"> + <bpmn:incoming>SequenceFlow_1kjccf1</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_1tgngf7</bpmn:outgoing> + <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def deleteVfMod = new DoDeleteVfModuleVolumeV2() +deleteVfMod.executeMethod('prepareVnfAdapterDeleteRequest', execution, isDebugLogEnabled)]]></bpmn:script> + </bpmn:scriptTask> + <bpmn:callActivity id="Task_14fsstq" name="Call REST VNF Adapter Delete" calledElement="vnfAdapterRestV1"> + <bpmn:extensionElements> + <camunda:in source="DDVMV_deleteVnfARequest" target="vnfAdapterRestV1Request" /> + <camunda:in source="mso-request-id" target="mso-request-id" /> + <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" /> + <camunda:in variables="all" /> + <camunda:out source="vnfAdapterRestV1Response" target="DDVMV_deleteVnfAResponse" /> + <camunda:out source="WorkflowException" target="WorkflowException" /> + <camunda:out source="VNFREST_SuccessIndicator" target="VNFREST_SuccessIndicator" /> + </bpmn:extensionElements> + <bpmn:incoming>SequenceFlow_1tgngf7</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_1x3luyj</bpmn:outgoing> + </bpmn:callActivity> + <bpmn:scriptTask id="Task_17q1roq" name="Call REST AAI Delete Volume Group" scriptFormat="groovy"> + <bpmn:incoming>SequenceFlow_0cy0y9t</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_13c3cv2</bpmn:outgoing> + <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def deleteVfMod = new DoDeleteVfModuleVolumeV2() +deleteVfMod.executeMethod('callRESTDeleteAAIVolumeGroup', execution, isDebugLogEnabled)]]></bpmn:script> + </bpmn:scriptTask> + <bpmn:endEvent id="EndEvent_0fw1gkf" name="Stop"> + <bpmn:incoming>SequenceFlow_1sgtwr2</bpmn:incoming> + </bpmn:endEvent> + <bpmn:sequenceFlow id="SequenceFlow_1dlcqmc" sourceRef="Task_06u1lr0" targetRef="Task_1woqfjw" /> + <bpmn:sequenceFlow id="SequenceFlow_1kjccf1" sourceRef="Task_1woqfjw" targetRef="Task_0yjx0p2" /> + <bpmn:sequenceFlow id="SequenceFlow_1tgngf7" sourceRef="Task_0yjx0p2" targetRef="Task_14fsstq" /> + <bpmn:scriptTask id="Task_1i432ud" name="Pre Process Request" scriptFormat="groovy"> + <bpmn:incoming>SequenceFlow_1gvfdp4</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_1vy2ojp</bpmn:outgoing> + <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def deleteVfMod = new DoDeleteVfModuleVolumeV2() +deleteVfMod.executeMethod('preProcessRequest', execution, isDebugLogEnabled) +]]></bpmn:script> + </bpmn:scriptTask> + <bpmn:sequenceFlow id="SequenceFlow_1gvfdp4" sourceRef="StartEvent_1" targetRef="Task_1i432ud" /> + <bpmn:sequenceFlow id="SequenceFlow_1vy2ojp" sourceRef="Task_1i432ud" targetRef="Task_06u1lr0" /> + <bpmn:exclusiveGateway id="ExclusiveGateway_0o3lxtf" name="VNF Adapter REST call success?"> + <bpmn:incoming>SequenceFlow_1x3luyj</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_0cy0y9t</bpmn:outgoing> + <bpmn:outgoing>SequenceFlow_1rgd8dg</bpmn:outgoing> + </bpmn:exclusiveGateway> + <bpmn:sequenceFlow id="SequenceFlow_1x3luyj" sourceRef="Task_14fsstq" targetRef="ExclusiveGateway_0o3lxtf" /> + <bpmn:sequenceFlow id="SequenceFlow_0cy0y9t" name="Yes" sourceRef="ExclusiveGateway_0o3lxtf" targetRef="Task_17q1roq"> + <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">#{VNFREST_SuccessIndicator == true}</bpmn:conditionExpression> + </bpmn:sequenceFlow> + <bpmn:endEvent id="EndEvent_00cohim" name="throw MSOException"> + <bpmn:incoming>SequenceFlow_1rgd8dg</bpmn:incoming> + <bpmn:errorEventDefinition errorRef="Error_0fa7ks7" /> + </bpmn:endEvent> + <bpmn:sequenceFlow id="SequenceFlow_1rgd8dg" sourceRef="ExclusiveGateway_0o3lxtf" targetRef="EndEvent_00cohim" /> + <bpmn:scriptTask id="Task_018w43g" name="Post Process" scriptFormat="groovy"> + <bpmn:incoming>SequenceFlow_13c3cv2</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_1sgtwr2</bpmn:outgoing> + <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def deleteVfMod = new DoDeleteVfModuleVolumeV2() +deleteVfMod.executeMethod('postProcess', execution, isDebugLogEnabled)]]></bpmn:script> + </bpmn:scriptTask> + <bpmn:sequenceFlow id="SequenceFlow_13c3cv2" sourceRef="Task_17q1roq" targetRef="Task_018w43g" /> + <bpmn:sequenceFlow id="SequenceFlow_1sgtwr2" sourceRef="Task_018w43g" targetRef="EndEvent_0fw1gkf" /> + </bpmn:process> + <bpmn:error id="Error_0fa7ks7" name="MSOWorkflowException" errorCode="MSOWorkflowException" /> + <bpmndi:BPMNDiagram id="BPMNDiagram_1"> + <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoDeleteVfModuleVolumeV2"> + <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1"> + <dc:Bounds x="173" y="102" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="179" y="138" width="23" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ScriptTask_1qojxu5_di" bpmnElement="Task_06u1lr0"> + <dc:Bounds x="407" y="80" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ScriptTask_1mht6f6_di" bpmnElement="Task_1woqfjw"> + <dc:Bounds x="564" y="80" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ScriptTask_02ujn8y_di" bpmnElement="Task_0yjx0p2"> + <dc:Bounds x="713" y="80" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="CallActivity_0bf87en_di" bpmnElement="Task_14fsstq"> + <dc:Bounds x="865" y="80" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ScriptTask_07kmkio_di" bpmnElement="Task_17q1roq"> + <dc:Bounds x="1151" y="80" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="EndEvent_0fw1gkf_di" bpmnElement="EndEvent_0fw1gkf"> + <dc:Bounds x="1463" y="102" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1470" y="138" width="22" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1dlcqmc_di" bpmnElement="SequenceFlow_1dlcqmc"> + <di:waypoint xsi:type="dc:Point" x="507" y="120" /> + <di:waypoint xsi:type="dc:Point" x="564" y="120" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="536" y="95" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1kjccf1_di" bpmnElement="SequenceFlow_1kjccf1"> + <di:waypoint xsi:type="dc:Point" x="664" y="120" /> + <di:waypoint xsi:type="dc:Point" x="713" y="120" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="689" y="95" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1tgngf7_di" bpmnElement="SequenceFlow_1tgngf7"> + <di:waypoint xsi:type="dc:Point" x="813" y="120" /> + <di:waypoint xsi:type="dc:Point" x="865" y="120" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="839" y="95" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ScriptTask_0wjwf8w_di" bpmnElement="Task_1i432ud"> + <dc:Bounds x="247" y="80" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1gvfdp4_di" bpmnElement="SequenceFlow_1gvfdp4"> + <di:waypoint xsi:type="dc:Point" x="209" y="120" /> + <di:waypoint xsi:type="dc:Point" x="247" y="120" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="228" y="95" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1vy2ojp_di" bpmnElement="SequenceFlow_1vy2ojp"> + <di:waypoint xsi:type="dc:Point" x="347" y="120" /> + <di:waypoint xsi:type="dc:Point" x="407" y="120" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="377" y="95" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ExclusiveGateway_0o3lxtf_di" bpmnElement="ExclusiveGateway_0o3lxtf" isMarkerVisible="true"> + <dc:Bounds x="1028" y="95" width="50" height="50" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1020" y="145" width="66" height="36" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1x3luyj_di" bpmnElement="SequenceFlow_1x3luyj"> + <di:waypoint xsi:type="dc:Point" x="965" y="120" /> + <di:waypoint xsi:type="dc:Point" x="1028" y="120" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="997" y="95" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_0cy0y9t_di" bpmnElement="SequenceFlow_0cy0y9t"> + <di:waypoint xsi:type="dc:Point" x="1078" y="120" /> + <di:waypoint xsi:type="dc:Point" x="1151" y="120" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1106" y="95" width="18" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="EndEvent_0zln0ww_di" bpmnElement="EndEvent_00cohim"> + <dc:Bounds x="1035" y="274" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1016" y="310" width="73" height="24" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1rgd8dg_di" bpmnElement="SequenceFlow_1rgd8dg"> + <di:waypoint xsi:type="dc:Point" x="1053" y="145" /> + <di:waypoint xsi:type="dc:Point" x="1053" y="274" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1068" y="199.5" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ScriptTask_1ilduoy_di" bpmnElement="Task_018w43g"> + <dc:Bounds x="1298" y="80" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_13c3cv2_di" bpmnElement="SequenceFlow_13c3cv2"> + <di:waypoint xsi:type="dc:Point" x="1251" y="120" /> + <di:waypoint xsi:type="dc:Point" x="1298" y="120" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1275" y="95" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1sgtwr2_di" bpmnElement="SequenceFlow_1sgtwr2"> + <di:waypoint xsi:type="dc:Point" x="1398" y="120" /> + <di:waypoint xsi:type="dc:Point" x="1463" y="120" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1431" y="95" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + </bpmndi:BPMNPlane> + </bpmndi:BPMNDiagram> +</bpmn:definitions> diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVnfAndModules.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVnfAndModules.bpmn index 078e0107ba..9850552a9e 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVnfAndModules.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVnfAndModules.bpmn @@ -66,7 +66,7 @@ exceptionUtil.processJavaException(execution)]]></bpmn2:script> <camunda:in source="DDVAM_vfModuleModelInfo" target="vfModuleModelInfo" /> <camunda:in source="cloudConfiguration" target="cloudConfiguration" /> <camunda:in source="DDVAM_sdncVersion" target="sdncVersion" /> - <camunda:in source=""true"" target="isVidRequest" /> + <camunda:in source="DDVAM_isVidRequest" target="isVidRequest" /> <camunda:out source="WorkflowException" target="WorkflowException" /> </bpmn2:extensionElements> <bpmn2:incoming>SequenceFlow_1xujrk5</bpmn2:incoming> diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateNetworkInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateNetworkInstance.bpmn index 45e1a49f8a..53c419e6a6 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateNetworkInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateNetworkInstance.bpmn @@ -155,7 +155,7 @@ DoUpdateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script> </bpmn2:exclusiveGateway> <bpmn2:sequenceFlow id="SequenceFlow_0nrc66n" name="No" sourceRef="ExclusiveGateway_1kjh92x" targetRef="sdncOk_ExclusiveGateway" /> <bpmn2:sequenceFlow id="SequenceFlow_0srdlf3" name="Yes" sourceRef="ExclusiveGateway_1kjh92x" targetRef="InclusiveGateway_6"> - <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("sdncVersion") == '1702'} ]]></bpmn2:conditionExpression> + <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("sdncVersion") != '1610'} ]]></bpmn2:conditionExpression> </bpmn2:sequenceFlow> <bpmn2:scriptTask id="ScriptTask_1gedbow" name="Set Exception Flag" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_23</bpmn2:incoming> @@ -238,18 +238,12 @@ def DoUpdateNetworkInstance = new DoUpdateNetworkInstance() DoUpdateNetworkInstance.callRESTQueryAAINetworkId(execution)]]></bpmn2:script> </bpmn2:scriptTask> <bpmn2:sequenceFlow id="SequenceFlow_24" name="" sourceRef="callRESTQueryNetworkId_ScriptTask" targetRef="callRESTQueryCloudRegion_ScriptTask" /> - <bpmn2:endEvent id="EndEvent_2"> - <bpmn2:incoming>SequenceFlow_30</bpmn2:incoming> - <bpmn2:errorEventDefinition id="_ErrorEventDefinition_97" errorRef="Error_2" /> - </bpmn2:endEvent> <bpmn2:scriptTask id="workflowExceptionSINotFound" name="Create Workflow Exception" scriptFormat="groovy"> <bpmn2:incoming>siFoundNo</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_30</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.utils.* + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.* ExceptionUtil exceptionUtil = new ExceptionUtil() -exceptionUtil.buildWorkflowException(execution, 404, "Service Instance Not Found")]]></bpmn2:script> +exceptionUtil.buildAndThrowWorkflowException(execution, 404, "Service Instance Not Found")]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_30" name="" sourceRef="workflowExceptionSINotFound" targetRef="EndEvent_2" /> <bpmn2:exclusiveGateway id="siFoundCheck" name="is SI Found?" default="siFoundNo"> <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming> <bpmn2:outgoing>siFoundYes</bpmn2:outgoing> @@ -259,7 +253,7 @@ exceptionUtil.buildWorkflowException(execution, 404, "Service Instance Not Found <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("GENGSI_FoundIndicator" ) == true && execution.getVariable("GENGSI_SuccessIndicator" ) == true}]]></bpmn2:conditionExpression> </bpmn2:sequenceFlow> <bpmn2:sequenceFlow id="siFoundNo" name="No" sourceRef="siFoundCheck" targetRef="workflowExceptionSINotFound" /> - <bpmn2:callActivity id="callGetServiceInstance" name="Get
Service
Instance" calledElement="GenericGetService"> + <bpmn2:callActivity id="callGetServiceInstance" name="Get Service Instance" calledElement="GenericGetService"> <bpmn2:extensionElements> <camunda:in source="UPDNETI_serviceInstanceId" target="GENGS_serviceInstanceId" /> <camunda:out source="GENGS_serviceInstance" target="UPDNETI_serviceInstanceId" /> @@ -714,12 +708,6 @@ DoUpdateNetworkInstance.callRESTQueryAAINetworkPolicy(execution)]]></bpmn2:scrip <dc:Bounds x="868" y="157" width="29" height="22" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="_BPMNShape_EndEvent_247" bpmnElement="EndEvent_2"> - <dc:Bounds x="1155" y="278" width="36" height="36" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="1173" y="319" width="0" height="0" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_331" bpmnElement="workflowExceptionSINotFound"> <dc:Bounds x="984" y="256" width="100" height="80" /> </bpmndi:BPMNShape> @@ -731,13 +719,6 @@ DoUpdateNetworkInstance.callRESTQueryAAINetworkPolicy(execution)]]></bpmn2:scrip <dc:Bounds x="871" y="233" width="22" height="22" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_21" bpmnElement="SequenceFlow_30" sourceElement="_BPMNShape_ScriptTask_331" targetElement="_BPMNShape_EndEvent_247"> - <di:waypoint xsi:type="dc:Point" x="1084" y="296" /> - <di:waypoint xsi:type="dc:Point" x="1155" y="296" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="1103" y="296" width="6" height="6" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_22" bpmnElement="SequenceFlow_24" sourceElement="_BPMNShape_ScriptTask_133" targetElement="_BPMNShape_ScriptTask_245"> <di:waypoint xsi:type="dc:Point" x="1084" y="140" /> <di:waypoint xsi:type="dc:Point" x="1200" y="140" /> diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateNetworkInstanceRollback.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateNetworkInstanceRollback.bpmn index 6fd0565f3a..a8ea29b15c 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateNetworkInstanceRollback.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateNetworkInstanceRollback.bpmn @@ -82,7 +82,7 @@ DoUpdateNetworkInstanceRollback.validateRollbackResponses(execution)]]></bpmn:sc <bpmn:sequenceFlow id="SequenceFlow_17o4w67" sourceRef="ServiceTask_0bqh5yl" targetRef="ExclusiveGateway_1n5jck8" /> <bpmn:sequenceFlow id="SequenceFlow_101y57s" name="No" sourceRef="ExclusiveGateway_17g4q5c" targetRef="CallActivity_1xilevb" /> <bpmn:sequenceFlow id="SequenceFlow_0mw0dgd" name="Yes" sourceRef="ExclusiveGateway_17g4q5c" targetRef="ExclusiveGateway_0b9kbop"> - <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("sdncVersion") == '1702'} ]]></bpmn:conditionExpression> + <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("sdncVersion") != '1610'} ]]></bpmn:conditionExpression> </bpmn:sequenceFlow> <bpmn:endEvent id="EndEvent_1fvr7ad"> <bpmn:incoming>SequenceFlow_0yto4gz</bpmn:incoming> @@ -149,7 +149,7 @@ wasDeleted <bpmn:association id="Association_1gx121b" sourceRef="ScriptTask_1ggaxfu" targetRef="TextAnnotation_0vwyo82" /> </bpmn:process> <bpmndi:BPMNDiagram id="BPMNDiagram_1"> - <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateNetworkInstanceRollback"> + <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoUpdateNetworkInstanceRollback"> <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1"> <dc:Bounds x="240" y="354" width="36" height="36" /> <bpmndi:BPMNLabel> diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateVfModule.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateVfModule.bpmn index 5911067a49..ce96a3593a 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateVfModule.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateVfModule.bpmn @@ -1,7 +1,7 @@ <?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" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_Wblj8GyfEeWUWLTvug7ZOg" exporter="camunda modeler" exporterVersion="2.7.0" targetNamespace="http://camunda.org/schema/1.0/bpmn"> +<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="_Wblj8GyfEeWUWLTvug7ZOg" 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:process id="DoUpdateVfModule" name="DoUpdateVfModule" isExecutable="true"> - <bpmn2:documentation>This flow expects its incoming request to be in the variable 'DoUpdateVfModuleRequest'. This flow produces no output.</bpmn2:documentation> + <bpmn2:documentation><![CDATA[This flow expects its incoming request to be in the variable 'DoUpdateVfModuleRequest'. This flow produces no output.]]></bpmn2:documentation> <bpmn2:scriptTask id="PrepareUpdateAAIVfModule_prep" name="Prepare Update AAI Vf Module (prep)" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_38</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing> @@ -9,16 +9,16 @@ def duvm = new DoUpdateVfModule() duvm.prepPrepareUpdateAAIVfModule(execution)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="PrepareUpdateAAIVfModule_prep" targetRef="ScriptTask_1"/> + <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="PrepareUpdateAAIVfModule_prep" targetRef="ScriptTask_1" /> <bpmn2:callActivity id="ScriptTask_1" name="Prepare Update AAI Vf Module" calledElement="PrepareUpdateAAIVfModule"> <bpmn2:extensionElements> - <camunda:in source="DOUPVfMod_prepareUpdateAAIVfModuleRequest" target="PrepareUpdateAAIVfModuleRequest"/> - <camunda:in source="mso-request-id" target="mso-request-id"/> - <camunda:in source="mso-service-instance-id" target="mso-service-instance-id"/> - <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled"/> - <camunda:out source="PUAAIVfMod_outVfModule" target="DOUPVfMod_vfModule"/> - <camunda:out source="PUAAIVfMod_vnfName" target="DOUPVfMod_vnfNameFromAAI"/> - <camunda:out source="WorkflowException" target="WorkflowException"/> + <camunda:in source="DOUPVfMod_prepareUpdateAAIVfModuleRequest" target="PrepareUpdateAAIVfModuleRequest" /> + <camunda:in source="mso-request-id" target="mso-request-id" /> + <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" /> + <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" /> + <camunda:out source="PUAAIVfMod_outVfModule" target="DOUPVfMod_vfModule" /> + <camunda:out source="PUAAIVfMod_vnfName" target="DOUPVfMod_vnfNameFromAAI" /> + <camunda:out source="WorkflowException" target="WorkflowException" /> </bpmn2:extensionElements> <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_15</bpmn2:outgoing> @@ -30,7 +30,7 @@ duvm.prepPrepareUpdateAAIVfModule(execution)]]></bpmn2:script> def duvm = new DoUpdateVfModule() duvm.preProcessRequest(execution)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_38" name="" sourceRef="ProcessReceivedRequest" targetRef="PrepareUpdateAAIVfModule_prep"/> + <bpmn2:sequenceFlow id="SequenceFlow_38" name="" sourceRef="ProcessReceivedRequest" targetRef="PrepareUpdateAAIVfModule_prep" /> <bpmn2:subProcess id="SubProcess_1" name="Catch Exception" triggeredByEvent="true"> <bpmn2:scriptTask id="ScriptTask_16" name="Handle Exception" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_6</bpmn2:incoming> @@ -41,24 +41,24 @@ duvm.handleWorkflowException(execution)]]></bpmn2:script> </bpmn2:scriptTask> <bpmn2:endEvent id="EndEvent_3"> <bpmn2:incoming>SequenceFlow_35</bpmn2:incoming> - <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_11"/> + <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_11" /> </bpmn2:endEvent> - <bpmn2:sequenceFlow id="SequenceFlow_35" name="" sourceRef="ScriptTask_16" targetRef="EndEvent_3"/> + <bpmn2:sequenceFlow id="SequenceFlow_35" name="" sourceRef="ScriptTask_16" targetRef="EndEvent_3" /> <bpmn2:startEvent id="StartEvent_3"> <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing> - <bpmn2:errorEventDefinition id="ErrorEventDefinition_2"/> + <bpmn2:errorEventDefinition id="ErrorEventDefinition_2" /> </bpmn2:startEvent> - <bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="StartEvent_3" targetRef="ScriptTask_16"/> + <bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="StartEvent_3" targetRef="ScriptTask_16" /> </bpmn2:subProcess> <bpmn2:endEvent id="EndEvent_5"> <bpmn2:incoming>SequenceFlow_36</bpmn2:incoming> - <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_12"/> + <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_12" /> </bpmn2:endEvent> <bpmn2:boundaryEvent id="BoundaryEvent_1" name="" attachedToRef="SubProcess_1"> <bpmn2:outgoing>SequenceFlow_36</bpmn2:outgoing> - <bpmn2:errorEventDefinition id="_ErrorEventDefinition_70"/> + <bpmn2:errorEventDefinition id="_ErrorEventDefinition_70" /> </bpmn2:boundaryEvent> - <bpmn2:sequenceFlow id="SequenceFlow_36" name="" sourceRef="BoundaryEvent_1" targetRef="EndEvent_5"/> + <bpmn2:sequenceFlow id="SequenceFlow_36" name="" sourceRef="BoundaryEvent_1" targetRef="EndEvent_5" /> <bpmn2:scriptTask id="ScriptTask_10" name="Update AAI Vf Module (prep)" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming> <bpmn2:incoming>SequenceFlow_18</bpmn2:incoming> @@ -67,19 +67,19 @@ duvm.handleWorkflowException(execution)]]></bpmn2:script> def duvm = new DoUpdateVfModule() duvm.prepUpdateAAIVfModule(execution)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_25" name="" sourceRef="ScriptTask_10" targetRef="ScriptTask_11"/> + <bpmn2:sequenceFlow id="SequenceFlow_25" name="" sourceRef="ScriptTask_10" targetRef="ScriptTask_11" /> <bpmn2:callActivity id="ScriptTask_11" name="UpdateAAIVfModule" calledElement="UpdateAAIVfModule"> <bpmn2:extensionElements> - <camunda:out source="WorkflowException" target="WorkflowException"/> - <camunda:in source="DOUPVfMod_updateAAIVfModuleRequest" target="UpdateAAIVfModuleRequest"/> - <camunda:in source="mso-request-id" target="mso-request-id"/> - <camunda:in source="mso-service-instance-id" target="mso-service-instance-id"/> - <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled"/> + <camunda:out source="WorkflowException" target="WorkflowException" /> + <camunda:in source="DOUPVfMod_updateAAIVfModuleRequest" target="UpdateAAIVfModuleRequest" /> + <camunda:in source="mso-request-id" target="mso-request-id" /> + <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" /> + <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" /> </bpmn2:extensionElements> <bpmn2:incoming>SequenceFlow_25</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_26</bpmn2:outgoing> </bpmn2:callActivity> - <bpmn2:sequenceFlow id="SequenceFlow_26" name="" sourceRef="ScriptTask_11" targetRef="ScriptTask_12"/> + <bpmn2:sequenceFlow id="SequenceFlow_26" name="" sourceRef="ScriptTask_11" targetRef="ScriptTask_12" /> <bpmn2:scriptTask id="ScriptTask_12" name="SDNC Topology Activate (prep)" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_26</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_27</bpmn2:outgoing> @@ -87,16 +87,16 @@ duvm.prepUpdateAAIVfModule(execution)]]></bpmn2:script> def duvm = new DoUpdateVfModule() duvm.prepSDNCTopologyAct(execution)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_27" name="" sourceRef="ScriptTask_12" targetRef="ScriptTask_13"/> + <bpmn2:sequenceFlow id="SequenceFlow_27" name="" sourceRef="ScriptTask_12" targetRef="ScriptTask_13" /> <bpmn2:callActivity id="ScriptTask_13" name="SDNCAdapter Topology Activate" calledElement="sdncAdapter"> <bpmn2:extensionElements> - <camunda:in source="DOUPVfMod_sdncActivateRequest" target="sdncAdapterWorkflowRequest"/> - <camunda:in source="mso-request-id" target="mso-request-id"/> - <camunda:in source="mso-service-instance-id" target="mso-service-instance-id"/> - <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled"/> - <camunda:out source="WorkflowException" target="WorkflowException"/> - <camunda:out source="sdncAdapterResponse" target="DOUPVfMod_sdncActivateResponse"/> - <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator"/> + <camunda:in source="DOUPVfMod_sdncActivateRequest" target="sdncAdapterWorkflowRequest" /> + <camunda:in source="mso-request-id" target="mso-request-id" /> + <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" /> + <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" /> + <camunda:out source="WorkflowException" target="WorkflowException" /> + <camunda:out source="sdncAdapterResponse" target="DOUPVfMod_sdncActivateResponse" /> + <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" /> </bpmn2:extensionElements> <bpmn2:incoming>SequenceFlow_27</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing> @@ -108,32 +108,33 @@ duvm.prepSDNCTopologyAct(execution)]]></bpmn2:script> def duvm = new DoUpdateVfModule() duvm.prepUpdateAAIGenericVnf(execution)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_13" name="" sourceRef="ScriptTask_14" targetRef="ExclusiveGateway_1"/> + <bpmn2:sequenceFlow id="SequenceFlow_13" name="" sourceRef="ScriptTask_14" targetRef="ExclusiveGateway_1" /> <bpmn2:callActivity id="CallActivity_1" name="UpdateAAIGenericVnf" calledElement="UpdateAAIGenericVnf"> <bpmn2:extensionElements> - <camunda:in source="DOUPVfMod_updateAAIGenericVnfRequest" target="UpdateAAIGenericVnfRequest"/> - <camunda:in source="mso-request-id" target="mso-request-id"/> - <camunda:in source="mso-service-instance-id" target="mso-service-instance-id"/> - <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled"/> - <camunda:out source="WorkflowException" target="WorkflowException"/> + <camunda:in source="DOUPVfMod_updateAAIGenericVnfRequest" target="UpdateAAIGenericVnfRequest" /> + <camunda:in source="mso-request-id" target="mso-request-id" /> + <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" /> + <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" /> + <camunda:out source="WorkflowException" target="WorkflowException" /> </bpmn2:extensionElements> <bpmn2:incoming>SequenceFlow_14</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_9</bpmn2:outgoing> </bpmn2:callActivity> - <bpmn2:sequenceFlow id="SequenceFlow_9" name="" sourceRef="CallActivity_1" targetRef="ScriptTask_10"/> - <bpmn2:exclusiveGateway id="ExclusiveGateway_1" name="Skip Update
Generic Vnf?" default="SequenceFlow_14"> + <bpmn2:sequenceFlow id="SequenceFlow_9" name="" sourceRef="CallActivity_1" targetRef="ScriptTask_10" /> + <bpmn2:exclusiveGateway id="ExclusiveGateway_1" name="Skip Update + Generic Vnf?" default="SequenceFlow_14"> <bpmn2:incoming>SequenceFlow_13</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing> <bpmn2:outgoing>SequenceFlow_18</bpmn2:outgoing> </bpmn2:exclusiveGateway> - <bpmn2:sequenceFlow id="SequenceFlow_14" name="Do the update" sourceRef="ExclusiveGateway_1" targetRef="CallActivity_1"/> + <bpmn2:sequenceFlow id="SequenceFlow_14" name="Do the update" sourceRef="ExclusiveGateway_1" targetRef="CallActivity_1" /> <bpmn2:sequenceFlow id="SequenceFlow_18" name="Skip the update" sourceRef="ExclusiveGateway_1" targetRef="ScriptTask_10"> - <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy">${execution.getVariable('DOUPVfMod_skipUpdateGenericVnf')} == true</bpmn2:conditionExpression> + <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[${execution.getVariable('DOUPVfMod_skipUpdateGenericVnf')} == true]]></bpmn2:conditionExpression> </bpmn2:sequenceFlow> <bpmn2:startEvent id="StartEvent_1" name="Start"> <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing> </bpmn2:startEvent> - <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="ProcessReceivedRequest"/> + <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="ProcessReceivedRequest" /> <bpmn2:scriptTask id="ScriptTask_4" name="SDNC Topology Change/Assign (prep)" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_16</bpmn2:incoming> <bpmn2:incoming>SequenceFlow_17</bpmn2:incoming> @@ -142,33 +143,33 @@ duvm.prepUpdateAAIGenericVnf(execution)]]></bpmn2:script> def duvm = new DoUpdateVfModule() duvm.prepSDNCTopologyChg(execution)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_12" name="" sourceRef="ScriptTask_4" targetRef="ScriptTask_5"/> + <bpmn2:sequenceFlow id="SequenceFlow_12" name="" sourceRef="ScriptTask_4" targetRef="ScriptTask_5" /> <bpmn2:callActivity id="ScriptTask_5" name="SDNC Adapter Topology Change/Assign" calledElement="sdncAdapter"> <bpmn2:extensionElements> - <camunda:in source="DOUPVfMod_sdncChangeAssignRequest" target="sdncAdapterWorkflowRequest"/> - <camunda:in source="mso-request-id" target="mso-request-id"/> - <camunda:in source="mso-service-instance-id" target="mso-service-instance-id"/> - <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled"/> - <camunda:out source="WorkflowException" target="WorkflowException"/> - <camunda:out source="sdncAdapterResponse" target="DOUPVfMod_sdncChangeAssignResponse"/> - <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator"/> + <camunda:in source="DOUPVfMod_sdncChangeAssignRequest" target="sdncAdapterWorkflowRequest" /> + <camunda:in source="mso-request-id" target="mso-request-id" /> + <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" /> + <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" /> + <camunda:out source="WorkflowException" target="WorkflowException" /> + <camunda:out source="sdncAdapterResponse" target="DOUPVfMod_sdncChangeAssignResponse" /> + <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" /> </bpmn2:extensionElements> <bpmn2:incoming>SequenceFlow_12</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing> </bpmn2:callActivity> <bpmn2:callActivity id="ScriptTask_9" name="VnfAdapterRest" calledElement="vnfAdapterRestV1"> <bpmn2:extensionElements> - <camunda:in source="DOUPVfMod_vnfAdapterRestRequest" target="vnfAdapterRestV1Request"/> - <camunda:in source="mso-request-id" target="mso-request-id"/> - <camunda:in source="mso-service-instance-id" target="mso-service-instance-id"/> - <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled"/> - <camunda:out source="WorkflowException" target="WorkflowException"/> - <camunda:out source="vnfAdapterRestV1Response" target="DOUPVfMod_vnfAdapterRestResponse"/> + <camunda:in source="DOUPVfMod_vnfAdapterRestRequest" target="vnfAdapterRestV1Request" /> + <camunda:in source="mso-request-id" target="mso-request-id" /> + <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" /> + <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" /> + <camunda:out source="WorkflowException" target="WorkflowException" /> + <camunda:out source="vnfAdapterRestV1Response" target="DOUPVfMod_vnfAdapterRestResponse" /> </bpmn2:extensionElements> <bpmn2:incoming>SequenceFlow_21</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_24</bpmn2:outgoing> </bpmn2:callActivity> - <bpmn2:sequenceFlow id="SequenceFlow_24" name="" sourceRef="ScriptTask_9" targetRef="ScriptTask_14"/> + <bpmn2:sequenceFlow id="SequenceFlow_24" name="" sourceRef="ScriptTask_9" targetRef="ScriptTask_14" /> <bpmn2:scriptTask id="ScriptTask_8" name="VNF Adapter (prep)" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_23</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_21</bpmn2:outgoing> @@ -176,7 +177,7 @@ duvm.prepSDNCTopologyChg(execution)]]></bpmn2:script> def duvm = new DoUpdateVfModule() duvm.prepVnfAdapterRest(execution)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_21" name="" sourceRef="ScriptTask_8" targetRef="ScriptTask_9"/> + <bpmn2:sequenceFlow id="SequenceFlow_21" name="" sourceRef="ScriptTask_8" targetRef="ScriptTask_9" /> <bpmn2:scriptTask id="ScriptTask_15" name="Validate SDNC Query Response" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_22</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_23</bpmn2:outgoing> @@ -187,13 +188,13 @@ duvm.validateSDNCResponse(execution, response, "query")]]></bpmn2:script> </bpmn2:scriptTask> <bpmn2:callActivity id="ScriptTask_7" name="SDNCAdapter Topology Query" calledElement="sdncAdapter"> <bpmn2:extensionElements> - <camunda:in source="DOUPVfMod_sdncTopologyRequest" target="sdncAdapterWorkflowRequest"/> - <camunda:in source="mso-request-id" target="mso-request-id"/> - <camunda:in source="mso-service-instance-id" target="mso-service-instance-id"/> - <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled"/> - <camunda:out source="WorkflowException" target="WorkflowException"/> - <camunda:out source="sdncAdapterResponse" target="DOUPVfMod_sdncTopologyResponse"/> - <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator"/> + <camunda:in source="DOUPVfMod_sdncTopologyRequest" target="sdncAdapterWorkflowRequest" /> + <camunda:in source="mso-request-id" target="mso-request-id" /> + <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" /> + <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" /> + <camunda:out source="WorkflowException" target="WorkflowException" /> + <camunda:out source="sdncAdapterResponse" target="DOUPVfMod_sdncTopologyResponse" /> + <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" /> </bpmn2:extensionElements> <bpmn2:incoming>SequenceFlow_19</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_22</bpmn2:outgoing> @@ -206,8 +207,8 @@ String response = execution.getVariable("DOUPVfMod_sdncChangeAssignResponse") def duvm = new DoUpdateVfModule() duvm.validateSDNCResponse(execution, response, "changeassign")]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="ScriptTask_5" targetRef="ScriptTask_18"/> - <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="ScriptTask_18" targetRef="ScriptTask_6"/> + <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="ScriptTask_5" targetRef="ScriptTask_18" /> + <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="ScriptTask_18" targetRef="ScriptTask_6" /> <bpmn2:scriptTask id="ScriptTask_6" name="SDNC Topology Query (prep)" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_19</bpmn2:outgoing> @@ -215,29 +216,30 @@ duvm.validateSDNCResponse(execution, response, "changeassign")]]></bpmn2:script> def duvm = new DoUpdateVfModule() duvm.prepSDNCTopologyQuery(execution)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_19" name="" sourceRef="ScriptTask_6" targetRef="ScriptTask_7"/> - <bpmn2:sequenceFlow id="SequenceFlow_22" name="" sourceRef="ScriptTask_7" targetRef="ScriptTask_15"/> - <bpmn2:sequenceFlow id="SequenceFlow_23" name="" sourceRef="ScriptTask_15" targetRef="ScriptTask_8"/> + <bpmn2:sequenceFlow id="SequenceFlow_19" name="" sourceRef="ScriptTask_6" targetRef="ScriptTask_7" /> + <bpmn2:sequenceFlow id="SequenceFlow_22" name="" sourceRef="ScriptTask_7" targetRef="ScriptTask_15" /> + <bpmn2:sequenceFlow id="SequenceFlow_23" name="" sourceRef="ScriptTask_15" targetRef="ScriptTask_8" /> <bpmn2:exclusiveGateway id="IsBaseVfModule" name="Is Base VF Module?" default="SequenceFlow_30"> <bpmn2:incoming>SequenceFlow_15</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_28</bpmn2:outgoing> <bpmn2:outgoing>SequenceFlow_30</bpmn2:outgoing> </bpmn2:exclusiveGateway> - <bpmn2:sequenceFlow id="SequenceFlow_15" name="" sourceRef="ScriptTask_1" targetRef="IsBaseVfModule"/> + <bpmn2:sequenceFlow id="SequenceFlow_15" name="" sourceRef="ScriptTask_1" targetRef="IsBaseVfModule" /> <bpmn2:callActivity id="ScriptTask_3" name="Confirm VolumeGroup Tenant" calledElement="ConfirmVolumeGroupTenant"> <bpmn2:extensionElements> - <camunda:in source="DOUPVfMod_volumeGroupId" target="volumeGroupId"/> - <camunda:in source="DOUPVfMod_tenantId" target="tenantId"/> - <camunda:in source="DOUPVfMod_aicCloudRegion" target="aicCloudRegion"/> - <camunda:in source="mso-request-id" target="mso-request-id"/> - <camunda:in source="mso-service-instance-id" target="mso-service-instance-id"/> - <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled"/> - <camunda:out source="WorkflowException" target="WorkflowException"/> + <camunda:in source="DOUPVfMod_volumeGroupId" target="volumeGroupId" /> + <camunda:in source="DOUPVfMod_tenantId" target="tenantId" /> + <camunda:in source="DOUPVfMod_cloudRegionForVolume" target="aicCloudRegion" /> + <camunda:in source="mso-request-id" target="mso-request-id" /> + <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" /> + <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" /> + <camunda:out source="WorkflowException" target="WorkflowException" /> + <camunda:out source="ConfirmVolumeGroupTenantResponse" target="DOUPVfMod_volumeGroupStackId" /> </bpmn2:extensionElements> <bpmn2:incoming>SequenceFlow_11</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_17</bpmn2:outgoing> </bpmn2:callActivity> - <bpmn2:sequenceFlow id="SequenceFlow_17" name="" sourceRef="ScriptTask_3" targetRef="ScriptTask_4"/> + <bpmn2:sequenceFlow id="SequenceFlow_17" name="" sourceRef="ScriptTask_3" targetRef="ScriptTask_4" /> <bpmn2:scriptTask id="ScriptTask_2" name="Confirm VolumeGroup Tenant (prep)" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_10</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_11</bpmn2:outgoing> @@ -245,16 +247,17 @@ duvm.prepSDNCTopologyQuery(execution)]]></bpmn2:script> def duvm = new DoUpdateVfModule() duvm.prepConfirmVolumeGroupTenant(execution)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_11" name="" sourceRef="ScriptTask_2" targetRef="ScriptTask_3"/> - <bpmn2:exclusiveGateway id="ExclusiveGateway_2" name="VolumeGroupId 
present?" default="SequenceFlow_16"> + <bpmn2:sequenceFlow id="SequenceFlow_11" name="" sourceRef="ScriptTask_2" targetRef="ScriptTask_3" /> + <bpmn2:exclusiveGateway id="ExclusiveGateway_2" name="VolumeGroupId + present?" default="SequenceFlow_16"> <bpmn2:incoming>SequenceFlow_29</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_10</bpmn2:outgoing> <bpmn2:outgoing>SequenceFlow_16</bpmn2:outgoing> </bpmn2:exclusiveGateway> <bpmn2:sequenceFlow id="SequenceFlow_10" name="Yes" sourceRef="ExclusiveGateway_2" targetRef="ScriptTask_2"> - <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy">${execution.getVariable('DOUPVfMod_volumeGroupId').isEmpty()} == false</bpmn2:conditionExpression> + <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[${execution.getVariable('DOUPVfMod_volumeGroupId').isEmpty()} == false]]></bpmn2:conditionExpression> </bpmn2:sequenceFlow> - <bpmn2:sequenceFlow id="SequenceFlow_16" name="No" sourceRef="ExclusiveGateway_2" targetRef="ScriptTask_4"/> + <bpmn2:sequenceFlow id="SequenceFlow_16" name="No" sourceRef="ExclusiveGateway_2" targetRef="ScriptTask_4" /> <bpmn2:sequenceFlow id="SequenceFlow_28" name="yes" sourceRef="IsBaseVfModule" targetRef="ExclusiveGateway_3"> <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable("DOUPVfMod_isBaseVfModule") == "true"]]></bpmn2:conditionExpression> </bpmn2:sequenceFlow> @@ -265,15 +268,15 @@ duvm.prepConfirmVolumeGroupTenant(execution)]]></bpmn2:script> def doUpdateVfModule = new DoUpdateVfModule() doUpdateVfModule.queryAAIVfModule(execution)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_30" name="no" sourceRef="IsBaseVfModule" targetRef="QueryAAIVfModule"/> - <bpmn2:sequenceFlow id="SequenceFlow_34" name="" sourceRef="QueryAAIVfModule" targetRef="ExclusiveGateway_3"/> + <bpmn2:sequenceFlow id="SequenceFlow_30" name="no" sourceRef="IsBaseVfModule" targetRef="QueryAAIVfModule" /> + <bpmn2:sequenceFlow id="SequenceFlow_34" name="" sourceRef="QueryAAIVfModule" targetRef="ExclusiveGateway_3" /> <bpmn2:exclusiveGateway id="ExclusiveGateway_3"> <bpmn2:incoming>SequenceFlow_28</bpmn2:incoming> <bpmn2:incoming>SequenceFlow_34</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_29</bpmn2:outgoing> </bpmn2:exclusiveGateway> - <bpmn2:sequenceFlow id="SequenceFlow_29" name="" sourceRef="ExclusiveGateway_3" targetRef="ExclusiveGateway_2"/> - <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="ScriptTask_13" targetRef="ScriptTask_19"/> + <bpmn2:sequenceFlow id="SequenceFlow_29" name="" sourceRef="ExclusiveGateway_3" targetRef="ExclusiveGateway_2" /> + <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="ScriptTask_13" targetRef="ScriptTask_19" /> <bpmn2:scriptTask id="ScriptTask_19" name="PostProcess SDNC Adapter Activate" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_20</bpmn2:outgoing> @@ -288,381 +291,381 @@ duvm.validateSDNCResponse(execution, response, "activate")]]></bpmn2:script> <bpmn2:script><![CDATA[// This variable is checked by the unit test execution.setVariable('DoUpdateVfModuleSuccessIndicator', true)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="ScriptTask_17" targetRef="EndEvent_1"/> + <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="ScriptTask_17" targetRef="EndEvent_1" /> <bpmn2:endEvent id="EndEvent_1" name="TheEnd"> <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming> - <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_10"/> + <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_10" /> </bpmn2:endEvent> - <bpmn2:sequenceFlow id="SequenceFlow_20" name="" sourceRef="ScriptTask_19" targetRef="ScriptTask_17"/> + <bpmn2:sequenceFlow id="SequenceFlow_20" name="" sourceRef="ScriptTask_19" targetRef="ScriptTask_17" /> </bpmn2:process> - <bpmn2:error id="Error_1" errorCode="MSOWorkflowException" name="MSO Workflow Exception"/> + <bpmn2:error id="Error_1" name="MSO Workflow Exception" errorCode="MSOWorkflowException" /> <bpmndi:BPMNDiagram id="BPMNDiagram_1"> <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoUpdateVfModule"> <bpmndi:BPMNShape id="_BPMNShape_StartEvent_37" bpmnElement="StartEvent_1"> - <dc:Bounds height="36.0" width="36.0" x="150.0" y="214.0"/> + <dc:Bounds x="150" y="214" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds height="22.0" width="34.0" x="151.0" y="255.0"/> + <dc:Bounds x="151" y="255" width="34" height="22" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_22" bpmnElement="ProcessReceivedRequest"> - <dc:Bounds height="80.0" width="100.0" x="300.0" y="192.0"/> + <dc:Bounds x="300" y="192" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_37" targetElement="_BPMNShape_ScriptTask_22"> - <di:waypoint xsi:type="dc:Point" x="186.0" y="232.0"/> - <di:waypoint xsi:type="dc:Point" x="300.0" y="232.0"/> + <di:waypoint xsi:type="dc:Point" x="186" y="232" /> + <di:waypoint xsi:type="dc:Point" x="300" y="232" /> <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="208.0" y="232.0"/> + <dc:Bounds x="208" y="232" width="6" height="6" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_160" bpmnElement="PrepareUpdateAAIVfModule_prep"> - <dc:Bounds height="80.0" width="100.0" x="456.0" y="192.0"/> + <dc:Bounds x="456" y="192" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_38" bpmnElement="SequenceFlow_38" sourceElement="_BPMNShape_ScriptTask_22" targetElement="_BPMNShape_ScriptTask_160"> - <di:waypoint xsi:type="dc:Point" x="400.0" y="232.0"/> - <di:waypoint xsi:type="dc:Point" x="456.0" y="232.0"/> + <di:waypoint xsi:type="dc:Point" x="400" y="232" /> + <di:waypoint xsi:type="dc:Point" x="456" y="232" /> <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="492.0" y="232.0"/> + <dc:Bounds x="492" y="232" width="6" height="6" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_164" bpmnElement="ScriptTask_1"> - <dc:Bounds height="80.0" width="100.0" x="624.0" y="192.0"/> + <dc:Bounds x="624" y="192" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_160" targetElement="_BPMNShape_ScriptTask_164"> - <di:waypoint xsi:type="dc:Point" x="556.0" y="232.0"/> - <di:waypoint xsi:type="dc:Point" x="624.0" y="232.0"/> + <di:waypoint xsi:type="dc:Point" x="556" y="232" /> + <di:waypoint xsi:type="dc:Point" x="624" y="232" /> <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="575.0" y="232.0"/> + <dc:Bounds x="575" y="232" width="6" height="6" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_88" bpmnElement="ExclusiveGateway_2" isMarkerVisible="true"> - <dc:Bounds height="50.0" width="50.0" x="1039.0" y="206.0"/> + <dc:Bounds x="1039" y="206" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds height="38.0" width="109.0" x="1011.0" y="172.0"/> + <dc:Bounds x="1011" y="172" width="109" height="38" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_165" bpmnElement="ScriptTask_2"> - <dc:Bounds height="80.0" width="100.0" x="1152.0" y="192.0"/> + <dc:Bounds x="1152" y="192" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_ExclusiveGateway_88" targetElement="_BPMNShape_ScriptTask_165"> - <di:waypoint xsi:type="dc:Point" x="1089.0" y="231.0"/> - <di:waypoint xsi:type="dc:Point" x="1118.0" y="231.0"/> - <di:waypoint xsi:type="dc:Point" x="1118.0" y="232.0"/> - <di:waypoint xsi:type="dc:Point" x="1152.0" y="232.0"/> + <di:waypoint xsi:type="dc:Point" x="1089" y="231" /> + <di:waypoint xsi:type="dc:Point" x="1118" y="231" /> + <di:waypoint xsi:type="dc:Point" x="1118" y="232" /> + <di:waypoint xsi:type="dc:Point" x="1152" y="232" /> <bpmndi:BPMNLabel> - <dc:Bounds height="22.0" width="29.0" x="1099.0" y="231.0"/> + <dc:Bounds x="1099" y="231" width="29" height="22" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_166" bpmnElement="ScriptTask_3"> - <dc:Bounds height="80.0" width="100.0" x="1308.0" y="192.0"/> + <dc:Bounds x="1308" y="192" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_11" sourceElement="_BPMNShape_ScriptTask_165" targetElement="_BPMNShape_ScriptTask_166"> - <di:waypoint xsi:type="dc:Point" x="1252.0" y="232.0"/> - <di:waypoint xsi:type="dc:Point" x="1308.0" y="232.0"/> + <di:waypoint xsi:type="dc:Point" x="1252" y="232" /> + <di:waypoint xsi:type="dc:Point" x="1308" y="232" /> <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="1271.0" y="232.0"/> + <dc:Bounds x="1271" y="232" width="6" height="6" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_167" bpmnElement="ScriptTask_4"> - <dc:Bounds height="80.0" width="100.0" x="72.0" y="420.0"/> + <dc:Bounds x="72" y="420" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_168" bpmnElement="ScriptTask_5"> - <dc:Bounds height="80.0" width="100.0" x="239.0" y="420.0"/> + <dc:Bounds x="239" y="420" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_169" bpmnElement="ScriptTask_6"> - <dc:Bounds height="80.0" width="100.0" x="535.0" y="420.0"/> + <dc:Bounds x="535" y="420" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_ScriptTask_167" targetElement="_BPMNShape_ScriptTask_168"> - <di:waypoint xsi:type="dc:Point" x="172.0" y="460.0"/> - <di:waypoint xsi:type="dc:Point" x="239.0" y="460.0"/> + <di:waypoint xsi:type="dc:Point" x="172" y="460" /> + <di:waypoint xsi:type="dc:Point" x="239" y="460" /> <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="197.0" y="460.0"/> + <dc:Bounds x="197" y="460" width="6" height="6" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_16" bpmnElement="SequenceFlow_16" sourceElement="_BPMNShape_ExclusiveGateway_88" targetElement="_BPMNShape_ScriptTask_167"> - <di:waypoint xsi:type="dc:Point" x="1064.0" y="256.0"/> - <di:waypoint xsi:type="dc:Point" x="1064.0" y="351.0"/> - <di:waypoint xsi:type="dc:Point" x="122.0" y="351.0"/> - <di:waypoint xsi:type="dc:Point" x="122.0" y="420.0"/> + <di:waypoint xsi:type="dc:Point" x="1064" y="256" /> + <di:waypoint xsi:type="dc:Point" x="1064" y="351" /> + <di:waypoint xsi:type="dc:Point" x="122" y="351" /> + <di:waypoint xsi:type="dc:Point" x="122" y="420" /> <bpmndi:BPMNLabel> - <dc:Bounds height="22.0" width="22.0" x="1073.0" y="271.0"/> + <dc:Bounds x="1073" y="271" width="22" height="22" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_17" bpmnElement="SequenceFlow_17" sourceElement="_BPMNShape_ScriptTask_166" targetElement="_BPMNShape_ScriptTask_167"> - <di:waypoint xsi:type="dc:Point" x="1358.0" y="272.0"/> - <di:waypoint xsi:type="dc:Point" x="1358.0" y="352.0"/> - <di:waypoint xsi:type="dc:Point" x="639.0" y="352.0"/> - <di:waypoint xsi:type="dc:Point" x="122.0" y="352.0"/> - <di:waypoint xsi:type="dc:Point" x="122.0" y="420.0"/> + <di:waypoint xsi:type="dc:Point" x="1358" y="272" /> + <di:waypoint xsi:type="dc:Point" x="1358" y="352" /> + <di:waypoint xsi:type="dc:Point" x="639" y="352" /> + <di:waypoint xsi:type="dc:Point" x="122" y="352" /> + <di:waypoint xsi:type="dc:Point" x="122" y="420" /> <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="927.0" y="352.0"/> + <dc:Bounds x="927" y="352" width="6" height="6" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_170" bpmnElement="ScriptTask_7"> - <dc:Bounds height="80.0" width="100.0" x="684.0" y="420.0"/> + <dc:Bounds x="684" y="420" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_19" bpmnElement="SequenceFlow_19" sourceElement="_BPMNShape_ScriptTask_169" targetElement="_BPMNShape_ScriptTask_170"> - <di:waypoint xsi:type="dc:Point" x="635.0" y="460.0"/> - <di:waypoint xsi:type="dc:Point" x="684.0" y="460.0"/> + <di:waypoint xsi:type="dc:Point" x="635" y="460" /> + <di:waypoint xsi:type="dc:Point" x="684" y="460" /> <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="648.0" y="460.0"/> + <dc:Bounds x="648" y="460" width="6" height="6" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_171" bpmnElement="ScriptTask_8"> - <dc:Bounds height="80.0" width="100.0" x="996.0" y="420.0"/> + <dc:Bounds x="996" y="420" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_172" bpmnElement="ScriptTask_9"> - <dc:Bounds height="80.0" width="100.0" x="1176.0" y="420.0"/> + <dc:Bounds x="1176" y="420" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_21" bpmnElement="SequenceFlow_21" sourceElement="_BPMNShape_ScriptTask_171" targetElement="_BPMNShape_ScriptTask_172"> - <di:waypoint xsi:type="dc:Point" x="1096.0" y="460.0"/> - <di:waypoint xsi:type="dc:Point" x="1176.0" y="460.0"/> + <di:waypoint xsi:type="dc:Point" x="1096" y="460" /> + <di:waypoint xsi:type="dc:Point" x="1176" y="460" /> <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="1133.0" y="460.0"/> + <dc:Bounds x="1133" y="460" width="6" height="6" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_173" bpmnElement="ScriptTask_10"> - <dc:Bounds height="80.0" width="100.0" x="466.0" y="636.0"/> + <dc:Bounds x="466" y="636" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_174" bpmnElement="ScriptTask_11"> - <dc:Bounds height="80.0" width="100.0" x="624.0" y="636.0"/> + <dc:Bounds x="624" y="636" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_22" bpmnElement="SequenceFlow_24" sourceElement="_BPMNShape_ScriptTask_172" targetElement="_BPMNShape_ScriptTask_219"> - <di:waypoint xsi:type="dc:Point" x="1226.0" y="500.0"/> - <di:waypoint xsi:type="dc:Point" x="1226.0" y="576.0"/> - <di:waypoint xsi:type="dc:Point" x="194.0" y="576.0"/> - <di:waypoint xsi:type="dc:Point" x="194.0" y="636.0"/> + <di:waypoint xsi:type="dc:Point" x="1226" y="500" /> + <di:waypoint xsi:type="dc:Point" x="1226" y="576" /> + <di:waypoint xsi:type="dc:Point" x="194" y="576" /> + <di:waypoint xsi:type="dc:Point" x="194" y="636" /> <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="821.0" y="576.0"/> + <dc:Bounds x="821" y="576" width="6" height="6" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_25" bpmnElement="SequenceFlow_25" sourceElement="_BPMNShape_ScriptTask_173" targetElement="_BPMNShape_ScriptTask_174"> - <di:waypoint xsi:type="dc:Point" x="566.0" y="676.0"/> - <di:waypoint xsi:type="dc:Point" x="624.0" y="676.0"/> + <di:waypoint xsi:type="dc:Point" x="566" y="676" /> + <di:waypoint xsi:type="dc:Point" x="624" y="676" /> <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="591.0" y="676.0"/> + <dc:Bounds x="591" y="676" width="6" height="6" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_175" bpmnElement="ScriptTask_12"> - <dc:Bounds height="80.0" width="100.0" x="804.0" y="636.0"/> + <dc:Bounds x="804" y="636" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_176" bpmnElement="ScriptTask_13"> - <dc:Bounds height="80.0" width="100.0" x="984.0" y="636.0"/> + <dc:Bounds x="984" y="636" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_26" bpmnElement="SequenceFlow_26" sourceElement="_BPMNShape_ScriptTask_174" targetElement="_BPMNShape_ScriptTask_175"> - <di:waypoint xsi:type="dc:Point" x="724.0" y="676.0"/> - <di:waypoint xsi:type="dc:Point" x="804.0" y="676.0"/> + <di:waypoint xsi:type="dc:Point" x="724" y="676" /> + <di:waypoint xsi:type="dc:Point" x="804" y="676" /> <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="695.0" y="674.0"/> + <dc:Bounds x="695" y="674" width="6" height="6" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_27" bpmnElement="SequenceFlow_27" sourceElement="_BPMNShape_ScriptTask_175" targetElement="_BPMNShape_ScriptTask_176"> - <di:waypoint xsi:type="dc:Point" x="904.0" y="676.0"/> - <di:waypoint xsi:type="dc:Point" x="984.0" y="676.0"/> + <di:waypoint xsi:type="dc:Point" x="904" y="676" /> + <di:waypoint xsi:type="dc:Point" x="984" y="676" /> <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="902.0" y="676.0"/> + <dc:Bounds x="902" y="676" width="6" height="6" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_EndEvent_162" bpmnElement="EndEvent_1"> - <dc:Bounds height="36.0" width="36.0" x="1208.0" y="906.0"/> + <dc:Bounds x="1208" y="906" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds height="22.0" width="50.0" x="1201.0" y="947.0"/> + <dc:Bounds x="1201" y="947" width="50" height="22" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_SubProcess_21" bpmnElement="SubProcess_1" isExpanded="true"> - <dc:Bounds height="198.0" width="475.0" x="239.0" y="924.0"/> + <dc:Bounds x="239" y="924" width="475" height="198" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_179" bpmnElement="ScriptTask_16"> - <dc:Bounds height="80.0" width="100.0" x="399.0" y="984.0"/> + <dc:Bounds x="399" y="984" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_EndEvent_163" bpmnElement="EndEvent_3"> - <dc:Bounds height="36.0" width="36.0" x="617.0" y="1006.0"/> + <dc:Bounds x="617" y="1006" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds height="0.0" width="0.0" x="635.0" y="1047.0"/> + <dc:Bounds x="635" y="1047" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_35" bpmnElement="SequenceFlow_35" sourceElement="_BPMNShape_ScriptTask_179" targetElement="_BPMNShape_EndEvent_163"> - <di:waypoint xsi:type="dc:Point" x="499.0" y="1024.0"/> - <di:waypoint xsi:type="dc:Point" x="617.0" y="1024.0"/> + <di:waypoint xsi:type="dc:Point" x="499" y="1024" /> + <di:waypoint xsi:type="dc:Point" x="617" y="1024" /> <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="555.0" y="1024.0"/> + <dc:Bounds x="555" y="1024" width="6" height="6" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_BoundaryEvent_46" bpmnElement="BoundaryEvent_1"> - <dc:Bounds height="36.0" width="36.0" x="696.0" y="1005.0"/> + <dc:Bounds x="696" y="1005" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="711.0" y="1046.0"/> + <dc:Bounds x="711" y="1046" width="6" height="6" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_EndEvent_164" bpmnElement="EndEvent_5"> - <dc:Bounds height="36.0" width="36.0" x="814.0" y="1005.0"/> + <dc:Bounds x="814" y="1005" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds height="0.0" width="0.0" x="832.0" y="1046.0"/> + <dc:Bounds x="832" y="1046" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_36" bpmnElement="SequenceFlow_36" sourceElement="_BPMNShape_BoundaryEvent_46" targetElement="_BPMNShape_EndEvent_164"> - <di:waypoint xsi:type="dc:Point" x="732.0" y="1023.0"/> - <di:waypoint xsi:type="dc:Point" x="814.0" y="1023.0"/> + <di:waypoint xsi:type="dc:Point" x="732" y="1023" /> + <di:waypoint xsi:type="dc:Point" x="814" y="1023" /> <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="770.0" y="1023.0"/> + <dc:Bounds x="770" y="1023" width="6" height="6" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_StartEvent_56" bpmnElement="StartEvent_3"> - <dc:Bounds height="36.0" width="36.0" x="305.0" y="1006.0"/> + <dc:Bounds x="305" y="1006" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds height="0.0" width="0.0" x="323.0" y="1047.0"/> + <dc:Bounds x="323" y="1047" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_StartEvent_56" targetElement="_BPMNShape_ScriptTask_179"> - <di:waypoint xsi:type="dc:Point" x="341.0" y="1024.0"/> - <di:waypoint xsi:type="dc:Point" x="399.0" y="1024.0"/> + <di:waypoint xsi:type="dc:Point" x="341" y="1024" /> + <di:waypoint xsi:type="dc:Point" x="399" y="1024" /> <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="302.0" y="1084.0"/> + <dc:Bounds x="302" y="1084" width="6" height="6" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_180" bpmnElement="ScriptTask_17"> - <dc:Bounds height="80.0" width="100.0" x="1176.0" y="768.0"/> + <dc:Bounds x="1176" y="768" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_ScriptTask_180" targetElement="_BPMNShape_EndEvent_162"> - <di:waypoint xsi:type="dc:Point" x="1226.0" y="848.0"/> - <di:waypoint xsi:type="dc:Point" x="1226.0" y="906.0"/> + <di:waypoint xsi:type="dc:Point" x="1226" y="848" /> + <di:waypoint xsi:type="dc:Point" x="1226" y="906" /> <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="1223.0" y="868.0"/> + <dc:Bounds x="1223" y="868" width="6" height="6" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_219" bpmnElement="ScriptTask_14"> - <dc:Bounds height="80.0" width="100.0" x="144.0" y="636.0"/> + <dc:Bounds x="144" y="636" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_CallActivity_2" bpmnElement="CallActivity_1"> - <dc:Bounds height="80.0" width="100.0" x="300.0" y="636.0"/> + <dc:Bounds x="300" y="636" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_CallActivity_2" targetElement="_BPMNShape_ScriptTask_173"> - <di:waypoint xsi:type="dc:Point" x="400.0" y="676.0"/> - <di:waypoint xsi:type="dc:Point" x="466.0" y="676.0"/> + <di:waypoint xsi:type="dc:Point" x="400" y="676" /> + <di:waypoint xsi:type="dc:Point" x="466" y="676" /> <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="431.0" y="676.0"/> + <dc:Bounds x="431" y="676" width="6" height="6" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="SequenceFlow_13" sourceElement="_BPMNShape_ScriptTask_219" targetElement="_BPMNShape_ExclusiveGateway_213"> - <di:waypoint xsi:type="dc:Point" x="194.0" y="716.0"/> - <di:waypoint xsi:type="dc:Point" x="195.0" y="793.0"/> - <di:waypoint xsi:type="dc:Point" x="284.0" y="793.0"/> - <di:waypoint xsi:type="dc:Point" x="324.0" y="793.0"/> + <di:waypoint xsi:type="dc:Point" x="194" y="716" /> + <di:waypoint xsi:type="dc:Point" x="195" y="793" /> + <di:waypoint xsi:type="dc:Point" x="284" y="793" /> + <di:waypoint xsi:type="dc:Point" x="324" y="793" /> <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="191.0" y="746.0"/> + <dc:Bounds x="191" y="746" width="6" height="6" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_213" bpmnElement="ExclusiveGateway_1" isMarkerVisible="true"> - <dc:Bounds height="50.0" width="50.0" x="324.0" y="768.0"/> + <dc:Bounds x="324" y="768" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds height="0.0" width="0.0" x="349.0" y="823.0"/> + <dc:Bounds x="349" y="823" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_14" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_ExclusiveGateway_213" targetElement="_BPMNShape_CallActivity_2"> - <di:waypoint xsi:type="dc:Point" x="349.0" y="768.0"/> - <di:waypoint xsi:type="dc:Point" x="350.0" y="716.0"/> + <di:waypoint xsi:type="dc:Point" x="349" y="768" /> + <di:waypoint xsi:type="dc:Point" x="350" y="716" /> <bpmndi:BPMNLabel> - <dc:Bounds height="22.0" width="80.0" x="357.0" y="733.0"/> + <dc:Bounds x="357" y="733" width="80" height="22" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="SequenceFlow_18" sourceElement="_BPMNShape_ExclusiveGateway_213" targetElement="_BPMNShape_ScriptTask_173"> - <di:waypoint xsi:type="dc:Point" x="374.0" y="793.0"/> - <di:waypoint xsi:type="dc:Point" x="515.0" y="793.0"/> - <di:waypoint xsi:type="dc:Point" x="516.0" y="716.0"/> + <di:waypoint xsi:type="dc:Point" x="374" y="793" /> + <di:waypoint xsi:type="dc:Point" x="515" y="793" /> + <di:waypoint xsi:type="dc:Point" x="516" y="716" /> <bpmndi:BPMNLabel> - <dc:Bounds height="22.0" width="97.0" x="380.0" y="768.0"/> + <dc:Bounds x="380" y="768" width="97" height="22" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_220" bpmnElement="ScriptTask_15"> - <dc:Bounds height="80.0" width="100.0" x="840.0" y="420.0"/> + <dc:Bounds x="840" y="420" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_221" bpmnElement="ScriptTask_18"> - <dc:Bounds height="80.0" width="100.0" x="384.0" y="420.0"/> + <dc:Bounds x="384" y="420" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_ScriptTask_168" targetElement="_BPMNShape_ScriptTask_221"> - <di:waypoint xsi:type="dc:Point" x="339.0" y="460.0"/> - <di:waypoint xsi:type="dc:Point" x="384.0" y="460.0"/> + <di:waypoint xsi:type="dc:Point" x="339" y="460" /> + <di:waypoint xsi:type="dc:Point" x="384" y="460" /> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ScriptTask_221" targetElement="_BPMNShape_ScriptTask_169"> - <di:waypoint xsi:type="dc:Point" x="484.0" y="460.0"/> - <di:waypoint xsi:type="dc:Point" x="535.0" y="460.0"/> + <di:waypoint xsi:type="dc:Point" x="484" y="460" /> + <di:waypoint xsi:type="dc:Point" x="535" y="460" /> <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="511.0" y="460.0"/> + <dc:Bounds x="511" y="460" width="6" height="6" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_23" bpmnElement="SequenceFlow_22" sourceElement="_BPMNShape_ScriptTask_170" targetElement="_BPMNShape_ScriptTask_220"> - <di:waypoint xsi:type="dc:Point" x="784.0" y="460.0"/> - <di:waypoint xsi:type="dc:Point" x="840.0" y="460.0"/> + <di:waypoint xsi:type="dc:Point" x="784" y="460" /> + <di:waypoint xsi:type="dc:Point" x="840" y="460" /> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_24" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_ScriptTask_220" targetElement="_BPMNShape_ScriptTask_171"> - <di:waypoint xsi:type="dc:Point" x="940.0" y="460.0"/> - <di:waypoint xsi:type="dc:Point" x="996.0" y="460.0"/> + <di:waypoint xsi:type="dc:Point" x="940" y="460" /> + <di:waypoint xsi:type="dc:Point" x="996" y="460" /> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_214" bpmnElement="ExclusiveGateway_3" isMarkerVisible="true"> - <dc:Bounds height="50.0" width="50.0" x="965.0" y="206.0"/> + <dc:Bounds x="965" y="206" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds height="0.0" width="0.0" x="990.0" y="261.0"/> + <dc:Bounds x="990" y="261" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_215" bpmnElement="IsBaseVfModule" isMarkerVisible="true"> - <dc:Bounds height="50.0" width="50.0" x="770.0" y="206.0"/> + <dc:Bounds x="770" y="206" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds height="0.0" width="0.0" x="795.0" y="261.0"/> + <dc:Bounds x="795" y="261" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_285" bpmnElement="QueryAAIVfModule"> - <dc:Bounds height="80.0" width="100.0" x="849.0" y="72.0"/> + <dc:Bounds x="849" y="72" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_15" bpmnElement="SequenceFlow_15" sourceElement="_BPMNShape_ScriptTask_164" targetElement="_BPMNShape_ExclusiveGateway_215"> - <di:waypoint xsi:type="dc:Point" x="724.0" y="232.0"/> - <di:waypoint xsi:type="dc:Point" x="747.0" y="232.0"/> - <di:waypoint xsi:type="dc:Point" x="747.0" y="231.0"/> - <di:waypoint xsi:type="dc:Point" x="770.0" y="231.0"/> + <di:waypoint xsi:type="dc:Point" x="724" y="232" /> + <di:waypoint xsi:type="dc:Point" x="747" y="232" /> + <di:waypoint xsi:type="dc:Point" x="747" y="231" /> + <di:waypoint xsi:type="dc:Point" x="770" y="231" /> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_28" bpmnElement="SequenceFlow_28" sourceElement="_BPMNShape_ExclusiveGateway_215" targetElement="_BPMNShape_ExclusiveGateway_214"> - <di:waypoint xsi:type="dc:Point" x="820.0" y="231.0"/> - <di:waypoint xsi:type="dc:Point" x="965.0" y="231.0"/> + <di:waypoint xsi:type="dc:Point" x="820" y="231" /> + <di:waypoint xsi:type="dc:Point" x="965" y="231" /> <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="888.0" y="231.0"/> + <dc:Bounds x="888" y="231" width="6" height="6" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_29" bpmnElement="SequenceFlow_29" sourceElement="_BPMNShape_ExclusiveGateway_214" targetElement="_BPMNShape_ExclusiveGateway_88"> - <di:waypoint xsi:type="dc:Point" x="1015.0" y="231.0"/> - <di:waypoint xsi:type="dc:Point" x="1039.0" y="231.0"/> + <di:waypoint xsi:type="dc:Point" x="1015" y="231" /> + <di:waypoint xsi:type="dc:Point" x="1039" y="231" /> <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="1015.0" y="231.0"/> + <dc:Bounds x="1015" y="231" width="6" height="6" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_30" bpmnElement="SequenceFlow_30" sourceElement="_BPMNShape_ExclusiveGateway_215" targetElement="_BPMNShape_ScriptTask_285"> - <di:waypoint xsi:type="dc:Point" x="795.0" y="206.0"/> - <di:waypoint xsi:type="dc:Point" x="795.0" y="112.0"/> - <di:waypoint xsi:type="dc:Point" x="849.0" y="112.0"/> + <di:waypoint xsi:type="dc:Point" x="795" y="206" /> + <di:waypoint xsi:type="dc:Point" x="795" y="112" /> + <di:waypoint xsi:type="dc:Point" x="849" y="112" /> <bpmndi:BPMNLabel> - <dc:Bounds height="22.0" width="20.0" x="770.0" y="151.0"/> + <dc:Bounds x="770" y="151" width="20" height="22" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_34" bpmnElement="SequenceFlow_34" sourceElement="_BPMNShape_ScriptTask_285" targetElement="_BPMNShape_ExclusiveGateway_214"> - <di:waypoint xsi:type="dc:Point" x="949.0" y="112.0"/> - <di:waypoint xsi:type="dc:Point" x="966.0" y="112.0"/> - <di:waypoint xsi:type="dc:Point" x="990.0" y="112.0"/> - <di:waypoint xsi:type="dc:Point" x="990.0" y="206.0"/> + <di:waypoint xsi:type="dc:Point" x="949" y="112" /> + <di:waypoint xsi:type="dc:Point" x="966" y="112" /> + <di:waypoint xsi:type="dc:Point" x="990" y="112" /> + <di:waypoint xsi:type="dc:Point" x="990" y="206" /> <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="987.0" y="136.0"/> + <dc:Bounds x="987" y="136" width="6" height="6" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_286" bpmnElement="ScriptTask_19"> - <dc:Bounds height="80.0" width="100.0" x="1176.0" y="636.0"/> + <dc:Bounds x="1176" y="636" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ScriptTask_176" targetElement="_BPMNShape_ScriptTask_286"> - <di:waypoint xsi:type="dc:Point" x="1084.0" y="676.0"/> - <di:waypoint xsi:type="dc:Point" x="1176.0" y="676.0"/> + <di:waypoint xsi:type="dc:Point" x="1084" y="676" /> + <di:waypoint xsi:type="dc:Point" x="1176" y="676" /> <bpmndi:BPMNLabel> - <dc:Bounds height="6.0" width="6.0" x="1121.0" y="676.0"/> + <dc:Bounds x="1121" y="676" width="6" height="6" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_20" bpmnElement="SequenceFlow_20" sourceElement="_BPMNShape_ScriptTask_286" targetElement="_BPMNShape_ScriptTask_180"> - <di:waypoint xsi:type="dc:Point" x="1226.0" y="716.0"/> - <di:waypoint xsi:type="dc:Point" x="1226.0" y="768.0"/> + <di:waypoint xsi:type="dc:Point" x="1226" y="716" /> + <di:waypoint xsi:type="dc:Point" x="1226" y="768" /> </bpmndi:BPMNEdge> </bpmndi:BPMNPlane> </bpmndi:BPMNDiagram> -</bpmn2:definitions>
\ No newline at end of file +</bpmn2:definitions> diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateVnfAndModules.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateVnfAndModules.bpmn new file mode 100644 index 0000000000..c110580f5c --- /dev/null +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateVnfAndModules.bpmn @@ -0,0 +1,274 @@ +<?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="_9MhrcHqVEea26OhQB97uCQ" 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:process id="DoUpdateVnfAndModules" name="DoUpdateVnfAndModules" isExecutable="true"> + <bpmn2:startEvent id="StartEvent_1"> + <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing> + </bpmn2:startEvent> + <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="StartEvent_1" targetRef="intialization" /> + <bpmn2:scriptTask id="intialization" name="Intialization" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_08nd69s</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +DoUpdateVnfAndModules updateVnfAndModules = new DoUpdateVnfAndModules() +updateVnfAndModules.preProcessRequest(execution)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:subProcess id="javaErrorHandlingSubProcess" name="Java Exception Handling Sub Process" triggeredByEvent="true"> + <bpmn2:endEvent id="EndEvent_4"> + <bpmn2:incoming>SequenceFlow_19</bpmn2:incoming> + </bpmn2:endEvent> + <bpmn2:startEvent id="StartEvent_3"> + <bpmn2:outgoing>SequenceFlow_18</bpmn2:outgoing> + <bpmn2:errorEventDefinition id="_ErrorEventDefinition_95" errorRef="Error_2" /> + </bpmn2:startEvent> + <bpmn2:sequenceFlow id="SequenceFlow_18" name="" sourceRef="StartEvent_3" targetRef="processJavaException" /> + <bpmn2:scriptTask id="processJavaException" name="Process Error" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_18</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_19</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.* +ExceptionUtil exceptionUtil = new ExceptionUtil() +exceptionUtil.processJavaException(execution)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:sequenceFlow id="SequenceFlow_19" name="" sourceRef="processJavaException" targetRef="EndEvent_4" /> + </bpmn2:subProcess> + <bpmn2:endEvent id="EndEvent_2"> + <bpmn2:incoming>SequenceFlow_0of4kmm</bpmn2:incoming> + <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_36" /> + </bpmn2:endEvent> + <bpmn2:exclusiveGateway id="ExclusiveGateway_1amun4k" name="Are there VF modules to update?" default="SequenceFlow_19c7hcw"> + <bpmn2:incoming>SequenceFlow_0t4yszi</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_1f4mbkc</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_1qrkdn3</bpmn2:outgoing> + <bpmn2:outgoing>SequenceFlow_19c7hcw</bpmn2:outgoing> + </bpmn2:exclusiveGateway> + <bpmn2:sequenceFlow id="SequenceFlow_08nd69s" sourceRef="intialization" targetRef="QueryVnf" /> + <bpmn2:sequenceFlow id="SequenceFlow_1qrkdn3" name="yes" sourceRef="ExclusiveGateway_1amun4k" targetRef="PrepareModuleList"> + <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable("DUVAM_nextModule") < execution.getVariable("DUVAM_moduleCount")]]></bpmn2:conditionExpression> + </bpmn2:sequenceFlow> + <bpmn2:callActivity id="UpdateVFModule" name="Do Update VF Module" calledElement="DoUpdateVfModule"> + <bpmn2:extensionElements> + <camunda:in source="msoRequestId" target="msoRequestId" /> + <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" /> + <camunda:out source="WorkflowException" target="WorkflowException" /> + <camunda:in source="isVidRequest" target="isVidRequest" /> + <camunda:in source="vnfType" target="vnfType" /> + <camunda:in source="vnfName" target="vnfName" /> + <camunda:in source="vnfId" target="vnfId" /> + <camunda:in source="DUVAM_vfModuleName" target="vfModuleName" /> + <camunda:in source="DUVAM_vfModuleId" target="vfModuleId" /> + <camunda:in source="DUVAM_volumeGroupId" target="volumeGroupId" /> + <camunda:in source="DUVAM_volumeGroupName" target="volumeGroupName" /> + <camunda:in source="DUVAM_isBaseVfModule" target="isBaseVfModule" /> + <camunda:in source="asdcServiceModelVersion" target="asdcServiceModelVersion" /> + <camunda:in source="serviceInstanceId" target="serviceInstanceId" /> + <camunda:in source="serviceModelInfo" target="serviceModelInfo" /> + <camunda:in source="vnfModelInfo" target="vnfModelInfo" /> + <camunda:in source="globalSubscriberId" target="globalSubscriberId" /> + <camunda:in source="lcpCloudRegionId" target="lcpCloudRegionId" /> + <camunda:in source="tenantId" target="tenantId" /> + <camunda:in source="sdncVersion" target="sdncVersion" /> + <camunda:in source="DUVAM_vfModuleModelInfo" target="vfModuleModelInfo" /> + <camunda:in source="usePreload" target="usePreload" /> + </bpmn2:extensionElements> + <bpmn2:incoming>SequenceFlow_04o61yk</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_1p4ycii</bpmn2:outgoing> + </bpmn2:callActivity> + <bpmn2:sequenceFlow id="SequenceFlow_1p4ycii" sourceRef="UpdateVFModule" targetRef="PostProcessUpdateVfModule" /> + <bpmn2:sequenceFlow id="SequenceFlow_0t4yszi" sourceRef="PostProcessUpdateVfModule" targetRef="ExclusiveGateway_1amun4k" /> + <bpmn2:scriptTask id="QueryVnf" name="Query VNF" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_08nd69s</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_1f4mbkc</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def duvam = new DoUpdateVnfAndModules() +duvam.queryAAIVfModule(execution)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:scriptTask id="PrepareModuleList" name="Prepare Next Module To Update" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_1qrkdn3</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_04o61yk</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def duvam = new DoUpdateVnfAndModules() +duvam.prepareNextModuleToUpdate(execution)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:scriptTask id="PostProcessUpdateVfModule" name="PostProcess Update VF Module" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_1p4ycii</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_0t4yszi</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +int nextModule = execution.getVariable("DUVAM_nextModule") + execution.setVariable("DUVAM_nextModule", nextModule + 1)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:sequenceFlow id="SequenceFlow_04o61yk" sourceRef="PrepareModuleList" targetRef="UpdateVFModule" /> + <bpmn2:sequenceFlow id="SequenceFlow_19c7hcw" name="no" sourceRef="ExclusiveGateway_1amun4k" targetRef="PreProcessUpdateAAIGenericVNF" /> + <bpmn2:sequenceFlow id="SequenceFlow_0of4kmm" sourceRef="UpdateAAIGenericVNFTask" targetRef="EndEvent_2" /> + <bpmn2:sequenceFlow id="SequenceFlow_1ltycz6" sourceRef="PreProcessUpdateAAIGenericVNF" targetRef="UpdateAAIGenericVNFTask" /> + <bpmn2:callActivity id="UpdateAAIGenericVNFTask" name="Update AAI Generic VNF" calledElement="UpdateAAIGenericVnf"> + <bpmn2:extensionElements> + <camunda:in source="DUVAM_updateAAIGenericVnfRequest" target="UpdateAAIGenericVnfRequest" /> + <camunda:in source="mso-request-id" target="mso-request-id" /> + <camunda:in source="mso-service-id" target="mso-service-id" /> + <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" /> + <camunda:out source="WorkflowException" target="WorkflowException" /> + </bpmn2:extensionElements> + <bpmn2:incoming>SequenceFlow_1ltycz6</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_0of4kmm</bpmn2:outgoing> + </bpmn2:callActivity> + <bpmn2:scriptTask id="PreProcessUpdateAAIGenericVNF" name="PreProcess Update AAI Generic VNF" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_19c7hcw</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_1ltycz6</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* +def duvam = new DoUpdateVnfAndModules() +duvam.prepUpdateAAIGenericVnf(execution)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:sequenceFlow id="SequenceFlow_1f4mbkc" sourceRef="QueryVnf" targetRef="ExclusiveGateway_1amun4k" /> + </bpmn2:process> + <bpmn2:error id="Error_1" name="MSO Workflow Exception" errorCode="MSOWorkflowException" /> + <bpmn2:error id="Error_2" name="Java Lang Exception" errorCode="java.lang.Exception" /> + <bpmndi:BPMNDiagram id="BPMNDiagram_1"> + <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoUpdateVnfAndModules"> + <bpmndi:BPMNShape id="_BPMNShape_StartEvent_79" bpmnElement="StartEvent_1"> + <dc:Bounds x="238" y="209" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="256" y="250" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_311" bpmnElement="intialization"> + <dc:Bounds x="344" y="187" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_79" targetElement="_BPMNShape_ScriptTask_311"> + <di:waypoint xsi:type="dc:Point" x="274" y="227" /> + <di:waypoint xsi:type="dc:Point" x="344" y="228" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="309" y="212.5" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="_BPMNShape_EndEvent_237" bpmnElement="EndEvent_2"> + <dc:Bounds x="1441" y="279" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1459" y="320" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="_BPMNShape_SubProcess_35" bpmnElement="javaErrorHandlingSubProcess" isExpanded="true"> + <dc:Bounds x="242" y="457" width="431" height="157" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="_BPMNShape_StartEvent_81" bpmnElement="StartEvent_3"> + <dc:Bounds x="390" y="518" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="408" y="559" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="_BPMNShape_EndEvent_239" bpmnElement="EndEvent_4"> + <dc:Bounds x="606" y="518" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="624" y="559" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_319" bpmnElement="processJavaException"> + <dc:Bounds x="460" y="496" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_20" bpmnElement="SequenceFlow_18" sourceElement="_BPMNShape_StartEvent_81" targetElement="_BPMNShape_ScriptTask_319"> + <di:waypoint xsi:type="dc:Point" x="426" y="536" /> + <di:waypoint xsi:type="dc:Point" x="460" y="536" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="443" y="521" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_21" bpmnElement="SequenceFlow_19" sourceElement="_BPMNShape_ScriptTask_319" targetElement="_BPMNShape_EndEvent_239"> + <di:waypoint xsi:type="dc:Point" x="560" y="536" /> + <di:waypoint xsi:type="dc:Point" x="606" y="536" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="583" y="521" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ExclusiveGateway_1amun4k_di" bpmnElement="ExclusiveGateway_1amun4k" isMarkerVisible="true"> + <dc:Bounds x="706" y="201" width="50" height="50" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="660" y="248" width="65" height="36" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_08nd69s_di" bpmnElement="SequenceFlow_08nd69s"> + <di:waypoint xsi:type="dc:Point" x="444" y="227" /> + <di:waypoint xsi:type="dc:Point" x="512" y="227" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="478" y="212" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1qrkdn3_di" bpmnElement="SequenceFlow_1qrkdn3"> + <di:waypoint xsi:type="dc:Point" x="731" y="201" /> + <di:waypoint xsi:type="dc:Point" x="731" y="92" /> + <di:waypoint xsi:type="dc:Point" x="816" y="92" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="737" y="151" width="18" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="CallActivity_0qmp9y5_di" bpmnElement="UpdateVFModule"> + <dc:Bounds x="983" y="52" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1p4ycii_di" bpmnElement="SequenceFlow_1p4ycii"> + <di:waypoint xsi:type="dc:Point" x="1083" y="92" /> + <di:waypoint xsi:type="dc:Point" x="1164" y="92" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1124" y="77" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_0t4yszi_di" bpmnElement="SequenceFlow_0t4yszi"> + <di:waypoint xsi:type="dc:Point" x="1214" y="132" /> + <di:waypoint xsi:type="dc:Point" x="1214" y="226" /> + <di:waypoint xsi:type="dc:Point" x="756" y="226" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1229" y="179" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ScriptTask_12xsp2f_di" bpmnElement="QueryVnf"> + <dc:Bounds x="512" y="187" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ScriptTask_01c9qas_di" bpmnElement="PrepareModuleList"> + <dc:Bounds x="816" y="52" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ScriptTask_11i0rnd_di" bpmnElement="PostProcessUpdateVfModule"> + <dc:Bounds x="1164" y="52" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_04o61yk_di" bpmnElement="SequenceFlow_04o61yk"> + <di:waypoint xsi:type="dc:Point" x="916" y="92" /> + <di:waypoint xsi:type="dc:Point" x="983" y="92" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="950" y="77" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_19c7hcw_di" bpmnElement="SequenceFlow_19c7hcw"> + <di:waypoint xsi:type="dc:Point" x="731" y="251" /> + <di:waypoint xsi:type="dc:Point" x="731" y="295" /> + <di:waypoint xsi:type="dc:Point" x="1111" y="297" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="908" y="273" width="12" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_0of4kmm_di" bpmnElement="SequenceFlow_0of4kmm"> + <di:waypoint xsi:type="dc:Point" x="1367" y="297" /> + <di:waypoint xsi:type="dc:Point" x="1404" y="297" /> + <di:waypoint xsi:type="dc:Point" x="1404" y="297" /> + <di:waypoint xsi:type="dc:Point" x="1441" y="297" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1419" y="297" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1ltycz6_di" bpmnElement="SequenceFlow_1ltycz6"> + <di:waypoint xsi:type="dc:Point" x="1211" y="297" /> + <di:waypoint xsi:type="dc:Point" x="1267" y="297" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1239" y="282" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="CallActivity_1cem00f_di" bpmnElement="UpdateAAIGenericVNFTask"> + <dc:Bounds x="1267" y="257" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ScriptTask_0snu9sv_di" bpmnElement="PreProcessUpdateAAIGenericVNF"> + <dc:Bounds x="1111" y="257" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1f4mbkc_di" bpmnElement="SequenceFlow_1f4mbkc"> + <di:waypoint xsi:type="dc:Point" x="612" y="227" /> + <di:waypoint xsi:type="dc:Point" x="706" y="226" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="659" y="211.5" width="0" height="0" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + </bpmndi:BPMNPlane> + </bpmndi:BPMNDiagram> +</bpmn2:definitions> |