diff options
Diffstat (limited to 'bpmn/so-bpmn-infrastructure-flows/src/main')
5 files changed, 307 insertions, 222 deletions
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateAndActivatePnfResource.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateAndActivatePnfResource.bpmn index 89d66bfdb6..e0b14ab0db 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateAndActivatePnfResource.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateAndActivatePnfResource.bpmn @@ -27,15 +27,15 @@ <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">#{aaiContainsInfoAboutPnf}</bpmn:conditionExpression> </bpmn:sequenceFlow> <bpmn:sequenceFlow id="SequenceFlow_0967g8p" sourceRef="CheckInputs" targetRef="CheckAiiForCorrelationId" /> - <bpmn:serviceTask id="CheckInputs" name="Check inputs" camunda:delegateExpression="${pnfCheckInputs}"> + <bpmn:serviceTask id="CheckInputs" name="Check inputs" camunda:delegateExpression="${PnfCheckInputs}"> <bpmn:incoming>SequenceFlow_0j5ksz1</bpmn:incoming> <bpmn:outgoing>SequenceFlow_0967g8p</bpmn:outgoing> </bpmn:serviceTask> - <bpmn:serviceTask id="CancelDmaapClientSubscription" name="Cancel DmaapClient subscription" camunda:delegateExpression="${cancelDmaapSubscription}"> + <bpmn:serviceTask id="CancelDmaapClientSubscription" name="Cancel DmaapClient subscription" camunda:delegateExpression="${CancelDmaapSubscription}"> <bpmn:incoming>SequenceFlow_1kc34bc</bpmn:incoming> <bpmn:outgoing>SequenceFlow_1miyzfe</bpmn:outgoing> </bpmn:serviceTask> - <bpmn:serviceTask id="InformDmaapClient" name="Inform DmaapClient about business key and corresponding pnf-id" camunda:delegateExpression="${informDmaapClient}"> + <bpmn:serviceTask id="InformDmaapClient" name="Inform DmaapClient about business key and corresponding pnf-id" camunda:delegateExpression="${InformDmaapClient}"> <bpmn:incoming>SequenceFlow_17s9025</bpmn:incoming> <bpmn:outgoing>SequenceFlow_1o8od8e</bpmn:outgoing> </bpmn:serviceTask> @@ -44,7 +44,7 @@ <bpmn:incoming>SequenceFlow_1l1t6ak</bpmn:incoming> <bpmn:outgoing>SequenceFlow_17s9025</bpmn:outgoing> </bpmn:intermediateThrowEvent> - <bpmn:serviceTask id="CreateAndActivatePnf_CreateAaiEntry" name="Create AAI entry with pnf-id = correlation_id" camunda:delegateExpression="${createAaiEntryWithPnfIdDelegate}"> + <bpmn:serviceTask id="CreateAndActivatePnf_CreateAaiEntry" name="Create AAI entry with pnf-id = correlation_id" camunda:delegateExpression="${CreateAaiEntryWithPnfIdDelegate}"> <bpmn:incoming>SequenceFlow_0v5ffpe</bpmn:incoming> <bpmn:outgoing>SequenceFlow_1qr6cmf</bpmn:outgoing> </bpmn:serviceTask> @@ -53,7 +53,7 @@ <bpmn:outgoing>SequenceFlow_1l1t6ak</bpmn:outgoing> <bpmn:outgoing>SequenceFlow_0v5ffpe</bpmn:outgoing> </bpmn:exclusiveGateway> - <bpmn:serviceTask id="CheckAiiForCorrelationId" name="Check AAI for correlation_id" camunda:delegateExpression="${checkAaiForCorrelationIdDelegate}"> + <bpmn:serviceTask id="CheckAiiForCorrelationId" name="Check AAI for correlation_id" camunda:delegateExpression="${CheckAaiForCorrelationIdDelegate}"> <bpmn:incoming>SequenceFlow_0967g8p</bpmn:incoming> <bpmn:outgoing>SequenceFlow_1j4r3zt</bpmn:outgoing> </bpmn:serviceTask> diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateDeviceResource.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateDeviceResource.bpmn index 3c7be0937f..5fd2c69608 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateDeviceResource.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateDeviceResource.bpmn @@ -33,7 +33,7 @@ csi.sendSyncResponse(execution)]]></bpmn:script> <bpmn:outgoing>SequenceFlow_1rwaeun</bpmn:outgoing> </bpmn:startEvent> <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_1caax8u" name="GoTo StartCreateDevinSDNC"> - <bpmn:incoming>SequenceFlow_1ylvnxq</bpmn:incoming> + <bpmn:incoming>SequenceFlow_1ss02ik</bpmn:incoming> <bpmn:linkEventDefinition name="StartCreateDevinSDNC" /> </bpmn:intermediateThrowEvent> <bpmn:scriptTask id="ScriptTask_00y93jj" name="Check DevType" scriptFormat="groovy"> @@ -53,7 +53,7 @@ dcsi.checkDevType(execution)]]></bpmn:script> <bpmn:incoming>SequenceFlow_0h4378g</bpmn:incoming> <bpmn:linkEventDefinition name="StartCreateDevinSDNC" /> </bpmn:intermediateThrowEvent> - <bpmn:sequenceFlow id="SequenceFlow_1ss02ik" name="VNF" sourceRef="ExclusiveGateway_0kba700" targetRef="ScriptTask_02rli65"> + <bpmn:sequenceFlow id="SequenceFlow_1ss02ik" name="VNF" sourceRef="ExclusiveGateway_0kba700" targetRef="IntermediateThrowEvent_1caax8u"> <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{(execution.getVariable("device_class" ) == "VNF" )}]]></bpmn:conditionExpression> </bpmn:sequenceFlow> <bpmn:sequenceFlow id="SequenceFlow_1hp2h5t" sourceRef="ScriptTask_00y93jj" targetRef="ExclusiveGateway_0kba700" /> @@ -74,39 +74,6 @@ dcsi.preProcessRequest(execution)]]></bpmn:script> <bpmn:linkEventDefinition name="StartCreateDevinSDNC" /> </bpmn:intermediateCatchEvent> <bpmn:sequenceFlow id="SequenceFlow_1gu13by" sourceRef="IntermediateCatchEvent_0slgrxw" targetRef="Task_0bga3e8" /> - <bpmn:callActivity id="CallActivity_0pyrfca" name="call CreateVNF" calledElement="DoCreateVNF"> - <bpmn:extensionElements> - <camunda:in source="mso-request-id" target="mso-request-id" /> - <camunda:in source="requestAction" target="requestAction" /> - <camunda:in source="recipeParams" target="recipeParams" /> - <camunda:in source="resourceInput" target="resourceInput" /> - <camunda:in source="recipeParamXsd" target="recipeParamXsd" /> - <camunda:in source="operationId" target="operationId" /> - <camunda:in source="svcAction" target="svcAction" /> - <camunda:in source="requestAction" target="requestAction" /> - <camunda:in source="URN_mso_workflow_sdncadapter_callback" target="URN_mso_workflow_sdncadapter_callback" /> - <camunda:in source="networkRequest" target="networkRequest" /> - </bpmn:extensionElements> - <bpmn:incoming>SequenceFlow_0pg3072</bpmn:incoming> - <bpmn:outgoing>SequenceFlow_0pkp4ce</bpmn:outgoing> - </bpmn:callActivity> - <bpmn:sequenceFlow id="SequenceFlow_0pkp4ce" sourceRef="CallActivity_0pyrfca" targetRef="ScriptTask_0u1piih" /> - <bpmn:scriptTask id="ScriptTask_02rli65" name="Get VNF Template fom SDC" scriptFormat="groovy"> - <bpmn:incoming>SequenceFlow_1ss02ik</bpmn:incoming> - <bpmn:outgoing>SequenceFlow_0pg3072</bpmn:outgoing> - <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.* -def dcsi = new CreateDeviceResource() -dcsi.getVNFTemplatefromSDC(execution)]]></bpmn:script> - </bpmn:scriptTask> - <bpmn:sequenceFlow id="SequenceFlow_0pg3072" sourceRef="ScriptTask_02rli65" targetRef="CallActivity_0pyrfca" /> - <bpmn:scriptTask id="ScriptTask_0u1piih" name="Post VNF info process " scriptFormat="groovy"> - <bpmn:incoming>SequenceFlow_0pkp4ce</bpmn:incoming> - <bpmn:outgoing>SequenceFlow_1ylvnxq</bpmn:outgoing> - <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.* -def dcsi = new CreateDeviceResource() -dcsi.postVNFInfoProcess(execution)]]></bpmn:script> - </bpmn:scriptTask> - <bpmn:sequenceFlow id="SequenceFlow_1ylvnxq" sourceRef="ScriptTask_0u1piih" targetRef="IntermediateThrowEvent_1caax8u" /> <bpmn:scriptTask id="ScriptTask_0p4b5vu" name="Prepare Create resource progress" scriptFormat="groovy"> <bpmn:incoming>SequenceFlow_0b5nrig</bpmn:incoming> <bpmn:outgoing>SequenceFlow_09s5dfc</bpmn:outgoing> @@ -203,9 +170,9 @@ dcsi.prepareUpdateProgress(execution)]]></bpmn:script> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1ss02ik_di" bpmnElement="SequenceFlow_1ss02ik"> <di:waypoint xsi:type="dc:Point" x="384" y="-127" /> - <di:waypoint xsi:type="dc:Point" x="480" y="-127" /> + <di:waypoint xsi:type="dc:Point" x="1026" y="-127" /> <bpmndi:BPMNLabel> - <dc:Bounds x="420.94444444444446" y="-148" width="23" height="12" /> + <dc:Bounds x="696.8437500000002" y="-148" width="23" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1hp2h5t_di" bpmnElement="SequenceFlow_1hp2h5t"> @@ -252,36 +219,6 @@ dcsi.prepareUpdateProgress(execution)]]></bpmn:script> <dc:Bounds x="-75.5" y="108" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="CallActivity_0pyrfca_di" bpmnElement="CallActivity_0pyrfca"> - <dc:Bounds x="662" y="-167" width="100" height="80" /> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="SequenceFlow_0pkp4ce_di" bpmnElement="SequenceFlow_0pkp4ce"> - <di:waypoint xsi:type="dc:Point" x="762" y="-127" /> - <di:waypoint xsi:type="dc:Point" x="849" y="-127" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="760.5" y="-148" width="90" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="ScriptTask_02rli65_di" bpmnElement="ScriptTask_02rli65"> - <dc:Bounds x="480" y="-167" width="100" height="80" /> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="SequenceFlow_0pg3072_di" bpmnElement="SequenceFlow_0pg3072"> - <di:waypoint xsi:type="dc:Point" x="580" y="-127" /> - <di:waypoint xsi:type="dc:Point" x="662" y="-127" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="621" y="-148" width="0" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="ScriptTask_0u1piih_di" bpmnElement="ScriptTask_0u1piih"> - <dc:Bounds x="849" y="-167" width="100" height="80" /> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="SequenceFlow_1ylvnxq_di" bpmnElement="SequenceFlow_1ylvnxq"> - <di:waypoint xsi:type="dc:Point" x="949" y="-127" /> - <di:waypoint xsi:type="dc:Point" x="1026" y="-127" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="987.5" y="-148" width="0" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_0p4b5vu_di" bpmnElement="ScriptTask_0p4b5vu"> <dc:Bounds x="309" y="-290" width="100" height="80" /> </bpmndi:BPMNShape> diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVcpeResCustService_simplified.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVcpeResCustService_simplified.bpmn index 3b1c56628e..02b564e81f 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVcpeResCustService_simplified.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVcpeResCustService_simplified.bpmn @@ -315,7 +315,7 @@ CreateVcpeResCustService.postProcessRollback(execution)]]></bpmn2:script> <bpmn2:sequenceFlow id="SequenceFlow_0afe2pg" sourceRef="setPONR_ScriptTask" targetRef="postProcessAndCompletionRequest_ScriptTask" /> <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_0prlju0" name="GoTo StartService"> <bpmn2:incoming>SequenceFlow_11efpvh</bpmn2:incoming> - <bpmn2:linkEventDefinition name="CreateAllottedResourcesBRG" /> + <bpmn2:linkEventDefinition name="StartService" /> </bpmn2:intermediateThrowEvent> <bpmn2:callActivity id="DecomposeService" name="Call Decompose Service" calledElement="DecomposeService"> <bpmn2:extensionElements> @@ -339,9 +339,9 @@ CreateVcpeResCustService.prepareDecomposeService(execution)]]></bpmn2:script> <bpmn2:sequenceFlow id="SequenceFlow_1eu60rt" sourceRef="IntermediateCatchEvent_3" targetRef="ScriptTask_0cdtchu" /> <bpmn2:sequenceFlow id="SequenceFlow_00h6hmd" sourceRef="ScriptTask_0cdtchu" targetRef="DecomposeService" /> <bpmn2:sequenceFlow id="SequenceFlow_17g05fd" sourceRef="DecomposeService" targetRef="ScriptTask_0lpv2da" /> - <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_17pzn7m" name="CreateAllottedResourcesBRG"> + <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_17pzn7m" name="PnfCreateAndActivate"> <bpmn2:outgoing>SequenceFlow_0gj4vud</bpmn2:outgoing> - <bpmn2:linkEventDefinition name="CreateAllottedResourcesBRG" /> + <bpmn2:linkEventDefinition name="PnfCreateAndActivate" /> </bpmn2:intermediateCatchEvent> <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_0lt5ltv" name="GoToFinishProcess"> <bpmn2:incoming>SequenceFlow_0clhseq</bpmn2:incoming> @@ -366,25 +366,75 @@ CreateVcpeResCustService.processDecomposition(execution)]]></bpmn2:script> <bpmn2:incoming>SequenceFlow_0gj4vud</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_0clhseq</bpmn2:outgoing> </bpmn2:callActivity> + <bpmn2:callActivity id="CallActivity_1vc4jeh" name="Call Create ServiceInstance " calledElement="DoCreateServiceInstance"> + <bpmn2:extensionElements> + <camunda:in source="msoRequestId" target="msoRequestId" /> + <camunda:in source="globalSubscriberId" target="globalSubscriberId" /> + <camunda:in source="subscriptionServiceType" target="subscriptionServiceType" /> + <camunda:in source="serviceInstanceId" target="serviceInstanceId" /> + <camunda:out source="rollbackData" target="DCRESI_rollbackData" /> + <camunda:in source="serviceInstanceName" target="serviceInstanceName" /> + <camunda:in source="serviceModelInfo" target="serviceModelInfo" /> + <camunda:in source="failIfExists" target="failIfExists" /> + <camunda:in source="disableRollback" target="disableRollback" /> + <camunda:in source="serviceInputParams" target="serviceInputParams" /> + <camunda:out source="rolledBack" target="rolledBack" /> + <camunda:out source="WorkflowException" target="WorkflowException" /> + <camunda:out source="serviceInstanceName" target="serviceInstanceName" /> + <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" /> + <camunda:in source="subscriptionServiceType" target="subscriptionServiceType" /> + <camunda:in source="productFamilyId" target="productFamilyId" /> + <camunda:in source="sdncVersion" target="sdncVersion" /> + <camunda:in source="bpmnRequest" target="requestJson" /> + </bpmn2:extensionElements> + <bpmn2:incoming>SequenceFlow_0bt420h</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_0ocy2qp</bpmn2:outgoing> + </bpmn2:callActivity> + <bpmn2:scriptTask id="ScriptTask_1y241p8" name="Prepare Create Service " scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_1429lyc</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_0bt420h</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.onap.so.bpmn.vcpe.scripts.* +def CreateVcpeResCustService = new CreateVcpeResCustService() +CreateVcpeResCustService.prepareCreateServiceInstance(execution)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:scriptTask id="ScriptTask_1y5lvl7" name="Post Process Create Service " scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_0ocy2qp</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_11gw54u</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.onap.so.bpmn.vcpe.scripts.* +def CreateVcpeResCustService = new CreateVcpeResCustService() +CreateVcpeResCustService.postProcessServiceInstanceCreate(execution)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_0m5yuay" name="StartService"> + <bpmn2:outgoing>SequenceFlow_1429lyc</bpmn2:outgoing> + <bpmn2:linkEventDefinition name="StartService" /> + </bpmn2:intermediateCatchEvent> + <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_13xv36r" name="Go To PnfCreateAndActivate"> + <bpmn2:incoming>SequenceFlow_11gw54u</bpmn2:incoming> + <bpmn2:linkEventDefinition name="PnfCreateAndActivate" /> + </bpmn2:intermediateThrowEvent> + <bpmn2:sequenceFlow id="SequenceFlow_0bt420h" sourceRef="ScriptTask_1y241p8" targetRef="CallActivity_1vc4jeh" /> + <bpmn2:sequenceFlow id="SequenceFlow_0ocy2qp" sourceRef="CallActivity_1vc4jeh" targetRef="ScriptTask_1y5lvl7" /> + <bpmn2:sequenceFlow id="SequenceFlow_1429lyc" sourceRef="IntermediateCatchEvent_0m5yuay" targetRef="ScriptTask_1y241p8" /> + <bpmn2:sequenceFlow id="SequenceFlow_11gw54u" sourceRef="ScriptTask_1y5lvl7" targetRef="IntermediateThrowEvent_13xv36r" /> </bpmn2:process> <bpmn2:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" /> <bpmn2:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" /> <bpmndi:BPMNDiagram id="BPMNDiagram_1"> <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="CreateVcpeResCustService_simplified"> <bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="createVCPE_startEvent"> - <dc:Bounds x="67" y="920" width="36" height="36" /> + <dc:Bounds x="67" y="811" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="61" y="961" width="50" height="12" /> + <dc:Bounds x="61" y="852" width="50" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_61" bpmnElement="preProcessRequest_ScriptTask"> - <dc:Bounds x="256" y="898" width="100" height="80" /> + <dc:Bounds x="256" y="789" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_47" targetElement="_BPMNShape_ScriptTask_61"> - <di:waypoint xsi:type="dc:Point" x="103" y="938" /> - <di:waypoint xsi:type="dc:Point" x="256" y="938" /> + <di:waypoint xsi:type="dc:Point" x="103" y="829" /> + <di:waypoint xsi:type="dc:Point" x="256" y="829" /> <bpmndi:BPMNLabel> - <dc:Bounds x="100" y="938" width="90" height="0" /> + <dc:Bounds x="100" y="829" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_CallActivity_4" bpmnElement="callCompleteMsoProcess_CallActivity"> @@ -394,14 +444,14 @@ CreateVcpeResCustService.processDecomposition(execution)]]></bpmn2:script> <dc:Bounds x="490" y="1432" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ScriptTask_61" targetElement="_BPMNShape_ScriptTask_127"> - <di:waypoint xsi:type="dc:Point" x="356" y="938" /> - <di:waypoint xsi:type="dc:Point" x="447" y="938" /> + <di:waypoint xsi:type="dc:Point" x="356" y="829" /> + <di:waypoint xsi:type="dc:Point" x="447" y="829" /> <bpmndi:BPMNLabel> - <dc:Bounds x="200" y="899" width="90" height="0" /> + <dc:Bounds x="200" y="790" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_127" bpmnElement="sendSyncAckResponse_ScriptTask"> - <dc:Bounds x="447" y="898" width="100" height="80" /> + <dc:Bounds x="447" y="789" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_42" bpmnElement="SequenceFlow_29" sourceElement="_BPMNShape_ScriptTask_80" targetElement="_BPMNShape_CallActivity_4"> <di:waypoint xsi:type="dc:Point" x="590" y="1472" /> @@ -458,10 +508,10 @@ CreateVcpeResCustService.processDecomposition(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_ScriptTask_127"> - <di:waypoint xsi:type="dc:Point" x="547" y="938" /> - <di:waypoint xsi:type="dc:Point" x="699" y="938" /> + <di:waypoint xsi:type="dc:Point" x="547" y="829" /> + <di:waypoint xsi:type="dc:Point" x="699" y="829" /> <bpmndi:BPMNLabel> - <dc:Bounds x="578" y="923" width="90" height="0" /> + <dc:Bounds x="578" y="814" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_337" bpmnElement="ScriptTask_2"> @@ -475,9 +525,9 @@ CreateVcpeResCustService.processDecomposition(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_IntermediateCatchEvent_35" bpmnElement="IntermediateCatchEvent_3"> - <dc:Bounds x="67" y="1075" width="36" height="36" /> + <dc:Bounds x="67" y="966" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="43" y="1111" width="85" height="12" /> + <dc:Bounds x="43" y="1002" width="85" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_IntermediateCatchEvent_36" bpmnElement="IntermediateCatchEvent_4"> @@ -487,9 +537,9 @@ CreateVcpeResCustService.processDecomposition(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_IntermediateThrowEvent_49" bpmnElement="IntermediateThrowEvent_2"> - <dc:Bounds x="699" y="920" width="36" height="36" /> + <dc:Bounds x="699" y="811" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="687" y="961" width="59" height="24" /> + <dc:Bounds x="687" y="852" width="59" height="24" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="SubProcess_0s6hpty_di" bpmnElement="SubProcess_0s6hpty" isExpanded="true"> @@ -628,9 +678,9 @@ CreateVcpeResCustService.processDecomposition(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="IntermediateThrowEvent_0prlju0_di" bpmnElement="IntermediateThrowEvent_0prlju0"> - <dc:Bounds x="1036" y="1075" width="36" height="36" /> + <dc:Bounds x="902" y="966" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1009" y="1116" width="90" height="12" /> + <dc:Bounds x="875" y="1007" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ExclusiveGateway_05indeh_di" bpmnElement="ExclusiveGateway_05indeh" isMarkerVisible="true"> @@ -676,23 +726,23 @@ CreateVcpeResCustService.processDecomposition(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="CallActivity_0w2alah_di" bpmnElement="DecomposeService"> - <dc:Bounds x="447" y="1053" width="100" height="80" /> + <dc:Bounds x="447" y="944" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_0cdtchu_di" bpmnElement="ScriptTask_0cdtchu"> - <dc:Bounds x="256" y="1053" width="100" height="80" /> + <dc:Bounds x="256" y="944" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1eu60rt_di" bpmnElement="SequenceFlow_1eu60rt"> - <di:waypoint xsi:type="dc:Point" x="103" y="1093" /> - <di:waypoint xsi:type="dc:Point" x="256" y="1093" /> + <di:waypoint xsi:type="dc:Point" x="103" y="984" /> + <di:waypoint xsi:type="dc:Point" x="256" y="984" /> <bpmndi:BPMNLabel> - <dc:Bounds x="135" y="1078" width="90" height="0" /> + <dc:Bounds x="135" y="969" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_00h6hmd_di" bpmnElement="SequenceFlow_00h6hmd"> - <di:waypoint xsi:type="dc:Point" x="356" y="1093" /> - <di:waypoint xsi:type="dc:Point" x="447" y="1093" /> + <di:waypoint xsi:type="dc:Point" x="356" y="984" /> + <di:waypoint xsi:type="dc:Point" x="447" y="984" /> <bpmndi:BPMNLabel> - <dc:Bounds x="357" y="1078" width="90" height="0" /> + <dc:Bounds x="357" y="969" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ExclusiveGateway_06gq6em_di" bpmnElement="ExclusiveGateway_06gq6em" isMarkerVisible="true"> @@ -795,10 +845,10 @@ CreateVcpeResCustService.processDecomposition(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_17g05fd_di" bpmnElement="SequenceFlow_17g05fd"> - <di:waypoint xsi:type="dc:Point" x="547" y="1093" /> - <di:waypoint xsi:type="dc:Point" x="638" y="1093" /> + <di:waypoint xsi:type="dc:Point" x="547" y="984" /> + <di:waypoint xsi:type="dc:Point" x="638" y="984" /> <bpmndi:BPMNLabel> - <dc:Bounds x="548" y="1078" width="90" height="0" /> + <dc:Bounds x="548" y="969" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ExclusiveGateway_0y7gtd9_di" bpmnElement="ExclusiveGateway_0y7gtd9" isMarkerVisible="true"> @@ -867,15 +917,15 @@ CreateVcpeResCustService.processDecomposition(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="IntermediateCatchEvent_17pzn7m_di" bpmnElement="IntermediateCatchEvent_17pzn7m"> - <dc:Bounds x="83" y="1259" width="36" height="36" /> + <dc:Bounds x="67" y="1259" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="58" y="1295" width="78" height="24" /> + <dc:Bounds x="42" y="1295" width="88" height="24" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="IntermediateThrowEvent_0lt5ltv_di" bpmnElement="IntermediateThrowEvent_0lt5ltv"> - <dc:Bounds x="670" y="1259" width="36" height="36" /> + <dc:Bounds x="466" y="1259" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="645" y="1306" width="85" height="24" /> + <dc:Bounds x="441" y="1306" width="85" height="24" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="CallActivity_071yaf8_di" bpmnElement="CallActivity_071yaf8"> @@ -944,32 +994,81 @@ CreateVcpeResCustService.processDecomposition(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_0lpv2da_di" bpmnElement="ScriptTask_0lpv2da"> - <dc:Bounds x="638" y="1053" width="100" height="80" /> + <dc:Bounds x="638" y="944" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_11efpvh_di" bpmnElement="SequenceFlow_11efpvh"> - <di:waypoint xsi:type="dc:Point" x="738" y="1093" /> - <di:waypoint xsi:type="dc:Point" x="1036" y="1093" /> + <di:waypoint xsi:type="dc:Point" x="738" y="984" /> + <di:waypoint xsi:type="dc:Point" x="902" y="984" /> <bpmndi:BPMNLabel> - <dc:Bounds x="842" y="1072" width="90" height="12" /> + <dc:Bounds x="775" y="963" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0gj4vud_di" bpmnElement="SequenceFlow_0gj4vud"> - <di:waypoint xsi:type="dc:Point" x="119" y="1277" /> - <di:waypoint xsi:type="dc:Point" x="345" y="1277" /> + <di:waypoint xsi:type="dc:Point" x="103" y="1277" /> + <di:waypoint xsi:type="dc:Point" x="256" y="1277" /> <bpmndi:BPMNLabel> - <dc:Bounds x="187" y="1257" width="90" height="10" /> + <dc:Bounds x="134.5" y="1257" width="90" height="10" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0clhseq_di" bpmnElement="SequenceFlow_0clhseq"> - <di:waypoint xsi:type="dc:Point" x="445" y="1277" /> - <di:waypoint xsi:type="dc:Point" x="670" y="1277" /> + <di:waypoint xsi:type="dc:Point" x="356" y="1277" /> + <di:waypoint xsi:type="dc:Point" x="466" y="1277" /> <bpmndi:BPMNLabel> - <dc:Bounds x="513" y="1257" width="90" height="10" /> + <dc:Bounds x="366" y="1257" width="90" height="10" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="CallActivity_1totpg4_di" bpmnElement="Task_14l19kv"> - <dc:Bounds x="345" y="1237" width="100" height="80" /> + <dc:Bounds x="256" y="1237" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="CallActivity_1vc4jeh_di" bpmnElement="CallActivity_1vc4jeh"> + <dc:Bounds x="447" y="1072" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ScriptTask_1y241p8_di" bpmnElement="ScriptTask_1y241p8"> + <dc:Bounds x="256" y="1072" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ScriptTask_1y5lvl7_di" bpmnElement="ScriptTask_1y5lvl7"> + <dc:Bounds x="638" y="1072" width="100" height="80" /> </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="IntermediateCatchEvent_0m5yuay_di" bpmnElement="IntermediateCatchEvent_0m5yuay"> + <dc:Bounds x="65" y="1094" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="53" y="1130" width="60" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="IntermediateThrowEvent_13xv36r_di" bpmnElement="IntermediateThrowEvent_13xv36r"> + <dc:Bounds x="902" y="1094" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="877" y="1135" width="88" height="36" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_0bt420h_di" bpmnElement="SequenceFlow_0bt420h"> + <di:waypoint xsi:type="dc:Point" x="356" y="1112" /> + <di:waypoint xsi:type="dc:Point" x="447" y="1112" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="356.5" y="1091" width="90" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_0ocy2qp_di" bpmnElement="SequenceFlow_0ocy2qp"> + <di:waypoint xsi:type="dc:Point" x="547" y="1112" /> + <di:waypoint xsi:type="dc:Point" x="638" y="1112" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="547.5" y="1091" width="90" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1429lyc_di" bpmnElement="SequenceFlow_1429lyc"> + <di:waypoint xsi:type="dc:Point" x="101" y="1112" /> + <di:waypoint xsi:type="dc:Point" x="256" y="1112" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="133.5" y="1091" width="90" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_11gw54u_di" bpmnElement="SequenceFlow_11gw54u"> + <di:waypoint xsi:type="dc:Point" x="738" y="1112" /> + <di:waypoint xsi:type="dc:Point" x="902" y="1112" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="775" y="1091" width="90" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> </bpmndi:BPMNPlane> </bpmndi:BPMNDiagram> </bpmn2:definitions> diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/DeleteDeviceResource.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/DeleteDeviceResource.bpmn index f0baac0254..73d38b383c 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/DeleteDeviceResource.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/DeleteDeviceResource.bpmn @@ -33,7 +33,7 @@ csi.sendSyncResponse(execution)]]></bpmn:script> <bpmn:outgoing>SequenceFlow_1rwaeun</bpmn:outgoing> </bpmn:startEvent> <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_1caax8u" name="GoTo StartDeleteDevinSDNC"> - <bpmn:incoming>SequenceFlow_1ylvnxq</bpmn:incoming> + <bpmn:incoming>SequenceFlow_1ss02ik</bpmn:incoming> <bpmn:linkEventDefinition name="StartDeleteDevinSDNC" /> </bpmn:intermediateThrowEvent> <bpmn:scriptTask id="ScriptTask_00y93jj" name="Check DevType from AAI" scriptFormat="groovy"> @@ -53,7 +53,7 @@ dcsi.checkDevType(execution)]]></bpmn:script> <bpmn:incoming>SequenceFlow_0h4378g</bpmn:incoming> <bpmn:linkEventDefinition name="StartDeleteDevinSDNC" /> </bpmn:intermediateThrowEvent> - <bpmn:sequenceFlow id="SequenceFlow_1ss02ik" name="VNF" sourceRef="ExclusiveGateway_0kba700" targetRef="ScriptTask_02rli65"> + <bpmn:sequenceFlow id="SequenceFlow_1ss02ik" name="VNF" sourceRef="ExclusiveGateway_0kba700" targetRef="IntermediateThrowEvent_1caax8u"> <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{(execution.getVariable("device_class" ) == "VNF" )}]]></bpmn:conditionExpression> </bpmn:sequenceFlow> <bpmn:sequenceFlow id="SequenceFlow_1hp2h5t" sourceRef="ScriptTask_00y93jj" targetRef="ExclusiveGateway_0kba700" /> @@ -74,39 +74,6 @@ dcsi.preProcessRequest(execution)]]></bpmn:script> <bpmn:linkEventDefinition name="StartDeleteDevinSDNC" /> </bpmn:intermediateCatchEvent> <bpmn:sequenceFlow id="SequenceFlow_1gu13by" sourceRef="IntermediateCatchEvent_0slgrxw" targetRef="Task_0bga3e8" /> - <bpmn:callActivity id="CallActivity_0pyrfca" name="call DeleteVNF" calledElement="DoDeleteVNF"> - <bpmn:extensionElements> - <camunda:in source="mso-request-id" target="mso-request-id" /> - <camunda:in source="requestAction" target="requestAction" /> - <camunda:in source="recipeParams" target="recipeParams" /> - <camunda:in source="resourceInput" target="resourceInput" /> - <camunda:in source="recipeParamXsd" target="recipeParamXsd" /> - <camunda:in source="operationId" target="operationId" /> - <camunda:in source="svcAction" target="svcAction" /> - <camunda:in source="requestAction" target="requestAction" /> - <camunda:in source="URN_mso_workflow_sdncadapter_callback" target="URN_mso_workflow_sdncadapter_callback" /> - <camunda:in source="networkRequest" target="networkRequest" /> - </bpmn:extensionElements> - <bpmn:incoming>SequenceFlow_0pg3072</bpmn:incoming> - <bpmn:outgoing>SequenceFlow_0pkp4ce</bpmn:outgoing> - </bpmn:callActivity> - <bpmn:sequenceFlow id="SequenceFlow_0pkp4ce" sourceRef="CallActivity_0pyrfca" targetRef="ScriptTask_0u1piih" /> - <bpmn:scriptTask id="ScriptTask_02rli65" name="Get VNF ID" scriptFormat="groovy"> - <bpmn:incoming>SequenceFlow_1ss02ik</bpmn:incoming> - <bpmn:outgoing>SequenceFlow_0pg3072</bpmn:outgoing> - <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.* -def dcsi = new DeleteDeviceResource() -dcsi.getVNFTemplatefromSDC(execution)]]></bpmn:script> - </bpmn:scriptTask> - <bpmn:sequenceFlow id="SequenceFlow_0pg3072" sourceRef="ScriptTask_02rli65" targetRef="CallActivity_0pyrfca" /> - <bpmn:scriptTask id="ScriptTask_0u1piih" name="Post VNF info process " scriptFormat="groovy"> - <bpmn:incoming>SequenceFlow_0pkp4ce</bpmn:incoming> - <bpmn:outgoing>SequenceFlow_1ylvnxq</bpmn:outgoing> - <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.* -def dcsi = new DeleteDeviceResource() -dcsi.postVNFInfoProcess(execution)]]></bpmn:script> - </bpmn:scriptTask> - <bpmn:sequenceFlow id="SequenceFlow_1ylvnxq" sourceRef="ScriptTask_0u1piih" targetRef="IntermediateThrowEvent_1caax8u" /> <bpmn:scriptTask id="ScriptTask_14oc86m" name="Prepare Create resource progress" scriptFormat="groovy"> <bpmn:incoming>SequenceFlow_1g6azih</bpmn:incoming> <bpmn:outgoing>SequenceFlow_003svcq</bpmn:outgoing> @@ -203,9 +170,9 @@ dcsi.prepareUpdateProgress(execution)]]></bpmn:script> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1ss02ik_di" bpmnElement="SequenceFlow_1ss02ik"> <di:waypoint xsi:type="dc:Point" x="384" y="-127" /> - <di:waypoint xsi:type="dc:Point" x="480" y="-127" /> + <di:waypoint xsi:type="dc:Point" x="1026" y="-127" /> <bpmndi:BPMNLabel> - <dc:Bounds x="420.94444444444446" y="-148" width="23" height="12" /> + <dc:Bounds x="696.8437500000002" y="-148" width="23" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1hp2h5t_di" bpmnElement="SequenceFlow_1hp2h5t"> @@ -252,36 +219,6 @@ dcsi.prepareUpdateProgress(execution)]]></bpmn:script> <dc:Bounds x="-75.5" y="108" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="CallActivity_0pyrfca_di" bpmnElement="CallActivity_0pyrfca"> - <dc:Bounds x="662" y="-167" width="100" height="80" /> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="SequenceFlow_0pkp4ce_di" bpmnElement="SequenceFlow_0pkp4ce"> - <di:waypoint xsi:type="dc:Point" x="762" y="-127" /> - <di:waypoint xsi:type="dc:Point" x="849" y="-127" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="760.5" y="-148" width="90" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="ScriptTask_02rli65_di" bpmnElement="ScriptTask_02rli65"> - <dc:Bounds x="480" y="-167" width="100" height="80" /> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="SequenceFlow_0pg3072_di" bpmnElement="SequenceFlow_0pg3072"> - <di:waypoint xsi:type="dc:Point" x="580" y="-127" /> - <di:waypoint xsi:type="dc:Point" x="662" y="-127" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="621" y="-148" width="0" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="ScriptTask_0u1piih_di" bpmnElement="ScriptTask_0u1piih"> - <dc:Bounds x="849" y="-167" width="100" height="80" /> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="SequenceFlow_1ylvnxq_di" bpmnElement="SequenceFlow_1ylvnxq"> - <di:waypoint xsi:type="dc:Point" x="949" y="-127" /> - <di:waypoint xsi:type="dc:Point" x="1026" y="-127" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="987.5" y="-148" width="0" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_14oc86m_di" bpmnElement="ScriptTask_14oc86m"> <dc:Bounds x="309" y="-281" width="100" height="80" /> </bpmndi:BPMNShape> diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteE2EServiceInstance.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteE2EServiceInstance.bpmn index a975ebdee0..17f6c66e4a 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteE2EServiceInstance.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteE2EServiceInstance.bpmn @@ -1,5 +1,5 @@ <?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.10.0"> +<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.11.3"> <bpmn:process id="DoDeleteE2EServiceInstance" name="All Resources Deleted" isExecutable="true"> <bpmn:startEvent id="StartEvent_0212h2r" name="Start Flow"> <bpmn:outgoing>SequenceFlow_0vz7cd9</bpmn:outgoing> @@ -24,6 +24,7 @@ ddsi.postProcessAAIGET(execution)]]></bpmn:script> </bpmn:scriptTask> <bpmn:scriptTask id="ScriptTask_01erufg" name=" AAI Delete (svc instance) " scriptFormat="groovy"> <bpmn:incoming>SequenceFlow_1cevtpy</bpmn:incoming> + <bpmn:incoming>SequenceFlow_12rr1yy</bpmn:incoming> <bpmn:outgoing>SequenceFlow_0e7inkl</bpmn:outgoing> <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.* def ddsi = new DoCustomDeleteE2EServiceInstance() @@ -99,11 +100,6 @@ ddsi.preInitResourcesOperStatus(execution)]]></bpmn:script> <bpmn:sequenceFlow id="SequenceFlow_1j08ko3" sourceRef="ServiceTask_00tg69u" targetRef="Task_1f5dlsv" /> <bpmn:sequenceFlow id="SequenceFlow_0fo5vw5" sourceRef="Task_1ldvug1" targetRef="Task_0mhdfuu" /> <bpmn:sequenceFlow id="SequenceFlow_0orw2f8" sourceRef="Task_0mhdfuu" targetRef="Task_1yx1n05" /> - <bpmn:sequenceFlow id="SequenceFlow_0ha8ix9" sourceRef="Task_1yx1n05" targetRef="IntermediateThrowEvent_0ve5ukt" /> - <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_0ve5ukt" name="Go to Delete Resources"> - <bpmn:incoming>SequenceFlow_0ha8ix9</bpmn:incoming> - <bpmn:linkEventDefinition name="StartDeleteResource" /> - </bpmn:intermediateThrowEvent> <bpmn:intermediateCatchEvent id="startDeleteResources" name="Start Delete Resources"> <bpmn:outgoing>SequenceFlow_1961633</bpmn:outgoing> <bpmn:linkEventDefinition name="StartDeleteResource" /> @@ -133,7 +129,7 @@ dcsi.prepareDecomposeService(execution)]]></bpmn:script> </bpmn:callActivity> <bpmn:scriptTask id="Task_1yx1n05" name="Post Decompose Service" scriptFormat="groovy"> <bpmn:incoming>SequenceFlow_0orw2f8</bpmn:incoming> - <bpmn:outgoing>SequenceFlow_0ha8ix9</bpmn:outgoing> + <bpmn:outgoing>SequenceFlow_013rime</bpmn:outgoing> <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.* def dcsi= new DoDeleteE2EServiceInstance() dcsi.postDecomposeService(execution)]]></bpmn:script> @@ -167,6 +163,63 @@ dcsi.postDecomposeService(execution)]]></bpmn:script> <bpmn:linkEventDefinition name="DecomposeService" /> </bpmn:intermediateThrowEvent> <bpmn:sequenceFlow id="SequenceFlow_0vi0sv6" sourceRef="ScriptTask_1rtnsh8" targetRef="StartEvent_1qh5a34" /> + <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_00pyc0n" name="Start Delete Resources"> + <bpmn:incoming>SequenceFlow_1fozgqz</bpmn:incoming> + <bpmn:linkEventDefinition name="StartDeleteResource" /> + </bpmn:intermediateThrowEvent> + <bpmn:exclusiveGateway id="ExclusiveGateway_156mc3h" name="Valid Resource List?" default="SequenceFlow_1ncja2b"> + <bpmn:incoming>SequenceFlow_013rime</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_1fozgqz</bpmn:outgoing> + <bpmn:outgoing>SequenceFlow_1ncja2b</bpmn:outgoing> + </bpmn:exclusiveGateway> + <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_1g4uc66" name="End Delete Process"> + <bpmn:incoming>SequenceFlow_1ncja2b</bpmn:incoming> + <bpmn:linkEventDefinition name="EndDeleteProcess" /> + </bpmn:intermediateThrowEvent> + <bpmn:sequenceFlow id="SequenceFlow_1fozgqz" name="Yes" sourceRef="ExclusiveGateway_156mc3h" targetRef="IntermediateThrowEvent_00pyc0n"> + <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{(execution.getVariable("isDeleteResourceListValid" ) == true)}]]></bpmn:conditionExpression> + </bpmn:sequenceFlow> + <bpmn:sequenceFlow id="SequenceFlow_1ncja2b" sourceRef="ExclusiveGateway_156mc3h" targetRef="IntermediateThrowEvent_1g4uc66" /> + <bpmn:sequenceFlow id="SequenceFlow_013rime" sourceRef="Task_1yx1n05" targetRef="ExclusiveGateway_156mc3h" /> + <bpmn:serviceTask id="ServiceTask_1lsic7i" name="Update Service Operation Status"> + <bpmn:extensionElements> + <camunda:connector> + <camunda:inputOutput> + <camunda:inputParameter name="url">${CVFMI_dbAdapterEndpoint}</camunda:inputParameter> + <camunda:inputParameter name="headers"> + <camunda:map> + <camunda:entry key="content-type">application/soap+xml</camunda:entry> + <camunda:entry key="Authorization">Basic QlBFTENsaWVudDpwYXNzd29yZDEk</camunda:entry> + </camunda:map> + </camunda:inputParameter> + <camunda:inputParameter name="payload">${CVFMI_updateServiceOperStatusRequest}</camunda:inputParameter> + <camunda:inputParameter name="method">POST</camunda:inputParameter> + <camunda:outputParameter name="CVFMI_dbResponseCode">${statusCode}</camunda:outputParameter> + <camunda:outputParameter name="CVFMI_dbResponse">${response}</camunda:outputParameter> + </camunda:inputOutput> + <camunda:connectorId>http-connector</camunda:connectorId> + </camunda:connector> + </bpmn:extensionElements> + <bpmn:incoming>SequenceFlow_1ab3vex</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_12rr1yy</bpmn:outgoing> + </bpmn:serviceTask> + <bpmn:scriptTask id="ScriptTask_0f3tjbn" name="prepare update service operation status" scriptFormat="groovy"> + <bpmn:incoming>SequenceFlow_0h5c1bd</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_1ab3vex</bpmn:outgoing> + <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.* +execution.setVariable("progress", "100") +execution.setVariable("result", "finished") +execution.setVariable("operationContent", "No actual resoure in service instance") +def csi= new DoDeleteE2EServiceInstance() +csi.prepareUpdateServiceOperationStatus(execution)]]></bpmn:script> + </bpmn:scriptTask> + <bpmn:intermediateCatchEvent id="IntermediateCatchEvent_0hrkmxb" name="End Delete Process"> + <bpmn:outgoing>SequenceFlow_0h5c1bd</bpmn:outgoing> + <bpmn:linkEventDefinition name="EndDeleteProcess" /> + </bpmn:intermediateCatchEvent> + <bpmn:sequenceFlow id="SequenceFlow_1ab3vex" sourceRef="ScriptTask_0f3tjbn" targetRef="ServiceTask_1lsic7i" /> + <bpmn:sequenceFlow id="SequenceFlow_0h5c1bd" sourceRef="IntermediateCatchEvent_0hrkmxb" targetRef="ScriptTask_0f3tjbn" /> + <bpmn:sequenceFlow id="SequenceFlow_12rr1yy" sourceRef="ServiceTask_1lsic7i" targetRef="ScriptTask_01erufg" /> </bpmn:process> <bpmndi:BPMNDiagram id="BPMNDiagram_1"> <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoDeleteE2EServiceInstance"> @@ -192,7 +245,7 @@ dcsi.postDecomposeService(execution)]]></bpmn:script> <dc:Bounds x="254" y="450" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="SubProcess_1u8zt9i_di" bpmnElement="SubProcess_1u8zt9i" isExpanded="true"> - <dc:Bounds x="-166" y="672" width="467" height="193" /> + <dc:Bounds x="-161" y="980" width="467" height="193" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0vz7cd9_di" bpmnElement="SequenceFlow_0vz7cd9"> <di:waypoint xsi:type="dc:Point" x="-501" y="-33" /> @@ -220,32 +273,32 @@ dcsi.postDecomposeService(execution)]]></bpmn:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="StartEvent_0sf5lpt_di" bpmnElement="StartEvent_0sf5lpt"> - <dc:Bounds x="-98" y="739" width="36" height="36" /> + <dc:Bounds x="-93" y="1047" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="-170" y="780" width="90" height="12" /> + <dc:Bounds x="-165" y="1088" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="EndEvent_06utmg4_di" bpmnElement="EndEvent_06utmg4"> - <dc:Bounds x="195" y="739" width="36" height="36" /> + <dc:Bounds x="200" y="1047" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="123" y="780" width="90" height="12" /> + <dc:Bounds x="128" y="1088" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_0nha3pr_di" bpmnElement="ScriptTask_0nha3pr"> - <dc:Bounds x="6" y="717" width="100" height="80" /> + <dc:Bounds x="11" y="1025" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1921mo3_di" bpmnElement="SequenceFlow_1921mo3"> - <di:waypoint xsi:type="dc:Point" x="-62" y="757" /> - <di:waypoint xsi:type="dc:Point" x="6" y="757" /> + <di:waypoint xsi:type="dc:Point" x="-57" y="1065" /> + <di:waypoint xsi:type="dc:Point" x="11" y="1065" /> <bpmndi:BPMNLabel> - <dc:Bounds x="-118" y="742" width="90" height="12" /> + <dc:Bounds x="-113" y="1050" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_18vlzfo_di" bpmnElement="SequenceFlow_18vlzfo"> - <di:waypoint xsi:type="dc:Point" x="106" y="757" /> - <di:waypoint xsi:type="dc:Point" x="195" y="757" /> + <di:waypoint xsi:type="dc:Point" x="111" y="1065" /> + <di:waypoint xsi:type="dc:Point" x="200" y="1065" /> <bpmndi:BPMNLabel> - <dc:Bounds x="62" y="742" width="90" height="12" /> + <dc:Bounds x="67" y="1050" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_146jt8v_di" bpmnElement="ScriptTask_146jt8v"> @@ -298,21 +351,6 @@ dcsi.postDecomposeService(execution)]]></bpmn:script> <dc:Bounds x="-79" y="192" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="SequenceFlow_0ha8ix9_di" bpmnElement="SequenceFlow_0ha8ix9"> - <di:waypoint xsi:type="dc:Point" x="147" y="198" /> - <di:waypoint xsi:type="dc:Point" x="181" y="198" /> - <di:waypoint xsi:type="dc:Point" x="181" y="198" /> - <di:waypoint xsi:type="dc:Point" x="246" y="198" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="151" y="192" width="90" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="IntermediateThrowEvent_15myvzx_di" bpmnElement="IntermediateThrowEvent_0ve5ukt"> - <dc:Bounds x="246" y="180" width="36" height="36" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="233" y="220" width="64" height="24" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> <bpmndi:BPMNShape id="IntermediateCatchEvent_1jcfnjr_di" bpmnElement="startDeleteResources"> <dc:Bounds x="-537" y="472" width="36" height="36" /> <bpmndi:BPMNLabel> @@ -373,6 +411,80 @@ dcsi.postDecomposeService(execution)]]></bpmn:script> <dc:Bounds x="-16" y="-39" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="IntermediateThrowEvent_00pyc0n_di" bpmnElement="IntermediateThrowEvent_00pyc0n"> + <dc:Bounds x="398" y="180" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="389" y="220" width="57" height="24" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ExclusiveGateway_156mc3h_di" bpmnElement="ExclusiveGateway_156mc3h" isMarkerVisible="true"> + <dc:Bounds x="279" y="173" width="50" height="50" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="266" y="145" width="75" height="24" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="IntermediateThrowEvent_1g4uc66_di" bpmnElement="IntermediateThrowEvent_1g4uc66"> + <dc:Bounds x="286" y="270" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="279" y="308" width="53" height="24" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1fozgqz_di" bpmnElement="SequenceFlow_1fozgqz"> + <di:waypoint xsi:type="dc:Point" x="329" y="198" /> + <di:waypoint xsi:type="dc:Point" x="398" y="198" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="356.5" y="176" width="19" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1ncja2b_di" bpmnElement="SequenceFlow_1ncja2b"> + <di:waypoint xsi:type="dc:Point" x="304" y="223" /> + <di:waypoint xsi:type="dc:Point" x="304" y="270" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="274" y="240.5" width="0" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_013rime_di" bpmnElement="SequenceFlow_013rime"> + <di:waypoint xsi:type="dc:Point" x="147" y="198" /> + <di:waypoint xsi:type="dc:Point" x="279" y="198" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="213" y="177" width="0" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="ServiceTask_1lsic7i_di" bpmnElement="ServiceTask_1lsic7i"> + <dc:Bounds x="-121" y="697" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ScriptTask_0f3tjbn_di" bpmnElement="ScriptTask_0f3tjbn"> + <dc:Bounds x="-399" y="697" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="IntermediateCatchEvent_0hrkmxb_di" bpmnElement="IntermediateCatchEvent_0hrkmxb"> + <dc:Bounds x="-531" y="719" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="-539" y="759" width="53" height="24" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1ab3vex_di" bpmnElement="SequenceFlow_1ab3vex"> + <di:waypoint xsi:type="dc:Point" x="-299" y="737" /> + <di:waypoint xsi:type="dc:Point" x="-121" y="737" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="-255" y="715" width="0" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_0h5c1bd_di" bpmnElement="SequenceFlow_0h5c1bd"> + <di:waypoint xsi:type="dc:Point" x="-495" y="737" /> + <di:waypoint xsi:type="dc:Point" x="-399" y="737" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="-492" y="715" width="0" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_12rr1yy_di" bpmnElement="SequenceFlow_12rr1yy"> + <di:waypoint xsi:type="dc:Point" x="-21" y="737" /> + <di:waypoint xsi:type="dc:Point" x="117" y="737" /> + <di:waypoint xsi:type="dc:Point" x="117" y="490" /> + <di:waypoint xsi:type="dc:Point" x="254" y="490" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="132" y="607.5" width="0" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> </bpmndi:BPMNPlane> </bpmndi:BPMNDiagram> -</bpmn:definitions>
\ No newline at end of file +</bpmn:definitions> |