summaryrefslogtreecommitdiffstats
path: root/bpmn/so-bpmn-infrastructure-flows
diff options
context:
space:
mode:
authorBoslet, Cory <cory.boslet@att.com>2020-04-16 10:43:38 -0400
committerBenjamin, Max (mb388a) <mb388a@att.com>2020-04-16 10:43:44 -0400
commitfa9a707c87654330dfb5788a6029b8199c6cdf17 (patch)
treeebd981e12166281957b47353a45b6b3c9b3ee490 /bpmn/so-bpmn-infrastructure-flows
parentb0f5ac59c297f81b7f17c1f367e64257ef7be2d2 (diff)
move network adapter to an external client task
Began impelenting new network external task. Made the vnfAdapterTask subflow an openstack subflow, refactored infra flows and BB to call it for network functions. Fixed bugs discovered through a robot dry run, added unit test, added support for rollback network request Updated junit test files for comparison due to not polling for response Removed the no longer used network adapter rest task from bpmn tasks Removed the unused network adapter async and its beans Removed network async client package from open pojo scan Issue-ID: SO-2813 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: I4c25892012cc86659ab122448ed1aca5cab91671
Diffstat (limited to 'bpmn/so-bpmn-infrastructure-flows')
-rw-r--r--bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/DeleteVfModuleVolumeInfraV1.bpmn286
-rw-r--r--bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateVfModuleVolumeInfraV1.bpmn178
-rw-r--r--bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateNetworkInstance.bpmn651
-rw-r--r--bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateNetworkInstanceRollback.bpmn267
-rw-r--r--bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModule.bpmn890
-rw-r--r--bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleRollback.bpmn584
-rw-r--r--bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleVolumeRollback.bpmn116
-rw-r--r--bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleVolumeV2.bpmn182
-rw-r--r--bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteNetworkInstance.bpmn549
-rw-r--r--bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteNetworkInstanceRollback.bpmn547
-rw-r--r--bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModule.bpmn228
-rw-r--r--bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModuleFromVnf.bpmn202
-rw-r--r--bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModuleVolumeV2.bpmn62
-rw-r--r--bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateNetworkInstance.bpmn497
-rw-r--r--bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateNetworkInstanceRollback.bpmn374
-rw-r--r--bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateVfModule.bpmn330
16 files changed, 2431 insertions, 3512 deletions
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/DeleteVfModuleVolumeInfraV1.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/DeleteVfModuleVolumeInfraV1.bpmn
index 2e5d2e30b1..65a11e24be 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/DeleteVfModuleVolumeInfraV1.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/DeleteVfModuleVolumeInfraV1.bpmn
@@ -1,14 +1,14 @@
<?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="1.10.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_MagIIMOUEeW8asg-vCEgWQ" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="3.7.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
<bpmn2:process id="DeleteVfModuleVolumeInfraV1" name="DeleteVfModuleVolumeInfraV1" isExecutable="true">
<bpmn2:scriptTask id="preProcessRequest_ScriptTask" name="PreProcess Incoming Request" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def deleteVfMod = new DeleteVfModuleVolumeInfraV1()
deleteVfMod.executeMethod('preProcessRequest', execution, isDebugLogEnabled)
-]]></bpmn2:script>
+</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="preProcessRequest_ScriptTask" targetRef="sendSyncAckResponse_ScriptTask" />
<bpmn2:startEvent id="deleteNetwork_startEvent" name="Start Flow">
@@ -18,24 +18,24 @@ deleteVfMod.executeMethod('preProcessRequest', execution, isDebugLogEnabled)
<bpmn2:scriptTask id="sendSyncAckResponse_ScriptTask" name="Send Sync Ack Response" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_12</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def deleteVfMod = new DeleteVfModuleVolumeInfraV1()
-deleteVfMod.executeMethod('sendSyncResponse', execution, isDebugLogEnabled)]]></bpmn2:script>
+deleteVfMod.executeMethod('sendSyncResponse', execution, isDebugLogEnabled)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_12" name="" sourceRef="sendSyncAckResponse_ScriptTask" targetRef="ScriptTask_callRestCloudRegion" />
<bpmn2:scriptTask id="ScriptTask_callRestCloudRegion" name="Call REST Query Cloud Region " scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_12</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def delVfModuleVol = new DeleteVfModuleVolumeInfraV1()
-delVfModuleVol.executeMethod('callRESTQueryAAICloudRegion', execution, isDebugLogEnabled)]]></bpmn2:script>
+delVfModuleVol.executeMethod('callRESTQueryAAICloudRegion', execution, isDebugLogEnabled)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:scriptTask id="prepareVnfAdapterDelete_ScriptTask_1" name="Prepare Vnf Adapter Delete" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_15</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def deleteVfMod = new DeleteVfModuleVolumeInfraV1()
-deleteVfMod.executeMethod('prepareVnfAdapterDeleteRequest', execution, isDebugLogEnabled)]]></bpmn2:script>
+deleteVfMod.executeMethod('prepareVnfAdapterDeleteRequest', execution, isDebugLogEnabled)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="prepareVnfAdapterDelete_ScriptTask_1" targetRef="callVnfAdapterDeleteSubflow_CallActivity" />
<bpmn2:endEvent id="EndEvent_5">
@@ -48,12 +48,12 @@ deleteVfMod.executeMethod('prepareVnfAdapterDeleteRequest', execution, isDebugLo
<bpmn2:outgoing>SequenceFlow_21</bpmn2:outgoing>
</bpmn2:exclusiveGateway>
<bpmn2:sequenceFlow id="SequenceFlow_15" name="" sourceRef="ExclusiveGateway_3" targetRef="prepareVnfAdapterDelete_ScriptTask_1">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DELVfModVol_tenantId") == execution.getVariable("DELVfModVol_volumeGroupTenantId")}]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DELVfModVol_tenantId") == execution.getVariable("DELVfModVol_volumeGroupTenantId")}</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:sequenceFlow id="SequenceFlow_21" name="" sourceRef="ExclusiveGateway_3" targetRef="ScriptTask_2" />
- <bpmn2:callActivity id="callVnfAdapterDeleteSubflow_CallActivity" name="Call Vnf Adapter Delete subflow" calledElement="vnfAdapterTask">
+ <bpmn2:callActivity id="callVnfAdapterDeleteSubflow_CallActivity" name="Call Vnf Adapter Delete subflow" calledElement="openstackAdapterTask">
<bpmn2:extensionElements>
- <camunda:in source="DELVfModVol_deleteVnfARequest" target="vnfAdapterTaskRequest" />
+ <camunda:in source="DELVfModVol_deleteVnfARequest" target="openstackAdapterTaskRequest" />
<camunda:out source="WorkflowResponse" target="DELVfModVol_deleteVnfAResponse" />
<camunda:in source="mso-request-id" target="mso-request-id" />
<camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
@@ -67,18 +67,18 @@ deleteVfMod.executeMethod('prepareVnfAdapterDeleteRequest', execution, isDebugLo
<bpmn2:scriptTask id="callAAIQuery_scriptTask" name="Query AAI for Volume Group Info" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_8</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_13</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def deleteVfMod = new DeleteVfModuleVolumeInfraV1()
deleteVfMod.executeMethod('queryAAIForVolumeGroup', execution, isDebugLogEnabled)
-]]></bpmn2:script>
+</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_13" name="" sourceRef="callAAIQuery_scriptTask" targetRef="ExclusiveGateway_3" />
<bpmn2:scriptTask id="ScriptTask_2" name="Handle TenantId Mismatch" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_21</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_22</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def deleteVfMod = new DeleteVfModuleVolumeInfraV1()
-deleteVfMod.executeMethod('handleTenantIdMismatch', execution, isDebugLogEnabled)]]></bpmn2:script>
+deleteVfMod.executeMethod('handleTenantIdMismatch', execution, isDebugLogEnabled)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_22" name="" sourceRef="ScriptTask_2" targetRef="EndEvent_5" />
<bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="ScriptTask_callRestCloudRegion" targetRef="ExclusiveGateway_1" />
@@ -89,7 +89,7 @@ deleteVfMod.executeMethod('handleTenantIdMismatch', execution, isDebugLogEnabled
</bpmn2:exclusiveGateway>
<bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="ExclusiveGateway_1" targetRef="EndEvent_3" />
<bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="ExclusiveGateway_1" targetRef="callAAIQuery_scriptTask">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DELVfModVol_isCloudRegionGood") == true}]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DELVfModVol_isCloudRegionGood") == true}</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:endEvent id="EndEvent_3">
<bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>
@@ -109,9 +109,9 @@ deleteVfMod.executeMethod('handleTenantIdMismatch', execution, isDebugLogEnabled
<bpmn2:scriptTask id="ScriptTask_4" name="Send Sync Ack Error" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_responseNotSent</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def deleteVfMod = new DeleteVfModuleVolumeInfraV1()
-deleteVfMod.executeMethod('sendSyncError', execution, isDebugLogEnabled)]]></bpmn2:script>
+deleteVfMod.executeMethod('sendSyncError', execution, isDebugLogEnabled)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_responseNotSent" name="No" sourceRef="ExclusiveGateway_synResponseSent" targetRef="ScriptTask_4" />
<bpmn2:sequenceFlow id="SequenceFlow_responseSent" name="Yes" sourceRef="ExclusiveGateway_synResponseSent" targetRef="prepareFalloutHandler_ScriptTask">
@@ -121,10 +121,10 @@ deleteVfMod.executeMethod('sendSyncError', execution, isDebugLogEnabled)]]></bpm
<bpmn2:incoming>SequenceFlow_responseSent</bpmn2:incoming>
<bpmn2:incoming>SequenceFlow_14</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_25</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def deleteVfMod = new DeleteVfModuleVolumeInfraV1()
deleteVfMod.executeMethod('prepareFalloutHandler', execution, isDebugLogEnabled)
-]]></bpmn2:script>
+</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_25" name="" sourceRef="prepareFalloutHandler_ScriptTask" targetRef="faultHandler_CallActivity" />
<bpmn2:callActivity id="faultHandler_CallActivity" name="Call FalloutHandlerV1" calledElement="FalloutHandler">
@@ -151,27 +151,27 @@ deleteVfMod.executeMethod('prepareFalloutHandler', execution, isDebugLogEnabled)
<bpmn2:scriptTask id="prepareDBInfraRequest_ScriptTask" name="Prepare DB Infra Request" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_35</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_37</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def deleteVfMod = new DeleteVfModuleVolumeInfraV1()
deleteVfMod.executeMethod('prepareDBRequest', execution, isDebugLogEnabled)
-]]></bpmn2:script>
+</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_37" name="" sourceRef="prepareDBInfraRequest_ScriptTask" targetRef="callDBInfra_ServiceTask" />
<bpmn2:scriptTask id="postProcessAndCompletionRequest_ScriptTask" name="Prepare Completion Handler Request" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_27</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_29</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def deleteVfMod = new DeleteVfModuleVolumeInfraV1()
deleteVfMod.executeMethod('prepareCompletionHandlerRequest', execution, isDebugLogEnabled)
-]]></bpmn2:script>
+</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_29" name="" sourceRef="postProcessAndCompletionRequest_ScriptTask" targetRef="callCompleteMsoProcess_CallActivity" />
<bpmn2:scriptTask id="ScriptTask_3" name="Set Success" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_10</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_24</bpmn2:outgoing>
- <bpmn2:script><![CDATA[// The following variable is checked by the unit test
-execution.setVariable("DELVfModVol_TransactionSuccessIndicator", true)]]></bpmn2:script>
+ <bpmn2:script>// The following variable is checked by the unit test
+execution.setVariable("DELVfModVol_TransactionSuccessIndicator", true)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_24" name="" sourceRef="ScriptTask_3" targetRef="EndEvent_2" />
<bpmn2:callActivity id="callCompleteMsoProcess_CallActivity" name="Call CompleteMsoProcess" calledElement="CompleteMsoProcess">
@@ -197,7 +197,7 @@ execution.setVariable("DELVfModVol_TransactionSuccessIndicator", true)]]></bpmn2
<bpmn2:extensionElements>
<camunda:connector>
<camunda:inputOutput>
- <camunda:inputParameter name="url"><![CDATA[${UrnPropertiesReader.getVariable("mso.adapters.openecomp.db.endpoint", execution)}]]></camunda:inputParameter>
+ <camunda:inputParameter name="url">${UrnPropertiesReader.getVariable("mso.adapters.openecomp.db.endpoint", execution)}</camunda:inputParameter>
<camunda:inputParameter name="payload">${DELVfModVol_updateInfraRequest}</camunda:inputParameter>
<camunda:inputParameter name="headers">
<camunda:map>
@@ -219,9 +219,9 @@ execution.setVariable("DELVfModVol_TransactionSuccessIndicator", true)]]></bpmn2
<bpmn2:scriptTask id="callRESTDeleteVolGrpId_ScriptTask" name="Call REST Delete AAI Vol Grp Id" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_vnfAdapterCallOK</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_35</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def deleteVfMod = new DeleteVfModuleVolumeInfraV1()
-deleteVfMod.executeMethod('deleteVolGrpId', execution, isDebugLogEnabled)]]></bpmn2:script>
+deleteVfMod.executeMethod('deleteVolGrpId', execution, isDebugLogEnabled)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_35" name="" sourceRef="callRESTDeleteVolGrpId_ScriptTask" targetRef="prepareDBInfraRequest_ScriptTask" />
<bpmn2:exclusiveGateway id="ExclusiveGateway_2" name="Is call to VNF Adapter OK?" default="SequenceFlow_vnfAdapterCallNotOK">
@@ -243,321 +243,321 @@ deleteVfMod.executeMethod('deleteVolGrpId', execution, isDebugLogEnabled)]]></bp
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DeleteVfModuleVolumeInfraV1">
<bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="deleteNetwork_startEvent">
- <dc:Bounds x="103" y="94" width="36" height="36" />
+ <dc:Bounds x="223" y="94" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="89" y="135" width="65" height="22" />
+ <dc:Bounds x="216" y="135" width="51" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_61" bpmnElement="preProcessRequest_ScriptTask">
- <dc:Bounds x="355" y="72" width="100" height="80" />
+ <dc:Bounds x="475" y="72" 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="139" y="112" />
- <di:waypoint xsi:type="dc:Point" x="355" y="112" />
+ <di:waypoint x="259" y="112" />
+ <di:waypoint x="475" y="112" />
<bpmndi:BPMNLabel>
<dc:Bounds x="116" y="12" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_62" bpmnElement="callAAIQuery_scriptTask">
- <dc:Bounds x="864" y="72" width="100" height="80" />
+ <dc:Bounds x="984" y="72" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_CallActivity_3" bpmnElement="faultHandler_CallActivity">
- <dc:Bounds x="438" y="360" width="100" height="80" />
+ <dc:Bounds x="558" y="360" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_CallActivity_4" bpmnElement="callCompleteMsoProcess_CallActivity">
- <dc:Bounds x="993" y="985" width="100" height="80" />
+ <dc:Bounds x="1113" y="985" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_SubProcess_16" bpmnElement="subProcessException_SubProcess" isExpanded="true">
- <dc:Bounds x="37" y="288" width="660" height="337" />
+ <dc:Bounds x="157" y="288" width="660" height="337" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_StartEvent_50" bpmnElement="subProcessStart_StartEvent">
- <dc:Bounds x="60" y="383" width="36" height="36" />
+ <dc:Bounds x="180" y="383" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="45" y="424" width="67" height="22" />
+ <dc:Bounds x="173" y="424" width="52" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_79" bpmnElement="prepareFalloutHandler_ScriptTask">
- <dc:Bounds x="288" y="360" width="100" height="80" />
+ <dc:Bounds x="408" y="360" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_80" bpmnElement="postProcessAndCompletionRequest_ScriptTask">
- <dc:Bounds x="993" y="877" width="100" height="80" />
+ <dc:Bounds x="1113" y="877" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_83" bpmnElement="prepareDBInfraRequest_ScriptTask">
- <dc:Bounds x="993" y="660" width="100" height="80" />
+ <dc:Bounds x="1113" y="660" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ServiceTask_86" bpmnElement="callDBInfra_ServiceTask">
- <dc:Bounds x="993" y="769" width="100" height="80" />
+ <dc:Bounds x="1113" y="769" 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="455" y="112" />
- <di:waypoint xsi:type="dc:Point" x="496" y="112" />
+ <di:waypoint x="575" y="112" />
+ <di:waypoint x="616" y="112" />
<bpmndi:BPMNLabel>
<dc:Bounds x="486" y="112" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_127" bpmnElement="sendSyncAckResponse_ScriptTask">
- <dc:Bounds x="496" y="72" width="100" height="80" />
+ <dc:Bounds x="616" y="72" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_35" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_StartEvent_50" targetElement="_BPMNShape_ExclusiveGateway_255">
- <di:waypoint xsi:type="dc:Point" x="96" y="401" />
- <di:waypoint xsi:type="dc:Point" x="118" y="401" />
- <di:waypoint xsi:type="dc:Point" x="118" y="400" />
- <di:waypoint xsi:type="dc:Point" x="144" y="400" />
+ <di:waypoint x="216" y="401" />
+ <di:waypoint x="238" y="401" />
+ <di:waypoint x="238" y="400" />
+ <di:waypoint x="264" y="400" />
<bpmndi:BPMNLabel>
<dc:Bounds x="99" y="401" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_38" bpmnElement="SequenceFlow_25" sourceElement="_BPMNShape_ScriptTask_79" targetElement="_BPMNShape_CallActivity_3">
- <di:waypoint xsi:type="dc:Point" x="388" y="400" />
- <di:waypoint xsi:type="dc:Point" x="438" y="400" />
+ <di:waypoint x="508" y="400" />
+ <di:waypoint x="558" y="400" />
<bpmndi:BPMNLabel>
<dc:Bounds x="413" y="400" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_40" bpmnElement="SequenceFlow_27" sourceElement="_BPMNShape_ServiceTask_86" targetElement="_BPMNShape_ScriptTask_80">
- <di:waypoint xsi:type="dc:Point" x="1043" y="849" />
- <di:waypoint xsi:type="dc:Point" x="1043" y="877" />
+ <di:waypoint x="1163" y="849" />
+ <di:waypoint x="1163" y="877" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1258" y="857" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_42" bpmnElement="SequenceFlow_29" sourceElement="_BPMNShape_ScriptTask_80" targetElement="_BPMNShape_CallActivity_4">
- <di:waypoint xsi:type="dc:Point" x="1043" y="957" />
- <di:waypoint xsi:type="dc:Point" x="1043" y="985" />
+ <di:waypoint x="1163" y="957" />
+ <di:waypoint x="1163" y="985" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1289" y="898" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_134" bpmnElement="callRESTDeleteVolGrpId_ScriptTask">
- <dc:Bounds x="993" y="528" width="100" height="80" />
+ <dc:Bounds x="1113" y="528" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_54" bpmnElement="SequenceFlow_35" sourceElement="_BPMNShape_ScriptTask_134" targetElement="_BPMNShape_ScriptTask_83">
- <di:waypoint xsi:type="dc:Point" x="1043" y="608" />
- <di:waypoint xsi:type="dc:Point" x="1043" y="660" />
+ <di:waypoint x="1163" y="608" />
+ <di:waypoint x="1163" y="660" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1291" y="557" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_58" bpmnElement="SequenceFlow_37" sourceElement="_BPMNShape_ScriptTask_83" targetElement="_BPMNShape_ServiceTask_86">
- <di:waypoint xsi:type="dc:Point" x="1043" y="740" />
- <di:waypoint xsi:type="dc:Point" x="1043" y="769" />
+ <di:waypoint x="1163" y="740" />
+ <di:waypoint x="1163" y="769" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1258" y="751" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_CallActivity_22" bpmnElement="callVnfAdapterDeleteSubflow_CallActivity">
- <dc:Bounds x="993" y="300" width="100" height="80" />
+ <dc:Bounds x="1113" y="300" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_160" bpmnElement="prepareVnfAdapterDelete_ScriptTask_1">
- <dc:Bounds x="993" y="180" width="100" height="80" />
+ <dc:Bounds x="1113" y="180" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_160" targetElement="_BPMNShape_CallActivity_22">
- <di:waypoint xsi:type="dc:Point" x="1043" y="260" />
- <di:waypoint xsi:type="dc:Point" x="1043" y="300" />
+ <di:waypoint x="1163" y="260" />
+ <di:waypoint x="1163" y="300" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1112" y="280" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_CallActivity_22" targetElement="_BPMNShape_ExclusiveGateway_252">
- <di:waypoint xsi:type="dc:Point" x="1043" y="380" />
- <di:waypoint xsi:type="dc:Point" x="1043" y="401" />
- <di:waypoint xsi:type="dc:Point" x="1042" y="401" />
- <di:waypoint xsi:type="dc:Point" x="1042" y="422" />
+ <di:waypoint x="1163" y="380" />
+ <di:waypoint x="1163" y="401" />
+ <di:waypoint x="1162" y="401" />
+ <di:waypoint x="1162" y="422" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1039" y="415" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_EndEvent_163" bpmnElement="EndEvent_1">
- <dc:Bounds x="588" y="382" width="36" height="36" />
+ <dc:Bounds x="708" y="382" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="606" y="423" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_28" bpmnElement="SequenceFlow_19" sourceElement="_BPMNShape_CallActivity_3" targetElement="_BPMNShape_EndEvent_163">
- <di:waypoint xsi:type="dc:Point" x="538" y="400" />
- <di:waypoint xsi:type="dc:Point" x="588" y="400" />
+ <di:waypoint x="658" y="400" />
+ <di:waypoint x="708" y="400" />
<bpmndi:BPMNLabel>
<dc:Bounds x="558" y="400" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_EndEvent_167" bpmnElement="EndEvent_2">
- <dc:Bounds x="1025" y="1201" width="36" height="36" />
+ <dc:Bounds x="1145" y="1201" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1029" y="1242" width="29" height="22" />
+ <dc:Bounds x="1154" y="1242" width="20" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_CallActivity_4" targetElement="_BPMNShape_ScriptTask_241">
- <di:waypoint xsi:type="dc:Point" x="1043" y="1065" />
- <di:waypoint xsi:type="dc:Point" x="1043" y="1093" />
+ <di:waypoint x="1163" y="1065" />
+ <di:waypoint x="1163" y="1093" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1258" y="1083" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_234" bpmnElement="ScriptTask_4">
- <dc:Bounds x="120" y="492" width="100" height="80" />
+ <dc:Bounds x="240" y="492" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_ScriptTask_127" targetElement="_BPMNShape_ScriptTask_251">
- <di:waypoint xsi:type="dc:Point" x="596" y="112" />
- <di:waypoint xsi:type="dc:Point" x="623" y="112" />
- <di:waypoint xsi:type="dc:Point" x="623" y="115" />
- <di:waypoint xsi:type="dc:Point" x="636" y="115" />
+ <di:waypoint x="716" y="112" />
+ <di:waypoint x="743" y="112" />
+ <di:waypoint x="743" y="115" />
+ <di:waypoint x="756" y="115" />
<bpmndi:BPMNLabel>
<dc:Bounds x="613" y="112" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="SequenceFlow_13" sourceElement="_BPMNShape_ScriptTask_62" targetElement="_BPMNShape_ExclusiveGateway_203">
- <di:waypoint xsi:type="dc:Point" x="964" y="112" />
- <di:waypoint xsi:type="dc:Point" x="1017" y="111" />
+ <di:waypoint x="1084" y="112" />
+ <di:waypoint x="1137" y="111" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1067" y="113" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_203" bpmnElement="ExclusiveGateway_3" isMarkerVisible="true">
- <dc:Bounds x="1017" y="86" width="50" height="50" />
+ <dc:Bounds x="1137" y="86" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="984" y="60" width="102" height="22" />
+ <dc:Bounds x="1115" y="60" width="81" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_240" bpmnElement="ScriptTask_2">
- <dc:Bounds x="1104" y="72" width="100" height="80" />
+ <dc:Bounds x="1224" y="72" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_14" bpmnElement="SequenceFlow_15" sourceElement="_BPMNShape_ExclusiveGateway_203" targetElement="_BPMNShape_ScriptTask_160">
- <di:waypoint xsi:type="dc:Point" x="1042" y="136" />
- <di:waypoint xsi:type="dc:Point" x="1043" y="180" />
+ <di:waypoint x="1162" y="136" />
+ <di:waypoint x="1163" y="180" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1040" y="122" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_16" bpmnElement="SequenceFlow_21" sourceElement="_BPMNShape_ExclusiveGateway_203" targetElement="_BPMNShape_ScriptTask_240">
- <di:waypoint xsi:type="dc:Point" x="1067" y="111" />
- <di:waypoint xsi:type="dc:Point" x="1085" y="111" />
- <di:waypoint xsi:type="dc:Point" x="1085" y="112" />
- <di:waypoint xsi:type="dc:Point" x="1104" y="112" />
+ <di:waypoint x="1187" y="111" />
+ <di:waypoint x="1205" y="111" />
+ <di:waypoint x="1205" y="112" />
+ <di:waypoint x="1224" y="112" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1216" y="113" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_EndEvent_178" bpmnElement="EndEvent_5">
- <dc:Bounds x="1242" y="95" width="36" height="36" />
+ <dc:Bounds x="1362" y="95" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1260" y="136" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="SequenceFlow_22" sourceElement="_BPMNShape_ScriptTask_240" targetElement="_BPMNShape_EndEvent_178">
- <di:waypoint xsi:type="dc:Point" x="1204" y="112" />
- <di:waypoint xsi:type="dc:Point" x="1222" y="112" />
- <di:waypoint xsi:type="dc:Point" x="1222" y="113" />
- <di:waypoint xsi:type="dc:Point" x="1242" y="113" />
+ <di:waypoint x="1324" y="112" />
+ <di:waypoint x="1342" y="112" />
+ <di:waypoint x="1342" y="113" />
+ <di:waypoint x="1362" y="113" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1220" y="113" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_241" bpmnElement="ScriptTask_3">
- <dc:Bounds x="993" y="1093" width="100" height="80" />
+ <dc:Bounds x="1113" y="1093" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_19" bpmnElement="SequenceFlow_24" sourceElement="_BPMNShape_ScriptTask_241" targetElement="_BPMNShape_EndEvent_167">
- <di:waypoint xsi:type="dc:Point" x="1043" y="1173" />
- <di:waypoint xsi:type="dc:Point" x="1043" y="1201" />
+ <di:waypoint x="1163" y="1173" />
+ <di:waypoint x="1163" y="1201" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1040" y="1320" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_251" bpmnElement="ScriptTask_callRestCloudRegion">
- <dc:Bounds x="636" y="75" width="100" height="80" />
+ <dc:Bounds x="756" y="75" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_223" bpmnElement="ExclusiveGateway_1" isMarkerVisible="true">
- <dc:Bounds x="774" y="89" width="50" height="50" />
+ <dc:Bounds x="894" y="89" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="735" y="40" width="125" height="22" />
+ <dc:Bounds x="879" y="40" width="78" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_EndEvent_215" bpmnElement="EndEvent_3">
- <dc:Bounds x="781" y="170" width="36" height="36" />
+ <dc:Bounds x="901" y="170" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="799" y="211" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_ExclusiveGateway_223" targetElement="_BPMNShape_EndEvent_215">
- <di:waypoint xsi:type="dc:Point" x="798" y="139" />
- <di:waypoint xsi:type="dc:Point" x="798" y="153" />
- <di:waypoint xsi:type="dc:Point" x="799" y="153" />
- <di:waypoint xsi:type="dc:Point" x="799" y="170" />
+ <di:waypoint x="918" y="139" />
+ <di:waypoint x="918" y="153" />
+ <di:waypoint x="919" y="153" />
+ <di:waypoint x="919" y="170" />
<bpmndi:BPMNLabel>
<dc:Bounds x="796" y="166" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_ScriptTask_251" targetElement="_BPMNShape_ExclusiveGateway_223">
- <di:waypoint xsi:type="dc:Point" x="736" y="115" />
- <di:waypoint xsi:type="dc:Point" x="754" y="115" />
- <di:waypoint xsi:type="dc:Point" x="754" y="114" />
- <di:waypoint xsi:type="dc:Point" x="774" y="114" />
+ <di:waypoint x="856" y="115" />
+ <di:waypoint x="874" y="115" />
+ <di:waypoint x="874" y="114" />
+ <di:waypoint x="894" y="114" />
<bpmndi:BPMNLabel>
<dc:Bounds x="752" y="114" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_ExclusiveGateway_223" targetElement="_BPMNShape_ScriptTask_62">
- <di:waypoint xsi:type="dc:Point" x="824" y="114" />
- <di:waypoint xsi:type="dc:Point" x="844" y="114" />
- <di:waypoint xsi:type="dc:Point" x="844" y="112" />
- <di:waypoint xsi:type="dc:Point" x="864" y="112" />
+ <di:waypoint x="944" y="114" />
+ <di:waypoint x="964" y="114" />
+ <di:waypoint x="964" y="112" />
+ <di:waypoint x="984" y="112" />
<bpmndi:BPMNLabel>
<dc:Bounds x="841" y="113" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_252" bpmnElement="ExclusiveGateway_2" isMarkerVisible="true">
- <dc:Bounds x="1017" y="422" width="50" height="50" />
+ <dc:Bounds x="1137" y="422" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="960" y="477" width="164" height="22" />
+ <dc:Bounds x="1129" y="477" width="66" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_vnfAdapterCallOK" sourceElement="_BPMNShape_ExclusiveGateway_252" targetElement="_BPMNShape_ScriptTask_134">
- <di:waypoint xsi:type="dc:Point" x="1042" y="472" />
- <di:waypoint xsi:type="dc:Point" x="1043" y="528" />
+ <di:waypoint x="1162" y="472" />
+ <di:waypoint x="1163" y="528" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1040" y="500" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_EndEvent_236" bpmnElement="EndEvent_6">
- <dc:Bounds x="1168" y="430" width="36" height="36" />
+ <dc:Bounds x="1288" y="430" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1186" y="471" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_15" bpmnElement="SequenceFlow_vnfAdapterCallNotOK" sourceElement="_BPMNShape_ExclusiveGateway_252" targetElement="_BPMNShape_EndEvent_236">
- <di:waypoint xsi:type="dc:Point" x="1067" y="447" />
- <di:waypoint xsi:type="dc:Point" x="1117" y="447" />
- <di:waypoint xsi:type="dc:Point" x="1117" y="448" />
- <di:waypoint xsi:type="dc:Point" x="1168" y="448" />
+ <di:waypoint x="1187" y="447" />
+ <di:waypoint x="1237" y="447" />
+ <di:waypoint x="1237" y="448" />
+ <di:waypoint x="1288" y="448" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_255" bpmnElement="ExclusiveGateway_synResponseSent" isMarkerVisible="true">
- <dc:Bounds x="144" y="375" width="50" height="50" />
+ <dc:Bounds x="264" y="375" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="106" y="439" width="129" height="22" />
+ <dc:Bounds x="254" y="439" width="73" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_17" bpmnElement="SequenceFlow_responseNotSent" sourceElement="_BPMNShape_ExclusiveGateway_255" targetElement="_BPMNShape_ScriptTask_234">
- <di:waypoint xsi:type="dc:Point" x="169" y="425" />
- <di:waypoint xsi:type="dc:Point" x="169" y="458" />
- <di:waypoint xsi:type="dc:Point" x="170" y="458" />
- <di:waypoint xsi:type="dc:Point" x="170" y="492" />
+ <di:waypoint x="289" y="425" />
+ <di:waypoint x="289" y="458" />
+ <di:waypoint x="290" y="458" />
+ <di:waypoint x="290" y="492" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="159" y="458" width="22" height="22" />
+ <dc:Bounds x="283" y="458" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_20" bpmnElement="SequenceFlow_responseSent" sourceElement="_BPMNShape_ExclusiveGateway_255" targetElement="_BPMNShape_ScriptTask_79">
- <di:waypoint xsi:type="dc:Point" x="194" y="400" />
- <di:waypoint xsi:type="dc:Point" x="288" y="400" />
+ <di:waypoint x="314" y="400" />
+ <di:waypoint x="408" y="400" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="204" y="400" width="29" height="22" />
+ <dc:Bounds x="330" y="400" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_22" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_ScriptTask_234" targetElement="_BPMNShape_ScriptTask_79">
- <di:waypoint xsi:type="dc:Point" x="220" y="532" />
- <di:waypoint xsi:type="dc:Point" x="254" y="532" />
- <di:waypoint xsi:type="dc:Point" x="336" y="532" />
- <di:waypoint xsi:type="dc:Point" x="336" y="508" />
- <di:waypoint xsi:type="dc:Point" x="336" y="482" />
- <di:waypoint xsi:type="dc:Point" x="337" y="440" />
+ <di:waypoint x="340" y="532" />
+ <di:waypoint x="374" y="532" />
+ <di:waypoint x="456" y="532" />
+ <di:waypoint x="456" y="508" />
+ <di:waypoint x="456" y="482" />
+ <di:waypoint x="457" y="440" />
<bpmndi:BPMNLabel>
<dc:Bounds x="317" y="532" width="6" height="6" />
</bpmndi:BPMNLabel>
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateVfModuleVolumeInfraV1.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateVfModuleVolumeInfraV1.bpmn
index ce346e13b3..4826d88d8a 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateVfModuleVolumeInfraV1.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateVfModuleVolumeInfraV1.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="_ZBLUcCkQEeaY6ZhIaNLwzg" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.10.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_ZBLUcCkQEeaY6ZhIaNLwzg" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="3.7.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
<bpmn2:process id="UpdateVfModuleVolumeInfraV1" name="UpdateVfModuleVolumeInfraV1" isExecutable="true">
<bpmn2:endEvent id="EndEvent_4" name="TheEnd">
<bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
@@ -21,7 +21,7 @@
<bpmn2:extensionElements>
<camunda:connector>
<camunda:inputOutput>
- <camunda:inputParameter name="url"><![CDATA[${UrnPropertiesReader.getVariable("mso.adapters.openecomp.db.endpoint", execution)}]]></camunda:inputParameter>
+ <camunda:inputParameter name="url">${UrnPropertiesReader.getVariable("mso.adapters.openecomp.db.endpoint", execution)}</camunda:inputParameter>
<camunda:inputParameter name="payload">${UPDVfModVol_updateInfraRequest}</camunda:inputParameter>
<camunda:inputParameter name="headers">
<camunda:map>
@@ -43,26 +43,26 @@
<bpmn2:scriptTask id="ScriptTask_prepVnfRest" name="Prepare VNF Adapter Rest Request" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_22</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_21</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def uvmv = new UpdateVfModuleVolumeInfraV1()
-uvmv.executeMethod('prepVnfAdapterRest', execution, isDebugLogEnabled)]]></bpmn2:script>
+uvmv.executeMethod('prepVnfAdapterRest', execution, isDebugLogEnabled)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_21" name="" sourceRef="ScriptTask_prepVnfRest" targetRef="CallActivity_callVNFAdapterRest" />
<bpmn2:scriptTask id="ScriptTask_prepCompletionHandlerRequest" name="Prep Completion Handler Request" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_12</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_13</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def uvmv = new UpdateVfModuleVolumeInfraV1()
-uvmv.executeMethod('prepCompletionHandlerRequest', execution, UPDVfModVol_requestId, 'UPDATE', UPDVfModVol_source, isDebugLogEnabled)]]></bpmn2:script>
+uvmv.executeMethod('prepCompletionHandlerRequest', execution, UPDVfModVol_requestId, 'UPDATE', UPDVfModVol_source, isDebugLogEnabled)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_13" name="" sourceRef="ScriptTask_prepCompletionHandlerRequest" targetRef="CallActivity_completionHandler" />
- <bpmn2:callActivity id="CallActivity_callVNFAdapterRest" name="VNFAdapterRest" calledElement="vnfAdapterTask">
+ <bpmn2:callActivity id="CallActivity_callVNFAdapterRest" name="VNFAdapterRest" calledElement="openstackAdapterTask">
<bpmn2:extensionElements>
<camunda:in source="mso-request-id" target="mso-request-id" />
<camunda:out source="WorkflowResponse" target="UPDVfModVol_vnfAdapterRestResponse" />
<camunda:out source="WorkflowException" target="WorkflowException" />
<camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
- <camunda:in source="UPDVfModVol_vnfAdapterRestRequest" target="vnfAdapterTaskRequest" />
+ <camunda:in source="UPDVfModVol_vnfAdapterRestRequest" target="openstackAdapterTaskRequest" />
</bpmn2:extensionElements>
<bpmn2:incoming>SequenceFlow_21</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_19</bpmn2:outgoing>
@@ -71,16 +71,16 @@ uvmv.executeMethod('prepCompletionHandlerRequest', execution, UPDVfModVol_reques
<bpmn2:scriptTask id="ScriptTask_prepDbInfraRequest" name="Prep DB Infra Request" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_19</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_11</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def uvmv = new UpdateVfModuleVolumeInfraV1()
-uvmv.executeMethod('prepDbInfraDbRequest', execution, isDebugLogEnabled)]]></bpmn2:script>
+uvmv.executeMethod('prepDbInfraDbRequest', execution, isDebugLogEnabled)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_11" name="" sourceRef="ScriptTask_prepDbInfraRequest" targetRef="ServiceTask_callUpdateInfraDb" />
<bpmn2:scriptTask id="ScriptTask_postProcessTemp" name="Set Success" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_14</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
- <bpmn2:script><![CDATA[// The following variable is checked by the unit test
-execution.setVariable("UpdateVfModuleVolumeSuccessIndicator", true)]]></bpmn2:script>
+ <bpmn2:script>// The following variable is checked by the unit test
+execution.setVariable("UpdateVfModuleVolumeSuccessIndicator", true)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="ScriptTask_postProcessTemp" targetRef="EndEvent_4" />
<bpmn2:exclusiveGateway id="ExclusiveGateway_2">
@@ -101,9 +101,9 @@ execution.setVariable("UpdateVfModuleVolumeSuccessIndicator", true)]]></bpmn2:sc
<bpmn2:scriptTask id="ScriptTask_preFalloutHandler" name="Fallout Handler (prep)" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def uvmv = new UpdateVfModuleVolumeInfraV1()
-uvmv.executeMethod('prepFalloutHandler', execution, isDebugLogEnabled)]]></bpmn2:script>
+uvmv.executeMethod('prepFalloutHandler', execution, isDebugLogEnabled)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="ScriptTask_preFalloutHandler" targetRef="CallActivity_falloutHandler" />
<bpmn2:callActivity id="CallActivity_falloutHandler" name="Fallout Handler" calledElement="FalloutHandler">
@@ -134,17 +134,17 @@ uvmv.executeMethod('prepFalloutHandler', execution, isDebugLogEnabled)]]></bpmn2
<bpmn2:scriptTask id="ScriptTask_queryAaiForVfModule" name="Query AAI for VF Module" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_YesVfModuleRelation</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def uvmv = new UpdateVfModuleVolumeInfraV1()
-uvmv.executeMethod('queryAAIForVfModule', execution, isDebugLogEnabled)]]></bpmn2:script>
+uvmv.executeMethod('queryAAIForVfModule', execution, isDebugLogEnabled)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="ScriptTask_queryAaiForVfModule" targetRef="ExclusiveGateway_personaModelIdMatch" />
<bpmn2:scriptTask id="ScriptTask_handlePersonaModelIdMismatch" name="Handle Persona Model ID Mismatch" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_personaModelidMatchNo</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_18</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def uvmv = new UpdateVfModuleVolumeInfraV1()
-uvmv.executeMethod('handlePersonaModelIdMismatch', execution, isDebugLogEnabled)]]></bpmn2:script>
+uvmv.executeMethod('handlePersonaModelIdMismatch', execution, isDebugLogEnabled)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_18" name="" sourceRef="ScriptTask_handlePersonaModelIdMismatch" targetRef="EndEvent_personaModelIdMismatch" />
<bpmn2:endEvent id="EndEvent_personaModelIdMismatch">
@@ -154,9 +154,9 @@ uvmv.executeMethod('handlePersonaModelIdMismatch', execution, isDebugLogEnabled)
<bpmn2:scriptTask id="ScriptTask_preProcessRequest" name="Pre-process Request" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def uvmv = new UpdateVfModuleVolumeInfraV1()
-uvmv.executeMethod('preProcessRequest', execution, isDebugLogEnabled)]]></bpmn2:script>
+uvmv.executeMethod('preProcessRequest', execution, isDebugLogEnabled)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="ScriptTask_preProcessRequest" targetRef="ScriptTask_sendSynchResponse" />
<bpmn2:startEvent id="StartEvent_1" name="Start">
@@ -166,9 +166,9 @@ uvmv.executeMethod('preProcessRequest', execution, isDebugLogEnabled)]]></bpmn2:
<bpmn2:scriptTask id="ScriptTask_sendSynchResponse" name="Send Synch Response" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_20</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def uvmv = new UpdateVfModuleVolumeInfraV1()
-uvmv.executeMethod('sendSynchResponse', execution, isDebugLogEnabled)]]></bpmn2:script>
+uvmv.executeMethod('sendSynchResponse', execution, isDebugLogEnabled)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_20" name="" sourceRef="ScriptTask_sendSynchResponse" targetRef="ScriptTask_queryAaiGenricVnf" />
<bpmn2:exclusiveGateway id="ExclusiveGateway_1" name="VF-MODULE relation?" default="SequenceFlow_noVfModuleRelation">
@@ -177,7 +177,7 @@ uvmv.executeMethod('sendSynchResponse', execution, isDebugLogEnabled)]]></bpmn2:
<bpmn2:outgoing>SequenceFlow_noVfModuleRelation</bpmn2:outgoing>
</bpmn2:exclusiveGateway>
<bpmn2:sequenceFlow id="SequenceFlow_YesVfModuleRelation" name="Yes" sourceRef="ExclusiveGateway_1" targetRef="ScriptTask_queryAaiForVfModule">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{UPDVfModVol_relatedVfModuleLink != ''}]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{UPDVfModVol_relatedVfModuleLink != ''}</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:sequenceFlow id="SequenceFlow_noVfModuleRelation" name="No" sourceRef="ExclusiveGateway_1" targetRef="ExclusiveGateway_2" />
<bpmn2:exclusiveGateway id="ExclusiveGateway_isTenantMatch" name="TenantId Match?" default="SequenceFlow_NoTenantMatch">
@@ -192,9 +192,9 @@ uvmv.executeMethod('sendSynchResponse', execution, isDebugLogEnabled)]]></bpmn2:
<bpmn2:scriptTask id="ScriptTask_tenantIdMismatch" name="Handle TenantId Mismatch" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_NoTenantMatch</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_17</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def uvmv = new UpdateVfModuleVolumeInfraV1()
-uvmv.executeMethod('handleTenantIdMismatch', execution, isDebugLogEnabled)]]></bpmn2:script>
+uvmv.executeMethod('handleTenantIdMismatch', execution, isDebugLogEnabled)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_17" name="" sourceRef="ScriptTask_tenantIdMismatch" targetRef="EndEvent_2" />
<bpmn2:endEvent id="EndEvent_2">
@@ -204,17 +204,17 @@ uvmv.executeMethod('handleTenantIdMismatch', execution, isDebugLogEnabled)]]></b
<bpmn2:scriptTask id="ScriptTask_queryAAI" name="Query AAI for Volume Group Info" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_15</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def uvmv = new UpdateVfModuleVolumeInfraV1()
-uvmv.executeMethod('queryAAIForVolumeGroup', execution, isDebugLogEnabled)]]></bpmn2:script>
+uvmv.executeMethod('queryAAIForVolumeGroup', execution, isDebugLogEnabled)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_15" name="" sourceRef="ScriptTask_queryAAI" targetRef="ExclusiveGateway_isTenantMatch" />
<bpmn2:scriptTask id="ScriptTask_queryAaiGenricVnf" name="Query AAI for Generic VNF" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_20</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def uvmv = new UpdateVfModuleVolumeInfraV1()
-uvmv.executeMethod('queryAAIForGenericVnf', execution, isDebugLogEnabled)]]></bpmn2:script>
+uvmv.executeMethod('queryAAIForGenericVnf', execution, isDebugLogEnabled)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="ScriptTask_queryAaiGenricVnf" targetRef="ScriptTask_queryAAI" />
</bpmn2:process>
@@ -228,10 +228,10 @@ uvmv.executeMethod('queryAAIForGenericVnf', execution, isDebugLogEnabled)]]></bp
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_StartEvent_62" targetElement="_BPMNShape_ScriptTask_231">
- <di:waypoint xsi:type="dc:Point" x="227" y="149" />
- <di:waypoint xsi:type="dc:Point" x="268" y="149" />
- <di:waypoint xsi:type="dc:Point" x="268" y="150" />
- <di:waypoint xsi:type="dc:Point" x="295" y="150" />
+ <di:waypoint x="227" y="149" />
+ <di:waypoint x="268" y="149" />
+ <di:waypoint x="268" y="150" />
+ <di:waypoint x="295" y="150" />
<bpmndi:BPMNLabel>
<dc:Bounds x="248" y="149" width="6" height="6" />
</bpmndi:BPMNLabel>
@@ -249,8 +249,8 @@ uvmv.executeMethod('queryAAIForGenericVnf', execution, isDebugLogEnabled)]]></bp
<dc:Bounds x="454" y="112" width="109" height="76" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_231" targetElement="_BPMNShape_ScriptTask_232">
- <di:waypoint xsi:type="dc:Point" x="403" y="150" />
- <di:waypoint xsi:type="dc:Point" x="454" y="150" />
+ <di:waypoint x="403" y="150" />
+ <di:waypoint x="454" y="150" />
<bpmndi:BPMNLabel>
<dc:Bounds x="418" y="150" width="6" height="6" />
</bpmndi:BPMNLabel>
@@ -262,15 +262,15 @@ uvmv.executeMethod('queryAAIForGenericVnf', execution, isDebugLogEnabled)]]></bp
<dc:Bounds x="868" y="420" width="109" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_11" sourceElement="_BPMNShape_ScriptTask_233" targetElement="_BPMNShape_ServiceTask_101">
- <di:waypoint xsi:type="dc:Point" x="838" y="460" />
- <di:waypoint xsi:type="dc:Point" x="868" y="460" />
+ <di:waypoint x="838" y="460" />
+ <di:waypoint x="868" y="460" />
<bpmndi:BPMNLabel>
<dc:Bounds x="853" y="491" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_ServiceTask_101" targetElement="_BPMNShape_ScriptTask_234">
- <di:waypoint xsi:type="dc:Point" x="976" y="460" />
- <di:waypoint xsi:type="dc:Point" x="1014" y="460" />
+ <di:waypoint x="976" y="460" />
+ <di:waypoint x="1014" y="460" />
<bpmndi:BPMNLabel>
<dc:Bounds x="959" y="497" width="6" height="6" />
</bpmndi:BPMNLabel>
@@ -282,15 +282,15 @@ uvmv.executeMethod('queryAAIForGenericVnf', execution, isDebugLogEnabled)]]></bp
<dc:Bounds x="1162" y="429" width="109" height="61" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="SequenceFlow_13" sourceElement="_BPMNShape_ScriptTask_234" targetElement="_BPMNShape_CallActivity_43">
- <di:waypoint xsi:type="dc:Point" x="1122" y="460" />
- <di:waypoint xsi:type="dc:Point" x="1162" y="459" />
+ <di:waypoint x="1122" y="460" />
+ <di:waypoint x="1162" y="459" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1134" y="477" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_14" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_CallActivity_43" targetElement="_BPMNShape_ScriptTask_230">
- <di:waypoint xsi:type="dc:Point" x="1270" y="459" />
- <di:waypoint xsi:type="dc:Point" x="1318" y="460" />
+ <di:waypoint x="1270" y="459" />
+ <di:waypoint x="1318" y="460" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1216" y="521" width="6" height="6" />
</bpmndi:BPMNLabel>
@@ -308,15 +308,15 @@ uvmv.executeMethod('queryAAIForGenericVnf', execution, isDebugLogEnabled)]]></bp
<dc:Bounds x="1064" y="112" width="97" height="75" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_15" bpmnElement="SequenceFlow_15" sourceElement="_BPMNShape_ScriptTask_235" targetElement="_BPMNShape_ExclusiveGateway_126">
- <di:waypoint xsi:type="dc:Point" x="850" y="149" />
- <di:waypoint xsi:type="dc:Point" x="931" y="149" />
+ <di:waypoint x="850" y="149" />
+ <di:waypoint x="931" y="149" />
<bpmndi:BPMNLabel>
<dc:Bounds x="877" y="149" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_16" bpmnElement="SequenceFlow_NoTenantMatch" sourceElement="_BPMNShape_ExclusiveGateway_126" targetElement="_BPMNShape_ScriptTask_236">
- <di:waypoint xsi:type="dc:Point" x="965" y="149" />
- <di:waypoint xsi:type="dc:Point" x="1064" y="149" />
+ <di:waypoint x="965" y="149" />
+ <di:waypoint x="1064" y="149" />
<bpmndi:BPMNLabel>
<dc:Bounds x="986" y="149" width="22" height="22" />
</bpmndi:BPMNLabel>
@@ -328,31 +328,31 @@ uvmv.executeMethod('queryAAIForGenericVnf', execution, isDebugLogEnabled)]]></bp
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_17" bpmnElement="SequenceFlow_17" sourceElement="_BPMNShape_ScriptTask_236" targetElement="_BPMNShape_EndEvent_169">
- <di:waypoint xsi:type="dc:Point" x="1160" y="149" />
- <di:waypoint xsi:type="dc:Point" x="1225" y="149" />
+ <di:waypoint x="1160" y="149" />
+ <di:waypoint x="1225" y="149" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1179" y="149" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="SequenceFlow_tenantIsMatch" sourceElement="_BPMNShape_ExclusiveGateway_126" targetElement="_BPMNShape_ExclusiveGateway_254">
- <di:waypoint xsi:type="dc:Point" x="948" y="166" />
- <di:waypoint xsi:type="dc:Point" x="948" y="244" />
+ <di:waypoint x="948" y="166" />
+ <di:waypoint x="948" y="244" />
<bpmndi:BPMNLabel>
<dc:Bounds x="915" y="173" width="29" height="22" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_19" bpmnElement="SequenceFlow_19" sourceElement="_BPMNShape_CallActivity_42" targetElement="_BPMNShape_ScriptTask_233">
- <di:waypoint xsi:type="dc:Point" x="691" y="460" />
- <di:waypoint xsi:type="dc:Point" x="730" y="460" />
+ <di:waypoint x="691" y="460" />
+ <di:waypoint x="730" y="460" />
<bpmndi:BPMNLabel>
<dc:Bounds x="712" y="531" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_20" bpmnElement="SequenceFlow_20" sourceElement="_BPMNShape_ScriptTask_232" targetElement="_BPMNShape_ScriptTask_318">
- <di:waypoint xsi:type="dc:Point" x="562" y="150" />
- <di:waypoint xsi:type="dc:Point" x="581" y="150" />
- <di:waypoint xsi:type="dc:Point" x="581" y="149" />
- <di:waypoint xsi:type="dc:Point" x="612" y="149" />
+ <di:waypoint x="562" y="150" />
+ <di:waypoint x="581" y="150" />
+ <di:waypoint x="581" y="149" />
+ <di:waypoint x="612" y="149" />
<bpmndi:BPMNLabel>
<dc:Bounds x="578" y="150" width="6" height="6" />
</bpmndi:BPMNLabel>
@@ -361,8 +361,8 @@ uvmv.executeMethod('queryAAIForGenericVnf', execution, isDebugLogEnabled)]]></bp
<dc:Bounds x="454" y="420" width="109" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_21" bpmnElement="SequenceFlow_21" sourceElement="_BPMNShape_ScriptTask_237" targetElement="_BPMNShape_CallActivity_42">
- <di:waypoint xsi:type="dc:Point" x="562" y="460" />
- <di:waypoint xsi:type="dc:Point" x="591" y="460" />
+ <di:waypoint x="562" y="460" />
+ <di:waypoint x="591" y="460" />
<bpmndi:BPMNLabel>
<dc:Bounds x="446" y="460" width="6" height="6" />
</bpmndi:BPMNLabel>
@@ -383,8 +383,8 @@ uvmv.executeMethod('queryAAIForGenericVnf', execution, isDebugLogEnabled)]]></bp
<dc:Bounds x="639" y="832" width="109" height="61" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_ScriptTask_238" targetElement="_BPMNShape_CallActivity_44">
- <di:waypoint xsi:type="dc:Point" x="553" y="862" />
- <di:waypoint xsi:type="dc:Point" x="639" y="862" />
+ <di:waypoint x="553" y="862" />
+ <di:waypoint x="639" y="862" />
<bpmndi:BPMNLabel>
<dc:Bounds x="573" y="946" width="6" height="6" />
</bpmndi:BPMNLabel>
@@ -396,8 +396,8 @@ uvmv.executeMethod('queryAAIForGenericVnf', execution, isDebugLogEnabled)]]></bp
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_CallActivity_44" targetElement="_BPMNShape_EndEvent_170">
- <di:waypoint xsi:type="dc:Point" x="747" y="862" />
- <di:waypoint xsi:type="dc:Point" x="862" y="862" />
+ <di:waypoint x="747" y="862" />
+ <di:waypoint x="862" y="862" />
<bpmndi:BPMNLabel>
<dc:Bounds x="765" y="1030" width="6" height="6" />
</bpmndi:BPMNLabel>
@@ -409,15 +409,15 @@ uvmv.executeMethod('queryAAIForGenericVnf', execution, isDebugLogEnabled)]]></bp
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_ScriptTask_230" targetElement="_BPMNShape_EndEvent_171">
- <di:waypoint xsi:type="dc:Point" x="1426" y="460" />
- <di:waypoint xsi:type="dc:Point" x="1461" y="459" />
+ <di:waypoint x="1426" y="460" />
+ <di:waypoint x="1461" y="459" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1442" y="467" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_StartEvent_63" targetElement="_BPMNShape_ScriptTask_238">
- <di:waypoint xsi:type="dc:Point" x="337" y="862" />
- <di:waypoint xsi:type="dc:Point" x="445" y="862" />
+ <di:waypoint x="337" y="862" />
+ <di:waypoint x="445" y="862" />
<bpmndi:BPMNLabel>
<dc:Bounds x="385" y="1030" width="6" height="6" />
</bpmndi:BPMNLabel>
@@ -429,10 +429,10 @@ uvmv.executeMethod('queryAAIForGenericVnf', execution, isDebugLogEnabled)]]></bp
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_YesVfModuleRelation" sourceElement="_BPMNShape_ExclusiveGateway_254" targetElement="_BPMNShape_ScriptTask_313">
- <di:waypoint xsi:type="dc:Point" x="931" y="261" />
- <di:waypoint xsi:type="dc:Point" x="634" y="261" />
- <di:waypoint xsi:type="dc:Point" x="634" y="262" />
- <di:waypoint xsi:type="dc:Point" x="405" y="262" />
+ <di:waypoint x="931" y="261" />
+ <di:waypoint x="634" y="261" />
+ <di:waypoint x="634" y="262" />
+ <di:waypoint x="405" y="262" />
<bpmndi:BPMNLabel>
<dc:Bounds x="729" y="261" width="29" height="22" />
</bpmndi:BPMNLabel>
@@ -447,16 +447,16 @@ uvmv.executeMethod('queryAAIForGenericVnf', execution, isDebugLogEnabled)]]></bp
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_ScriptTask_313" targetElement="_BPMNShape_ExclusiveGateway_255">
- <di:waypoint xsi:type="dc:Point" x="350" y="302" />
- <di:waypoint xsi:type="dc:Point" x="350" y="329" />
- <di:waypoint xsi:type="dc:Point" x="350" y="346" />
+ <di:waypoint x="350" y="302" />
+ <di:waypoint x="350" y="329" />
+ <di:waypoint x="350" y="346" />
<bpmndi:BPMNLabel>
<dc:Bounds x="347" y="318" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="SequenceFlow_personaModelIdMatchYes" sourceElement="_BPMNShape_ExclusiveGateway_255" targetElement="_BPMNShape_ExclusiveGateway_256">
- <di:waypoint xsi:type="dc:Point" x="367" y="363" />
- <di:waypoint xsi:type="dc:Point" x="491" y="363" />
+ <di:waypoint x="367" y="363" />
+ <di:waypoint x="491" y="363" />
<bpmndi:BPMNLabel>
<dc:Bounds x="398" y="363" width="29" height="22" />
</bpmndi:BPMNLabel>
@@ -468,18 +468,18 @@ uvmv.executeMethod('queryAAIForGenericVnf', execution, isDebugLogEnabled)]]></bp
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="SequenceFlow_noVfModuleRelation" sourceElement="_BPMNShape_ExclusiveGateway_254" targetElement="_BPMNShape_ExclusiveGateway_256">
- <di:waypoint xsi:type="dc:Point" x="948" y="278" />
- <di:waypoint xsi:type="dc:Point" x="948" y="363" />
- <di:waypoint xsi:type="dc:Point" x="701" y="363" />
- <di:waypoint xsi:type="dc:Point" x="525" y="363" />
+ <di:waypoint x="948" y="278" />
+ <di:waypoint x="948" y="363" />
+ <di:waypoint x="701" y="363" />
+ <di:waypoint x="525" y="363" />
<bpmndi:BPMNLabel>
<dc:Bounds x="795" y="363" width="22" height="22" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_22" bpmnElement="SequenceFlow_personaModelidMatchNo" sourceElement="_BPMNShape_ExclusiveGateway_255" targetElement="_BPMNShape_ScriptTask_315">
- <di:waypoint xsi:type="dc:Point" x="350" y="380" />
- <di:waypoint xsi:type="dc:Point" x="350" y="401" />
- <di:waypoint xsi:type="dc:Point" x="351" y="460" />
+ <di:waypoint x="350" y="380" />
+ <di:waypoint x="350" y="401" />
+ <di:waypoint x="351" y="460" />
<bpmndi:BPMNLabel>
<dc:Bounds x="350" y="409" width="22" height="22" />
</bpmndi:BPMNLabel>
@@ -494,22 +494,22 @@ uvmv.executeMethod('queryAAIForGenericVnf', execution, isDebugLogEnabled)]]></bp
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_24" bpmnElement="SequenceFlow_18" sourceElement="_BPMNShape_ScriptTask_315" targetElement="_BPMNShape_EndEvent_172">
- <di:waypoint xsi:type="dc:Point" x="351" y="540" />
- <di:waypoint xsi:type="dc:Point" x="351" y="600" />
+ <di:waypoint x="351" y="540" />
+ <di:waypoint x="351" y="600" />
<bpmndi:BPMNLabel>
<dc:Bounds x="348" y="560" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_25" bpmnElement="SequenceFlow_22" sourceElement="_BPMNShape_ExclusiveGateway_256" targetElement="_BPMNShape_ScriptTask_237">
- <di:waypoint xsi:type="dc:Point" x="508" y="380" />
- <di:waypoint xsi:type="dc:Point" x="508" y="420" />
+ <di:waypoint x="508" y="380" />
+ <di:waypoint x="508" y="420" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_318" bpmnElement="ScriptTask_queryAaiGenricVnf">
<dc:Bounds x="612" y="112" width="97" height="75" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_23" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ScriptTask_318" targetElement="_BPMNShape_ScriptTask_235">
- <di:waypoint xsi:type="dc:Point" x="708" y="149" />
- <di:waypoint xsi:type="dc:Point" x="742" y="149" />
+ <di:waypoint x="708" y="149" />
+ <di:waypoint x="742" y="149" />
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateNetworkInstance.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateNetworkInstance.bpmn
index c049eaafa0..76e6199fa6 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateNetworkInstance.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateNetworkInstance.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="3.7.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
<bpmn2:process id="DoCreateNetworkInstance" name="DoCreateNetworkInstance" isExecutable="true">
<bpmn2:startEvent id="createNetwork_startEvent" name="Start Flow">
<bpmn2:outgoing>SequenceFlow_1n61wit</bpmn2:outgoing>
@@ -24,8 +24,7 @@ DoCreateNetworkInstance.callRESTQueryAAICloudRegion(execution)</bpmn2:script>
<bpmn2:outgoing>SequenceFlow_11</bpmn2:outgoing>
<bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoCreateNetworkInstance = new DoCreateNetworkInstance()
-DoCreateNetworkInstance.prepareSDNCRequest(execution)
-</bpmn2:script>
+DoCreateNetworkInstance.prepareSDNCRequest(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_11" name="" sourceRef="prepareSDNCTopoRequest_ScriptTask" targetRef="callAssignSDNCAdapter_CallActivity" />
<bpmn2:scriptTask id="validateSDNCResponse_ScriptTask" name="Validate SDNC Assign Response" scriptFormat="groovy">
@@ -78,13 +77,6 @@ DoCreateNetworkInstance.callRESTQueryAAINetworkId(execution)</bpmn2:script>
<bpmn2:outgoing>SequenceFlow_12</bpmn2:outgoing>
</bpmn2:callActivity>
<bpmn2:sequenceFlow id="SequenceFlow_12" name="" sourceRef="callAssignSDNCAdapter_CallActivity" targetRef="validateSDNCResponse_ScriptTask" />
- <bpmn2:scriptTask id="validateCreatePONetwork_ScriptTask" name="Validate Create PO Network" scriptFormat="groovy">
- <bpmn2:incoming>SequenceFlow_59</bpmn2:incoming>
- <bpmn2:outgoing>SequenceFlow_13</bpmn2:outgoing>
- <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
-def DoCreateNetworkInstance = new DoCreateNetworkInstance()
-DoCreateNetworkInstance.validateCreateNetworkResponse(execution)</bpmn2:script>
- </bpmn2:scriptTask>
<bpmn2:exclusiveGateway id="isNetworkActive_ExclusiveGateway" name="Is Network Active?" default="isNetworkActiveNo_SequenceFlow">
<bpmn2:incoming>isAAIQueryNameYes_SequenceFlow</bpmn2:incoming>
<bpmn2:outgoing>isNetworkActiveYes_SequenceFlow</bpmn2:outgoing>
@@ -149,7 +141,7 @@ DoCreateNetworkInstance.prepareSDNCRollbackRequest(execution)</bpmn2:script>
<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">#{execution.getVariable("sdncVersion") != '1610'} </bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{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">
@@ -163,7 +155,7 @@ DoCreateNetworkInstance.prepareRpcSDNCRollbackRequest(execution)</bpmn2:script>
<bpmn2:incoming>SequenceFlow_1qwubew</bpmn2:incoming>
</bpmn2:endEvent>
<bpmn2:scriptTask id="ScriptTask_0myjg9k" name="Prepare RollbackData" scriptFormat="groovy">
- <bpmn2:incoming>SequenceFlow_15sffxc</bpmn2:incoming>
+ <bpmn2:incoming>Flow_15l1pk2</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_096tad6</bpmn2:outgoing>
<bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoCreateNetworkInstance = new DoCreateNetworkInstance()
@@ -223,7 +215,7 @@ DoCreateNetworkInstance.postProcessResponse(execution)</bpmn2:script>
<bpmn2:incoming>SequenceFlow_0bwpkkb</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_15sffxc</bpmn2:outgoing>
</bpmn2:inclusiveGateway>
- <bpmn2:sequenceFlow id="SequenceFlow_15sffxc" sourceRef="ExclusiveGateway_1qb2vwe" targetRef="ScriptTask_0myjg9k" />
+ <bpmn2:sequenceFlow id="SequenceFlow_15sffxc" sourceRef="ExclusiveGateway_1qb2vwe" targetRef="validateCreatePONetwork_ScriptTask" />
<bpmn2:inclusiveGateway id="ExclusiveGateway_1bk0tqd">
<bpmn2:incoming>SequenceFlow_0b8j5rw</bpmn2:incoming>
<bpmn2:incoming>SequenceFlow_12tlymf</bpmn2:incoming>
@@ -241,19 +233,24 @@ DoCreateNetworkInstance.postProcessResponse(execution)</bpmn2:script>
<bpmn2:outgoing>SequenceFlow_10ttvwn</bpmn2:outgoing>
<bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoCreateNetworkInstance = new DoCreateNetworkInstance()
-DoCreateNetworkInstance.setExceptionFlag(execution)
-</bpmn2:script>
+DoCreateNetworkInstance.setExceptionFlag(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_10ttvwn" sourceRef="ScriptTask_0j3058g" targetRef="isRollbackOn_ExclusiveGateway" />
+ <bpmn2:scriptTask id="validateCreatePONetwork_ScriptTask" name="Validate Create PO Network" scriptFormat="groovy">
+ <bpmn2:incoming>SequenceFlow_15sffxc</bpmn2:incoming>
+ <bpmn2:outgoing>Flow_15l1pk2</bpmn2:outgoing>
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
+def DoCreateNetworkInstance = new DoCreateNetworkInstance()
+DoCreateNetworkInstance.validateCreateNetworkResponse(execution)</bpmn2:script>
+ </bpmn2:scriptTask>
+ <bpmn2:sequenceFlow id="Flow_15l1pk2" sourceRef="validateCreatePONetwork_ScriptTask" targetRef="ScriptTask_0myjg9k" />
<bpmn2:textAnnotation id="TextAnnotation_1py1p84">
- <bpmn2:text>  
-Include ONLY inputs/varrables:  
+ <bpmn2:text>Include ONLY inputs/varrables:  
rollbackData, as Map
-rollbackSDNCRequest
-rollbackActivateSDNCRequest
-rollbackNetworkRequest
-WorkflowException
- </bpmn2:text>
+WorkflowException</bpmn2:text>
</bpmn2:textAnnotation>
<bpmn2:association id="Association_0nketgd" sourceRef="CallActivity_1u07hp7" targetRef="TextAnnotation_1py1p84" />
<bpmn2:textAnnotation id="TextAnnotation_0wjpv6r">
@@ -261,31 +258,7 @@ WorkflowException
</bpmn2:textAnnotation>
<bpmn2:association id="Association_0eolbkz" sourceRef="ExclusiveGateway_1bk0tqd" targetRef="TextAnnotation_0wjpv6r" />
</bpmn2:subProcess>
- <bpmn2:serviceTask id="callCreateNetwork_ServiceTask" name="Call Create Network">
- <bpmn2:extensionElements>
- <camunda:connector>
- <camunda:inputOutput>
- <camunda:inputParameter name="payload">${CRENWKI_createNetworkRequest}</camunda:inputParameter>
- <camunda:inputParameter name="url">${UrnPropertiesReader.getVariable("mso.adapters.network.rest.endpoint", execution)}
-</camunda:inputParameter>
- <camunda:inputParameter name="headers">
- <camunda:map>
- <camunda:entry key="Authorization">#{BasicAuthHeaderValuePO}</camunda:entry>
- <camunda:entry key="content-type">application/xml</camunda:entry>
- </camunda:map>
- </camunda:inputParameter>
- <camunda:inputParameter name="method">POST</camunda:inputParameter>
- <camunda:outputParameter name="CRENWKI_networkReturnCode">${statusCode}</camunda:outputParameter>
- <camunda:outputParameter name="CRENWKI_createNetworkResponse">${response}</camunda:outputParameter>
- </camunda:inputOutput>
- <camunda:connectorId>http-connector</camunda:connectorId>
- </camunda:connector>
- </bpmn2:extensionElements>
- <bpmn2:incoming>SequenceFlow_61</bpmn2:incoming>
- <bpmn2:outgoing>SequenceFlow_59</bpmn2:outgoing>
- </bpmn2:serviceTask>
- <bpmn2:sequenceFlow id="SequenceFlow_59" name="" sourceRef="callCreateNetwork_ServiceTask" targetRef="validateCreatePONetwork_ScriptTask" />
- <bpmn2:sequenceFlow id="SequenceFlow_13" name="" sourceRef="validateCreatePONetwork_ScriptTask" targetRef="callRESTReQueryNetworkID_ScriptTask" />
+ <bpmn2:sequenceFlow id="SequenceFlow_13" name="" sourceRef="Activity_1yoiuwp" targetRef="callRESTReQueryNetworkID_ScriptTask" />
<bpmn2:scriptTask id="callRESTReQueryNetworkID_ScriptTask" name="Call REST ReQuery Network Id in AAI" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_13</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_35</bpmn2:outgoing>
@@ -349,10 +322,9 @@ DoCreateNetworkInstance.callRESTQueryAAINetworkPolicy(execution)</bpmn2:script>
<bpmn2:outgoing>SequenceFlow_61</bpmn2:outgoing>
<bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoCreateNetworkInstance = new DoCreateNetworkInstance()
-DoCreateNetworkInstance.prepareCreateNetworkRequest(execution)
-</bpmn2:script>
+DoCreateNetworkInstance.prepareCreateNetworkRequest(execution)</bpmn2:script>
</bpmn2:scriptTask>
- <bpmn2:sequenceFlow id="SequenceFlow_61" name="" sourceRef="prepareNetworkRequest_ScriptTask" targetRef="callCreateNetwork_ServiceTask" />
+ <bpmn2:sequenceFlow id="SequenceFlow_61" name="" sourceRef="prepareNetworkRequest_ScriptTask" targetRef="Activity_1yoiuwp" />
<bpmn2:scriptTask id="callRESTQueryNetworkTableRef_ScriptTask" name="Call REST Query Network TableRef in AAI" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_38</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_20</bpmn2:outgoing>
@@ -435,7 +407,7 @@ DoCreateNetworkInstance.validateRpcSDNCActivateResponse(execution)</bpmn2:script
</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">#{execution.getVariable("sdncVersion") != '1610'} </bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("sdncVersion") != '1610'}</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:callActivity id="Task_0pbtywn" name="Call SDNC RSRC Assign Adapter V1 " calledElement="sdncAdapter">
<bpmn2:extensionElements>
@@ -458,7 +430,7 @@ DoCreateNetworkInstance.validateRpcSDNCActivateResponse(execution)</bpmn2:script
<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">#{execution.getVariable("sdncVersion") != '1610'} </bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{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">
@@ -466,8 +438,7 @@ DoCreateNetworkInstance.validateRpcSDNCActivateResponse(execution)</bpmn2:script
<bpmn2:outgoing>SequenceFlow_0j8bxnb</bpmn2:outgoing>
<bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoCreateNetworkInstance = new DoCreateNetworkInstance()
-DoCreateNetworkInstance.prepareRpcSDNCRequest(execution)
-</bpmn2:script>
+DoCreateNetworkInstance.prepareRpcSDNCRequest(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:endEvent id="EndEvent_1te02c4">
<bpmn2:incoming>SequenceFlow_1s8b1m1</bpmn2:incoming>
@@ -500,781 +471,773 @@ DoCreateNetworkInstance.postProcessResponse(execution)</bpmn2:script>
def DoCreateNetworkInstance = new DoCreateNetworkInstance()
DoCreateNetworkInstance.getServiceInstance(execution)</bpmn2:script>
</bpmn2:scriptTask>
- <bpmn2:textAnnotation id="TextAnnotation_1orb6o6">
- <bpmn2:text>if '200', Prepare PO Network Rollback</bpmn2:text>
- </bpmn2:textAnnotation>
- <bpmn2:association id="Association_0c315jr" sourceRef="validateCreatePONetwork_ScriptTask" targetRef="TextAnnotation_1orb6o6" />
+ <bpmn2:callActivity id="Activity_1yoiuwp" name="Openstack Adapter" calledElement="openstackAdapterTask">
+ <bpmn2:extensionElements>
+ <camunda:in source="CRENWKI_createNetworkRequest" target="openstackAdapterTaskRequest" />
+ <camunda:out source="WorkflowException" target="WorkflowException" />
+ <camunda:out source="WorkflowResponse" target="CRENWKI_createNetworkResponse" />
+ <camunda:in source="mso-request-id" target="mso-request-id" />
+ </bpmn2:extensionElements>
+ <bpmn2:incoming>SequenceFlow_61</bpmn2:incoming>
+ <bpmn2:outgoing>SequenceFlow_13</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" />
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateNetworkInstance">
<bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="createNetwork_startEvent">
- <dc:Bounds x="397" y="177" width="36" height="36" />
+ <dc:Bounds x="537" y="317" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="390" y="218" width="49" height="13" />
+ <dc:Bounds x="529" y="358" width="51" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_62" bpmnElement="callAAIQuery_scriptTask">
- <dc:Bounds x="926" y="-31" width="100" height="80" />
+ <dc:Bounds x="1066" y="109" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_62" bpmnElement="isAAIQueryNameOk_ExclusiveGateway" isMarkerVisible="true">
- <dc:Bounds x="1098" y="-16" width="50" height="50" />
+ <dc:Bounds x="1238" y="124" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1085" y="-56" width="75" height="24" />
+ <dc:Bounds x="1226" y="84" width="74" height="40" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_ScriptTask_62" targetElement="_BPMNShape_ExclusiveGateway_62">
- <di:waypoint x="1026" y="8" />
- <di:waypoint x="1098" y="9" />
+ <di:waypoint x="1166" y="148" />
+ <di:waypoint x="1238" y="149" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1062" y="-6.5" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_63" bpmnElement="validateCreatePONetwork_ScriptTask">
- <dc:Bounds x="1457" y="1258" width="100" height="80" />
+ <dc:Bounds x="828" y="1193" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="isAAIQueryNameNo_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_62" targetElement="_BPMNShape_InclusiveGateway_4">
- <di:waypoint x="1123" y="34" />
- <di:waypoint x="1123" y="116" />
- <di:waypoint x="1224" y="116" />
+ <di:waypoint x="1263" y="174" />
+ <di:waypoint x="1263" y="256" />
+ <di:waypoint x="1364" y="256" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1131" y="44" width="15" height="14" />
+ <dc:Bounds x="1271" y="184" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="isAAIQueryNameYes_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_62" targetElement="_BPMNShape_ExclusiveGateway_73">
- <di:waypoint x="1148" y="9" />
- <di:waypoint x="1186" y="9" />
- <di:waypoint x="1186" y="9" />
- <di:waypoint x="1224" y="9" />
+ <di:waypoint x="1288" y="149" />
+ <di:waypoint x="1326" y="149" />
+ <di:waypoint x="1326" y="149" />
+ <di:waypoint x="1364" y="149" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1151" y="14.164179104477611" width="18" height="12" />
+ <dc:Bounds x="1291" y="154" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="_BPMNShape_ServiceTask_83" bpmnElement="callCreateNetwork_ServiceTask">
- <dc:Bounds x="1454" y="1135" width="100" height="80" />
- </bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_67" bpmnElement="prepareSDNCTopoRequest_ScriptTask">
- <dc:Bounds x="1590" y="155" width="100" height="80" />
+ <dc:Bounds x="1730" y="295" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_SubProcess_16" bpmnElement="subProcessException_SubProcess" isExpanded="true">
- <dc:Bounds x="31" y="608" width="1266" height="686" />
+ <dc:Bounds x="171" y="748" width="1266" height="686" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_StartEvent_50" bpmnElement="subProcessStart_StartEvent">
- <dc:Bounds x="107" y="1166" width="36" height="36" />
+ <dc:Bounds x="247" y="1306" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="101" y="1207" width="50" height="12" />
+ <dc:Bounds x="240" y="1347" width="52" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_67" bpmnElement="isSdncTopoOk_ExclusiveGateway" isMarkerVisible="true">
- <dc:Bounds x="1615" y="520" width="50" height="50" />
+ <dc:Bounds x="1755" y="660" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1606" y="580" width="67" height="13" />
+ <dc:Bounds x="1746" y="720" width="67" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_26" bpmnElement="sdncTopoNo_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_67" targetElement="_BPMNShape_EndEvent_124">
- <di:waypoint x="1665" y="545" />
- <di:waypoint x="1739" y="545" />
+ <di:waypoint x="1805" y="685" />
+ <di:waypoint x="1879" y="685" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1670" y="545.8651480742376" width="14" height="13" />
+ <dc:Bounds x="1810" y="686" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_28" bpmnElement="sdncTopoYes_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_67" targetElement="_BPMNShape_ScriptTask_133">
- <di:waypoint x="1615" y="545" />
- <di:waypoint x="1554" y="546" />
+ <di:waypoint x="1755" y="685" />
+ <di:waypoint x="1694" y="686" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1587" y="549.9992641545633" width="18" height="12" />
+ <dc:Bounds x="1727" y="690" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_EndEvent_124" bpmnElement="sndcError_EndEvent">
- <dc:Bounds x="1739" y="527" width="36" height="36" />
+ <dc:Bounds x="1879" y="667" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1727" y="576" width="59" height="13" />
+ <dc:Bounds x="1866" y="716" width="61" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_CallActivity_19" bpmnElement="callAssignSDNCAdapter_CallActivity">
- <dc:Bounds x="1590" y="276" width="100" height="80" />
+ <dc:Bounds x="1730" y="416" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_24" bpmnElement="SequenceFlow_11" sourceElement="_BPMNShape_ScriptTask_67" targetElement="_BPMNShape_CallActivity_19">
- <di:waypoint x="1640" y="235" />
- <di:waypoint x="1640" y="276" />
+ <di:waypoint x="1780" y="375" />
+ <di:waypoint x="1780" y="416" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1655" y="255.5" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_29" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_CallActivity_19" targetElement="_BPMNShape_ScriptTask_131">
- <di:waypoint x="1640" y="356" />
- <di:waypoint x="1640" y="395" />
+ <di:waypoint x="1780" y="496" />
+ <di:waypoint x="1780" y="535" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1655" y="375.5" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_35" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_StartEvent_50">
- <di:waypoint x="143" y="1184" />
- <di:waypoint x="170" y="1184" />
+ <di:waypoint x="283" y="1324" />
+ <di:waypoint x="310" y="1324" />
<bpmndi:BPMNLabel>
<dc:Bounds x="157" y="1169" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_131" bpmnElement="validateSDNCResponse_ScriptTask">
- <dc:Bounds x="1590" y="395" width="100" height="80" />
+ <dc:Bounds x="1730" y="535" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ScriptTask_131" targetElement="_BPMNShape_ExclusiveGateway_67">
- <di:waypoint x="1640" y="475" />
- <di:waypoint x="1640" y="498" />
- <di:waypoint x="1640" y="498" />
- <di:waypoint x="1640" y="520" />
+ <di:waypoint x="1780" y="615" />
+ <di:waypoint x="1780" y="638" />
+ <di:waypoint x="1780" y="638" />
+ <di:waypoint x="1780" y="660" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1655" y="498" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_73" bpmnElement="isNetworkActive_ExclusiveGateway" isMarkerVisible="true">
- <dc:Bounds x="1224" y="-16" width="50" height="50" />
+ <dc:Bounds x="1364" y="124" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1221" y="-57" width="56" height="24" />
+ <dc:Bounds x="1363" y="83" width="53" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_39" bpmnElement="isNetworkActiveYes_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_73">
- <di:waypoint x="1274" y="9" />
- <di:waypoint x="1335" y="9" />
+ <di:waypoint x="1414" y="149" />
+ <di:waypoint x="1475" y="149" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1275" y="14.380425096632202" width="18" height="12" />
+ <dc:Bounds x="1415" y="154" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_44" bpmnElement="isNetworkActiveNo_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_73" targetElement="_BPMNShape_InclusiveGateway_4">
- <di:waypoint x="1249" y="34" />
- <di:waypoint x="1249" y="91" />
+ <di:waypoint x="1389" y="174" />
+ <di:waypoint x="1389" y="231" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1258" y="37.520779498373976" width="14" height="12" />
+ <dc:Bounds x="1398" y="178" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_45" bpmnElement="SequenceFlow_21" sourceElement="_BPMNShape_InclusiveGateway_4" targetElement="_BPMNShape_ScriptTask_245">
- <di:waypoint x="1249" y="141" />
- <di:waypoint x="1249" y="276" />
+ <di:waypoint x="1389" y="281" />
+ <di:waypoint x="1389" y="416" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1264" y="208.5" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_InclusiveGateway_4" bpmnElement="InclusiveGateway">
- <dc:Bounds x="1224" y="91" width="50" height="50" />
+ <dc:Bounds x="1364" y="231" width="50" height="50" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1306" y="86" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_133" bpmnElement="callRESTQueryNetworkId_ScriptTask">
- <dc:Bounds x="1454" y="505" width="100" height="80" />
+ <dc:Bounds x="1594" y="645" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_134" bpmnElement="callRESTReQueryNetworkID_ScriptTask">
- <dc:Bounds x="1454" y="1392" width="100" height="80" />
+ <dc:Bounds x="1594" y="1532" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_135" bpmnElement="callRESTUpdateContrailNetwork_ScriptTask">
- <dc:Bounds x="1454" y="1538" width="100" height="80" />
+ <dc:Bounds x="1594" y="1678" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_54" bpmnElement="SequenceFlow_35" sourceElement="_BPMNShape_ScriptTask_134" targetElement="_BPMNShape_ScriptTask_135">
- <di:waypoint x="1504" y="1472" />
- <di:waypoint x="1504" y="1538" />
+ <di:waypoint x="1644" y="1612" />
+ <di:waypoint x="1644" y="1678" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1519" y="1505" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_156" bpmnElement="callRESTQueryVpnBinding_ScriptTask">
- <dc:Bounds x="1454" y="627" width="100" height="80" />
+ <dc:Bounds x="1594" y="767" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="SequenceFlow_15" sourceElement="_BPMNShape_ScriptTask_156" targetElement="_BPMNShape_ScriptTask_215">
- <di:waypoint x="1504" y="707" />
- <di:waypoint x="1504" y="727" />
- <di:waypoint x="1504" y="727" />
- <di:waypoint x="1504" y="750" />
+ <di:waypoint x="1644" y="847" />
+ <di:waypoint x="1644" y="867" />
+ <di:waypoint x="1644" y="867" />
+ <di:waypoint x="1644" y="890" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1519" y="727" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_49" bpmnElement="SequenceFlow_16" sourceElement="_BPMNShape_ScriptTask_133" targetElement="_BPMNShape_ScriptTask_156">
- <di:waypoint x="1504" y="585" />
- <di:waypoint x="1504" y="606" />
- <di:waypoint x="1504" y="606" />
- <di:waypoint x="1504" y="627" />
+ <di:waypoint x="1644" y="725" />
+ <di:waypoint x="1644" y="746" />
+ <di:waypoint x="1644" y="746" />
+ <di:waypoint x="1644" y="767" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1519" y="606" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_87" bpmnElement="SequenceFlow_59" sourceElement="_BPMNShape_ServiceTask_83" targetElement="_BPMNShape_ScriptTask_63">
- <di:waypoint x="1505" y="1215" />
- <di:waypoint x="1505" y="1237" />
- <di:waypoint x="1505" y="1237" />
- <di:waypoint x="1505" y="1258" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1520" y="1237" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_157" bpmnElement="prepareNetworkRequest_ScriptTask">
- <dc:Bounds x="1454" y="1009" width="100" height="80" />
+ <dc:Bounds x="1594" y="1149" width="100" height="80" />
</bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_89" bpmnElement="SequenceFlow_61" sourceElement="_BPMNShape_ScriptTask_157" targetElement="_BPMNShape_ServiceTask_83">
- <di:waypoint x="1504" y="1089" />
- <di:waypoint x="1504" y="1111" />
- <di:waypoint x="1504" y="1111" />
- <di:waypoint x="1504" y="1135" />
+ <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_89" bpmnElement="SequenceFlow_61" sourceElement="_BPMNShape_ScriptTask_157" targetElement="Activity_18agmdb_di">
+ <di:waypoint x="1644" y="1229" />
+ <di:waypoint x="1644" y="1275" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1519" y="1111" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_215" bpmnElement="callRESTQueryNetworkPolicy_ScriptTask">
- <dc:Bounds x="1454" y="750" width="100" height="80" />
+ <dc:Bounds x="1594" y="890" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_60" bpmnElement="SequenceFlow_38" sourceElement="_BPMNShape_ScriptTask_215" targetElement="_BPMNShape_ScriptTask_333">
- <di:waypoint x="1504" y="830" />
- <di:waypoint x="1504" y="879" />
+ <di:waypoint x="1644" y="970" />
+ <di:waypoint x="1644" y="1019" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1519" y="854.5" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_215" bpmnElement="isPONR_ExclusiveGateway" isMarkerVisible="true">
- <dc:Bounds x="304" y="1060" width="50" height="50" />
+ <dc:Bounds x="444" y="1200" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="248" y="1078" width="46" height="12" />
+ <dc:Bounds x="388" y="1218" width="46" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_77" bpmnElement="isPONR_Yes_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_215">
- <di:waypoint x="354" y="1085" />
- <di:waypoint x="457" y="1085" />
- <di:waypoint x="457" y="1159" />
+ <di:waypoint x="494" y="1225" />
+ <di:waypoint x="597" y="1225" />
+ <di:waypoint x="597" y="1299" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="351" y="1088" width="18" height="12" />
+ <dc:Bounds x="491" y="1228" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_85" bpmnElement="isPONR_No_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_215">
- <di:waypoint x="329" y="1060" />
- <di:waypoint x="329" y="1003" />
+ <di:waypoint x="469" y="1200" />
+ <di:waypoint x="469" y="1143" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="339" y="1051" width="14" height="12" />
+ <dc:Bounds x="479" y="1191" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_217" bpmnElement="sdncOk_ExclusiveGateway" isMarkerVisible="true">
- <dc:Bounds x="527" y="845" width="50" height="50" />
+ <dc:Bounds x="667" y="985" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="585" y="858" width="72" height="24" />
+ <dc:Bounds x="726" y="998" width="70" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_92" bpmnElement="sdncOk_Yeso_ExclusiveGateway" sourceElement="_BPMNShape_ExclusiveGateway_217" targetElement="_BPMNShape_ScriptTask_261">
- <di:waypoint x="552" y="845" />
- <di:waypoint x="552" y="776" />
- <di:waypoint x="713" y="776" />
+ <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_92" bpmnElement="sdncOk_Yeso_ExclusiveGateway" sourceElement="_BPMNShape_ExclusiveGateway_217" targetElement="ExclusiveGateway_00dh41t_di">
+ <di:waypoint x="692" y="985" />
+ <di:waypoint x="692" y="916" />
+ <di:waypoint x="853" y="916" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="559" y="829" width="18" height="12" />
+ <dc:Bounds x="699" y="969" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_93" bpmnElement="sdncOk_No_ExclusiveGateway" sourceElement="_BPMNShape_ExclusiveGateway_217">
- <di:waypoint x="551" y="894" />
- <di:waypoint x="551" y="978" />
- <di:waypoint x="713" y="978" />
+ <di:waypoint x="691" y="1034" />
+ <di:waypoint x="691" y="1118" />
+ <di:waypoint x="853" y="1118" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="559" y="895" width="14" height="12" />
+ <dc:Bounds x="699" y="1035" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_245" bpmnElement="callRESTQueryCloudRegion_ScriptTask">
- <dc:Bounds x="1199" y="276" width="100" height="80" />
+ <dc:Bounds x="1339" y="416" width="100" height="80" />
</bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_53" bpmnElement="SequenceFlow_32" sourceElement="_BPMNShape_ScriptTask_245" targetElement="_BPMNShape_ScriptTask_67">
- <di:waypoint x="1299" y="316" />
- <di:waypoint x="1337" y="316" />
+ <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_53" bpmnElement="SequenceFlow_32" sourceElement="_BPMNShape_ScriptTask_245" targetElement="ExclusiveGateway_1ts3ph0_di">
+ <di:waypoint x="1439" y="456" />
+ <di:waypoint x="1477" y="456" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1318" y="301" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_BoundaryEvent_38" bpmnElement="BoundaryEvent_4">
- <dc:Bounds x="1672" y="457" width="36" height="36" />
+ <dc:Bounds x="1812" y="597" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1690" y="493" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_69" bpmnElement="SequenceFlow_34" sourceElement="_BPMNShape_BoundaryEvent_38" targetElement="_BPMNShape_EndEvent_124">
- <di:waypoint x="1702" y="488" />
- <di:waypoint x="1745" y="533" />
+ <di:waypoint x="1842" y="628" />
+ <di:waypoint x="1885" y="673" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1724" y="495.5" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_261" bpmnElement="prepareSDNCRollbackRequest_ScriptTask">
- <dc:Bounds x="886" y="830" width="100" height="79" />
+ <dc:Bounds x="1026" y="970" width="100" height="79" />
</bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_19" bpmnElement="SequenceFlow_13" sourceElement="_BPMNShape_ScriptTask_63" targetElement="_BPMNShape_ScriptTask_134">
- <di:waypoint x="1507" y="1338" />
- <di:waypoint x="1505" y="1392" />
+ <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_19" bpmnElement="SequenceFlow_13" sourceElement="Activity_18agmdb_di" targetElement="_BPMNShape_ScriptTask_134">
+ <di:waypoint x="1644" y="1355" />
+ <di:waypoint x="1644" y="1532" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1506" y="1350" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_SubProcess_28" bpmnElement="unexpectedErrors_SubProcess" isExpanded="true">
- <dc:Bounds x="21" y="381" width="394" height="188" />
+ <dc:Bounds x="161" y="521" width="394" height="188" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_StartEvent_71" bpmnElement="StartEvent_1">
- <dc:Bounds x="54" y="458" width="36" height="36" />
+ <dc:Bounds x="194" y="598" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="72" y="499" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_270" bpmnElement="ScriptTask_1">
- <dc:Bounds x="169" y="436" width="100" height="80" />
+ <dc:Bounds x="309" y="576" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_EndEvent_220" bpmnElement="EndEvent_1">
- <dc:Bounds x="330" y="458" width="36" height="36" />
+ <dc:Bounds x="470" y="598" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="348" y="499" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_StartEvent_71" targetElement="_BPMNShape_ScriptTask_270">
- <di:waypoint x="90" y="476" />
- <di:waypoint x="169" y="476" />
+ <di:waypoint x="230" y="616" />
+ <di:waypoint x="309" y="616" />
<bpmndi:BPMNLabel>
<dc:Bounds x="129" y="476" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_ScriptTask_270" targetElement="_BPMNShape_EndEvent_220">
- <di:waypoint x="269" y="476" />
- <di:waypoint x="330" y="476" />
+ <di:waypoint x="409" y="616" />
+ <di:waypoint x="470" y="616" />
<bpmndi:BPMNLabel>
<dc:Bounds x="301" y="476" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_3" sourceElement="ScriptTask_0z2n0hl_di" targetElement="ExclusiveGateway_0lw40k5_di">
- <di:waypoint x="809" y="235" />
- <di:waypoint x="809" y="316" />
- <di:waypoint x="951" y="316" />
+ <di:waypoint x="949" y="375" />
+ <di:waypoint x="949" y="456" />
+ <di:waypoint x="1091" y="456" />
<bpmndi:BPMNLabel>
<dc:Bounds x="779" y="275.5" width="90" 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" />
+ <dc:Bounds x="1594" y="1019" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_14" bpmnElement="SequenceFlow_20" sourceElement="_BPMNShape_ScriptTask_333" targetElement="_BPMNShape_ScriptTask_157">
- <di:waypoint x="1504" y="959" />
- <di:waypoint x="1504" y="981" />
- <di:waypoint x="1504" y="981" />
- <di:waypoint x="1504" y="1009" />
+ <di:waypoint x="1644" y="1099" />
+ <di:waypoint x="1644" y="1121" />
+ <di:waypoint x="1644" y="1121" />
+ <di:waypoint x="1644" y="1149" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1519" y="981" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1n61wit_di" bpmnElement="SequenceFlow_1n61wit">
- <di:waypoint x="433" y="195" />
- <di:waypoint x="492" y="195" />
- <di:waypoint x="492" y="195" />
- <di:waypoint x="546" y="195" />
+ <di:waypoint x="573" y="335" />
+ <di:waypoint x="632" y="335" />
+ <di:waypoint x="632" y="335" />
+ <di:waypoint x="686" y="335" />
<bpmndi:BPMNLabel>
<dc:Bounds x="507" y="195" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ScriptTask_1jay2gg_di" bpmnElement="ScriptTask_preprocess">
- <dc:Bounds x="546" y="155" width="100" height="80" />
+ <dc:Bounds x="686" y="295" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0ftylq3_di" bpmnElement="SequenceFlow_0ftylq3">
- <di:waypoint x="646" y="195" />
- <di:waypoint x="706" y="195" />
- <di:waypoint x="706" y="195" />
- <di:waypoint x="759" y="195" />
+ <di:waypoint x="786" y="335" />
+ <di:waypoint x="846" y="335" />
+ <di:waypoint x="846" y="335" />
+ <di:waypoint x="899" y="335" />
<bpmndi:BPMNLabel>
<dc:Bounds x="676" y="195" width="90" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ExclusiveGateway_0lw40k5_di" bpmnElement="isNameSent_ExclusiveGateway" isMarkerVisible="true">
- <dc:Bounds x="951" y="291" width="50" height="50" />
+ <dc:Bounds x="1091" y="431" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="933" y="349" width="85" height="26" />
+ <dc:Bounds x="1074" y="489" width="84" height="40" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0635hhm_di" bpmnElement="isNameSentYes_SequenceFlow">
- <di:waypoint x="976" y="291" />
- <di:waypoint x="976" y="170" />
- <di:waypoint x="976" y="170" />
- <di:waypoint x="976" y="49" />
+ <di:waypoint x="1116" y="431" />
+ <di:waypoint x="1116" y="310" />
+ <di:waypoint x="1116" y="310" />
+ <di:waypoint x="1116" y="189" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="988" y="275" width="18" height="13" />
+ <dc:Bounds x="1128" y="415" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1sirjgc_di" bpmnElement="isNameSentNo_SequenceFlow">
- <di:waypoint x="1001" y="316" />
- <di:waypoint x="1199" y="316" />
+ <di:waypoint x="1141" y="456" />
+ <di:waypoint x="1339" y="456" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1005" y="328" width="14" height="13" />
+ <dc:Bounds x="1145" y="468" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="CallActivity_1uxa4p9_di" bpmnElement="Task_1ipbwbj">
- <dc:Bounds x="1014" y="1538" width="100" height="80" />
+ <dc:Bounds x="1154" y="1678" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ScriptTask_0m5hrmn_di" bpmnElement="Task_1rd6dg6">
- <dc:Bounds x="1183" y="1538" width="100" height="80" />
+ <dc:Bounds x="1323" y="1678" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ExclusiveGateway_0n0ptg6_di" bpmnElement="ExclusiveGateway_0n0ptg6" isMarkerVisible="true">
- <dc:Bounds x="724" y="1553" width="50" height="50" />
+ <dc:Bounds x="864" y="1693" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="644" y="1566" width="68" height="24" />
+ <dc:Bounds x="784" y="1706" width="69" height="40" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_13deudk_di" bpmnElement="SequenceFlow_13deudk">
- <di:waypoint x="1183" y="1578" />
- <di:waypoint x="1114" y="1578" />
+ <di:waypoint x="1323" y="1718" />
+ <di:waypoint x="1254" y="1718" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1149" y="1563" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_08qibb9_di" bpmnElement="SequenceFlow_08qibb9">
- <di:waypoint x="1014" y="1578" />
- <di:waypoint x="953" y="1578" />
+ <di:waypoint x="1154" y="1718" />
+ <di:waypoint x="1093" y="1718" />
<bpmndi:BPMNLabel>
<dc:Bounds x="984" y="1563" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1t03rs2_di" bpmnElement="SequenceFlow_1t03rs2">
- <di:waypoint x="853" y="1578" />
- <di:waypoint x="774" y="1578" />
+ <di:waypoint x="993" y="1718" />
+ <di:waypoint x="914" y="1718" />
<bpmndi:BPMNLabel>
<dc:Bounds x="814" y="1563" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1jia57e_di" bpmnElement="SequenceFlow_1jia57e">
- <di:waypoint x="749" y="1553" />
- <di:waypoint x="749" y="1484" />
+ <di:waypoint x="889" y="1693" />
+ <di:waypoint x="889" y="1624" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="757" y="1537.7047949008065" width="18" height="12" />
+ <dc:Bounds x="897" y="1678" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_18ybfu5_di" bpmnElement="SequenceFlow_18ybfu5">
- <di:waypoint x="749" y="1603" />
- <di:waypoint x="749" y="1669" />
+ <di:waypoint x="889" y="1743" />
+ <di:waypoint x="889" y="1809" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="758" y="1603.7606668519034" width="14" height="12" />
+ <dc:Bounds x="898" y="1744" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ScriptTask_1v458g5_di" bpmnElement="validateSDNCActivate_Task">
- <dc:Bounds x="853" y="1538" width="100" height="80" />
+ <dc:Bounds x="993" y="1678" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BoundaryEvent_0pg57au_di" bpmnElement="BoundaryEvent_0vb26bm">
- <dc:Bounds x="859" y="1600" width="36" height="36" />
+ <dc:Bounds x="999" y="1740" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="877" y="1636" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0s51ns0_di" bpmnElement="SequenceFlow_0s51ns0">
- <di:waypoint x="877" y="1636" />
- <di:waypoint x="877" y="1687" />
- <di:waypoint x="767" y="1687" />
+ <di:waypoint x="1017" y="1776" />
+ <di:waypoint x="1017" y="1827" />
+ <di:waypoint x="907" y="1827" />
<bpmndi:BPMNLabel>
<dc:Bounds x="892" y="1661.5" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="EndEvent_0h7h49p_di" bpmnElement="EndEvent_13v46cq">
- <dc:Bounds x="731" y="1669" width="36" height="36" />
+ <dc:Bounds x="871" y="1809" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="711" y="1715" width="76" height="24" />
+ <dc:Bounds x="852" y="1855" width="74" height="40" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ExclusiveGateway_0f9d94i_di" bpmnElement="isSDNCActivate_ExclusiveGateway" isMarkerVisible="true">
- <dc:Bounds x="304" y="953" width="50" height="50" />
+ <dc:Bounds x="444" y="1093" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="210" y="966" width="84" height="24" />
+ <dc:Bounds x="350" y="1106" width="85" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0cly7z2_di" bpmnElement="SequenceFlow_0cly7z2">
- <di:waypoint x="329" y="953" />
- <di:waypoint x="329" y="910" />
+ <di:waypoint x="469" y="1093" />
+ <di:waypoint x="469" y="1050" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="335" y="937" width="18" height="12" />
+ <dc:Bounds x="475" y="1077" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_12tlymf_di" bpmnElement="SequenceFlow_12tlymf">
- <di:waypoint x="354" y="978" />
- <di:waypoint x="457" y="978" />
- <di:waypoint x="457" y="895" />
+ <di:waypoint x="494" y="1118" />
+ <di:waypoint x="597" y="1118" />
+ <di:waypoint x="597" y="1035" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="350" y="988" width="14" height="12" />
+ <dc:Bounds x="490" y="1128" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ExclusiveGateway_1ts3ph0_di" bpmnElement="isSdncRpc1_ExclusiveGateway1" isMarkerVisible="true">
- <dc:Bounds x="1337.228" y="291" width="50" height="50" />
+ <dc:Bounds x="1477" y="431" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1401" y="304" width="61" height="24" />
+ <dc:Bounds x="1542" y="444" width="60" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1r5sja0_di" bpmnElement="isSdncRpc1No_SequenceFlow1">
- <di:waypoint x="1362" y="291" />
- <di:waypoint x="1362" y="195" />
- <di:waypoint x="1590" y="195" />
+ <di:waypoint x="1502" y="431" />
+ <di:waypoint x="1502" y="335" />
+ <di:waypoint x="1730" y="335" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1371" y="273" width="14" height="12" />
+ <dc:Bounds x="1511" y="413" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1ow57qy_di" bpmnElement="isSdncRpc1Yes_SequenceFlow1">
- <di:waypoint x="1362" y="341" />
- <di:waypoint x="1362" y="395" />
+ <di:waypoint x="1502" y="481" />
+ <di:waypoint x="1502" y="535" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1373" y="341" width="18" height="12" />
+ <dc:Bounds x="1513" y="481" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="CallActivity_067czgj_di" bpmnElement="Task_0pbtywn">
- <dc:Bounds x="1454" y="395" width="100" height="80" />
+ <dc:Bounds x="1594" y="535" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0j8bxnb_di" bpmnElement="SequenceFlow_0j8bxnb">
- <di:waypoint x="1412" y="435" />
- <di:waypoint x="1454" y="435" />
+ <di:waypoint x="1552" y="575" />
+ <di:waypoint x="1594" y="575" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1433" y="420" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0d93bqw_di" bpmnElement="SequenceFlow_0d93bqw">
- <di:waypoint x="1554" y="435" />
- <di:waypoint x="1590" y="435" />
+ <di:waypoint x="1694" y="575" />
+ <di:waypoint x="1730" y="575" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1572" y="420" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ExclusiveGateway_00dh41t_di" bpmnElement="isSdncRpc4_ExclusiveGateway4" isMarkerVisible="true">
- <dc:Bounds x="713" y="751" width="50" height="50" />
+ <dc:Bounds x="853" y="891" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="714" y="710" width="61" height="24" />
+ <dc:Bounds x="855" y="850" width="60" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0suu90e_di" bpmnElement="isSdncRpc4Yes_SequenceFlow4">
- <di:waypoint x="738" y="801" />
- <di:waypoint x="738" y="830" />
+ <di:waypoint x="878" y="941" />
+ <di:waypoint x="878" y="970" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="743" y="800" width="18" height="12" />
+ <dc:Bounds x="883" y="940" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0xnyl6e_di" bpmnElement="isSdncRpc4No_SequenceFlow4">
- <di:waypoint x="763" y="776" />
- <di:waypoint x="936" y="776" />
- <di:waypoint x="936" y="830" />
+ <di:waypoint x="903" y="916" />
+ <di:waypoint x="1076" y="916" />
+ <di:waypoint x="1076" y="970" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="772" y="755" width="14" height="12" />
+ <dc:Bounds x="912" y="895" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ExclusiveGateway_1gghe34_di" bpmnElement="isSdncRpc2_ExclusiveGateway2" isMarkerVisible="true">
- <dc:Bounds x="1360" y="1553" width="50" height="50" />
+ <dc:Bounds x="1500" y="1693" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1343" y="1619" width="83" height="36" />
+ <dc:Bounds x="1484" y="1759" width="82" height="40" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1lphs99_di" bpmnElement="isSdncRpc2Yes_SequenceFlow2">
- <di:waypoint x="1360" y="1578" />
- <di:waypoint x="1283" y="1578" />
+ <di:waypoint x="1500" y="1718" />
+ <di:waypoint x="1423" y="1718" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1337" y="1580.0388981849903" width="18" height="12" />
+ <dc:Bounds x="1477" y="1720" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0lk1uut_di" bpmnElement="isSdncRpc2No_SequenceFlow2">
- <di:waypoint x="1385" y="1553" />
- <di:waypoint x="1385" y="1444" />
- <di:waypoint x="799" y="1444" />
+ <di:waypoint x="1525" y="1693" />
+ <di:waypoint x="1525" y="1584" />
+ <di:waypoint x="939" y="1584" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1362" y="1543.660178848007" width="14" height="12" />
+ <dc:Bounds x="1502" y="1684" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ScriptTask_1lkq0a3_di" bpmnElement="Task_10lubzj">
- <dc:Bounds x="1312" y="395" width="100" height="80" />
+ <dc:Bounds x="1452" y="535" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ScriptTask_19o9l99_di" bpmnElement="Task_0q6pzpn">
- <dc:Bounds x="688" y="830" width="100" height="80" />
+ <dc:Bounds x="828" y="970" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="EndEvent_1te02c4_di" bpmnElement="EndEvent_1te02c4">
- <dc:Bounds x="467" y="1426" width="36" height="36" />
+ <dc:Bounds x="607" y="1566" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="486" y="1462" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="EndEvent_1kpt4kc_di" bpmnElement="EndEvent_1kpt4kc">
- <dc:Bounds x="1160" y="1075" width="36" height="36" />
+ <dc:Bounds x="1372" y="1215" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1179" y="1111" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="EndEvent_0ti2ctu_di" bpmnElement="EndEvent_0ti2ctu">
- <dc:Bounds x="1486" y="-9" width="36" height="36" />
+ <dc:Bounds x="1626" y="131" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1468" y="38" width="72" height="12" />
+ <dc:Bounds x="1608" y="178" width="73" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1s8b1m1_di" bpmnElement="SequenceFlow_1s8b1m1">
- <di:waypoint x="699" y="1444" />
- <di:waypoint x="597" y="1444" />
- <di:waypoint x="597" y="1444" />
- <di:waypoint x="503" y="1444" />
+ <di:waypoint x="839" y="1584" />
+ <di:waypoint x="737" y="1584" />
+ <di:waypoint x="737" y="1584" />
+ <di:waypoint x="643" y="1584" />
<bpmndi:BPMNLabel>
<dc:Bounds x="612" y="1444" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ScriptTask_1feo4ms_di" bpmnElement="Task_0zzobg6">
- <dc:Bounds x="699" y="1404" width="100" height="80" />
+ <dc:Bounds x="839" y="1544" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ScriptTask_0myjg9k_di" bpmnElement="ScriptTask_0myjg9k">
- <dc:Bounds x="688" y="1053" width="100" height="80" />
+ <dc:Bounds x="960" y="1193" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0b8j5rw_di" bpmnElement="SequenceFlow_0b8j5rw">
- <di:waypoint x="379" y="870" />
- <di:waypoint x="432" y="870" />
+ <di:waypoint x="519" y="1010" />
+ <di:waypoint x="572" y="1010" />
<bpmndi:BPMNLabel>
<dc:Bounds x="406" y="855" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ScriptTask_17adm0m_di" bpmnElement="Task_1imzwi3">
- <dc:Bounds x="279" y="830" width="100" height="80" />
+ <dc:Bounds x="419" y="970" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1ipz2ze_di" bpmnElement="SequenceFlow_1ipz2ze">
- <di:waypoint x="1454" y="1578" />
- <di:waypoint x="1432" y="1578" />
- <di:waypoint x="1432" y="1578" />
- <di:waypoint x="1410" y="1578" />
+ <di:waypoint x="1594" y="1718" />
+ <di:waypoint x="1572" y="1718" />
+ <di:waypoint x="1572" y="1718" />
+ <di:waypoint x="1550" y="1718" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1447" y="1578" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="CallActivity_1u07hp7_di" bpmnElement="CallActivity_1u07hp7">
- <dc:Bounds x="841" y="1053" width="100" height="80" />
+ <dc:Bounds x="1090" y="1193" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0vzsyrd_di" bpmnElement="SequenceFlow_0vzsyrd">
- <di:waypoint x="941" y="1093" />
- <di:waypoint x="1007" y="1093" />
+ <di:waypoint x="1190" y="1233" />
+ <di:waypoint x="1220" y="1233" />
<bpmndi:BPMNLabel>
<dc:Bounds x="974" y="1078" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0bwpkkb_di" bpmnElement="SequenceFlow_0bwpkkb">
- <di:waypoint x="738" y="910" />
- <di:waypoint x="738" y="953" />
+ <di:waypoint x="878" y="1050" />
+ <di:waypoint x="878" y="1093" />
<bpmndi:BPMNLabel>
<dc:Bounds x="753" y="922" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0lndbvr_di" bpmnElement="SequenceFlow_0lndbvr">
- <di:waypoint x="936" y="909" />
- <di:waypoint x="936" y="978" />
- <di:waypoint x="763" y="978" />
+ <di:waypoint x="1076" y="1049" />
+ <di:waypoint x="1076" y="1118" />
+ <di:waypoint x="903" y="1118" />
<bpmndi:BPMNLabel>
<dc:Bounds x="951" y="944" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_096tad6_di" bpmnElement="SequenceFlow_096tad6">
- <di:waypoint x="788" y="1093" />
- <di:waypoint x="841" y="1093" />
+ <di:waypoint x="1060" y="1233" />
+ <di:waypoint x="1090" y="1233" />
<bpmndi:BPMNLabel>
<dc:Bounds x="815" y="1078" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="TextAnnotation_1py1p84_di" bpmnElement="TextAnnotation_1py1p84">
- <dc:Bounds x="1036" y="901" width="252" height="119" />
+ <dc:Bounds x="1176" y="1041" width="252" height="119" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Association_0nketgd_di" bpmnElement="Association_0nketgd">
- <di:waypoint x="941" y="1069" />
- <di:waypoint x="1041" y="1020" />
+ <di:waypoint x="1187" y="1196" />
+ <di:waypoint x="1230" y="1160" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ScriptTask_0w2ekuz_di" bpmnElement="ScriptTask_0w2ekuz">
- <dc:Bounds x="1007" y="1053" width="100" height="80" />
+ <dc:Bounds x="1220" y="1193" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1qwubew_di" bpmnElement="SequenceFlow_1qwubew">
- <di:waypoint x="1107" y="1093" />
- <di:waypoint x="1160" y="1093" />
+ <di:waypoint x="1320" y="1233" />
+ <di:waypoint x="1372" y="1233" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1134" y="1068" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ExclusiveGateway_1r7vhm5_di" bpmnElement="isRollbackOn_ExclusiveGateway" isMarkerVisible="true">
- <dc:Bounds x="304" y="1159" width="50" height="50" />
+ <dc:Bounds x="444" y="1299" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="290" y="1209" width="78" height="12" />
+ <dc:Bounds x="430" y="1349" width="78" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_19kcbiw_di" bpmnElement="isRollbackOn_SequenceFlow_Yes">
- <di:waypoint x="329" y="1159" />
- <di:waypoint x="329" y="1110" />
+ <di:waypoint x="469" y="1299" />
+ <di:waypoint x="469" y="1250" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="337" y="1142" width="18" height="12" />
+ <dc:Bounds x="477" y="1282" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0pl3e54_di" bpmnElement="isRollbackOn_SequenceFlow_No">
- <di:waypoint x="354" y="1184" />
- <di:waypoint x="432" y="1184" />
+ <di:waypoint x="494" y="1324" />
+ <di:waypoint x="572" y="1324" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="355" y="1190" width="14" height="12" />
+ <dc:Bounds x="495" y="1330" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="InclusiveGateway_0zl5xa8_di" bpmnElement="ExclusiveGateway_1qb2vwe">
- <dc:Bounds x="713" y="953" width="50" height="50" />
+ <dc:Bounds x="853" y="1093" width="50" height="50" />
<bpmndi:BPMNLabel>
<dc:Bounds x="738" y="1003" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_15sffxc_di" bpmnElement="SequenceFlow_15sffxc">
- <di:waypoint x="738" y="1003" />
- <di:waypoint x="738" y="1053" />
+ <di:waypoint x="878" y="1143" />
+ <di:waypoint x="878" y="1193" />
<bpmndi:BPMNLabel>
<dc:Bounds x="753" y="1028" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="InclusiveGateway_0t3i8it_di" bpmnElement="ExclusiveGateway_1bk0tqd">
- <dc:Bounds x="432" y="845" width="50" height="50" />
+ <dc:Bounds x="572" y="985" width="50" height="50" />
<bpmndi:BPMNLabel>
<dc:Bounds x="457" y="895" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0k7y7b5_di" bpmnElement="SequenceFlow_0k7y7b5">
- <di:waypoint x="482" y="870" />
- <di:waypoint x="527" y="870" />
+ <di:waypoint x="622" y="1010" />
+ <di:waypoint x="667" y="1010" />
<bpmndi:BPMNLabel>
<dc:Bounds x="505" y="845" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ScriptTask_0p3v749_di" bpmnElement="ScriptTask_0p3v749">
- <dc:Bounds x="1335" y="-31" width="100" height="80" />
+ <dc:Bounds x="1475" y="109" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_18ylufb_di" bpmnElement="SequenceFlow_18ylufb">
- <di:waypoint x="1435" y="9" />
- <di:waypoint x="1486" y="9" />
+ <di:waypoint x="1575" y="149" />
+ <di:waypoint x="1626" y="149" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1461" y="-6" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="InclusiveGateway_1eochiz_di" bpmnElement="ExclusiveGateway_1umhuft">
- <dc:Bounds x="432" y="1159" width="50" height="50" />
+ <dc:Bounds x="572" y="1299" width="50" height="50" />
<bpmndi:BPMNLabel>
<dc:Bounds x="457" y="1209" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_17nx822_di" bpmnElement="SequenceFlow_17nx822">
- <di:waypoint x="482" y="1184" />
- <di:waypoint x="1057" y="1184" />
- <di:waypoint x="1057" y="1133" />
+ <di:waypoint x="622" y="1324" />
+ <di:waypoint x="1270" y="1324" />
+ <di:waypoint x="1270" y="1273" />
<bpmndi:BPMNLabel>
<dc:Bounds x="770" y="1169" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="TextAnnotation_1orb6o6_di" bpmnElement="TextAnnotation_1orb6o6">
- <dc:Bounds x="1606" y="1241" width="233" height="37" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="Association_0c315jr_di" bpmnElement="Association_0c315jr">
- <di:waypoint x="1557" y="1289" />
- <di:waypoint x="1621" y="1278" />
- </bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="TextAnnotation_0wjpv6r_di" bpmnElement="TextAnnotation_0wjpv6r">
- <dc:Bounds x="341" y="735" width="180" height="36" />
+ <dc:Bounds x="481" y="875" width="180" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Association_0eolbkz_di" bpmnElement="Association_0eolbkz">
- <di:waypoint x="452" y="850" />
- <di:waypoint x="435" y="771" />
+ <di:waypoint x="592" y="990" />
+ <di:waypoint x="575" y="911" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ScriptTask_0j3058g_di" bpmnElement="ScriptTask_0j3058g">
- <dc:Bounds x="170" y="1144" width="100" height="80" />
+ <dc:Bounds x="310" y="1284" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_10ttvwn_di" bpmnElement="SequenceFlow_10ttvwn">
- <di:waypoint x="270" y="1184" />
- <di:waypoint x="304" y="1184" />
+ <di:waypoint x="410" y="1324" />
+ <di:waypoint x="444" y="1324" />
<bpmndi:BPMNLabel>
<dc:Bounds x="287" y="1159" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ScriptTask_0z2n0hl_di" bpmnElement="callGetServiceInstance">
- <dc:Bounds x="759" y="155" width="100" height="80" />
+ <dc:Bounds x="899" y="295" width="100" height="80" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="Activity_18agmdb_di" bpmnElement="Activity_1yoiuwp">
+ <dc:Bounds x="1594" y="1275" width="100" height="80" />
</bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="Flow_15l1pk2_di" bpmnElement="Flow_15l1pk2">
+ <di:waypoint x="928" y="1233" />
+ <di:waypoint x="960" y="1233" />
+ </bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</bpmn2:definitions>
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateNetworkInstanceRollback.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateNetworkInstanceRollback.bpmn
index 6a4861b9a4..5103fa9d0a 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateNetworkInstanceRollback.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateNetworkInstanceRollback.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: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: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="3.7.0">
<bpmn:process id="DoCreateNetworkInstanceRollback" name="DoCreateNetworkInstanceRollback" isExecutable="true">
<bpmn:startEvent id="StartEvent_1">
<bpmn:outgoing>SequenceFlow_1krl2dg</bpmn:outgoing>
@@ -7,9 +7,9 @@
<bpmn:scriptTask id="Task_0whino1" name="PreProcess Incoming Data" scriptFormat="groovy">
<bpmn:incoming>SequenceFlow_1krl2dg</bpmn:incoming>
<bpmn:outgoing>SequenceFlow_0u41iz2</bpmn:outgoing>
- <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoCreateNetworkInstanceRollback = new DoCreateNetworkInstanceRollback()
-DoCreateNetworkInstanceRollback.preProcessRequest(execution)]]></bpmn:script>
+DoCreateNetworkInstanceRollback.preProcessRequest(execution)</bpmn:script>
</bpmn:scriptTask>
<bpmn:sequenceFlow id="SequenceFlow_1krl2dg" sourceRef="StartEvent_1" targetRef="Task_0whino1" />
<bpmn:sequenceFlow id="SequenceFlow_0u41iz2" sourceRef="Task_0whino1" targetRef="ExclusiveGateway_0p5zgdb" />
@@ -72,9 +72,9 @@ DoCreateNetworkInstanceRollback.preProcessRequest(execution)]]></bpmn:script>
<bpmn:incoming>SequenceFlow_0qc4v9t</bpmn:incoming>
<bpmn:incoming>SequenceFlow_0el8yzs</bpmn:incoming>
<bpmn:outgoing>SequenceFlow_0yto4gz</bpmn:outgoing>
- <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoCreateNetworkInstanceRollback = new DoCreateNetworkInstanceRollback()
-DoCreateNetworkInstanceRollback.validateRollbackResponses(execution)]]></bpmn:script>
+DoCreateNetworkInstanceRollback.validateRollbackResponses(execution)</bpmn:script>
</bpmn:scriptTask>
<bpmn:exclusiveGateway id="ExclusiveGateway_1n5jck8" name="is SDNC Rollback?" default="SequenceFlow_0qc4v9t">
<bpmn:incoming>SequenceFlow_1lteduj</bpmn:incoming>
@@ -84,20 +84,20 @@ DoCreateNetworkInstanceRollback.validateRollbackResponses(execution)]]></bpmn:sc
</bpmn:exclusiveGateway>
<bpmn:sequenceFlow id="SequenceFlow_1bb7zpp" name="No" sourceRef="ExclusiveGateway_0p5zgdb" targetRef="ExclusiveGateway_0v0en47" />
<bpmn:sequenceFlow id="SequenceFlow_1mxbdps" name="Yes" sourceRef="ExclusiveGateway_0p5zgdb" targetRef="CallActivity_1x88fsq">
- <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("CRENWKIR_rollbackActivateSDNCRequest") != null}]]></bpmn:conditionExpression>
+ <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">#{execution.getVariable("CRENWKIR_rollbackActivateSDNCRequest") != null}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
- <bpmn:sequenceFlow id="SequenceFlow_0e1uixp" name="Yes" sourceRef="ExclusiveGateway_0v0en47" targetRef="ServiceTask_0bqh5yl">
- <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("CRENWKIR_rollbackNetworkRequest") != null}]]></bpmn:conditionExpression>
+ <bpmn:sequenceFlow id="SequenceFlow_0e1uixp" name="Yes" sourceRef="ExclusiveGateway_0v0en47" targetRef="Activity_0620gqx">
+ <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">#{execution.getVariable("CRENWKIR_rollbackNetworkRequest") != null}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:sequenceFlow id="SequenceFlow_07s5r14" sourceRef="CallActivity_1x88fsq" targetRef="ExclusiveGateway_0v0en47" />
<bpmn:sequenceFlow id="SequenceFlow_1lteduj" name="No" sourceRef="ExclusiveGateway_0v0en47" targetRef="ExclusiveGateway_1n5jck8" />
<bpmn:sequenceFlow id="SequenceFlow_0virkpu" name="Yes" sourceRef="ExclusiveGateway_1n5jck8" targetRef="ExclusiveGateway_17g4q5c">
- <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("CRENWKIR_rollbackSDNCRequest") != null}]]></bpmn:conditionExpression>
+ <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">#{execution.getVariable("CRENWKIR_rollbackSDNCRequest") != null}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<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") != '1610'} ]]></bpmn:conditionExpression>
+ <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">#{execution.getVariable("sdncVersion") != '1610'} </bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:endEvent id="EndEvent_1fvr7ad">
<bpmn:incoming>SequenceFlow_0yto4gz</bpmn:incoming>
@@ -109,9 +109,9 @@ DoCreateNetworkInstanceRollback.validateRollbackResponses(execution)]]></bpmn:sc
<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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoCreateNetworkInstanceRollback = new DoCreateNetworkInstanceRollback()
-DoCreateNetworkInstanceRollback.processJavaException(execution)]]></bpmn:script>
+DoCreateNetworkInstanceRollback.processJavaException(execution)</bpmn:script>
</bpmn:scriptTask>
<bpmn:startEvent id="StartEvent_1j0eixl">
<bpmn:outgoing>SequenceFlow_0xktw7v</bpmn:outgoing>
@@ -137,9 +137,9 @@ DoCreateNetworkInstanceRollback.processJavaException(execution)]]></bpmn:script>
<bpmn:scriptTask id="Task_07i164j" name="Catch Exception" scriptFormat="groovy">
<bpmn:incoming>SequenceFlow_0q0te67</bpmn:incoming>
<bpmn:outgoing>SequenceFlow_0lomcvn</bpmn:outgoing>
- <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
execution.setVariable("workflowException", execution.getVariable("WorkflowException")
-]]></bpmn:script>
+</bpmn:script>
</bpmn:scriptTask>
<bpmn:sequenceFlow id="SequenceFlow_0q0te67" sourceRef="StartEvent_1p75ok8" targetRef="Task_07i164j" />
<bpmn:sequenceFlow id="SequenceFlow_0lomcvn" sourceRef="Task_07i164j" targetRef="EndEvent_1aqh7ih" />
@@ -172,29 +172,41 @@ execution.setVariable("workflowException", execution.getVariable("WorkflowExcept
</bpmn:endEvent>
<bpmn:sequenceFlow id="SequenceFlow_1j55a94" sourceRef="BoundaryEvent_1yj6513" targetRef="EndEvent_05tcxw3" />
<bpmn:sequenceFlow id="SequenceFlow_1yn24xq" sourceRef="BoundaryEvent_1y8kgef" targetRef="EndEvent_05tcxw3" />
- <bpmn:scriptTask id="ServiceTask_0bqh5yl" name="Call Rollback Network" scriptFormat="groovy">
- <bpmn:incoming>SequenceFlow_0e1uixp</bpmn:incoming>
+ <bpmn:scriptTask id="ServiceTask_0bqh5yl" name="Set Response" scriptFormat="groovy">
+ <bpmn:incoming>Flow_0t2n952</bpmn:incoming>
<bpmn:outgoing>SequenceFlow_17o4w67</bpmn:outgoing>
- <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoCreateNetworkInstanceRollback = new DoCreateNetworkInstanceRollback()
-DoCreateNetworkInstanceRollback.callPONetworkAdapter(execution)]]></bpmn:script>
+DoCreateNetworkInstanceRollback.setNetworkAdapterResponseCode(execution)</bpmn:script>
</bpmn:scriptTask>
- <bpmn:textAnnotation id="TextAnnotation_000ap15"> <bpmn:text><![CDATA[Include ONLY inputs/varrables:  
+ <bpmn:callActivity id="Activity_0620gqx" name="openstack Adapter" calledElement="openstackAdapterTask">
+ <bpmn:extensionElements>
+ <camunda:in source="CRENWKIR_rollbackNetworkRequest" target="openstackAdapterTaskRequest" />
+ <camunda:out source="WorkflowException" target="WorkflowException" />
+ <camunda:out source="WorkflowResponse" target="WorkflowResponse" />
+ </bpmn:extensionElements>
+ <bpmn:incoming>SequenceFlow_0e1uixp</bpmn:incoming>
+ <bpmn:outgoing>Flow_0t2n952</bpmn:outgoing>
+ </bpmn:callActivity>
+ <bpmn:sequenceFlow id="Flow_0t2n952" sourceRef="Activity_0620gqx" targetRef="ServiceTask_0bqh5yl" />
+ <bpmn:textAnnotation id="TextAnnotation_000ap15">
+ <bpmn:text>Include ONLY inputs/varrables:  
rollbackData, as Map
-rollbackSDNCRequest
-rollbackActivateSDNCRequest
-rollbackNetworkRequest
WorkflowException
 
-]]></bpmn:text>
-</bpmn:textAnnotation>
+</bpmn:text>
+ </bpmn:textAnnotation>
<bpmn:association id="Association_0ybkmal" sourceRef="Task_0whino1" targetRef="TextAnnotation_000ap15" />
- <bpmn:textAnnotation id="TextAnnotation_0vwyo82"> <bpmn:text><![CDATA[set value for:
+ <bpmn:textAnnotation id="TextAnnotation_0vwyo82">
+ <bpmn:text>set value for:
WorkflowException
rolledBack
wasDeleted
-]]></bpmn:text>
-</bpmn:textAnnotation>
+</bpmn:text>
+ </bpmn:textAnnotation>
<bpmn:association id="Association_1gx121b" sourceRef="ScriptTask_1ggaxfu" targetRef="TextAnnotation_0vwyo82" />
</bpmn:process>
<bpmn:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" />
@@ -202,316 +214,321 @@ wasDeleted
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateNetworkInstanceRollback">
<bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
- <dc:Bounds x="214" y="240" width="36" height="36" />
+ <dc:Bounds x="374" y="100" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="232" y="276" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ScriptTask_1dqe09s_di" bpmnElement="Task_0whino1">
- <dc:Bounds x="333" y="218" width="100" height="80" />
+ <dc:Bounds x="493" y="78" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1krl2dg_di" bpmnElement="SequenceFlow_1krl2dg">
- <di:waypoint xsi:type="dc:Point" x="250" y="258" />
- <di:waypoint xsi:type="dc:Point" x="333" y="258" />
+ <di:waypoint x="410" y="118" />
+ <di:waypoint x="493" y="118" />
<bpmndi:BPMNLabel>
<dc:Bounds x="292" y="243" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0u41iz2_di" bpmnElement="SequenceFlow_0u41iz2">
- <di:waypoint xsi:type="dc:Point" x="433" y="258" />
- <di:waypoint xsi:type="dc:Point" x="556" y="258" />
- <di:waypoint xsi:type="dc:Point" x="556" y="347" />
+ <di:waypoint x="593" y="118" />
+ <di:waypoint x="716" y="118" />
+ <di:waypoint x="716" y="207" />
<bpmndi:BPMNLabel>
<dc:Bounds x="495" y="243" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="CallActivity_1x88fsq_di" bpmnElement="CallActivity_1x88fsq">
- <dc:Bounds x="506" y="481" width="100" height="80" />
+ <dc:Bounds x="666" y="341" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="CallActivity_0kbwa1x_di" bpmnElement="CallActivity_0kbwa1x">
- <dc:Bounds x="972" y="481" width="100" height="80" />
+ <dc:Bounds x="1132" y="341" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ExclusiveGateway_0p5zgdb_di" bpmnElement="ExclusiveGateway_0p5zgdb" isMarkerVisible="true">
- <dc:Bounds x="531" y="347" width="50" height="50" />
+ <dc:Bounds x="691" y="207" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="439" y="360" width="79" height="24" />
+ <dc:Bounds x="600" y="220" width="77" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ExclusiveGateway_0v0en47_di" bpmnElement="ExclusiveGateway_0v0en47" isMarkerVisible="true">
- <dc:Bounds x="697" y="347" width="50" height="50" />
+ <dc:Bounds x="857" y="207" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="685" y="312" width="74" height="24" />
+ <dc:Bounds x="847" y="172" width="71" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="TextAnnotation_000ap15_di" bpmnElement="TextAnnotation_000ap15">
- <dc:Bounds x="112" y="355" width="277" height="115" />
+ <dc:Bounds x="272" y="215" width="277" height="115" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Association_0ybkmal_di" bpmnElement="Association_0ybkmal">
- <di:waypoint xsi:type="dc:Point" x="349" y="298" />
- <di:waypoint xsi:type="dc:Point" x="300" y="355" />
+ <di:waypoint x="509" y="158" />
+ <di:waypoint x="460" y="215" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="CallActivity_1xilevb_di" bpmnElement="CallActivity_1xilevb">
- <dc:Bounds x="972" y="608" width="100" height="80" />
+ <dc:Bounds x="1132" y="468" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ExclusiveGateway_17g4q5c_di" bpmnElement="ExclusiveGateway_17g4q5c" isMarkerVisible="true">
- <dc:Bounds x="879" y="496" width="50" height="50" />
+ <dc:Bounds x="1039" y="356" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="914" y="460" width="82" height="12" />
+ <dc:Bounds x="1074" y="320" width="83" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ScriptTask_1ggaxfu_di" bpmnElement="ScriptTask_1ggaxfu">
- <dc:Bounds x="1123" y="332" width="100" height="80" />
+ <dc:Bounds x="1283" y="192" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ExclusiveGateway_1n5jck8_di" bpmnElement="ExclusiveGateway_1n5jck8" isMarkerVisible="true">
- <dc:Bounds x="879" y="347" width="50" height="50" />
+ <dc:Bounds x="1039" y="207" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="880" y="308" width="48" height="24" />
+ <dc:Bounds x="1040" y="168" width="49" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="TextAnnotation_0vwyo82_di" bpmnElement="TextAnnotation_0vwyo82">
- <dc:Bounds x="1287" y="410" width="165" height="60" />
+ <dc:Bounds x="1447" y="270" width="165" height="60" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Association_1gx121b_di" bpmnElement="Association_1gx121b">
- <di:waypoint xsi:type="dc:Point" x="1223" y="389" />
- <di:waypoint xsi:type="dc:Point" x="1287" y="412" />
+ <di:waypoint x="1383" y="249" />
+ <di:waypoint x="1447" y="272" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1bb7zpp_di" bpmnElement="SequenceFlow_1bb7zpp">
- <di:waypoint xsi:type="dc:Point" x="581" y="372" />
- <di:waypoint xsi:type="dc:Point" x="697" y="372" />
+ <di:waypoint x="741" y="232" />
+ <di:waypoint x="857" y="232" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="582" y="349.27450980392155" width="14" height="12" />
+ <dc:Bounds x="742" y="209" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1mxbdps_di" bpmnElement="SequenceFlow_1mxbdps">
- <di:waypoint xsi:type="dc:Point" x="556" y="397" />
- <di:waypoint xsi:type="dc:Point" x="556" y="481" />
+ <di:waypoint x="716" y="257" />
+ <di:waypoint x="716" y="341" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="560" y="397.10731155015196" width="18" height="12" />
+ <dc:Bounds x="720" y="257" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0e1uixp_di" bpmnElement="SequenceFlow_0e1uixp">
- <di:waypoint xsi:type="dc:Point" x="722" y="397" />
- <di:waypoint xsi:type="dc:Point" x="722" y="439" />
- <di:waypoint xsi:type="dc:Point" x="722" y="439" />
- <di:waypoint xsi:type="dc:Point" x="722" y="481" />
+ <di:waypoint x="882" y="257" />
+ <di:waypoint x="882" y="290" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="730" y="395" width="18" height="12" />
+ <dc:Bounds x="890" y="253" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_07s5r14_di" bpmnElement="SequenceFlow_07s5r14">
- <di:waypoint xsi:type="dc:Point" x="606" y="521" />
- <di:waypoint xsi:type="dc:Point" x="647" y="521" />
- <di:waypoint xsi:type="dc:Point" x="647" y="372" />
- <di:waypoint xsi:type="dc:Point" x="697" y="372" />
+ <di:waypoint x="766" y="381" />
+ <di:waypoint x="807" y="381" />
+ <di:waypoint x="807" y="232" />
+ <di:waypoint x="857" y="232" />
<bpmndi:BPMNLabel>
<dc:Bounds x="662" y="446.5" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1lteduj_di" bpmnElement="SequenceFlow_1lteduj">
- <di:waypoint xsi:type="dc:Point" x="747" y="372" />
- <di:waypoint xsi:type="dc:Point" x="879" y="372" />
+ <di:waypoint x="907" y="232" />
+ <di:waypoint x="1039" y="232" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="750" y="350.14631933618307" width="14" height="12" />
+ <dc:Bounds x="910" y="210" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0virkpu_di" bpmnElement="SequenceFlow_0virkpu">
- <di:waypoint xsi:type="dc:Point" x="904" y="397" />
- <di:waypoint xsi:type="dc:Point" x="904" y="496" />
+ <di:waypoint x="1064" y="257" />
+ <di:waypoint x="1064" y="356" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="914" y="392.7469456247061" width="18" height="12" />
+ <dc:Bounds x="1074" y="253" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_17o4w67_di" bpmnElement="SequenceFlow_17o4w67">
- <di:waypoint xsi:type="dc:Point" x="772" y="521" />
- <di:waypoint xsi:type="dc:Point" x="817" y="521" />
- <di:waypoint xsi:type="dc:Point" x="817" y="372" />
- <di:waypoint xsi:type="dc:Point" x="879" y="372" />
+ <di:waypoint x="932" y="451" />
+ <di:waypoint x="977" y="451" />
+ <di:waypoint x="977" y="232" />
+ <di:waypoint x="1039" y="232" />
<bpmndi:BPMNLabel>
<dc:Bounds x="832" y="446.5" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_101y57s_di" bpmnElement="SequenceFlow_101y57s">
- <di:waypoint xsi:type="dc:Point" x="904" y="546" />
- <di:waypoint xsi:type="dc:Point" x="904" y="648" />
- <di:waypoint xsi:type="dc:Point" x="972" y="648" />
+ <di:waypoint x="1064" y="406" />
+ <di:waypoint x="1064" y="508" />
+ <di:waypoint x="1132" y="508" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="913" y="544" width="14" height="12" />
+ <dc:Bounds x="1073" y="404" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0mw0dgd_di" bpmnElement="SequenceFlow_0mw0dgd">
- <di:waypoint xsi:type="dc:Point" x="929" y="521" />
- <di:waypoint xsi:type="dc:Point" x="972" y="521" />
+ <di:waypoint x="1089" y="381" />
+ <di:waypoint x="1132" y="381" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="930" y="498" width="18" height="12" />
+ <dc:Bounds x="1090" y="358" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="EndEvent_1fvr7ad_di" bpmnElement="EndEvent_1fvr7ad">
- <dc:Bounds x="1278" y="255" width="36" height="36" />
+ <dc:Bounds x="1438" y="115" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1296" y="291" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0qc4v9t_di" bpmnElement="SequenceFlow_0qc4v9t">
- <di:waypoint xsi:type="dc:Point" x="929" y="372" />
- <di:waypoint xsi:type="dc:Point" x="1123" y="372" />
+ <di:waypoint x="1089" y="232" />
+ <di:waypoint x="1283" y="232" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="941" y="351.1191898360114" width="14" height="12" />
+ <dc:Bounds x="1101" y="211" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0790olb_di" bpmnElement="SequenceFlow_0790olb">
- <di:waypoint xsi:type="dc:Point" x="1072" y="648" />
- <di:waypoint xsi:type="dc:Point" x="1173" y="648" />
- <di:waypoint xsi:type="dc:Point" x="1173" y="546" />
+ <di:waypoint x="1232" y="508" />
+ <di:waypoint x="1333" y="508" />
+ <di:waypoint x="1333" y="406" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1123" y="633" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1rrutp3_di" bpmnElement="SequenceFlow_1rrutp3">
- <di:waypoint xsi:type="dc:Point" x="1072" y="521" />
- <di:waypoint xsi:type="dc:Point" x="1148" y="521" />
+ <di:waypoint x="1232" y="381" />
+ <di:waypoint x="1308" y="381" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1110" y="506" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="SubProcess_1p4663w_di" bpmnElement="SubProcess_1p4663w" isExpanded="true">
- <dc:Bounds x="-6" y="665" width="394" height="188" />
+ <dc:Bounds x="154" y="525" width="394" height="188" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ScriptTask_0by1uwk_di" bpmnElement="ScriptTask_0by1uwk">
- <dc:Bounds x="142" y="720" width="100" height="80" />
+ <dc:Bounds x="302" y="580" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="StartEvent_1j0eixl_di" bpmnElement="StartEvent_1j0eixl">
- <dc:Bounds x="27" y="742" width="36" height="36" />
+ <dc:Bounds x="187" y="602" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="45" y="783" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="EndEvent_0jxh015_di" bpmnElement="EndEvent_0jxh015">
- <dc:Bounds x="303" y="742" width="36" height="36" />
+ <dc:Bounds x="463" y="602" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="321" y="783" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0xktw7v_di" bpmnElement="SequenceFlow_0xktw7v">
- <di:waypoint xsi:type="dc:Point" x="63" y="760" />
- <di:waypoint xsi:type="dc:Point" x="142" y="760" />
+ <di:waypoint x="223" y="620" />
+ <di:waypoint x="302" y="620" />
<bpmndi:BPMNLabel>
<dc:Bounds x="105" y="760" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0soe5t3_di" bpmnElement="SequenceFlow_0soe5t3">
- <di:waypoint xsi:type="dc:Point" x="242" y="760" />
- <di:waypoint xsi:type="dc:Point" x="303" y="760" />
+ <di:waypoint x="402" y="620" />
+ <di:waypoint x="463" y="620" />
<bpmndi:BPMNLabel>
<dc:Bounds x="277" y="760" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="InclusiveGateway_0dot6c9_di" bpmnElement="ExclusiveGateway_0b9kbop">
- <dc:Bounds x="1148" y="496" width="50" height="50" />
+ <dc:Bounds x="1308" y="356" width="50" height="50" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1173" y="546" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0el8yzs_di" bpmnElement="SequenceFlow_0el8yzs">
- <di:waypoint xsi:type="dc:Point" x="1173" y="496" />
- <di:waypoint xsi:type="dc:Point" x="1173" y="412" />
+ <di:waypoint x="1333" y="356" />
+ <di:waypoint x="1333" y="272" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1188" y="444" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0yto4gz_di" bpmnElement="SequenceFlow_0yto4gz">
- <di:waypoint xsi:type="dc:Point" x="1173" y="332" />
- <di:waypoint xsi:type="dc:Point" x="1173" y="273" />
- <di:waypoint xsi:type="dc:Point" x="1278" y="273" />
+ <di:waypoint x="1333" y="192" />
+ <di:waypoint x="1333" y="133" />
+ <di:waypoint x="1438" y="133" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1188" y="302.5" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="SubProcess_1laq87i_di" bpmnElement="SubProcess_0y6ppiy" isExpanded="true">
- <dc:Bounds x="2" y="886" width="382" height="213" />
+ <dc:Bounds x="162" y="746" width="382" height="213" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="EndEvent_1aqh7ih_di" bpmnElement="EndEvent_1aqh7ih">
- <dc:Bounds x="305" y="964" width="36" height="36" />
+ <dc:Bounds x="465" y="824" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="323" y="1000" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ScriptTask_0gg2fk5_di" bpmnElement="Task_07i164j">
- <dc:Bounds x="132" y="942" width="100" height="80" />
+ <dc:Bounds x="292" y="802" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0q0te67_di" bpmnElement="SequenceFlow_0q0te67">
- <di:waypoint xsi:type="dc:Point" x="68" y="982" />
- <di:waypoint xsi:type="dc:Point" x="132" y="982" />
+ <di:waypoint x="228" y="842" />
+ <di:waypoint x="292" y="842" />
<bpmndi:BPMNLabel>
<dc:Bounds x="100" y="967" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0lomcvn_di" bpmnElement="SequenceFlow_0lomcvn">
- <di:waypoint xsi:type="dc:Point" x="232" y="982" />
- <di:waypoint xsi:type="dc:Point" x="305" y="982" />
+ <di:waypoint x="392" y="842" />
+ <di:waypoint x="465" y="842" />
<bpmndi:BPMNLabel>
<dc:Bounds x="269" y="957" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="BoundaryEvent_0i4ili6_di" bpmnElement="BoundaryEvent_0dnnott">
- <dc:Bounds x="588" y="543" width="36" height="36" />
+ <dc:Bounds x="748" y="403" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="606" y="579" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0ctlrql_di" bpmnElement="SequenceFlow_0ctlrql">
- <di:waypoint xsi:type="dc:Point" x="612" y="577" />
- <di:waypoint xsi:type="dc:Point" x="631" y="622" />
+ <di:waypoint x="772" y="437" />
+ <di:waypoint x="791" y="482" />
<bpmndi:BPMNLabel>
<dc:Bounds x="622" y="584.5" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="EndEvent_1ra7y1s_di" bpmnElement="EndEvent_0n9y395">
- <dc:Bounds x="621" y="620" width="36" height="36" />
+ <dc:Bounds x="781" y="480" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="639" y="656" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="StartEvent_0a7qaw9_di" bpmnElement="StartEvent_1p75ok8">
- <dc:Bounds x="32" y="964" width="36" height="36" />
+ <dc:Bounds x="192" y="824" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="50" y="1000" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BoundaryEvent_13arr8o_di" bpmnElement="BoundaryEvent_1yj6513">
- <dc:Bounds x="1054" y="543" width="36" height="36" />
+ <dc:Bounds x="1214" y="403" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1072" y="579" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BoundaryEvent_0qs2m90_di" bpmnElement="BoundaryEvent_1y8kgef">
- <dc:Bounds x="1054" y="590" width="36" height="36" />
+ <dc:Bounds x="1214" y="450" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1072" y="626" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="EndEvent_0tnenxe_di" bpmnElement="EndEvent_05tcxw3">
- <dc:Bounds x="1116" y="573" width="36" height="36" />
+ <dc:Bounds x="1276" y="433" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1134" y="609" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1j55a94_di" bpmnElement="SequenceFlow_1j55a94">
- <di:waypoint xsi:type="dc:Point" x="1088" y="569" />
- <di:waypoint xsi:type="dc:Point" x="1118" y="584" />
+ <di:waypoint x="1248" y="429" />
+ <di:waypoint x="1278" y="444" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1103" y="561.5" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1yn24xq_di" bpmnElement="SequenceFlow_1yn24xq">
- <di:waypoint xsi:type="dc:Point" x="1088" y="599" />
- <di:waypoint xsi:type="dc:Point" x="1116" y="591" />
+ <di:waypoint x="1248" y="459" />
+ <di:waypoint x="1276" y="451" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1102" y="580" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ScriptTask_0c5jqhn_di" bpmnElement="ServiceTask_0bqh5yl">
- <dc:Bounds x="672" y="481" width="100" height="80" />
+ <dc:Bounds x="832" y="411" width="100" height="80" />
</bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="Activity_0txfb5e_di" bpmnElement="Activity_0620gqx">
+ <dc:Bounds x="832" y="290" width="100" height="80" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="Flow_0t2n952_di" bpmnElement="Flow_0t2n952">
+ <di:waypoint x="882" y="370" />
+ <di:waypoint x="882" y="411" />
+ </bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
-</bpmn:definitions> \ No newline at end of file
+</bpmn:definitions>
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModule.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModule.bpmn
index 0d1b970c62..74e0600f4f 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModule.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModule.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="_pNTO8MRhEeWv36YLr7PC3Q" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.10.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_pNTO8MRhEeWv36YLr7PC3Q" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="3.7.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
<bpmn2:process id="DoCreateVfModule" name="DoCreateVfModule" isExecutable="true">
<bpmn2:startEvent id="StartEvent_1" name="Start">
<bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
@@ -37,7 +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"><![CDATA[#{execution.getVariable("DCVFM_volumeGroupName") != null && execution.getVariable("DCVFM_volumeGroupName") != "" }]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DCVFM_volumeGroupName") != null &amp;&amp; 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">
@@ -76,19 +76,19 @@
<bpmn2:scriptTask id="PostProcessSDNCAssignRequest" name="PostProcess SDNC Assign Request" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_20</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_1nh92s8</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
String response = execution.getVariable("DCVFM_assignSDNCAdapterResponse")
def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.validateSDNCResponse(execution, response, "assign")]]></bpmn2:script>
+doCreateVfModule.validateSDNCResponse(execution, response, "assign")</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:scriptTask id="PreProcessSDNCAssignRequest" name="PreProcess SDNC Assign Request" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_8</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_18</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.preProcessSDNCAssignRequest(execution)]]></bpmn2:script>
+doCreateVfModule.preProcessSDNCAssignRequest(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_18" name="" sourceRef="PreProcessSDNCAssignRequest" targetRef="CallSDNCAdapterVDModuleTopologyAssign" />
<bpmn2:sequenceFlow id="SequenceFlow_20" name="" sourceRef="CallSDNCAdapterVDModuleTopologyAssign" targetRef="PostProcessSDNCAssignRequest" />
@@ -96,9 +96,9 @@ doCreateVfModule.preProcessSDNCAssignRequest(execution)]]></bpmn2:script>
<bpmn2:incoming>SequenceFlow_0p61zug</bpmn2:incoming>
<bpmn2:incoming>SequenceFlow_0aegg0r</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_23</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.preProcessSDNCGetRequest(execution, "vfmodule")]]></bpmn2:script>
+doCreateVfModule.preProcessSDNCGetRequest(execution, "vfmodule")</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:callActivity id="CallSDNCAdapterVFModuleTopologyGET" name="Call SDNC Adapter: VF Module Topology GET" calledElement="sdncAdapter">
<bpmn2:extensionElements>
@@ -118,12 +118,12 @@ doCreateVfModule.preProcessSDNCGetRequest(execution, "vfmodule")]]></bpmn2:scrip
<bpmn2:scriptTask id="PostProcessSDNCGetRequest" name="PostProcess SDNC GET Request" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_24</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_31</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
String response = execution.getVariable("DCVFM_getSDNCAdapterResponse")
def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.validateSDNCResponse(execution, response, "get")]]></bpmn2:script>
+doCreateVfModule.validateSDNCResponse(execution, response, "get")</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:callActivity id="UpdateAAIVfModule_1" name="UpdateAAIVfModule" calledElement="UpdateAAIVfModule">
<bpmn2:extensionElements>
@@ -138,16 +138,16 @@ doCreateVfModule.validateSDNCResponse(execution, response, "get")]]></bpmn2:scri
<bpmn2:scriptTask id="PreProcessUpdateAAIVfModule_1" name="PreProcess Update AAIVfModule" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_1avfxsz</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.preProcessUpdateAAIVfModuleRequestOrch(execution)]]></bpmn2:script>
+doCreateVfModule.preProcessUpdateAAIVfModuleRequestOrch(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:scriptTask id="PreProcessSDNCActivateRequest" name="PreProcess SDNC Activate Request" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_10</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_12</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.preProcessSDNCActivateRequest(execution)]]></bpmn2:script>
+doCreateVfModule.preProcessSDNCActivateRequest(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:callActivity id="CallSDNCAdapterVFModuleTopologyActivate" name="Call SDNC Adapter: VF Module Topology Activate" calledElement="sdncAdapter">
<bpmn2:extensionElements>
@@ -165,12 +165,12 @@ doCreateVfModule.preProcessSDNCActivateRequest(execution)]]></bpmn2:script>
<bpmn2:scriptTask id="PostProcessSDNCActivateRequest" name="PostProcess SDNC Activate Request" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_13</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
String response = execution.getVariable("DCVFM_activateSDNCAdapterResponse")
def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.validateSDNCResponse(execution, response, "activate")]]></bpmn2:script>
+doCreateVfModule.validateSDNCResponse(execution, response, "activate")</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:exclusiveGateway id="ExclusiveGateway_5" name="Is volume_group_id specified?" default="SequenceFlow_30">
<bpmn2:incoming>SequenceFlow_14</bpmn2:incoming>
@@ -195,9 +195,9 @@ doCreateVfModule.validateSDNCResponse(execution, response, "activate")]]></bpmn2
<bpmn2:scriptTask id="PrepareCreateAAIVfModuleVolumeGroupRequest" name="Prepare CreateAAIVfModuleVolumeGroup Request" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_28</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.prepareCreateAAIVfModuleVolumeGroupRequest(execution)]]></bpmn2:script>
+doCreateVfModule.prepareCreateAAIVfModuleVolumeGroupRequest(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:callActivity id="CreateAAIVfModuleVolumeGroup" name="CreateAAIVfModuleVolumeGroup" calledElement="CreateAAIVfModuleVolumeGroup">
<bpmn2:extensionElements>
@@ -220,13 +220,13 @@ doCreateVfModule.prepareCreateAAIVfModuleVolumeGroupRequest(execution)]]></bpmn2
<bpmn2:scriptTask id="PreProcessVNFAdapterRequest" name="PreProcess VNF Adapter Request" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_31</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_32</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.preProcessVNFAdapterRequest(execution)]]></bpmn2:script>
+doCreateVfModule.preProcessVNFAdapterRequest(execution)</bpmn2:script>
</bpmn2:scriptTask>
- <bpmn2:callActivity id="CallVNFAdapterVFModuleCreate" name="Call VNF Adapter to create VF Module" calledElement="vnfAdapterTask">
+ <bpmn2:callActivity id="CallVNFAdapterVFModuleCreate" name="Call VNF Adapter to create VF Module" calledElement="openstackAdapterTask">
<bpmn2:extensionElements>
- <camunda:in source="DCVFM_createVnfARequest" target="vnfAdapterTaskRequest" />
+ <camunda:in source="DCVFM_createVnfARequest" target="openstackAdapterTaskRequest" />
<camunda:out source="WorkflowResponse" target="DCVFM_createVnfAResponse" />
<camunda:in source="mso-request-id" target="mso-request-id" />
<camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
@@ -239,9 +239,9 @@ doCreateVfModule.preProcessVNFAdapterRequest(execution)]]></bpmn2:script>
<bpmn2:scriptTask id="PostProcessVNFAdapterRequest" name="PostProcess VNF Adapter Request" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_33</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_1ushk1d</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.postProcessVNFAdapterRequest(execution)]]></bpmn2:script>
+doCreateVfModule.postProcessVNFAdapterRequest(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_2" name="To UpdateAndActivate">
<bpmn2:incoming>SequenceFlow_0xfanpi</bpmn2:incoming>
@@ -265,9 +265,9 @@ doCreateVfModule.postProcessVNFAdapterRequest(execution)]]></bpmn2:script>
<bpmn2:scriptTask id="PostProcessCreateAAIVfModule" name="PostProcess CreateAAIVfModule" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_25</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_27</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.postProcessCreateAAIVfModule(execution)]]></bpmn2:script>
+doCreateVfModule.postProcessCreateAAIVfModule(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_27" name="" sourceRef="PostProcessCreateAAIVfModule" targetRef="IsBaseVfModule" />
<bpmn2:exclusiveGateway id="IsBaseVfModule" name="Is Base VF Module?" default="SequenceFlow_36">
@@ -277,22 +277,22 @@ doCreateVfModule.postProcessCreateAAIVfModule(execution)]]></bpmn2:script>
</bpmn2:exclusiveGateway>
<bpmn2:sequenceFlow id="SequenceFlow_36" name="no" sourceRef="IsBaseVfModule" targetRef="QueryAAIVfModule" />
<bpmn2:sequenceFlow id="SequenceFlow_39" name="yes" sourceRef="IsBaseVfModule" targetRef="ExclusiveGateway_2">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable("DCVFM_isBaseVfModule") == "true"]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy">execution.getVariable("DCVFM_isBaseVfModule") == "true"</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:scriptTask id="QueryAAIVfModule" name="Query AAI Vf Module" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_36</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_37</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.queryAAIVfModule(execution)]]></bpmn2:script>
+doCreateVfModule.queryAAIVfModule(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_37" name="" sourceRef="QueryAAIVfModule" targetRef="ExclusiveGateway_2" />
<bpmn2:scriptTask id="ScriptTask_setSuccess" name="Set Success Indicator" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_16</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.setSuccessIndicator(execution, true)]]></bpmn2:script>
+doCreateVfModule.setSuccessIndicator(execution, true)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="ScriptTask_setSuccess" targetRef="EndEvent_1" />
<bpmn2:endEvent id="EndEvent_1">
@@ -302,20 +302,20 @@ doCreateVfModule.setSuccessIndicator(execution, true)]]></bpmn2:script>
<bpmn2:scriptTask id="QueryCloudRegion" name="Query Cloud Region" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_40</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_43</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModule = new DoCreateVfModule()
-return doCreateVfModule.queryCloudRegion(execution)]]></bpmn2:script>
+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"><![CDATA[#{execution.getVariable("DCVFM_volumeGroupId") != null && execution.getVariable("DCVFM_volumeGroupId") != "" }]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DCVFM_volumeGroupId") != null &amp;&amp; execution.getVariable("DCVFM_volumeGroupId") != "" }</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:sequenceFlow id="SequenceFlow_43" name="" sourceRef="QueryCloudRegion" targetRef="ConfirmVolumeGroupTenant" />
<bpmn2:scriptTask id="PreProcessRequest" name="Pre-Process Request" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.preProcessRequest(execution)]]></bpmn2:script>
+doCreateVfModule.preProcessRequest(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="PreProcessRequest" targetRef="ExclusiveGateway_19933zh" />
<bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_1" name="To DoCreateVfModule">
@@ -352,16 +352,16 @@ doCreateVfModule.preProcessRequest(execution)]]></bpmn2:script>
</bpmn2:exclusiveGateway>
<bpmn2:sequenceFlow id="SequenceFlow_1ushk1d" sourceRef="PostProcessVNFAdapterRequest" targetRef="ExclusiveGateway_183x8vk" />
<bpmn2:sequenceFlow id="SequenceFlow_0ery1pk" name="yes" sourceRef="ExclusiveGateway_183x8vk" targetRef="CreateNetworkPoliciesInAAI">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable("DCVFM_contrailNetworkPolicyFqdnList") != null && !execution.getVariable("DCVFM_contrailNetworkPolicyFqdnList").isEmpty()]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy">execution.getVariable("DCVFM_contrailNetworkPolicyFqdnList") != null &amp;&amp; !execution.getVariable("DCVFM_contrailNetworkPolicyFqdnList").isEmpty()</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:sequenceFlow id="SequenceFlow_0xfanpi" name="no" sourceRef="ExclusiveGateway_183x8vk" targetRef="IntermediateThrowEvent_2" />
<bpmn2:sequenceFlow id="SequenceFlow_0abffyj" sourceRef="CreateNetworkPoliciesInAAI" targetRef="IntermediateThrowEvent_2" />
<bpmn2:scriptTask id="CreateNetworkPoliciesInAAI" name="Create Network Policies In AAI" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_0ery1pk</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_0abffyj</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.createNetworkPoliciesInAAI(execution)]]></bpmn2:script>
+doCreateVfModule.createNetworkPoliciesInAAI(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:exclusiveGateway id="ExclusiveGateway_0f54imv" name="need to update VNF in AAI?" default="SequenceFlow_1k5uku2">
<bpmn2:incoming>SequenceFlow_0363dz7</bpmn2:incoming>
@@ -374,7 +374,7 @@ doCreateVfModule.createNetworkPoliciesInAAI(execution)]]></bpmn2:script>
<bpmn2:outgoing>SequenceFlow_1avfxsz</bpmn2:outgoing>
</bpmn2:exclusiveGateway>
<bpmn2:sequenceFlow id="SequenceFlow_0bi38s7" name="yes" sourceRef="ExclusiveGateway_0f54imv" targetRef="PreProcessUpdateAAIGenericVnf">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[!execution.getVariable("DCVFM_oamManagementV4Address").isEmpty() || !execution.getVariable("DCVFM_oamManagementV6Address").isEmpty()]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy">!execution.getVariable("DCVFM_oamManagementV4Address").isEmpty() || !execution.getVariable("DCVFM_oamManagementV6Address").isEmpty()</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:sequenceFlow id="SequenceFlow_1qm81ym" sourceRef="PreProcessUpdateAAIGenericVnf" targetRef="UpdateAAIGenericVNFTask" />
<bpmn2:sequenceFlow id="SequenceFlow_112los9" sourceRef="UpdateAAIGenericVNFTask" targetRef="ExclusiveGateway_1edqxlf" />
@@ -384,9 +384,9 @@ doCreateVfModule.createNetworkPoliciesInAAI(execution)]]></bpmn2:script>
<bpmn2:scriptTask id="PreProcessUpdateAAIGenericVnf" name="PreProcess Update AAI Generic VNF" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_0bi38s7</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_1qm81ym</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.prepUpdateAAIGenericVnf(execution)]]></bpmn2:script>
+doCreateVfModule.prepUpdateAAIGenericVnf(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:callActivity id="UpdateAAIGenericVNFTask" name="Update AAI Generic VNF" calledElement="UpdateAAIGenericVnf">
<bpmn2:extensionElements>
@@ -401,16 +401,16 @@ doCreateVfModule.prepUpdateAAIGenericVnf(execution)]]></bpmn2:script>
</bpmn2:callActivity>
<bpmn2:sequenceFlow id="SequenceFlow_0zcfn2x" name="no" sourceRef="ExclusiveGateway_2" targetRef="IntermediateThrowEvent_3" />
<bpmn2:sequenceFlow id="SequenceFlow_0m382su" name="yes" sourceRef="ExclusiveGateway_2" targetRef="PreProcessSDNCVnfGetRequest">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFM_sdncVersion" ) == '1707'}]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DCVFM_sdncVersion" ) == '1707'}</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:sequenceFlow id="SequenceFlow_0g270u0" sourceRef="PreProcessSDNCVnfGetRequest" targetRef="CallSDNCAdapterVNFTopologyGET" />
<bpmn2:sequenceFlow id="SequenceFlow_1yrlvgb" sourceRef="CallSDNCAdapterVNFTopologyGET" targetRef="PostProcessSDNCVnfGetRequest" />
<bpmn2:scriptTask id="PreProcessSDNCVnfGetRequest" name="PreProcess SDNC VNF Topology GET Request" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_0m382su</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_0g270u0</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.preProcessSDNCGetRequest(execution, 'vnf')]]></bpmn2:script>
+doCreateVfModule.preProcessSDNCGetRequest(execution, 'vnf')</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:callActivity id="CallSDNCAdapterVNFTopologyGET" name="Call SDNC Adapter: VNF Topology GET" calledElement="sdncAdapter">
<bpmn2:extensionElements>
@@ -428,12 +428,12 @@ doCreateVfModule.preProcessSDNCGetRequest(execution, 'vnf')]]></bpmn2:script>
<bpmn2:scriptTask id="PostProcessSDNCVnfGetRequest" name="PostProcess SDNC VNF Toplogy GET request" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_1yrlvgb</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_170kw7h</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
String response = execution.getVariable("DCVFM_getVnfSDNCAdapterResponse")
def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.validateSDNCResponse(execution, response, "get")]]></bpmn2:script>
+doCreateVfModule.validateSDNCResponse(execution, response, "get")</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_170kw7h" sourceRef="PostProcessSDNCVnfGetRequest" targetRef="IntermediateThrowEvent_3" />
<bpmn2:sequenceFlow id="SequenceFlow_1f53tby" sourceRef="Task_0kuj2a1" targetRef="IntermediateThrowEvent_1" />
@@ -445,7 +445,7 @@ doCreateVfModule.validateSDNCResponse(execution, response, "get")]]></bpmn2:scri
</bpmn2:exclusiveGateway>
<bpmn2:sequenceFlow id="SequenceFlow_0270n5c" name="yes" sourceRef="ExclusiveGateway_0ffvqla" targetRef="IntermediateThrowEvent_1" />
<bpmn2:sequenceFlow id="SequenceFlow_05og7iw" name="no" sourceRef="ExclusiveGateway_0ffvqla" targetRef="Task_0kuj2a1">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFM_vfModuleName") == null}]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DCVFM_vfModuleName") == null}</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:callActivity id="Task_0kuj2a1" name="Generate VF Module Name" calledElement="GenerateVfModuleName">
<bpmn2:extensionElements>
@@ -486,16 +486,16 @@ doCreateVfModule.validateSDNCResponse(execution, response, "get")]]></bpmn2:scri
<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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.preProcessRollback(execution)]]></bpmn2:script>
+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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.postProcessRollback(execution)]]></bpmn2:script>
+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" />
@@ -508,14 +508,14 @@ doCreateVfModule.postProcessRollback(execution)]]></bpmn2:script>
</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:conditionExpression xsi:type="bpmn2:tFormalExpression">#{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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.processBPMNException(execution)]]></bpmn2:script>
+doCreateVfModule.processBPMNException(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_1pgo10r" sourceRef="Task_1fm09pi" targetRef="EndEvent_0wsdptv" />
</bpmn2:subProcess>
@@ -525,7 +525,7 @@ doCreateVfModule.processBPMNException(execution)]]></bpmn2:script>
<bpmn2:outgoing>SequenceFlow_006rnym</bpmn2:outgoing>
</bpmn2:exclusiveGateway>
<bpmn2:sequenceFlow id="SequenceFlow_28" name="yes" sourceRef="ExclusiveGateway_5" targetRef="PrepareCreateAAIVfModuleVolumeGroupRequest">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFM_volumeGroupId") != null && execution.getVariable("DCVFM_volumeGroupId") != "" }]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DCVFM_volumeGroupId") != null &amp;&amp; execution.getVariable("DCVFM_volumeGroupId") != "" }</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:exclusiveGateway id="ExclusiveGateway_19933zh" name="Is aLaCarte?" default="SequenceFlow_1y1ttqe">
<bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>
@@ -540,18 +540,18 @@ doCreateVfModule.processBPMNException(execution)]]></bpmn2:script>
</bpmn2:exclusiveGateway>
<bpmn2:sequenceFlow id="SequenceFlow_0lilmm3" name="no" sourceRef="ExclusiveGateway_02fd6gx" targetRef="ExclusiveGateway_0ffvqla" />
<bpmn2:sequenceFlow id="SequenceFlow_1y8q87e" name="yes" sourceRef="ExclusiveGateway_19933zh" targetRef="Task_14n44kb">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable("DCVFM_aLaCarte") == true]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy">execution.getVariable("DCVFM_aLaCarte") == true</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:sequenceFlow id="SequenceFlow_1sf1091" sourceRef="Task_14n44kb" targetRef="ExclusiveGateway_02fd6gx" />
<bpmn2:sequenceFlow id="SequenceFlow_17cp3tn" name="yes" sourceRef="ExclusiveGateway_0jw7ymg" targetRef="Task_0kqh1of">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable("DCVFM_twoPhaseDesign") == true]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy">execution.getVariable("DCVFM_twoPhaseDesign") == true</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:endEvent id="EndEvent_0pd6bbj">
<bpmn2:incoming>SequenceFlow_00bh7m7</bpmn2:incoming>
<bpmn2:terminateEventDefinition />
</bpmn2:endEvent>
<bpmn2:sequenceFlow id="SequenceFlow_15i583d" name="yes" sourceRef="ExclusiveGateway_02fd6gx" targetRef="ExclusiveGateway_1f6x9ii">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable("DCVFM_orchestrationStatus") == "PendingActivation" || execution.getVariable("DCVFM_orchestrationStatus") == "Assigned"]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy">execution.getVariable("DCVFM_orchestrationStatus") == "PendingActivation" || execution.getVariable("DCVFM_orchestrationStatus") == "Assigned"</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:exclusiveGateway id="ExclusiveGateway_0gsliyw" name="Is aLaCarte?" default="SequenceFlow_1iyt5i4">
<bpmn2:incoming>SequenceFlow_1nh92s8</bpmn2:incoming>
@@ -559,7 +559,7 @@ doCreateVfModule.processBPMNException(execution)]]></bpmn2:script>
<bpmn2:outgoing>SequenceFlow_1iyt5i4</bpmn2:outgoing>
</bpmn2:exclusiveGateway>
<bpmn2:sequenceFlow id="SequenceFlow_16mgvsd" name="yes" sourceRef="ExclusiveGateway_0gsliyw" targetRef="Task_08tnqe1">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable("DCVFM_aLaCarte") == true]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy">execution.getVariable("DCVFM_aLaCarte") == true</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:sequenceFlow id="SequenceFlow_1nh92s8" sourceRef="PostProcessSDNCAssignRequest" targetRef="ExclusiveGateway_0gsliyw" />
<bpmn2:sequenceFlow id="SequenceFlow_0cc17yk" sourceRef="Task_08tnqe1" targetRef="ExclusiveGateway_0jw7ymg" />
@@ -581,30 +581,30 @@ doCreateVfModule.processBPMNException(execution)]]></bpmn2:script>
<bpmn2:scriptTask id="Task_0kqh1of" name="PrepareUpdateAAIVfModulePendingActivation" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_17cp3tn</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_0ynd0iy</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.preProcessUpdateAAIVfModuleRequestStatus(execution, 'PendingActivation')]]></bpmn2:script>
+doCreateVfModule.preProcessUpdateAAIVfModuleRequestStatus(execution, 'PendingActivation')</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:scriptTask id="Task_08tnqe1" name="Query Catalog DB" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_16mgvsd</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_0cc17yk</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.queryCatalogDB(execution)]]></bpmn2:script>
+doCreateVfModule.queryCatalogDB(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:scriptTask id="Task_14n44kb" name="Query AAI for Orchestration Status" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_1y8q87e</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_1sf1091</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.queryAAIVfModuleForStatus(execution)]]></bpmn2:script>
+doCreateVfModule.queryAAIVfModuleForStatus(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:scriptTask id="Task_16p51r4" name="Set Success Indicator 1st Phase" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_1mnipp8</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_00bh7m7</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.setSuccessIndicator(execution, true)]]></bpmn2:script>
+doCreateVfModule.setSuccessIndicator(execution, true)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:exclusiveGateway id="ExclusiveGateway_1f6x9ii" name="Is volume_group_id specified for stage 2?" default="SequenceFlow_0tfrcnc">
<bpmn2:incoming>SequenceFlow_15i583d</bpmn2:incoming>
@@ -613,7 +613,7 @@ doCreateVfModule.setSuccessIndicator(execution, true)]]></bpmn2:script>
</bpmn2:exclusiveGateway>
<bpmn2:sequenceFlow id="SequenceFlow_0tfrcnc" name="no" sourceRef="ExclusiveGateway_1f6x9ii" targetRef="ExclusiveGateway_09r5rvt" />
<bpmn2:sequenceFlow id="SequenceFlow_0oadvvx" name="yes" sourceRef="ExclusiveGateway_1f6x9ii" targetRef="Task_0dx8gpp">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFM_volumeGroupId") != null && execution.getVariable("DCVFM_volumeGroupId") != "" }]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DCVFM_volumeGroupId") != null &amp;&amp; execution.getVariable("DCVFM_volumeGroupId") != "" }</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:exclusiveGateway id="ExclusiveGateway_09r5rvt">
<bpmn2:incoming>SequenceFlow_0tfrcnc</bpmn2:incoming>
@@ -629,7 +629,7 @@ doCreateVfModule.setSuccessIndicator(execution, true)]]></bpmn2:script>
<bpmn2:outgoing>SequenceFlow_0p3cspl</bpmn2:outgoing>
</bpmn2:exclusiveGateway>
<bpmn2:sequenceFlow id="SequenceFlow_0xed5sn" name="yes" sourceRef="ExclusiveGateway_04msdir" targetRef="ExclusiveGateway_1biy4yg">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable("DCVFM_isBaseVfModule") == "true"]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy">execution.getVariable("DCVFM_isBaseVfModule") == "true"</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:sequenceFlow id="SequenceFlow_0p3cspl" name="no" sourceRef="ExclusiveGateway_04msdir" targetRef="Task_0cdjxcd" />
<bpmn2:exclusiveGateway id="ExclusiveGateway_1biy4yg">
@@ -642,9 +642,9 @@ doCreateVfModule.setSuccessIndicator(execution, true)]]></bpmn2:script>
<bpmn2:scriptTask id="Task_0dx8gpp" name="Query Cloud Region For Stage 2" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_0oadvvx</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_03batve</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModule = new DoCreateVfModule()
-return doCreateVfModule.queryCloudRegion(execution)]]></bpmn2:script>
+return doCreateVfModule.queryCloudRegion(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:callActivity id="Task_0e8s9xm" name="Confirm Volume Group Tenant" calledElement="ConfirmVolumeGroupTenant">
<bpmn2:extensionElements>
@@ -663,17 +663,17 @@ return doCreateVfModule.queryCloudRegion(execution)]]></bpmn2:script>
<bpmn2:scriptTask id="Task_0cdjxcd" name="Query AAI Vf Module for Stage 2" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_0p3cspl</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_1k7xbcu</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.queryAAIVfModule(execution)]]></bpmn2:script>
+doCreateVfModule.queryAAIVfModule(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:scriptTask id="Task_19zw1li" name="PrepareUpdateAAIVfModuleAssign" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_006rnym</bpmn2:incoming>
<bpmn2:incoming>SequenceFlow_1iyt5i4</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_0thm33s</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModule = new DoCreateVfModule()
-doCreateVfModule.preProcessUpdateAAIVfModuleRequestStatus(execution, 'Assigned')]]></bpmn2:script>
+doCreateVfModule.preProcessUpdateAAIVfModuleRequestStatus(execution, 'Assigned')</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:callActivity id="Task_01b1fio" name="Update AAI VF Module Assigned" calledElement="UpdateAAIVfModule">
<bpmn2:extensionElements>
@@ -693,983 +693,983 @@ doCreateVfModule.preProcessUpdateAAIVfModuleRequestStatus(execution, 'Assigned')
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateVfModule">
<bpmndi:BPMNShape id="_BPMNShape_StartEvent_50" bpmnElement="StartEvent_1">
- <dc:Bounds x="38" y="153" width="36" height="36" />
+ <dc:Bounds x="258" y="403" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="44" y="189" width="23" height="12" />
+ <dc:Bounds x="263" y="439" width="25" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_50" targetElement="_BPMNShape_ScriptTask_124">
- <di:waypoint xsi:type="dc:Point" x="74" y="171" />
- <di:waypoint xsi:type="dc:Point" x="147" y="171" />
+ <di:waypoint x="294" y="421" />
+ <di:waypoint x="367" y="421" />
<bpmndi:BPMNLabel>
<dc:Bounds x="99" y="171" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_124" bpmnElement="PreProcessRequest">
- <dc:Bounds x="147" y="131" width="100" height="80" />
+ <dc:Bounds x="367" y="381" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_IntermediateCatchEvent_24" bpmnElement="IntermediateCatchEvent_1">
- <dc:Bounds x="36" y="376" width="36" height="36" />
+ <dc:Bounds x="256" y="626" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="0" y="417" width="114" height="22" />
+ <dc:Bounds x="235" y="667" width="85" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_IntermediateThrowEvent_22" bpmnElement="IntermediateThrowEvent_1">
- <dc:Bounds x="828" y="153" width="36" height="36" />
+ <dc:Bounds x="1048" y="403" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="869" y="173" width="86" height="36" />
+ <dc:Bounds x="1090" y="423" width="85" height="40" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_157" bpmnElement="CallSDNCAdapterVDModuleTopologyAssign">
- <dc:Bounds x="266" y="672" width="121" height="94" />
+ <dc:Bounds x="486" y="922" width="121" height="94" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_158" bpmnElement="CallSDNCAdapterVFModuleTopologyGET">
- <dc:Bounds x="254" y="1029" width="133" height="97" />
+ <dc:Bounds x="474" y="1279" width="133" height="97" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_90" bpmnElement="IsVolumeGroupIdSpecified" isMarkerVisible="true">
- <dc:Bounds x="144" y="368" width="50" height="50" />
+ <dc:Bounds x="364" y="618" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="89" y="347" width="178" height="22" />
+ <dc:Bounds x="356" y="597" width="84" height="40" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_172" bpmnElement="ConfirmVolumeGroupTenant">
- <dc:Bounds x="209" y="528" width="118" height="89" />
+ <dc:Bounds x="429" y="778" width="118" height="89" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_91" bpmnElement="ExclusiveGateway_4" isMarkerVisible="true">
- <dc:Bounds x="559" y="368" width="50" height="50" />
+ <dc:Bounds x="779" y="618" width="50" height="50" />
<bpmndi:BPMNLabel>
<dc:Bounds x="584" y="423" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_11" sourceElement="_BPMNShape_ExclusiveGateway_90" targetElement="_BPMNShape_ExclusiveGateway_91">
- <di:waypoint xsi:type="dc:Point" x="194" y="393" />
- <di:waypoint xsi:type="dc:Point" x="559" y="393" />
+ <di:waypoint x="414" y="643" />
+ <di:waypoint x="779" y="643" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="209" y="393" width="20" height="22" />
+ <dc:Bounds x="433" y="643" width="13" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_173" bpmnElement="CallVNFAdapterVFModuleCreate">
- <dc:Bounds x="746" y="1031" width="121" height="97" />
+ <dc:Bounds x="966" y="1281" width="121" height="97" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_174" bpmnElement="UpdateAAIVfModule_1">
- <dc:Bounds x="717" y="1211" width="117" height="97" />
+ <dc:Bounds x="937" y="1461" width="117" height="97" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_175" bpmnElement="CallSDNCAdapterVFModuleTopologyActivate">
- <dc:Bounds x="1039" y="1209" width="119" height="99" />
+ <dc:Bounds x="1259" y="1459" width="119" height="99" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_92" bpmnElement="ExclusiveGateway_5" isMarkerVisible="true">
- <dc:Bounds x="1384" y="1234" width="50" height="50" />
+ <dc:Bounds x="1604" y="1484" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1381" y="1206" width="86" height="36" />
+ <dc:Bounds x="1602" y="1456" width="84" height="40" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_176" bpmnElement="CreateAAIVfModuleVolumeGroup">
- <dc:Bounds x="1688" y="1204" width="121" height="112" />
+ <dc:Bounds x="1908" y="1454" width="121" height="112" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_93" bpmnElement="ExclusiveGateway_6" isMarkerVisible="true">
- <dc:Bounds x="1813" y="1072" width="50" height="50" />
+ <dc:Bounds x="2033" y="1322" width="50" height="50" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1838" y="1127" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_29" bpmnElement="SequenceFlow_29" sourceElement="_BPMNShape_ScriptTask_176" targetElement="_BPMNShape_ExclusiveGateway_93">
- <di:waypoint xsi:type="dc:Point" x="1808" y="1260" />
- <di:waypoint xsi:type="dc:Point" x="1838" y="1260" />
- <di:waypoint xsi:type="dc:Point" x="1838" y="1162" />
- <di:waypoint xsi:type="dc:Point" x="1838" y="1122" />
+ <di:waypoint x="2028" y="1510" />
+ <di:waypoint x="2058" y="1510" />
+ <di:waypoint x="2058" y="1412" />
+ <di:waypoint x="2058" y="1372" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1834" y="1260" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_30" bpmnElement="SequenceFlow_30" sourceElement="_BPMNShape_ExclusiveGateway_92" targetElement="_BPMNShape_ExclusiveGateway_93">
- <di:waypoint xsi:type="dc:Point" x="1409" y="1234" />
- <di:waypoint xsi:type="dc:Point" x="1409" y="1097" />
- <di:waypoint xsi:type="dc:Point" x="1813" y="1097" />
+ <di:waypoint x="1629" y="1484" />
+ <di:waypoint x="1629" y="1347" />
+ <di:waypoint x="2033" y="1347" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1419" y="1143.6746987951808" width="12" height="12" />
+ <dc:Bounds x="1639" y="1394" width="13" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_15" bpmnElement="SequenceFlow_15" sourceElement="_BPMNShape_IntermediateCatchEvent_24" targetElement="_BPMNShape_ExclusiveGateway_90">
- <di:waypoint xsi:type="dc:Point" x="72" y="394" />
- <di:waypoint xsi:type="dc:Point" x="120" y="394" />
- <di:waypoint xsi:type="dc:Point" x="120" y="393" />
- <di:waypoint xsi:type="dc:Point" x="144" y="393" />
+ <di:waypoint x="292" y="644" />
+ <di:waypoint x="340" y="644" />
+ <di:waypoint x="340" y="643" />
+ <di:waypoint x="364" y="643" />
<bpmndi:BPMNLabel>
<dc:Bounds x="117" y="394" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_101" bpmnElement="IsVolumeGroupNameSpecified" isMarkerVisible="true">
- <dc:Bounds x="360" y="547" width="50" height="50" />
+ <dc:Bounds x="580" y="797" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="309" y="496" width="200" height="22" />
+ <dc:Bounds x="585" y="746" width="88" height="40" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_17" bpmnElement="SequenceFlow_17" sourceElement="_BPMNShape_ScriptTask_172" targetElement="_BPMNShape_ExclusiveGateway_101">
- <di:waypoint xsi:type="dc:Point" x="327" y="572" />
- <di:waypoint xsi:type="dc:Point" x="360" y="572" />
+ <di:waypoint x="547" y="822" />
+ <di:waypoint x="580" y="822" />
<bpmndi:BPMNLabel>
<dc:Bounds x="338" y="572" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_Task_3" bpmnElement="ConfirmVolumeName">
- <dc:Bounds x="453" y="528" width="109" height="89" />
+ <dc:Bounds x="673" y="778" width="109" height="89" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_19" bpmnElement="SequenceFlow_19" sourceElement="_BPMNShape_ExclusiveGateway_101" targetElement="_BPMNShape_Task_3">
- <di:waypoint xsi:type="dc:Point" x="410" y="572" />
- <di:waypoint xsi:type="dc:Point" x="453" y="572" />
+ <di:waypoint x="630" y="822" />
+ <di:waypoint x="673" y="822" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="410" y="576" width="27" height="22" />
+ <dc:Bounds x="635" y="826" width="17" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_21" bpmnElement="SequenceFlow_21" sourceElement="_BPMNShape_ExclusiveGateway_101" targetElement="_BPMNShape_ExclusiveGateway_91">
- <di:waypoint xsi:type="dc:Point" x="385" y="547" />
- <di:waypoint xsi:type="dc:Point" x="385" y="393" />
- <di:waypoint xsi:type="dc:Point" x="559" y="393" />
+ <di:waypoint x="605" y="797" />
+ <di:waypoint x="605" y="643" />
+ <di:waypoint x="779" y="643" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="392" y="450" width="20" height="22" />
+ <dc:Bounds x="616" y="700" width="13" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_35" bpmnElement="SequenceFlow_35" sourceElement="_BPMNShape_Task_3" targetElement="_BPMNShape_ExclusiveGateway_91">
- <di:waypoint xsi:type="dc:Point" x="561" y="572" />
- <di:waypoint xsi:type="dc:Point" x="584" y="572" />
- <di:waypoint xsi:type="dc:Point" x="584" y="418" />
+ <di:waypoint x="781" y="822" />
+ <di:waypoint x="804" y="822" />
+ <di:waypoint x="804" y="668" />
<bpmndi:BPMNLabel>
<dc:Bounds x="581" y="492" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_ScriptTask_124" targetElement="_BPMNShape_IntermediateThrowEvent_22">
- <di:waypoint xsi:type="dc:Point" x="247" y="171" />
- <di:waypoint xsi:type="dc:Point" x="302" y="171" />
+ <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_ScriptTask_124" targetElement="ExclusiveGateway_19933zh_di">
+ <di:waypoint x="467" y="421" />
+ <di:waypoint x="522" y="421" />
<bpmndi:BPMNLabel>
<dc:Bounds x="275" y="156" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_ExclusiveGateway_91" targetElement="_BPMNShape_ScriptTask_156">
- <di:waypoint xsi:type="dc:Point" x="609" y="393" />
- <di:waypoint xsi:type="dc:Point" x="628" y="393" />
- <di:waypoint xsi:type="dc:Point" x="628" y="394" />
- <di:waypoint xsi:type="dc:Point" x="696" y="394" />
+ <di:waypoint x="829" y="643" />
+ <di:waypoint x="848" y="643" />
+ <di:waypoint x="848" y="644" />
+ <di:waypoint x="916" y="644" />
<bpmndi:BPMNLabel>
<dc:Bounds x="636" y="394" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_178" bpmnElement="PreProcessSDNCAssignRequest">
- <dc:Bounds x="109" y="674" width="121" height="94" />
+ <dc:Bounds x="329" y="924" width="121" height="94" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_179" bpmnElement="PostProcessSDNCAssignRequest">
- <dc:Bounds x="435" y="674" width="121" height="94" />
+ <dc:Bounds x="655" y="924" width="121" height="94" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_IntermediateThrowEvent_44" bpmnElement="IntermediateThrowEvent_3">
- <dc:Bounds x="2193" y="376" width="36" height="36" />
+ <dc:Bounds x="2413" y="626" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="2181" y="417" width="60" height="12" />
+ <dc:Bounds x="2402" y="667" width="59" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_IntermediateCatchEvent_29" bpmnElement="IntermediateCatchEvent_2">
- <dc:Bounds x="24" y="706" width="36" height="36" />
+ <dc:Bounds x="244" y="956" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="13" y="747" width="58" height="22" />
+ <dc:Bounds x="239" y="997" width="46" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_IntermediateCatchEvent_29" targetElement="_BPMNShape_ScriptTask_178">
- <di:waypoint xsi:type="dc:Point" x="60" y="724" />
- <di:waypoint xsi:type="dc:Point" x="81" y="724" />
- <di:waypoint xsi:type="dc:Point" x="81" y="721" />
- <di:waypoint xsi:type="dc:Point" x="109" y="721" />
+ <di:waypoint x="280" y="974" />
+ <di:waypoint x="301" y="974" />
+ <di:waypoint x="301" y="971" />
+ <di:waypoint x="329" y="971" />
<bpmndi:BPMNLabel>
<dc:Bounds x="78" y="722" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="SequenceFlow_18" sourceElement="_BPMNShape_ScriptTask_178" targetElement="_BPMNShape_ScriptTask_157">
- <di:waypoint xsi:type="dc:Point" x="229" y="721" />
- <di:waypoint xsi:type="dc:Point" x="248" y="721" />
- <di:waypoint xsi:type="dc:Point" x="248" y="719" />
- <di:waypoint xsi:type="dc:Point" x="266" y="719" />
+ <di:waypoint x="449" y="971" />
+ <di:waypoint x="468" y="971" />
+ <di:waypoint x="468" y="969" />
+ <di:waypoint x="486" y="969" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_20" bpmnElement="SequenceFlow_20" sourceElement="_BPMNShape_ScriptTask_157" targetElement="_BPMNShape_ScriptTask_179">
- <di:waypoint xsi:type="dc:Point" x="386" y="719" />
- <di:waypoint xsi:type="dc:Point" x="411" y="719" />
- <di:waypoint xsi:type="dc:Point" x="411" y="721" />
- <di:waypoint xsi:type="dc:Point" x="435" y="721" />
+ <di:waypoint x="606" y="969" />
+ <di:waypoint x="631" y="969" />
+ <di:waypoint x="631" y="971" />
+ <di:waypoint x="655" y="971" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_213" bpmnElement="PreProcessSDNCGetRequest">
- <dc:Bounds x="98" y="1031" width="121" height="94" />
+ <dc:Bounds x="318" y="1281" width="121" height="94" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_214" bpmnElement="PostProcessSDNCGetRequest">
- <dc:Bounds x="434" y="1031" width="121" height="94" />
+ <dc:Bounds x="654" y="1281" width="121" height="94" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_23" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_ScriptTask_213" targetElement="_BPMNShape_ScriptTask_158">
- <di:waypoint xsi:type="dc:Point" x="218" y="1078" />
- <di:waypoint xsi:type="dc:Point" x="236" y="1078" />
- <di:waypoint xsi:type="dc:Point" x="236" y="1077" />
- <di:waypoint xsi:type="dc:Point" x="254" y="1077" />
+ <di:waypoint x="438" y="1328" />
+ <di:waypoint x="456" y="1328" />
+ <di:waypoint x="456" y="1327" />
+ <di:waypoint x="474" y="1327" />
<bpmndi:BPMNLabel>
<dc:Bounds x="251" y="1068" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_24" bpmnElement="SequenceFlow_24" sourceElement="_BPMNShape_ScriptTask_158" targetElement="_BPMNShape_ScriptTask_214">
- <di:waypoint xsi:type="dc:Point" x="386" y="1077" />
- <di:waypoint xsi:type="dc:Point" x="409" y="1077" />
- <di:waypoint xsi:type="dc:Point" x="409" y="1078" />
- <di:waypoint xsi:type="dc:Point" x="434" y="1078" />
+ <di:waypoint x="606" y="1327" />
+ <di:waypoint x="629" y="1327" />
+ <di:waypoint x="629" y="1328" />
+ <di:waypoint x="654" y="1328" />
<bpmndi:BPMNLabel>
<dc:Bounds x="410" y="1078" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_Task_2" bpmnElement="PreProcessUpdateAAIVfModule_1">
- <dc:Bounds x="558" y="1211" width="118" height="97" />
+ <dc:Bounds x="778" y="1461" width="118" height="97" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_Task_33" bpmnElement="PreProcessSDNCActivateRequest">
- <dc:Bounds x="884" y="1210" width="118" height="98" />
+ <dc:Bounds x="1104" y="1460" width="118" height="98" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_Task_4" bpmnElement="PostProcessSDNCActivateRequest">
- <dc:Bounds x="1201" y="1211" width="121" height="95" />
+ <dc:Bounds x="1421" y="1461" width="121" height="95" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_Task_2" targetElement="_BPMNShape_ScriptTask_174">
- <di:waypoint xsi:type="dc:Point" x="676" y="1259" />
- <di:waypoint xsi:type="dc:Point" x="717" y="1259" />
+ <di:waypoint x="896" y="1509" />
+ <di:waypoint x="937" y="1509" />
<bpmndi:BPMNLabel>
<dc:Bounds x="697" y="1234" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_ScriptTask_174" targetElement="_BPMNShape_Task_33">
- <di:waypoint xsi:type="dc:Point" x="833" y="1259" />
- <di:waypoint xsi:type="dc:Point" x="884" y="1259" />
+ <di:waypoint x="1053" y="1509" />
+ <di:waypoint x="1104" y="1509" />
<bpmndi:BPMNLabel>
<dc:Bounds x="859" y="1234" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_Task_33" targetElement="_BPMNShape_ScriptTask_175">
- <di:waypoint xsi:type="dc:Point" x="1002" y="1259" />
- <di:waypoint xsi:type="dc:Point" x="1020" y="1259" />
- <di:waypoint xsi:type="dc:Point" x="1020" y="1258" />
- <di:waypoint xsi:type="dc:Point" x="1039" y="1258" />
+ <di:waypoint x="1222" y="1509" />
+ <di:waypoint x="1240" y="1509" />
+ <di:waypoint x="1240" y="1508" />
+ <di:waypoint x="1259" y="1508" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1035" y="1249" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="SequenceFlow_13" sourceElement="_BPMNShape_ScriptTask_175" targetElement="_BPMNShape_Task_4">
- <di:waypoint xsi:type="dc:Point" x="1157" y="1258" />
- <di:waypoint xsi:type="dc:Point" x="1201" y="1258" />
+ <di:waypoint x="1377" y="1508" />
+ <di:waypoint x="1421" y="1508" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1179" y="1233" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_14" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_Task_4" targetElement="_BPMNShape_ExclusiveGateway_92">
- <di:waypoint xsi:type="dc:Point" x="1321" y="1258" />
- <di:waypoint xsi:type="dc:Point" x="1353" y="1258" />
- <di:waypoint xsi:type="dc:Point" x="1353" y="1259" />
- <di:waypoint xsi:type="dc:Point" x="1384" y="1259" />
+ <di:waypoint x="1541" y="1508" />
+ <di:waypoint x="1573" y="1508" />
+ <di:waypoint x="1573" y="1509" />
+ <di:waypoint x="1604" y="1509" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1368" y="1249" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_EndEvent_175" bpmnElement="EndEvent_1">
- <dc:Bounds x="2107" y="1079" width="36" height="36" />
+ <dc:Bounds x="2327" y="1329" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="2125" y="1120" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_16" bpmnElement="SequenceFlow_16" sourceElement="_BPMNShape_ExclusiveGateway_93" targetElement="_BPMNShape_ScriptTask_218">
- <di:waypoint xsi:type="dc:Point" x="1863" y="1097" />
- <di:waypoint xsi:type="dc:Point" x="1929" y="1096" />
+ <di:waypoint x="2083" y="1347" />
+ <di:waypoint x="2149" y="1346" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1896" y="1082" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_IntermediateThrowEvent_45" bpmnElement="IntermediateThrowEvent_2">
- <dc:Bounds x="1281" y="1060" width="36" height="36" />
+ <dc:Bounds x="1501" y="1310" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1257" y="1101" width="84" height="36" />
+ <dc:Bounds x="1477" y="1351" width="85" height="40" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_IntermediateCatchEvent_30" bpmnElement="IntermediateCatchEvent_3">
- <dc:Bounds x="-27" y="1241" width="36" height="36" />
+ <dc:Bounds x="193" y="1491" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="-35" y="1282" width="84" height="24" />
+ <dc:Bounds x="185" y="1532" width="85" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_Task_7" bpmnElement="PrepareCreateAAIVfModuleVolumeGroupRequest">
- <dc:Bounds x="1502" y="1204" width="121" height="112" />
+ <dc:Bounds x="1722" y="1454" width="121" height="112" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_Task_7" targetElement="_BPMNShape_ScriptTask_176">
- <di:waypoint xsi:type="dc:Point" x="1623" y="1260" />
- <di:waypoint xsi:type="dc:Point" x="1688" y="1260" />
+ <di:waypoint x="1843" y="1510" />
+ <di:waypoint x="1908" y="1510" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1656" y="1245" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_Task_25" bpmnElement="PreProcessVNFAdapterRequest">
- <dc:Bounds x="583" y="1031" width="121" height="96" />
+ <dc:Bounds x="803" y="1281" width="121" height="96" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_Task_35" bpmnElement="PostProcessVNFAdapterRequest">
- <dc:Bounds x="907" y="1033" width="116" height="92" />
+ <dc:Bounds x="1127" y="1283" width="116" height="92" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_31" bpmnElement="SequenceFlow_31" sourceElement="_BPMNShape_ScriptTask_214" targetElement="_BPMNShape_Task_25">
- <di:waypoint xsi:type="dc:Point" x="554" y="1078" />
- <di:waypoint xsi:type="dc:Point" x="569" y="1078" />
- <di:waypoint xsi:type="dc:Point" x="569" y="1079" />
- <di:waypoint xsi:type="dc:Point" x="583" y="1079" />
+ <di:waypoint x="774" y="1328" />
+ <di:waypoint x="789" y="1328" />
+ <di:waypoint x="789" y="1329" />
+ <di:waypoint x="803" y="1329" />
<bpmndi:BPMNLabel>
<dc:Bounds x="584" y="1069" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_32" bpmnElement="SequenceFlow_32" sourceElement="_BPMNShape_Task_25" targetElement="_BPMNShape_ScriptTask_173">
- <di:waypoint xsi:type="dc:Point" x="703" y="1079" />
- <di:waypoint xsi:type="dc:Point" x="746" y="1079" />
+ <di:waypoint x="923" y="1329" />
+ <di:waypoint x="966" y="1329" />
<bpmndi:BPMNLabel>
<dc:Bounds x="725" y="1054" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_33" bpmnElement="SequenceFlow_33" sourceElement="_BPMNShape_ScriptTask_173" targetElement="_BPMNShape_Task_35">
- <di:waypoint xsi:type="dc:Point" x="866" y="1079" />
- <di:waypoint xsi:type="dc:Point" x="907" y="1079" />
+ <di:waypoint x="1086" y="1329" />
+ <di:waypoint x="1127" y="1329" />
<bpmndi:BPMNLabel>
<dc:Bounds x="887" y="1054" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_215" bpmnElement="QueryAAIVfModule">
- <dc:Bounds x="1224" y="516" width="125" height="92" />
+ <dc:Bounds x="1444" y="766" width="125" height="92" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_211" bpmnElement="IsBaseVfModule" isMarkerVisible="true">
- <dc:Bounds x="1128" y="368" width="50" height="50" />
+ <dc:Bounds x="1348" y="618" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1092" y="336" width="124" height="22" />
+ <dc:Bounds x="1347" y="586" width="55" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_212" bpmnElement="ExclusiveGateway_2" isMarkerVisible="true">
- <dc:Bounds x="1408" y="368" width="50" height="50" />
+ <dc:Bounds x="1628" y="618" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1395" y="329" width="75" height="36" />
+ <dc:Bounds x="1616" y="579" width="73" height="40" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_36" bpmnElement="SequenceFlow_36" sourceElement="_BPMNShape_ExclusiveGateway_211" targetElement="_BPMNShape_ScriptTask_215">
- <di:waypoint xsi:type="dc:Point" x="1153" y="418" />
- <di:waypoint xsi:type="dc:Point" x="1153" y="562" />
- <di:waypoint xsi:type="dc:Point" x="1224" y="562" />
+ <di:waypoint x="1373" y="668" />
+ <di:waypoint x="1373" y="812" />
+ <di:waypoint x="1444" y="812" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1122" y="450" width="20" height="22" />
+ <dc:Bounds x="1346" y="700" width="13" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_39" bpmnElement="SequenceFlow_39" sourceElement="_BPMNShape_ExclusiveGateway_211" targetElement="_BPMNShape_ExclusiveGateway_212">
- <di:waypoint xsi:type="dc:Point" x="1178" y="393" />
- <di:waypoint xsi:type="dc:Point" x="1408" y="393" />
+ <di:waypoint x="1398" y="643" />
+ <di:waypoint x="1628" y="643" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1285" y="393" width="27" height="22" />
+ <dc:Bounds x="1510" y="643" width="17" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_216" bpmnElement="PostProcessCreateAAIVfModule">
- <dc:Bounds x="897" y="348" width="125" height="92" />
+ <dc:Bounds x="1117" y="598" width="125" height="92" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_27" bpmnElement="SequenceFlow_27" sourceElement="_BPMNShape_ScriptTask_216" targetElement="_BPMNShape_ExclusiveGateway_211">
- <di:waypoint xsi:type="dc:Point" x="1021" y="394" />
- <di:waypoint xsi:type="dc:Point" x="1075" y="394" />
- <di:waypoint xsi:type="dc:Point" x="1075" y="393" />
- <di:waypoint xsi:type="dc:Point" x="1128" y="393" />
+ <di:waypoint x="1241" y="644" />
+ <di:waypoint x="1295" y="644" />
+ <di:waypoint x="1295" y="643" />
+ <di:waypoint x="1348" y="643" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1072" y="394" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_37" bpmnElement="SequenceFlow_37" sourceElement="_BPMNShape_ScriptTask_215" targetElement="_BPMNShape_ExclusiveGateway_212">
- <di:waypoint xsi:type="dc:Point" x="1348" y="562" />
- <di:waypoint xsi:type="dc:Point" x="1378" y="562" />
- <di:waypoint xsi:type="dc:Point" x="1378" y="393" />
- <di:waypoint xsi:type="dc:Point" x="1408" y="393" />
+ <di:waypoint x="1568" y="812" />
+ <di:waypoint x="1598" y="812" />
+ <di:waypoint x="1598" y="643" />
+ <di:waypoint x="1628" y="643" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1393" y="468" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_218" bpmnElement="ScriptTask_setSuccess">
- <dc:Bounds x="1929" y="1049" width="128" height="95" />
+ <dc:Bounds x="2149" y="1299" width="128" height="95" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ScriptTask_218" targetElement="_BPMNShape_EndEvent_175">
- <di:waypoint xsi:type="dc:Point" x="2057" y="1097" />
- <di:waypoint xsi:type="dc:Point" x="2107" y="1096" />
+ <di:waypoint x="2277" y="1347" />
+ <di:waypoint x="2327" y="1346" />
<bpmndi:BPMNLabel>
<dc:Bounds x="2082" y="1082" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_254" bpmnElement="QueryCloudRegion">
- <dc:Bounds x="101" y="440" width="134" height="81" />
+ <dc:Bounds x="321" y="690" width="134" height="81" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_40" bpmnElement="SequenceFlow_40" sourceElement="_BPMNShape_ExclusiveGateway_90" targetElement="_BPMNShape_ScriptTask_254">
- <di:waypoint xsi:type="dc:Point" x="169" y="418" />
- <di:waypoint xsi:type="dc:Point" x="169" y="429" />
- <di:waypoint xsi:type="dc:Point" x="168" y="429" />
- <di:waypoint xsi:type="dc:Point" x="168" y="440" />
+ <di:waypoint x="389" y="668" />
+ <di:waypoint x="389" y="679" />
+ <di:waypoint x="388" y="679" />
+ <di:waypoint x="388" y="690" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="180" y="417" width="27" height="22" />
+ <dc:Bounds x="405" y="667" width="17" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_43" bpmnElement="SequenceFlow_43" sourceElement="_BPMNShape_ScriptTask_254" targetElement="_BPMNShape_ScriptTask_172">
- <di:waypoint xsi:type="dc:Point" x="168" y="520" />
- <di:waypoint xsi:type="dc:Point" x="168" y="524" />
- <di:waypoint xsi:type="dc:Point" x="168" y="581" />
- <di:waypoint xsi:type="dc:Point" x="208" y="581" />
- <di:waypoint xsi:type="dc:Point" x="209" y="581" />
+ <di:waypoint x="388" y="770" />
+ <di:waypoint x="388" y="774" />
+ <di:waypoint x="388" y="831" />
+ <di:waypoint x="428" y="831" />
+ <di:waypoint x="429" y="831" />
<bpmndi:BPMNLabel>
<dc:Bounds x="165" y="574" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_156" bpmnElement="CreateAAIVfModule">
- <dc:Bounds x="696" y="348" width="121" height="92" />
+ <dc:Bounds x="916" y="598" width="121" height="92" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_25" bpmnElement="SequenceFlow_25" sourceElement="_BPMNShape_ScriptTask_156" targetElement="_BPMNShape_ScriptTask_216">
- <di:waypoint xsi:type="dc:Point" x="816" y="394" />
- <di:waypoint xsi:type="dc:Point" x="897" y="394" />
+ <di:waypoint x="1036" y="644" />
+ <di:waypoint x="1117" y="644" />
<bpmndi:BPMNLabel>
<dc:Bounds x="857" y="369" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ExclusiveGateway_183x8vk_di" bpmnElement="ExclusiveGateway_183x8vk" isMarkerVisible="true">
- <dc:Bounds x="1076" y="1055" width="50" height="50" />
+ <dc:Bounds x="1296" y="1305" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1056" y="1105" width="89" height="36" />
+ <dc:Bounds x="1281" y="1355" width="79" height="40" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1ushk1d_di" bpmnElement="SequenceFlow_1ushk1d">
- <di:waypoint xsi:type="dc:Point" x="1023" y="1079" />
- <di:waypoint xsi:type="dc:Point" x="1076" y="1080" />
+ <di:waypoint x="1243" y="1329" />
+ <di:waypoint x="1296" y="1330" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1050" y="1065" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0ery1pk_di" bpmnElement="SequenceFlow_0ery1pk">
- <di:waypoint xsi:type="dc:Point" x="1101" y="1055" />
- <di:waypoint xsi:type="dc:Point" x="1101" y="979" />
- <di:waypoint xsi:type="dc:Point" x="1147" y="979" />
+ <di:waypoint x="1321" y="1305" />
+ <di:waypoint x="1321" y="1229" />
+ <di:waypoint x="1367" y="1229" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1054" y="1267" width="18" height="12" />
+ <dc:Bounds x="1275" y="1517" width="17" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0xfanpi_di" bpmnElement="SequenceFlow_0xfanpi">
- <di:waypoint xsi:type="dc:Point" x="1126" y="1080" />
- <di:waypoint xsi:type="dc:Point" x="1281" y="1078" />
+ <di:waypoint x="1346" y="1330" />
+ <di:waypoint x="1501" y="1328" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1198" y="1054" width="12" height="12" />
+ <dc:Bounds x="1418" y="1304" width="13" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0abffyj_di" bpmnElement="SequenceFlow_0abffyj">
- <di:waypoint xsi:type="dc:Point" x="1247" y="979" />
- <di:waypoint xsi:type="dc:Point" x="1299" y="979" />
- <di:waypoint xsi:type="dc:Point" x="1299" y="1060" />
+ <di:waypoint x="1467" y="1229" />
+ <di:waypoint x="1519" y="1229" />
+ <di:waypoint x="1519" y="1310" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1273" y="964" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ScriptTask_1dv7amn_di" bpmnElement="CreateNetworkPoliciesInAAI">
- <dc:Bounds x="1147" y="939" width="100" height="80" />
+ <dc:Bounds x="1367" y="1189" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ExclusiveGateway_0f54imv_di" bpmnElement="ExclusiveGateway_0f54imv" isMarkerVisible="true">
- <dc:Bounds x="64" y="1235" width="50" height="50" />
+ <dc:Bounds x="284" y="1485" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="51" y="1200" width="75" height="24" />
+ <dc:Bounds x="272" y="1450" width="74" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ExclusiveGateway_1edqxlf_di" bpmnElement="ExclusiveGateway_1edqxlf" isMarkerVisible="true">
- <dc:Bounds x="432" y="1235" width="50" height="50" />
+ <dc:Bounds x="652" y="1485" width="50" height="50" />
<bpmndi:BPMNLabel>
<dc:Bounds x="457" y="1285" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0bi38s7_di" bpmnElement="SequenceFlow_0bi38s7">
- <di:waypoint xsi:type="dc:Point" x="89" y="1285" />
- <di:waypoint xsi:type="dc:Point" x="89" y="1438" />
- <di:waypoint xsi:type="dc:Point" x="142" y="1438" />
+ <di:waypoint x="309" y="1535" />
+ <di:waypoint x="309" y="1688" />
+ <di:waypoint x="362" y="1688" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="95" y="1362" width="18" height="12" />
+ <dc:Bounds x="316" y="1612" width="17" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1qm81ym_di" bpmnElement="SequenceFlow_1qm81ym">
- <di:waypoint xsi:type="dc:Point" x="242" y="1438" />
- <di:waypoint xsi:type="dc:Point" x="278" y="1438" />
- <di:waypoint xsi:type="dc:Point" x="278" y="1438" />
- <di:waypoint xsi:type="dc:Point" x="314" y="1438" />
+ <di:waypoint x="462" y="1688" />
+ <di:waypoint x="498" y="1688" />
+ <di:waypoint x="498" y="1688" />
+ <di:waypoint x="534" y="1688" />
<bpmndi:BPMNLabel>
<dc:Bounds x="293" y="1438" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_112los9_di" bpmnElement="SequenceFlow_112los9">
- <di:waypoint xsi:type="dc:Point" x="414" y="1438" />
- <di:waypoint xsi:type="dc:Point" x="457" y="1438" />
- <di:waypoint xsi:type="dc:Point" x="457" y="1285" />
+ <di:waypoint x="634" y="1688" />
+ <di:waypoint x="677" y="1688" />
+ <di:waypoint x="677" y="1535" />
<bpmndi:BPMNLabel>
<dc:Bounds x="436" y="1423" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1k5uku2_di" bpmnElement="SequenceFlow_1k5uku2">
- <di:waypoint xsi:type="dc:Point" x="114" y="1260" />
- <di:waypoint xsi:type="dc:Point" x="432" y="1260" />
+ <di:waypoint x="334" y="1510" />
+ <di:waypoint x="652" y="1510" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="267" y="1245" width="12" height="12" />
+ <dc:Bounds x="487" y="1495" width="13" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1avfxsz_di" bpmnElement="SequenceFlow_1avfxsz">
- <di:waypoint xsi:type="dc:Point" x="482" y="1260" />
- <di:waypoint xsi:type="dc:Point" x="520" y="1260" />
- <di:waypoint xsi:type="dc:Point" x="520" y="1260" />
- <di:waypoint xsi:type="dc:Point" x="558" y="1260" />
+ <di:waypoint x="702" y="1510" />
+ <di:waypoint x="740" y="1510" />
+ <di:waypoint x="740" y="1510" />
+ <di:waypoint x="778" y="1510" />
<bpmndi:BPMNLabel>
<dc:Bounds x="535" y="1260" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0363dz7_di" bpmnElement="SequenceFlow_0363dz7">
- <di:waypoint xsi:type="dc:Point" x="9" y="1259" />
- <di:waypoint xsi:type="dc:Point" x="64" y="1260" />
+ <di:waypoint x="229" y="1509" />
+ <di:waypoint x="284" y="1510" />
<bpmndi:BPMNLabel>
<dc:Bounds x="37" y="1235" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ScriptTask_0o3bcyq_di" bpmnElement="PreProcessUpdateAAIGenericVnf">
- <dc:Bounds x="142" y="1399" width="100" height="80" />
+ <dc:Bounds x="362" y="1649" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="CallActivity_0j45ic9_di" bpmnElement="UpdateAAIGenericVNFTask">
- <dc:Bounds x="314" y="1398" width="100" height="80" />
+ <dc:Bounds x="534" y="1648" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0zcfn2x_di" bpmnElement="SequenceFlow_0zcfn2x">
- <di:waypoint xsi:type="dc:Point" x="1458" y="393" />
- <di:waypoint xsi:type="dc:Point" x="2193" y="394" />
+ <di:waypoint x="1678" y="643" />
+ <di:waypoint x="2413" y="644" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1822" y="368.5010168687388" width="12" height="12" />
+ <dc:Bounds x="2042" y="619" width="13" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0m382su_di" bpmnElement="SequenceFlow_0m382su">
- <di:waypoint xsi:type="dc:Point" x="1433" y="418" />
- <di:waypoint xsi:type="dc:Point" x="1433" y="521" />
- <di:waypoint xsi:type="dc:Point" x="1666" y="521" />
+ <di:waypoint x="1653" y="668" />
+ <di:waypoint x="1653" y="771" />
+ <di:waypoint x="1886" y="771" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1363.5900806639468" y="422.98801391242307" width="19" height="12" />
+ <dc:Bounds x="1585" y="673" width="17" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0g270u0_di" bpmnElement="SequenceFlow_0g270u0">
- <di:waypoint xsi:type="dc:Point" x="1766" y="521" />
- <di:waypoint xsi:type="dc:Point" x="1816" y="521" />
+ <di:waypoint x="1986" y="771" />
+ <di:waypoint x="2036" y="771" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1791" y="506" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1yrlvgb_di" bpmnElement="SequenceFlow_1yrlvgb">
- <di:waypoint xsi:type="dc:Point" x="1916" y="521" />
- <di:waypoint xsi:type="dc:Point" x="1969" y="521" />
+ <di:waypoint x="2136" y="771" />
+ <di:waypoint x="2189" y="771" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1943" y="506" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ScriptTask_1j22oyj_di" bpmnElement="PreProcessSDNCVnfGetRequest">
- <dc:Bounds x="1666" y="481" width="100" height="80" />
+ <dc:Bounds x="1886" y="731" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="CallActivity_10t4tix_di" bpmnElement="CallSDNCAdapterVNFTopologyGET">
- <dc:Bounds x="1816" y="481" width="100" height="80" />
+ <dc:Bounds x="2036" y="731" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ScriptTask_09wgk9p_di" bpmnElement="PostProcessSDNCVnfGetRequest">
- <dc:Bounds x="1969" y="481" width="100" height="80" />
+ <dc:Bounds x="2189" y="731" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_170kw7h_di" bpmnElement="SequenceFlow_170kw7h">
- <di:waypoint xsi:type="dc:Point" x="2069" y="521" />
- <di:waypoint xsi:type="dc:Point" x="2131" y="521" />
- <di:waypoint xsi:type="dc:Point" x="2131" y="394" />
- <di:waypoint xsi:type="dc:Point" x="2193" y="394" />
+ <di:waypoint x="2289" y="771" />
+ <di:waypoint x="2351" y="771" />
+ <di:waypoint x="2351" y="644" />
+ <di:waypoint x="2413" y="644" />
<bpmndi:BPMNLabel>
<dc:Bounds x="2146" y="447.5" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1f53tby_di" bpmnElement="SequenceFlow_1f53tby">
- <di:waypoint xsi:type="dc:Point" x="776" y="282" />
- <di:waypoint xsi:type="dc:Point" x="846" y="282" />
- <di:waypoint xsi:type="dc:Point" x="846" y="189" />
+ <di:waypoint x="996" y="532" />
+ <di:waypoint x="1066" y="532" />
+ <di:waypoint x="1066" y="439" />
<bpmndi:BPMNLabel>
<dc:Bounds x="811" y="267" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ExclusiveGateway_0ffvqla_di" bpmnElement="ExclusiveGateway_0ffvqla" isMarkerVisible="true">
- <dc:Bounds x="592" y="146" width="50" height="50" />
+ <dc:Bounds x="812" y="396" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="574" y="98" width="86" height="36" />
+ <dc:Bounds x="795" y="348" width="84" height="40" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0270n5c_di" bpmnElement="SequenceFlow_0270n5c">
- <di:waypoint xsi:type="dc:Point" x="642" y="171" />
- <di:waypoint xsi:type="dc:Point" x="828" y="171" />
+ <di:waypoint x="862" y="421" />
+ <di:waypoint x="1048" y="421" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="699" y="145" width="18" height="12" />
+ <dc:Bounds x="920" y="395" width="17" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_05og7iw_di" bpmnElement="SequenceFlow_05og7iw">
- <di:waypoint xsi:type="dc:Point" x="617" y="196" />
- <di:waypoint xsi:type="dc:Point" x="617" y="282" />
- <di:waypoint xsi:type="dc:Point" x="676" y="282" />
+ <di:waypoint x="837" y="446" />
+ <di:waypoint x="837" y="532" />
+ <di:waypoint x="896" y="532" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="626" y="239" width="12" height="12" />
+ <dc:Bounds x="846" y="489" width="13" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="CallActivity_14nvmgk_di" bpmnElement="Task_0kuj2a1">
- <dc:Bounds x="676" y="242" width="100" height="80" />
+ <dc:Bounds x="896" y="492" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="SubProcess_0ltzufk_di" bpmnElement="SubProcess_0ltzufk" isExpanded="true">
- <dc:Bounds x="-52" y="1578" width="1047" height="338" />
+ <dc:Bounds x="168" y="1828" width="1047" height="338" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="StartEvent_18lzc5m_di" bpmnElement="StartEvent_18lzc5m">
- <dc:Bounds x="91" y="1682" width="36" height="36" />
+ <dc:Bounds x="311" y="1932" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="109" y="1723" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="EndEvent_0wsdptv_di" bpmnElement="EndEvent_0wsdptv">
- <dc:Bounds x="859" y="1682" width="36" height="36" />
+ <dc:Bounds x="1079" y="1932" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="877" y="1723" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="CallActivity_1ehr5kq_di" bpmnElement="CallDoCreateVfModuleRollback">
- <dc:Bounds x="507" y="1660" width="100" height="80" />
+ <dc:Bounds x="727" y="1910" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ScriptTask_0upatdd_di" bpmnElement="PreProcessRollback">
- <dc:Bounds x="327" y="1660" width="100" height="80" />
+ <dc:Bounds x="547" y="1910" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ScriptTask_0o1zc29_di" bpmnElement="PostProcessRollback">
- <dc:Bounds x="692" y="1660" width="100" height="80" />
+ <dc:Bounds x="912" y="1910" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_02lc25j_di" bpmnElement="SequenceFlow_02lc25j">
- <di:waypoint xsi:type="dc:Point" x="127" y="1700" />
- <di:waypoint xsi:type="dc:Point" x="194" y="1700" />
+ <di:waypoint x="347" y="1950" />
+ <di:waypoint x="414" y="1950" />
<bpmndi:BPMNLabel>
<dc:Bounds x="161" y="1685" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0z2rczk_di" bpmnElement="SequenceFlow_0z2rczk">
- <di:waypoint xsi:type="dc:Point" x="792" y="1700" />
- <di:waypoint xsi:type="dc:Point" x="824" y="1700" />
- <di:waypoint xsi:type="dc:Point" x="824" y="1700" />
- <di:waypoint xsi:type="dc:Point" x="859" y="1700" />
+ <di:waypoint x="1012" y="1950" />
+ <di:waypoint x="1044" y="1950" />
+ <di:waypoint x="1044" y="1950" />
+ <di:waypoint x="1079" y="1950" />
<bpmndi:BPMNLabel>
<dc:Bounds x="839" y="1700" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1i1q78e_di" bpmnElement="SequenceFlow_1i1q78e">
- <di:waypoint xsi:type="dc:Point" x="427" y="1700" />
- <di:waypoint xsi:type="dc:Point" x="507" y="1700" />
+ <di:waypoint x="647" y="1950" />
+ <di:waypoint x="727" y="1950" />
<bpmndi:BPMNLabel>
<dc:Bounds x="467" y="1685" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0112l2c_di" bpmnElement="SequenceFlow_0112l2c">
- <di:waypoint xsi:type="dc:Point" x="607" y="1700" />
- <di:waypoint xsi:type="dc:Point" x="692" y="1700" />
+ <di:waypoint x="827" y="1950" />
+ <di:waypoint x="912" y="1950" />
<bpmndi:BPMNLabel>
<dc:Bounds x="650" y="1685" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ExclusiveGateway_039bib8_di" bpmnElement="ExclusiveGateway_039bib8" isMarkerVisible="true">
- <dc:Bounds x="194" y="1675" width="50" height="50" />
+ <dc:Bounds x="414" y="1925" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="175" y="1647" width="87" height="12" />
+ <dc:Bounds x="394" y="1897" width="89" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_04bd5in_di" bpmnElement="SequenceFlow_04bd5in">
- <di:waypoint xsi:type="dc:Point" x="244" y="1700" />
- <di:waypoint xsi:type="dc:Point" x="327" y="1700" />
+ <di:waypoint x="464" y="1950" />
+ <di:waypoint x="547" y="1950" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="280" y="1685" width="12" height="12" />
+ <dc:Bounds x="500" y="1935" width="13" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1nh7m8d_di" bpmnElement="SequenceFlow_1nh7m8d">
- <di:waypoint xsi:type="dc:Point" x="219" y="1725" />
- <di:waypoint xsi:type="dc:Point" x="219" y="1824" />
- <di:waypoint xsi:type="dc:Point" x="507" y="1824" />
+ <di:waypoint x="439" y="1975" />
+ <di:waypoint x="439" y="2074" />
+ <di:waypoint x="727" y="2074" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="225" y="1775" width="18" height="12" />
+ <dc:Bounds x="446" y="2025" width="17" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ScriptTask_05v20n0_di" bpmnElement="Task_1fm09pi">
- <dc:Bounds x="507" y="1784" width="100" height="80" />
+ <dc:Bounds x="727" y="2034" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1pgo10r_di" bpmnElement="SequenceFlow_1pgo10r">
- <di:waypoint xsi:type="dc:Point" x="607" y="1824" />
- <di:waypoint xsi:type="dc:Point" x="877" y="1824" />
- <di:waypoint xsi:type="dc:Point" x="877" y="1718" />
+ <di:waypoint x="827" y="2074" />
+ <di:waypoint x="1097" y="2074" />
+ <di:waypoint x="1097" y="1968" />
<bpmndi:BPMNLabel>
<dc:Bounds x="742" y="1809" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ExclusiveGateway_0jw7ymg_di" bpmnElement="ExclusiveGateway_0jw7ymg" isMarkerVisible="true">
- <dc:Bounds x="803" y="696" width="50" height="50" />
+ <dc:Bounds x="1023" y="946" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="797" y="653" width="61" height="24" />
+ <dc:Bounds x="1018" y="903" width="59" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_28" bpmnElement="SequenceFlow_28" sourceElement="_BPMNShape_ExclusiveGateway_92" targetElement="_BPMNShape_Task_7">
- <di:waypoint xsi:type="dc:Point" x="1434" y="1259" />
- <di:waypoint xsi:type="dc:Point" x="1502" y="1260" />
+ <di:waypoint x="1654" y="1509" />
+ <di:waypoint x="1722" y="1510" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1454" y="1264.6906474820144" width="18" height="12" />
+ <dc:Bounds x="1675" y="1515" width="17" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ExclusiveGateway_19933zh_di" bpmnElement="ExclusiveGateway_19933zh" isMarkerVisible="true">
- <dc:Bounds x="302" y="146" width="50" height="50" />
+ <dc:Bounds x="522" y="396" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="295" y="196" width="63" height="12" />
+ <dc:Bounds x="515" y="446" width="63" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1y1ttqe_di" bpmnElement="SequenceFlow_1y1ttqe">
- <di:waypoint xsi:type="dc:Point" x="352" y="171" />
- <di:waypoint xsi:type="dc:Point" x="592" y="171" />
+ <di:waypoint x="572" y="421" />
+ <di:waypoint x="812" y="421" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="379" y="147" width="12" height="12" />
+ <dc:Bounds x="599" y="397" width="13" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ExclusiveGateway_02fd6gx_di" bpmnElement="ExclusiveGateway_02fd6gx" isMarkerVisible="true">
- <dc:Bounds x="447" y="-1" width="50" height="50" />
+ <dc:Bounds x="667" y="249" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="427" y="-48" width="89" height="36" />
+ <dc:Bounds x="647" y="202" width="89" height="40" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0lilmm3_di" bpmnElement="SequenceFlow_0lilmm3">
- <di:waypoint xsi:type="dc:Point" x="472" y="49" />
- <di:waypoint xsi:type="dc:Point" x="472" y="171" />
- <di:waypoint xsi:type="dc:Point" x="592" y="171" />
+ <di:waypoint x="692" y="299" />
+ <di:waypoint x="692" y="421" />
+ <di:waypoint x="812" y="421" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="482" y="100" width="12" height="12" />
+ <dc:Bounds x="702" y="350" width="13" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1y8q87e_di" bpmnElement="SequenceFlow_1y8q87e">
- <di:waypoint xsi:type="dc:Point" x="327" y="146" />
- <di:waypoint xsi:type="dc:Point" x="327" y="64" />
+ <di:waypoint x="547" y="396" />
+ <di:waypoint x="547" y="314" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="333" y="95" width="18" height="12" />
+ <dc:Bounds x="554" y="345" width="17" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1sf1091_di" bpmnElement="SequenceFlow_1sf1091">
- <di:waypoint xsi:type="dc:Point" x="377" y="24" />
- <di:waypoint xsi:type="dc:Point" x="447" y="24" />
+ <di:waypoint x="597" y="274" />
+ <di:waypoint x="667" y="274" />
<bpmndi:BPMNLabel>
<dc:Bounds x="412" y="9" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_17cp3tn_di" bpmnElement="SequenceFlow_17cp3tn">
- <di:waypoint xsi:type="dc:Point" x="853" y="721" />
- <di:waypoint xsi:type="dc:Point" x="901" y="720" />
+ <di:waypoint x="1073" y="971" />
+ <di:waypoint x="1121" y="970" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="866" y="694.5" width="18" height="12" />
+ <dc:Bounds x="1087" y="945" width="17" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="EndEvent_0b33fd2_di" bpmnElement="EndEvent_0pd6bbj">
- <dc:Bounds x="1367" y="701" width="36" height="36" />
+ <dc:Bounds x="1587" y="951" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1385" y="737" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_15i583d_di" bpmnElement="SequenceFlow_15i583d">
- <di:waypoint xsi:type="dc:Point" x="497" y="24" />
- <di:waypoint xsi:type="dc:Point" x="559" y="24" />
+ <di:waypoint x="717" y="274" />
+ <di:waypoint x="779" y="274" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="513" y="3.588067006526856" width="18" height="12" />
+ <dc:Bounds x="734" y="254" width="17" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ExclusiveGateway_0gsliyw_di" bpmnElement="ExclusiveGateway_0gsliyw" isMarkerVisible="true">
- <dc:Bounds x="592" y="694" width="50" height="50" />
+ <dc:Bounds x="812" y="944" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="585" y="656" width="63" height="12" />
+ <dc:Bounds x="805" y="906" width="63" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_16mgvsd_di" bpmnElement="SequenceFlow_16mgvsd">
- <di:waypoint xsi:type="dc:Point" x="642" y="719" />
- <di:waypoint xsi:type="dc:Point" x="668" y="719" />
+ <di:waypoint x="862" y="969" />
+ <di:waypoint x="888" y="969" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="641" y="696" width="18" height="12" />
+ <dc:Bounds x="862" y="946" width="17" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1nh92s8_di" bpmnElement="SequenceFlow_1nh92s8">
- <di:waypoint xsi:type="dc:Point" x="556" y="720" />
- <di:waypoint xsi:type="dc:Point" x="592" y="719" />
+ <di:waypoint x="776" y="970" />
+ <di:waypoint x="812" y="969" />
<bpmndi:BPMNLabel>
<dc:Bounds x="574" y="694.5" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0cc17yk_di" bpmnElement="SequenceFlow_0cc17yk">
- <di:waypoint xsi:type="dc:Point" x="768" y="720" />
- <di:waypoint xsi:type="dc:Point" x="803" y="721" />
+ <di:waypoint x="988" y="970" />
+ <di:waypoint x="1023" y="971" />
<bpmndi:BPMNLabel>
<dc:Bounds x="786" y="705.5" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1iyt5i4_di" bpmnElement="SequenceFlow_1iyt5i4">
- <di:waypoint xsi:type="dc:Point" x="617" y="744" />
- <di:waypoint xsi:type="dc:Point" x="617" y="799" />
- <di:waypoint xsi:type="dc:Point" x="98" y="799" />
- <di:waypoint xsi:type="dc:Point" x="98" y="881" />
- <di:waypoint xsi:type="dc:Point" x="119" y="881" />
+ <di:waypoint x="837" y="994" />
+ <di:waypoint x="837" y="1049" />
+ <di:waypoint x="318" y="1049" />
+ <di:waypoint x="318" y="1131" />
+ <di:waypoint x="339" y="1131" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="466" y="776.3184256922661" width="12" height="12" />
+ <dc:Bounds x="686" y="1026" width="13" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_006rnym_di" bpmnElement="SequenceFlow_006rnym">
- <di:waypoint xsi:type="dc:Point" x="828" y="746" />
- <di:waypoint xsi:type="dc:Point" x="828" y="815" />
- <di:waypoint xsi:type="dc:Point" x="169" y="815" />
- <di:waypoint xsi:type="dc:Point" x="169" y="841" />
+ <di:waypoint x="1048" y="996" />
+ <di:waypoint x="1048" y="1065" />
+ <di:waypoint x="389" y="1065" />
+ <di:waypoint x="389" y="1091" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="807" y="762.4025974025974" width="12" height="12" />
+ <dc:Bounds x="1027" y="1012" width="13" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0ynd0iy_di" bpmnElement="SequenceFlow_0ynd0iy">
- <di:waypoint xsi:type="dc:Point" x="1001" y="719" />
- <di:waypoint xsi:type="dc:Point" x="1057" y="719" />
+ <di:waypoint x="1221" y="969" />
+ <di:waypoint x="1277" y="969" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1029" y="704" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_00bh7m7_di" bpmnElement="SequenceFlow_00bh7m7">
- <di:waypoint xsi:type="dc:Point" x="1312" y="719" />
- <di:waypoint xsi:type="dc:Point" x="1367" y="719" />
+ <di:waypoint x="1532" y="969" />
+ <di:waypoint x="1587" y="969" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1340" y="704" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1mnipp8_di" bpmnElement="SequenceFlow_1mnipp8">
- <di:waypoint xsi:type="dc:Point" x="1157" y="719" />
- <di:waypoint xsi:type="dc:Point" x="1212" y="719" />
+ <di:waypoint x="1377" y="969" />
+ <di:waypoint x="1432" y="969" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1185" y="704" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="CallActivity_1bvhxkk_di" bpmnElement="Task_08z2aai">
- <dc:Bounds x="1057" y="679" width="100" height="80" />
+ <dc:Bounds x="1277" y="929" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ScriptTask_05mwaoo_di" bpmnElement="Task_0kqh1of">
- <dc:Bounds x="901" y="679" width="100" height="80" />
+ <dc:Bounds x="1121" y="929" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ScriptTask_059xue9_di" bpmnElement="Task_08tnqe1">
- <dc:Bounds x="668" y="679" width="100" height="80" />
+ <dc:Bounds x="888" y="929" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ScriptTask_1k3dub4_di" bpmnElement="Task_14n44kb">
- <dc:Bounds x="277" y="-16" width="100" height="80" />
+ <dc:Bounds x="497" y="234" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ScriptTask_0okxyur_di" bpmnElement="Task_16p51r4">
- <dc:Bounds x="1212" y="679" width="100" height="80" />
+ <dc:Bounds x="1432" y="929" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ExclusiveGateway_1f6x9ii_di" bpmnElement="ExclusiveGateway_1f6x9ii" isMarkerVisible="true">
- <dc:Bounds x="559" y="-1" width="50" height="50" />
+ <dc:Bounds x="779" y="249" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="539" y="49" width="89" height="48" />
+ <dc:Bounds x="762" y="299" width="84" height="53" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0tfrcnc_di" bpmnElement="SequenceFlow_0tfrcnc">
- <di:waypoint xsi:type="dc:Point" x="609" y="24" />
- <di:waypoint xsi:type="dc:Point" x="946" y="24" />
+ <di:waypoint x="829" y="274" />
+ <di:waypoint x="1166" y="274" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="772" y="9" width="12" height="12" />
+ <dc:Bounds x="992" y="259" width="13" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0oadvvx_di" bpmnElement="SequenceFlow_0oadvvx">
- <di:waypoint xsi:type="dc:Point" x="584" y="-1" />
- <di:waypoint xsi:type="dc:Point" x="584" y="-63" />
- <di:waypoint xsi:type="dc:Point" x="616" y="-63" />
+ <di:waypoint x="804" y="249" />
+ <di:waypoint x="804" y="187" />
+ <di:waypoint x="836" y="187" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="590" y="-42" width="18" height="12" />
+ <dc:Bounds x="811" y="208" width="17" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ExclusiveGateway_09r5rvt_di" bpmnElement="ExclusiveGateway_09r5rvt" isMarkerVisible="true">
- <dc:Bounds x="946" y="-1" width="50" height="50" />
+ <dc:Bounds x="1166" y="249" width="50" height="50" />
<bpmndi:BPMNLabel>
<dc:Bounds x="971" y="49" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1qzw172_di" bpmnElement="SequenceFlow_1qzw172">
- <di:waypoint xsi:type="dc:Point" x="996" y="24" />
- <di:waypoint xsi:type="dc:Point" x="1074" y="24" />
+ <di:waypoint x="1216" y="274" />
+ <di:waypoint x="1294" y="274" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1035" y="9" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_03batve_di" bpmnElement="SequenceFlow_03batve">
- <di:waypoint xsi:type="dc:Point" x="716" y="-63" />
- <di:waypoint xsi:type="dc:Point" x="796" y="-63" />
+ <di:waypoint x="936" y="187" />
+ <di:waypoint x="1016" y="187" />
<bpmndi:BPMNLabel>
<dc:Bounds x="756" y="-78" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0c6p4aa_di" bpmnElement="SequenceFlow_0c6p4aa">
- <di:waypoint xsi:type="dc:Point" x="896" y="-63" />
- <di:waypoint xsi:type="dc:Point" x="971" y="-63" />
- <di:waypoint xsi:type="dc:Point" x="971" y="-1" />
+ <di:waypoint x="1116" y="187" />
+ <di:waypoint x="1191" y="187" />
+ <di:waypoint x="1191" y="249" />
<bpmndi:BPMNLabel>
<dc:Bounds x="934" y="-78" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ExclusiveGateway_04msdir_di" bpmnElement="ExclusiveGateway_04msdir" isMarkerVisible="true">
- <dc:Bounds x="1074" y="-1" width="50" height="50" />
+ <dc:Bounds x="1294" y="249" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1057" y="49" width="84" height="36" />
+ <dc:Bounds x="1278" y="299" width="82" height="40" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0xed5sn_di" bpmnElement="SequenceFlow_0xed5sn">
- <di:waypoint xsi:type="dc:Point" x="1124" y="24" />
- <di:waypoint xsi:type="dc:Point" x="1338" y="24" />
+ <di:waypoint x="1344" y="274" />
+ <di:waypoint x="1558" y="274" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1222" y="9" width="18" height="12" />
+ <dc:Bounds x="1443" y="259" width="17" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0p3cspl_di" bpmnElement="SequenceFlow_0p3cspl">
- <di:waypoint xsi:type="dc:Point" x="1099" y="-1" />
- <di:waypoint xsi:type="dc:Point" x="1099" y="-63" />
- <di:waypoint xsi:type="dc:Point" x="1190" y="-63" />
+ <di:waypoint x="1319" y="249" />
+ <di:waypoint x="1319" y="187" />
+ <di:waypoint x="1410" y="187" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1108" y="-41.26315789473686" width="12" height="12" />
+ <dc:Bounds x="1328" y="209" width="13" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ExclusiveGateway_1biy4yg_di" bpmnElement="ExclusiveGateway_1biy4yg" isMarkerVisible="true">
- <dc:Bounds x="1338" y="-1" width="50" height="50" />
+ <dc:Bounds x="1558" y="249" width="50" height="50" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1363" y="49" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0p61zug_di" bpmnElement="SequenceFlow_0p61zug">
- <di:waypoint xsi:type="dc:Point" x="1388" y="24" />
- <di:waypoint xsi:type="dc:Point" x="1436" y="24" />
- <di:waypoint xsi:type="dc:Point" x="1436" y="-170" />
- <di:waypoint xsi:type="dc:Point" x="-60" y="-170" />
- <di:waypoint xsi:type="dc:Point" x="-60" y="1078" />
- <di:waypoint xsi:type="dc:Point" x="98" y="1078" />
+ <di:waypoint x="1608" y="274" />
+ <di:waypoint x="1656" y="274" />
+ <di:waypoint x="1656" y="80" />
+ <di:waypoint x="160" y="80" />
+ <di:waypoint x="160" y="1328" />
+ <di:waypoint x="318" y="1328" />
<bpmndi:BPMNLabel>
<dc:Bounds x="688" y="-185" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1k7xbcu_di" bpmnElement="SequenceFlow_1k7xbcu">
- <di:waypoint xsi:type="dc:Point" x="1290" y="-63" />
- <di:waypoint xsi:type="dc:Point" x="1363" y="-63" />
- <di:waypoint xsi:type="dc:Point" x="1363" y="-1" />
+ <di:waypoint x="1510" y="187" />
+ <di:waypoint x="1583" y="187" />
+ <di:waypoint x="1583" y="249" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1327" y="-78" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ScriptTask_0ti2a86_di" bpmnElement="Task_0dx8gpp">
- <dc:Bounds x="616" y="-103" width="100" height="80" />
+ <dc:Bounds x="836" y="147" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="CallActivity_1r5f381_di" bpmnElement="Task_0e8s9xm">
- <dc:Bounds x="796" y="-103" width="100" height="80" />
+ <dc:Bounds x="1016" y="147" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ScriptTask_0fajmo7_di" bpmnElement="Task_0cdjxcd">
- <dc:Bounds x="1190" y="-103" width="100" height="80" />
+ <dc:Bounds x="1410" y="147" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ScriptTask_065935d_di" bpmnElement="Task_19zw1li">
- <dc:Bounds x="119" y="841" width="100" height="80" />
+ <dc:Bounds x="339" y="1091" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="CallActivity_11w102e_di" bpmnElement="Task_01b1fio">
- <dc:Bounds x="285" y="841" width="100" height="80" />
+ <dc:Bounds x="505" y="1091" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0thm33s_di" bpmnElement="SequenceFlow_0thm33s">
- <di:waypoint xsi:type="dc:Point" x="219" y="881" />
- <di:waypoint xsi:type="dc:Point" x="285" y="881" />
+ <di:waypoint x="439" y="1131" />
+ <di:waypoint x="505" y="1131" />
<bpmndi:BPMNLabel>
<dc:Bounds x="252" y="856" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0aegg0r_di" bpmnElement="SequenceFlow_0aegg0r">
- <di:waypoint xsi:type="dc:Point" x="385" y="881" />
- <di:waypoint xsi:type="dc:Point" x="438" y="881" />
- <di:waypoint xsi:type="dc:Point" x="438" y="953" />
- <di:waypoint xsi:type="dc:Point" x="159" y="953" />
- <di:waypoint xsi:type="dc:Point" x="159" y="1031" />
+ <di:waypoint x="605" y="1131" />
+ <di:waypoint x="658" y="1131" />
+ <di:waypoint x="658" y="1203" />
+ <di:waypoint x="379" y="1203" />
+ <di:waypoint x="379" y="1281" />
<bpmndi:BPMNLabel>
<dc:Bounds x="453" y="917" width="0" height="0" />
</bpmndi:BPMNLabel>
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleRollback.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleRollback.bpmn
index e9675b89f8..699ee5bcd1 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleRollback.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleRollback.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="_Wblj8GyfEeWUWLTvug7ZOg" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.10.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_Wblj8GyfEeWUWLTvug7ZOg" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="3.7.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
<bpmn2:process id="DoCreateVfModuleRollback" name="DoCreateVfModuleRollback" isExecutable="true">
<bpmn2:startEvent id="StartEvent_1">
<bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
@@ -21,7 +21,7 @@
<bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing>
</bpmn2:callActivity>
<bpmn2:sequenceFlow id="SequenceFlow_6" name="yes" sourceRef="ExclusiveGateway_1" targetRef="InvokePrepareUpdateAAIVfModule">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable("DCVFMR_rollbackPrepareUpdateVfModule") == "true" && !(execution.getVariable('aLaCarte') == true && execution.getVariable("DCVFMR_rollbackSDNCRequestAssign") == "true")]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy">execution.getVariable("DCVFMR_rollbackPrepareUpdateVfModule") == "true" &amp;&amp; !(execution.getVariable('aLaCarte') == true &amp;&amp; execution.getVariable("DCVFMR_rollbackSDNCRequestAssign") == "true")</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="InvokePrepareUpdateAAIVfModule" targetRef="ExclusiveGateway_2" />
<bpmn2:sequenceFlow id="SequenceFlow_9" name="no" sourceRef="ExclusiveGateway_1" targetRef="ExclusiveGateway_2" />
@@ -34,15 +34,15 @@
<bpmn2:scriptTask id="VNFAdapterPrep" name="VNFAdapter&#10;Prep" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_1p0v6yk</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_16</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def dcvfmr = new DoCreateVfModuleRollback()
-dcvfmr.prepVNFAdapterRequest(execution)]]></bpmn2:script>
+dcvfmr.prepVNFAdapterRequest(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_16" name="" sourceRef="VNFAdapterPrep" targetRef="InvokeVNFAdapter" />
- <bpmn2:callActivity id="InvokeVNFAdapter" name="Invoke&#10;VNFAdapterTask" calledElement="vnfAdapterTask">
+ <bpmn2:callActivity id="InvokeVNFAdapter" name="Invoke&#10;VNFAdapterTask" calledElement="openstackAdapterTask">
<bpmn2:extensionElements>
<camunda:out source="WorkflowException" target="WorkflowException" />
- <camunda:in source="vnfAdapterTaskRequest" target="vnfAdapterTaskRequest" />
+ <camunda:in source="vnfAdapterTaskRequest" target="openstackAdapterTaskRequest" />
<camunda:out source="WorkflowResponse" target="DoDVfMod_DoCreateVfModuleRollbackResponse" />
<camunda:in source="mso-request-id" target="mso-request-id" />
<camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
@@ -51,15 +51,15 @@ dcvfmr.prepVNFAdapterRequest(execution)]]></bpmn2:script>
<bpmn2:outgoing>SequenceFlow_08aruzz</bpmn2:outgoing>
</bpmn2:callActivity>
<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:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DCVFMR_rollbackSDNCRequestActivate") == "true" &amp;&amp; execution.getVariable("sdncVersion") == "1707"}</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:sequenceFlow id="SequenceFlow_15" name="no" sourceRef="ExclusiveGateway_2" targetRef="ExclusiveGateway_1938vz9" />
<bpmn2:scriptTask id="UpdateAAIVfModulePrep" name="UpdateAAIVfModule&#10;Prep" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_13</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def dcvfmr = new DoCreateVfModuleRollback()
-dcvfmr.prepUpdateAAIVfModule(execution)]]></bpmn2:script>
+dcvfmr.prepUpdateAAIVfModule(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_14" name="" sourceRef="UpdateAAIVfModulePrep" targetRef="InvokeUpdateAAIVfModule" />
<bpmn2:callActivity id="InvokeUpdateAAIVfModule" name="Invoke&#10;UpdateAAIVfModule" calledElement="UpdateAAIVfModule">
@@ -78,7 +78,7 @@ dcvfmr.prepUpdateAAIVfModule(execution)]]></bpmn2:script>
<bpmn2:outgoing>SequenceFlow_17</bpmn2:outgoing>
</bpmn2:exclusiveGateway>
<bpmn2:sequenceFlow id="SequenceFlow_13" name="yes" sourceRef="ExclusiveGateway_3" targetRef="UpdateAAIVfModulePrep">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFMR_rollbackUpdateAAIVfModule") == "true"}]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DCVFMR_rollbackUpdateAAIVfModule") == "true"}</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:sequenceFlow id="SequenceFlow_17" name="no" sourceRef="ExclusiveGateway_3" targetRef="ExclusiveGateway_4" />
<bpmn2:exclusiveGateway id="ExclusiveGateway_4" name="Rollback SDNC Request?" default="SequenceFlow_20">
@@ -88,15 +88,15 @@ dcvfmr.prepUpdateAAIVfModule(execution)]]></bpmn2:script>
<bpmn2:outgoing>SequenceFlow_20</bpmn2:outgoing>
</bpmn2:exclusiveGateway>
<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:conditionExpression xsi:type="bpmn2:tFormalExpression">#{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&#10;Prep" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_1rpg6ac</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_32</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def dcvfmr = new DoCreateVfModuleRollback()
-dcvfmr.prepSDNCAdapterRequest(execution)]]></bpmn2:script>
+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&#10;SDNCAdapterV1" calledElement="sdncAdapter">
@@ -121,7 +121,7 @@ dcvfmr.prepSDNCAdapterRequest(execution)]]></bpmn2:script>
</bpmn2:exclusiveGateway>
<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:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DCVFMR_rollbackCreateAAIVfModule") == "true"}</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:callActivity id="InvokeDeleteAAIVfModule" name="Invoke&#10;DeleteAAIVfModule" calledElement="DeleteAAIVfModule">
<bpmn2:extensionElements>
@@ -141,18 +141,18 @@ dcvfmr.prepSDNCAdapterRequest(execution)]]></bpmn2:script>
<bpmn2:scriptTask id="DeleteAAIVfModulePrep" name="DeleteAAIVfModule&#10;Prep" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_24</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_34</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def dcvfmr = new DoCreateVfModuleRollback()
-dcvfmr.prepDeleteAAIVfModule(execution)]]></bpmn2:script>
+dcvfmr.prepDeleteAAIVfModule(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_34" name="" sourceRef="DeleteAAIVfModulePrep" targetRef="InvokeDeleteAAIVfModule" />
<bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="InvokeSDNCAdapterV1_2" targetRef="ScriptTask_1" />
<bpmn2:scriptTask id="ScriptTask_1" name="Validate SDNC Response" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def dcvfmr = new DoCreateVfModuleRollback()
-dcvfmr.sdncValidateResponse(execution, DCVFMR_DoCreateVfModuleRollbackResponse)]]></bpmn2:script>
+dcvfmr.sdncValidateResponse(execution, DCVFMR_DoCreateVfModuleRollbackResponse)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="ScriptTask_1" targetRef="ExclusiveGateway_5" />
<bpmn2:subProcess id="SubProcess_1" name="Rollback Error Handling" triggeredByEvent="true">
@@ -168,18 +168,18 @@ dcvfmr.sdncValidateResponse(execution, DCVFMR_DoCreateVfModuleRollbackResponse)]
<bpmn2:scriptTask id="LogSaveWorkflowException" name="Log and Save Workflow Exception" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_02fx6z6</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_22</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def dcvfmr = new DoCreateVfModuleRollback()
dcvfmr.logWorkflowException(execution, 'DoCreateVfModuleRollback caught an event')
-dcvfmr.saveWorkflowException(execution, 'DCVFMR_CaughtWorkflowException1')]]></bpmn2:script>
+dcvfmr.saveWorkflowException(execution, 'DCVFMR_CaughtWorkflowException1')</bpmn2:script>
</bpmn2:scriptTask>
<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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def dcvfmr = new DoCreateVfModuleRollback()
-dcvfmr.setFailedRollbackStatus(execution)]]></bpmn2:script>
+dcvfmr.setFailedRollbackStatus(execution)</bpmn2:script>
</bpmn2:scriptTask>
</bpmn2:subProcess>
<bpmn2:boundaryEvent id="BoundaryEvent_1" name="" attachedToRef="SubProcess_1">
@@ -193,9 +193,9 @@ dcvfmr.setFailedRollbackStatus(execution)]]></bpmn2:script>
<bpmn2:scriptTask id="InitializeVariables" name="Initialize Variables" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def dcvfmr = new DoCreateVfModuleRollback()
-dcvfmr.preProcessRequest(execution)]]></bpmn2:script>
+dcvfmr.preProcessRequest(execution)</bpmn2:script>
</bpmn2:scriptTask>
<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">
@@ -207,16 +207,16 @@ dcvfmr.preProcessRequest(execution)]]></bpmn2:script>
<bpmn2:scriptTask id="Task_08csf14" name="Delete Network Policies from AAI" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_0unumxv</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_0djpj3r</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def dcvfmr = new DoCreateVfModuleRollback()
-dcvfmr.deleteNetworkPoliciesFromAAI(execution)]]></bpmn2:script>
+dcvfmr.deleteNetworkPoliciesFromAAI(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:scriptTask id="Task_18r7u02" name="PreProcess Update AAI Generic VNF" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_111l1he</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_0ca4brn</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def dcvfmr = new DoCreateVfModuleRollback()
-dcvfmr.preProcessUpdateAAIGenericVnf(execution)]]></bpmn2:script>
+dcvfmr.preProcessUpdateAAIGenericVnf(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:callActivity id="Task_01ajtiy" name="Update AAI Generic VNF" calledElement="UpdateAAIGenericVnf">
<bpmn2:extensionElements>
@@ -238,12 +238,12 @@ dcvfmr.preProcessUpdateAAIGenericVnf(execution)]]></bpmn2:script>
</bpmn2:exclusiveGateway>
<bpmn2:sequenceFlow id="SequenceFlow_185bo77" name="no" sourceRef="ExclusiveGateway_0a0hroy" targetRef="ExclusiveGateway_0uvarlv" />
<bpmn2:sequenceFlow id="SequenceFlow_111l1he" name="yes" sourceRef="ExclusiveGateway_0a0hroy" targetRef="Task_18r7u02">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFMR_rollbackUpdateVnfAAI") == "true"}]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DCVFMR_rollbackUpdateVnfAAI") == "true"}</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:sequenceFlow id="SequenceFlow_0ca4brn" sourceRef="Task_18r7u02" targetRef="Task_01ajtiy" />
<bpmn2:sequenceFlow id="SequenceFlow_19r2uus" sourceRef="Task_01ajtiy" targetRef="ExclusiveGateway_0uvarlv" />
<bpmn2:sequenceFlow id="SequenceFlow_1p0v6yk" name="yes&#10;&#10;" sourceRef="ExclusiveGateway_0uvarlv" targetRef="VNFAdapterPrep">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFMR_rollbackVnfAdapterCreate") == "true"}]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DCVFMR_rollbackVnfAdapterCreate") == "true"}</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:sequenceFlow id="SequenceFlow_03i4czf" name="no" sourceRef="ExclusiveGateway_0uvarlv" targetRef="ExclusiveGateway_0ahc44p" />
<bpmn2:exclusiveGateway id="ExclusiveGateway_1yozzae" name="Skip Rollback?" default="SequenceFlow_11er1t8">
@@ -253,7 +253,7 @@ dcvfmr.preProcessUpdateAAIGenericVnf(execution)]]></bpmn2:script>
</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:conditionExpression xsi:type="bpmn2:tFormalExpression">#{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>
@@ -264,9 +264,9 @@ dcvfmr.preProcessUpdateAAIGenericVnf(execution)]]></bpmn2:script>
<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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def dcvfmr = new DoCreateVfModuleRollback()
-dcvfmr.preProcessSDNCDeactivateRequest(execution)]]></bpmn2:script>
+dcvfmr.preProcessSDNCDeactivateRequest(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:callActivity id="CallSDNCDeactivate" name="Call SDNC Adapter Deactivate" calledElement="sdncAdapter">
<bpmn2:extensionElements>
@@ -284,26 +284,26 @@ dcvfmr.preProcessSDNCDeactivateRequest(execution)]]></bpmn2:script>
<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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def dcvfmr = new DoCreateVfModuleRollback()
String response = execution.getVariable("DCVFMR_deactivateSDNCAdapterResponse")
-dcvfmr.sdncValidateResponse(execution, response)]]></bpmn2:script>
+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:conditionExpression xsi:type="bpmn2:tFormalExpression">#{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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def dcvfmr = new DoCreateVfModuleRollback()
-dcvfmr.preProcessSDNCUnassignRequest(execution)]]></bpmn2:script>
+dcvfmr.preProcessSDNCUnassignRequest(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:callActivity id="CallSDNCAdapterUnassign" name="Call SDNC Adapter Unassign" calledElement="sdncAdapter">
<bpmn2:extensionElements>
@@ -321,10 +321,10 @@ dcvfmr.preProcessSDNCUnassignRequest(execution)]]></bpmn2:script>
<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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def dcvfmr = new DoCreateVfModuleRollback()
String response = execution.getVariable("DCVFMR_unassignSDNCAdapterResponse")
-dcvfmr.sdncValidateResponse(execution, response)]]></bpmn2:script>
+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>
@@ -333,7 +333,7 @@ dcvfmr.sdncValidateResponse(execution, response)]]></bpmn2:script>
</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:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DCVFMR_rollbackSDNCRequestAssign") == "true" &amp;&amp; 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" />
@@ -342,9 +342,9 @@ dcvfmr.sdncValidateResponse(execution, response)]]></bpmn2:script>
<bpmn2:incoming>SequenceFlow_35</bpmn2:incoming>
<bpmn2:incoming>SequenceFlow_17it51d</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_1h8ve60</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def dcvfmr = new DoCreateVfModuleRollback()
-dcvfmr.setSuccessfulRollbackStatus(execution)]]></bpmn2:script>
+dcvfmr.setSuccessfulRollbackStatus(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:exclusiveGateway id="ExclusiveGateway_0ahc44p" name="Set AAI Status to Assigned?" default="SequenceFlow_1gcfdej">
<bpmn2:incoming>SequenceFlow_03i4czf</bpmn2:incoming>
@@ -354,7 +354,7 @@ dcvfmr.setSuccessfulRollbackStatus(execution)]]></bpmn2:script>
</bpmn2:exclusiveGateway>
<bpmn2:sequenceFlow id="SequenceFlow_1gcfdej" name="no" sourceRef="ExclusiveGateway_0ahc44p" targetRef="ExclusiveGateway_3" />
<bpmn2:sequenceFlow id="SequenceFlow_17ne2iz" name="yes" sourceRef="ExclusiveGateway_0ahc44p" targetRef="Task_1sqxedz">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable('aLaCarte') == true && execution.getVariable("DCVFMR_rollbackSDNCRequestAssign") == "true"]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy">execution.getVariable('aLaCarte') == true &amp;&amp; execution.getVariable("DCVFMR_rollbackSDNCRequestAssign") == "true"</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:sequenceFlow id="SequenceFlow_17it51d" sourceRef="Task_0k9gnp2" targetRef="SetSuccessfulRollbackStatus" />
<bpmn2:sequenceFlow id="SequenceFlow_0fvuowt" sourceRef="Task_1sqxedz" targetRef="Task_0k9gnp2" />
@@ -370,9 +370,9 @@ dcvfmr.setSuccessfulRollbackStatus(execution)]]></bpmn2:script>
<bpmn2:scriptTask id="Task_1sqxedz" name="UpdateAAIVfModule To Assigned Prep" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_17ne2iz</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_0fvuowt</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def dcvfmr = new DoCreateVfModuleRollback()
-dcvfmr.prepUpdateAAIVfModuleToAssigned(execution)]]></bpmn2:script>
+dcvfmr.prepUpdateAAIVfModuleToAssigned(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_08aruzz" sourceRef="InvokeVNFAdapter" targetRef="ExclusiveGateway_0ahc44p" />
</bpmn2:process>
@@ -381,593 +381,593 @@ dcvfmr.prepUpdateAAIVfModuleToAssigned(execution)]]></bpmn2:script>
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateVfModuleRollback">
<bpmndi:BPMNShape id="_BPMNShape_StartEvent_37" bpmnElement="StartEvent_1">
- <dc:Bounds x="13" y="100" width="36" height="36" />
+ <dc:Bounds x="203" y="210" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="31" y="141" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_22" bpmnElement="InitializeVariables">
- <dc:Bounds x="115" y="78" width="100" height="80" />
+ <dc:Bounds x="305" y="188" 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="115" y="118" />
+ <di:waypoint x="239" y="228" />
+ <di:waypoint x="305" y="228" />
<bpmndi:BPMNLabel>
<dc:Bounds x="82" y="103" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_160" bpmnElement="InvokePrepareUpdateAAIVfModule">
- <dc:Bounds x="725" y="23" width="100" height="80" />
+ <dc:Bounds x="915" y="133" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_170" bpmnElement="VNFAdapterPrep">
- <dc:Bounds x="104" y="763" width="100" height="80" />
+ <dc:Bounds x="294" y="873" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_CallActivity_13" bpmnElement="InvokeVNFAdapter">
- <dc:Bounds x="262" y="763" width="100" height="80" />
+ <dc:Bounds x="452" y="873" 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="204" y="803" />
- <di:waypoint xsi:type="dc:Point" x="262" y="803" />
+ <di:waypoint x="394" y="913" />
+ <di:waypoint x="452" y="913" />
<bpmndi:BPMNLabel>
<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="732" y="758" width="100" height="80" />
+ <dc:Bounds x="922" y="868" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_CallActivity_14" bpmnElement="InvokeUpdateAAIVfModule">
- <dc:Bounds x="912" y="758" width="100" height="80" />
+ <dc:Bounds x="1102" y="868" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_172" bpmnElement="SDNCAdapterPrep2">
- <dc:Bounds x="187" y="995" width="100" height="80" />
+ <dc:Bounds x="377" y="1105" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_CallActivity_15" bpmnElement="InvokeSDNCAdapterV1_2">
- <dc:Bounds x="327" y="995" width="100" height="80" />
+ <dc:Bounds x="517" y="1105" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_173" bpmnElement="DeleteAAIVfModulePrep">
- <dc:Bounds x="704" y="998" width="100" height="80" />
+ <dc:Bounds x="894" y="1108" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_CallActivity_16" bpmnElement="InvokeDeleteAAIVfModule">
- <dc:Bounds x="860" y="998" width="100" height="80" />
+ <dc:Bounds x="1050" y="1108" 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="287" y="1035" />
- <di:waypoint xsi:type="dc:Point" x="327" y="1035" />
+ <di:waypoint x="477" y="1145" />
+ <di:waypoint x="517" y="1145" />
<bpmndi:BPMNLabel>
<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="804" y="1038" />
- <di:waypoint xsi:type="dc:Point" x="860" y="1038" />
+ <di:waypoint x="994" y="1148" />
+ <di:waypoint x="1050" y="1148" />
<bpmndi:BPMNLabel>
<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="1159" y="1105" width="36" height="36" />
+ <dc:Bounds x="1349" y="1215" width="36" height="36" />
<bpmndi:BPMNLabel>
<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="960" y="1038" />
- <di:waypoint xsi:type="dc:Point" x="1078" y="1038" />
- <di:waypoint xsi:type="dc:Point" x="1078" y="1083" />
+ <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_35" bpmnElement="SequenceFlow_35" sourceElement="_BPMNShape_CallActivity_16" targetElement="ScriptTask_0lrbhgj_di">
+ <di:waypoint x="1150" y="1148" />
+ <di:waypoint x="1268" y="1148" />
+ <di:waypoint x="1268" y="1193" />
<bpmndi:BPMNLabel>
<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">
- <dc:Bounds x="538" y="93" width="50" height="50" />
+ <dc:Bounds x="728" y="203" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="519" y="152" width="88" height="36" />
+ <dc:Bounds x="708" y="262" width="90" height="40" />
</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="215" y="118" />
- <di:waypoint xsi:type="dc:Point" x="278" y="118" />
+ <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ScriptTask_22" targetElement="ExclusiveGateway_1yozzae_di">
+ <di:waypoint x="405" y="228" />
+ <di:waypoint x="468" y="228" />
<bpmndi:BPMNLabel>
<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" />
+ <dc:Bounds x="1102" y="202" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="897" y="152" width="79" height="24" />
+ <dc:Bounds x="1087" y="262" width="80" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_ExclusiveGateway_223">
- <di:waypoint xsi:type="dc:Point" x="563" y="93" />
- <di:waypoint xsi:type="dc:Point" x="563" y="63" />
- <di:waypoint xsi:type="dc:Point" x="725" y="63" />
+ <di:waypoint x="753" y="203" />
+ <di:waypoint x="753" y="173" />
+ <di:waypoint x="915" y="173" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="573" y="39.419820324530114" width="18" height="12" />
+ <dc:Bounds x="764" y="149" width="17" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_ScriptTask_160" targetElement="_BPMNShape_ExclusiveGateway_224">
- <di:waypoint xsi:type="dc:Point" x="825" y="63" />
- <di:waypoint xsi:type="dc:Point" x="862" y="63" />
- <di:waypoint xsi:type="dc:Point" x="937" y="63" />
- <di:waypoint xsi:type="dc:Point" x="937" y="92" />
+ <di:waypoint x="1015" y="173" />
+ <di:waypoint x="1052" y="173" />
+ <di:waypoint x="1127" y="173" />
+ <di:waypoint x="1127" y="202" />
<bpmndi:BPMNLabel>
<dc:Bounds x="888" y="63" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_ExclusiveGateway_223" targetElement="_BPMNShape_ExclusiveGateway_224">
- <di:waypoint xsi:type="dc:Point" x="588" y="118" />
- <di:waypoint xsi:type="dc:Point" x="912" y="117" />
+ <di:waypoint x="778" y="228" />
+ <di:waypoint x="1102" y="227" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="743" y="117.50867542935495" width="12" height="12" />
+ <dc:Bounds x="933" y="228" width="13" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_ExclusiveGateway_224" targetElement="_BPMNShape_ScriptTask_170">
- <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="321" />
- <di:waypoint xsi:type="dc:Point" x="203" y="321" />
+ <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_ExclusiveGateway_224" targetElement="ScriptTask_17dmaj7_di">
+ <di:waypoint x="1127" y="252" />
+ <di:waypoint x="1127" y="339" />
+ <di:waypoint x="219" y="339" />
+ <di:waypoint x="219" y="431" />
+ <di:waypoint x="393" y="431" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="501" y="235" width="18" height="12" />
+ <dc:Bounds x="692" y="345" width="17" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_225" bpmnElement="ExclusiveGateway_3" isMarkerVisible="true">
- <dc:Bounds x="594" y="837" width="50" height="50" />
+ <dc:Bounds x="784" y="947" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="578" y="892" width="83" height="24" />
+ <dc:Bounds x="769" y="1002" width="81" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="SequenceFlow_13" sourceElement="_BPMNShape_ExclusiveGateway_225" targetElement="_BPMNShape_ScriptTask_171">
- <di:waypoint xsi:type="dc:Point" x="644" y="862" />
- <di:waypoint xsi:type="dc:Point" x="665" y="862" />
- <di:waypoint xsi:type="dc:Point" x="665" y="798" />
- <di:waypoint xsi:type="dc:Point" x="732" y="798" />
+ <di:waypoint x="834" y="972" />
+ <di:waypoint x="855" y="972" />
+ <di:waypoint x="855" y="908" />
+ <di:waypoint x="922" y="908" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="687" y="803" width="18" height="12" />
+ <dc:Bounds x="878" y="913" width="17" 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="832" y="798" />
- <di:waypoint xsi:type="dc:Point" x="912" y="798" />
+ <di:waypoint x="1022" y="908" />
+ <di:waypoint x="1102" y="908" />
<bpmndi:BPMNLabel>
<dc:Bounds x="843" y="798" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_226" bpmnElement="ExclusiveGateway_4" isMarkerVisible="true">
- <dc:Bounds x="1092" y="837" width="50" height="50" />
+ <dc:Bounds x="1282" y="947" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1078" y="892" width="79" height="24" />
+ <dc:Bounds x="1269" y="1002" width="77" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_15" bpmnElement="SequenceFlow_15" sourceElement="_BPMNShape_ExclusiveGateway_224" targetElement="_BPMNShape_ExclusiveGateway_225">
- <di:waypoint xsi:type="dc:Point" x="962" y="117" />
- <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="382" />
- <di:waypoint xsi:type="dc:Point" x="922" y="382" />
+ <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_15" bpmnElement="SequenceFlow_15" sourceElement="_BPMNShape_ExclusiveGateway_224" targetElement="ExclusiveGateway_1938vz9_di">
+ <di:waypoint x="1152" y="227" />
+ <di:waypoint x="1215" y="227" />
+ <di:waypoint x="1215" y="322" />
+ <di:waypoint x="209" y="322" />
+ <di:waypoint x="209" y="492" />
+ <di:waypoint x="1112" y="492" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="501" y="187" width="12" height="12" />
+ <dc:Bounds x="691" y="297" width="13" height="14" />
</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="644" y="862" />
- <di:waypoint xsi:type="dc:Point" x="1092" y="862" />
+ <di:waypoint x="834" y="972" />
+ <di:waypoint x="1282" y="972" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="855" y="862" width="12" height="12" />
+ <dc:Bounds x="1045" y="972" width="13" 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="1012" y="798" />
- <di:waypoint xsi:type="dc:Point" x="1117" y="798" />
- <di:waypoint xsi:type="dc:Point" x="1117" y="837" />
+ <di:waypoint x="1202" y="908" />
+ <di:waypoint x="1307" y="908" />
+ <di:waypoint x="1307" y="947" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1090" 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="1117" y="887" />
- <di:waypoint xsi:type="dc:Point" x="1117" 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="56" y="1103" />
+ <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_19" bpmnElement="SequenceFlow_19" sourceElement="_BPMNShape_ExclusiveGateway_226" targetElement="ExclusiveGateway_1h87hhh_di">
+ <di:waypoint x="1307" y="997" />
+ <di:waypoint x="1307" y="1068" />
+ <di:waypoint x="224" y="1068" />
+ <di:waypoint x="224" y="1213" />
+ <di:waypoint x="246" y="1213" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="262" y="958" width="18" height="12" />
+ <dc:Bounds x="453" y="1068" width="17" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_227" bpmnElement="ExclusiveGateway_5" isMarkerVisible="true">
- <dc:Bounds x="589" y="1098" width="50" height="50" />
+ <dc:Bounds x="779" y="1208" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="578" y="1153" width="71" height="24" />
+ <dc:Bounds x="769" y="1263" width="70" height="27" />
</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="1092" 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" />
+ <di:waypoint x="1282" y="972" />
+ <di:waypoint x="1219" y="972" />
+ <di:waypoint x="1219" y="1052" />
+ <di:waypoint x="215" y="1052" />
+ <di:waypoint x="215" y="1356" />
+ <di:waypoint x="804" y="1356" />
+ <di:waypoint x="804" y="1258" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="976" y="912" width="12" height="12" />
+ <dc:Bounds x="1166" y="1022" width="13" height="14" />
</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="639" y="1123" />
- <di:waypoint xsi:type="dc:Point" x="1028" y="1123" />
+ <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_21" bpmnElement="SequenceFlow_21" sourceElement="_BPMNShape_ExclusiveGateway_227" targetElement="ScriptTask_0lrbhgj_di">
+ <di:waypoint x="829" y="1233" />
+ <di:waypoint x="1218" y="1233" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="811" y="1123" width="12" height="12" />
+ <dc:Bounds x="1001" y="1233" width="13" height="14" />
</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="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" />
+ <di:waypoint x="829" y="1233" />
+ <di:waypoint x="854" y="1233" />
+ <di:waypoint x="854" y="1177" />
+ <di:waypoint x="854" y="1148" />
+ <di:waypoint x="894" y="1148" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="679" y="1044" width="18" height="12" />
+ <dc:Bounds x="870" y="1154" width="17" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_255" bpmnElement="ScriptTask_1">
- <dc:Bounds x="461" y="995" width="100" height="80" />
+ <dc:Bounds x="651" y="1105" 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="427" y="1035" />
- <di:waypoint xsi:type="dc:Point" x="461" y="1035" />
+ <di:waypoint x="617" y="1145" />
+ <di:waypoint x="651" y="1145" />
<bpmndi:BPMNLabel>
<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="561" y="1035" />
- <di:waypoint xsi:type="dc:Point" x="614" y="1035" />
- <di:waypoint xsi:type="dc:Point" x="614" y="1098" />
+ <di:waypoint x="751" y="1145" />
+ <di:waypoint x="804" y="1145" />
+ <di:waypoint x="804" y="1208" />
<bpmndi:BPMNLabel>
<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="27" y="1464" width="699" height="159" />
+ <dc:Bounds x="217" y="1574" width="699" height="159" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_StartEvent_59" bpmnElement="CatchExceptions">
- <dc:Bounds x="47" y="1515" width="36" height="36" />
+ <dc:Bounds x="237" y="1625" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="53" y="1560" width="86" height="12" />
+ <dc:Bounds x="243" y="1670" width="87" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_281" bpmnElement="LogSaveWorkflowException">
- <dc:Bounds x="391" y="1493" width="100" height="80" />
+ <dc:Bounds x="581" y="1603" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_EndEvent_188" bpmnElement="EndEvent_1">
- <dc:Bounds x="565" y="1515" width="36" height="36" />
+ <dc:Bounds x="755" y="1625" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="583" y="1551" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_BoundaryEvent_55" bpmnElement="BoundaryEvent_1">
- <dc:Bounds x="708" y="1514" width="36" height="36" />
+ <dc:Bounds x="898" y="1624" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="726" y="1550" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_EndEvent_189" bpmnElement="EndEvent_2">
- <dc:Bounds x="880" y="1514" width="36" height="36" />
+ <dc:Bounds x="1070" y="1624" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="898" y="1555" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_23" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_BoundaryEvent_55" targetElement="_BPMNShape_EndEvent_189">
- <di:waypoint xsi:type="dc:Point" x="744" y="1532" />
- <di:waypoint xsi:type="dc:Point" x="818" y="1532" />
- <di:waypoint xsi:type="dc:Point" x="818" y="1532" />
- <di:waypoint xsi:type="dc:Point" x="880" y="1532" />
+ <di:waypoint x="934" y="1642" />
+ <di:waypoint x="1008" y="1642" />
+ <di:waypoint x="1008" y="1642" />
+ <di:waypoint x="1070" y="1642" />
<bpmndi:BPMNLabel>
<dc:Bounds x="833" y="1532" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ExclusiveGateway_0a0hroy_di" bpmnElement="ExclusiveGateway_0a0hroy" isMarkerVisible="true">
- <dc:Bounds x="413" y="588" width="50" height="50" />
+ <dc:Bounds x="603" y="698" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="397" y="638" width="84" height="38" />
+ <dc:Bounds x="584" y="748" width="90" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ScriptTask_0mnb4d7_di" bpmnElement="Task_08csf14">
- <dc:Bounds x="212" y="507" width="100" height="80" />
+ <dc:Bounds x="402" y="617" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ScriptTask_1shi2a6_di" bpmnElement="Task_18r7u02">
- <dc:Bounds x="552" y="507" width="100" height="80" />
+ <dc:Bounds x="742" y="617" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="CallActivity_0zvct4i_di" bpmnElement="Task_01ajtiy">
- <dc:Bounds x="747" y="507" width="100" height="80" />
+ <dc:Bounds x="937" y="617" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0djpj3r_di" bpmnElement="SequenceFlow_0djpj3r">
- <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" />
+ <di:waypoint x="502" y="657" />
+ <di:waypoint x="628" y="657" />
+ <di:waypoint x="628" y="699" />
<bpmndi:BPMNLabel>
<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="921" y="588" width="50" height="50" />
+ <dc:Bounds x="1111" y="698" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="907" y="638" width="78" height="26" />
+ <dc:Bounds x="1096" y="748" width="80" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_185bo77_di" bpmnElement="SequenceFlow_185bo77">
- <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" />
+ <di:waypoint x="653" y="723" />
+ <di:waypoint x="882" y="723" />
+ <di:waypoint x="882" y="723" />
+ <di:waypoint x="1111" y="723" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="701" y="613" width="12" height="14" />
+ <dc:Bounds x="891" y="723" width="13" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_111l1he_di" bpmnElement="SequenceFlow_111l1he">
- <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" />
+ <di:waypoint x="653" y="723" />
+ <di:waypoint x="683" y="723" />
+ <di:waypoint x="683" y="657" />
+ <di:waypoint x="742" y="657" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="508" y="553" width="18" height="14" />
+ <dc:Bounds x="699" y="663" width="17" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0ca4brn_di" bpmnElement="SequenceFlow_0ca4brn">
- <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" />
+ <di:waypoint x="842" y="657" />
+ <di:waypoint x="883" y="657" />
+ <di:waypoint x="883" y="657" />
+ <di:waypoint x="937" y="657" />
<bpmndi:BPMNLabel>
<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="847" y="547" />
- <di:waypoint xsi:type="dc:Point" x="946" y="547" />
- <di:waypoint xsi:type="dc:Point" x="946" y="588" />
+ <di:waypoint x="1037" y="657" />
+ <di:waypoint x="1136" y="657" />
+ <di:waypoint x="1136" y="698" />
<bpmndi:BPMNLabel>
<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="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" />
+ <di:waypoint x="1136" y="748" />
+ <di:waypoint x="1136" y="834" />
+ <di:waypoint x="237" y="834" />
+ <di:waypoint x="237" y="913" />
+ <di:waypoint x="294" y="913" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="507" y="732" width="18" height="14" />
+ <dc:Bounds x="698" y="842" width="17" height="40" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_03i4czf_di" bpmnElement="SequenceFlow_03i4czf">
- <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="466" y="862" />
+ <di:waypoint x="1161" y="723" />
+ <di:waypoint x="1226" y="723" />
+ <di:waypoint x="1226" y="819" />
+ <di:waypoint x="220" y="819" />
+ <di:waypoint x="220" y="972" />
+ <di:waypoint x="656" y="972" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="508" y="683" width="12" height="12" />
+ <dc:Bounds x="698" y="793" width="13" 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" />
+ <dc:Bounds x="468" y="203" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="267" y="143" width="72" height="12" />
+ <dc:Bounds x="457" y="253" width="73" height="14" />
</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="538" y="118" />
+ <di:waypoint x="518" y="228" />
+ <di:waypoint x="728" y="228" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="357" y="91.50148837900852" width="12" height="12" />
+ <dc:Bounds x="547" y="202" width="13" height="14" />
</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="1158" y="-11" />
- <di:waypoint xsi:type="dc:Point" x="1177" y="1105" />
+ <di:waypoint x="493" y="203" />
+ <di:waypoint x="493" y="99" />
+ <di:waypoint x="1348" y="99" />
+ <di:waypoint x="1367" y="1215" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="723" y="-26" width="18" height="14" />
+ <dc:Bounds x="914" y="84" width="17" height="14" />
</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="491" y="1533" />
- <di:waypoint xsi:type="dc:Point" x="565" y="1533" />
+ <di:waypoint x="681" y="1643" />
+ <di:waypoint x="755" y="1643" />
<bpmndi:BPMNLabel>
<dc:Bounds x="528" y="1518" 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="83" y="1533" />
- <di:waypoint xsi:type="dc:Point" x="198" y="1533" />
+ <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_StartEvent_59" targetElement="ScriptTask_0cd144f_di">
+ <di:waypoint x="273" y="1643" />
+ <di:waypoint x="388" y="1643" />
<bpmndi:BPMNLabel>
<dc:Bounds x="141" y="1518" 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" />
+ <dc:Bounds x="1112" y="467" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="902" y="407" width="90" height="24" />
+ <dc:Bounds x="1093" y="517" width="89" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ScriptTask_17dmaj7_di" bpmnElement="PrepareSDNCDeactivateRequest">
- <dc:Bounds x="204" y="281" width="100" height="80" />
+ <dc:Bounds x="394" y="391" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="CallActivity_0ouj5y6_di" bpmnElement="CallSDNCDeactivate">
- <dc:Bounds x="401" y="280" width="100" height="80" />
+ <dc:Bounds x="591" y="390" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ScriptTask_1fmh02z_di" bpmnElement="PostProcessSDNCDeactivateRequest">
- <dc:Bounds x="613" y="280" width="100" height="80" />
+ <dc:Bounds x="803" y="390" 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" />
+ <di:waypoint x="494" y="431" />
+ <di:waypoint x="591" y="430" />
<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" />
+ <di:waypoint x="691" y="430" />
+ <di:waypoint x="803" y="430" />
<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" />
+ <di:waypoint x="903" y="430" />
+ <di:waypoint x="1137" y="430" />
+ <di:waypoint x="1137" y="467" />
<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" />
+ <di:waypoint x="1162" y="492" />
+ <di:waypoint x="1223" y="492" />
+ <di:waypoint x="1223" y="576" />
+ <di:waypoint x="204" y="576" />
+ <di:waypoint x="204" y="723" />
+ <di:waypoint x="603" y="723" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="508" y="444" width="12" height="12" />
+ <dc:Bounds x="698" y="554" width="13" height="14" />
</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" />
+ <di:waypoint x="1137" y="517" />
+ <di:waypoint x="1137" y="592" />
+ <di:waypoint x="222" y="592" />
+ <di:waypoint x="222" y="657" />
+ <di:waypoint x="401" y="657" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="506" y="493" width="18" height="12" />
+ <dc:Bounds x="697" y="603" width="17" height="14" />
</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" />
+ <di:waypoint x="477" y="1287" />
+ <di:waypoint x="518" y="1287" />
<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" />
+ <di:waypoint x="618" y="1287" />
+ <di:waypoint x="659" y="1286" />
<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" />
+ <dc:Bounds x="377" y="1248" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="CallActivity_1stidyk_di" bpmnElement="CallSDNCAdapterUnassign">
- <dc:Bounds x="328" y="1137" width="100" height="80" />
+ <dc:Bounds x="518" y="1247" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ScriptTask_1ub9z2k_di" bpmnElement="PostProcessSDNCUnassignRequest">
- <dc:Bounds x="469" y="1136" width="100" height="80" />
+ <dc:Bounds x="659" y="1246" 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" />
+ <dc:Bounds x="246" y="1188" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="41" y="1127.9259624876604" width="79" height="24" />
+ <dc:Bounds x="231" y="1238" width="80" height="27" />
</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" />
+ <di:waypoint x="271" y="1188" />
+ <di:waypoint x="271" y="1145" />
+ <di:waypoint x="377" y="1145" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="100" y="1010.5" width="12" height="12" />
+ <dc:Bounds x="290" y="1121" width="13" height="14" />
</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" />
+ <di:waypoint x="271" y="1238" />
+ <di:waypoint x="271" y="1288" />
+ <di:waypoint x="377" y="1288" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="92" y="1182" width="18" height="12" />
+ <dc:Bounds x="283" y="1292" width="17" height="14" />
</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" />
+ <di:waypoint x="759" y="1286" />
+ <di:waypoint x="769" y="1286" />
+ <di:waypoint x="769" y="1233" />
+ <di:waypoint x="779" y="1233" />
<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" />
+ <di:waypoint x="1318" y="1233" />
+ <di:waypoint x="1349" y="1233" />
<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" />
+ <dc:Bounds x="1218" y="1193" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_02fx6z6_di" bpmnElement="SequenceFlow_02fx6z6">
- <di:waypoint xsi:type="dc:Point" x="298" y="1533" />
- <di:waypoint xsi:type="dc:Point" x="391" y="1533" />
+ <di:waypoint x="488" y="1643" />
+ <di:waypoint x="581" y="1643" />
<bpmndi:BPMNLabel>
<dc:Bounds x="345" y="1518" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ScriptTask_0cd144f_di" bpmnElement="SetFailedRollbackStatus">
- <dc:Bounds x="198" y="1493" width="100" height="80" />
+ <dc:Bounds x="388" y="1603" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ExclusiveGateway_0ahc44p_di" bpmnElement="ExclusiveGateway_0ahc44p" isMarkerVisible="true">
- <dc:Bounds x="465.5588822355289" y="837" width="50" height="50" />
+ <dc:Bounds x="656" y="947" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="500" y="805" width="82" height="24" />
+ <dc:Bounds x="689" y="915" width="84" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1gcfdej_di" bpmnElement="SequenceFlow_1gcfdej">
- <di:waypoint xsi:type="dc:Point" x="516" y="862" />
- <di:waypoint xsi:type="dc:Point" x="594" y="862" />
+ <di:waypoint x="706" y="972" />
+ <di:waypoint x="784" y="972" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="551" y="837.0195010054398" width="12" height="12" />
+ <dc:Bounds x="741" y="947" width="13" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_17ne2iz_di" bpmnElement="SequenceFlow_17ne2iz">
- <di:waypoint xsi:type="dc:Point" x="491" y="887" />
- <di:waypoint xsi:type="dc:Point" x="491" y="931" />
- <di:waypoint xsi:type="dc:Point" x="-38" y="931" />
- <di:waypoint xsi:type="dc:Point" x="-38" y="1347" />
- <di:waypoint xsi:type="dc:Point" x="104" y="1347" />
+ <di:waypoint x="681" y="997" />
+ <di:waypoint x="681" y="1041" />
+ <di:waypoint x="152" y="1041" />
+ <di:waypoint x="152" y="1457" />
+ <di:waypoint x="294" y="1457" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="459" y="884.8446601941747" width="18" height="12" />
+ <dc:Bounds x="650" y="995" width="17" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_17it51d_di" bpmnElement="SequenceFlow_17it51d">
- <di:waypoint xsi:type="dc:Point" x="362" y="1347" />
- <di:waypoint xsi:type="dc:Point" x="1078" y="1347" />
- <di:waypoint xsi:type="dc:Point" x="1078" y="1163" />
+ <di:waypoint x="552" y="1457" />
+ <di:waypoint x="1268" y="1457" />
+ <di:waypoint x="1268" y="1273" />
<bpmndi:BPMNLabel>
<dc:Bounds x="720" y="1332" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0fvuowt_di" bpmnElement="SequenceFlow_0fvuowt">
- <di:waypoint xsi:type="dc:Point" x="204" y="1347" />
- <di:waypoint xsi:type="dc:Point" x="262" y="1347" />
+ <di:waypoint x="394" y="1457" />
+ <di:waypoint x="452" y="1457" />
<bpmndi:BPMNLabel>
<dc:Bounds x="233" y="1332" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="CallActivity_0i5a02m_di" bpmnElement="Task_0k9gnp2">
- <dc:Bounds x="262" y="1307" width="100" height="80" />
+ <dc:Bounds x="452" y="1417" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ScriptTask_008e45v_di" bpmnElement="Task_1sqxedz">
- <dc:Bounds x="104" y="1308" width="100" height="80" />
+ <dc:Bounds x="294" y="1418" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_08aruzz_di" bpmnElement="SequenceFlow_08aruzz">
- <di:waypoint xsi:type="dc:Point" x="362" y="803" />
- <di:waypoint xsi:type="dc:Point" x="491" y="803" />
- <di:waypoint xsi:type="dc:Point" x="491" y="837" />
+ <di:waypoint x="552" y="913" />
+ <di:waypoint x="681" y="913" />
+ <di:waypoint x="681" y="947" />
<bpmndi:BPMNLabel>
<dc:Bounds x="427" y="778" width="0" height="0" />
</bpmndi:BPMNLabel>
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleVolumeRollback.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleVolumeRollback.bpmn
index 6f3dceda84..b5cb1bf255 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleVolumeRollback.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleVolumeRollback.bpmn
@@ -1,13 +1,13 @@
<?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.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: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="3.7.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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModuleVolumeRollback = new DoCreateVfModuleVolumeRollback()
-doCreateVfModuleVolumeRollback.processJavaException(execution)]]></bpmn:script>
+doCreateVfModuleVolumeRollback.processJavaException(execution)</bpmn:script>
</bpmn:scriptTask>
<bpmn:startEvent id="StartEvent_1j0eixl">
<bpmn:outgoing>SequenceFlow_0xktw7v</bpmn:outgoing>
@@ -33,9 +33,9 @@ doCreateVfModuleVolumeRollback.processJavaException(execution)]]></bpmn:script>
<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="vnfAdapterTask">
+ <bpmn:callActivity id="CallActivity_03pmk7v" name="Call VNF Adapter Rollback" calledElement="openstackAdapterTask">
<bpmn:extensionElements>
- <camunda:in source="DCVFMODVOLRBK_rollbackVnfARequest" target="vnfAdapterTaskRequest" />
+ <camunda:in source="DCVFMODVOLRBK_rollbackVnfARequest" target="openstackAdapterTaskRequest" />
<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" />
@@ -44,15 +44,15 @@ doCreateVfModuleVolumeRollback.processJavaException(execution)]]></bpmn:script>
<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:conditionExpression xsi:type="bpmn:tFormalExpression">#{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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModuleVolumeRollback = new DoCreateVfModuleVolumeRollback()
-doCreateVfModuleVolumeRollback.executeMethod('callRESTDeleteAAIVolumeGroup', execution, isDebugLogEnabled)]]></bpmn:script>
+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" />
@@ -63,7 +63,7 @@ doCreateVfModuleVolumeRollback.executeMethod('callRESTDeleteAAIVolumeGroup', exe
<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:conditionExpression xsi:type="bpmn:tFormalExpression">#{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">
@@ -74,14 +74,14 @@ doCreateVfModuleVolumeRollback.executeMethod('callRESTDeleteAAIVolumeGroup', exe
<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:conditionExpression xsi:type="bpmn:tFormalExpression">#{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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModuleVolumeRollback = new DoCreateVfModuleVolumeRollback()
-doCreateVfModuleVolumeRollback.preProcessRequest(execution)]]></bpmn:script>
+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" />
@@ -90,153 +90,153 @@ doCreateVfModuleVolumeRollback.preProcessRequest(execution)]]></bpmn:script>
<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" />
+ <dc:Bounds x="293" y="365" 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" />
+ <dc:Bounds x="441" y="420" 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" />
+ <dc:Bounds x="326" y="442" 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" />
+ <dc:Bounds x="602" y="442" 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" />
+ <di:waypoint x="362" y="460" />
+ <di:waypoint x="441" y="460" />
<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" />
+ <di:waypoint x="541" y="460" />
+ <di:waypoint x="602" y="460" />
<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" />
+ <dc:Bounds x="173" y="107" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="167" y="-52" width="50" height="12" />
+ <dc:Bounds x="166" y="148" width="52" height="14" />
</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" />
+ <dc:Bounds x="465" y="100" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="450" y="-50" width="79" height="12" />
+ <dc:Bounds x="450" y="150" width="79" height="14" />
</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" />
+ <dc:Bounds x="607" y="100" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="606" y="-50" width="52" height="12" />
+ <dc:Bounds x="606" y="150" width="52" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="CallActivity_03pmk7v_di" bpmnElement="CallActivity_03pmk7v">
- <dc:Bounds x="786" y="-115" width="100" height="80" />
+ <dc:Bounds x="786" y="85" 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" />
+ <di:waypoint x="657" y="125" />
+ <di:waypoint x="786" y="125" />
<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" />
+ <dc:Bounds x="998" y="85" 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" />
+ <di:waypoint x="886" y="125" />
+ <di:waypoint x="937" y="125" />
+ <di:waypoint x="937" y="125" />
+ <di:waypoint x="998" y="125" />
<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" />
+ <di:waypoint x="632" y="150" />
+ <di:waypoint x="632" y="240" />
+ <di:waypoint x="811" y="240" />
<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" />
+ <di:waypoint x="1098" y="125" />
+ <di:waypoint x="1151" y="125" />
<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" />
+ <dc:Bounds x="811" y="215" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="809" y="65" width="53" height="12" />
+ <dc:Bounds x="809" y="265" width="53" height="14" />
</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" />
+ <di:waypoint x="861" y="240" />
+ <di:waypoint x="1048" y="240" />
+ <di:waypoint x="1048" y="165" />
<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" />
+ <di:waypoint x="836" y="265" />
+ <di:waypoint x="836" y="299" />
<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" />
+ <dc:Bounds x="818" y="299" 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" />
+ <dc:Bounds x="1151" y="107" 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" />
+ <di:waypoint x="515" y="125" />
+ <di:waypoint x="607" y="125" />
<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" />
+ <dc:Bounds x="288" y="85" 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" />
+ <di:waypoint x="490" y="150" />
+ <di:waypoint x="490" y="317" />
+ <di:waypoint x="818" y="317" />
<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" />
+ <di:waypoint x="209" y="125" />
+ <di:waypoint x="288" y="125" />
<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" />
+ <di:waypoint x="388" y="125" />
+ <di:waypoint x="465" y="125" />
<bpmndi:BPMNLabel>
<dc:Bounds x="427" y="-100" width="0" height="0" />
</bpmndi:BPMNLabel>
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleVolumeV2.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleVolumeV2.bpmn
index 58ea0c4951..5dc9878561 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleVolumeV2.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVfModuleVolumeV2.bpmn
@@ -1,27 +1,27 @@
<?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.10.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_FhrCQG2BEeaNdqnn65BT4A" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="3.7.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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2()
-doCreateVfModuleVolumeV2.executeMethod('preProcessRequest', execution, isDebugLogEnabled)]]></bpmn2:script>
+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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2()
-doCreateVfModuleVolumeV2.executeMethod('callRESTQueryAAICloudRegion', execution, isDebugLogEnabled)]]></bpmn2:script>
+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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2()
-doCreateVfModuleVolumeV2.executeMethod('buildWorkflowException', execution, 2500, "Volume group name already exists in the system.", isDebugLogEnabled)]]></bpmn2:script>
+doCreateVfModuleVolumeV2.executeMethod('buildWorkflowException', execution, 2500, "Volume group name 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">
@@ -31,15 +31,15 @@ doCreateVfModuleVolumeV2.executeMethod('buildWorkflowException', execution, 2500
<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:conditionExpression xsi:type="bpmn2:tFormalExpression">#{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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2()
-doCreateVfModuleVolumeV2.executeMethod('callRESTQueryAAIGenericVnf', execution, isDebugLogEnabled)]]></bpmn2:script>
+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">
@@ -50,22 +50,22 @@ doCreateVfModuleVolumeV2.executeMethod('callRESTQueryAAIGenericVnf', execution,
<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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2()
-doCreateVfModuleVolumeV2.executeMethod('callRESTQueryAAIVolGrpName', execution, isDebugLogEnabled)]]></bpmn2:script>
+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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2()
-doCreateVfModuleVolumeV2.executeMethod('callRESTCreateAAIVolGrpName', execution, isDebugLogEnabled)]]></bpmn2:script>
+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="vnfAdapterTask">
+ <bpmn2:callActivity id="CallActivity_callVnfAdapterCreate" name="Call VNF Adapter Create" calledElement="openstackAdapterTask">
<bpmn2:extensionElements>
- <camunda:in source="DCVFMODVOLV2_createVnfARequest" target="vnfAdapterTaskRequest" />
+ <camunda:in source="DCVFMODVOLV2_createVnfARequest" target="openstackAdapterTaskRequest" />
<camunda:in source="msoRequestId" target="mso-request-id" />
<camunda:in source="serviceInstanceId" target="mso-service-instance-id" />
<camunda:out source="WorkflowResponse" target="DCVFMODVOLV2_createVnfAResponse" />
@@ -79,25 +79,25 @@ doCreateVfModuleVolumeV2.executeMethod('callRESTCreateAAIVolGrpName', execution,
<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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2()
-doCreateVfModuleVolumeV2.executeMethod('callRESTQueryAAIVolGrpName', execution, isDebugLogEnabled)]]></bpmn2:script>
+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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2()
-doCreateVfModuleVolumeV2.executeMethod('setSuccessIndicator', execution, true)]]></bpmn2:script>
+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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2()
-doCreateVfModuleVolumeV2.executeMethod('callRESTUpdateCreatedVolGrpName', execution, isDebugLogEnabled)]]></bpmn2:script>
+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">
@@ -106,9 +106,9 @@ doCreateVfModuleVolumeV2.executeMethod('callRESTUpdateCreatedVolGrpName', execut
<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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2()
-doCreateVfModuleVolumeV2.executeMethod('prepareVnfAdapterCreateRequest', execution, isDebugLogEnabled)]]></bpmn2:script>
+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">
@@ -121,18 +121,18 @@ doCreateVfModuleVolumeV2.executeMethod('prepareVnfAdapterCreateRequest', executi
<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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2()
-doCreateVfModuleVolumeV2.executeMethod('validateVnfResponse', execution, isDebugLogEnabled)]]></bpmn2:script>
+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:scriptTask id="Task_0qbm5cz" name="&#10;AAI&#10;Query&#10;(svc instance)&#10;" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_1wi1cf9</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_1dpt7ul</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doCreateVfModuleVolumeV2 = new DoCreateVfModuleVolumeV2()
-doCreateVfModuleVolumeV2.executeMethod('getServiceInstance', execution, isDebugLogEnabled)]]></bpmn2:script>
+doCreateVfModuleVolumeV2.executeMethod('getServiceInstance', execution, isDebugLogEnabled)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_1wi1cf9" sourceRef="ScriptTask_preProcessRequest" targetRef="Task_0qbm5cz" />
<bpmn2:sequenceFlow id="SequenceFlow_1dpt7ul" sourceRef="Task_0qbm5cz" targetRef="ScriptTask_callRestAaiCloudRegion" />
@@ -142,194 +142,194 @@ doCreateVfModuleVolumeV2.executeMethod('getServiceInstance', execution, isDebugL
<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" />
+ <dc:Bounds x="170" y="128" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="276" y="169" width="23" height="12" />
+ <dc:Bounds x="175" y="169" width="25" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_285" bpmnElement="ScriptTask_preProcessRequest">
- <dc:Bounds x="369" y="106" width="100" height="80" />
+ <dc:Bounds x="269" 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" />
+ <dc:Bounds x="668" 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" />
+ <dc:Bounds x="945" 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" />
+ <dc:Bounds x="1142" y="121" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1224" y="176" width="85" height="24" />
+ <dc:Bounds x="1125" y="176" width="83" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_289" bpmnElement="ScriptTask_callRestAaiCreateVolumeGrp">
- <dc:Bounds x="256" y="307" width="100" height="80" />
+ <dc:Bounds x="156" 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" />
+ <dc:Bounds x="320" 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" />
+ <dc:Bounds x="476" 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" />
+ <dc:Bounds x="757" 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" />
+ <dc:Bounds x="895" 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" />
+ <dc:Bounds x="1042" 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" />
+ <dc:Bounds x="1183" y="328" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1292" y="369" width="19" height="12" />
+ <dc:Bounds x="1192" y="369" width="20" height="14" />
</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" />
+ <di:waypoint x="206" y="146" />
+ <di:waypoint x="269" 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" />
+ <di:waypoint x="1167" y="171" />
+ <di:waypoint x="1167" y="232" />
+ <di:waypoint x="711" y="232" />
+ <di:waypoint x="206" y="232" />
+ <di:waypoint x="206" y="307" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="582" y="232" width="18" height="12" />
+ <dc:Bounds x="482" y="232" width="18" height="14" />
</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" />
+ <di:waypoint x="256" y="347" />
+ <di:waypoint x="320" 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" />
+ <di:waypoint x="420" y="347" />
+ <di:waypoint x="476" 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" />
+ <di:waypoint x="768" y="146" />
+ <di:waypoint x="811" 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" />
+ <dc:Bounds x="1255" 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" />
+ <di:waypoint x="1355" y="146" />
+ <di:waypoint x="1393" 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" />
+ <di:waypoint x="1045" y="88" />
+ <di:waypoint x="1045" y="59" />
+ <di:waypoint x="1167" y="59" />
+ <di:waypoint x="1167" 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" />
+ <di:waypoint x="1192" y="146" />
+ <di:waypoint x="1255" y="146" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1320" y="146" width="14" height="12" />
+ <dc:Bounds x="1220" y="146" width="15" height="14" />
</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" />
+ <di:waypoint x="857" y="347" />
+ <di:waypoint x="895" 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" />
+ <di:waypoint x="995" y="347" />
+ <di:waypoint x="1042" 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" />
+ <di:waypoint x="1142" y="347" />
+ <di:waypoint x="1183" 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" />
+ <dc:Bounds x="811" 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" />
+ <di:waypoint x="911" y="146" />
+ <di:waypoint x="945" 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" />
+ <dc:Bounds x="1027" 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" />
+ <di:waypoint x="1045" y="146" />
+ <di:waypoint x="1142" 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" />
+ <dc:Bounds x="1393" y="128" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1502" y="169" width="19" height="12" />
+ <dc:Bounds x="1402" y="169" width="20" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ScriptTask_00lua86_di" bpmnElement="Task_07psich">
- <dc:Bounds x="716" y="307" width="100" height="80" />
+ <dc:Bounds x="616" 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" />
+ <di:waypoint x="576" y="347" />
+ <di:waypoint x="616" 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" />
+ <di:waypoint x="716" y="347" />
+ <di:waypoint x="757" y="347" />
<bpmndi:BPMNLabel>
<dc:Bounds x="837" y="322" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ScriptTask_1n9cmka_di" bpmnElement="Task_0qbm5cz">
- <dc:Bounds x="576" y="106" width="100" height="80" />
+ <dc:Bounds x="476" 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="576" y="146" />
+ <di:waypoint x="369" y="146" />
+ <di:waypoint x="476" y="146" />
<bpmndi:BPMNLabel>
<dc:Bounds x="477.5" y="131" width="90" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1dpt7ul_di" bpmnElement="SequenceFlow_1dpt7ul">
- <di:waypoint xsi:type="dc:Point" x="676" y="146" />
- <di:waypoint xsi:type="dc:Point" x="768" y="146" />
+ <di:waypoint x="576" y="146" />
+ <di:waypoint x="668" y="146" />
<bpmndi:BPMNLabel>
<dc:Bounds x="677" y="131" width="90" height="0" />
</bpmndi:BPMNLabel>
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteNetworkInstance.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteNetworkInstance.bpmn
index d6069d714e..5edbf3cd55 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteNetworkInstance.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteNetworkInstance.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="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_MagIIMOUEeW8asg-vCEgWQ" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="3.7.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
<bpmn2:process id="DoDeleteNetworkInstance" name="DoDeleteNetworkInstance" isExecutable="true">
<bpmn2:startEvent id="deleteNetwork_startEvent" name="Start Flow">
<bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
@@ -8,9 +8,9 @@
<bpmn2:scriptTask id="callAAIQuery_scriptTask" name="Call REST Query In AAI" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_0msqfwu</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def callRESTDeleteAAI = new DoDeleteNetworkInstance()
-callRESTDeleteAAI.callRESTQueryAAI(execution)]]></bpmn2:script>
+callRESTDeleteAAI.callRESTQueryAAI(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="callAAIQuery_scriptTask" targetRef="isRelationshipExists_ExclusiveGateway" />
<bpmn2:callActivity id="callDeleteSDNCAdapter_CallActivity" name="Call SDNC Unassign Adapter V1 Sub-process" calledElement="sdncAdapter">
@@ -31,10 +31,9 @@ callRESTDeleteAAI.callRESTQueryAAI(execution)]]></bpmn2:script>
<bpmn2:incoming>SequenceFlow_12</bpmn2:incoming>
<bpmn2:incoming>SequenceFlow_1jnva78</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def validateSDNCResponse = new DoDeleteNetworkInstance()
-validateSDNCResponse.validateSDNCResponse(execution)
-]]></bpmn2:script>
+validateSDNCResponse.validateSDNCResponse(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="validateSDNCResponse_ScriptTask" targetRef="isSdncTopoDeleteOk_ExclusiveGateway" />
<bpmn2:boundaryEvent id="BoundaryEvent_1" name="" attachedToRef="validateSDNCResponse_ScriptTask">
@@ -54,7 +53,7 @@ validateSDNCResponse.validateSDNCResponse(execution)
</bpmn2:endEvent>
<bpmn2:sequenceFlow id="sdncTopoDeleteNo_SequenceFlow" name="No" sourceRef="isSdncTopoDeleteOk_ExclusiveGateway" targetRef="sndcError_EndEvent" />
<bpmn2:sequenceFlow id="sdncTopoDeleteYes_SequenceFlow" name="Yes" sourceRef="isSdncTopoDeleteOk_ExclusiveGateway" targetRef="ScriptTask_01xjfhu">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DELNWKI_sdncResponseSuccess" ) == true}]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DELNWKI_sdncResponseSuccess" ) == true}</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:subProcess id="subProcessException_SubProcess" name="Subprocess For Exception" triggeredByEvent="true">
<bpmn2:startEvent id="subProcessStart_StartEvent" name="Fault Start">
@@ -67,18 +66,17 @@ validateSDNCResponse.validateSDNCResponse(execution)
<bpmn2:scriptTask id="ScriptTask_00lgy9f" name="PostProcess Response" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_1nl99y6</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_1yvnovn</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoDeleteNetworkInstance = new DoDeleteNetworkInstance()
-DoDeleteNetworkInstance.postProcessResponse(execution)
-]]></bpmn2:script>
+DoDeleteNetworkInstance.postProcessResponse(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_1a51h25" sourceRef="subProcessStart_StartEvent" targetRef="Task_0026x4v" />
<bpmn2:sequenceFlow id="SequenceFlow_1yvnovn" sourceRef="ScriptTask_00lgy9f" targetRef="EndEvent_2" />
<bpmn2:scriptTask id="ScriptTask_0n4do0p" name="Prepare SDNC RPC Rollback Deactivate" scriptFormat="groovy">
<bpmn2:outgoing>SequenceFlow_1wif0e5</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoDeleteNetworkInstance = new DoDeleteNetworkInstance()
-DoDeleteNetworkInstance.prepareRpcSDNCDeactivateRollback(execution)]]></bpmn2:script>
+DoDeleteNetworkInstance.prepareRpcSDNCDeactivateRollback(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:exclusiveGateway id="ExclusiveGateway_1gix2o6" name="Is Rollback On?">
<bpmn2:incoming>SequenceFlow_021b0sz</bpmn2:incoming>
@@ -86,33 +84,16 @@ DoDeleteNetworkInstance.prepareRpcSDNCDeactivateRollback(execution)]]></bpmn2:sc
<bpmn2:outgoing>SequenceFlow_1suj1nc</bpmn2:outgoing>
</bpmn2:exclusiveGateway>
<bpmn2:sequenceFlow id="SequenceFlow_0tiz0kk" name="Yes" sourceRef="ExclusiveGateway_1gix2o6" targetRef="ExclusiveGateway_1x7o5bo">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DELNWKI_rollbackEnabled") == true}]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DELNWKI_rollbackEnabled") == true}</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:sequenceFlow id="SequenceFlow_1suj1nc" name="No" sourceRef="ExclusiveGateway_1gix2o6" targetRef="ExclusiveGateway_01xin16" />
- <bpmn2:callActivity id="CallActivity_0lku52d" name="DoDelete NetworkInstanceRollback&#10;" calledElement="DoDeleteNetworkInstanceRollback">
- <bpmn2:extensionElements>
- <camunda:in source="msoRequestId" target="msoRequestId" />
- <camunda:out source="rolledBack" target="rolledBack" />
- <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
- <camunda:in source="serviceInstanceId" target="serviceInstanceId" />
- <camunda:in source="rollbackData" target="rollbackData" />
- <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="WorkflowException" target="WorkflowException" />
- <camunda:in source="sdncVersion" target="sdncVersion" />
- <camunda:out source="workflowException" target="workflowException" />
- <camunda:in source="SavedWorkflowException1" target="SavedWorkflowException1" />
- <camunda:out source="wasDeleted" target="wasDeleted" />
- </bpmn2:extensionElements>
- <bpmn2:incoming>SequenceFlow_147vc14</bpmn2:incoming>
- </bpmn2:callActivity>
<bpmn2:exclusiveGateway id="ExclusiveGateway_1x7o5bo" name="is SDNC Rollback Needed? " default="SequenceFlow_1raa09h">
<bpmn2:incoming>SequenceFlow_0tiz0kk</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_0jb7rws</bpmn2:outgoing>
<bpmn2:outgoing>SequenceFlow_1raa09h</bpmn2:outgoing>
</bpmn2:exclusiveGateway>
<bpmn2:sequenceFlow id="SequenceFlow_0jb7rws" name="Yes" sourceRef="ExclusiveGateway_1x7o5bo" targetRef="ExclusiveGateway_01xin16">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DELNWKI_isSdncDeactivateRollbackNeeded") == true}]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DELNWKI_isSdncDeactivateRollbackNeeded") == true}</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:inclusiveGateway id="ExclusiveGateway_01xin16">
<bpmn2:incoming>SequenceFlow_1suj1nc</bpmn2:incoming>
@@ -124,24 +105,19 @@ DoDeleteNetworkInstance.prepareRpcSDNCDeactivateRollback(execution)]]></bpmn2:sc
<bpmn2:sequenceFlow id="SequenceFlow_1nl99y6" sourceRef="ExclusiveGateway_01xin16" targetRef="ScriptTask_00lgy9f" />
<bpmn2:scriptTask id="ScriptTask_0n4ya47" name="Prepare RollbackData" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_1wif0e5</bpmn2:incoming>
- <bpmn2:outgoing>SequenceFlow_147vc14</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoDeleteNetworkInstance = new DoDeleteNetworkInstance()
-DoDeleteNetworkInstance.prepareRollbackData(execution)]]></bpmn2:script>
+DoDeleteNetworkInstance.prepareRollbackData(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_1wif0e5" sourceRef="ScriptTask_0n4do0p" targetRef="ScriptTask_0n4ya47" />
- <bpmn2:sequenceFlow id="SequenceFlow_147vc14" sourceRef="ScriptTask_0n4ya47" targetRef="CallActivity_0lku52d" />
<bpmn2:sequenceFlow id="SequenceFlow_021b0sz" sourceRef="Task_0026x4v" targetRef="ExclusiveGateway_1gix2o6" />
<bpmn2:scriptTask id="Task_0026x4v" name="Set Exception Flag" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_1a51h25</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_021b0sz</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoDeleteNetworkInstance = new DoDeleteNetworkInstance()
-DoDeleteNetworkInstance.setExceptionFlag(execution)]]></bpmn2:script>
+DoDeleteNetworkInstance.setExceptionFlag(execution)</bpmn2:script>
</bpmn2:scriptTask>
- <bpmn2:textAnnotation id="TextAnnotation_0i06ryl"> <bpmn2:text>Rollback Not Needed for Delete.</bpmn2:text>
-</bpmn2:textAnnotation>
- <bpmn2:association id="Association_0gzsxad" sourceRef="CallActivity_0lku52d" targetRef="TextAnnotation_0i06ryl" />
</bpmn2:subProcess>
<bpmn2:exclusiveGateway id="isAAIQueryOk_ExclusiveGateway_2" name="Is AAI Query Ok?" default="querySuccessNo_SequenceFlow">
<bpmn2:incoming>isRelationshipExistNo_SequenceFlow</bpmn2:incoming>
@@ -149,7 +125,7 @@ DoDeleteNetworkInstance.setExceptionFlag(execution)]]></bpmn2:script>
<bpmn2:outgoing>querySuccessNo_SequenceFlow</bpmn2:outgoing>
</bpmn2:exclusiveGateway>
<bpmn2:sequenceFlow id="querySuccessYes_SequenceFlow" name="Yes" sourceRef="isAAIQueryOk_ExclusiveGateway_2" targetRef="isResponseEmpty_ExclusiveGateway_2">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DELNWKI_isAAIGood") == true}]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DELNWKI_isAAIGood") == true}</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:sequenceFlow id="querySuccessNo_SequenceFlow" name="No" sourceRef="isAAIQueryOk_ExclusiveGateway_2" targetRef="isReturnCode404_ExclusiveGateway" />
<bpmn2:exclusiveGateway id="isReturnCode404_ExclusiveGateway" name="Is Return Code 404?" default="isReturnCode404_No_SequenceFlow">
@@ -159,7 +135,7 @@ DoDeleteNetworkInstance.setExceptionFlag(execution)]]></bpmn2:script>
</bpmn2:exclusiveGateway>
<bpmn2:sequenceFlow id="isReturnCode404_No_SequenceFlow" name="No" sourceRef="isReturnCode404_ExclusiveGateway" targetRef="aai_Error_EndEvent" />
<bpmn2:sequenceFlow id="isReturnCode404_Yes_SequenceFlow" name="Yes" sourceRef="isReturnCode404_ExclusiveGateway" targetRef="silentSucces_InclusiveGateway">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DELNWKI_aaiReturnCode" ) == "404"}]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DELNWKI_aaiReturnCode" ) == "404"}</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:endEvent id="aai_Error_EndEvent" name="AAI Error">
<bpmn2:incoming>isReturnCode404_No_SequenceFlow</bpmn2:incoming>
@@ -172,7 +148,7 @@ DoDeleteNetworkInstance.setExceptionFlag(execution)]]></bpmn2:script>
</bpmn2:exclusiveGateway>
<bpmn2:sequenceFlow id="isResponseEmptyNo_SequenceFlow" name="No" sourceRef="isResponseEmpty_ExclusiveGateway_2" targetRef="callRESTQueryCloudRegion_ScriptTask" />
<bpmn2:sequenceFlow id="isResponseEmptyYes_SequenceFlow" name="Yes" sourceRef="isResponseEmpty_ExclusiveGateway_2" targetRef="silentSucces_InclusiveGateway">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DELNWKI_isSilentSuccess") == true}]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DELNWKI_isSilentSuccess") == true}</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:inclusiveGateway id="silentSucces_InclusiveGateway" name="Joint">
<bpmn2:incoming>isReturnCode404_Yes_SequenceFlow</bpmn2:incoming>
@@ -186,9 +162,9 @@ DoDeleteNetworkInstance.setExceptionFlag(execution)]]></bpmn2:script>
<bpmn2:scriptTask id="callRESTQueryCloudRegion_ScriptTask" name="Call REST Query Cloud Region " scriptFormat="groovy">
<bpmn2:incoming>isResponseEmptyNo_SequenceFlow</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_30</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def deleteNetMod = new DoDeleteNetworkInstance()
-deleteNetMod.callRESTQueryAAICloudRegion(execution)]]></bpmn2:script>
+deleteNetMod.callRESTQueryAAICloudRegion(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_30" name="" sourceRef="callRESTQueryCloudRegion_ScriptTask" targetRef="prepareNetworkRequest_ScriptTask" />
<bpmn2:exclusiveGateway id="isRelationshipExists_ExclusiveGateway" name="Is Relationship Exists?" default="isRelationshipExistNo_SequenceFlow">
@@ -198,7 +174,7 @@ deleteNetMod.callRESTQueryAAICloudRegion(execution)]]></bpmn2:script>
</bpmn2:exclusiveGateway>
<bpmn2:sequenceFlow id="isRelationshipExistNo_SequenceFlow" name="No" sourceRef="isRelationshipExists_ExclusiveGateway" targetRef="isAAIQueryOk_ExclusiveGateway_2" />
<bpmn2:sequenceFlow id="isRelationshipExistYes_SequenceFlow" name="Yes" sourceRef="isRelationshipExists_ExclusiveGateway" targetRef="relationshipError_EndEvent">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DELNWKI_isVfRelationshipExist") == true}]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DELNWKI_isVfRelationshipExist") == true}</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:endEvent id="relationshipError_EndEvent" name="Relationship Error">
<bpmn2:incoming>isRelationshipExistYes_SequenceFlow</bpmn2:incoming>
@@ -210,36 +186,18 @@ deleteNetMod.callRESTQueryAAICloudRegion(execution)]]></bpmn2:script>
<bpmn2:scriptTask id="prepareSDNCTopoRequest_ScriptTask" name="Prepare SDNC Topology Request" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_0r3pvf8</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_1pdp4d2</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def prepareSDNCRequest = new DoDeleteNetworkInstance()
-prepareSDNCRequest.prepareSDNCRequest(execution)
-]]></bpmn2:script>
+prepareSDNCRequest.prepareSDNCRequest(execution)</bpmn2:script>
</bpmn2:scriptTask>
- <bpmn2:scriptTask id="validateDeletePONetwork_ScriptTask" name="Validate Delete PO Network" scriptFormat="groovy">
- <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
- <bpmn2:outgoing>SequenceFlow_20</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
-def validateNetworkResponse = new DoDeleteNetworkInstance()
-validateNetworkResponse.validateNetworkResponse(execution)]]></bpmn2:script>
- </bpmn2:scriptTask>
- <bpmn2:sequenceFlow id="SequenceFlow_20" name="" sourceRef="validateDeletePONetwork_ScriptTask" targetRef="ExclusiveGateway_02t94x3" />
<bpmn2:scriptTask id="prepareNetworkRequest_ScriptTask" name="Prepare Network Request" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_30</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_15</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
-def prepareNetworkRequest = new DoDeleteNetworkInstance()
-prepareNetworkRequest.prepareNetworkRequest(execution)
-]]></bpmn2:script>
- </bpmn2:scriptTask>
- <bpmn2:sequenceFlow id="SequenceFlow_15" name="" sourceRef="prepareNetworkRequest_ScriptTask" targetRef="sendRequestToNewworkAdapater_ScriptTask" />
- <bpmn2:scriptTask id="sendRequestToNewworkAdapater_ScriptTask" name="Send Request to Network Adapter" scriptFormat="groovy">
- <bpmn2:incoming>SequenceFlow_15</bpmn2:incoming>
- <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def prepareNetworkRequest = new DoDeleteNetworkInstance()
-prepareNetworkRequest.sendRequestToVnfAdapter(execution)]]></bpmn2:script>
+prepareNetworkRequest.prepareNetworkRequest(execution)</bpmn2:script>
</bpmn2:scriptTask>
- <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="sendRequestToNewworkAdapater_ScriptTask" targetRef="validateDeletePONetwork_ScriptTask" />
+ <bpmn2:sequenceFlow id="SequenceFlow_15" name="" sourceRef="prepareNetworkRequest_ScriptTask" targetRef="Activity_1bwwwba" />
<bpmn2:subProcess id="SubProcess_1" name="Sub-process for UnexpectedErrors" triggeredByEvent="true">
<bpmn2:startEvent id="StartEvent_1">
<bpmn2:outgoing>SequenceFlow_13</bpmn2:outgoing>
@@ -251,9 +209,9 @@ prepareNetworkRequest.sendRequestToVnfAdapter(execution)]]></bpmn2:script>
<bpmn2:scriptTask id="unexpectedError_DeleteNetworkInfra_ScriptTask_1" name="Log / Print Unexpected Error" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_13</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_17</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def deleteNetMod = new DoDeleteNetworkInstance()
-deleteNetMod.processJavaException(execution)]]></bpmn2:script>
+deleteNetMod.processJavaException(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_13" name="" sourceRef="StartEvent_1" targetRef="unexpectedError_DeleteNetworkInfra_ScriptTask_1" />
<bpmn2:sequenceFlow id="SequenceFlow_17" name="" sourceRef="unexpectedError_DeleteNetworkInfra_ScriptTask_1" targetRef="EndEvent_4" />
@@ -261,15 +219,14 @@ deleteNetMod.processJavaException(execution)]]></bpmn2:script>
<bpmn2:scriptTask id="ScriptTask_01xjfhu" name="PostProcess Response" scriptFormat="groovy">
<bpmn2:incoming>sdncTopoDeleteYes_SequenceFlow</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_1pbgnr2</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoDeleteNetworkInstance = new DoDeleteNetworkInstance()
-DoDeleteNetworkInstance.postProcessResponse(execution)
-]]></bpmn2:script>
+DoDeleteNetworkInstance.postProcessResponse(execution)</bpmn2:script>
</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 not &#39;1610&#39; SNDC Call?" default="SequenceFlow_0r3pvf8">
- <bpmn2:incoming>SequenceFlow_20</bpmn2:incoming>
+ <bpmn2:incoming>Flow_10caop8</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_0r3pvf8</bpmn2:outgoing>
<bpmn2:outgoing>SequenceFlow_0kqnddy</bpmn2:outgoing>
</bpmn2:exclusiveGateway>
@@ -277,10 +234,9 @@ DoDeleteNetworkInstance.postProcessResponse(execution)
<bpmn2:scriptTask id="ScriptTask_0iqzbz6" name="Prepare RSRC SDNC Unassign Request" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_0f13b17</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_0zlbzad</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def prepareSDNCRequest = new DoDeleteNetworkInstance()
-prepareSDNCRequest.prepareRpcSDNCRequest(execution)
-]]></bpmn2:script>
+prepareSDNCRequest.prepareRpcSDNCRequest(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:callActivity id="CallActivity_03wzdas" name="Call RSRC SDNC Unassign Adapter V1 " calledElement="sdncAdapter">
<bpmn2:extensionElements>
@@ -298,23 +254,22 @@ 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") != '1610'} ]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{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>
<bpmn2:outgoing>SequenceFlow_0msqfwu</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoDeleteNetworkInstance = new DoDeleteNetworkInstance()
-DoDeleteNetworkInstance.preProcessRequest(execution)]]></bpmn2:script>
+DoDeleteNetworkInstance.preProcessRequest(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_0msqfwu" sourceRef="ScriptTask_01w2cd9" targetRef="callAAIQuery_scriptTask" />
<bpmn2:scriptTask id="ScriptTask_0dtzzht" name="PostProcess Response" scriptFormat="groovy">
<bpmn2:incoming>silentSuccess_SequenceFlow</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_0f25bme</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoDeleteNetworkInstance = new DoDeleteNetworkInstance()
-DoDeleteNetworkInstance.postProcessResponse(execution)
-]]></bpmn2:script>
+DoDeleteNetworkInstance.postProcessResponse(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_0f25bme" sourceRef="ScriptTask_0dtzzht" targetRef="EndEvent_1" />
<bpmn2:callActivity id="CallActivity_0wyu1mx" name="Call RSRC SDNC Deactivate Adapter" calledElement="sdncAdapter">
@@ -333,9 +288,9 @@ DoDeleteNetworkInstance.postProcessResponse(execution)
<bpmn2:scriptTask id="ScriptTask_1wf192s" name="Prepare SDNC RSRC Deactivate Request" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_0kqnddy</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_1o088sy</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoDeleteNetworkInstance = new DoDeleteNetworkInstance()
-DoDeleteNetworkInstance.prepareRpcSDNCDeactivate(execution)]]></bpmn2:script>
+DoDeleteNetworkInstance.prepareRpcSDNCDeactivate(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_1o088sy" sourceRef="ScriptTask_1wf192s" targetRef="CallActivity_0wyu1mx" />
<bpmn2:exclusiveGateway id="ExclusiveGateway_024qvqd" default="SequenceFlow_1qyo7ot">
@@ -346,9 +301,9 @@ DoDeleteNetworkInstance.prepareRpcSDNCDeactivate(execution)]]></bpmn2:script>
<bpmn2:scriptTask id="ScriptTask_00vwf2h" name="Validate Deactivate SDNC Response" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_1i3193l</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_0n8sf23</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoDeleteNetworkInstance = new DoDeleteNetworkInstance()
-DoDeleteNetworkInstance.validateRpcSDNCDeactivateResponse(execution)]]></bpmn2:script>
+DoDeleteNetworkInstance.validateRpcSDNCDeactivateResponse(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:boundaryEvent id="BoundaryEvent_0un9yyu" name="" attachedToRef="ScriptTask_00vwf2h">
<bpmn2:outgoing>SequenceFlow_08hus4u</bpmn2:outgoing>
@@ -359,575 +314,555 @@ DoDeleteNetworkInstance.validateRpcSDNCDeactivateResponse(execution)]]></bpmn2:s
<bpmn2:sequenceFlow id="SequenceFlow_08hus4u" sourceRef="BoundaryEvent_0un9yyu" targetRef="EndEvent_1l210ae" />
<bpmn2:sequenceFlow id="SequenceFlow_1qyo7ot" name="No" sourceRef="ExclusiveGateway_024qvqd" targetRef="EndEvent_1l210ae" />
<bpmn2:sequenceFlow id="SequenceFlow_0f13b17" name="Yes" sourceRef="ExclusiveGateway_024qvqd" targetRef="ScriptTask_0iqzbz6">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DELNWKI_sdncResponseSuccess" ) == true}]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("DELNWKI_sdncResponseSuccess" ) == true}</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:endEvent id="EndEvent_1l210ae">
<bpmn2:incoming>SequenceFlow_08hus4u</bpmn2:incoming>
<bpmn2:incoming>SequenceFlow_1qyo7ot</bpmn2:incoming>
<bpmn2:errorEventDefinition errorRef="Error_3" />
</bpmn2:endEvent>
+ <bpmn2:callActivity id="Activity_1bwwwba" name="openstack Adapter" calledElement="openstackAdapterTask">
+ <bpmn2:extensionElements>
+ <camunda:in source="DELNWKI_deleteNetworkRequest" target="openstackAdapterTaskRequest" />
+ <camunda:out source="WorkflowException" target="WorkflowException" />
+ <camunda:out source="WorkflowResponse" target="DELNWKI_deleteNetworkResponse" />
+ </bpmn2:extensionElements>
+ <bpmn2:incoming>SequenceFlow_15</bpmn2:incoming>
+ <bpmn2:outgoing>Flow_10caop8</bpmn2:outgoing>
+ </bpmn2:callActivity>
+ <bpmn2:sequenceFlow id="Flow_10caop8" sourceRef="Activity_1bwwwba" targetRef="ExclusiveGateway_02t94x3" />
</bpmn2:process>
<bpmn2:error id="Error_3" 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="DoDeleteNetworkInstance">
<bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="deleteNetwork_startEvent">
- <dc:Bounds x="444" y="185" width="36" height="36" />
+ <dc:Bounds x="604" y="185" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="437" y="226" width="49" height="12" />
+ <dc:Bounds x="596" y="226" width="51" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_47">
- <di:waypoint xsi:type="dc:Point" x="480" y="203" />
- <di:waypoint xsi:type="dc:Point" x="597" y="204" />
+ <di:waypoint x="640" y="203" />
+ <di:waypoint x="757" y="204" />
<bpmndi:BPMNLabel>
<dc:Bounds x="539" y="188.5" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_62" bpmnElement="callAAIQuery_scriptTask">
- <dc:Bounds x="816" y="163" width="100" height="80" />
+ <dc:Bounds x="976" y="163" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_62" bpmnElement="isAAIQueryOk_ExclusiveGateway_2" isMarkerVisible="true">
- <dc:Bounds x="984" y="72" width="50" height="50" />
+ <dc:Bounds x="1144" y="72" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="966" y="44" width="87" height="12" />
+ <dc:Bounds x="1127" y="44" width="86" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_ScriptTask_62" targetElement="_BPMNShape_ExclusiveGateway_224">
- <di:waypoint xsi:type="dc:Point" x="866" y="163" />
- <di:waypoint xsi:type="dc:Point" x="865" y="122" />
+ <di:waypoint x="1026" y="163" />
+ <di:waypoint x="1025" y="122" />
<bpmndi:BPMNLabel>
<dc:Bounds x="862" y="135" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_63" bpmnElement="validateDeletePONetwork_ScriptTask">
- <dc:Bounds x="1131" y="509" width="100" height="80" />
- </bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="querySuccessYes_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_62" targetElement="_BPMNShape_ExclusiveGateway_65">
- <di:waypoint xsi:type="dc:Point" x="1009" y="122" />
- <di:waypoint xsi:type="dc:Point" x="1009" y="177" />
+ <di:waypoint x="1169" y="122" />
+ <di:waypoint x="1169" y="177" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1008" y="120" width="29" height="22" />
+ <dc:Bounds x="1174" y="120" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="querySuccessNo_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_62" targetElement="_BPMNShape_ExclusiveGateway_64">
- <di:waypoint xsi:type="dc:Point" x="1034" y="97" />
- <di:waypoint xsi:type="dc:Point" x="1126" y="97" />
+ <di:waypoint x="1194" y="97" />
+ <di:waypoint x="1286" y="97" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1036" y="97" width="22" height="22" />
+ <dc:Bounds x="1200" y="97" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_64" bpmnElement="isReturnCode404_ExclusiveGateway" isMarkerVisible="true">
- <dc:Bounds x="1126" y="72" width="50" height="50" />
+ <dc:Bounds x="1286" y="72" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1115" y="41" width="77" height="24" />
+ <dc:Bounds x="1277" y="41" width="74" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="isReturnCode404_No_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_64" targetElement="_BPMNShape_EndEvent_118">
- <di:waypoint xsi:type="dc:Point" x="1176" y="97" />
- <di:waypoint xsi:type="dc:Point" x="1212" y="97" />
- <di:waypoint xsi:type="dc:Point" x="1212" y="98" />
- <di:waypoint xsi:type="dc:Point" x="1281" y="98" />
+ <di:waypoint x="1336" y="97" />
+ <di:waypoint x="1372" y="97" />
+ <di:waypoint x="1372" y="98" />
+ <di:waypoint x="1441" y="98" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1176" y="97" width="22" height="22" />
+ <dc:Bounds x="1340" y="97" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="isReturnCode404_Yes_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_64" targetElement="_BPMNShape_InclusiveGateway_2">
- <di:waypoint xsi:type="dc:Point" x="1151" y="122" />
- <di:waypoint xsi:type="dc:Point" x="1151" y="177" />
+ <di:waypoint x="1311" y="122" />
+ <di:waypoint x="1311" y="177" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1152" y="120" width="29" height="22" />
+ <dc:Bounds x="1318" y="120" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_65" bpmnElement="isResponseEmpty_ExclusiveGateway_2" isMarkerVisible="true">
- <dc:Bounds x="984" y="177" width="50" height="50" />
+ <dc:Bounds x="1144" y="177" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1016" y="163" width="95" height="22" />
+ <dc:Bounds x="1185" y="163" width="78" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="isResponseEmptyNo_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_65" targetElement="_BPMNShape_ScriptTask_250">
- <di:waypoint xsi:type="dc:Point" x="1009" y="227" />
- <di:waypoint xsi:type="dc:Point" x="1010" y="269" />
+ <di:waypoint x="1169" y="227" />
+ <di:waypoint x="1170" y="269" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1016" y="227" width="22" height="22" />
+ <dc:Bounds x="1180" y="227" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_14" bpmnElement="isResponseEmptyYes_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_65" targetElement="_BPMNShape_InclusiveGateway_2">
- <di:waypoint xsi:type="dc:Point" x="1034" y="202" />
- <di:waypoint xsi:type="dc:Point" x="1126" y="202" />
+ <di:waypoint x="1194" y="202" />
+ <di:waypoint x="1286" y="202" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1034" y="202" width="29" height="22" />
+ <dc:Bounds x="1200" y="202" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_EndEvent_118" bpmnElement="aai_Error_EndEvent">
- <dc:Bounds x="1281" y="80" width="36" height="36" />
+ <dc:Bounds x="1441" y="80" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1270" y="121" width="59" height="22" />
+ <dc:Bounds x="1437" y="121" width="46" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_66" bpmnElement="prepareNetworkRequest_ScriptTask">
- <dc:Bounds x="1131" y="269" width="100" height="80" />
+ <dc:Bounds x="1291" y="269" width="100" height="80" />
</bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="SequenceFlow_15" sourceElement="_BPMNShape_ScriptTask_66" targetElement="_BPMNShape_ScriptTask_242">
- <di:waypoint xsi:type="dc:Point" x="1181" y="349" />
- <di:waypoint xsi:type="dc:Point" x="1181" y="387" />
+ <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="SequenceFlow_15" sourceElement="_BPMNShape_ScriptTask_66" targetElement="Activity_16tuuqq_di">
+ <di:waypoint x="1341" y="349" />
+ <di:waypoint x="1341" y="400" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1196" y="368" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_67" bpmnElement="prepareSDNCTopoRequest_ScriptTask">
- <dc:Bounds x="981" y="718" width="100" height="80" />
+ <dc:Bounds x="1141" y="718" width="100" height="80" />
</bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_23" bpmnElement="SequenceFlow_20" sourceElement="_BPMNShape_ScriptTask_63" targetElement="_BPMNShape_ScriptTask_67">
- <di:waypoint xsi:type="dc:Point" x="1180" y="589" />
- <di:waypoint xsi:type="dc:Point" x="1181" y="648" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1181" y="603.5" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_SubProcess_16" bpmnElement="subProcessException_SubProcess" isExpanded="true">
- <dc:Bounds x="-1" y="576" width="902" height="448" />
+ <dc:Bounds x="159" y="576" width="902" height="448" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_StartEvent_50" bpmnElement="subProcessStart_StartEvent">
- <dc:Bounds x="49" y="896" width="36" height="36" />
+ <dc:Bounds x="209" y="896" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="43" y="938" width="50" height="12" />
+ <dc:Bounds x="202" y="938" width="52" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_67" bpmnElement="isSdncTopoDeleteOk_ExclusiveGateway" isMarkerVisible="true">
- <dc:Bounds x="1156" y="997" width="50" height="50" />
+ <dc:Bounds x="1316" y="997" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1070" y="1010" width="70" height="24" />
+ <dc:Bounds x="1230" y="1010" width="70" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_26" bpmnElement="sdncTopoDeleteNo_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_67" targetElement="_BPMNShape_EndEvent_124">
- <di:waypoint xsi:type="dc:Point" x="1206" y="1022" />
- <di:waypoint xsi:type="dc:Point" x="1244" y="1022" />
- <di:waypoint xsi:type="dc:Point" x="1244" y="1022" />
- <di:waypoint xsi:type="dc:Point" x="1278" y="1022" />
+ <di:waypoint x="1366" y="1022" />
+ <di:waypoint x="1404" y="1022" />
+ <di:waypoint x="1404" y="1022" />
+ <di:waypoint x="1438" y="1022" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1206" y="1029.0213702128942" width="14" height="12" />
+ <dc:Bounds x="1366" y="1029" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_28" bpmnElement="sdncTopoDeleteYes_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_67">
- <di:waypoint xsi:type="dc:Point" x="1181" y="1047" />
- <di:waypoint xsi:type="dc:Point" x="1181" y="1097" />
+ <di:waypoint x="1341" y="1047" />
+ <di:waypoint x="1341" y="1097" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1187" y="1053.3920491579422" width="18" height="12" />
+ <dc:Bounds x="1347" y="1053" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_EndEvent_124" bpmnElement="sndcError_EndEvent">
- <dc:Bounds x="1278" y="1004" width="36" height="36" />
+ <dc:Bounds x="1438" y="1004" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1289" y="1047" width="59" height="12" />
+ <dc:Bounds x="1448" y="1047" width="61" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_CallActivity_19" bpmnElement="callDeleteSDNCAdapter_CallActivity">
- <dc:Bounds x="981" y="851" width="100" height="80" />
+ <dc:Bounds x="1141" y="851" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_29" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_CallActivity_19" targetElement="_BPMNShape_ScriptTask_131">
- <di:waypoint xsi:type="dc:Point" x="1081" y="891" />
- <di:waypoint xsi:type="dc:Point" x="1131" y="891" />
+ <di:waypoint x="1241" y="891" />
+ <di:waypoint x="1291" y="891" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1106" y="876" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_242" targetElement="_BPMNShape_ScriptTask_63">
- <di:waypoint xsi:type="dc:Point" x="1181" y="467" />
- <di:waypoint xsi:type="dc:Point" x="1181" y="509" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1196" y="488" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_InclusiveGateway_2" bpmnElement="silentSucces_InclusiveGateway">
- <dc:Bounds x="1126" y="177" width="50" height="50" />
+ <dc:Bounds x="1286" y="177" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1136" y="227" width="33" height="22" />
+ <dc:Bounds x="1300" y="227" width="25" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_36" bpmnElement="silentSuccess_SequenceFlow" sourceElement="_BPMNShape_InclusiveGateway_2">
- <di:waypoint xsi:type="dc:Point" x="1176" y="202" />
- <di:waypoint xsi:type="dc:Point" x="1305" y="203" />
+ <di:waypoint x="1336" y="202" />
+ <di:waypoint x="1465" y="203" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1195" y="180.7648701031734" width="72" height="12" />
+ <dc:Bounds x="1355" y="181" width="73" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_131" bpmnElement="validateSDNCResponse_ScriptTask">
- <dc:Bounds x="1131" y="851" width="100" height="80" />
+ <dc:Bounds x="1291" y="851" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ScriptTask_131" targetElement="_BPMNShape_ExclusiveGateway_67">
- <di:waypoint xsi:type="dc:Point" x="1180" y="931" />
- <di:waypoint xsi:type="dc:Point" x="1181" y="997" />
+ <di:waypoint x="1340" y="931" />
+ <di:waypoint x="1341" y="997" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1181" y="949" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_242" bpmnElement="sendRequestToNewworkAdapater_ScriptTask">
- <dc:Bounds x="1131" y="387" width="100" height="80" />
- </bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_EndEvent_179" bpmnElement="EndEvent_1">
- <dc:Bounds x="1458" y="185" width="36" height="36" />
+ <dc:Bounds x="1618" y="185" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1476" y="226" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_EndEvent_180" bpmnElement="EndEvent_2">
- <dc:Bounds x="817" y="687" width="36" height="36" />
+ <dc:Bounds x="977" y="687" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="835" y="728" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_EndEvent_182" bpmnElement="EndEvent_3">
- <dc:Bounds x="1163" y="1228" width="36" height="36" />
+ <dc:Bounds x="1323" y="1228" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1181" y="1269" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_250" bpmnElement="callRESTQueryCloudRegion_ScriptTask">
- <dc:Bounds x="960" y="269" width="100" height="80" />
+ <dc:Bounds x="1120" y="269" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_52" bpmnElement="SequenceFlow_30" sourceElement="_BPMNShape_ScriptTask_250" targetElement="_BPMNShape_ScriptTask_66">
- <di:waypoint xsi:type="dc:Point" x="1060" y="309" />
- <di:waypoint xsi:type="dc:Point" x="1096" y="309" />
- <di:waypoint xsi:type="dc:Point" x="1096" y="309" />
- <di:waypoint xsi:type="dc:Point" x="1131" y="309" />
+ <di:waypoint x="1220" y="309" />
+ <di:waypoint x="1256" y="309" />
+ <di:waypoint x="1256" y="309" />
+ <di:waypoint x="1291" y="309" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1111" y="309" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_BoundaryEvent_41" bpmnElement="BoundaryEvent_1">
- <dc:Bounds x="1213" y="913" width="36" height="36" />
+ <dc:Bounds x="1373" y="913" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1231" y="949" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_41" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_BoundaryEvent_41" targetElement="_BPMNShape_EndEvent_124">
- <di:waypoint xsi:type="dc:Point" x="1241" y="945" />
- <di:waypoint xsi:type="dc:Point" x="1286" y="1007" />
+ <di:waypoint x="1401" y="945" />
+ <di:waypoint x="1446" y="1007" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1264" y="961" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_224" bpmnElement="isRelationshipExists_ExclusiveGateway" isMarkerVisible="true">
- <dc:Bounds x="840" y="72" width="50" height="50" />
+ <dc:Bounds x="1000" y="72" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="829" y="41" width="74" height="24" />
+ <dc:Bounds x="989" y="41" width="74" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_60" bpmnElement="isRelationshipExistNo_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_224" targetElement="_BPMNShape_ExclusiveGateway_62">
- <di:waypoint xsi:type="dc:Point" x="890" y="97" />
- <di:waypoint xsi:type="dc:Point" x="984" y="97" />
+ <di:waypoint x="1050" y="97" />
+ <di:waypoint x="1144" y="97" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="890" y="97" width="22" height="22" />
+ <dc:Bounds x="1054" y="97" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_EndEvent_216" bpmnElement="relationshipError_EndEvent">
- <dc:Bounds x="730" y="80" width="36" height="36" />
+ <dc:Bounds x="890" y="80" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="701" y="117" width="109" height="22" />
+ <dc:Bounds x="871" y="117" width="90" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_61" bpmnElement="isRelationshipExistYes_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_224" targetElement="_BPMNShape_EndEvent_216">
- <di:waypoint xsi:type="dc:Point" x="840" y="97" />
- <di:waypoint xsi:type="dc:Point" x="800" y="97" />
- <di:waypoint xsi:type="dc:Point" x="800" y="98" />
- <di:waypoint xsi:type="dc:Point" x="766" y="98" />
+ <di:waypoint x="1000" y="97" />
+ <di:waypoint x="960" y="97" />
+ <di:waypoint x="960" y="98" />
+ <di:waypoint x="926" y="98" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="816" y="97" width="29" height="22" />
+ <dc:Bounds x="982" y="97" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_SubProcess_29" bpmnElement="SubProcess_1" isExpanded="true">
- <dc:Bounds x="0" y="369" width="326" height="175" />
+ <dc:Bounds x="160" y="369" width="326" height="175" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_StartEvent_73" bpmnElement="StartEvent_1">
- <dc:Bounds x="36" y="432" width="36" height="36" />
+ <dc:Bounds x="196" y="432" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="54" y="473" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_EndEvent_222" bpmnElement="EndEvent_4">
- <dc:Bounds x="240" y="432" width="36" height="36" />
+ <dc:Bounds x="400" y="432" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="258" y="473" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_272" bpmnElement="unexpectedError_DeleteNetworkInfra_ScriptTask_1">
- <dc:Bounds x="108" y="410" width="100" height="80" />
+ <dc:Bounds x="268" y="410" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_13" sourceElement="_BPMNShape_StartEvent_73" targetElement="_BPMNShape_ScriptTask_272">
- <di:waypoint xsi:type="dc:Point" x="72" y="450" />
- <di:waypoint xsi:type="dc:Point" x="108" y="450" />
+ <di:waypoint x="232" y="450" />
+ <di:waypoint x="268" y="450" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_15" bpmnElement="SequenceFlow_17" sourceElement="_BPMNShape_ScriptTask_272" targetElement="_BPMNShape_EndEvent_222">
- <di:waypoint xsi:type="dc:Point" x="208" y="450" />
- <di:waypoint xsi:type="dc:Point" x="240" y="450" />
+ <di:waypoint x="368" y="450" />
+ <di:waypoint x="400" y="450" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ScriptTask_00lgy9f_di" bpmnElement="ScriptTask_00lgy9f">
- <dc:Bounds x="688" y="665" width="100" height="80" />
+ <dc:Bounds x="848" y="665" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1a51h25_di" bpmnElement="SequenceFlow_1a51h25">
- <di:waypoint xsi:type="dc:Point" x="85" y="914" />
- <di:waypoint xsi:type="dc:Point" x="124" y="914" />
+ <di:waypoint x="245" y="914" />
+ <di:waypoint x="284" y="914" />
<bpmndi:BPMNLabel>
<dc:Bounds x="105" y="899" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1yvnovn_di" bpmnElement="SequenceFlow_1yvnovn">
- <di:waypoint xsi:type="dc:Point" x="788" y="705" />
- <di:waypoint xsi:type="dc:Point" x="817" y="705" />
+ <di:waypoint x="948" y="705" />
+ <di:waypoint x="977" y="705" />
<bpmndi:BPMNLabel>
<dc:Bounds x="803" y="690" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ScriptTask_01xjfhu_di" bpmnElement="ScriptTask_01xjfhu">
- <dc:Bounds x="1131" y="1097" width="100" height="80" />
+ <dc:Bounds x="1291" y="1097" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1pbgnr2_di" bpmnElement="SequenceFlow_1pbgnr2">
- <di:waypoint xsi:type="dc:Point" x="1181" y="1177" />
- <di:waypoint xsi:type="dc:Point" x="1181" y="1228" />
+ <di:waypoint x="1341" y="1177" />
+ <di:waypoint x="1341" y="1228" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1196" y="1202.5" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1pdp4d2_di" bpmnElement="SequenceFlow_1pdp4d2">
- <di:waypoint xsi:type="dc:Point" x="1031" y="798" />
- <di:waypoint xsi:type="dc:Point" x="1031" y="851" />
+ <di:waypoint x="1191" y="798" />
+ <di:waypoint x="1191" y="851" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1046" y="824.5" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ExclusiveGateway_02t94x3_di" bpmnElement="ExclusiveGateway_02t94x3" isMarkerVisible="true">
- <dc:Bounds x="1156" y="648" width="50" height="50" />
+ <dc:Bounds x="1316" y="648" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1150" y="707" width="61" height="24" />
+ <dc:Bounds x="1311" y="707" width="60" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0r3pvf8_di" bpmnElement="SequenceFlow_0r3pvf8">
- <di:waypoint xsi:type="dc:Point" x="1156" y="673" />
- <di:waypoint xsi:type="dc:Point" x="1031" y="673" />
- <di:waypoint xsi:type="dc:Point" x="1031" y="718" />
+ <di:waypoint x="1316" y="673" />
+ <di:waypoint x="1191" y="673" />
+ <di:waypoint x="1191" y="718" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1134" y="681" width="14" height="12" />
+ <dc:Bounds x="1294" y="681" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ScriptTask_0iqzbz6_di" bpmnElement="ScriptTask_0iqzbz6">
- <dc:Bounds x="1426" y="851" width="100" height="80" />
+ <dc:Bounds x="1586" y="851" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="CallActivity_03wzdas_di" bpmnElement="CallActivity_03wzdas">
- <dc:Bounds x="1279" y="851" width="100" height="80" />
+ <dc:Bounds x="1439" y="851" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1jnva78_di" bpmnElement="SequenceFlow_1jnva78">
- <di:waypoint xsi:type="dc:Point" x="1279" y="891" />
- <di:waypoint xsi:type="dc:Point" x="1231" y="891" />
+ <di:waypoint x="1439" y="891" />
+ <di:waypoint x="1391" y="891" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1255" y="876" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0zlbzad_di" bpmnElement="SequenceFlow_0zlbzad">
- <di:waypoint xsi:type="dc:Point" x="1426" y="891" />
- <di:waypoint xsi:type="dc:Point" x="1379" y="891" />
+ <di:waypoint x="1586" y="891" />
+ <di:waypoint x="1539" y="891" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1403" y="876" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0kqnddy_di" bpmnElement="SequenceFlow_0kqnddy">
- <di:waypoint xsi:type="dc:Point" x="1206" y="673" />
- <di:waypoint xsi:type="dc:Point" x="1279" y="673" />
+ <di:waypoint x="1366" y="673" />
+ <di:waypoint x="1439" y="673" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1217" y="677.9562629793824" width="18" height="12" />
+ <dc:Bounds x="1377" y="678" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ScriptTask_01w2cd9_di" bpmnElement="ScriptTask_01w2cd9">
- <dc:Bounds x="597" y="163" width="100" height="80" />
+ <dc:Bounds x="757" y="163" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0msqfwu_di" bpmnElement="SequenceFlow_0msqfwu">
- <di:waypoint xsi:type="dc:Point" x="697" y="203" />
- <di:waypoint xsi:type="dc:Point" x="816" y="203" />
+ <di:waypoint x="857" y="203" />
+ <di:waypoint x="976" y="203" />
<bpmndi:BPMNLabel>
<dc:Bounds x="757" y="188" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ScriptTask_0dtzzht_di" bpmnElement="ScriptTask_0dtzzht">
- <dc:Bounds x="1305" y="163" width="100" height="80" />
+ <dc:Bounds x="1465" y="163" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0f25bme_di" bpmnElement="SequenceFlow_0f25bme">
- <di:waypoint xsi:type="dc:Point" x="1405" y="203" />
- <di:waypoint xsi:type="dc:Point" x="1458" y="203" />
+ <di:waypoint x="1565" y="203" />
+ <di:waypoint x="1618" y="203" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1432" y="178" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="CallActivity_0wyu1mx_di" bpmnElement="CallActivity_0wyu1mx">
- <dc:Bounds x="1426" y="633" width="100" height="80" />
+ <dc:Bounds x="1586" y="633" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ScriptTask_1wf192s_di" bpmnElement="ScriptTask_1wf192s">
- <dc:Bounds x="1279" y="633" width="100" height="80" />
+ <dc:Bounds x="1439" y="633" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1o088sy_di" bpmnElement="SequenceFlow_1o088sy">
- <di:waypoint xsi:type="dc:Point" x="1379" y="673" />
- <di:waypoint xsi:type="dc:Point" x="1403" y="673" />
- <di:waypoint xsi:type="dc:Point" x="1403" y="673" />
- <di:waypoint xsi:type="dc:Point" x="1426" y="673" />
+ <di:waypoint x="1539" y="673" />
+ <di:waypoint x="1563" y="673" />
+ <di:waypoint x="1563" y="673" />
+ <di:waypoint x="1586" y="673" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1418" y="673" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ExclusiveGateway_024qvqd_di" bpmnElement="ExclusiveGateway_024qvqd" isMarkerVisible="true">
- <dc:Bounds x="1597" y="775" width="50" height="50" />
+ <dc:Bounds x="1757" y="775" width="50" height="50" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1622" y="825" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ScriptTask_00vwf2h_di" bpmnElement="ScriptTask_00vwf2h">
- <dc:Bounds x="1572" y="633" width="100" height="80" />
+ <dc:Bounds x="1732" y="633" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BoundaryEvent_0un9yyu_di" bpmnElement="BoundaryEvent_0un9yyu">
- <dc:Bounds x="1654" y="695" width="36" height="36" />
+ <dc:Bounds x="1814" y="695" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1672" y="731" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1i3193l_di" bpmnElement="SequenceFlow_1i3193l">
- <di:waypoint xsi:type="dc:Point" x="1526" y="673" />
- <di:waypoint xsi:type="dc:Point" x="1572" y="673" />
+ <di:waypoint x="1686" y="673" />
+ <di:waypoint x="1732" y="673" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1549" y="648" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0n8sf23_di" bpmnElement="SequenceFlow_0n8sf23">
- <di:waypoint xsi:type="dc:Point" x="1622" y="713" />
- <di:waypoint xsi:type="dc:Point" x="1622" y="775" />
+ <di:waypoint x="1782" y="713" />
+ <di:waypoint x="1782" y="775" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1637" y="734" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_08hus4u_di" bpmnElement="SequenceFlow_08hus4u">
- <di:waypoint xsi:type="dc:Point" x="1680" y="729" />
- <di:waypoint xsi:type="dc:Point" x="1710" y="784" />
+ <di:waypoint x="1840" y="729" />
+ <di:waypoint x="1870" y="784" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1695" y="741.5" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1qyo7ot_di" bpmnElement="SequenceFlow_1qyo7ot">
- <di:waypoint xsi:type="dc:Point" x="1647" y="800" />
- <di:waypoint xsi:type="dc:Point" x="1700" y="800" />
+ <di:waypoint x="1807" y="800" />
+ <di:waypoint x="1860" y="800" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1651" y="808" width="14" height="12" />
+ <dc:Bounds x="1811" y="808" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0f13b17_di" bpmnElement="SequenceFlow_0f13b17">
- <di:waypoint xsi:type="dc:Point" x="1622" y="825" />
- <di:waypoint xsi:type="dc:Point" x="1622" y="891" />
- <di:waypoint xsi:type="dc:Point" x="1526" y="891" />
+ <di:waypoint x="1782" y="825" />
+ <di:waypoint x="1782" y="891" />
+ <di:waypoint x="1686" y="891" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1629" y="824" width="18" height="12" />
+ <dc:Bounds x="1789" y="824" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="EndEvent_0p7ad9r_di" bpmnElement="EndEvent_1l210ae">
- <dc:Bounds x="1700" y="782" width="36" height="36" />
+ <dc:Bounds x="1860" y="782" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1718" y="818" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ScriptTask_0n4do0p_di" bpmnElement="ScriptTask_0n4do0p">
- <dc:Bounds x="245" y="665" width="100" height="80" />
+ <dc:Bounds x="405" y="665" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ExclusiveGateway_1gix2o6_di" bpmnElement="ExclusiveGateway_1gix2o6" isMarkerVisible="true">
- <dc:Bounds x="270" y="889" width="50" height="50" />
+ <dc:Bounds x="430" y="889" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="256" y="939" width="77" height="13" />
+ <dc:Bounds x="416" y="939" width="78" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0tiz0kk_di" bpmnElement="SequenceFlow_0tiz0kk">
- <di:waypoint xsi:type="dc:Point" x="295" y="889" />
- <di:waypoint xsi:type="dc:Point" x="295" y="869" />
- <di:waypoint xsi:type="dc:Point" x="295" y="869" />
- <di:waypoint xsi:type="dc:Point" x="295" y="849" />
+ <di:waypoint x="455" y="889" />
+ <di:waypoint x="455" y="869" />
+ <di:waypoint x="455" y="869" />
+ <di:waypoint x="455" y="849" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="299" y="858.4545454545455" width="19" height="13" />
+ <dc:Bounds x="460" y="858" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1suj1nc_di" bpmnElement="SequenceFlow_1suj1nc">
- <di:waypoint xsi:type="dc:Point" x="320" y="914" />
- <di:waypoint xsi:type="dc:Point" x="437" y="914" />
- <di:waypoint xsi:type="dc:Point" x="437" y="849" />
+ <di:waypoint x="480" y="914" />
+ <di:waypoint x="597" y="914" />
+ <di:waypoint x="597" y="849" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="333" y="897" width="14" height="13" />
+ <dc:Bounds x="493" y="897" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="CallActivity_0lku52d_di" bpmnElement="CallActivity_0lku52d">
- <dc:Bounds x="523" y="665" width="100" height="80" />
- </bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ExclusiveGateway_1x7o5bo_di" bpmnElement="ExclusiveGateway_1x7o5bo" isMarkerVisible="true">
- <dc:Bounds x="270" y="799" width="50" height="50" />
+ <dc:Bounds x="430" y="799" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="173" y="812" width="87" height="25" />
+ <dc:Bounds x="333" y="812" width="88" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0jb7rws_di" bpmnElement="SequenceFlow_0jb7rws">
- <di:waypoint xsi:type="dc:Point" x="295" y="799" />
- <di:waypoint xsi:type="dc:Point" x="295" y="772" />
- <di:waypoint xsi:type="dc:Point" x="437" y="772" />
- <di:waypoint xsi:type="dc:Point" x="437" y="799" />
+ <di:waypoint x="455" y="799" />
+ <di:waypoint x="455" y="772" />
+ <di:waypoint x="597" y="772" />
+ <di:waypoint x="597" y="799" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="312" y="776.0384854424079" width="18" height="12" />
+ <dc:Bounds x="472" y="776" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="InclusiveGateway_17qke2s_di" bpmnElement="ExclusiveGateway_01xin16">
- <dc:Bounds x="412" y="799" width="50" height="50" />
+ <dc:Bounds x="572" y="799" width="50" height="50" />
<bpmndi:BPMNLabel>
<dc:Bounds x="437" y="849" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1raa09h_di" bpmnElement="SequenceFlow_1raa09h">
- <di:waypoint xsi:type="dc:Point" x="320" y="824" />
- <di:waypoint xsi:type="dc:Point" x="412" y="824" />
+ <di:waypoint x="480" y="824" />
+ <di:waypoint x="572" y="824" />
<bpmndi:BPMNLabel>
<dc:Bounds x="366" y="809" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1nl99y6_di" bpmnElement="SequenceFlow_1nl99y6">
- <di:waypoint xsi:type="dc:Point" x="462" y="824" />
- <di:waypoint xsi:type="dc:Point" x="738" y="824" />
- <di:waypoint xsi:type="dc:Point" x="738" y="745" />
+ <di:waypoint x="622" y="824" />
+ <di:waypoint x="898" y="824" />
+ <di:waypoint x="898" y="745" />
<bpmndi:BPMNLabel>
<dc:Bounds x="600" y="809" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ScriptTask_0n4ya47_di" bpmnElement="ScriptTask_0n4ya47">
- <dc:Bounds x="387" y="665" width="100" height="80" />
+ <dc:Bounds x="547" y="665" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1wif0e5_di" bpmnElement="SequenceFlow_1wif0e5">
- <di:waypoint xsi:type="dc:Point" x="345" y="705" />
- <di:waypoint xsi:type="dc:Point" x="387" y="705" />
+ <di:waypoint x="505" y="705" />
+ <di:waypoint x="547" y="705" />
<bpmndi:BPMNLabel>
<dc:Bounds x="366" y="690" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_147vc14_di" bpmnElement="SequenceFlow_147vc14">
- <di:waypoint xsi:type="dc:Point" x="487" y="705" />
- <di:waypoint xsi:type="dc:Point" x="523" y="705" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="505" y="690" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_021b0sz_di" bpmnElement="SequenceFlow_021b0sz">
- <di:waypoint xsi:type="dc:Point" x="224" y="914" />
- <di:waypoint xsi:type="dc:Point" x="270" y="914" />
+ <di:waypoint x="384" y="914" />
+ <di:waypoint x="430" y="914" />
<bpmndi:BPMNLabel>
<dc:Bounds x="247" y="899" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ScriptTask_1gtl61j_di" bpmnElement="Task_0026x4v">
- <dc:Bounds x="124" y="874" width="100" height="80" />
+ <dc:Bounds x="284" y="874" width="100" height="80" />
</bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="TextAnnotation_0i06ryl_di" bpmnElement="TextAnnotation_0i06ryl">
- <dc:Bounds x="592" y="596" width="106" height="45" />
+ <bpmndi:BPMNShape id="Activity_16tuuqq_di" bpmnElement="Activity_1bwwwba">
+ <dc:Bounds x="1291" y="400" width="100" height="80" />
</bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="Association_0gzsxad_di" bpmnElement="Association_0gzsxad">
- <di:waypoint xsi:type="dc:Point" x="606" y="665" />
- <di:waypoint xsi:type="dc:Point" x="627" y="641" />
+ <bpmndi:BPMNEdge id="Flow_10caop8_di" bpmnElement="Flow_10caop8">
+ <di:waypoint x="1341" y="480" />
+ <di:waypoint x="1341" y="648" />
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
-</bpmn2:definitions> \ No newline at end of file
+</bpmn2:definitions>
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteNetworkInstanceRollback.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteNetworkInstanceRollback.bpmn
deleted file mode 100644
index 7ec02addfa..0000000000
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteNetworkInstanceRollback.bpmn
+++ /dev/null
@@ -1,547 +0,0 @@
-<?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="DoDeleteNetworkInstanceRollback" name="DoDeleteNetworkInstanceRollback" isExecutable="true">
- <bpmn:startEvent id="StartEvent_1">
- <bpmn:outgoing>SequenceFlow_1krl2dg</bpmn:outgoing>
- </bpmn:startEvent>
- <bpmn:scriptTask id="Task_0whino1" name="PreProcess Incoming Data" scriptFormat="groovy">
- <bpmn:incoming>SequenceFlow_1krl2dg</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_0u41iz2</bpmn:outgoing>
- <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
-def DoDeleteNetworkInstanceRollback = new DoDeleteNetworkInstanceRollback()
-DoDeleteNetworkInstanceRollback.preProcessRequest(execution)]]></bpmn:script>
- </bpmn:scriptTask>
- <bpmn:sequenceFlow id="SequenceFlow_1krl2dg" sourceRef="StartEvent_1" targetRef="Task_0whino1" />
- <bpmn:sequenceFlow id="SequenceFlow_0u41iz2" sourceRef="Task_0whino1" targetRef="ExclusiveGateway_0p5zgdb" />
- <bpmn:callActivity id="CallActivity_1x88fsq" name="Call RSRC SDNC Activate Adapter" calledElement="sdncAdapter">
- <bpmn:extensionElements>
- <camunda:in source="DELNWKIR_rollbackDeactivateSDNCRequest" 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:out source="SDNCA_ResponseCode" target="DELNWKIR_rollbackDeactivateSDNCReturnCode" />
- <camunda:out source="sdncAdapterResponse" target="DELNWKIR_rollbackDeactivateSDNCResponse" />
- <camunda:out source="WorkflowException" target="WorkflowException" />
- <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />
- </bpmn:extensionElements>
- <bpmn:incoming>SequenceFlow_1mxbdps</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_07s5r14</bpmn:outgoing>
- </bpmn:callActivity>
- <bpmn:exclusiveGateway id="ExclusiveGateway_0p5zgdb" name="is RSRC Deactivate Rollback?" default="SequenceFlow_1bb7zpp">
- <bpmn:incoming>SequenceFlow_0u41iz2</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_1bb7zpp</bpmn:outgoing>
- <bpmn:outgoing>SequenceFlow_1mxbdps</bpmn:outgoing>
- </bpmn:exclusiveGateway>
- <bpmn:scriptTask id="ScriptTask_1ggaxfu" name="Validate Rollback Responses" scriptFormat="groovy">
- <bpmn:incoming>SequenceFlow_1xokvq6</bpmn:incoming>
- <bpmn:incoming>SequenceFlow_1xs882r</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_1ucaagl</bpmn:outgoing>
- <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
-def DoDeleteNetworkInstanceRollback = new DoDeleteNetworkInstanceRollback()
-DoDeleteNetworkInstanceRollback.validateRollbackResponses(execution)]]></bpmn:script>
- </bpmn:scriptTask>
- <bpmn:sequenceFlow id="SequenceFlow_1bb7zpp" name="No" sourceRef="ExclusiveGateway_0p5zgdb" targetRef="ExclusiveGateway_03d5sol" />
- <bpmn:sequenceFlow id="SequenceFlow_1mxbdps" name="Yes" sourceRef="ExclusiveGateway_0p5zgdb" targetRef="CallActivity_1x88fsq">
- <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("DELNWKIR_rollbackDeactivateSDNCRequest") != null}]]></bpmn:conditionExpression>
- </bpmn:sequenceFlow>
- <bpmn:sequenceFlow id="SequenceFlow_07s5r14" sourceRef="CallActivity_1x88fsq" targetRef="ExclusiveGateway_03d5sol" />
- <bpmn:endEvent id="EndEvent_1fvr7ad">
- <bpmn:incoming>SequenceFlow_1ucaagl</bpmn:incoming>
- </bpmn:endEvent>
- <bpmn:sequenceFlow id="SequenceFlow_1eyt8z2" sourceRef="ServiceTask_1vx8ti9" targetRef="ExclusiveGateway_03fn5ks" />
- <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.onap.so.bpmn.infrastructure.scripts.*
-def DoDeleteNetworkInstanceRollback = new DoDeleteNetworkInstanceRollback()
-DoDeleteNetworkInstanceRollback.processJavaException(execution)]]></bpmn:script>
- </bpmn:scriptTask>
- <bpmn:startEvent id="StartEvent_1j0eixl">
- <bpmn:outgoing>SequenceFlow_0xktw7v</bpmn:outgoing>
- <bpmn:errorEventDefinition errorRef="Error_1" />
- </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:inclusiveGateway id="ExclusiveGateway_0798yby">
- <bpmn:incoming>SequenceFlow_1hcmrh9</bpmn:incoming>
- <bpmn:incoming>SequenceFlow_1pi168e</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_1xs882r</bpmn:outgoing>
- </bpmn:inclusiveGateway>
- <bpmn:sequenceFlow id="SequenceFlow_1xs882r" sourceRef="ExclusiveGateway_0798yby" targetRef="ScriptTask_1ggaxfu" />
- <bpmn:exclusiveGateway id="ExclusiveGateway_03d5sol" name="is PO Network Rollback?" default="SequenceFlow_1yj3542">
- <bpmn:incoming>SequenceFlow_1bb7zpp</bpmn:incoming>
- <bpmn:incoming>SequenceFlow_07s5r14</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_1yj3542</bpmn:outgoing>
- <bpmn:outgoing>SequenceFlow_18e00sw</bpmn:outgoing>
- </bpmn:exclusiveGateway>
- <bpmn:sequenceFlow id="SequenceFlow_1yj3542" name="No" sourceRef="ExclusiveGateway_03d5sol" targetRef="ExclusiveGateway_03fn5ks" />
- <bpmn:serviceTask id="ServiceTask_1vx8ti9" name="Call Rollback Network">
- <bpmn:extensionElements>
- <camunda:connector>
- <camunda:inputOutput>
- <camunda:inputParameter name="payload">${DELNWKIR_rollbackNetworkRequest}</camunda:inputParameter>
- <camunda:inputParameter name="url"><![CDATA[${UrnPropertiesReader.getVariable("mso.adapters.network.rest.endpoint", execution)}
-]]></camunda:inputParameter>
- <camunda:inputParameter name="headers">
- <camunda:map>
- <camunda:entry key="Authorization">#{BasicAuthHeaderValuePO}</camunda:entry>
- <camunda:entry key="content-type">application/xml</camunda:entry>
- </camunda:map>
- </camunda:inputParameter>
- <camunda:inputParameter name="method">POST</camunda:inputParameter>
- <camunda:outputParameter name="DELNWKIR_rollbackNetworkResponse">${response}</camunda:outputParameter>
- <camunda:outputParameter name="DELNWKIR_rollbackNetworkReturnCode">${statusCode}</camunda:outputParameter>
- </camunda:inputOutput>
- <camunda:connectorId>http-connector</camunda:connectorId>
- </camunda:connector>
- </bpmn:extensionElements>
- <bpmn:incoming>SequenceFlow_18e00sw</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_1eyt8z2</bpmn:outgoing>
- </bpmn:serviceTask>
- <bpmn:sequenceFlow id="SequenceFlow_18e00sw" name="Yes" sourceRef="ExclusiveGateway_03d5sol" targetRef="ServiceTask_1vx8ti9">
- <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("DELNWKIR_rollbackNetworkRequest") != null}]]></bpmn:conditionExpression>
- </bpmn:sequenceFlow>
- <bpmn:exclusiveGateway id="ExclusiveGateway_03fn5ks" name="is SDNC Rollback?" default="SequenceFlow_1xokvq6">
- <bpmn:incoming>SequenceFlow_1yj3542</bpmn:incoming>
- <bpmn:incoming>SequenceFlow_1eyt8z2</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_1xokvq6</bpmn:outgoing>
- <bpmn:outgoing>SequenceFlow_172safw</bpmn:outgoing>
- </bpmn:exclusiveGateway>
- <bpmn:exclusiveGateway id="ExclusiveGateway_1ga27si" name="is RSRC SDNC?" default="SequenceFlow_1wy1aba">
- <bpmn:incoming>SequenceFlow_172safw</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_1wy1aba</bpmn:outgoing>
- <bpmn:outgoing>SequenceFlow_1yltkyg</bpmn:outgoing>
- </bpmn:exclusiveGateway>
- <bpmn:sequenceFlow id="SequenceFlow_1xokvq6" name="No" sourceRef="ExclusiveGateway_03fn5ks" targetRef="ScriptTask_1ggaxfu" />
- <bpmn:sequenceFlow id="SequenceFlow_172safw" name="Yes" sourceRef="ExclusiveGateway_03fn5ks" targetRef="ExclusiveGateway_1ga27si">
- <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("DELNWKIR_rollbackSDNCRequest") != null}]]></bpmn:conditionExpression>
- </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") != '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" />
- <bpmn:callActivity id="Task_1iuumxi" name="Call Assign RSRC SDNC Adapter" calledElement="sdncAdapter">
- <bpmn:extensionElements>
- <camunda:in source="DELNWKIR_rollbackSDNCRequest" 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:out source="SDNCA_ResponseCode" target="DELNWKIR_rollbackSDNCReturnCode" />
- <camunda:out source="sdncAdapterResponse" target="DELNWKIR_rollbackSDNCResponse" />
- <camunda:out source="WorkflowException" target="WorkflowException" />
- <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />
- </bpmn:extensionElements>
- <bpmn:incoming>SequenceFlow_1yltkyg</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_1hcmrh9</bpmn:outgoing>
- </bpmn:callActivity>
- <bpmn:callActivity id="Task_00chyig" name="Call Rollback SDNC Adapter" calledElement="sdncAdapter">
- <bpmn:extensionElements>
- <camunda:in source="DELNWKIR_rollbackSDNCRequest" 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:out source="SDNCA_ResponseCode" target="DELNWKIR_rollbackSDNCReturnCode" />
- <camunda:out source="sdncAdapterResponse" target="DELNWKIR_rollbackSDNCResponse" />
- <camunda:out source="WorkflowException" target="WorkflowException" />
- <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />
- </bpmn:extensionElements>
- <bpmn:incoming>SequenceFlow_1wy1aba</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_1pi168e</bpmn:outgoing>
- </bpmn:callActivity>
- <bpmn:sequenceFlow id="SequenceFlow_1ucaagl" sourceRef="ScriptTask_1ggaxfu" targetRef="EndEvent_1fvr7ad" />
- <bpmn:subProcess id="SubProcess_02vfqr7" triggeredByEvent="true">
- <bpmn:endEvent id="EndEvent_0m7hpuj">
- <bpmn:incoming>SequenceFlow_1s5yjuu</bpmn:incoming>
- </bpmn:endEvent>
- <bpmn:scriptTask id="ScriptTask_0yr3vca" name="Catch Exception" scriptFormat="groovy">
- <bpmn:incoming>SequenceFlow_01hh1wq</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_1s5yjuu</bpmn:outgoing>
- <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
-execution.setVariable("workflowException", execution.getVariable("WorkflowException")]]></bpmn:script>
- </bpmn:scriptTask>
- <bpmn:startEvent id="StartEvent_001ol7f">
- <bpmn:outgoing>SequenceFlow_01hh1wq</bpmn:outgoing>
- <bpmn:errorEventDefinition errorRef="Error_2" />
- </bpmn:startEvent>
- <bpmn:sequenceFlow id="SequenceFlow_1s5yjuu" sourceRef="ScriptTask_0yr3vca" targetRef="EndEvent_0m7hpuj" />
- <bpmn:sequenceFlow id="SequenceFlow_01hh1wq" sourceRef="StartEvent_001ol7f" targetRef="ScriptTask_0yr3vca" />
- </bpmn:subProcess>
- <bpmn:boundaryEvent id="BoundaryEvent_1mrkh9x" attachedToRef="CallActivity_1x88fsq">
- <bpmn:outgoing>SequenceFlow_0b0m3o7</bpmn:outgoing>
- <bpmn:errorEventDefinition errorRef="Error_2" />
- </bpmn:boundaryEvent>
- <bpmn:boundaryEvent id="BoundaryEvent_16cracu" attachedToRef="ServiceTask_1vx8ti9">
- <bpmn:outgoing>SequenceFlow_141226w</bpmn:outgoing>
- <bpmn:errorEventDefinition errorRef="Error_2" />
- </bpmn:boundaryEvent>
- <bpmn:sequenceFlow id="SequenceFlow_141226w" sourceRef="BoundaryEvent_16cracu" targetRef="EndEvent_00y9o8y" />
- <bpmn:sequenceFlow id="SequenceFlow_0b0m3o7" sourceRef="BoundaryEvent_1mrkh9x" targetRef="EndEvent_00y9o8y" />
- <bpmn:endEvent id="EndEvent_00y9o8y">
- <bpmn:incoming>SequenceFlow_141226w</bpmn:incoming>
- <bpmn:incoming>SequenceFlow_0b0m3o7</bpmn:incoming>
- <bpmn:errorEventDefinition errorRef="Error_2" />
- </bpmn:endEvent>
- <bpmn:boundaryEvent id="BoundaryEvent_1gk4tem" attachedToRef="Task_1iuumxi">
- <bpmn:outgoing>SequenceFlow_1lr1613</bpmn:outgoing>
- <bpmn:errorEventDefinition errorRef="Error_2" />
- </bpmn:boundaryEvent>
- <bpmn:boundaryEvent id="BoundaryEvent_1qaz277" attachedToRef="Task_00chyig">
- <bpmn:outgoing>SequenceFlow_0np0b8p</bpmn:outgoing>
- <bpmn:errorEventDefinition errorRef="Error_2" />
- </bpmn:boundaryEvent>
- <bpmn:endEvent id="EndEvent_1qfbudr">
- <bpmn:incoming>SequenceFlow_1lr1613</bpmn:incoming>
- <bpmn:incoming>SequenceFlow_0np0b8p</bpmn:incoming>
- <bpmn:errorEventDefinition errorRef="Error_2" />
- </bpmn:endEvent>
- <bpmn:sequenceFlow id="SequenceFlow_1lr1613" sourceRef="BoundaryEvent_1gk4tem" targetRef="EndEvent_1qfbudr" />
- <bpmn:sequenceFlow id="SequenceFlow_0np0b8p" sourceRef="BoundaryEvent_1qaz277" targetRef="EndEvent_1qfbudr" />
- <bpmn:textAnnotation id="TextAnnotation_000ap15"> <bpmn:text><![CDATA[Include ONLY inputs/varrables:  
-rollbackData, as Map
--rollbackDeactivateSDNCRequest
--rollbackNetworkRequest 
-WorkflowException
-]]></bpmn:text>
-</bpmn:textAnnotation>
- <bpmn:association id="Association_0ybkmal" sourceRef="Task_0whino1" targetRef="TextAnnotation_000ap15" />
- <bpmn:textAnnotation id="TextAnnotation_0vwyo82"> <bpmn:text><![CDATA[set value for:
-WorkflowException
-rolledBack
-wasDeleted
-]]></bpmn:text>
-</bpmn:textAnnotation>
- <bpmn:association id="Association_1gx121b" sourceRef="ScriptTask_1ggaxfu" targetRef="TextAnnotation_0vwyo82" />
- </bpmn:process>
- <bpmn:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" />
- <bpmn:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" />
- <bpmndi:BPMNDiagram id="BPMNDiagram_1">
- <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoDeleteNetworkInstanceRollback">
- <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
- <dc:Bounds x="214" y="240" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="232" y="276" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="ScriptTask_1dqe09s_di" bpmnElement="Task_0whino1">
- <dc:Bounds x="333" y="218" width="100" height="80" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_1krl2dg_di" bpmnElement="SequenceFlow_1krl2dg">
- <di:waypoint xsi:type="dc:Point" x="250" y="258" />
- <di:waypoint xsi:type="dc:Point" x="333" y="258" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="292" y="243" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_0u41iz2_di" bpmnElement="SequenceFlow_0u41iz2">
- <di:waypoint xsi:type="dc:Point" x="433" y="258" />
- <di:waypoint xsi:type="dc:Point" x="556" y="258" />
- <di:waypoint xsi:type="dc:Point" x="556" y="347" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="495" y="243" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="CallActivity_1x88fsq_di" bpmnElement="CallActivity_1x88fsq">
- <dc:Bounds x="506" y="481" width="100" height="80" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="ExclusiveGateway_0p5zgdb_di" bpmnElement="ExclusiveGateway_0p5zgdb" isMarkerVisible="true">
- <dc:Bounds x="531" y="347" width="50" height="50" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="451" y="360" width="55" height="36" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="TextAnnotation_000ap15_di" bpmnElement="TextAnnotation_000ap15">
- <dc:Bounds x="112" y="355" width="277" height="115" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="Association_0ybkmal_di" bpmnElement="Association_0ybkmal">
- <di:waypoint xsi:type="dc:Point" x="349" y="298" />
- <di:waypoint xsi:type="dc:Point" x="300" y="355" />
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="ScriptTask_1ggaxfu_di" bpmnElement="ScriptTask_1ggaxfu">
- <dc:Bounds x="1097" y="332" width="100" height="80" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="TextAnnotation_0vwyo82_di" bpmnElement="TextAnnotation_0vwyo82">
- <dc:Bounds x="1230" y="448" width="165" height="60" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="Association_1gx121b_di" bpmnElement="Association_1gx121b">
- <di:waypoint xsi:type="dc:Point" x="1195" y="404" />
- <di:waypoint xsi:type="dc:Point" x="1264" y="448" />
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_1bb7zpp_di" bpmnElement="SequenceFlow_1bb7zpp">
- <di:waypoint xsi:type="dc:Point" x="581" y="372" />
- <di:waypoint xsi:type="dc:Point" x="711" y="372" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="589" y="350.17259171746633" width="14" height="12" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_1mxbdps_di" bpmnElement="SequenceFlow_1mxbdps">
- <di:waypoint xsi:type="dc:Point" x="556" y="397" />
- <di:waypoint xsi:type="dc:Point" x="556" y="481" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="560" y="397.10731155015196" width="18" height="12" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_07s5r14_di" bpmnElement="SequenceFlow_07s5r14">
- <di:waypoint xsi:type="dc:Point" x="606" y="521" />
- <di:waypoint xsi:type="dc:Point" x="639" y="521" />
- <di:waypoint xsi:type="dc:Point" x="639" y="372" />
- <di:waypoint xsi:type="dc:Point" x="711" y="372" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="654" y="446.5" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="EndEvent_1fvr7ad_di" bpmnElement="EndEvent_1fvr7ad">
- <dc:Bounds x="1253" y="252" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1271" y="288" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_1eyt8z2_di" bpmnElement="SequenceFlow_1eyt8z2">
- <di:waypoint xsi:type="dc:Point" x="786" y="521" />
- <di:waypoint xsi:type="dc:Point" x="815" y="521" />
- <di:waypoint xsi:type="dc:Point" x="815" y="372" />
- <di:waypoint xsi:type="dc:Point" x="866" y="372" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="830" y="446.5" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="SubProcess_1p4663w_di" bpmnElement="SubProcess_1p4663w" isExpanded="true">
- <dc:Bounds x="-6" y="665" width="394" height="188" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="ScriptTask_0by1uwk_di" bpmnElement="ScriptTask_0by1uwk">
- <dc:Bounds x="142" y="720" width="100" height="80" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="StartEvent_1j0eixl_di" bpmnElement="StartEvent_1j0eixl">
- <dc:Bounds x="27" y="742" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="45" y="783" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="EndEvent_0jxh015_di" bpmnElement="EndEvent_0jxh015">
- <dc:Bounds x="303" y="742" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="321" y="783" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_0xktw7v_di" bpmnElement="SequenceFlow_0xktw7v">
- <di:waypoint xsi:type="dc:Point" x="63" y="760" />
- <di:waypoint xsi:type="dc:Point" x="142" y="760" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="105" y="760" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_0soe5t3_di" bpmnElement="SequenceFlow_0soe5t3">
- <di:waypoint xsi:type="dc:Point" x="242" y="760" />
- <di:waypoint xsi:type="dc:Point" x="303" y="760" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="277" y="760" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="InclusiveGateway_04myanb_di" bpmnElement="ExclusiveGateway_0798yby">
- <dc:Bounds x="1122" y="496" width="50" height="50" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1147" y="546" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_1xs882r_di" bpmnElement="SequenceFlow_1xs882r">
- <di:waypoint xsi:type="dc:Point" x="1147" y="496" />
- <di:waypoint xsi:type="dc:Point" x="1147" y="412" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1162" y="454" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="ExclusiveGateway_03d5sol_di" bpmnElement="ExclusiveGateway_03d5sol" isMarkerVisible="true">
- <dc:Bounds x="711" y="347" width="50" height="50" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="699" y="312" width="74" height="24" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_1yj3542_di" bpmnElement="SequenceFlow_1yj3542">
- <di:waypoint xsi:type="dc:Point" x="761" y="372" />
- <di:waypoint xsi:type="dc:Point" x="866" y="372" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="774" y="354" width="14" height="12" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="ServiceTask_1vx8ti9_di" bpmnElement="ServiceTask_1vx8ti9">
- <dc:Bounds x="686" y="481" width="100" height="80" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_18e00sw_di" bpmnElement="SequenceFlow_18e00sw">
- <di:waypoint xsi:type="dc:Point" x="736" y="397" />
- <di:waypoint xsi:type="dc:Point" x="736" y="481" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="748" y="394" width="18" height="12" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="ExclusiveGateway_03fn5ks_di" bpmnElement="ExclusiveGateway_03fn5ks" isMarkerVisible="true">
- <dc:Bounds x="866" y="347" width="50" height="50" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="867" y="310" width="48" height="24" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="ExclusiveGateway_1ga27si_di" bpmnElement="ExclusiveGateway_1ga27si" isMarkerVisible="true">
- <dc:Bounds x="866" y="496" width="50" height="50" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="898" y="456" width="82" height="12" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_1xokvq6_di" bpmnElement="SequenceFlow_1xokvq6">
- <di:waypoint xsi:type="dc:Point" x="916" y="372" />
- <di:waypoint xsi:type="dc:Point" x="1097" y="372" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="926" y="353" width="14" height="12" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_172safw_di" bpmnElement="SequenceFlow_172safw">
- <di:waypoint xsi:type="dc:Point" x="891" y="397" />
- <di:waypoint xsi:type="dc:Point" x="891" y="496" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="898" y="396.5" width="18" height="12" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_1wy1aba_di" bpmnElement="SequenceFlow_1wy1aba">
- <di:waypoint xsi:type="dc:Point" x="891" y="546" />
- <di:waypoint xsi:type="dc:Point" x="891" y="677" />
- <di:waypoint xsi:type="dc:Point" x="955" y="677" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="903" y="541.5" width="14" height="12" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_1yltkyg_di" bpmnElement="SequenceFlow_1yltkyg">
- <di:waypoint xsi:type="dc:Point" x="916" y="521" />
- <di:waypoint xsi:type="dc:Point" x="955" y="521" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="915" y="502" width="18" height="12" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_1hcmrh9_di" bpmnElement="SequenceFlow_1hcmrh9">
- <di:waypoint xsi:type="dc:Point" x="1055" y="521" />
- <di:waypoint xsi:type="dc:Point" x="1122" y="521" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1089" y="506" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_1pi168e_di" bpmnElement="SequenceFlow_1pi168e">
- <di:waypoint xsi:type="dc:Point" x="1055" y="677" />
- <di:waypoint xsi:type="dc:Point" x="1147" y="677" />
- <di:waypoint xsi:type="dc:Point" x="1147" y="546" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1101" y="662" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="CallActivity_12rk9t5_di" bpmnElement="Task_1iuumxi">
- <dc:Bounds x="955" y="481" width="100" height="80" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="CallActivity_0l1dvlv_di" bpmnElement="Task_00chyig">
- <dc:Bounds x="955" y="637" width="100" height="80" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_1ucaagl_di" bpmnElement="SequenceFlow_1ucaagl">
- <di:waypoint xsi:type="dc:Point" x="1147" y="332" />
- <di:waypoint xsi:type="dc:Point" x="1147" y="270" />
- <di:waypoint xsi:type="dc:Point" x="1253" y="270" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1162" y="301" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="SubProcess_02vfqr7_di" bpmnElement="SubProcess_02vfqr7" isExpanded="true">
- <dc:Bounds x="-10" y="898" width="382" height="213" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="EndEvent_0m7hpuj_di" bpmnElement="EndEvent_0m7hpuj">
- <dc:Bounds x="293" y="977" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="311" y="1013" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="ScriptTask_0yr3vca_di" bpmnElement="ScriptTask_0yr3vca">
- <dc:Bounds x="120" y="955" width="100" height="80" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="StartEvent_001ol7f_di" bpmnElement="StartEvent_001ol7f">
- <dc:Bounds x="20" y="977" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="38" y="1013" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_1s5yjuu_di" bpmnElement="SequenceFlow_1s5yjuu">
- <di:waypoint xsi:type="dc:Point" x="220" y="995" />
- <di:waypoint xsi:type="dc:Point" x="293" y="995" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="257" y="970" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_01hh1wq_di" bpmnElement="SequenceFlow_01hh1wq">
- <di:waypoint xsi:type="dc:Point" x="56" y="995" />
- <di:waypoint xsi:type="dc:Point" x="120" y="995" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="88" y="980" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="BoundaryEvent_10qmjw0_di" bpmnElement="BoundaryEvent_1mrkh9x">
- <dc:Bounds x="588" y="543" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="606" y="579" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="BoundaryEvent_1n1s1n0_di" bpmnElement="BoundaryEvent_16cracu">
- <dc:Bounds x="668" y="543" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="686" y="579" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_141226w_di" bpmnElement="SequenceFlow_141226w">
- <di:waypoint xsi:type="dc:Point" x="677" y="577" />
- <di:waypoint xsi:type="dc:Point" x="655" y="613" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="666" y="580" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_0b0m3o7_di" bpmnElement="SequenceFlow_0b0m3o7">
- <di:waypoint xsi:type="dc:Point" x="615" y="576" />
- <di:waypoint xsi:type="dc:Point" x="637" y="614" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="626" y="580" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="EndEvent_0yeci14_di" bpmnElement="EndEvent_00y9o8y">
- <dc:Bounds x="628" y="611" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="646" y="647" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="BoundaryEvent_10psbey_di" bpmnElement="BoundaryEvent_1gk4tem">
- <dc:Bounds x="1037" y="543" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1055" y="579" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="BoundaryEvent_0wka4xd_di" bpmnElement="BoundaryEvent_1qaz277">
- <dc:Bounds x="1037" y="619" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1055" y="655" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="EndEvent_0c33uj0_di" bpmnElement="EndEvent_1qfbudr">
- <dc:Bounds x="1089" y="587" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1107" y="623" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_1lr1613_di" bpmnElement="SequenceFlow_1lr1613">
- <di:waypoint xsi:type="dc:Point" x="1068" y="572" />
- <di:waypoint xsi:type="dc:Point" x="1094" y="594" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1081" y="568" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_0np0b8p_di" bpmnElement="SequenceFlow_0np0b8p">
- <di:waypoint xsi:type="dc:Point" x="1070" y="628" />
- <di:waypoint xsi:type="dc:Point" x="1092" y="614" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1081" y="606" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- </bpmndi:BPMNPlane>
- </bpmndi:BPMNDiagram>
-</bpmn:definitions> \ No newline at end of file
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModule.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModule.bpmn
index 6026fc84b3..e08ffbde2f 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModule.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModule.bpmn
@@ -1,12 +1,12 @@
<?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.10.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_Wblj8GyfEeWUWLTvug7ZOg" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="3.7.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
<bpmn2:process id="DoDeleteVfModule" name="DoDeleteVfModule" isExecutable="true">
<bpmn2:scriptTask id="UpdateAAIVfModulePrep" name="UpdateAAIVfModule &#10;Prep" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_0fp1wqz</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_28</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def dvm = new DoDeleteVfModule()
-dvm.prepUpdateAAIVfModule(execution)]]></bpmn2:script>
+dvm.prepUpdateAAIVfModule(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_28" name="" sourceRef="UpdateAAIVfModulePrep" targetRef="InvokeUpdateAAIVfModule" />
<bpmn2:callActivity id="InvokeUpdateAAIVfModule" name="Invoke &#10;UpdateAAIVfModule" calledElement="UpdateAAIVfModule">
@@ -30,7 +30,7 @@ dvm.prepUpdateAAIVfModule(execution)]]></bpmn2:script>
<bpmn2:incoming>SequenceFlow_029ioyr</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_14xn858</bpmn2:outgoing>
</bpmn2:callActivity>
- <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="VNFAdapterPrep" targetRef="InvokeVNFAdapterTask" />
+ <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="VNFAdapterPrep" targetRef="InvokeopenstackAdapterTask" />
<bpmn2:callActivity id="InvokeSDNCAdapterV1_2" name="Invoke &#10;SDNCAdapterV1" calledElement="sdncAdapter">
<bpmn2:extensionElements>
<camunda:out source="WorkflowException" target="WorkflowException" />
@@ -48,22 +48,22 @@ dvm.prepUpdateAAIVfModule(execution)]]></bpmn2:script>
<bpmn2:scriptTask id="VNFAdapterPrep" name="VNFAdapter &#10;Prep" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_14xn858</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def dvm = new DoDeleteVfModule()
-dvm.prepVNFAdapterRequest(execution)]]></bpmn2:script>
+dvm.prepVNFAdapterRequest(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:scriptTask id="SDNCAdapterPrep2" name="SDNCAdapter &#10;Prep" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_31</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_32</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def dvm = new DoDeleteVfModule()
-dvm.prepSDNCAdapterRequest(execution, "delete")]]></bpmn2:script>
+dvm.prepSDNCAdapterRequest(execution, "delete")</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_32" name="" sourceRef="SDNCAdapterPrep2" targetRef="InvokeSDNCAdapterV1_2" />
- <bpmn2:callActivity id="InvokeVNFAdapterTask" name="Invoke&#10;VNFAdapterTask" calledElement="vnfAdapterTask">
+ <bpmn2:callActivity id="InvokeopenstackAdapterTask" name="Invoke&#10;openstackAdapterTask" calledElement="openstackAdapterTask">
<bpmn2:extensionElements>
<camunda:out source="WorkflowException" target="WorkflowException" />
- <camunda:in source="vnfAdapterTaskRequest" target="vnfAdapterTaskRequest" />
+ <camunda:in source="vnfAdapterTaskRequest" target="openstackAdapterTaskRequest" />
<camunda:out source="WorkflowResponse" target="DoDVfMod_doDeleteVfModuleResponse" />
<camunda:in source="mso-request-id" target="mso-request-id" />
<camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
@@ -88,33 +88,33 @@ dvm.prepSDNCAdapterRequest(execution, "delete")]]></bpmn2:script>
<bpmn2:scriptTask id="DeleteAAIVfModulePrep" name="DeleteAAIVfModule &#10;Prep" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_34</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def dvm = new DoDeleteVfModule()
-dvm.prepDeleteAAIVfModule(execution)]]></bpmn2:script>
+dvm.prepDeleteAAIVfModule(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_34" name="" sourceRef="DeleteAAIVfModulePrep" targetRef="InvokeDeleteAAIVfModule" />
<bpmn2:scriptTask id="validateSDNCResponse" name="Validate SDNC Response" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_33</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def dvm = new DoDeleteVfModule()
-dvm.sdncValidateResponse(execution, DoDVfMod_doDeleteVfModuleResponse)]]></bpmn2:script>
+dvm.sdncValidateResponse(execution, DoDVfMod_doDeleteVfModuleResponse)</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_12</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def dvm = new DoDeleteVfModule()
-dvm.preProcessRequest(execution)]]></bpmn2:script>
+dvm.preProcessRequest(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_12" name="" sourceRef="InitializeVariables" targetRef="PrepareUpdateAAIVfModulePrep" />
<bpmn2:scriptTask id="PrepareUpdateAAIVfModulePrep" name="PrepareUpdateAAIVfModule Prep" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_12</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_42</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def dvm = new DoDeleteVfModule()
-dvm.preProcessRequest(execution)]]></bpmn2:script>
+dvm.preProcessRequest(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_42" name="" sourceRef="PrepareUpdateAAIVfModulePrep" targetRef="Task_0h2lui6" />
<bpmn2:startEvent id="StartEvent_1">
@@ -125,16 +125,16 @@ dvm.preProcessRequest(execution)]]></bpmn2:script>
<bpmn2:scriptTask id="DeleteNetworkPoliciesFromAAI" name="Delete Network Policies from AAI" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_0coa90m</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_08g02ch</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def dvm = new DoDeleteVfModule()
-dvm.deleteNetworkPoliciesFromAAI(execution)]]></bpmn2:script>
+dvm.deleteNetworkPoliciesFromAAI(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:scriptTask id="PostProcessVNFAdapterRequest" name="PostProcess VNFAdapter Request" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_1xruki1</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_0coa90m</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def dvm = new DoDeleteVfModule()
-dvm.postProcessVNFAdapterRequest(execution)]]></bpmn2:script>
+dvm.postProcessVNFAdapterRequest(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_0coa90m" sourceRef="PostProcessVNFAdapterRequest" targetRef="DeleteNetworkPoliciesFromAAI" />
<bpmn2:exclusiveGateway id="ExclusiveGateway_1drlnlk" name="need to update VNF in AAI?" default="SequenceFlow_0ep3hjm">
@@ -144,7 +144,7 @@ dvm.postProcessVNFAdapterRequest(execution)]]></bpmn2:script>
</bpmn2:exclusiveGateway>
<bpmn2:sequenceFlow id="SequenceFlow_08g02ch" sourceRef="DeleteNetworkPoliciesFromAAI" targetRef="ExclusiveGateway_1drlnlk" />
<bpmn2:sequenceFlow id="SequenceFlow_1yehsyc" name="yes" sourceRef="ExclusiveGateway_1drlnlk" targetRef="PreProcessUpdateAAIGenericVnf">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable("DoDVfMod_oamManagementV4Address") != null || execution.getVariable("DoDVfMod_oamManagementV6Address") != null]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy">execution.getVariable("DoDVfMod_oamManagementV4Address") != null || execution.getVariable("DoDVfMod_oamManagementV6Address") != null</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:sequenceFlow id="SequenceFlow_1a7lzhz" sourceRef="PreProcessUpdateAAIGenericVnf" targetRef="UpdateAAIGenericVnfTask" />
<bpmn2:exclusiveGateway id="ExclusiveGateway_0lsru7z">
@@ -158,9 +158,9 @@ dvm.postProcessVNFAdapterRequest(execution)]]></bpmn2:script>
<bpmn2:scriptTask id="PreProcessUpdateAAIGenericVnf" name="PreProcess Update AAI Generic VNF" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_1yehsyc</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_1a7lzhz</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doDeleteVfModule = new DoDeleteVfModule()
-doDeleteVfModule.prepUpdateAAIGenericVnf(execution)]]></bpmn2:script>
+doDeleteVfModule.prepUpdateAAIGenericVnf(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:callActivity id="UpdateAAIGenericVnfTask" name="Update AAI Generic VNF" calledElement="UpdateAAIGenericVnf">
<bpmn2:extensionElements>
@@ -177,11 +177,11 @@ doDeleteVfModule.prepUpdateAAIGenericVnf(execution)]]></bpmn2:script>
<bpmn2:scriptTask id="Task_0h2lui6" name="Query AAI for Orchestration Status" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_42</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_029ioyr</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def dvm = new DoDeleteVfModule()
-dvm.queryAAIVfModuleForStatus(execution)]]></bpmn2:script>
+dvm.queryAAIVfModuleForStatus(execution)</bpmn2:script>
</bpmn2:scriptTask>
- <bpmn2:sequenceFlow id="SequenceFlow_1xruki1" sourceRef="InvokeVNFAdapterTask" targetRef="PostProcessVNFAdapterRequest" />
+ <bpmn2:sequenceFlow id="SequenceFlow_1xruki1" sourceRef="InvokeopenstackAdapterTask" targetRef="PostProcessVNFAdapterRequest" />
<bpmn2:sequenceFlow id="SequenceFlow_14xn858" sourceRef="InvokePrepareUpdateAAIVfModule" targetRef="VNFAdapterPrep" />
</bpmn2:process>
<bpmn2:error id="Error_1" name="MSO Workflow Exception" errorCode="MSOWorkflowException" />
@@ -189,240 +189,240 @@ dvm.queryAAIVfModuleForStatus(execution)]]></bpmn2:script>
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoDeleteVfModule">
<bpmndi:BPMNShape id="_BPMNShape_StartEvent_37" bpmnElement="StartEvent_1">
- <dc:Bounds x="34" y="57" width="36" height="36" />
+ <dc:Bounds x="154" y="107" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="52" y="98" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_22" bpmnElement="InitializeVariables">
- <dc:Bounds x="144" y="36" width="100" height="80" />
+ <dc:Bounds x="264" y="86" 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="70" y="75" />
- <di:waypoint xsi:type="dc:Point" x="144" y="76" />
+ <di:waypoint x="190" y="125" />
+ <di:waypoint x="264" y="126" />
<bpmndi:BPMNLabel>
<dc:Bounds x="104" y="0" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_160" bpmnElement="InvokePrepareUpdateAAIVfModule">
- <dc:Bounds x="647" y="36" width="100" height="80" />
+ <dc:Bounds x="767" y="86" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_168" bpmnElement="PrepareUpdateAAIVfModulePrep">
- <dc:Bounds x="315" y="36" width="100" height="80" />
+ <dc:Bounds x="435" y="86" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_ScriptTask_22" targetElement="_BPMNShape_ScriptTask_168">
- <di:waypoint xsi:type="dc:Point" x="244" y="76" />
- <di:waypoint xsi:type="dc:Point" x="315" y="76" />
+ <di:waypoint x="364" y="126" />
+ <di:waypoint x="435" y="126" />
<bpmndi:BPMNLabel>
<dc:Bounds x="269" y="0" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_170" bpmnElement="VNFAdapterPrep">
- <dc:Bounds x="193" y="206" width="100" height="80" />
+ <dc:Bounds x="313" y="256" width="100" height="80" />
</bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="_BPMNShape_CallActivity_13" bpmnElement="InvokeVNFAdapterTask">
- <dc:Bounds x="404" y="206" width="100" height="80" />
+ <bpmndi:BPMNShape id="_BPMNShape_CallActivity_13" bpmnElement="InvokeopenstackAdapterTask">
+ <dc:Bounds x="524" y="256" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_171" bpmnElement="UpdateAAIVfModulePrep">
- <dc:Bounds x="844" y="385" width="100" height="80" />
+ <dc:Bounds x="964" y="435" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_CallActivity_14" bpmnElement="InvokeUpdateAAIVfModule">
- <dc:Bounds x="995" y="385" width="100" height="80" />
+ <dc:Bounds x="1115" y="435" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_28" bpmnElement="SequenceFlow_28" sourceElement="_BPMNShape_ScriptTask_171" targetElement="_BPMNShape_CallActivity_14">
- <di:waypoint xsi:type="dc:Point" x="944" y="425" />
- <di:waypoint xsi:type="dc:Point" x="995" y="425" />
+ <di:waypoint x="1064" y="475" />
+ <di:waypoint x="1115" y="475" />
<bpmndi:BPMNLabel>
<dc:Bounds x="970" y="410" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_172" bpmnElement="SDNCAdapterPrep2">
- <dc:Bounds x="140" y="665" width="100" height="80" />
+ <dc:Bounds x="260" y="715" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_CallActivity_15" bpmnElement="InvokeSDNCAdapterV1_2">
- <dc:Bounds x="272" y="665" width="100" height="80" />
+ <dc:Bounds x="392" y="715" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_173" bpmnElement="DeleteAAIVfModulePrep">
- <dc:Bounds x="547" y="665" width="100" height="80" />
+ <dc:Bounds x="667" y="715" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_CallActivity_16" bpmnElement="InvokeDeleteAAIVfModule">
- <dc:Bounds x="690" y="665" width="100" height="80" />
+ <dc:Bounds x="810" y="715" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_31" bpmnElement="SequenceFlow_31" sourceElement="_BPMNShape_CallActivity_14" targetElement="_BPMNShape_ScriptTask_172">
- <di:waypoint xsi:type="dc:Point" x="1045" y="465" />
- <di:waypoint xsi:type="dc:Point" x="1045" y="603" />
- <di:waypoint xsi:type="dc:Point" x="70" y="603" />
- <di:waypoint xsi:type="dc:Point" x="70" y="705" />
- <di:waypoint xsi:type="dc:Point" x="140" y="705" />
+ <di:waypoint x="1165" y="515" />
+ <di:waypoint x="1165" y="653" />
+ <di:waypoint x="190" y="653" />
+ <di:waypoint x="190" y="755" />
+ <di:waypoint x="260" y="755" />
<bpmndi:BPMNLabel>
<dc:Bounds x="558" y="588" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_32" bpmnElement="SequenceFlow_32" sourceElement="_BPMNShape_ScriptTask_172" targetElement="_BPMNShape_CallActivity_15">
- <di:waypoint xsi:type="dc:Point" x="240" y="705" />
- <di:waypoint xsi:type="dc:Point" x="256" y="705" />
- <di:waypoint xsi:type="dc:Point" x="256" y="706" />
- <di:waypoint xsi:type="dc:Point" x="272" y="706" />
+ <di:waypoint x="360" y="755" />
+ <di:waypoint x="376" y="755" />
+ <di:waypoint x="376" y="756" />
+ <di:waypoint x="392" y="756" />
<bpmndi:BPMNLabel>
<dc:Bounds x="268" y="558" 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="372" y="705" />
- <di:waypoint xsi:type="dc:Point" x="404" y="705" />
+ <di:waypoint x="492" y="755" />
+ <di:waypoint x="524" y="755" />
<bpmndi:BPMNLabel>
<dc:Bounds x="388" y="705" 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="647" y="705" />
- <di:waypoint xsi:type="dc:Point" x="690" y="705" />
+ <di:waypoint x="767" y="755" />
+ <di:waypoint x="810" y="755" />
<bpmndi:BPMNLabel>
<dc:Bounds x="669" y="690" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_EndEvent_169" bpmnElement="EndEvent_9">
- <dc:Bounds x="836" y="687" width="36" height="36" />
+ <dc:Bounds x="956" y="737" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="854" y="728" 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="790" y="705" />
- <di:waypoint xsi:type="dc:Point" x="836" y="705" />
+ <di:waypoint x="910" y="755" />
+ <di:waypoint x="956" y="755" />
<bpmndi:BPMNLabel>
<dc:Bounds x="813" y="690" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_42" bpmnElement="SequenceFlow_42" sourceElement="_BPMNShape_ScriptTask_168" targetElement="_BPMNShape_ScriptTask_160">
- <di:waypoint xsi:type="dc:Point" x="415" y="76" />
- <di:waypoint xsi:type="dc:Point" x="483" y="76" />
+ <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_42" bpmnElement="SequenceFlow_42" sourceElement="_BPMNShape_ScriptTask_168" targetElement="ScriptTask_15vzlxw_di">
+ <di:waypoint x="535" y="126" />
+ <di:waypoint x="603" y="126" />
<bpmndi:BPMNLabel>
<dc:Bounds x="449" y="61" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_ScriptTask_160" targetElement="_BPMNShape_ScriptTask_170">
- <di:waypoint xsi:type="dc:Point" x="293" y="246" />
- <di:waypoint xsi:type="dc:Point" x="404" y="246" />
+ <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_ScriptTask_170" targetElement="_BPMNShape_CallActivity_13">
+ <di:waypoint x="413" y="296" />
+ <di:waypoint x="524" y="296" />
<bpmndi:BPMNLabel>
<dc:Bounds x="349" y="231" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_251" bpmnElement="validateSDNCResponse">
- <dc:Bounds x="404" y="665" width="100" height="80" />
+ <dc:Bounds x="524" y="715" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_251" targetElement="_BPMNShape_ScriptTask_173">
- <di:waypoint xsi:type="dc:Point" x="504" y="705" />
- <di:waypoint xsi:type="dc:Point" x="547" y="705" />
+ <di:waypoint x="624" y="755" />
+ <di:waypoint x="667" y="755" />
<bpmndi:BPMNLabel>
<dc:Bounds x="526" y="690" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ScriptTask_0la8haz_di" bpmnElement="DeleteNetworkPoliciesFromAAI">
- <dc:Bounds x="202" y="385" width="100" height="80" />
+ <dc:Bounds x="322" y="435" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ScriptTask_0lewl6b_di" bpmnElement="PostProcessVNFAdapterRequest">
- <dc:Bounds x="620" y="206" width="100" height="80" />
+ <dc:Bounds x="740" y="256" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0coa90m_di" bpmnElement="SequenceFlow_0coa90m">
- <di:waypoint xsi:type="dc:Point" x="720" y="246" />
- <di:waypoint xsi:type="dc:Point" x="923" y="246" />
- <di:waypoint xsi:type="dc:Point" x="923" y="333" />
- <di:waypoint xsi:type="dc:Point" x="76" y="333" />
- <di:waypoint xsi:type="dc:Point" x="76" y="425" />
- <di:waypoint xsi:type="dc:Point" x="202" y="425" />
+ <di:waypoint x="840" y="296" />
+ <di:waypoint x="1043" y="296" />
+ <di:waypoint x="1043" y="383" />
+ <di:waypoint x="196" y="383" />
+ <di:waypoint x="196" y="475" />
+ <di:waypoint x="322" y="475" />
<bpmndi:BPMNLabel>
<dc:Bounds x="500" y="318" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ExclusiveGateway_1drlnlk_di" bpmnElement="ExclusiveGateway_1drlnlk" isMarkerVisible="true">
- <dc:Bounds x="415" y="400" width="50" height="50" />
+ <dc:Bounds x="535" y="450" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="402" y="362" width="75" height="24" />
+ <dc:Bounds x="523" y="412" width="74" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_08g02ch_di" bpmnElement="SequenceFlow_08g02ch">
- <di:waypoint xsi:type="dc:Point" x="302" y="425" />
- <di:waypoint xsi:type="dc:Point" x="415" y="425" />
+ <di:waypoint x="422" y="475" />
+ <di:waypoint x="535" y="475" />
<bpmndi:BPMNLabel>
<dc:Bounds x="359" y="410" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1yehsyc_di" bpmnElement="SequenceFlow_1yehsyc">
- <di:waypoint xsi:type="dc:Point" x="440" y="450" />
- <di:waypoint xsi:type="dc:Point" x="440" y="517" />
- <di:waypoint xsi:type="dc:Point" x="477" y="517" />
+ <di:waypoint x="560" y="500" />
+ <di:waypoint x="560" y="567" />
+ <di:waypoint x="597" y="567" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="406" y="473" width="18" height="12" />
+ <dc:Bounds x="527" y="523" width="17" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1a7lzhz_di" bpmnElement="SequenceFlow_1a7lzhz">
- <di:waypoint xsi:type="dc:Point" x="577" y="517" />
- <di:waypoint xsi:type="dc:Point" x="624" y="517" />
- <di:waypoint xsi:type="dc:Point" x="624" y="517" />
- <di:waypoint xsi:type="dc:Point" x="654" y="517" />
+ <di:waypoint x="697" y="567" />
+ <di:waypoint x="744" y="567" />
+ <di:waypoint x="744" y="567" />
+ <di:waypoint x="774" y="567" />
<bpmndi:BPMNLabel>
<dc:Bounds x="639" y="517" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ExclusiveGateway_0lsru7z_di" bpmnElement="ExclusiveGateway_0lsru7z" isMarkerVisible="true">
- <dc:Bounds x="759" y="400" width="50" height="50" />
+ <dc:Bounds x="879" y="450" width="50" height="50" />
<bpmndi:BPMNLabel>
<dc:Bounds x="784" y="450" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0ep3hjm_di" bpmnElement="SequenceFlow_0ep3hjm">
- <di:waypoint xsi:type="dc:Point" x="465" y="425" />
- <di:waypoint xsi:type="dc:Point" x="759" y="425" />
+ <di:waypoint x="585" y="475" />
+ <di:waypoint x="879" y="475" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="606" y="400" width="12" height="12" />
+ <dc:Bounds x="726" y="450" width="13" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_14l7olw_di" bpmnElement="SequenceFlow_14l7olw">
- <di:waypoint xsi:type="dc:Point" x="754" y="517" />
- <di:waypoint xsi:type="dc:Point" x="784" y="517" />
- <di:waypoint xsi:type="dc:Point" x="784" y="450" />
+ <di:waypoint x="874" y="567" />
+ <di:waypoint x="904" y="567" />
+ <di:waypoint x="904" y="500" />
<bpmndi:BPMNLabel>
<dc:Bounds x="769" y="502" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0fp1wqz_di" bpmnElement="SequenceFlow_0fp1wqz">
- <di:waypoint xsi:type="dc:Point" x="809" y="425" />
- <di:waypoint xsi:type="dc:Point" x="844" y="425" />
+ <di:waypoint x="929" y="475" />
+ <di:waypoint x="964" y="475" />
<bpmndi:BPMNLabel>
<dc:Bounds x="827" y="400" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ScriptTask_18y0guc_di" bpmnElement="PreProcessUpdateAAIGenericVnf">
- <dc:Bounds x="477" y="477" width="100" height="80" />
+ <dc:Bounds x="597" y="527" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="CallActivity_0kbqf50_di" bpmnElement="UpdateAAIGenericVnfTask">
- <dc:Bounds x="654" y="477" width="100" height="80" />
+ <dc:Bounds x="774" y="527" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_029ioyr_di" bpmnElement="SequenceFlow_029ioyr">
- <di:waypoint xsi:type="dc:Point" x="583" y="76" />
- <di:waypoint xsi:type="dc:Point" x="647" y="76" />
+ <di:waypoint x="703" y="126" />
+ <di:waypoint x="767" y="126" />
<bpmndi:BPMNLabel>
<dc:Bounds x="615" y="61" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ScriptTask_15vzlxw_di" bpmnElement="Task_0h2lui6">
- <dc:Bounds x="483" y="36" width="100" height="80" />
+ <dc:Bounds x="603" y="86" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1xruki1_di" bpmnElement="SequenceFlow_1xruki1">
- <di:waypoint xsi:type="dc:Point" x="504" y="246" />
- <di:waypoint xsi:type="dc:Point" x="620" y="246" />
+ <di:waypoint x="624" y="296" />
+ <di:waypoint x="740" y="296" />
<bpmndi:BPMNLabel>
<dc:Bounds x="562" y="231" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_14xn858_di" bpmnElement="SequenceFlow_14xn858">
- <di:waypoint xsi:type="dc:Point" x="747" y="76" />
- <di:waypoint xsi:type="dc:Point" x="914" y="76" />
- <di:waypoint xsi:type="dc:Point" x="914" y="154" />
- <di:waypoint xsi:type="dc:Point" x="71" y="154" />
- <di:waypoint xsi:type="dc:Point" x="71" y="246" />
- <di:waypoint xsi:type="dc:Point" x="193" y="246" />
+ <di:waypoint x="867" y="126" />
+ <di:waypoint x="1034" y="126" />
+ <di:waypoint x="1034" y="204" />
+ <di:waypoint x="191" y="204" />
+ <di:waypoint x="191" y="296" />
+ <di:waypoint x="313" y="296" />
<bpmndi:BPMNLabel>
<dc:Bounds x="493" y="139" width="0" height="0" />
</bpmndi:BPMNLabel>
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModuleFromVnf.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModuleFromVnf.bpmn
index 918964f8f8..2dcf79ec8b 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModuleFromVnf.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModuleFromVnf.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="_Wblj8GyfEeWUWLTvug7ZOg" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.10.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_Wblj8GyfEeWUWLTvug7ZOg" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="3.7.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="InvokeVNFAdapter" />
<bpmn2:callActivity id="callSDNCAdapterTopologyUnassign" name="Call SDNC Adapter Topology Unassign" calledElement="sdncAdapter">
@@ -19,22 +19,22 @@
<bpmn2:scriptTask id="VNFAdapterPrep" name="VNFAdapter &#10;&#10;Prep" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_0kx9e3s</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def ddvmfv = new DoDeleteVfModuleFromVnf()
-ddvmfv.prepVNFAdapterRequest(execution)]]></bpmn2:script>
+ddvmfv.prepVNFAdapterRequest(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:scriptTask id="SDNCAdapterPrep2" name="SDNCAdapter &#10;&#10;Prep" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_0ltm4jt</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_32</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def ddvmfv = new DoDeleteVfModuleFromVnf()
-ddvmfv.preProcessSDNCUnassignRequest(execution)]]></bpmn2:script>
+ddvmfv.preProcessSDNCUnassignRequest(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_32" name="" sourceRef="SDNCAdapterPrep2" targetRef="callSDNCAdapterTopologyUnassign" />
- <bpmn2:callActivity id="InvokeVNFAdapter" name="Invoke&#10;&#10;VNFAdapter" calledElement="vnfAdapterTask">
+ <bpmn2:callActivity id="InvokeVNFAdapter" name="Invoke&#10;&#10;VNFAdapter" calledElement="openstackAdapterTask">
<bpmn2:extensionElements>
<camunda:out source="WorkflowException" target="WorkflowException" />
- <camunda:in source="vnfAdapterTaskRequest" target="vnfAdapterTaskRequest" />
+ <camunda:in source="vnfAdapterTaskRequest" target="openstackAdapterTaskRequest" />
<camunda:out source="WorkflowResponse" 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" />
@@ -48,33 +48,33 @@ ddvmfv.preProcessSDNCUnassignRequest(execution)]]></bpmn2:script>
<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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def ddvmfv = new DoDeleteVfModuleFromVnf()
String response = execution.getVariable("DDVMFV_deactivateSDNCAdapterResponse")
-ddvmfv.validateSDNCResponse(execution, response, "unassign")]]></bpmn2:script>
+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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def ddvmfv = new DoDeleteVfModuleFromVnf()
-ddvmfv.preProcessRequest(execution)]]></bpmn2:script>
+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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def ddvmfv = new DoDeleteVfModuleFromVnf()
-ddvmfv.deleteNetworkPoliciesFromAAI(execution)]]></bpmn2:script>
+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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def ddvmfv = new DoDeleteVfModuleFromVnf()
-ddvmfv.postProcessVNFAdapterRequest(execution)]]></bpmn2:script>
+ddvmfv.postProcessVNFAdapterRequest(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_0coa90m" sourceRef="PostProcessVNFAdapterRequest" targetRef="DeleteNetworkPoliciesFromAAI" />
<bpmn2:startEvent id="StartEvent_1">
@@ -88,9 +88,9 @@ ddvmfv.postProcessVNFAdapterRequest(execution)]]></bpmn2:script>
<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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def ddvmfv = new DoDeleteVfModuleFromVnf()
-ddvmfv.preProcessSDNCDeactivateRequest(execution)]]></bpmn2:script>
+ddvmfv.preProcessSDNCDeactivateRequest(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:callActivity id="callSDNCAdapterTopologyDeactivate" name="Call SDNC Adapter Topology Deactivate" calledElement="sdncAdapter">
<bpmn2:extensionElements>
@@ -108,27 +108,27 @@ ddvmfv.preProcessSDNCDeactivateRequest(execution)]]></bpmn2:script>
<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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def ddvmfv = new DoDeleteVfModuleFromVnf()
String response = execution.getVariable("DDVMFV_deactivateSDNCAdapterResponse")
-ddvmfv.validateSDNCResponse(execution, response, "deactivate")]]></bpmn2:script>
+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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def ddvmfv = new DoDeleteVfModuleFromVnf()
-ddvmfv.queryAAIForVfModule(execution)]]></bpmn2:script>
+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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def ddvmfv = new DoDeleteVfModuleFromVnf()
-ddvmfv.validateVfModule(execution)]]></bpmn2:script>
+ddvmfv.validateVfModule(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:subProcess id="SubProcess_1r8unf9" name="Sub-process for UnexpectedErrors" triggeredByEvent="true">
<bpmn2:startEvent id="StartEvent_1ebrix6">
@@ -141,9 +141,9 @@ ddvmfv.validateVfModule(execution)]]></bpmn2:script>
<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.onap.so.bpmn.common.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.common.scripts.*
ExceptionUtil ex = new ExceptionUtil()
-ex.processJavaException(execution)]]></bpmn2:script>
+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" />
@@ -161,9 +161,9 @@ ex.processJavaException(execution)]]></bpmn2:script>
<bpmn2:scriptTask id="DeleteAAIVfModulePrep" name="DeleteAAIVfModule &#10;&#10;Prep" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_092kvy3</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def ddvmfv = new DoDeleteVfModuleFromVnf()
-ddvmfv.prepDeleteAAIVfModule(execution)]]></bpmn2:script>
+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" />
@@ -174,218 +174,218 @@ ddvmfv.prepDeleteAAIVfModule(execution)]]></bpmn2:script>
<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" />
+ <dc:Bounds x="264" y="86" 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" />
+ <di:waypoint x="190" y="125" />
+ <di:waypoint x="264" y="126" />
<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" />
+ <dc:Bounds x="245" y="380" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_CallActivity_13" bpmnElement="InvokeVNFAdapter">
- <dc:Bounds x="281" y="330" width="100" height="80" />
+ <dc:Bounds x="401" y="380" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_172" bpmnElement="SDNCAdapterPrep2">
- <dc:Bounds x="129" y="487" width="100" height="80" />
+ <dc:Bounds x="249" y="537" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_CallActivity_15" bpmnElement="callSDNCAdapterTopologyUnassign">
- <dc:Bounds x="281" y="487" width="100" height="80" />
+ <dc:Bounds x="401" y="537" 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" />
+ <di:waypoint x="349" y="577" />
+ <di:waypoint x="401" y="578" />
<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" />
+ <di:waypoint x="501" y="577" />
+ <di:waypoint x="545" y="577" />
<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" />
+ <dc:Bounds x="993" y="559" 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:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_4" targetElement="_BPMNShape_CallActivity_13">
+ <di:waypoint x="345" y="420" />
+ <di:waypoint x="401" y="420" />
<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" />
+ <dc:Bounds x="545" y="537" 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" />
+ <di:waypoint x="645" y="577" />
+ <di:waypoint x="668" y="577" />
+ <di:waypoint x="668" y="577" />
+ <di:waypoint x="690" y="577" />
<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" />
+ <dc:Bounds x="701" y="380" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ScriptTask_0lewl6b_di" bpmnElement="PostProcessVNFAdapterRequest">
- <dc:Bounds x="430" y="330" width="100" height="80" />
+ <dc:Bounds x="550" y="380" 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" />
+ <di:waypoint x="650" y="420" />
+ <di:waypoint x="701" y="420" />
<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" />
+ <dc:Bounds x="154" y="107" 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" />
+ <di:waypoint x="388" y="269" />
+ <di:waypoint x="408" y="269" />
+ <di:waypoint x="408" y="269" />
+ <di:waypoint x="436" y="269" />
<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" />
+ <di:waypoint x="536" y="269" />
+ <di:waypoint x="584" y="269" />
<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" />
+ <di:waypoint x="501" y="420" />
+ <di:waypoint x="550" y="420" />
<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" />
+ <di:waypoint x="684" y="269" />
+ <di:waypoint x="883" y="269" />
+ <di:waypoint x="883" y="343" />
+ <di:waypoint x="159" y="343" />
+ <di:waypoint x="159" y="420" />
+ <di:waypoint x="245" y="420" />
<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" />
+ <di:waypoint x="801" y="420" />
+ <di:waypoint x="879" y="420" />
+ <di:waypoint x="879" y="492" />
+ <di:waypoint x="171" y="492" />
+ <di:waypoint x="171" y="577" />
+ <di:waypoint x="249" y="577" />
<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" />
+ <dc:Bounds x="288" y="229" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="CallActivity_0xpc0da_di" bpmnElement="callSDNCAdapterTopologyDeactivate">
- <dc:Bounds x="316" y="179" width="100" height="80" />
+ <dc:Bounds x="436" y="229" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ScriptTask_1kkyngh_di" bpmnElement="postProcessSDNCDeactivateRequest">
- <dc:Bounds x="464" y="179" width="100" height="80" />
+ <dc:Bounds x="584" y="229" 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" />
+ <di:waypoint x="364" y="126" />
+ <di:waypoint x="436" y="126" />
<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" />
+ <di:waypoint x="536" y="126" />
+ <di:waypoint x="593" y="126" />
<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" />
+ <dc:Bounds x="436" y="86" 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" />
+ <di:waypoint x="693" y="126" />
+ <di:waypoint x="880" y="126" />
+ <di:waypoint x="880" y="195" />
+ <di:waypoint x="154" y="195" />
+ <di:waypoint x="154" y="268" />
+ <di:waypoint x="288" y="269" />
<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" />
+ <dc:Bounds x="593" y="86" 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" />
+ <dc:Bounds x="163" y="672" 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" />
+ <dc:Bounds x="231" y="739" 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" />
+ <dc:Bounds x="524" y="739" 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" />
+ <dc:Bounds x="335" y="717" 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" />
+ <di:waypoint x="267" y="757" />
+ <di:waypoint x="335" y="757" />
<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" />
+ <di:waypoint x="435" y="757" />
+ <di:waypoint x="524" y="757" />
<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" />
+ <dc:Bounds x="833" y="537" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ScriptTask_1rcw5x3_di" bpmnElement="DeleteAAIVfModulePrep">
- <dc:Bounds x="570" y="487" width="100" height="80" />
+ <dc:Bounds x="690" y="537" 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" />
+ <di:waypoint x="790" y="577" />
+ <di:waypoint x="833" y="577" />
<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" />
+ <di:waypoint x="933" y="577" />
+ <di:waypoint x="993" y="577" />
<bpmndi:BPMNLabel>
<dc:Bounds x="843" y="502" width="0" height="0" />
</bpmndi:BPMNLabel>
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModuleVolumeV2.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModuleVolumeV2.bpmn
index e7706c20e6..6a44a117c1 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModuleVolumeV2.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVfModuleVolumeV2.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="3.7.0">
<bpmn:process id="DoDeleteVfModuleVolumeV2" name="DoDeleteVfModuleVolumeV2" isExecutable="true">
<bpmn:startEvent id="StartEvent_1" name="Start">
<bpmn:outgoing>SequenceFlow_1gvfdp4</bpmn:outgoing>
@@ -7,27 +7,27 @@
<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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
def delVfModuleVol = new DoDeleteVfModuleVolumeV2()
-delVfModuleVol.executeMethod('callRESTQueryAAICloudRegion', execution, isDebugLogEnabled)]]></bpmn:script>
+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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
def deleteVfMod = new DoDeleteVfModuleVolumeV2()
-deleteVfMod.executeMethod('callRESTQueryAAIForVolumeGroup', execution, isDebugLogEnabled)]]></bpmn:script>
+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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
def deleteVfMod = new DoDeleteVfModuleVolumeV2()
-deleteVfMod.executeMethod('prepareVnfAdapterDeleteRequest', execution, isDebugLogEnabled)]]></bpmn:script>
+deleteVfMod.executeMethod('prepareVnfAdapterDeleteRequest', execution, isDebugLogEnabled)</bpmn:script>
</bpmn:scriptTask>
- <bpmn:callActivity id="Task_14fsstq" name="Call REST VNF Adapter Delete" calledElement="vnfAdapterTask">
+ <bpmn:callActivity id="Task_14fsstq" name="Call REST VNF Adapter Delete" calledElement="openstackAdapterTask">
<bpmn:extensionElements>
- <camunda:in source="DDVMV_deleteVnfARequest" target="vnfAdapterTaskRequest" />
+ <camunda:in source="DDVMV_deleteVnfARequest" target="openstackAdapterTaskRequest" />
<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="WorkflowResponse" target="DDVMV_deleteVnfAResponse" />
@@ -40,9 +40,9 @@ deleteVfMod.executeMethod('prepareVnfAdapterDeleteRequest', execution, isDebugLo
<bpmn:scriptTask id="Task_17q1roq" name="Call REST AAI Delete Volume Group" scriptFormat="groovy">
<bpmn:incoming>SequenceFlow_04zsr0f</bpmn:incoming>
<bpmn:outgoing>SequenceFlow_13c3cv2</bpmn:outgoing>
- <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
def deleteVfMod = new DoDeleteVfModuleVolumeV2()
-deleteVfMod.executeMethod('callRESTDeleteAAIVolumeGroup', execution, isDebugLogEnabled)]]></bpmn:script>
+deleteVfMod.executeMethod('callRESTDeleteAAIVolumeGroup', execution, isDebugLogEnabled)</bpmn:script>
</bpmn:scriptTask>
<bpmn:endEvent id="EndEvent_0fw1gkf" name="Stop">
<bpmn:incoming>SequenceFlow_1sgtwr2</bpmn:incoming>
@@ -53,19 +53,19 @@ deleteVfMod.executeMethod('callRESTDeleteAAIVolumeGroup', execution, isDebugLogE
<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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
def deleteVfMod = new DoDeleteVfModuleVolumeV2()
deleteVfMod.executeMethod('preProcessRequest', execution, isDebugLogEnabled)
-]]></bpmn:script>
+</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: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.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
def deleteVfMod = new DoDeleteVfModuleVolumeV2()
-deleteVfMod.executeMethod('postProcess', execution, isDebugLogEnabled)]]></bpmn:script>
+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" />
@@ -102,22 +102,22 @@ deleteVfMod.executeMethod('postProcess', execution, isDebugLogEnabled)]]></bpmn:
</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" />
+ <di:waypoint x="507" y="120" />
+ <di:waypoint 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" />
+ <di:waypoint x="664" y="120" />
+ <di:waypoint 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" />
+ <di:waypoint x="813" y="120" />
+ <di:waypoint x="865" y="120" />
<bpmndi:BPMNLabel>
<dc:Bounds x="839" y="95" width="0" height="0" />
</bpmndi:BPMNLabel>
@@ -126,15 +126,15 @@ deleteVfMod.executeMethod('postProcess', execution, isDebugLogEnabled)]]></bpmn:
<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" />
+ <di:waypoint x="209" y="120" />
+ <di:waypoint 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" />
+ <di:waypoint x="347" y="120" />
+ <di:waypoint x="407" y="120" />
<bpmndi:BPMNLabel>
<dc:Bounds x="377" y="95" width="0" height="0" />
</bpmndi:BPMNLabel>
@@ -143,22 +143,22 @@ deleteVfMod.executeMethod('postProcess', execution, isDebugLogEnabled)]]></bpmn:
<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" />
+ <di:waypoint x="1251" y="120" />
+ <di:waypoint 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" />
+ <di:waypoint x="1398" y="120" />
+ <di:waypoint x="1463" y="120" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1431" y="95" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_04zsr0f_di" bpmnElement="SequenceFlow_04zsr0f">
- <di:waypoint xsi:type="dc:Point" x="965" y="120" />
- <di:waypoint xsi:type="dc:Point" x="1151" y="120" />
+ <di:waypoint x="965" y="120" />
+ <di:waypoint x="1151" y="120" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1058" y="99" width="0" height="12" />
</bpmndi:BPMNLabel>
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateNetworkInstance.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateNetworkInstance.bpmn
index b82b1da951..ede63eafac 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateNetworkInstance.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateNetworkInstance.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="1.10.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_MagIIMOUEeW8asg-vCEgWQ" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="3.7.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
<bpmn2:process id="DoUpdateNetworkInstance" name="DoUpdateNetworkInstance" isExecutable="true">
<bpmn2:startEvent id="updateNetwork_startEvent" name="Start Flow">
<bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
@@ -8,18 +8,18 @@
<bpmn2:scriptTask id="prepareSDNCTopoRequest_ScriptTask" name="Prepare SDNC Topology Request" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_32</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_11</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
DoUpdateNetworkInstance.prepareSDNCRequest(execution)
-]]></bpmn2:script>
+</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_11" name="" sourceRef="prepareSDNCTopoRequest_ScriptTask" targetRef="callAssignSDNCAdapter_CallActivity" />
<bpmn2:scriptTask id="validateSDNCResponse_ScriptTask" name="Validate SDNC Response" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_12</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
-DoUpdateNetworkInstance.validateSDNCResponse(execution)]]></bpmn2:script>
+DoUpdateNetworkInstance.validateSDNCResponse(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:exclusiveGateway id="isSdncTopoOk_ExclusiveGateway" name="Is SDNC Ok?" default="sdncTopoNo_SequenceFlow">
<bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>
@@ -28,7 +28,7 @@ DoUpdateNetworkInstance.validateSDNCResponse(execution)]]></bpmn2:script>
</bpmn2:exclusiveGateway>
<bpmn2:sequenceFlow id="sdncTopoNo_SequenceFlow" name="No" sourceRef="isSdncTopoOk_ExclusiveGateway" targetRef="sndcError_EndEvent" />
<bpmn2:sequenceFlow id="sdncTopoYes_SequenceFlow" name="Yes" sourceRef="isSdncTopoOk_ExclusiveGateway" targetRef="callRESTReQuery1NetworkID_ScriptTask">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("UPDNETI_sdncResponseSuccess" ) == true}]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("UPDNETI_sdncResponseSuccess" ) == true}</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="validateSDNCResponse_ScriptTask" targetRef="isSdncTopoOk_ExclusiveGateway" />
<bpmn2:boundaryEvent id="BoundaryEvent_4" name="" attachedToRef="validateSDNCResponse_ScriptTask">
@@ -59,9 +59,9 @@ DoUpdateNetworkInstance.validateSDNCResponse(execution)]]></bpmn2:script>
<bpmn2:scriptTask id="postProcessAndCompletionRequest_ScriptTask" name="Post Process Response" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_46</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_29</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
-DoUpdateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script>
+DoUpdateNetworkInstance.postProcessResponse(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_29" name="" sourceRef="postProcessAndCompletionRequest_ScriptTask" targetRef="EndEvent_3" />
<bpmn2:subProcess id="subProcessException_SubProcess" name="Subprocess For Exception" triggeredByEvent="true">
@@ -71,7 +71,7 @@ DoUpdateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script>
<bpmn2:outgoing>isRollbackOn_NoNetwork_SequenceFlow</bpmn2:outgoing>
</bpmn2:exclusiveGateway>
<bpmn2:sequenceFlow id="isRollbackOn_YesNetwork_SequenceFlow" name="Yes" sourceRef="isRollbackOn_Network_ExclusiveGateway" targetRef="isPONR_ExclusiveGateway">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("UPDNETI_rollbackEnabled") == true}]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("UPDNETI_rollbackEnabled") == true}</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:sequenceFlow id="isRollbackOn_NoNetwork_SequenceFlow" name="No" sourceRef="isRollbackOn_Network_ExclusiveGateway" targetRef="ExclusiveGateway_1dcb5p2" />
<bpmn2:startEvent id="subProcessStart_StartEvent" name="Fault Start">
@@ -85,7 +85,7 @@ DoUpdateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script>
<bpmn2:outgoing>isPONR_No_SequenceFlow</bpmn2:outgoing>
</bpmn2:exclusiveGateway>
<bpmn2:sequenceFlow id="isPONR_Yes_SequenceFlow" name="Yes" sourceRef="isPONR_ExclusiveGateway" targetRef="ExclusiveGateway_1dcb5p2">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("UPDNETI_isPONR") == true}]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("UPDNETI_isPONR") == true}</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:sequenceFlow id="isPONR_No_SequenceFlow" name="No" sourceRef="isPONR_ExclusiveGateway" targetRef="ExclusiveGateway_1dcb5p2" />
<bpmn2:exclusiveGateway id="sdncOk_ExclusiveGateway" name="is Sdnc Ok?" default="sdncOk_No_ExclusiveGateway">
@@ -94,15 +94,15 @@ DoUpdateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script>
<bpmn2:outgoing>sdncOk_No_ExclusiveGateway</bpmn2:outgoing>
</bpmn2:exclusiveGateway>
<bpmn2:sequenceFlow id="sdncOk_Yeso_ExclusiveGateway" name="Yes" sourceRef="sdncOk_ExclusiveGateway" targetRef="prepareSDNCRollbackRequest_ScriptTask">
- <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("UPDNETI_isSdncRollbackNeeded" ) == true}]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{execution.getVariable("UPDNETI_isSdncRollbackNeeded" ) == true}</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:sequenceFlow id="sdncOk_No_ExclusiveGateway" name="No" sourceRef="sdncOk_ExclusiveGateway" targetRef="InclusiveGateway_6" />
<bpmn2:scriptTask id="prepareSDNCRollbackRequest_ScriptTask" name="Prepare SDNCRollback Request" scriptFormat="groovy">
<bpmn2:incoming>sdncOk_Yeso_ExclusiveGateway</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_53</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
-DoUpdateNetworkInstance.prepareSDNCRollbackRequest(execution)]]></bpmn2:script>
+DoUpdateNetworkInstance.prepareSDNCRollbackRequest(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_53" name="" sourceRef="prepareSDNCRollbackRequest_ScriptTask" targetRef="InclusiveGateway_6" />
<bpmn2:endEvent id="EndEvent_4">
@@ -117,37 +117,17 @@ DoUpdateNetworkInstance.prepareSDNCRollbackRequest(execution)]]></bpmn2:script>
<bpmn2:sequenceFlow id="SequenceFlow_47" name="" sourceRef="InclusiveGateway_6" targetRef="ScriptTask_1p6n2yy" />
<bpmn2:scriptTask id="ScriptTask_1p6n2yy" name="Prepare RollbackData" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_47</bpmn2:incoming>
- <bpmn2:outgoing>SequenceFlow_0qr4es6</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
-DoUpdateNetworkInstance.prepareRollbackData(execution)]]></bpmn2:script>
+DoUpdateNetworkInstance.prepareRollbackData(execution)</bpmn2:script>
</bpmn2:scriptTask>
- <bpmn2:callActivity id="CallActivity_1kid5y0" name="DoUpdate&#10;NetworkInstanceRollback&#10;" calledElement="DoCreateNetworkInstanceRollback">
- <bpmn2:extensionElements>
- <camunda:in source="msoRequestId" target="msoRequestId" />
- <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
- <camunda:in source="serviceInstanceId" target="serviceInstanceId" />
- <camunda:in source="rollbackData" target="rollbackData" />
- <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="WorkflowException" target="WorkflowException" />
- <camunda:in source="sdncVersion" target="sdncVersion" />
- <camunda:out source="wasDeleted" target="wasDeleted" />
- <camunda:out source="rolledBack" target="rolledBack" />
- <camunda:out source="WorkflowException" target="WorkflowException" />
- <camunda:out source="workflowException" target="workflowException" />
- <camunda:in source="SavedWorkflowException1" target="SavedWorkflowException1" />
- </bpmn2:extensionElements>
- <bpmn2:incoming>SequenceFlow_0qr4es6</bpmn2:incoming>
- </bpmn2:callActivity>
<bpmn2:scriptTask id="ScriptTask_0voqz6r" name="Post Process Response" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_0ze5k6c</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_04rdjfi</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
-DoUpdateNetworkInstance.postProcessResponse(execution)]]></bpmn2:script>
+DoUpdateNetworkInstance.postProcessResponse(execution)</bpmn2:script>
</bpmn2:scriptTask>
- <bpmn2:sequenceFlow id="SequenceFlow_0qr4es6" sourceRef="ScriptTask_1p6n2yy" targetRef="CallActivity_1kid5y0" />
<bpmn2:sequenceFlow id="SequenceFlow_04rdjfi" sourceRef="ScriptTask_0voqz6r" targetRef="EndEvent_4" />
<bpmn2:exclusiveGateway id="ExclusiveGateway_1kjh92x" name="is &#39;1702&#39; SNDC Call?">
<bpmn2:outgoing>SequenceFlow_0nrc66n</bpmn2:outgoing>
@@ -155,14 +135,14 @@ 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") != '1610'} ]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{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>
<bpmn2:outgoing>SequenceFlow_053re4q</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
-DoUpdateNetworkInstance.setExceptionFlag(execution)]]></bpmn2:script>
+DoUpdateNetworkInstance.setExceptionFlag(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_053re4q" sourceRef="ScriptTask_1gedbow" targetRef="isRollbackOn_Network_ExclusiveGateway" />
<bpmn2:inclusiveGateway id="ExclusiveGateway_1dcb5p2">
@@ -172,24 +152,21 @@ DoUpdateNetworkInstance.setExceptionFlag(execution)]]></bpmn2:script>
<bpmn2:outgoing>SequenceFlow_0ze5k6c</bpmn2:outgoing>
</bpmn2:inclusiveGateway>
<bpmn2:sequenceFlow id="SequenceFlow_0ze5k6c" sourceRef="ExclusiveGateway_1dcb5p2" targetRef="ScriptTask_0voqz6r" />
- <bpmn2:textAnnotation id="TextAnnotation_0qx19b9"> <bpmn2:text>Note: Rollback is not needed for UpdateNetwork,</bpmn2:text>
-</bpmn2:textAnnotation>
- <bpmn2:association id="Association_10dk4x3" sourceRef="CallActivity_1kid5y0" targetRef="TextAnnotation_0qx19b9" />
</bpmn2:subProcess>
<bpmn2:scriptTask id="callRESTReQuery2NetworkID_ScriptTask" name="Call REST ReQuery2 Network Id in AAI" scriptFormat="groovy">
- <bpmn2:incoming>SequenceFlow_13</bpmn2:incoming>
+ <bpmn2:incoming>Flow_1eutzkj</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_35</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
-DoUpdateNetworkInstance.callRESTReQueryAAINetworkId(execution)]]></bpmn2:script>
+DoUpdateNetworkInstance.callRESTReQueryAAINetworkId(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_35" name="" sourceRef="callRESTReQuery2NetworkID_ScriptTask" targetRef="callRESTUpdateContrailNetwork_ScriptTask" />
<bpmn2:scriptTask id="callRESTUpdateContrailNetwork_ScriptTask" name="Call REST Update Contrail Network in AAI" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_35</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_46</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
-DoUpdateNetworkInstance.callRESTUpdateContrailAAINetwork(execution)]]></bpmn2:script>
+DoUpdateNetworkInstance.callRESTUpdateContrailAAINetwork(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_46" name="PONR" sourceRef="callRESTUpdateContrailNetwork_ScriptTask" targetRef="postProcessAndCompletionRequest_ScriptTask" />
<bpmn2:endEvent id="EndEvent_3">
@@ -199,9 +176,9 @@ DoUpdateNetworkInstance.callRESTUpdateContrailAAINetwork(execution)]]></bpmn2:sc
<bpmn2:scriptTask id="ScriptTask_1" name="Log / Print Unexpected Error" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_10</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
-DoUpdateNetworkInstance.processJavaException(execution)]]></bpmn2:script>
+DoUpdateNetworkInstance.processJavaException(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_14" name="" sourceRef="ScriptTask_1" targetRef="EndEvent_1" />
<bpmn2:startEvent id="StartEvent_1">
@@ -216,570 +193,518 @@ DoUpdateNetworkInstance.processJavaException(execution)]]></bpmn2:script>
<bpmn2:scriptTask id="preProcessRequest_ScriptTask" name="PreProcess Incoming Request" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
DoUpdateNetworkInstance.preProcessRequest(execution)
-]]></bpmn2:script>
+</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="preProcessRequest_ScriptTask" targetRef="callGetServiceInstance" />
<bpmn2:scriptTask id="callRESTQueryCloudRegion_ScriptTask" name="Call REST Query Cloud Region " scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_24</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_32</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
-DoUpdateNetworkInstance.callRESTQueryAAICloudRegion(execution)]]></bpmn2:script>
+DoUpdateNetworkInstance.callRESTQueryAAICloudRegion(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_32" name="" sourceRef="callRESTQueryCloudRegion_ScriptTask" targetRef="prepareSDNCTopoRequest_ScriptTask" />
<bpmn2:scriptTask id="callRESTQueryNetworkId_ScriptTask" name="Call REST Query Network Id In AAI" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_24</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
-DoUpdateNetworkInstance.callRESTQueryAAINetworkId(execution)]]></bpmn2:script>
+DoUpdateNetworkInstance.callRESTQueryAAINetworkId(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_24" name="" sourceRef="callRESTQueryNetworkId_ScriptTask" targetRef="callRESTQueryCloudRegion_ScriptTask" />
<bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="callGetServiceInstance" targetRef="callRESTQueryNetworkId_ScriptTask" />
- <bpmn2:scriptTask id="validateUpdatePONetwork_ScriptTask" name="Validate Update PO Network" scriptFormat="groovy">
- <bpmn2:incoming>SequenceFlow_59</bpmn2:incoming>
- <bpmn2:outgoing>SequenceFlow_13</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
-def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
-DoUpdateNetworkInstance.validateUpdateNetworkResponse(execution)]]></bpmn2:script>
- </bpmn2:scriptTask>
- <bpmn2:sequenceFlow id="SequenceFlow_13" name="" sourceRef="validateUpdatePONetwork_ScriptTask" targetRef="callRESTReQuery2NetworkID_ScriptTask" />
- <bpmn2:serviceTask id="callUpdateNetwork_ServiceTask" name="Call Update Network">
- <bpmn2:extensionElements>
- <camunda:connector>
- <camunda:inputOutput>
- <camunda:inputParameter name="payload">${UPDNETI_updateNetworkRequest}</camunda:inputParameter>
- <camunda:inputParameter name="url"><![CDATA[${UrnPropertiesReader.getVariable("mso.adapters.network.rest.endpoint", execution)}/${UPDNETI_networkId}
-]]></camunda:inputParameter>
- <camunda:inputParameter name="headers">
- <camunda:map>
- <camunda:entry key="Authorization">#{BasicAuthHeaderValuePO}</camunda:entry>
- <camunda:entry key="content-type">application/xml</camunda:entry>
- </camunda:map>
- </camunda:inputParameter>
- <camunda:inputParameter name="method">PUT</camunda:inputParameter>
- <camunda:outputParameter name="UPDNETI_networkReturnCode">${statusCode}</camunda:outputParameter>
- <camunda:outputParameter name="UPDNETI_updateNetworkResponse">${response}</camunda:outputParameter>
- </camunda:inputOutput>
- <camunda:connectorId>http-connector</camunda:connectorId>
- </camunda:connector>
- </bpmn2:extensionElements>
- <bpmn2:incoming>SequenceFlow_61</bpmn2:incoming>
- <bpmn2:outgoing>SequenceFlow_59</bpmn2:outgoing>
- </bpmn2:serviceTask>
- <bpmn2:sequenceFlow id="SequenceFlow_59" name="" sourceRef="callUpdateNetwork_ServiceTask" targetRef="validateUpdatePONetwork_ScriptTask" />
<bpmn2:scriptTask id="prepareNetworkRequest_ScriptTask" name="Prepare Create Network Request" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_61</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
DoUpdateNetworkInstance.prepareUpdateNetworkRequest(execution)
-]]></bpmn2:script>
+</bpmn2:script>
</bpmn2:scriptTask>
- <bpmn2:sequenceFlow id="SequenceFlow_61" name="" sourceRef="prepareNetworkRequest_ScriptTask" targetRef="callUpdateNetwork_ServiceTask" />
+ <bpmn2:sequenceFlow id="SequenceFlow_61" name="" sourceRef="prepareNetworkRequest_ScriptTask" targetRef="openstackAdapterTask" />
<bpmn2:scriptTask id="callRESTQueryNetworkTableRef_ScriptTask" name="Call REST Query Network TableRef in AAI" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_38</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
-DoUpdateNetworkInstance.callRESTQueryAAINetworkTableRef(execution)]]></bpmn2:script>
+DoUpdateNetworkInstance.callRESTQueryAAINetworkTableRef(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="callRESTQueryNetworkTableRef_ScriptTask" targetRef="prepareNetworkRequest_ScriptTask" />
<bpmn2:scriptTask id="callRESTReQuery1NetworkID_ScriptTask" name="Call REST ReQuery1 Network Id in AAI" scriptFormat="groovy">
<bpmn2:incoming>sdncTopoYes_SequenceFlow</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
-DoUpdateNetworkInstance.callRESTReQueryAAINetworkId(execution)]]></bpmn2:script>
+DoUpdateNetworkInstance.callRESTReQueryAAINetworkId(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="callRESTReQuery1NetworkID_ScriptTask" targetRef="callRESTQueryVpnBinding_ScriptTask" />
<bpmn2:scriptTask id="callRESTQueryVpnBinding_ScriptTask" name="Call REST Query Vpn Binding in AAI" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_6</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_15</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
-DoUpdateNetworkInstance.callRESTQueryAAINetworkVpnBinding(execution)]]></bpmn2:script>
+DoUpdateNetworkInstance.callRESTQueryAAINetworkVpnBinding(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_15" name="" sourceRef="callRESTQueryVpnBinding_ScriptTask" targetRef="callRESTQueryNetworkPolicy_ScriptTask" />
<bpmn2:scriptTask id="callRESTQueryNetworkPolicy_ScriptTask" name="Call REST Query Network Policy in AAI" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_15</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_38</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
-DoUpdateNetworkInstance.callRESTQueryAAINetworkPolicy(execution)]]></bpmn2:script>
+DoUpdateNetworkInstance.callRESTQueryAAINetworkPolicy(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_38" name="" sourceRef="callRESTQueryNetworkPolicy_ScriptTask" targetRef="callRESTQueryNetworkTableRef_ScriptTask" />
<bpmn2:scriptTask id="callGetServiceInstance" name="AAI&#10;Query&#10;(svc instance)" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def DoUpdateNetworkInstance = new DoUpdateNetworkInstance()
-DoUpdateNetworkInstance.getServiceInstance(execution)]]></bpmn2:script>
+DoUpdateNetworkInstance.getServiceInstance(execution)</bpmn2:script>
</bpmn2:scriptTask>
+ <bpmn2:callActivity id="openstackAdapterTask" name="openstack Adapter" calledElement="openstackAdapterTask">
+ <bpmn2:extensionElements>
+ <camunda:in source="UPDNETI_updateNetworkRequest" target="openstackAdapterTaskRequest" />
+ <camunda:out source="WorkflowException" target="WorkflowException" />
+ <camunda:out source="WorkflowResponse" target="UPDNETI_updateNetworkResponse" />
+ </bpmn2:extensionElements>
+ <bpmn2:incoming>SequenceFlow_61</bpmn2:incoming>
+ <bpmn2:outgoing>Flow_1eutzkj</bpmn2:outgoing>
+ </bpmn2:callActivity>
+ <bpmn2:sequenceFlow id="Flow_1eutzkj" sourceRef="openstackAdapterTask" targetRef="callRESTReQuery2NetworkID_ScriptTask" />
</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="DoUpdateNetworkInstance">
<bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="updateNetwork_startEvent">
- <dc:Bounds x="286" y="185" width="36" height="36" />
+ <dc:Bounds x="596" y="185" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="279" y="226" width="49" height="12" />
+ <dc:Bounds x="588" y="226" width="51" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_61" bpmnElement="preProcessRequest_ScriptTask">
- <dc:Bounds x="472" y="163" width="100" height="80" />
+ <dc:Bounds x="782" y="163" 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="322" y="203" />
- <di:waypoint xsi:type="dc:Point" x="472" y="203" />
+ <di:waypoint x="632" y="203" />
+ <di:waypoint x="782" y="203" />
<bpmndi:BPMNLabel>
<dc:Bounds x="397" y="188" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_63" bpmnElement="validateUpdatePONetwork_ScriptTask">
- <dc:Bounds x="1343" y="1311" width="100" height="80" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="_BPMNShape_ServiceTask_83" bpmnElement="callUpdateNetwork_ServiceTask">
- <dc:Bounds x="1342" y="1176" width="100" height="80" />
- </bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_67" bpmnElement="prepareSDNCTopoRequest_ScriptTask">
- <dc:Bounds x="1519" y="100" width="100" height="80" />
+ <dc:Bounds x="1829" y="100" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_SubProcess_16" bpmnElement="subProcessException_SubProcess" isExpanded="true">
- <dc:Bounds x="-153" y="594" width="1288" height="701" />
+ <dc:Bounds x="157" y="594" width="1288" height="701" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_StartEvent_50" bpmnElement="subProcessStart_StartEvent">
- <dc:Bounds x="-103" y="1160" width="36" height="36" />
+ <dc:Bounds x="207" y="1160" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="-109" y="1201" width="50" height="12" />
+ <dc:Bounds x="200" y="1201" width="52" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_67" bpmnElement="isSdncTopoOk_ExclusiveGateway" isMarkerVisible="true">
- <dc:Bounds x="1544" y="521" width="50" height="50" />
+ <dc:Bounds x="1854" y="521" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1535" y="577" width="67" height="12" />
+ <dc:Bounds x="1845" y="577" width="67" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_26" bpmnElement="sdncTopoNo_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_67" targetElement="_BPMNShape_EndEvent_124">
- <di:waypoint xsi:type="dc:Point" x="1594" y="546" />
- <di:waypoint xsi:type="dc:Point" x="1682" y="546" />
+ <di:waypoint x="1904" y="546" />
+ <di:waypoint x="1992" y="546" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1600" y="546.8622891951518" width="14" height="12" />
+ <dc:Bounds x="1910" y="547" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_28" bpmnElement="sdncTopoYes_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_67" targetElement="_BPMNShape_ScriptTask_336">
- <di:waypoint xsi:type="dc:Point" x="1544" y="546" />
- <di:waypoint xsi:type="dc:Point" x="1393" y="546" />
- <di:waypoint xsi:type="dc:Point" x="1393" y="576" />
+ <di:waypoint x="1854" y="546" />
+ <di:waypoint x="1703" y="546" />
+ <di:waypoint x="1703" y="576" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1526" y="546" width="18" height="12" />
+ <dc:Bounds x="1836" y="546" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_80" bpmnElement="postProcessAndCompletionRequest_ScriptTask">
- <dc:Bounds x="743" y="1390" width="100" height="80" />
+ <dc:Bounds x="1053" y="1390" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_EndEvent_124" bpmnElement="sndcError_EndEvent">
- <dc:Bounds x="1682" y="528" width="36" height="36" />
+ <dc:Bounds x="1992" y="528" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1663" y="569" width="74" height="22" />
+ <dc:Bounds x="1980" y="569" width="61" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_CallActivity_19" bpmnElement="callAssignSDNCAdapter_CallActivity">
- <dc:Bounds x="1519" y="242" width="100" height="80" />
+ <dc:Bounds x="1829" y="242" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_24" bpmnElement="SequenceFlow_11" sourceElement="_BPMNShape_ScriptTask_67" targetElement="_BPMNShape_CallActivity_19">
- <di:waypoint xsi:type="dc:Point" x="1569" y="180" />
- <di:waypoint xsi:type="dc:Point" x="1569" y="242" />
+ <di:waypoint x="1879" y="180" />
+ <di:waypoint x="1879" y="242" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1584" y="211" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_29" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_CallActivity_19" targetElement="_BPMNShape_ScriptTask_131">
- <di:waypoint xsi:type="dc:Point" x="1569" y="322" />
- <di:waypoint xsi:type="dc:Point" x="1569" y="373" />
+ <di:waypoint x="1879" y="322" />
+ <di:waypoint x="1879" y="373" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1584" y="347.5" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_ScriptTask_61">
- <di:waypoint xsi:type="dc:Point" x="572" y="203" />
- <di:waypoint xsi:type="dc:Point" x="686" y="203" />
+ <di:waypoint x="882" y="203" />
+ <di:waypoint x="996" y="203" />
<bpmndi:BPMNLabel>
<dc:Bounds x="584" y="188" width="90" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_35" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_StartEvent_50" targetElement="_BPMNShape_ExclusiveGateway_90">
- <di:waypoint xsi:type="dc:Point" x="-67" y="1178" />
- <di:waypoint xsi:type="dc:Point" x="-40" y="1178" />
- <di:waypoint xsi:type="dc:Point" x="-11" y="1178" />
+ <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_35" bpmnElement="SequenceFlow_23" sourceElement="_BPMNShape_StartEvent_50" targetElement="ScriptTask_1gedbow_di">
+ <di:waypoint x="243" y="1178" />
+ <di:waypoint x="270" y="1178" />
+ <di:waypoint x="299" y="1178" />
<bpmndi:BPMNLabel>
<dc:Bounds x="-53" y="1163" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_131" bpmnElement="validateSDNCResponse_ScriptTask">
- <dc:Bounds x="1519" y="373" width="100" height="80" />
+ <dc:Bounds x="1829" y="373" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ScriptTask_131" targetElement="_BPMNShape_ExclusiveGateway_67">
- <di:waypoint xsi:type="dc:Point" x="1569" y="453" />
- <di:waypoint xsi:type="dc:Point" x="1569" y="521" />
+ <di:waypoint x="1879" y="453" />
+ <di:waypoint x="1879" y="521" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1584" y="487" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_42" bpmnElement="SequenceFlow_29" sourceElement="_BPMNShape_ScriptTask_80">
- <di:waypoint xsi:type="dc:Point" x="743" y="1430" />
- <di:waypoint xsi:type="dc:Point" x="635" y="1430" />
+ <di:waypoint x="1053" y="1430" />
+ <di:waypoint x="945" y="1430" />
<bpmndi:BPMNLabel>
<dc:Bounds x="689" y="1415" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_133" bpmnElement="callRESTQueryNetworkId_ScriptTask">
- <dc:Bounds x="984" y="100" width="100" height="80" />
+ <dc:Bounds x="1294" y="100" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_134" bpmnElement="callRESTReQuery2NetworkID_ScriptTask">
- <dc:Bounds x="1176" y="1390" width="100" height="80" />
+ <dc:Bounds x="1486" y="1390" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_135" bpmnElement="callRESTUpdateContrailNetwork_ScriptTask">
- <dc:Bounds x="984" y="1390" width="100" height="80" />
+ <dc:Bounds x="1294" y="1390" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_54" bpmnElement="SequenceFlow_35" sourceElement="_BPMNShape_ScriptTask_134" targetElement="_BPMNShape_ScriptTask_135">
- <di:waypoint xsi:type="dc:Point" x="1176" y="1430" />
- <di:waypoint xsi:type="dc:Point" x="1084" y="1430" />
+ <di:waypoint x="1486" y="1430" />
+ <di:waypoint x="1394" y="1430" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1130" y="1415" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_65" bpmnElement="SequenceFlow_46" sourceElement="_BPMNShape_ScriptTask_135">
- <di:waypoint xsi:type="dc:Point" x="984" y="1430" />
- <di:waypoint xsi:type="dc:Point" x="843" y="1430" />
+ <di:waypoint x="1294" y="1430" />
+ <di:waypoint x="1153" y="1430" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="935" y="1431.2411831373652" width="32" height="12" />
+ <dc:Bounds x="1245" y="1431" width="33" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_156" bpmnElement="callRESTQueryVpnBinding_ScriptTask">
- <dc:Bounds x="1341" y="688" width="100" height="80" />
+ <dc:Bounds x="1651" y="688" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="SequenceFlow_15" sourceElement="_BPMNShape_ScriptTask_156" targetElement="_BPMNShape_ScriptTask_215">
- <di:waypoint xsi:type="dc:Point" x="1391" y="768" />
- <di:waypoint xsi:type="dc:Point" x="1391" y="810" />
+ <di:waypoint x="1701" y="768" />
+ <di:waypoint x="1701" y="810" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1388" y="781" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_87" bpmnElement="SequenceFlow_59" sourceElement="_BPMNShape_ServiceTask_83" targetElement="_BPMNShape_ScriptTask_63">
- <di:waypoint xsi:type="dc:Point" x="1392" y="1256" />
- <di:waypoint xsi:type="dc:Point" x="1393" y="1311" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1390" y="1284" width="6" height="6" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_157" bpmnElement="prepareNetworkRequest_ScriptTask">
- <dc:Bounds x="1342" y="1052" width="100" height="80" />
+ <dc:Bounds x="1652" y="1052" width="100" height="80" />
</bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_89" bpmnElement="SequenceFlow_61" sourceElement="_BPMNShape_ScriptTask_157" targetElement="_BPMNShape_ServiceTask_83">
- <di:waypoint xsi:type="dc:Point" x="1392" y="1132" />
- <di:waypoint xsi:type="dc:Point" x="1392" y="1176" />
+ <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_89" bpmnElement="SequenceFlow_61" sourceElement="_BPMNShape_ScriptTask_157" targetElement="Activity_06vsf1e_di">
+ <di:waypoint x="1702" y="1132" />
+ <di:waypoint x="1702" y="1190" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1389" y="1159" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_90" bpmnElement="isRollbackOn_Network_ExclusiveGateway" isMarkerVisible="true">
- <dc:Bounds x="156" y="1153" width="50" height="50" />
+ <dc:Bounds x="466" y="1153" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="143" y="1213" width="78" height="12" />
+ <dc:Bounds x="453" y="1213" width="78" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_25" bpmnElement="isRollbackOn_YesNetwork_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_90" targetElement="_BPMNShape_ExclusiveGateway_215">
- <di:waypoint xsi:type="dc:Point" x="181" y="1153" />
- <di:waypoint xsi:type="dc:Point" x="181" y="1089" />
+ <di:waypoint x="491" y="1153" />
+ <di:waypoint x="491" y="1089" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="187" y="1133.4787123394708" width="18" height="12" />
+ <dc:Bounds x="497" y="1133" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_34" bpmnElement="isRollbackOn_NoNetwork_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_90" targetElement="_BPMNShape_InclusiveGateway_24">
- <di:waypoint xsi:type="dc:Point" x="206" y="1178" />
- <di:waypoint xsi:type="dc:Point" x="372" y="1178" />
+ <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_34" bpmnElement="isRollbackOn_NoNetwork_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_90" targetElement="InclusiveGateway_1adrta3_di">
+ <di:waypoint x="516" y="1178" />
+ <di:waypoint x="682" y="1178" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="206" y="1182.7278101950883" width="14" height="12" />
+ <dc:Bounds x="516" y="1183" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_215" bpmnElement="callRESTQueryNetworkPolicy_ScriptTask">
- <dc:Bounds x="1341" y="810" width="100" height="80" />
+ <dc:Bounds x="1651" y="810" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_60" bpmnElement="SequenceFlow_38" sourceElement="_BPMNShape_ScriptTask_215" targetElement="_BPMNShape_ScriptTask_335">
- <di:waypoint xsi:type="dc:Point" x="1391" y="890" />
- <di:waypoint xsi:type="dc:Point" x="1391" y="926" />
+ <di:waypoint x="1701" y="890" />
+ <di:waypoint x="1701" y="926" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1388" y="900" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_InclusiveGateway_24" bpmnElement="InclusiveGateway_6">
- <dc:Bounds x="626" y="859" width="50" height="50" />
+ <dc:Bounds x="936" y="859" width="50" height="50" />
<bpmndi:BPMNLabel>
<dc:Bounds x="651" y="914" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_215" bpmnElement="isPONR_ExclusiveGateway" isMarkerVisible="true">
- <dc:Bounds x="156" y="1039" width="50" height="50" />
+ <dc:Bounds x="466" y="1039" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="90" y="1054" width="46" height="12" />
+ <dc:Bounds x="400" y="1054" width="46" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_77" bpmnElement="isPONR_Yes_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_215" targetElement="_BPMNShape_InclusiveGateway_24">
- <di:waypoint xsi:type="dc:Point" x="206" y="1064" />
- <di:waypoint xsi:type="dc:Point" x="397" y="1064" />
- <di:waypoint xsi:type="dc:Point" x="397" y="1153" />
+ <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_77" bpmnElement="isPONR_Yes_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_215" targetElement="InclusiveGateway_1adrta3_di">
+ <di:waypoint x="516" y="1064" />
+ <di:waypoint x="707" y="1064" />
+ <di:waypoint x="707" y="1153" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="213" y="1067.6448598130842" width="18" height="12" />
+ <dc:Bounds x="523" y="1068" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_85" bpmnElement="isPONR_No_SequenceFlow" sourceElement="_BPMNShape_ExclusiveGateway_215">
- <di:waypoint xsi:type="dc:Point" x="181" y="1039" />
- <di:waypoint xsi:type="dc:Point" x="181" y="971" />
- <di:waypoint xsi:type="dc:Point" x="397" y="971" />
- <di:waypoint xsi:type="dc:Point" x="397" y="1153" />
+ <di:waypoint x="491" y="1039" />
+ <di:waypoint x="491" y="971" />
+ <di:waypoint x="707" y="971" />
+ <di:waypoint x="707" y="1153" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="185" y="1027.872131147541" width="14" height="12" />
+ <dc:Bounds x="495" y="1028" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_217" bpmnElement="sdncOk_ExclusiveGateway" isMarkerVisible="true">
- <dc:Bounds x="493" y="709" width="50" height="50" />
+ <dc:Bounds x="803" y="709" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="488" y="683" width="60" height="12" />
+ <dc:Bounds x="798" y="683" width="60" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_92" bpmnElement="sdncOk_Yeso_ExclusiveGateway" sourceElement="_BPMNShape_ExclusiveGateway_217" targetElement="_BPMNShape_ScriptTask_261">
- <di:waypoint xsi:type="dc:Point" x="543" y="734" />
- <di:waypoint xsi:type="dc:Point" x="601" y="733" />
+ <di:waypoint x="853" y="734" />
+ <di:waypoint x="911" y="733" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="545" y="737.2172362208834" width="18" height="12" />
+ <dc:Bounds x="855" y="737" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_93" bpmnElement="sdncOk_No_ExclusiveGateway" sourceElement="_BPMNShape_ExclusiveGateway_217">
- <di:waypoint xsi:type="dc:Point" x="517" y="758" />
- <di:waypoint xsi:type="dc:Point" x="517" y="884" />
- <di:waypoint xsi:type="dc:Point" x="626" y="884" />
+ <di:waypoint x="827" y="758" />
+ <di:waypoint x="827" y="884" />
+ <di:waypoint x="936" y="884" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="526" y="761.1171067354646" width="14" height="12" />
+ <dc:Bounds x="836" y="761" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_EndEvent_177" bpmnElement="EndEvent_3">
- <dc:Bounds x="599" y="1412" width="36" height="36" />
+ <dc:Bounds x="909" y="1412" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="617" y="1453" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_EndEvent_178" bpmnElement="EndEvent_4">
- <dc:Bounds x="1029" y="968" width="36" height="36" />
+ <dc:Bounds x="1339" y="968" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1047" y="1009" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_245" bpmnElement="callRESTQueryCloudRegion_ScriptTask">
- <dc:Bounds x="1200" y="100" width="100" height="80" />
+ <dc:Bounds x="1510" y="100" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_53" bpmnElement="SequenceFlow_32" sourceElement="_BPMNShape_ScriptTask_245" targetElement="_BPMNShape_ScriptTask_67">
- <di:waypoint xsi:type="dc:Point" x="1300" y="140" />
- <di:waypoint xsi:type="dc:Point" x="1519" y="140" />
+ <di:waypoint x="1610" y="140" />
+ <di:waypoint x="1829" y="140" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1410" y="125" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_BoundaryEvent_38" bpmnElement="BoundaryEvent_4">
- <dc:Bounds x="1601" y="355" width="36" height="36" />
+ <dc:Bounds x="1911" y="355" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1619" y="391" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_69" bpmnElement="SequenceFlow_34" sourceElement="_BPMNShape_BoundaryEvent_38" targetElement="_BPMNShape_EndEvent_124">
- <di:waypoint xsi:type="dc:Point" x="1637" y="373" />
- <di:waypoint xsi:type="dc:Point" x="1700" y="373" />
- <di:waypoint xsi:type="dc:Point" x="1700" y="528" />
+ <di:waypoint x="1947" y="373" />
+ <di:waypoint x="2010" y="373" />
+ <di:waypoint x="2010" y="528" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1669" y="358" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_261" bpmnElement="prepareSDNCRollbackRequest_ScriptTask">
- <dc:Bounds x="601" y="694" width="100" height="79" />
+ <dc:Bounds x="911" y="694" width="100" height="79" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_76" bpmnElement="SequenceFlow_47" sourceElement="_BPMNShape_InclusiveGateway_24">
- <di:waypoint xsi:type="dc:Point" x="651" y="909" />
- <di:waypoint xsi:type="dc:Point" x="651" y="946" />
+ <di:waypoint x="961" y="909" />
+ <di:waypoint x="961" y="946" />
<bpmndi:BPMNLabel>
<dc:Bounds x="666" y="927.5" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_84" bpmnElement="SequenceFlow_53" sourceElement="_BPMNShape_ScriptTask_261">
- <di:waypoint xsi:type="dc:Point" x="651" y="773" />
- <di:waypoint xsi:type="dc:Point" x="651" y="859" />
+ <di:waypoint x="961" y="773" />
+ <di:waypoint x="961" y="859" />
<bpmndi:BPMNLabel>
<dc:Bounds x="666" y="816" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_19" bpmnElement="SequenceFlow_13" sourceElement="_BPMNShape_ScriptTask_63" targetElement="_BPMNShape_ScriptTask_134">
- <di:waypoint xsi:type="dc:Point" x="1393" y="1391" />
- <di:waypoint xsi:type="dc:Point" x="1393" y="1430" />
- <di:waypoint xsi:type="dc:Point" x="1310" y="1430" />
- <di:waypoint xsi:type="dc:Point" x="1276" y="1430" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1390" y="1425" width="6" height="6" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_SubProcess_28" bpmnElement="unexpectedErrors_SubProcess" isExpanded="true">
- <dc:Bounds x="-62" y="375" width="394" height="188" />
+ <dc:Bounds x="248" y="375" width="394" height="188" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_StartEvent_71" bpmnElement="StartEvent_1">
- <dc:Bounds x="-29" y="452" width="36" height="36" />
+ <dc:Bounds x="281" y="452" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="-11" y="493" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_270" bpmnElement="ScriptTask_1">
- <dc:Bounds x="86" y="430" width="100" height="80" />
+ <dc:Bounds x="396" y="430" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_EndEvent_220" bpmnElement="EndEvent_1">
- <dc:Bounds x="247" y="452" width="36" height="36" />
+ <dc:Bounds x="557" y="452" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="265" y="493" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_StartEvent_71" targetElement="_BPMNShape_ScriptTask_270">
- <di:waypoint xsi:type="dc:Point" x="7" y="470" />
- <di:waypoint xsi:type="dc:Point" x="86" y="470" />
+ <di:waypoint x="317" y="470" />
+ <di:waypoint x="396" y="470" />
<bpmndi:BPMNLabel>
<dc:Bounds x="49" y="470" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_ScriptTask_270" targetElement="_BPMNShape_EndEvent_220">
- <di:waypoint xsi:type="dc:Point" x="186" y="470" />
- <di:waypoint xsi:type="dc:Point" x="247" y="470" />
+ <di:waypoint x="496" y="470" />
+ <di:waypoint x="557" y="470" />
<bpmndi:BPMNLabel>
<dc:Bounds x="221" y="470" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_3" sourceElement="ScriptTask_0e58tta_di" targetElement="_BPMNShape_ScriptTask_133">
- <di:waypoint xsi:type="dc:Point" x="786" y="203" />
- <di:waypoint xsi:type="dc:Point" x="805" y="203" />
- <di:waypoint xsi:type="dc:Point" x="805" y="202" />
- <di:waypoint xsi:type="dc:Point" x="861" y="202" />
- <di:waypoint xsi:type="dc:Point" x="861" y="140" />
- <di:waypoint xsi:type="dc:Point" x="910" y="140" />
- <di:waypoint xsi:type="dc:Point" x="984" y="140" />
+ <di:waypoint x="1096" y="203" />
+ <di:waypoint x="1115" y="203" />
+ <di:waypoint x="1115" y="202" />
+ <di:waypoint x="1171" y="202" />
+ <di:waypoint x="1171" y="140" />
+ <di:waypoint x="1220" y="140" />
+ <di:waypoint x="1294" y="140" />
<bpmndi:BPMNLabel>
<dc:Bounds x="788" y="184" width="90" 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" />
+ <di:waypoint x="1394" y="140" />
+ <di:waypoint x="1510" y="140" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1127" y="140" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_335" bpmnElement="callRESTQueryNetworkTableRef_ScriptTask">
- <dc:Bounds x="1341" y="926" width="100" height="80" />
+ <dc:Bounds x="1651" y="926" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_335" targetElement="_BPMNShape_ScriptTask_157">
- <di:waypoint xsi:type="dc:Point" x="1391" y="1006" />
- <di:waypoint xsi:type="dc:Point" x="1392" y="1052" />
+ <di:waypoint x="1701" y="1006" />
+ <di:waypoint x="1702" y="1052" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1388" y="1028" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_336" bpmnElement="callRESTReQuery1NetworkID_ScriptTask">
- <dc:Bounds x="1343" y="576" width="100" height="80" />
+ <dc:Bounds x="1653" y="576" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_ScriptTask_336" targetElement="_BPMNShape_ScriptTask_156">
- <di:waypoint xsi:type="dc:Point" x="1393" y="656" />
- <di:waypoint xsi:type="dc:Point" x="1393" y="672" />
- <di:waypoint xsi:type="dc:Point" x="1391" y="672" />
- <di:waypoint xsi:type="dc:Point" x="1391" y="688" />
+ <di:waypoint x="1703" y="656" />
+ <di:waypoint x="1703" y="672" />
+ <di:waypoint x="1701" y="672" />
+ <di:waypoint x="1701" y="688" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1390" y="666" width="6" height="6" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ScriptTask_1p6n2yy_di" bpmnElement="ScriptTask_1p6n2yy">
- <dc:Bounds x="601" y="946" width="100" height="80" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="CallActivity_1kid5y0_di" bpmnElement="CallActivity_1kid5y0">
- <dc:Bounds x="739" y="946" width="100" height="80" />
+ <dc:Bounds x="911" y="946" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ScriptTask_0voqz6r_di" bpmnElement="ScriptTask_0voqz6r">
- <dc:Bounds x="883" y="946" width="100" height="80" />
+ <dc:Bounds x="1110" y="1138" width="100" height="80" />
</bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_0qr4es6_di" bpmnElement="SequenceFlow_0qr4es6">
- <di:waypoint xsi:type="dc:Point" x="701" y="986" />
- <di:waypoint xsi:type="dc:Point" x="739" y="986" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="720" y="971" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_04rdjfi_di" bpmnElement="SequenceFlow_04rdjfi">
- <di:waypoint xsi:type="dc:Point" x="983" y="986" />
- <di:waypoint xsi:type="dc:Point" x="1029" y="986" />
+ <di:waypoint x="1210" y="1178" />
+ <di:waypoint x="1275" y="1178" />
+ <di:waypoint x="1275" y="986" />
+ <di:waypoint x="1339" y="986" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1006" y="961" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ExclusiveGateway_1kjh92x_di" bpmnElement="ExclusiveGateway_1kjh92x" isMarkerVisible="true">
- <dc:Bounds x="372" y="709" width="50" height="50" />
+ <dc:Bounds x="682" y="709" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="368" y="672" width="76" height="24" />
+ <dc:Bounds x="679" y="672" width="74" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0nrc66n_di" bpmnElement="SequenceFlow_0nrc66n">
- <di:waypoint xsi:type="dc:Point" x="422" y="734" />
- <di:waypoint xsi:type="dc:Point" x="493" y="734" />
+ <di:waypoint x="732" y="734" />
+ <di:waypoint x="803" y="734" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="427" y="735" width="14" height="12" />
+ <dc:Bounds x="737" y="735" width="15" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0srdlf3_di" bpmnElement="SequenceFlow_0srdlf3">
- <di:waypoint xsi:type="dc:Point" x="397" y="759" />
- <di:waypoint xsi:type="dc:Point" x="397" y="884" />
- <di:waypoint xsi:type="dc:Point" x="626" y="884" />
+ <di:waypoint x="707" y="759" />
+ <di:waypoint x="707" y="884" />
+ <di:waypoint x="936" y="884" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="402" y="760" width="18" height="12" />
+ <dc:Bounds x="712" y="760" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ScriptTask_1gedbow_di" bpmnElement="ScriptTask_1gedbow">
- <dc:Bounds x="-11" y="1138" width="100" height="80" />
+ <dc:Bounds x="299" y="1138" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_053re4q_di" bpmnElement="SequenceFlow_053re4q">
- <di:waypoint xsi:type="dc:Point" x="89" y="1178" />
- <di:waypoint xsi:type="dc:Point" x="156" y="1178" />
+ <di:waypoint x="399" y="1178" />
+ <di:waypoint x="466" y="1178" />
<bpmndi:BPMNLabel>
<dc:Bounds x="123" y="1163" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="InclusiveGateway_1adrta3_di" bpmnElement="ExclusiveGateway_1dcb5p2">
- <dc:Bounds x="372" y="1153" width="50" height="50" />
+ <dc:Bounds x="682" y="1153" width="50" height="50" />
<bpmndi:BPMNLabel>
<dc:Bounds x="397" y="1203" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0ze5k6c_di" bpmnElement="SequenceFlow_0ze5k6c">
- <di:waypoint xsi:type="dc:Point" x="422" y="1178" />
- <di:waypoint xsi:type="dc:Point" x="933" y="1178" />
- <di:waypoint xsi:type="dc:Point" x="933" y="1026" />
+ <di:waypoint x="732" y="1178" />
+ <di:waypoint x="1110" y="1178" />
<bpmndi:BPMNLabel>
<dc:Bounds x="678" y="1163" width="0" height="0" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="TextAnnotation_0qx19b9_di" bpmnElement="TextAnnotation_0qx19b9">
- <dc:Bounds x="736" y="808" width="168" height="39" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="Association_10dk4x3_di" bpmnElement="Association_10dk4x3">
- <di:waypoint xsi:type="dc:Point" x="797" y="946" />
- <di:waypoint xsi:type="dc:Point" x="816" y="847" />
- </bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ScriptTask_0e58tta_di" bpmnElement="callGetServiceInstance">
- <dc:Bounds x="686" y="163" width="100" height="80" />
+ <dc:Bounds x="996" y="163" width="100" height="80" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="Activity_06vsf1e_di" bpmnElement="openstackAdapterTask">
+ <dc:Bounds x="1653" y="1190" width="100" height="80" />
</bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="Flow_1eutzkj_di" bpmnElement="Flow_1eutzkj">
+ <di:waypoint x="1704" y="1270" />
+ <di:waypoint x="1704" y="1430" />
+ <di:waypoint x="1586" y="1430" />
+ </bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</bpmn2:definitions>
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateNetworkInstanceRollback.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateNetworkInstanceRollback.bpmn
deleted file mode 100644
index 9d37d8084e..0000000000
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateNetworkInstanceRollback.bpmn
+++ /dev/null
@@ -1,374 +0,0 @@
-<?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="DoUpdateNetworkInstanceRollback" name="DoUpdateNetworkInstanceRollback" isExecutable="true">
- <bpmn:startEvent id="StartEvent_1">
- <bpmn:outgoing>SequenceFlow_1krl2dg</bpmn:outgoing>
- </bpmn:startEvent>
- <bpmn:scriptTask id="Task_0whino1" name="PreProcess Incoming Data" scriptFormat="groovy">
- <bpmn:incoming>SequenceFlow_1krl2dg</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_0u41iz2</bpmn:outgoing>
- <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
-def DoUpdateNetworkInstanceRollback = new DoUpdateNetworkInstanceRollback()
-DoUpdateNetworkInstanceRollback.preProcessRequest(execution)]]></bpmn:script>
- </bpmn:scriptTask>
- <bpmn:sequenceFlow id="SequenceFlow_1krl2dg" sourceRef="StartEvent_1" targetRef="Task_0whino1" />
- <bpmn:sequenceFlow id="SequenceFlow_0u41iz2" sourceRef="Task_0whino1" targetRef="ExclusiveGateway_0v0en47" />
- <bpmn:serviceTask id="ServiceTask_0bqh5yl" name="Call Rollback Network">
- <bpmn:extensionElements>
- <camunda:connector>
- <camunda:inputOutput>
- <camunda:inputParameter name="payload">${UPDNETIR_rollbackNetworkRequest}</camunda:inputParameter>
- <camunda:inputParameter name="url"><![CDATA[${UrnPropertiesReader.getVariable("mso.adapters.network.rest.endpoint", execution)}
-]]></camunda:inputParameter>
- <camunda:inputParameter name="headers">
- <camunda:map>
- <camunda:entry key="Authorization">#{BasicAuthHeaderValuePO}</camunda:entry>
- <camunda:entry key="content-type">application/xml</camunda:entry>
- </camunda:map>
- </camunda:inputParameter>
- <camunda:inputParameter name="method">PUT</camunda:inputParameter>
- <camunda:outputParameter name="UPDNETIR_rollbackNetworkReturnCode">${statusCode}</camunda:outputParameter>
- <camunda:outputParameter name="UPDNETIR_rollbackNetworkResponse">${response}</camunda:outputParameter>
- </camunda:inputOutput>
- <camunda:connectorId>http-connector</camunda:connectorId>
- </camunda:connector>
- </bpmn:extensionElements>
- <bpmn:incoming>SequenceFlow_0e1uixp</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_17o4w67</bpmn:outgoing>
- </bpmn:serviceTask>
- <bpmn:exclusiveGateway id="ExclusiveGateway_0v0en47" name="is PO Network Rollback?" default="SequenceFlow_1lteduj">
- <bpmn:incoming>SequenceFlow_0u41iz2</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_0e1uixp</bpmn:outgoing>
- <bpmn:outgoing>SequenceFlow_1lteduj</bpmn:outgoing>
- </bpmn:exclusiveGateway>
- <bpmn:callActivity id="CallActivity_1xilevb" name="Call Rollback SDNC Adapter" calledElement="sdncAdapter">
- <bpmn:extensionElements>
- <camunda:in source="UPDNETIR_rollbackSDNCRequest" 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:out source="SDNCA_ResponseCode" target="UPDNETIR_rollbackSDNCReturnCode" />
- <camunda:out source="sdncAdapterResponse" target="UPDNETIR_rollbackSDNCResponse" />
- <camunda:out source="WorkflowException" target="WorkflowException" />
- <camunda:out source="SDNCA_SuccessIndicator" target="SDNCA_SuccessIndicator" />
- </bpmn:extensionElements>
- <bpmn:incoming>SequenceFlow_101y57s</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_0790olb</bpmn:outgoing>
- </bpmn:callActivity>
- <bpmn:exclusiveGateway id="ExclusiveGateway_17g4q5c" name="is RSRC SDNC?" default="SequenceFlow_101y57s">
- <bpmn:incoming>SequenceFlow_0virkpu</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_101y57s</bpmn:outgoing>
- <bpmn:outgoing>SequenceFlow_0mw0dgd</bpmn:outgoing>
- </bpmn:exclusiveGateway>
- <bpmn:scriptTask id="ScriptTask_1ggaxfu" name="Validate Rollback Responses" scriptFormat="groovy">
- <bpmn:incoming>SequenceFlow_0qc4v9t</bpmn:incoming>
- <bpmn:incoming>SequenceFlow_0el8yzs</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_0yto4gz</bpmn:outgoing>
- <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
-def DoUpdateNetworkInstanceRollback = new DoUpdateNetworkInstanceRollback()
-DoUpdateNetworkInstanceRollback.validateRollbackResponses(execution)]]></bpmn:script>
- </bpmn:scriptTask>
- <bpmn:exclusiveGateway id="ExclusiveGateway_1n5jck8" name="is SDNC Rollback?" default="SequenceFlow_0qc4v9t">
- <bpmn:incoming>SequenceFlow_1lteduj</bpmn:incoming>
- <bpmn:incoming>SequenceFlow_17o4w67</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_0virkpu</bpmn:outgoing>
- <bpmn:outgoing>SequenceFlow_0qc4v9t</bpmn:outgoing>
- </bpmn:exclusiveGateway>
- <bpmn:sequenceFlow id="SequenceFlow_0e1uixp" name="Yes" sourceRef="ExclusiveGateway_0v0en47" targetRef="ServiceTask_0bqh5yl">
- <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("UPDNETIR_rollbackNetworkRequest") != null}]]></bpmn:conditionExpression>
- </bpmn:sequenceFlow>
- <bpmn:sequenceFlow id="SequenceFlow_1lteduj" name="No" sourceRef="ExclusiveGateway_0v0en47" targetRef="ExclusiveGateway_1n5jck8" />
- <bpmn:sequenceFlow id="SequenceFlow_0virkpu" name="Yes" sourceRef="ExclusiveGateway_1n5jck8" targetRef="ExclusiveGateway_17g4q5c">
- <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("UPDNETIR_rollbackSDNCRequest") != null}]]></bpmn:conditionExpression>
- </bpmn:sequenceFlow>
- <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") != '1610'} ]]></bpmn:conditionExpression>
- </bpmn:sequenceFlow>
- <bpmn:endEvent id="EndEvent_1fvr7ad">
- <bpmn:incoming>SequenceFlow_0yto4gz</bpmn:incoming>
- </bpmn:endEvent>
- <bpmn:sequenceFlow id="SequenceFlow_0qc4v9t" name="No" sourceRef="ExclusiveGateway_1n5jck8" targetRef="ScriptTask_1ggaxfu" />
- <bpmn:sequenceFlow id="SequenceFlow_0790olb" sourceRef="CallActivity_1xilevb" targetRef="ExclusiveGateway_0b9kbop" />
- <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.onap.so.bpmn.infrastructure.scripts.*
-def DoUpdateNetworkInstanceRollback = new DoUpdateNetworkInstanceRollback()
-DoUpdateNetworkInstanceRollback.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:inclusiveGateway id="ExclusiveGateway_0b9kbop">
- <bpmn:incoming>SequenceFlow_0790olb</bpmn:incoming>
- <bpmn:incoming>SequenceFlow_0mw0dgd</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_0el8yzs</bpmn:outgoing>
- </bpmn:inclusiveGateway>
- <bpmn:sequenceFlow id="SequenceFlow_0el8yzs" sourceRef="ExclusiveGateway_0b9kbop" targetRef="ScriptTask_1ggaxfu" />
- <bpmn:sequenceFlow id="SequenceFlow_0yto4gz" sourceRef="ScriptTask_1ggaxfu" targetRef="EndEvent_1fvr7ad" />
- <bpmn:subProcess id="SubProcess_1b8rnqv" name="Sub-process for UnexpectedErrors" triggeredByEvent="true">
- <bpmn:scriptTask id="ScriptTask_02d3i14" name="Catch Exception">
- <bpmn:incoming>SequenceFlow_07kf49j</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_01syg1x</bpmn:outgoing>
- <bpmn:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
-execution.setVariable("workflowException", execution.getVariable("WorkflowException")]]></bpmn:script>
- </bpmn:scriptTask>
- <bpmn:startEvent id="StartEvent_0e8yrgo">
- <bpmn:outgoing>SequenceFlow_07kf49j</bpmn:outgoing>
- <bpmn:errorEventDefinition />
- </bpmn:startEvent>
- <bpmn:endEvent id="EndEvent_1cmovvm">
- <bpmn:incoming>SequenceFlow_01syg1x</bpmn:incoming>
- </bpmn:endEvent>
- <bpmn:sequenceFlow id="SequenceFlow_07kf49j" name="" sourceRef="StartEvent_0e8yrgo" targetRef="ScriptTask_02d3i14" />
- <bpmn:sequenceFlow id="SequenceFlow_01syg1x" name="" sourceRef="ScriptTask_02d3i14" targetRef="EndEvent_1cmovvm" />
- </bpmn:subProcess>
- <bpmn:textAnnotation id="TextAnnotation_000ap15"> <bpmn:text><![CDATA[Include ONLY inputs/varrables:  
-rollbackData, as Map
--rollbackSDNCRequest
--rollbackNetworkRequest
-WorkflowException
- 
-]]></bpmn:text>
-</bpmn:textAnnotation>
- <bpmn:association id="Association_0ybkmal" sourceRef="Task_0whino1" targetRef="TextAnnotation_000ap15" />
- <bpmn:textAnnotation id="TextAnnotation_0vwyo82"> <bpmn:text><![CDATA[set value for:
-WorkflowException
-rolledBack
-wasDeleted
-]]></bpmn:text>
-</bpmn:textAnnotation>
- <bpmn:association id="Association_1gx121b" sourceRef="ScriptTask_1ggaxfu" targetRef="TextAnnotation_0vwyo82" />
- </bpmn:process>
- <bpmndi:BPMNDiagram id="BPMNDiagram_1">
- <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>
- <dc:Bounds x="258" y="390" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="ScriptTask_1dqe09s_di" bpmnElement="Task_0whino1">
- <dc:Bounds x="403" y="332" width="100" height="80" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_1krl2dg_di" bpmnElement="SequenceFlow_1krl2dg">
- <di:waypoint xsi:type="dc:Point" x="276" y="372" />
- <di:waypoint xsi:type="dc:Point" x="382" y="372" />
- <di:waypoint xsi:type="dc:Point" x="382" y="372" />
- <di:waypoint xsi:type="dc:Point" x="403" y="372" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="397" y="372" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_0u41iz2_di" bpmnElement="SequenceFlow_0u41iz2">
- <di:waypoint xsi:type="dc:Point" x="503" y="372" />
- <di:waypoint xsi:type="dc:Point" x="660" y="372" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="582" y="357" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="ServiceTask_0bqh5yl_di" bpmnElement="ServiceTask_0bqh5yl">
- <dc:Bounds x="635" y="481" width="100" height="80" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="ExclusiveGateway_0v0en47_di" bpmnElement="ExclusiveGateway_0v0en47" isMarkerVisible="true">
- <dc:Bounds x="660" y="347" width="50" height="50" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="648" y="312" width="74" height="24" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="TextAnnotation_000ap15_di" bpmnElement="TextAnnotation_000ap15">
- <dc:Bounds x="469" y="133" width="277" height="115" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="Association_0ybkmal_di" bpmnElement="Association_0ybkmal">
- <di:waypoint xsi:type="dc:Point" x="487" y="332" />
- <di:waypoint xsi:type="dc:Point" x="559" y="248" />
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="CallActivity_1xilevb_di" bpmnElement="CallActivity_1xilevb">
- <dc:Bounds x="995" y="610" width="100" height="80" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="ExclusiveGateway_17g4q5c_di" bpmnElement="ExclusiveGateway_17g4q5c" isMarkerVisible="true">
- <dc:Bounds x="879" y="496" width="50" height="50" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="926" y="474" width="82" height="12" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="ScriptTask_1ggaxfu_di" bpmnElement="ScriptTask_1ggaxfu">
- <dc:Bounds x="1123" y="332" width="100" height="80" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="ExclusiveGateway_1n5jck8_di" bpmnElement="ExclusiveGateway_1n5jck8" isMarkerVisible="true">
- <dc:Bounds x="879" y="347" width="50" height="50" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="880" y="308" width="48" height="24" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="TextAnnotation_0vwyo82_di" bpmnElement="TextAnnotation_0vwyo82">
- <dc:Bounds x="1287" y="410" width="165" height="60" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="Association_1gx121b_di" bpmnElement="Association_1gx121b">
- <di:waypoint xsi:type="dc:Point" x="1223" y="389" />
- <di:waypoint xsi:type="dc:Point" x="1287" y="412" />
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_0e1uixp_di" bpmnElement="SequenceFlow_0e1uixp">
- <di:waypoint xsi:type="dc:Point" x="685" y="397" />
- <di:waypoint xsi:type="dc:Point" x="685" y="439" />
- <di:waypoint xsi:type="dc:Point" x="685" y="439" />
- <di:waypoint xsi:type="dc:Point" x="685" y="481" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="693" y="395" width="18" height="12" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_1lteduj_di" bpmnElement="SequenceFlow_1lteduj">
- <di:waypoint xsi:type="dc:Point" x="710" y="372" />
- <di:waypoint xsi:type="dc:Point" x="879" y="372" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="716" y="350" width="14" height="12" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_0virkpu_di" bpmnElement="SequenceFlow_0virkpu">
- <di:waypoint xsi:type="dc:Point" x="904" y="397" />
- <di:waypoint xsi:type="dc:Point" x="904" y="496" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="914" y="392.7469456247061" width="18" height="12" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_17o4w67_di" bpmnElement="SequenceFlow_17o4w67">
- <di:waypoint xsi:type="dc:Point" x="735" y="521" />
- <di:waypoint xsi:type="dc:Point" x="817" y="521" />
- <di:waypoint xsi:type="dc:Point" x="817" y="372" />
- <di:waypoint xsi:type="dc:Point" x="879" y="372" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="832" y="446.5" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_101y57s_di" bpmnElement="SequenceFlow_101y57s">
- <di:waypoint xsi:type="dc:Point" x="904" y="546" />
- <di:waypoint xsi:type="dc:Point" x="904" y="650" />
- <di:waypoint xsi:type="dc:Point" x="995" y="650" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="913" y="544.0784313725491" width="14" height="12" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_0mw0dgd_di" bpmnElement="SequenceFlow_0mw0dgd">
- <di:waypoint xsi:type="dc:Point" x="929" y="521" />
- <di:waypoint xsi:type="dc:Point" x="1148" y="521" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="937" y="500" width="18" height="12" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="EndEvent_1fvr7ad_di" bpmnElement="EndEvent_1fvr7ad">
- <dc:Bounds x="1352" y="354" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1370" y="390" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_0qc4v9t_di" bpmnElement="SequenceFlow_0qc4v9t">
- <di:waypoint xsi:type="dc:Point" x="929" y="372" />
- <di:waypoint xsi:type="dc:Point" x="1123" y="372" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="941" y="351.1191898360114" width="14" height="12" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_0790olb_di" bpmnElement="SequenceFlow_0790olb">
- <di:waypoint xsi:type="dc:Point" x="1095" y="650" />
- <di:waypoint xsi:type="dc:Point" x="1173" y="650" />
- <di:waypoint xsi:type="dc:Point" x="1173" y="546" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1134" y="635" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="SubProcess_1p4663w_di" bpmnElement="SubProcess_1p4663w" isExpanded="true">
- <dc:Bounds x="61" y="668" width="394" height="188" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="ScriptTask_0by1uwk_di" bpmnElement="ScriptTask_0by1uwk">
- <dc:Bounds x="209" y="723" width="100" height="80" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="StartEvent_1j0eixl_di" bpmnElement="StartEvent_1j0eixl">
- <dc:Bounds x="94" y="745" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="112" y="786" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="EndEvent_0jxh015_di" bpmnElement="EndEvent_0jxh015">
- <dc:Bounds x="370" y="745" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="388" y="786" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_0xktw7v_di" bpmnElement="SequenceFlow_0xktw7v">
- <di:waypoint xsi:type="dc:Point" x="130" y="763" />
- <di:waypoint xsi:type="dc:Point" x="209" y="763" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="172" y="763" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_0soe5t3_di" bpmnElement="SequenceFlow_0soe5t3">
- <di:waypoint xsi:type="dc:Point" x="309" y="763" />
- <di:waypoint xsi:type="dc:Point" x="370" y="763" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="344" y="763" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="InclusiveGateway_0dot6c9_di" bpmnElement="ExclusiveGateway_0b9kbop">
- <dc:Bounds x="1148" y="496" width="50" height="50" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1173" y="546" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_0el8yzs_di" bpmnElement="SequenceFlow_0el8yzs">
- <di:waypoint xsi:type="dc:Point" x="1173" y="496" />
- <di:waypoint xsi:type="dc:Point" x="1173" y="412" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1188" y="444" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_0yto4gz_di" bpmnElement="SequenceFlow_0yto4gz">
- <di:waypoint xsi:type="dc:Point" x="1223" y="372" />
- <di:waypoint xsi:type="dc:Point" x="1352" y="372" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1288" y="357" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="SubProcess_1b8rnqv_di" bpmnElement="SubProcess_1b8rnqv" isExpanded="true">
- <dc:Bounds x="61" y="916" width="394" height="188" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="ScriptTask_02d3i14_di" bpmnElement="ScriptTask_02d3i14">
- <dc:Bounds x="209" y="971" width="100" height="80" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="StartEvent_0e8yrgo_di" bpmnElement="StartEvent_0e8yrgo">
- <dc:Bounds x="94" y="993" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="112" y="1034" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="EndEvent_1cmovvm_di" bpmnElement="EndEvent_1cmovvm">
- <dc:Bounds x="370" y="993" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="388" y="1034" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_07kf49j_di" bpmnElement="SequenceFlow_07kf49j">
- <di:waypoint xsi:type="dc:Point" x="130" y="1011" />
- <di:waypoint xsi:type="dc:Point" x="209" y="1011" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="172" y="1011" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_01syg1x_di" bpmnElement="SequenceFlow_01syg1x">
- <di:waypoint xsi:type="dc:Point" x="309" y="1011" />
- <di:waypoint xsi:type="dc:Point" x="370" y="1011" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="344" y="1011" width="0" height="0" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- </bpmndi:BPMNPlane>
- </bpmndi:BPMNDiagram>
-</bpmn:definitions> \ No newline at end of file
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateVfModule.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateVfModule.bpmn
index cfda2ad73c..d423ae5cba 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateVfModule.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateVfModule.bpmn
@@ -1,13 +1,13 @@
<?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.10.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_Wblj8GyfEeWUWLTvug7ZOg" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="3.7.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
<bpmn2:process id="DoUpdateVfModule" name="DoUpdateVfModule" isExecutable="true">
- <bpmn2:documentation><![CDATA[This flow expects its incoming request to be in the variable 'DoUpdateVfModuleRequest'. This flow produces no output.]]></bpmn2:documentation>
+ <bpmn2:documentation>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>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def duvm = new DoUpdateVfModule()
-duvm.prepPrepareUpdateAAIVfModule(execution)]]></bpmn2:script>
+duvm.prepPrepareUpdateAAIVfModule(execution)</bpmn2:script>
</bpmn2:scriptTask>
<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">
@@ -26,18 +26,18 @@ duvm.prepPrepareUpdateAAIVfModule(execution)]]></bpmn2:script>
<bpmn2:scriptTask id="ProcessReceivedRequest" name="Process Received Request" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_38</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def duvm = new DoUpdateVfModule()
-duvm.preProcessRequest(execution)]]></bpmn2:script>
+duvm.preProcessRequest(execution)</bpmn2:script>
</bpmn2:scriptTask>
<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>
<bpmn2:outgoing>SequenceFlow_35</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def duvm = new DoUpdateVfModule()
-duvm.handleWorkflowException(execution)]]></bpmn2:script>
+duvm.handleWorkflowException(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:endEvent id="EndEvent_3">
<bpmn2:incoming>SequenceFlow_35</bpmn2:incoming>
@@ -63,9 +63,9 @@ duvm.handleWorkflowException(execution)]]></bpmn2:script>
<bpmn2:incoming>SequenceFlow_9</bpmn2:incoming>
<bpmn2:incoming>SequenceFlow_18</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_25</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def duvm = new DoUpdateVfModule()
-duvm.prepUpdateAAIVfModule(execution)]]></bpmn2:script>
+duvm.prepUpdateAAIVfModule(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_25" name="" sourceRef="ScriptTask_10" targetRef="ScriptTask_11" />
<bpmn2:callActivity id="ScriptTask_11" name="UpdateAAIVfModule" calledElement="UpdateAAIVfModule">
@@ -83,9 +83,9 @@ duvm.prepUpdateAAIVfModule(execution)]]></bpmn2:script>
<bpmn2:scriptTask id="ScriptTask_12" name="SDNC Topology Activate (prep)" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_26</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_27</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def duvm = new DoUpdateVfModule()
-duvm.prepSDNCTopologyAct(execution)]]></bpmn2:script>
+duvm.prepSDNCTopologyAct(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_27" name="" sourceRef="ScriptTask_12" targetRef="ScriptTask_13" />
<bpmn2:callActivity id="ScriptTask_13" name="SDNCAdapter Topology Activate" calledElement="sdncAdapter">
@@ -104,9 +104,9 @@ duvm.prepSDNCTopologyAct(execution)]]></bpmn2:script>
<bpmn2:scriptTask id="ScriptTask_14" name="Update AAI Generic Vnf (prep)" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_24</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_13</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def duvm = new DoUpdateVfModule()
-duvm.prepUpdateAAIGenericVnf(execution)]]></bpmn2:script>
+duvm.prepUpdateAAIGenericVnf(execution)</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:sequenceFlow id="SequenceFlow_13" name="" sourceRef="ScriptTask_14" targetRef="ExclusiveGateway_1" />
<bpmn2:callActivity id="CallActivity_1" name="UpdateAAIGenericVnf" calledElement="UpdateAAIGenericVnf">
@@ -128,7 +128,7 @@ duvm.prepUpdateAAIGenericVnf(execution)]]></bpmn2:script>
</bpmn2:exclusiveGateway>
<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"><![CDATA[${execution.getVariable('DOUPVfMod_skipUpdateGenericVnf')} == true]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy">${execution.getVariable('DOUPVfMod_skipUpdateGenericVnf')} == true</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:startEvent id="StartEvent_1" name="Start">
<bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
@@ -138,9 +138,9 @@ duvm.prepUpdateAAIGenericVnf(execution)]]></bpmn2:script>
<bpmn2:incoming>SequenceFlow_16</bpmn2:incoming>
<bpmn2:incoming>SequenceFlow_17</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_12</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def duvm = new DoUpdateVfModule()
-duvm.prepSDNCTopologyChg(execution)]]></bpmn2:script>
+duvm.prepSDNCTopologyChg(execution)</bpmn2:script>
</bpmn2:scriptTask>
<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">
@@ -156,9 +156,9 @@ duvm.prepSDNCTopologyChg(execution)]]></bpmn2:script>
<bpmn2:incoming>SequenceFlow_12</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
</bpmn2:callActivity>
- <bpmn2:callActivity id="ScriptTask_9" name="VnfAdapterRest" calledElement="vnfAdapterTask">
+ <bpmn2:callActivity id="ScriptTask_9" name="VnfAdapterRest" calledElement="openstackAdapterTask">
<bpmn2:extensionElements>
- <camunda:in source="DOUPVfMod_vnfAdapterRestRequest" target="vnfAdapterTaskRequest" />
+ <camunda:in source="DOUPVfMod_vnfAdapterRestRequest" target="openstackAdapterTaskRequest" />
<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" />
@@ -171,18 +171,18 @@ duvm.prepSDNCTopologyChg(execution)]]></bpmn2:script>
<bpmn2:scriptTask id="ScriptTask_8" name="VNF Adapter (prep)" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_23</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_21</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def duvm = new DoUpdateVfModule()
-duvm.prepVnfAdapterRest(execution)]]></bpmn2:script>
+duvm.prepVnfAdapterRest(execution)</bpmn2:script>
</bpmn2:scriptTask>
<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>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
String response = execution.getVariable("DOUPVfMod_sdncTopologyResponse")
def duvm = new DoUpdateVfModule()
-duvm.validateSDNCResponse(execution, response, "query")]]></bpmn2:script>
+duvm.validateSDNCResponse(execution, response, "query")</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:callActivity id="ScriptTask_7" name="SDNCAdapter Topology Query" calledElement="sdncAdapter">
<bpmn2:extensionElements>
@@ -200,19 +200,19 @@ duvm.validateSDNCResponse(execution, response, "query")]]></bpmn2:script>
<bpmn2:scriptTask id="ScriptTask_18" name="Validate SDNC Change/Assign Response" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
String response = execution.getVariable("DOUPVfMod_sdncChangeAssignResponse")
def duvm = new DoUpdateVfModule()
-duvm.validateSDNCResponse(execution, response, "changeassign")]]></bpmn2:script>
+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:scriptTask id="ScriptTask_6" name="SDNC Topology Query (prep)" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_19</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def duvm = new DoUpdateVfModule()
-duvm.prepSDNCTopologyQuery(execution)]]></bpmn2:script>
+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" />
@@ -241,9 +241,9 @@ duvm.prepSDNCTopologyQuery(execution)]]></bpmn2:script>
<bpmn2:scriptTask id="ScriptTask_2" name="Confirm VolumeGroup Tenant (prep)" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_10</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_11</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def duvm = new DoUpdateVfModule()
-duvm.prepConfirmVolumeGroupTenant(execution)]]></bpmn2:script>
+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 &#10;&#10;present?" default="SequenceFlow_16">
@@ -252,18 +252,18 @@ duvm.prepConfirmVolumeGroupTenant(execution)]]></bpmn2:script>
<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"><![CDATA[${execution.getVariable('DOUPVfMod_volumeGroupId').isEmpty()} == false]]></bpmn2:conditionExpression>
+ <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy">${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_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:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy">execution.getVariable("DOUPVfMod_isBaseVfModule") == "true"</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:scriptTask id="QueryAAIVfModule" name="Query AAI Vf Module" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_30</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_34</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
def doUpdateVfModule = new DoUpdateVfModule()
-doUpdateVfModule.queryAAIVfModule(execution)]]></bpmn2:script>
+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" />
@@ -277,16 +277,16 @@ doUpdateVfModule.queryAAIVfModule(execution)]]></bpmn2:script>
<bpmn2:scriptTask id="ScriptTask_19" name="PostProcess SDNC Adapter Activate" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_20</bpmn2:outgoing>
- <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+ <bpmn2:script>import org.onap.so.bpmn.infrastructure.scripts.*
String response = execution.getVariable("DOUPVfMod_sdncActivateResponse")
def duvm = new DoUpdateVfModule()
-duvm.validateSDNCResponse(execution, response, "activate")]]></bpmn2:script>
+duvm.validateSDNCResponse(execution, response, "activate")</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:scriptTask id="ScriptTask_17" name="Set Success Indicator" scriptFormat="groovy">
<bpmn2:incoming>SequenceFlow_20</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
- <bpmn2:script><![CDATA[// This variable is checked by the unit test
-execution.setVariable('DoUpdateVfModuleSuccessIndicator', true)]]></bpmn2:script>
+ <bpmn2:script>// 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:endEvent id="EndEvent_1" name="TheEnd">
@@ -299,369 +299,369 @@ execution.setVariable('DoUpdateVfModuleSuccessIndicator', true)]]></bpmn2:script
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoUpdateVfModule">
<bpmndi:BPMNShape id="_BPMNShape_StartEvent_37" bpmnElement="StartEvent_1">
- <dc:Bounds x="150" y="214" width="36" height="36" />
+ <dc:Bounds x="230" y="214" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="151" y="255" width="34" height="22" />
+ <dc:Bounds x="236" y="255" width="25" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_22" bpmnElement="ProcessReceivedRequest">
- <dc:Bounds x="300" y="192" width="100" height="80" />
+ <dc:Bounds x="380" 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" y="232" />
- <di:waypoint xsi:type="dc:Point" x="300" y="232" />
+ <di:waypoint x="266" y="232" />
+ <di:waypoint x="380" y="232" />
<bpmndi:BPMNLabel>
<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 x="456" y="192" width="100" height="80" />
+ <dc:Bounds x="536" 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" y="232" />
- <di:waypoint xsi:type="dc:Point" x="456" y="232" />
+ <di:waypoint x="480" y="232" />
+ <di:waypoint x="536" y="232" />
<bpmndi:BPMNLabel>
<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 x="624" y="192" width="100" height="80" />
+ <dc:Bounds x="704" 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" y="232" />
- <di:waypoint xsi:type="dc:Point" x="624" y="232" />
+ <di:waypoint x="636" y="232" />
+ <di:waypoint x="704" y="232" />
<bpmndi:BPMNLabel>
<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 x="1039" y="206" width="50" height="50" />
+ <dc:Bounds x="1119" y="206" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1011" y="172" width="109" height="38" />
+ <dc:Bounds x="1108" y="172" width="76" height="40" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_165" bpmnElement="ScriptTask_2">
- <dc:Bounds x="1152" y="192" width="100" height="80" />
+ <dc:Bounds x="1232" 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" 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" />
+ <di:waypoint x="1169" y="231" />
+ <di:waypoint x="1198" y="231" />
+ <di:waypoint x="1198" y="232" />
+ <di:waypoint x="1232" y="232" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1099" y="231" width="29" height="22" />
+ <dc:Bounds x="1185" y="231" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_166" bpmnElement="ScriptTask_3">
- <dc:Bounds x="1308" y="192" width="100" height="80" />
+ <dc:Bounds x="1388" 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" y="232" />
- <di:waypoint xsi:type="dc:Point" x="1308" y="232" />
+ <di:waypoint x="1332" y="232" />
+ <di:waypoint x="1388" y="232" />
<bpmndi:BPMNLabel>
<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 x="72" y="420" width="100" height="80" />
+ <dc:Bounds x="152" y="420" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_168" bpmnElement="ScriptTask_5">
- <dc:Bounds x="239" y="420" width="100" height="80" />
+ <dc:Bounds x="319" y="420" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_169" bpmnElement="ScriptTask_6">
- <dc:Bounds x="535" y="420" width="100" height="80" />
+ <dc:Bounds x="615" 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" y="460" />
- <di:waypoint xsi:type="dc:Point" x="239" y="460" />
+ <di:waypoint x="252" y="460" />
+ <di:waypoint x="319" y="460" />
<bpmndi:BPMNLabel>
<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" 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" />
+ <di:waypoint x="1144" y="256" />
+ <di:waypoint x="1144" y="351" />
+ <di:waypoint x="202" y="351" />
+ <di:waypoint x="202" y="420" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1073" y="271" width="22" height="22" />
+ <dc:Bounds x="1157" y="271" width="15" height="14" />
</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" 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" />
+ <di:waypoint x="1438" y="272" />
+ <di:waypoint x="1438" y="352" />
+ <di:waypoint x="719" y="352" />
+ <di:waypoint x="202" y="352" />
+ <di:waypoint x="202" y="420" />
<bpmndi:BPMNLabel>
<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 x="684" y="420" width="100" height="80" />
+ <dc:Bounds x="764" 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" y="460" />
- <di:waypoint xsi:type="dc:Point" x="684" y="460" />
+ <di:waypoint x="715" y="460" />
+ <di:waypoint x="764" y="460" />
<bpmndi:BPMNLabel>
<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 x="996" y="420" width="100" height="80" />
+ <dc:Bounds x="1076" y="420" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_172" bpmnElement="ScriptTask_9">
- <dc:Bounds x="1176" y="420" width="100" height="80" />
+ <dc:Bounds x="1256" 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" y="460" />
- <di:waypoint xsi:type="dc:Point" x="1176" y="460" />
+ <di:waypoint x="1176" y="460" />
+ <di:waypoint x="1256" y="460" />
<bpmndi:BPMNLabel>
<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 x="466" y="636" width="100" height="80" />
+ <dc:Bounds x="546" y="636" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_174" bpmnElement="ScriptTask_11">
- <dc:Bounds x="624" y="636" width="100" height="80" />
+ <dc:Bounds x="704" 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" 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" />
+ <di:waypoint x="1306" y="500" />
+ <di:waypoint x="1306" y="576" />
+ <di:waypoint x="274" y="576" />
+ <di:waypoint x="274" y="636" />
<bpmndi:BPMNLabel>
<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" y="676" />
- <di:waypoint xsi:type="dc:Point" x="624" y="676" />
+ <di:waypoint x="646" y="676" />
+ <di:waypoint x="704" y="676" />
<bpmndi:BPMNLabel>
<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 x="804" y="636" width="100" height="80" />
+ <dc:Bounds x="884" y="636" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_176" bpmnElement="ScriptTask_13">
- <dc:Bounds x="984" y="636" width="100" height="80" />
+ <dc:Bounds x="1064" 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" y="676" />
- <di:waypoint xsi:type="dc:Point" x="804" y="676" />
+ <di:waypoint x="804" y="676" />
+ <di:waypoint x="884" y="676" />
<bpmndi:BPMNLabel>
<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" y="676" />
- <di:waypoint xsi:type="dc:Point" x="984" y="676" />
+ <di:waypoint x="984" y="676" />
+ <di:waypoint x="1064" y="676" />
<bpmndi:BPMNLabel>
<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 x="1208" y="906" width="36" height="36" />
+ <dc:Bounds x="1288" y="906" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1201" y="947" width="50" height="22" />
+ <dc:Bounds x="1287" y="947" width="38" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_SubProcess_21" bpmnElement="SubProcess_1" isExpanded="true">
- <dc:Bounds x="239" y="924" width="475" height="198" />
+ <dc:Bounds x="319" y="924" width="475" height="198" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_179" bpmnElement="ScriptTask_16">
- <dc:Bounds x="399" y="984" width="100" height="80" />
+ <dc:Bounds x="479" y="984" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_EndEvent_163" bpmnElement="EndEvent_3">
- <dc:Bounds x="617" y="1006" width="36" height="36" />
+ <dc:Bounds x="697" y="1006" width="36" height="36" />
<bpmndi:BPMNLabel>
<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" y="1024" />
- <di:waypoint xsi:type="dc:Point" x="617" y="1024" />
+ <di:waypoint x="579" y="1024" />
+ <di:waypoint x="697" y="1024" />
<bpmndi:BPMNLabel>
<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 x="696" y="1005" width="36" height="36" />
+ <dc:Bounds x="776" y="1005" width="36" height="36" />
<bpmndi:BPMNLabel>
<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 x="814" y="1005" width="36" height="36" />
+ <dc:Bounds x="894" y="1005" width="36" height="36" />
<bpmndi:BPMNLabel>
<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" y="1023" />
- <di:waypoint xsi:type="dc:Point" x="814" y="1023" />
+ <di:waypoint x="812" y="1023" />
+ <di:waypoint x="894" y="1023" />
<bpmndi:BPMNLabel>
<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 x="305" y="1006" width="36" height="36" />
+ <dc:Bounds x="385" y="1006" width="36" height="36" />
<bpmndi:BPMNLabel>
<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" y="1024" />
- <di:waypoint xsi:type="dc:Point" x="399" y="1024" />
+ <di:waypoint x="421" y="1024" />
+ <di:waypoint x="479" y="1024" />
<bpmndi:BPMNLabel>
<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 x="1176" y="768" width="100" height="80" />
+ <dc:Bounds x="1256" 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" y="848" />
- <di:waypoint xsi:type="dc:Point" x="1226" y="906" />
+ <di:waypoint x="1306" y="848" />
+ <di:waypoint x="1306" y="906" />
<bpmndi:BPMNLabel>
<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 x="144" y="636" width="100" height="80" />
+ <dc:Bounds x="224" y="636" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_CallActivity_2" bpmnElement="CallActivity_1">
- <dc:Bounds x="300" y="636" width="100" height="80" />
+ <dc:Bounds x="380" 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" y="676" />
- <di:waypoint xsi:type="dc:Point" x="466" y="676" />
+ <di:waypoint x="480" y="676" />
+ <di:waypoint x="546" y="676" />
<bpmndi:BPMNLabel>
<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" 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" />
+ <di:waypoint x="274" y="716" />
+ <di:waypoint x="275" y="793" />
+ <di:waypoint x="364" y="793" />
+ <di:waypoint x="404" y="793" />
<bpmndi:BPMNLabel>
<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 x="324" y="768" width="50" height="50" />
+ <dc:Bounds x="404" y="768" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="349" y="823" width="0" height="0" />
+ <dc:Bounds x="397" y="823" width="65" height="40" />
</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" y="768" />
- <di:waypoint xsi:type="dc:Point" x="350" y="716" />
+ <di:waypoint x="429" y="768" />
+ <di:waypoint x="430" y="716" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="357" y="733" width="80" height="22" />
+ <dc:Bounds x="442" y="733" width="70" height="14" />
</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" y="793" />
- <di:waypoint xsi:type="dc:Point" x="515" y="793" />
- <di:waypoint xsi:type="dc:Point" x="516" y="716" />
+ <di:waypoint x="454" y="793" />
+ <di:waypoint x="595" y="793" />
+ <di:waypoint x="596" y="716" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="380" y="768" width="97" height="22" />
+ <dc:Bounds x="470" y="768" width="77" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_220" bpmnElement="ScriptTask_15">
- <dc:Bounds x="840" y="420" width="100" height="80" />
+ <dc:Bounds x="920" y="420" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_221" bpmnElement="ScriptTask_18">
- <dc:Bounds x="384" y="420" width="100" height="80" />
+ <dc:Bounds x="464" 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" y="460" />
- <di:waypoint xsi:type="dc:Point" x="384" y="460" />
+ <di:waypoint x="419" y="460" />
+ <di:waypoint x="464" 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" y="460" />
- <di:waypoint xsi:type="dc:Point" x="535" y="460" />
+ <di:waypoint x="564" y="460" />
+ <di:waypoint x="615" y="460" />
<bpmndi:BPMNLabel>
<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" y="460" />
- <di:waypoint xsi:type="dc:Point" x="840" y="460" />
+ <di:waypoint x="864" y="460" />
+ <di:waypoint x="920" 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" y="460" />
- <di:waypoint xsi:type="dc:Point" x="996" y="460" />
+ <di:waypoint x="1020" y="460" />
+ <di:waypoint x="1076" y="460" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_214" bpmnElement="ExclusiveGateway_3" isMarkerVisible="true">
- <dc:Bounds x="965" y="206" width="50" height="50" />
+ <dc:Bounds x="1045" y="206" width="50" height="50" />
<bpmndi:BPMNLabel>
<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 x="770" y="206" width="50" height="50" />
+ <dc:Bounds x="850" y="206" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="795" y="261" width="0" height="0" />
+ <dc:Bounds x="848" y="261" width="55" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="_BPMNShape_ScriptTask_285" bpmnElement="QueryAAIVfModule">
- <dc:Bounds x="849" y="72" width="100" height="80" />
+ <dc:Bounds x="929" 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" 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" />
+ <di:waypoint x="804" y="232" />
+ <di:waypoint x="827" y="232" />
+ <di:waypoint x="827" y="231" />
+ <di:waypoint x="850" 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" y="231" />
- <di:waypoint xsi:type="dc:Point" x="965" y="231" />
+ <di:waypoint x="900" y="231" />
+ <di:waypoint x="1045" y="231" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="888" y="231" width="6" height="6" />
+ <dc:Bounds x="963" y="231" width="17" height="14" />
</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" y="231" />
- <di:waypoint xsi:type="dc:Point" x="1039" y="231" />
+ <di:waypoint x="1095" y="231" />
+ <di:waypoint x="1119" y="231" />
<bpmndi:BPMNLabel>
<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" y="206" />
- <di:waypoint xsi:type="dc:Point" x="795" y="112" />
- <di:waypoint xsi:type="dc:Point" x="849" y="112" />
+ <di:waypoint x="875" y="206" />
+ <di:waypoint x="875" y="112" />
+ <di:waypoint x="929" y="112" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="770" y="151" width="20" height="22" />
+ <dc:Bounds x="854" y="151" width="13" height="14" />
</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" 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" />
+ <di:waypoint x="1029" y="112" />
+ <di:waypoint x="1046" y="112" />
+ <di:waypoint x="1070" y="112" />
+ <di:waypoint x="1070" y="206" />
<bpmndi:BPMNLabel>
<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 x="1176" y="636" width="100" height="80" />
+ <dc:Bounds x="1256" 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" y="676" />
- <di:waypoint xsi:type="dc:Point" x="1176" y="676" />
+ <di:waypoint x="1164" y="676" />
+ <di:waypoint x="1256" y="676" />
<bpmndi:BPMNLabel>
<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" y="716" />
- <di:waypoint xsi:type="dc:Point" x="1226" y="768" />
+ <di:waypoint x="1306" y="716" />
+ <di:waypoint x="1306" y="768" />
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>