PNF WF post instantiation configuration

Add PNF ipv4/v6 address for config Deploy
Add Integration test for CreateVcpeResCustService_simplified.bpmn
Modify the PnfEventReadyDmaapClient to avoid one more running thread
Refactor the so-bpmn-infrastructure-flows test resources
Modify the CreateVcpeResCustService_simplified.bpmn
Add ConfigurePnfResource.bpmn
Add Delegates

Issue-ID: SO-1506
Change-Id: Iffb69d1441ef0b485ee8cd3fb5da5f1a35279a95
Signed-off-by: eeginux <henry.xie@est.tech>

2 files changed, 259 insertions, 44 deletions

diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/ConfigurePnfResource.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/ConfigurePnfResource.bpmn
new file mode 100644
index 0000000000..f489a27052
--- /dev/null
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/ConfigurePnfResource.bpmn
@@ -0,0 +1,198 @@
+<?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_13i2vsn" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="2.2.4">
+  <bpmn:process id="ConfigurePnfResource" name="ConfigurePnfResource" isExecutable="true">
+    <bpmn:startEvent id="ConfigurePnfResource_StartEvent">
+      <bpmn:outgoing>SequenceFlow_069mxkg</bpmn:outgoing>
+    </bpmn:startEvent>
+    <bpmn:exclusiveGateway id="ExclusiveGateway_079gavg" name="SkipPostInstantiationConfiguration">
+      <bpmn:incoming>SequenceFlow_1u89rk8</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_157of54</bpmn:outgoing>
+      <bpmn:outgoing>SequenceFlow_0j3pm2g</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:endEvent id="EndEvent_0xky46v">
+      <bpmn:incoming>SequenceFlow_157of54</bpmn:incoming>
+      <bpmn:incoming>SequenceFlow_1n080up</bpmn:incoming>
+    </bpmn:endEvent>
+    <bpmn:sequenceFlow id="SequenceFlow_157of54" name="true" sourceRef="ExclusiveGateway_079gavg" targetRef="EndEvent_0xky46v">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">#{SkipPostInstantiationConfiguration}</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:serviceTask id="Task_0k2q5vd" name="Prepare Config Assign" camunda:delegateExpression="${PrepareConfigAssignDelegate}">
+      <bpmn:incoming>SequenceFlow_0j3pm2g</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_17llfxw</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:sequenceFlow id="SequenceFlow_17llfxw" sourceRef="Task_0k2q5vd" targetRef="Task_1u5pka9" />
+    <bpmn:callActivity id="Task_1u5pka9" name="Config Assign&#10;CDS call&#10;" calledElement="AbstractCDSProcessingBB">
+      <bpmn:extensionElements>
+        <camunda:in source="executionObject" target="executionObject" />
+        <camunda:in businessKey="#{execution.processBusinessKey}" />
+        <camunda:out source="CDSStatus" target="CDSStatus" />
+      </bpmn:extensionElements>
+      <bpmn:incoming>SequenceFlow_17llfxw</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_0p0aqtx</bpmn:outgoing>
+    </bpmn:callActivity>
+    <bpmn:exclusiveGateway id="ExclusiveGateway_0vtv1wi">
+      <bpmn:incoming>SequenceFlow_0p0aqtx</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_1owbpsy</bpmn:outgoing>
+      <bpmn:outgoing>SequenceFlow_1w4p9f7</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:sequenceFlow id="SequenceFlow_0p0aqtx" sourceRef="Task_1u5pka9" targetRef="ExclusiveGateway_0vtv1wi" />
+    <bpmn:sequenceFlow id="SequenceFlow_1owbpsy" name="Success" sourceRef="ExclusiveGateway_0vtv1wi" targetRef="Task_1uvsz0c">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">#{execution.getVariable("CDSStatus").equals("Success")}</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="SequenceFlow_0jfgn7n" sourceRef="Task_1uvsz0c" targetRef="Task_1a5w1si" />
+    <bpmn:callActivity id="Task_1a5w1si" name="Config Deploy&#10;CDS call&#10;" calledElement="AbstractCDSProcessingBB">
+      <bpmn:extensionElements>
+        <camunda:in businessKey="#{execution.processBusinessKey}" />
+        <camunda:in source="executionObject" target="executionObject" />
+        <camunda:out source="CDSStatus" target="CDSStatus" />
+      </bpmn:extensionElements>
+      <bpmn:incoming>SequenceFlow_0jfgn7n</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_08voj55</bpmn:outgoing>
+    </bpmn:callActivity>
+    <bpmn:exclusiveGateway id="ExclusiveGateway_01jwwmc">
+      <bpmn:incoming>SequenceFlow_08voj55</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_1n080up</bpmn:outgoing>
+      <bpmn:outgoing>SequenceFlow_0d24h26</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:sequenceFlow id="SequenceFlow_08voj55" sourceRef="Task_1a5w1si" targetRef="ExclusiveGateway_01jwwmc" />
+    <bpmn:sequenceFlow id="SequenceFlow_1n080up" name="Success" sourceRef="ExclusiveGateway_01jwwmc" targetRef="EndEvent_0xky46v">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">#{execution.getVariable("CDSStatus").equals("Success")}</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="SequenceFlow_1w4p9f7" name="Failure" sourceRef="ExclusiveGateway_0vtv1wi" targetRef="EndEvent_16620h9" />
+    <bpmn:endEvent id="EndEvent_16620h9">
+      <bpmn:incoming>SequenceFlow_1w4p9f7</bpmn:incoming>
+      <bpmn:errorEventDefinition errorRef="Error_11v8tez" />
+    </bpmn:endEvent>
+    <bpmn:sequenceFlow id="SequenceFlow_0d24h26" name="Failure" sourceRef="ExclusiveGateway_01jwwmc" targetRef="EndEvent_0izr65x" />
+    <bpmn:endEvent id="EndEvent_0izr65x">
+      <bpmn:incoming>SequenceFlow_0d24h26</bpmn:incoming>
+      <bpmn:errorEventDefinition errorRef="Error_0rjwti0" />
+    </bpmn:endEvent>
+    <bpmn:serviceTask id="Task_1nhh7ob" name="Configuration Checker" camunda:delegateExpression="${ConfigCheckerDelegate}">
+      <bpmn:incoming>SequenceFlow_069mxkg</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_1u89rk8</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:sequenceFlow id="SequenceFlow_069mxkg" sourceRef="ConfigurePnfResource_StartEvent" targetRef="Task_1nhh7ob" />
+    <bpmn:sequenceFlow id="SequenceFlow_1u89rk8" sourceRef="Task_1nhh7ob" targetRef="ExclusiveGateway_079gavg" />
+    <bpmn:sequenceFlow id="SequenceFlow_0j3pm2g" name="false" sourceRef="ExclusiveGateway_079gavg" targetRef="Task_0k2q5vd">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">#{!SkipPostInstantiationConfiguration}</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:serviceTask id="Task_1uvsz0c" name="Prepare Config Deploy" camunda:delegateExpression="${PrepareConfigDeployDelegate}">
+      <bpmn:incoming>SequenceFlow_1owbpsy</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_0jfgn7n</bpmn:outgoing>
+    </bpmn:serviceTask>
+  </bpmn:process>
+  <bpmn:error id="Error_11v8tez" name="MSOWorkflowException" errorCode="MSOWorkflowException" />
+  <bpmn:error id="Error_0rjwti0" name="MSOWorkflowException" errorCode="MSOWorkflowException" />
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="ConfigurePnfResource">
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="ConfigurePnfResource_StartEvent">
+        <dc:Bounds x="165" y="158" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ExclusiveGateway_079gavg_di" bpmnElement="ExclusiveGateway_079gavg" isMarkerVisible="true">
+        <dc:Bounds x="401" y="151" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="383" y="113.5" width="86" height="27" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="EndEvent_0xky46v_di" bpmnElement="EndEvent_0xky46v">
+        <dc:Bounds x="1402" y="158" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_157of54_di" bpmnElement="SequenceFlow_157of54">
+        <di:waypoint x="451" y="176" />
+        <di:waypoint x="1402" y="176" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="918" y="158" width="19" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ServiceTask_0h627qv_di" bpmnElement="Task_0k2q5vd">
+        <dc:Bounds x="486" y="286" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_17llfxw_di" bpmnElement="SequenceFlow_17llfxw">
+        <di:waypoint x="586" y="326" />
+        <di:waypoint x="621" y="326" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="CallActivity_0y8mxy4_di" bpmnElement="Task_1u5pka9">
+        <dc:Bounds x="621" y="286" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ExclusiveGateway_0vtv1wi_di" bpmnElement="ExclusiveGateway_0vtv1wi" isMarkerVisible="true">
+        <dc:Bounds x="786" y="301" width="50" height="50" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0p0aqtx_di" bpmnElement="SequenceFlow_0p0aqtx">
+        <di:waypoint x="721" y="326" />
+        <di:waypoint x="786" y="326" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1owbpsy_di" bpmnElement="SequenceFlow_1owbpsy">
+        <di:waypoint x="836" y="326" />
+        <di:waypoint x="901" y="326" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="847" y="308" width="43" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0jfgn7n_di" bpmnElement="SequenceFlow_0jfgn7n">
+        <di:waypoint x="1001" y="326" />
+        <di:waypoint x="1066" y="326" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="CallActivity_1viph1b_di" bpmnElement="Task_1a5w1si">
+        <dc:Bounds x="1066" y="286" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ExclusiveGateway_01jwwmc_di" bpmnElement="ExclusiveGateway_01jwwmc" isMarkerVisible="true">
+        <dc:Bounds x="1231" y="301" width="50" height="50" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_08voj55_di" bpmnElement="SequenceFlow_08voj55">
+        <di:waypoint x="1166" y="326" />
+        <di:waypoint x="1231" y="326" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1n080up_di" bpmnElement="SequenceFlow_1n080up">
+        <di:waypoint x="1256" y="301" />
+        <di:waypoint x="1256" y="176" />
+        <di:waypoint x="1402" y="176" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1250" y="236" width="43" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1w4p9f7_di" bpmnElement="SequenceFlow_1w4p9f7">
+        <di:waypoint x="811" y="351" />
+        <di:waypoint x="811" y="418" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="809" y="382" width="34" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="EndEvent_0etscol_di" bpmnElement="EndEvent_16620h9">
+        <dc:Bounds x="793" y="418" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0d24h26_di" bpmnElement="SequenceFlow_0d24h26">
+        <di:waypoint x="1256" y="351" />
+        <di:waypoint x="1256" y="418" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1254" y="382" width="34" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="EndEvent_0buf1g3_di" bpmnElement="EndEvent_0izr65x">
+        <dc:Bounds x="1238" y="418" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ServiceTask_0dzvrj0_di" bpmnElement="Task_1nhh7ob">
+        <dc:Bounds x="251" y="136" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_069mxkg_di" bpmnElement="SequenceFlow_069mxkg">
+        <di:waypoint x="201" y="176" />
+        <di:waypoint x="251" y="176" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1u89rk8_di" bpmnElement="SequenceFlow_1u89rk8">
+        <di:waypoint x="351" y="176" />
+        <di:waypoint x="401" y="176" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0j3pm2g_di" bpmnElement="SequenceFlow_0j3pm2g">
+        <di:waypoint x="426" y="201" />
+        <di:waypoint x="426" y="326" />
+        <di:waypoint x="486" y="326" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="429" y="261" width="24" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ServiceTask_0vmu4wk_di" bpmnElement="Task_1uvsz0c">
+        <dc:Bounds x="901" y="286" width="100" height="80" />
+      </bpmndi:BPMNShape>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</bpmn:definitions>
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 9579f770fc..9e33cbc68d 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_MagIIMOUEeW8asg-vCEgWQ" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="2.0.3" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_MagIIMOUEeW8asg-vCEgWQ" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="2.2.4" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="CreateVcpeResCustService_simplified" name="CreateVcpeResCustService_simplified" isExecutable="true">
     <bpmn2:scriptTask id="sendSyncAckResponse_ScriptTask" name="Send Sync Ack Response" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>
@@ -343,7 +343,7 @@ CreateVcpeResCustService.prepareDecomposeService(execution)</bpmn2:script>
       <bpmn2:linkEventDefinition name="PnfCreateAndActivate" />
     </bpmn2:intermediateCatchEvent>
     <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_0lt5ltv" name="GoToFinishProcess">
-      <bpmn2:incoming>SequenceFlow_0clhseq</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_0ti37h1</bpmn2:incoming>
       <bpmn2:linkEventDefinition name="FinishProcess" />
     </bpmn2:intermediateThrowEvent>
     <bpmn2:scriptTask id="ScriptTask_0lpv2da" name="PostProcess&#10;Decompose&#10;Service&#10;" scriptFormat="groovy">
@@ -355,7 +355,6 @@ CreateVcpeResCustService.processDecomposition(execution)</bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_11efpvh" sourceRef="ScriptTask_0lpv2da" targetRef="IntermediateThrowEvent_0prlju0" />
     <bpmn2:sequenceFlow id="SequenceFlow_0gj4vud" sourceRef="IntermediateCatchEvent_17pzn7m" targetRef="GeneratePnfUuid" />
-    <bpmn2:sequenceFlow id="SequenceFlow_0clhseq" sourceRef="Task_14l19kv" targetRef="IntermediateThrowEvent_0lt5ltv" />
     <bpmn2:callActivity id="Task_14l19kv" name="Create And Activate Pnf Resource" calledElement="CreateAndActivatePnfResource">
       <bpmn2:extensionElements>
         <camunda:in source="timeoutForPnfEntryNotification" target="timeoutForPnfEntryNotification" />
@@ -365,7 +364,7 @@ CreateVcpeResCustService.processDecomposition(execution)</bpmn2:script>
         <camunda:in source="serviceInstanceId" target="serviceInstanceId" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_1yojilk</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_0clhseq</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_050kuu1</bpmn2:outgoing>
     </bpmn2:callActivity>
     <bpmn2:callActivity id="CallActivity_1vc4jeh" name="Call Create &#10;ServiceInstance&#10;" calledElement="DoCreateServiceInstance">
       <bpmn2:extensionElements>
@@ -422,6 +421,20 @@ CreateVcpeResCustService.postProcessServiceInstanceCreate(execution)</bpmn2:scri
       <bpmn2:incoming>SequenceFlow_0gj4vud</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1yojilk</bpmn2:outgoing>
     </bpmn2:serviceTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_050kuu1" sourceRef="Task_14l19kv" targetRef="Pnf_Con" />
+    <bpmn2:sequenceFlow id="SequenceFlow_0ti37h1" sourceRef="Pnf_Con" targetRef="IntermediateThrowEvent_0lt5ltv" />
+    <bpmn2:callActivity id="Pnf_Con" name="Configuration" calledElement="ConfigurePnfResource">
+      <bpmn2:extensionElements>
+        <camunda:in source="pnfCorrelationId" target="pnfCorrelationId" />
+        <camunda:in source="pnfUuid" target="pnfUuid" />
+        <camunda:in source="serviceInstanceId" target="serviceInstanceId" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:in source="serviceModelInfo" target="serviceModelInfo" />
+        <camunda:in source="msoRequestId" target="msoRequestId" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_050kuu1</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0ti37h1</bpmn2:outgoing>
+    </bpmn2:callActivity>
   </bpmn2:process>
   <bpmn2:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" />
   <bpmn2:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" />
@@ -554,25 +567,25 @@ CreateVcpeResCustService.postProcessServiceInstanceCreate(execution)</bpmn2:scri
       <bpmndi:BPMNShape id="ExclusiveGateway_1vwgs6p_di" bpmnElement="ExclusiveGateway_1vwgs6p" isMarkerVisible="true">
         <dc:Bounds x="50" y="2971" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="38" y="3031" width="78" height="12" />
+          <dc:Bounds x="38" y="3031" width="79" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="StartEvent_1bwmffk_di" bpmnElement="StartEvent_1bwmffk">
         <dc:Bounds x="-63" y="2979" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="-69" y="3020" width="51" height="12" />
+          <dc:Bounds x="-69" y="3020" width="51" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_0ydrtdx_di" bpmnElement="ExclusiveGateway_0ydrtdx" isMarkerVisible="true">
         <dc:Bounds x="50" y="2888" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="-15" y="2903" width="46" height="12" />
+          <dc:Bounds x="-15" y="2903" width="46" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_1kvn1pz_di" bpmnElement="ExclusiveGateway_1kvn1pz" isMarkerVisible="true">
         <dc:Bounds x="177" y="1821" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="110" y="1815" width="78" height="12" />
+          <dc:Bounds x="110" y="1815" width="78" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_0jw5tqa_di" bpmnElement="CallActivity_0jw5tqa">
@@ -591,7 +604,7 @@ CreateVcpeResCustService.postProcessServiceInstanceCreate(execution)</bpmn2:scri
         <di:waypoint x="75" y="2971" />
         <di:waypoint x="75" y="2938" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="81" y="2958" width="19" height="12" />
+          <dc:Bounds x="81" y="2958" width="19" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0dhf2js_di" bpmnElement="SequenceFlow_0dhf2js">
@@ -599,7 +612,7 @@ CreateVcpeResCustService.postProcessServiceInstanceCreate(execution)</bpmn2:scri
         <di:waypoint x="734" y="2996" />
         <di:waypoint x="734" y="2938" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="140" y="3001" width="15" height="12" />
+          <dc:Bounds x="141" y="3001" width="14" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1sx5llu_di" bpmnElement="SequenceFlow_1sx5llu">
@@ -608,14 +621,14 @@ CreateVcpeResCustService.postProcessServiceInstanceCreate(execution)</bpmn2:scri
         <di:waypoint x="405" y="2913" />
         <di:waypoint x="709" y="2913" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="419" y="2917" width="19" height="12" />
+          <dc:Bounds x="419" y="2917" width="19" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_02o4yqx_di" bpmnElement="SequenceFlow_02o4yqx">
         <di:waypoint x="75" y="2888" />
         <di:waypoint x="75" y="2866" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="86" y="2871" width="15" height="12" />
+          <dc:Bounds x="87" y="2871" width="14" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_19mxskt_di" bpmnElement="SequenceFlow_19mxskt">
@@ -624,7 +637,7 @@ CreateVcpeResCustService.postProcessServiceInstanceCreate(execution)</bpmn2:scri
         <di:waypoint x="681" y="1725" />
         <di:waypoint x="681" y="1941" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="392" y="1704" width="15" height="12" />
+          <dc:Bounds x="393" y="1704" width="14" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_11b4gmn_di" bpmnElement="setPONR_ScriptTask">
@@ -692,7 +705,7 @@ CreateVcpeResCustService.postProcessServiceInstanceCreate(execution)</bpmn2:scri
       <bpmndi:BPMNShape id="ExclusiveGateway_05indeh_di" bpmnElement="ExclusiveGateway_05indeh" isMarkerVisible="true">
         <dc:Bounds x="656" y="1941" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="718" y="1923" width="83" height="24" />
+          <dc:Bounds x="718" y="1923" width="83" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0sezboq_di" bpmnElement="SequenceFlow_0sezboq">
@@ -700,7 +713,7 @@ CreateVcpeResCustService.postProcessServiceInstanceCreate(execution)</bpmn2:scri
         <di:waypoint x="681" y="2128" />
         <di:waypoint x="1001" y="2128" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="689" y="2045" width="15" height="12" />
+          <dc:Bounds x="690" y="2045" width="14" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_17doerz_di" bpmnElement="ScriptTask_17doerz">
@@ -754,7 +767,7 @@ CreateVcpeResCustService.postProcessServiceInstanceCreate(execution)</bpmn2:scri
       <bpmndi:BPMNShape id="ExclusiveGateway_06gq6em_di" bpmnElement="ExclusiveGateway_06gq6em" isMarkerVisible="true">
         <dc:Bounds x="50" y="2603" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="-37" y="2618" width="80" height="12" />
+          <dc:Bounds x="-37" y="2618" width="80" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_1bpuf2p_di" bpmnElement="CallActivity_1bpuf2p">
@@ -771,7 +784,7 @@ CreateVcpeResCustService.postProcessServiceInstanceCreate(execution)</bpmn2:scri
         <di:waypoint x="202" y="2628" />
         <di:waypoint x="202" y="2598" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="141" y="2613" width="19" height="12" />
+          <dc:Bounds x="141" y="2613" width="19" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1t3cnnx_di" bpmnElement="SequenceFlow_1t3cnnx">
@@ -787,13 +800,13 @@ CreateVcpeResCustService.postProcessServiceInstanceCreate(execution)</bpmn2:scri
         <di:waypoint x="75" y="2542" />
         <di:waypoint x="75" y="2481" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="88" y="2508" width="15" height="12" />
+          <dc:Bounds x="89" y="2508" width="14" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_14tl857_di" bpmnElement="ExclusiveGateway_14tl857" isMarkerVisible="true">
         <dc:Bounds x="50" y="2282" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="-24" y="2297" width="57" height="12" />
+          <dc:Bounds x="-24" y="2297" width="57" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="InclusiveGateway_142br6v_di" bpmnElement="InclusiveGateway_142br6v">
@@ -806,20 +819,20 @@ CreateVcpeResCustService.postProcessServiceInstanceCreate(execution)</bpmn2:scri
         <di:waypoint x="75" y="2282" />
         <di:waypoint x="75" y="2153" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="83" y="2218" width="15" height="12" />
+          <dc:Bounds x="84" y="2218" width="14" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_1mjdcct_di" bpmnElement="ExclusiveGateway_1mjdcct" isMarkerVisible="true">
         <dc:Bounds x="177" y="2431" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="179" y="2393" width="46" height="24" />
+          <dc:Bounds x="179" y="2393" width="46" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1sim44y_di" bpmnElement="SequenceFlow_1sim44y">
         <di:waypoint x="177" y="2456" />
         <di:waypoint x="100" y="2456" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="107" y="2431" width="19" height="12" />
+          <dc:Bounds x="107" y="2431" width="19" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0dr2fem_di" bpmnElement="SequenceFlow_0dr2fem">
@@ -827,27 +840,27 @@ CreateVcpeResCustService.postProcessServiceInstanceCreate(execution)</bpmn2:scri
         <di:waypoint x="734" y="2457" />
         <di:waypoint x="734" y="2695" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="316" y="2436" width="15" height="12" />
+          <dc:Bounds x="317" y="2436" width="14" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_05dg1m1_di" bpmnElement="ExclusiveGateway_05dg1m1" isMarkerVisible="true">
         <dc:Bounds x="177" y="2103" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="179" y="2064" width="46" height="24" />
+          <dc:Bounds x="179" y="2064" width="46" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1quvahv_di" bpmnElement="SequenceFlow_1quvahv">
         <di:waypoint x="177" y="2128" />
         <di:waypoint x="100" y="2128" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="129" y="2103" width="19" height="12" />
+          <dc:Bounds x="129" y="2103" width="19" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1mbymcu_di" bpmnElement="SequenceFlow_1mbymcu">
         <di:waypoint x="227" y="2128" />
         <di:waypoint x="1001" y="2128" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="290" y="2097" width="15" height="12" />
+          <dc:Bounds x="291" y="2097" width="14" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_17g05fd_di" bpmnElement="SequenceFlow_17g05fd">
@@ -860,7 +873,7 @@ CreateVcpeResCustService.postProcessServiceInstanceCreate(execution)</bpmn2:scri
       <bpmndi:BPMNShape id="ExclusiveGateway_0y7gtd9_di" bpmnElement="ExclusiveGateway_0y7gtd9" isMarkerVisible="true">
         <dc:Bounds x="50" y="2695" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="-40" y="2708" width="74" height="12" />
+          <dc:Bounds x="-40" y="2708" width="74" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0ftzjjm_di" bpmnElement="SequenceFlow_0ftzjjm">
@@ -874,7 +887,7 @@ CreateVcpeResCustService.postProcessServiceInstanceCreate(execution)</bpmn2:scri
         <di:waypoint x="75" y="2695" />
         <di:waypoint x="75" y="2653" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="83" y="2666" width="15" height="12" />
+          <dc:Bounds x="84" y="2666" width="14" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="InclusiveGateway_1xenadu_di" bpmnElement="InclusiveGateway_1xenadu">
@@ -904,7 +917,7 @@ CreateVcpeResCustService.postProcessServiceInstanceCreate(execution)</bpmn2:scri
         <di:waypoint x="423" y="2720" />
         <di:waypoint x="709" y="2720" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="144" y="2693" width="19" height="12" />
+          <dc:Bounds x="144" y="2693" width="19" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_027lz43_di" bpmnElement="SequenceFlow_027lz43">
@@ -929,9 +942,9 @@ CreateVcpeResCustService.postProcessServiceInstanceCreate(execution)</bpmn2:scri
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="IntermediateThrowEvent_0lt5ltv_di" bpmnElement="IntermediateThrowEvent_0lt5ltv">
-        <dc:Bounds x="725" y="1259" width="36" height="36" />
+        <dc:Bounds x="1087" y="1259" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="700" y="1306" width="85" height="27" />
+          <dc:Bounds x="1062" y="1306" width="85" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_071yaf8_di" bpmnElement="CallActivity_071yaf8">
@@ -943,13 +956,13 @@ CreateVcpeResCustService.postProcessServiceInstanceCreate(execution)</bpmn2:scri
         <di:waypoint x="256" y="1846" />
         <di:waypoint x="321" y="1846" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="271" y="1826" width="19" height="12" />
+          <dc:Bounds x="271" y="1826" width="19" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_0y158bb_di" bpmnElement="ExclusiveGateway_0y158bb" isMarkerVisible="true">
         <dc:Bounds x="521" y="1821" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="523" y="1782" width="46" height="24" />
+          <dc:Bounds x="523" y="1782" width="46" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0ne9n0g_di" bpmnElement="SequenceFlow_0ne9n0g">
@@ -963,7 +976,7 @@ CreateVcpeResCustService.postProcessServiceInstanceCreate(execution)</bpmn2:scri
         <di:waypoint x="706" y="1966" />
         <di:waypoint x="976" y="1966" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="832" y="1945" width="19" height="12" />
+          <dc:Bounds x="832" y="1945" width="19" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_00by7l7_di" bpmnElement="SequenceFlow_00by7l7">
@@ -971,14 +984,14 @@ CreateVcpeResCustService.postProcessServiceInstanceCreate(execution)</bpmn2:scri
         <di:waypoint x="546" y="2128" />
         <di:waypoint x="1001" y="2128" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="554" y="1994" width="15" height="12" />
+          <dc:Bounds x="555" y="1994" width="14" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_17cz98f_di" bpmnElement="SequenceFlow_17cz98f">
         <di:waypoint x="559" y="1858" />
         <di:waypoint x="668" y="1954" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="615" y="1889" width="19" height="12" />
+          <dc:Bounds x="615" y="1889" width="19" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="CallActivity_1cl4iu4_di" bpmnElement="CallActivity_1cl4iu4">
@@ -996,7 +1009,7 @@ CreateVcpeResCustService.postProcessServiceInstanceCreate(execution)</bpmn2:scri
         <di:waypoint x="202" y="2307" />
         <di:waypoint x="202" y="2273" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="142" y="2286" width="19" height="12" />
+          <dc:Bounds x="142" y="2286" width="19" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_0lpv2da_di" bpmnElement="ScriptTask_0lpv2da">
@@ -1016,13 +1029,6 @@ CreateVcpeResCustService.postProcessServiceInstanceCreate(execution)</bpmn2:scri
           <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 x="547" y="1277" />
-        <di:waypoint x="725" y="1277" />
-        <bpmndi:BPMNLabel>
-          <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="447" y="1237" width="100" height="80" />
       </bpmndi:BPMNShape>
@@ -1082,6 +1088,17 @@ CreateVcpeResCustService.postProcessServiceInstanceCreate(execution)</bpmn2:scri
       <bpmndi:BPMNShape id="ServiceTask_1j71wic_di" bpmnElement="GeneratePnfUuid">
         <dc:Bounds x="256" y="1237" width="100" height="80" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_050kuu1_di" bpmnElement="SequenceFlow_050kuu1">
+        <di:waypoint x="547" y="1277" />
+        <di:waypoint x="667" y="1277" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0ti37h1_di" bpmnElement="SequenceFlow_0ti37h1">
+        <di:waypoint x="767" y="1277" />
+        <di:waypoint x="1087" y="1277" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="CallActivity_15ra3vr_di" bpmnElement="Pnf_Con">
+        <dc:Bounds x="667" y="1237" width="100" height="80" />
+      </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn2:definitions>