diff options
| author |   Benjamin, Max (mb388a) <mb388a@us.att.com> | 2018-10-11 13:55:37 -0400 |
|---|---|---|
| committer |   Rob Daugherty <rd472p@att.com> | 2018-10-12 10:10:16 -0400 |
| commit | 6ba0a22bc952232d14d2d24c5f73a42aae2791a9 (patch) | |
| tree | 9046e63bccb77ca3e2df4ae7ceab44cc238dd074 /bpmn/so-bpmn-infrastructure-flows/src | |
| parent | 58c1d90a787979e507f559d7075aac8a1428df42 (diff) | |
Dynamic Cloud Owner Support
added in cloud configuration object to request params
Fix Bean scanning so it picks up the resttemplate
removed unnecessary RestTemplate Bean configurations
corrected typo in CloudConfiguration class
updated gr api test cases with dynamic cloud owner
updated groovy files to allow for dynamic cloud owner values
updated GR API layer to include cloud owner
added enum for default cloud owner
add cloud owner variable to camunda in mapping
removed references to att-aic from BBInputSetup
updated aai schema dependency to 1.3.1 from 1.3.0
Fixed incorrect type AAIUri and updated logging in the method.
use existing service instance id instead of generating
Pass cloudOwner to process to propagate to subprocesses.
NOTE: our aai-schema dependency is 1.3.1-SNAPSHOT to be
compatible with the cloud owner changes here. The
releaesed 1.3.0 version is NOT compatible.
Change-Id: I43b46774b77981d1c8bfe7c7a79b9434889e62ae
Issue-ID: SO-1128
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
Signed-off-by: Rob Daugherty <rd472p@att.com>
Diffstat (limited to 'bpmn/so-bpmn-infrastructure-flows/src')
28 files changed, 358 insertions, 748 deletions
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateNetworkInstance.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateNetworkInstance.bpmn index 9b21b9309f..b35aa80b83 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateNetworkInstance.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateNetworkInstance.bpmn @@ -30,6 +30,7 @@ networkMod.processJavaException(execution)]]></bpmn2:script> <camunda:in source="networkId" target="networkId" /> <camunda:in source="networkName" target="networkName" /> <camunda:in source="networkModelInfo" target="networkModelInfo" /> + <camunda:in source="cloudOwner" target="cloudOwner" /> <camunda:in source="lcpCloudRegionId" target="lcpCloudRegionId" /> <camunda:in source="tenantId" target="tenantId" /> <camunda:in source="productFamilyId" target="productFamilyId" /> diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVcpeResCustService.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVcpeResCustService.bpmn index 3b49011c3e..7413e6df83 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVcpeResCustService.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVcpeResCustService.bpmn @@ -505,6 +505,7 @@ CreateVcpeResCustService.prepareCreateAllottedResourceBRG(execution)]]></bpmn2:s <camunda:in source="serviceInstanceId" target="serviceInstanceId" /> <camunda:in source="productFamilyId" target="productFamilyId" /> <camunda:in source="vnfModelInfo" target="vnfModelInfo" /> + <camunda:in source="cloudOwner" target="cloudOwner" /> <camunda:in source="lcpCloudRegionId" target="lcpCloudRegionId" /> <camunda:in source="tenantId" target="tenantId" /> <camunda:in source="sdncVersion" target="sdncVersion" /> diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVcpeResCustServiceV2.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVcpeResCustServiceV2.bpmn index 06c517c12d..bfbdc25f18 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVcpeResCustServiceV2.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVcpeResCustServiceV2.bpmn @@ -475,6 +475,7 @@ CreateVcpeResCustService.prepareCreateAllottedResourceTXC(execution)]]></bpmn2:s <camunda:in source="serviceInstanceId" target="serviceInstanceId" /> <camunda:in source="productFamilyId" target="productFamilyId" /> <camunda:in source="vnfModelInfo" target="vnfModelInfo" /> + <camunda:in source="cloudOwner" target="cloudOwner" /> <camunda:in source="lcpCloudRegionId" target="lcpCloudRegionId" /> <camunda:in source="tenantId" target="tenantId" /> <camunda:in source="sdncVersion" target="sdncVersion" /> diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVfModuleInfra.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVfModuleInfra.bpmn index eefc2ca12c..150d50232a 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVfModuleInfra.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVfModuleInfra.bpmn @@ -32,6 +32,7 @@ <camunda:in source="CVFMI_globalSubscriberId" target="globalSubscriberId" /> <camunda:in source="CVFMI_sdncVersion" target="sdncVersion" /> <camunda:in source="CVFMI_lcpCloudRegionId" target="lcpCloudRegionId" /> + <camunda:in source="CVFMI_cloudOwner" target="cloudOwner" /> <camunda:in source="CVFMI_tenantId" target="tenantId" /> <camunda:in source="CVFMI_vfModuleId" target="vfModuleId" /> <camunda:in source="CVFMI_vfModuleModelInfo" target="vfModuleModelInfo" /> diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVfModuleVolumeInfraV1.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVfModuleVolumeInfraV1.bpmn index dcdcdc9d26..c1e60ba46b 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVfModuleVolumeInfraV1.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVfModuleVolumeInfraV1.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="_CyftwG_HEeaKe-v4u9MasA" 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="_CyftwG_HEeaKe-v4u9MasA" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.8.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd"> <bpmn2:process id="CreateVfModuleVolumeInfraV1" name="CreateVfModuleVolumeInfraV1" isExecutable="true"> <bpmn2:startEvent id="StartEvent_createVfModuleVolumeInfraV1"> <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing> @@ -154,6 +154,7 @@ createVfModuleVolumeInfraV1.executeMethod('buildWorkflowException', execution, 2 <camunda:in source="vnfName" target="vnfName" /> <camunda:in source="volumeGroupName" target="volumeGroupName" /> <camunda:in source="vfModuleModelInfo" target="vfModuleModelInfo" /> + <camunda:in source="cloudOwner" target="cloudOwner" /> <camunda:in source="lcpCloudRegionId" target="lcpCloudRegionId" /> <camunda:in source="tenantId" target="tenantId" /> <camunda:in source="vnfType" target="vnfType" /> diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVnfInfra.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVnfInfra.bpmn index 6af8c2248e..d7d4561364 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVnfInfra.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVnfInfra.bpmn @@ -37,6 +37,7 @@ createVnf.sendSyncResponse(execution)]]></bpmn2:script> <camunda:out source="vnfOutputParameters" target="CREVI_vnfOutputParameters" /> <camunda:out source="WorkflowException" target="WorkflowException" /> <camunda:in source="CREVI_lcpCloudRegionId" target="lcpCloudRegionId" /> + <camunda:in source="CREVI_cloudOwner" target="cloudOwner" /> <camunda:in source="CREVI_tenantId" target="tenandId" /> <camunda:in source="CREVI_vnfResourceDecomposition" target="vnfResourceDecomposition" /> </bpmn2:extensionElements> diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/DeleteNetworkInstance.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/DeleteNetworkInstance.bpmn index a62e16525d..827dfb034d 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/DeleteNetworkInstance.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/DeleteNetworkInstance.bpmn @@ -30,6 +30,7 @@ networkMod.processJavaException(execution)]]></bpmn2:script> <camunda:in source="networkId" target="networkId" /> <camunda:in source="networkName" target="networkName" /> <camunda:in source="networkModelInfo" target="networkModelInfo" /> + <camunda:in source="cloudOwner" target="cloudOwner" /> <camunda:in source="lcpCloudRegionId" target="lcpCloudRegionId" /> <camunda:in source="tenantId" target="tenantId" /> <camunda:in source="productFamilyId" target="productFamilyId" /> diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/DeleteVcpeResCustService.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/DeleteVcpeResCustService.bpmn index 0d287ebca4..fd0d8ff27a 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/DeleteVcpeResCustService.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/DeleteVcpeResCustService.bpmn @@ -240,6 +240,7 @@ DeleteVcpeResCustService.getServiceInstance(execution)]]></bpmn2:script> <camunda:out source="rollbackData" target="rollbackData" /> <camunda:out source="WorkflowException" target="WorkflowException" /> <camunda:out source="rolledBack" target="rolledBack" /> + <camunda:in source="cloudOwner" target="cloudOwner" /> <camunda:in source="lcpCloudRegionId" target="lcpCloudRegionId" /> <camunda:in source="tenantId" target="tenantId" /> <camunda:in source="cloudConfiguration" target="cloudConfiguration" /> diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/ReplaceVnfInfra.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/ReplaceVnfInfra.bpmn index 6a157eb7c0..25b4f5de7f 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/ReplaceVnfInfra.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/ReplaceVnfInfra.bpmn @@ -362,6 +362,7 @@ uvfm.prepDoCreateVnfAndModules(execution)]]></bpmn2:script> <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" /> <camunda:in source="productFamilyId" target="productFamilyId" /> <camunda:in source="vnfModelInfo" target="vnfModelInfo" /> + <camunda:in source="cloudOwner" target="cloudOwner" /> <camunda:in source="lcpCloudRegionId" target="lcpCloudRegionId" /> <camunda:in source="tenantId" target="tenantId" /> <camunda:in source="sdncVersion" target="sdncVersion" /> diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateNetworkInstance.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateNetworkInstance.bpmn index e5236f92bf..50600bd49f 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateNetworkInstance.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateNetworkInstance.bpmn @@ -30,6 +30,7 @@ networkMod.processJavaException(execution)</bpmn2:script> <camunda:in source="networkId" target="networkId" /> <camunda:in source="networkName" target="networkName" /> <camunda:in source="networkModelInfo" target="networkModelInfo" /> + <camunda:in source="cloudOwner" target="cloudOwner" /> <camunda:in source="lcpCloudRegionId" target="lcpCloudRegionId" /> <camunda:in source="tenantId" target="tenantId" /> <camunda:in source="productFamilyId" target="productFamilyId" /> diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateVfModuleInfra.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateVfModuleInfra.bpmn index c35e7ece96..3c5fff2d24 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateVfModuleInfra.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateVfModuleInfra.bpmn @@ -122,6 +122,7 @@ uvfm.falloutHandlerPrep(execution, 'UPDVfModI_FalloutHandlerRequest') <camunda:in source="UPDVfModI_vnfModelInfo" target="vnfModelInfo" /> <camunda:in source="UPDVfModI_globalSubscriberId" target="globalSubscriberId" /> <camunda:in source="UPDVfModI_lcpCloudRegionId" target="lcpCloudRegionId" /> + <camunda:in source="UPDVfModI_cloudOwner" target="cloudOwner" /> <camunda:in source="UPDVfModI_tenantId" target="tenantId" /> <camunda:in source="UPDVfModI_sdncVersion" target="sdncVersion" /> <camunda:in source="UPDVfModI_vfModuleModelInfo" target="vfModuleModelInfo" /> diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateVfModuleInfraV2.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateVfModuleInfraV2.bpmn index 1efb127e33..8d30679849 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateVfModuleInfraV2.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateVfModuleInfraV2.bpmn @@ -164,6 +164,7 @@ uvfm.vfFlagSet(execution)]]></bpmn2:script> <camunda:in source="UPDVfModI_vnfModelInfo" target="vnfModelInfo" /> <camunda:in source="UPDVfModI_globalSubscriberId" target="globalSubscriberId" /> <camunda:in source="UPDVfModI_lcpCloudRegionId" target="lcpCloudRegionId" /> + <camunda:in source="UPDVfModI_cloudOwner" target="cloudOwner" /> <camunda:in source="UPDVfModI_tenantId" target="tenantId" /> <camunda:in source="UPDVfModI_sdncVersion" target="sdncVersion" /> <camunda:in source="UPDVfModI_vfModuleModelInfo" target="vfModuleModelInfo" /> diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateVnfInfra.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateVnfInfra.bpmn index e50eb7f805..71fc966233 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateVnfInfra.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/UpdateVnfInfra.bpmn @@ -142,6 +142,7 @@ uvfm.postProcessRollback(execution)]]></bpmn2:script> <camunda:in source="serviceModelInfo" target="serviceModelInfo" /> <camunda:in source="vnfModelInfo" target="vnfModelInfo" /> <camunda:in source="globalSubscriberId" target="globalSubscriberId" /> + <camunda:in source="cloudOwner" target="cloudOwner" /> <camunda:in source="lcpCloudRegionId" target="lcpCloudRegionId" /> <camunda:in source="tenantId" target="tenantId" /> <camunda:in source="sdncVersion" target="sdncVersion" /> diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn index 9cf21ddc52..01040ba914 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateE2EServiceInstance.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.11.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="1.10.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd"> <bpmn2:process id="DoCreateE2EServiceInstanceV3" name="DoCreateE2EServiceInstanceV3" isExecutable="true"> <bpmn2:startEvent id="createSI_startEvent" name="Start Flow"> <bpmn2:outgoing>SequenceFlow_1qiiycn</bpmn2:outgoing> @@ -12,21 +12,6 @@ def dcsi = new DoCreateE2EServiceInstance() dcsi.preProcessRequest(execution) ]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:callActivity id="CustomE2EPutService" name="Call Custom E2E Put Service" calledElement="CustomE2EPutService"> - <bpmn2:extensionElements> - <camunda:in source="globalSubscriberId" target="GENPS_globalSubscriberId" /> - <camunda:in source="serviceInstanceId" target="GENPS_serviceInstanceId" /> - <camunda:in source="serviceType" target="GENPS_serviceType" /> - <camunda:in sourceExpression="service-instance" target="GENPS_type" /> - <camunda:in source="serviceInstanceData" target="GENPS_payload" /> - <camunda:out source="GENPS_SuccessIndicator" target="GENPS_SuccessIndicator" /> - <camunda:in source="msoRequestId" target="GENPS_requesId" /> - <camunda:out source="WorkflowException" target="WorkflowException" /> - </bpmn2:extensionElements> - <bpmn2:incoming>SequenceFlow_1i7t9hq</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_129ih1g</bpmn2:outgoing> - </bpmn2:callActivity> - <bpmn2:sequenceFlow id="SequenceFlow_129ih1g" sourceRef="CustomE2EPutService" targetRef="ScriptTask_0q37vn9" /> <bpmn2:subProcess id="SubProcess_06d8lk8" name="Sub-process for Application Errors" triggeredByEvent="true"> <bpmn2:startEvent id="StartEvent_0yljq9y"> <bpmn2:outgoing>SequenceFlow_0tgrn11</bpmn2:outgoing> @@ -67,51 +52,17 @@ dcsi.postProcessRollback(execution) </bpmn2:scriptTask> <bpmn2:sequenceFlow id="SequenceFlow_1xzgv5k" sourceRef="ScriptTask_1p0vyip" targetRef="EndEvent_117lkk3" /> </bpmn2:subProcess> - <bpmn2:scriptTask id="ScriptTask_0q37vn9" name="Post Process AAI PUT" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_129ih1g</bpmn2:incoming> + <bpmn2:scriptTask id="ScriptTask_0q37vn9" name=" AAI Create (srv instance) " scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_012h7yx</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_1tkgqu3</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.* def ddsi = new DoCreateE2EServiceInstance() -ddsi.postProcessAAIPUT(execution)]]></bpmn2:script> +ddsi.createServiceInstance(execution)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_1qctzm0" sourceRef="Task_0uiekmn" targetRef="Task_0raqlqc" /> - <bpmn2:scriptTask id="Task_0uiekmn" name="Prepare Resource Oper Status" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_1e5j351</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_1qctzm0</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.* -def ddsi = new DoCreateE2EServiceInstance() -ddsi.preInitResourcesOperStatus(execution)]]></bpmn2:script> - </bpmn2:scriptTask> - <bpmn2:serviceTask id="Task_0raqlqc" name="Init Resource Oper Status"> - <bpmn2:extensionElements> - <camunda:connector> - <camunda:inputOutput> - <camunda:inputParameter name="url">${CVFMI_dbAdapterEndpoint}</camunda:inputParameter> - <camunda:inputParameter name="headers"> - <camunda:map> - <camunda:entry key="content-type">application/soap+xml</camunda:entry> - <camunda:entry key="Authorization">Basic QlBFTENsaWVudDpwYXNzd29yZDEk</camunda:entry> - </camunda:map> - </camunda:inputParameter> - <camunda:inputParameter name="payload">${CVFMI_initResOperStatusRequest}</camunda:inputParameter> - <camunda:inputParameter name="method">POST</camunda:inputParameter> - <camunda:outputParameter name="CVFMI_dbResponseCode">${statusCode}</camunda:outputParameter> - <camunda:outputParameter name="CVFMI_dbResponse">${response}</camunda:outputParameter> - </camunda:inputOutput> - <camunda:connectorId>http-connector</camunda:connectorId> - </camunda:connector> - </bpmn2:extensionElements> - <bpmn2:incoming>SequenceFlow_1qctzm0</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_1s5aas9</bpmn2:outgoing> - </bpmn2:serviceTask> <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_0bq4fxs" name="Go to Decompose_Service"> <bpmn2:incoming>SequenceFlow_0w9t6tc</bpmn2:incoming> <bpmn2:linkEventDefinition name="Decompose_Service" /> </bpmn2:intermediateThrowEvent> - <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_1mlbhmt" name="GoTo StartService"> - <bpmn2:incoming>SequenceFlow_012h7yx</bpmn2:incoming> - <bpmn2:linkEventDefinition name="StartService" /> - </bpmn2:intermediateThrowEvent> <bpmn2:scriptTask id="ScriptTask_1o01d7d" name="PostProcess Decompose Service " scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_0xjwb45</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_012h7yx</bpmn2:outgoing> @@ -152,17 +103,41 @@ dcsi.prepareDecomposeService(execution)]]></bpmn2:script> </bpmn2:intermediateThrowEvent> <bpmn2:sequenceFlow id="SequenceFlow_1tkgqu3" sourceRef="ScriptTask_0q37vn9" targetRef="IntermediateThrowEvent_16okck2" /> <bpmn2:sequenceFlow id="SequenceFlow_0w9t6tc" sourceRef="preProcessRequest_ScriptTask" targetRef="IntermediateThrowEvent_0bq4fxs" /> - <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_0jrb3xu" name="StartService"> - <bpmn2:outgoing>SequenceFlow_1i7t9hq</bpmn2:outgoing> - <bpmn2:linkEventDefinition name="StartService" /> - </bpmn2:intermediateCatchEvent> - <bpmn2:sequenceFlow id="SequenceFlow_1i7t9hq" sourceRef="IntermediateCatchEvent_0jrb3xu" targetRef="CustomE2EPutService" /> <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_05dus9b" name="StartPrepareResource"> - <bpmn2:outgoing>SequenceFlow_1hbesp9</bpmn2:outgoing> + <bpmn2:outgoing>SequenceFlow_0yuzaen</bpmn2:outgoing> <bpmn2:linkEventDefinition name="StartPrepareResource" /> </bpmn2:intermediateCatchEvent> - <bpmn2:sequenceFlow id="SequenceFlow_1hbesp9" sourceRef="IntermediateCatchEvent_05dus9b" targetRef="ScriptTask_0dpt36a" /> - <bpmn2:callActivity id="CallActivity_1ojtwas" name="Call DoCreateResources" calledElement="DoCreateResourcesV3"> + <bpmn2:sequenceFlow id="SequenceFlow_012h7yx" sourceRef="ScriptTask_1o01d7d" targetRef="ScriptTask_0q37vn9" /> + <bpmn2:scriptTask id="ScriptTask_1rzf8a1" name="Prepare Resource Oper Status" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_1y9rkfr</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_0n7nbx3</bpmn2:outgoing> + <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.* +def ddsi = new DoCreateE2EServiceInstance() +ddsi.preInitResourcesOperStatus(execution)]]></bpmn2:script> + </bpmn2:scriptTask> + <bpmn2:serviceTask id="ServiceTask_1asgesv" name="Init Resource Oper Status"> + <bpmn2:extensionElements> + <camunda:connector> + <camunda:inputOutput> + <camunda:inputParameter name="url">${CVFMI_dbAdapterEndpoint}</camunda:inputParameter> + <camunda:inputParameter name="headers"> + <camunda:map> + <camunda:entry key="content-type">application/soap+xml</camunda:entry> + <camunda:entry key="Authorization">Basic QlBFTENsaWVudDpwYXNzd29yZDEk</camunda:entry> + </camunda:map> + </camunda:inputParameter> + <camunda:inputParameter name="payload">${CVFMI_initResOperStatusRequest}</camunda:inputParameter> + <camunda:inputParameter name="method">POST</camunda:inputParameter> + <camunda:outputParameter name="CVFMI_dbResponseCode">${statusCode}</camunda:outputParameter> + <camunda:outputParameter name="CVFMI_dbResponse">${response}</camunda:outputParameter> + </camunda:inputOutput> + <camunda:connectorId>http-connector</camunda:connectorId> + </camunda:connector> + </bpmn2:extensionElements> + <bpmn2:incoming>SequenceFlow_0n7nbx3</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_0ckto7v</bpmn2:outgoing> + </bpmn2:serviceTask> + <bpmn2:callActivity id="CallActivity_1gae03e" name="Call DoCreateResources" calledElement="DoCreateResourcesV3"> <bpmn2:extensionElements> <camunda:in source="nsServiceName" target="nsServiceName" /> <camunda:in source="nsServiceDescription" target="nsServiceDescription" /> @@ -180,71 +155,62 @@ dcsi.prepareDecomposeService(execution)]]></bpmn2:script> <camunda:in source="uuiRequest" target="uuiRequest" /> <camunda:in source="msoRequestId" target="msoRequestId" /> </bpmn2:extensionElements> - <bpmn2:incoming>SequenceFlow_0bf6bzp</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_0d0c20n</bpmn2:outgoing> + <bpmn2:incoming>SequenceFlow_0b1dsaj</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_0sphcy5</bpmn2:outgoing> </bpmn2:callActivity> - <bpmn2:scriptTask id="ScriptTask_04b21gb" name="PreProcess for Add Resources" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_0p6ba92</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_0bf6bzp</bpmn2:outgoing> + <bpmn2:scriptTask id="ScriptTask_0ns08tn" name="PreProcess for Add Resources" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_022onug</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_0b1dsaj</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.* def csi = new DoCreateE2EServiceInstance() csi.preProcessForAddResource(execution)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:scriptTask id="ScriptTask_1y7jr4t" name="PostProcess for Add Resource" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_0d0c20n</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_0a6vgsu</bpmn2:outgoing> + <bpmn2:scriptTask id="ScriptTask_19t13rd" name="PostProcess for Add Resource" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_0sphcy5</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_18gnns6</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.* def csi = new DoCreateE2EServiceInstance() csi.postProcessForAddResource(execution)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_0bf6bzp" sourceRef="ScriptTask_04b21gb" targetRef="CallActivity_1ojtwas" /> - <bpmn2:sequenceFlow id="SequenceFlow_0d0c20n" sourceRef="CallActivity_1ojtwas" targetRef="ScriptTask_1y7jr4t" /> - <bpmn2:endEvent id="EndEvent_0hzmoug"> - <bpmn2:incoming>SequenceFlow_0a6vgsu</bpmn2:incoming> + <bpmn2:endEvent id="EndEvent_1x4kvfh"> + <bpmn2:incoming>SequenceFlow_18gnns6</bpmn2:incoming> </bpmn2:endEvent> - <bpmn2:sequenceFlow id="SequenceFlow_0a6vgsu" sourceRef="ScriptTask_1y7jr4t" targetRef="EndEvent_0hzmoug" /> - <bpmn2:sequenceFlow id="SequenceFlow_012h7yx" sourceRef="ScriptTask_1o01d7d" targetRef="IntermediateThrowEvent_1mlbhmt" /> - <bpmn2:scriptTask id="ScriptTask_0dpt36a" name="Process Site Location" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_1hbesp9</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_1e5j351</bpmn2:outgoing> + <bpmn2:scriptTask id="ScriptTask_0jxdler" name="Process Site Location" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_0yuzaen</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_1y9rkfr</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.* def dcsi= new DoCreateE2EServiceInstance() dcsi.doProcessSiteLocation(execution)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:scriptTask id="ScriptTask_1a5mdd6" name="Process Link TP Resource Allocation" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_1s5aas9</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_0p6ba92</bpmn2:outgoing> + <bpmn2:scriptTask id="ScriptTask_0ts3c3b" name="Process Link TP Resource Allocation" scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_0ckto7v</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_022onug</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.* def dcsi= new DoCreateE2EServiceInstance() dcsi.doTPResourcesAllocation(execution)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_0p6ba92" sourceRef="ScriptTask_1a5mdd6" targetRef="ScriptTask_04b21gb" /> - <bpmn2:sequenceFlow id="SequenceFlow_1s5aas9" sourceRef="Task_0raqlqc" targetRef="ScriptTask_1a5mdd6" /> - <bpmn2:sequenceFlow id="SequenceFlow_1e5j351" sourceRef="ScriptTask_0dpt36a" targetRef="Task_0uiekmn" /> + <bpmn2:sequenceFlow id="SequenceFlow_1y9rkfr" sourceRef="ScriptTask_0jxdler" targetRef="ScriptTask_1rzf8a1" /> + <bpmn2:sequenceFlow id="SequenceFlow_0n7nbx3" sourceRef="ScriptTask_1rzf8a1" targetRef="ServiceTask_1asgesv" /> + <bpmn2:sequenceFlow id="SequenceFlow_0ckto7v" sourceRef="ServiceTask_1asgesv" targetRef="ScriptTask_0ts3c3b" /> + <bpmn2:sequenceFlow id="SequenceFlow_0b1dsaj" sourceRef="ScriptTask_0ns08tn" targetRef="CallActivity_1gae03e" /> + <bpmn2:sequenceFlow id="SequenceFlow_0sphcy5" sourceRef="CallActivity_1gae03e" targetRef="ScriptTask_19t13rd" /> + <bpmn2:sequenceFlow id="SequenceFlow_022onug" sourceRef="ScriptTask_0ts3c3b" targetRef="ScriptTask_0ns08tn" /> + <bpmn2:sequenceFlow id="SequenceFlow_18gnns6" sourceRef="ScriptTask_19t13rd" targetRef="EndEvent_1x4kvfh" /> + <bpmn2:sequenceFlow id="SequenceFlow_0yuzaen" sourceRef="IntermediateCatchEvent_05dus9b" targetRef="ScriptTask_0jxdler" /> </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="DoCreateE2EServiceInstanceV3"> <bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="createSI_startEvent"> - <dc:Bounds x="18" y="-207" width="36" height="36" /> + <dc:Bounds x="9" y="-22" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="12" y="-166" width="50" height="12" /> + <dc:Bounds x="3" y="19" width="50" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_61" bpmnElement="preProcessRequest_ScriptTask"> - <dc:Bounds x="126" y="-229" width="100" height="80" /> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="CallActivity_0khp0qc_di" bpmnElement="CustomE2EPutService"> - <dc:Bounds x="478" y="54" width="100" height="80" /> + <dc:Bounds x="117" y="-44" width="100" height="80" /> </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="SequenceFlow_129ih1g_di" bpmnElement="SequenceFlow_129ih1g"> - <di:waypoint xsi:type="dc:Point" x="578" y="94" /> - <di:waypoint xsi:type="dc:Point" x="713" y="94" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="600.5" y="79" width="90" height="0" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="SubProcess_06d8lk8_di" bpmnElement="SubProcess_06d8lk8" isExpanded="true"> <dc:Bounds x="15" y="865" width="783" height="195" /> </bpmndi:BPMNShape> @@ -278,7 +244,7 @@ dcsi.doTPResourcesAllocation(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_0q37vn9_di" bpmnElement="ScriptTask_0q37vn9"> - <dc:Bounds x="713" y="54" width="100" height="80" /> + <dc:Bounds x="1012" y="106" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_0ocetux_di" bpmnElement="ScriptTask_0ocetux"> <dc:Bounds x="246" y="920" width="100" height="80" /> @@ -302,109 +268,77 @@ dcsi.doTPResourcesAllocation(execution)]]></bpmn2:script> <dc:Bounds x="679" y="960" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="SequenceFlow_1qctzm0_di" bpmnElement="SequenceFlow_1qctzm0"> - <di:waypoint xsi:type="dc:Point" x="376" y="300" /> - <di:waypoint xsi:type="dc:Point" x="447" y="300" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="367" y="279" width="90" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="ScriptTask_0v81r5h_di" bpmnElement="Task_0uiekmn"> - <dc:Bounds x="276" y="260" width="100" height="80" /> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="ServiceTask_14tnuxf_di" bpmnElement="Task_0raqlqc"> - <dc:Bounds x="447" y="260" width="100" height="80" /> - </bpmndi:BPMNShape> <bpmndi:BPMNShape id="IntermediateThrowEvent_11saqvj_di" bpmnElement="IntermediateThrowEvent_0bq4fxs"> - <dc:Bounds x="1315" y="-207" width="36" height="36" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="1290" y="-167" width="88" height="36" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="IntermediateThrowEvent_1mlbhmt_di" bpmnElement="IntermediateThrowEvent_1mlbhmt"> - <dc:Bounds x="1315" y="-57" width="36" height="36" /> + <dc:Bounds x="1306" y="-22" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1288" y="-16" width="90" height="12" /> + <dc:Bounds x="1281" y="18" width="88" height="36" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_1o01d7d_di" bpmnElement="ScriptTask_1o01d7d"> - <dc:Bounds x="713" y="-79" width="100" height="80" /> + <dc:Bounds x="704" y="106" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="CallActivity_0biblpc_di" bpmnElement="CallActivity_0biblpc"> - <dc:Bounds x="478" y="-79" width="100" height="80" /> + <dc:Bounds x="469" y="106" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_1cllqk3_di" bpmnElement="ScriptTask_1cllqk3"> - <dc:Bounds x="196" y="-79" width="100" height="80" /> + <dc:Bounds x="187" y="106" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="IntermediateCatchEvent_0tv85pg_di" bpmnElement="IntermediateCatchEvent_0tv85pg"> - <dc:Bounds x="26" y="-57" width="36" height="36" /> + <dc:Bounds x="17" y="128" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="2" y="-21" width="88" height="24" /> + <dc:Bounds x="-7" y="164" width="88" height="24" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0xjwb45_di" bpmnElement="SequenceFlow_0xjwb45"> - <di:waypoint xsi:type="dc:Point" x="578" y="-39" /> - <di:waypoint xsi:type="dc:Point" x="713" y="-39" /> + <di:waypoint xsi:type="dc:Point" x="569" y="146" /> + <di:waypoint xsi:type="dc:Point" x="704" y="146" /> <bpmndi:BPMNLabel> - <dc:Bounds x="645.5" y="-60" width="0" height="12" /> + <dc:Bounds x="592" y="125" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0qxzgvq_di" bpmnElement="SequenceFlow_0qxzgvq"> - <di:waypoint xsi:type="dc:Point" x="296" y="-39" /> - <di:waypoint xsi:type="dc:Point" x="478" y="-39" /> + <di:waypoint xsi:type="dc:Point" x="287" y="146" /> + <di:waypoint xsi:type="dc:Point" x="469" y="146" /> <bpmndi:BPMNLabel> - <dc:Bounds x="387" y="-60" width="0" height="12" /> + <dc:Bounds x="333" y="125" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1qiiycn_di" bpmnElement="SequenceFlow_1qiiycn"> - <di:waypoint xsi:type="dc:Point" x="54" y="-189" /> - <di:waypoint xsi:type="dc:Point" x="126" y="-189" /> + <di:waypoint xsi:type="dc:Point" x="45" y="-4" /> + <di:waypoint xsi:type="dc:Point" x="117" y="-4" /> <bpmndi:BPMNLabel> - <dc:Bounds x="90" y="-210" width="0" height="12" /> + <dc:Bounds x="36" y="-25" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_166w91p_di" bpmnElement="SequenceFlow_166w91p"> - <di:waypoint xsi:type="dc:Point" x="62" y="-39" /> - <di:waypoint xsi:type="dc:Point" x="196" y="-39" /> + <di:waypoint xsi:type="dc:Point" x="53" y="146" /> + <di:waypoint xsi:type="dc:Point" x="187" y="146" /> <bpmndi:BPMNLabel> - <dc:Bounds x="129" y="-60" width="0" height="12" /> + <dc:Bounds x="75" y="125" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="IntermediateThrowEvent_16okck2_di" bpmnElement="IntermediateThrowEvent_16okck2"> - <dc:Bounds x="1315" y="76" width="36" height="36" /> + <dc:Bounds x="1306" y="128" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1299" y="117" width="71" height="24" /> + <dc:Bounds x="1285" y="169" width="82" height="36" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1tkgqu3_di" bpmnElement="SequenceFlow_1tkgqu3"> - <di:waypoint xsi:type="dc:Point" x="813" y="94" /> - <di:waypoint xsi:type="dc:Point" x="1315" y="94" /> + <di:waypoint xsi:type="dc:Point" x="1112" y="146" /> + <di:waypoint xsi:type="dc:Point" x="1222" y="146" /> + <di:waypoint xsi:type="dc:Point" x="1222" y="146" /> + <di:waypoint xsi:type="dc:Point" x="1306" y="146" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1019" y="73" width="90" height="12" /> + <dc:Bounds x="1192" y="140" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0w9t6tc_di" bpmnElement="SequenceFlow_0w9t6tc"> - <di:waypoint xsi:type="dc:Point" x="226" y="-189" /> - <di:waypoint xsi:type="dc:Point" x="771" y="-189" /> - <di:waypoint xsi:type="dc:Point" x="771" y="-189" /> - <di:waypoint xsi:type="dc:Point" x="1315" y="-189" /> + <di:waypoint xsi:type="dc:Point" x="217" y="-4" /> + <di:waypoint xsi:type="dc:Point" x="762" y="-4" /> + <di:waypoint xsi:type="dc:Point" x="762" y="-4" /> + <di:waypoint xsi:type="dc:Point" x="1306" y="-4" /> <bpmndi:BPMNLabel> - <dc:Bounds x="786" y="-195" width="0" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="IntermediateCatchEvent_0jrb3xu_di" bpmnElement="IntermediateCatchEvent_0jrb3xu"> - <dc:Bounds x="18" y="76" width="36" height="36" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="8" y="112" width="60" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="SequenceFlow_1i7t9hq_di" bpmnElement="SequenceFlow_1i7t9hq"> - <di:waypoint xsi:type="dc:Point" x="54" y="94" /> - <di:waypoint xsi:type="dc:Point" x="266" y="94" /> - <di:waypoint xsi:type="dc:Point" x="266" y="94" /> - <di:waypoint xsi:type="dc:Point" x="478" y="94" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="236" y="88" width="90" height="12" /> + <dc:Bounds x="732" y="-10" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="IntermediateCatchEvent_05dus9b_di" bpmnElement="IntermediateCatchEvent_05dus9b"> @@ -413,83 +347,98 @@ dcsi.doTPResourcesAllocation(execution)]]></bpmn2:script> <dc:Bounds x="-3" y="318" width="82" height="24" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="SequenceFlow_1hbesp9_di" bpmnElement="SequenceFlow_1hbesp9"> - <di:waypoint xsi:type="dc:Point" x="54" y="300" /> - <di:waypoint xsi:type="dc:Point" x="102" y="300" /> + <bpmndi:BPMNEdge id="SequenceFlow_012h7yx_di" bpmnElement="SequenceFlow_012h7yx"> + <di:waypoint xsi:type="dc:Point" x="804" y="146" /> + <di:waypoint xsi:type="dc:Point" x="917" y="146" /> + <di:waypoint xsi:type="dc:Point" x="917" y="146" /> + <di:waypoint xsi:type="dc:Point" x="1012" y="146" /> <bpmndi:BPMNLabel> - <dc:Bounds x="33" y="279" width="90" height="12" /> + <dc:Bounds x="887" y="139" width="90" height="14" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="CallActivity_1ojtwas_di" bpmnElement="CallActivity_1ojtwas"> - <dc:Bounds x="971" y="260" width="100" height="80" /> + <bpmndi:BPMNShape id="ScriptTask_1rzf8a1_di" bpmnElement="ScriptTask_1rzf8a1"> + <dc:Bounds x="262" y="260" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ServiceTask_1asgesv_di" bpmnElement="ServiceTask_1asgesv"> + <dc:Bounds x="433" y="260" width="100" height="80" /> </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="ScriptTask_04b21gb_di" bpmnElement="ScriptTask_04b21gb"> - <dc:Bounds x="799" y="260" width="100" height="80" /> + <bpmndi:BPMNShape id="CallActivity_1gae03e_di" bpmnElement="CallActivity_1gae03e"> + <dc:Bounds x="957" y="260" width="100" height="80" /> </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="ScriptTask_1y7jr4t_di" bpmnElement="ScriptTask_1y7jr4t"> - <dc:Bounds x="1145" y="260" width="100" height="80" /> + <bpmndi:BPMNShape id="ScriptTask_0ns08tn_di" bpmnElement="ScriptTask_0ns08tn"> + <dc:Bounds x="785" y="260" width="100" height="80" /> </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="SequenceFlow_0bf6bzp_di" bpmnElement="SequenceFlow_0bf6bzp"> - <di:waypoint xsi:type="dc:Point" x="899" y="300" /> - <di:waypoint xsi:type="dc:Point" x="971" y="300" /> + <bpmndi:BPMNShape id="ScriptTask_19t13rd_di" bpmnElement="ScriptTask_19t13rd"> + <dc:Bounds x="1131" y="260" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="EndEvent_1x4kvfh_di" bpmnElement="EndEvent_1x4kvfh"> + <dc:Bounds x="1301" y="282" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="890" y="279" width="90" height="12" /> + <dc:Bounds x="1274" y="322" width="0" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ScriptTask_0jxdler_di" bpmnElement="ScriptTask_0jxdler"> + <dc:Bounds x="88" y="260" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="ScriptTask_0ts3c3b_di" bpmnElement="ScriptTask_0ts3c3b"> + <dc:Bounds x="599" y="260" width="100" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1y9rkfr_di" bpmnElement="SequenceFlow_1y9rkfr"> + <di:waypoint xsi:type="dc:Point" x="188" y="300" /> + <di:waypoint xsi:type="dc:Point" x="262" y="300" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="180" y="279" width="0" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="SequenceFlow_0d0c20n_di" bpmnElement="SequenceFlow_0d0c20n"> - <di:waypoint xsi:type="dc:Point" x="1071" y="300" /> - <di:waypoint xsi:type="dc:Point" x="1145" y="300" /> + <bpmndi:BPMNEdge id="SequenceFlow_0n7nbx3_di" bpmnElement="SequenceFlow_0n7nbx3"> + <di:waypoint xsi:type="dc:Point" x="362" y="300" /> + <di:waypoint xsi:type="dc:Point" x="433" y="300" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1063" y="279" width="90" height="12" /> + <dc:Bounds x="353.5" y="279" width="0" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="EndEvent_0hzmoug_di" bpmnElement="EndEvent_0hzmoug"> - <dc:Bounds x="1315" y="282.4076655052265" width="36" height="36" /> + <bpmndi:BPMNEdge id="SequenceFlow_0ckto7v_di" bpmnElement="SequenceFlow_0ckto7v"> + <di:waypoint xsi:type="dc:Point" x="533" y="300" /> + <di:waypoint xsi:type="dc:Point" x="599" y="300" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1333" y="322.4076655052265" width="0" height="12" /> + <dc:Bounds x="521" y="279" width="0" height="12" /> </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="SequenceFlow_0a6vgsu_di" bpmnElement="SequenceFlow_0a6vgsu"> - <di:waypoint xsi:type="dc:Point" x="1245" y="300" /> - <di:waypoint xsi:type="dc:Point" x="1315" y="300" /> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_0b1dsaj_di" bpmnElement="SequenceFlow_0b1dsaj"> + <di:waypoint xsi:type="dc:Point" x="885" y="300" /> + <di:waypoint xsi:type="dc:Point" x="957" y="300" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1235" y="279" width="90" height="12" /> + <dc:Bounds x="876" y="279" width="0" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="SequenceFlow_012h7yx_di" bpmnElement="SequenceFlow_012h7yx"> - <di:waypoint xsi:type="dc:Point" x="813" y="-39" /> - <di:waypoint xsi:type="dc:Point" x="1315" y="-39" /> + <bpmndi:BPMNEdge id="SequenceFlow_0sphcy5_di" bpmnElement="SequenceFlow_0sphcy5"> + <di:waypoint xsi:type="dc:Point" x="1057" y="300" /> + <di:waypoint xsi:type="dc:Point" x="1131" y="300" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1064" y="-61" width="0" height="14" /> + <dc:Bounds x="1049" y="279" width="0" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="ScriptTask_0dpt36a_di" bpmnElement="ScriptTask_0dpt36a"> - <dc:Bounds x="102" y="260" width="100" height="80" /> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="ScriptTask_1a5mdd6_di" bpmnElement="ScriptTask_1a5mdd6"> - <dc:Bounds x="613" y="260" width="100" height="80" /> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="SequenceFlow_0p6ba92_di" bpmnElement="SequenceFlow_0p6ba92"> - <di:waypoint xsi:type="dc:Point" x="713" y="300" /> - <di:waypoint xsi:type="dc:Point" x="799" y="300" /> + <bpmndi:BPMNEdge id="SequenceFlow_022onug_di" bpmnElement="SequenceFlow_022onug"> + <di:waypoint xsi:type="dc:Point" x="699" y="300" /> + <di:waypoint xsi:type="dc:Point" x="785" y="300" /> <bpmndi:BPMNLabel> - <dc:Bounds x="756" y="279" width="0" height="12" /> + <dc:Bounds x="697" y="279" width="0" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="SequenceFlow_1s5aas9_di" bpmnElement="SequenceFlow_1s5aas9"> - <di:waypoint xsi:type="dc:Point" x="547" y="300" /> - <di:waypoint xsi:type="dc:Point" x="613" y="300" /> + <bpmndi:BPMNEdge id="SequenceFlow_18gnns6_di" bpmnElement="SequenceFlow_18gnns6"> + <di:waypoint xsi:type="dc:Point" x="1231" y="300" /> + <di:waypoint xsi:type="dc:Point" x="1301" y="300" /> <bpmndi:BPMNLabel> - <dc:Bounds x="580" y="279" width="0" height="12" /> + <dc:Bounds x="1221" y="279" width="0" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="SequenceFlow_1e5j351_di" bpmnElement="SequenceFlow_1e5j351"> - <di:waypoint xsi:type="dc:Point" x="202" y="300" /> - <di:waypoint xsi:type="dc:Point" x="276" y="300" /> + <bpmndi:BPMNEdge id="SequenceFlow_0yuzaen_di" bpmnElement="SequenceFlow_0yuzaen"> + <di:waypoint xsi:type="dc:Point" x="54" y="300" /> + <di:waypoint xsi:type="dc:Point" x="88" y="300" /> <bpmndi:BPMNLabel> - <dc:Bounds x="239" y="279" width="0" height="12" /> + <dc:Bounds x="71" y="279" width="0" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> </bpmndi:BPMNPlane> </bpmndi:BPMNDiagram> -</bpmn2:definitions> +</bpmn2:definitions>
\ No newline at end of file diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateE2EServiceInstanceV2.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateE2EServiceInstanceV2.bpmn index 77c62e573d..c699f911d0 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateE2EServiceInstanceV2.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateE2EServiceInstanceV2.bpmn @@ -14,21 +14,6 @@ dcsi.preProcessRequest(execution) ]]></bpmn2:script> </bpmn2:scriptTask> <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="preProcessRequest_ScriptTask" targetRef="IntermediateThrowEvent_0aggdcl_GoToStartService" /> - <bpmn2:callActivity id="CustomE2EPutService" name="Call Custom E2E Put Service" calledElement="CustomE2EPutService"> - <bpmn2:extensionElements> - <camunda:in source="globalSubscriberId" target="GENPS_globalSubscriberId" /> - <camunda:in source="serviceInstanceId" target="GENPS_serviceInstanceId" /> - <camunda:in source="serviceType" target="GENPS_serviceType" /> - <camunda:in sourceExpression="service-instance" target="GENPS_type" /> - <camunda:in source="serviceInstanceData" target="GENPS_payload" /> - <camunda:out source="GENPS_SuccessIndicator" target="GENPS_SuccessIndicator" /> - <camunda:in source="msoRequestId" target="GENPS_requesId" /> - <camunda:out source="WorkflowException" target="WorkflowException" /> - </bpmn2:extensionElements> - <bpmn2:incoming>SequenceFlow_0zmz5am</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_129ih1g</bpmn2:outgoing> - </bpmn2:callActivity> - <bpmn2:sequenceFlow id="SequenceFlow_129ih1g" sourceRef="CustomE2EPutService" targetRef="ScriptTask_0q37vn9_PostProcessAAIPUT" /> <bpmn2:subProcess id="SubProcess_06d8lk8" name="Sub-process for Application Errors" triggeredByEvent="true"> <bpmn2:startEvent id="StartEvent_0yljq9y"> <bpmn2:outgoing>SequenceFlow_0tgrn11</bpmn2:outgoing> @@ -70,7 +55,7 @@ dcsi.postProcessRollback(execution) <bpmn2:sequenceFlow id="SequenceFlow_1xzgv5k" sourceRef="ScriptTask_1p0vyip" targetRef="EndEvent_117lkk3" /> </bpmn2:subProcess> <bpmn2:scriptTask id="ScriptTask_0q37vn9_PostProcessAAIPUT" name="Post Process AAI PUT" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_129ih1g</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_0zmz5am</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_03fabby</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.* def ddsi = new DoCreateE2EServiceInstanceV2() @@ -212,7 +197,7 @@ csi.postOtherControllerType(execution)]]></bpmn2:script> <bpmn2:outgoing>SequenceFlow_0zmz5am</bpmn2:outgoing> <bpmn2:linkEventDefinition name="StartService" /> </bpmn2:intermediateCatchEvent> - <bpmn2:sequenceFlow id="SequenceFlow_0zmz5am" sourceRef="StartEvent_0l5bz4h_StartService" targetRef="CustomE2EPutService" /> + <bpmn2:sequenceFlow id="SequenceFlow_0zmz5am" sourceRef="StartEvent_0l5bz4h_StartService" targetRef="ScriptTask_0q37vn9_PostProcessAAIPUT" /> <bpmn2:sequenceFlow id="SequenceFlow_1rhn48b" sourceRef="StartEvent_StartResource" targetRef="ExclusiveGateway_1pwgsa8" /> <bpmn2:intermediateCatchEvent id="StartEvent_StartResource" name="StartResource"> <bpmn2:outgoing>SequenceFlow_1rhn48b</bpmn2:outgoing> @@ -471,16 +456,6 @@ ddsi.preUpdateServiceOperationStatus(execution)]]></bpmn2:script> <dc:Bounds x="718" y="82" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="CallActivity_0khp0qc_di" bpmnElement="CustomE2EPutService"> - <dc:Bounds x="564" y="244" width="100" height="80" /> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="SequenceFlow_129ih1g_di" bpmnElement="SequenceFlow_129ih1g"> - <di:waypoint xsi:type="dc:Point" x="664" y="284" /> - <di:waypoint xsi:type="dc:Point" x="917" y="284" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="745.5" y="269" width="90" height="0" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="SubProcess_06d8lk8_di" bpmnElement="SubProcess_06d8lk8" isExpanded="true"> <dc:Bounds x="-11" y="1751" width="783" height="195" /> </bpmndi:BPMNShape> @@ -731,9 +706,9 @@ ddsi.preUpdateServiceOperationStatus(execution)]]></bpmn2:script> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0zmz5am_di" bpmnElement="SequenceFlow_0zmz5am"> <di:waypoint xsi:type="dc:Point" x="22" y="284" /> - <di:waypoint xsi:type="dc:Point" x="564" y="284" /> + <di:waypoint xsi:type="dc:Point" x="917" y="284" /> <bpmndi:BPMNLabel> - <dc:Bounds x="248" y="263" width="90" height="12" /> + <dc:Bounds x="424.5" y="263" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1rhn48b_di" bpmnElement="SequenceFlow_1rhn48b"> diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateServiceInstance.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateServiceInstance.bpmn index 2c6f5ee61d..e3f1d7721d 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateServiceInstance.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateServiceInstance.bpmn @@ -1,6 +1,6 @@ <?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:process id="DoCreateServiceInstance" name="DoCreateServiceInstance" isExecutable="true"> + <bpmn2:process id="DoCreateServiceInstance" name="DoCreateServiceInstance " isExecutable="true"> <bpmn2:startEvent id="createSI_startEvent" name="Start Flow"> <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing> </bpmn2:startEvent> @@ -12,7 +12,7 @@ def dcsi = new DoCreateServiceInstance() dcsi.getAAICustomerById(execution)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="getAAICustomerById_scriptTask" targetRef="callGenericPutService" /> + <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="getAAICustomerById_scriptTask" targetRef="ScriptTask_0q37vn9" /> <bpmn2:scriptTask id="preProcessRequest_ScriptTask" name="PreProcess Incoming Request" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing> @@ -54,20 +54,6 @@ dcsi.postProcessSDNCAssign(execution)]]></bpmn2:script> <bpmn2:sequenceFlow id="SequenceFlow_14" name="" sourceRef="PreProcessSDNCAssignRequest" targetRef="CallSDNCAdapterServiceTopologyAssign" /> <bpmn2:sequenceFlow id="SequenceFlow_9" name="" sourceRef="CallSDNCAdapterServiceTopologyAssign" targetRef="PostProcessSDNCAssignRequest" /> <bpmn2:sequenceFlow id="SequenceFlow_10" name="" sourceRef="PostProcessSDNCAssignRequest" targetRef="EndEvent_3" /> - <bpmn2:callActivity id="callGenericPutService" name="Call Generic Put Service" calledElement="GenericPutService"> - <bpmn2:extensionElements> - <camunda:in source="globalSubscriberId" target="GENPS_globalSubscriberId" /> - <camunda:in source="serviceInstanceId" target="GENPS_serviceInstanceId" /> - <camunda:in source="subscriptionServiceType" target="GENPS_serviceType" /> - <camunda:in sourceExpression="service-instance" target="GENPS_type" /> - <camunda:in source="serviceInstanceData" target="GENPS_payload" /> - <camunda:out source="GENPS_SuccessIndicator" target="GENPS_SuccessIndicator" /> - <camunda:in source="msoRequestId" target="GENPS_requesId" /> - <camunda:out source="WorkflowException" target="WorkflowException" /> - </bpmn2:extensionElements> - <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_1jhzmzn</bpmn2:outgoing> - </bpmn2:callActivity> <bpmn2:subProcess id="SubProcess_06d8lk8" name="Sub-process for Application Errors" triggeredByEvent="true"> <bpmn2:startEvent id="StartEvent_0yljq9y"> <bpmn2:outgoing>SequenceFlow_0tgrn11</bpmn2:outgoing> @@ -120,12 +106,12 @@ dcsi.postProcessRollback(execution) <bpmn2:sequenceFlow id="SequenceFlow_00v4npo" name="yes" sourceRef="ExclusiveGateway_1nk6aol" targetRef="EndEvent_10659gr"> <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{!execution.getVariable("sendToSDNC")}]]></bpmn2:conditionExpression> </bpmn2:sequenceFlow> - <bpmn2:scriptTask id="ScriptTask_0q37vn9" name="Post Process AAI PUT" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_1jhzmzn</bpmn2:incoming> + <bpmn2:scriptTask id="ScriptTask_0q37vn9" name=" AAI Create (svc instance) " scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_16sdyz9</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.* def ddsi = new DoCreateServiceInstance() -ddsi.postProcessAAIPUT(execution)]]></bpmn2:script> +ddsi.putServiceInstance(execution)]]></bpmn2:script> </bpmn2:scriptTask> <bpmn2:sequenceFlow id="SequenceFlow_0k0wn03" sourceRef="Task_0wj9ajs" targetRef="Task_1g8wthf" /> <bpmn2:scriptTask id="Task_0wj9ajs" name="Create Project" scriptFormat="groovy"> @@ -142,7 +128,6 @@ dcsi.createProject(execution)]]></bpmn2:script> def dcsi = new DoCreateServiceInstance() dcsi.createOwningEntity(execution)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_1jhzmzn" sourceRef="callGenericPutService" targetRef="ScriptTask_0q37vn9" /> <bpmn2:sequenceFlow id="SequenceFlow_0w5i6vf" sourceRef="Task_1g8wthf" targetRef="ExclusiveGateway_1nk6aol" /> <bpmn2:sequenceFlow id="SequenceFlow_16sdyz9" sourceRef="ScriptTask_0q37vn9" targetRef="Task_0wj9ajs" /> <bpmn2:subProcess id="SubProcess_1awd8cm" name="Sub-process for UnexpectedErrors" triggeredByEvent="true"> @@ -189,26 +174,25 @@ dcsi.processJavaException(execution)]]></bpmn2:script> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_ScriptTask_62"> <di:waypoint xsi:type="dc:Point" x="493" y="97" /> - <di:waypoint xsi:type="dc:Point" x="1022" y="97" /> - <di:waypoint xsi:type="dc:Point" x="1022" y="206" /> + <di:waypoint xsi:type="dc:Point" x="572" y="97" /> <bpmndi:BPMNLabel> - <dc:Bounds x="712.5" y="82" width="90" height="0" /> + <dc:Bounds x="487.5" y="82" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_EndEvent_177" bpmnElement="EndEvent_3"> - <dc:Bounds x="1004" y="1216" width="36" height="36" /> + <dc:Bounds x="1057" y="660" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="977" y="1257" width="90" height="0" /> + <dc:Bounds x="1030" y="701" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_334" bpmnElement="PreProcessSDNCAssignRequest"> - <dc:Bounds x="972" y="810" width="100" height="80" /> + <dc:Bounds x="1025" y="202" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_335" bpmnElement="PostProcessSDNCAssignRequest"> - <dc:Bounds x="972" y="1054" width="100" height="80" /> + <dc:Bounds x="1025" y="493" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_CallActivity_74" bpmnElement="CallSDNCAdapterServiceTopologyAssign"> - <dc:Bounds x="972" y="930" width="100" height="80" /> + <dc:Bounds x="1025" y="339" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_61" targetElement="_BPMNShape_ScriptTask_62"> <di:waypoint xsi:type="dc:Point" x="345" y="97" /> @@ -218,29 +202,30 @@ dcsi.processJavaException(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_ScriptTask_334" targetElement="_BPMNShape_CallActivity_74"> - <di:waypoint xsi:type="dc:Point" x="1020" y="890" /> - <di:waypoint xsi:type="dc:Point" x="1020" y="930" /> + <di:waypoint xsi:type="dc:Point" x="1073" y="282" /> + <di:waypoint xsi:type="dc:Point" x="1073" y="339" /> <bpmndi:BPMNLabel> - <dc:Bounds x="990" y="910" width="90" height="0" /> + <dc:Bounds x="1043" y="310.5" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_CallActivity_74" targetElement="_BPMNShape_ScriptTask_335"> - <di:waypoint xsi:type="dc:Point" x="1022" y="1010" /> - <di:waypoint xsi:type="dc:Point" x="1022" y="1054" /> + <di:waypoint xsi:type="dc:Point" x="1075" y="419" /> + <di:waypoint xsi:type="dc:Point" x="1075" y="459" /> + <di:waypoint xsi:type="dc:Point" x="1075" y="459" /> + <di:waypoint xsi:type="dc:Point" x="1075" y="493" /> <bpmndi:BPMNLabel> - <dc:Bounds x="992" y="1032" width="90" height="0" /> + <dc:Bounds x="1045" y="459" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_ScriptTask_335"> - <di:waypoint xsi:type="dc:Point" x="1023" y="1134" /> - <di:waypoint xsi:type="dc:Point" x="1022" y="1216" /> + <di:waypoint xsi:type="dc:Point" x="1076" y="573" /> + <di:waypoint xsi:type="dc:Point" x="1076" y="617" /> + <di:waypoint xsi:type="dc:Point" x="1075" y="617" /> + <di:waypoint xsi:type="dc:Point" x="1075" y="660" /> <bpmndi:BPMNLabel> - <dc:Bounds x="977.5" y="1160" width="90" height="0" /> + <dc:Bounds x="1030.5" y="602" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="CallActivity_0khp0qc_di" bpmnElement="callGenericPutService"> - <dc:Bounds x="972" y="206" width="100" height="80" /> - </bpmndi:BPMNShape> <bpmndi:BPMNShape id="SubProcess_06d8lk8_di" bpmnElement="SubProcess_06d8lk8" isExpanded="true"> <dc:Bounds x="99" y="531" width="783" height="195" /> </bpmndi:BPMNShape> @@ -274,31 +259,29 @@ dcsi.processJavaException(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ExclusiveGateway_1nk6aol_di" bpmnElement="ExclusiveGateway_1nk6aol" isMarkerVisible="true"> - <dc:Bounds x="997" y="717" width="50" height="50" /> + <dc:Bounds x="1050" y="72" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="898" y="729" width="86" height="36" /> + <dc:Bounds x="1032" y="32" width="86" height="36" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_156ih25_di" bpmnElement="SequenceFlow_156ih25"> - <di:waypoint xsi:type="dc:Point" x="1022" y="767" /> - <di:waypoint xsi:type="dc:Point" x="1022" y="810" /> + <di:waypoint xsi:type="dc:Point" x="1075" y="122" /> + <di:waypoint xsi:type="dc:Point" x="1075" y="202" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1039" y="770" width="12" height="12" /> + <dc:Bounds x="1084" y="134.8139534883721" width="12" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="EndEvent_10659gr_di" bpmnElement="EndEvent_10659gr"> - <dc:Bounds x="1105" y="724" width="36" height="36" /> + <dc:Bounds x="1168" y="79" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1078" y="765" width="90" height="0" /> + <dc:Bounds x="1141" y="120" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_00v4npo_di" bpmnElement="SequenceFlow_00v4npo"> - <di:waypoint xsi:type="dc:Point" x="1047" y="742" /> - <di:waypoint xsi:type="dc:Point" x="1075" y="742" /> - <di:waypoint xsi:type="dc:Point" x="1075" y="742" /> - <di:waypoint xsi:type="dc:Point" x="1105" y="742" /> + <di:waypoint xsi:type="dc:Point" x="1100" y="97" /> + <di:waypoint xsi:type="dc:Point" x="1168" y="97" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1050.5" y="718" width="18" height="12" /> + <dc:Bounds x="1108.5" y="99.57142857142858" width="19" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_0ocetux_di" bpmnElement="ScriptTask_0ocetux"> @@ -324,40 +307,33 @@ dcsi.processJavaException(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_0q37vn9_di" bpmnElement="ScriptTask_0q37vn9"> - <dc:Bounds x="972" y="336" width="100" height="80" /> + <dc:Bounds x="572" y="57" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_0k0wn03_di" bpmnElement="SequenceFlow_0k0wn03"> - <di:waypoint xsi:type="dc:Point" x="1022" y="541" /> - <di:waypoint xsi:type="dc:Point" x="1022" y="589" /> + <di:waypoint xsi:type="dc:Point" x="833" y="97" /> + <di:waypoint xsi:type="dc:Point" x="886" y="97" /> <bpmndi:BPMNLabel> - <dc:Bounds x="992" y="559" width="90" height="12" /> + <dc:Bounds x="814.5" y="76" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_0v8y3ex_di" bpmnElement="Task_0wj9ajs"> - <dc:Bounds x="972" y="461" width="100" height="80" /> + <dc:Bounds x="733" y="57" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_0lndrbk_di" bpmnElement="Task_1g8wthf"> - <dc:Bounds x="972" y="589" width="100" height="80" /> + <dc:Bounds x="886" y="57" width="100" height="80" /> </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="SequenceFlow_1jhzmzn_di" bpmnElement="SequenceFlow_1jhzmzn"> - <di:waypoint xsi:type="dc:Point" x="1022" y="286" /> - <di:waypoint xsi:type="dc:Point" x="1022" y="336" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="1037" y="305" width="0" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0w5i6vf_di" bpmnElement="SequenceFlow_0w5i6vf"> - <di:waypoint xsi:type="dc:Point" x="1022" y="669" /> - <di:waypoint xsi:type="dc:Point" x="1022" y="717" /> + <di:waypoint xsi:type="dc:Point" x="986" y="97" /> + <di:waypoint xsi:type="dc:Point" x="1050" y="97" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1037" y="687" width="0" height="12" /> + <dc:Bounds x="973" y="76" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_16sdyz9_di" bpmnElement="SequenceFlow_16sdyz9"> - <di:waypoint xsi:type="dc:Point" x="1022" y="416" /> - <di:waypoint xsi:type="dc:Point" x="1022" y="461" /> + <di:waypoint xsi:type="dc:Point" x="672" y="97" /> + <di:waypoint xsi:type="dc:Point" x="733" y="97" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1037" y="432.5" width="0" height="12" /> + <dc:Bounds x="657.5" y="76" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="SubProcess_1awd8cm_di" bpmnElement="SubProcess_1awd8cm" isExpanded="true"> 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 820d1174be..c16061edb2 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.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="_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:process id="DoCreateVfModule" name="DoCreateVfModule" isExecutable="true"> <bpmn2:startEvent id="StartEvent_1" name="Start"> <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing> @@ -400,13 +400,13 @@ doCreateVfModule.prepUpdateAAIGenericVnf(execution)]]></bpmn2:script> <bpmn2:outgoing>SequenceFlow_112los9</bpmn2:outgoing> </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="QueryVNF"> + <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: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_0d00zqi</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_0m382su</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_0g270u0</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.* def doCreateVfModule = new DoCreateVfModule() @@ -435,19 +435,7 @@ String response = execution.getVariable("DCVFM_getVnfSDNCAdapterResponse") def doCreateVfModule = new DoCreateVfModule() doCreateVfModule.validateSDNCResponse(execution, response, "get")]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_0d00zqi" sourceRef="QueryVNF" targetRef="PreProcessSDNCVnfGetRequest" /> <bpmn2:sequenceFlow id="SequenceFlow_170kw7h" sourceRef="PostProcessSDNCVnfGetRequest" targetRef="IntermediateThrowEvent_3" /> - <bpmn2:callActivity id="QueryVNF" name="Query VNF" calledElement="GenericGetVnf"> - <bpmn2:extensionElements> - <camunda:in source="DCVFM_vnfId" target="GENGV_vnfId" /> - <camunda:in source="DCVFM_vnfTypeToQuery" target="GENGV_type" /> - <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" /> - <camunda:out source="GENGV_vnf" target="DCVFM_vnfQueryResponse" /> - <camunda:out source="WorkflowException" target="WorkflowException" /> - </bpmn2:extensionElements> - <bpmn2:incoming>SequenceFlow_0m382su</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_0d00zqi</bpmn2:outgoing> - </bpmn2:callActivity> <bpmn2:sequenceFlow id="SequenceFlow_1f53tby" sourceRef="Task_0kuj2a1" targetRef="IntermediateThrowEvent_1" /> <bpmn2:exclusiveGateway id="ExclusiveGateway_0ffvqla" name="Is vf_module_name specified?" default="SequenceFlow_0270n5c"> <bpmn2:incoming>SequenceFlow_1y1ttqe</bpmn2:incoming> @@ -1248,9 +1236,9 @@ doCreateVfModule.preProcessUpdateAAIVfModuleRequestStatus(execution, 'Assigned') <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="1513" y="521" /> + <di:waypoint xsi:type="dc:Point" x="1666" y="521" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1439" y="459.5" width="18" height="12" /> + <dc:Bounds x="1363.5900806639468" y="422.98801391242307" width="19" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_0g270u0_di" bpmnElement="SequenceFlow_0g270u0"> @@ -1276,13 +1264,6 @@ doCreateVfModule.preProcessUpdateAAIVfModuleRequestStatus(execution, 'Assigned') <bpmndi:BPMNShape id="ScriptTask_09wgk9p_di" bpmnElement="PostProcessSDNCVnfGetRequest"> <dc:Bounds x="1969" y="481" width="100" height="80" /> </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="SequenceFlow_0d00zqi_di" bpmnElement="SequenceFlow_0d00zqi"> - <di:waypoint xsi:type="dc:Point" x="1613" y="521" /> - <di:waypoint xsi:type="dc:Point" x="1666" y="521" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="1640" y="506" width="0" height="0" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> <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" /> @@ -1292,9 +1273,6 @@ doCreateVfModule.preProcessUpdateAAIVfModuleRequestStatus(execution, 'Assigned') <dc:Bounds x="2146" y="447.5" width="0" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="CallActivity_0xev9kl_di" bpmnElement="QueryVNF"> - <dc:Bounds x="1513" y="481" width="100" height="80" /> - </bpmndi:BPMNShape> <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" /> diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVnf.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVnf.bpmn index a093beae91..50436352ea 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVnf.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVnf.bpmn @@ -13,44 +13,8 @@ DoCreateVnf createVnf = new DoCreateVnf() createVnf.preProcessRequest(execution)]]></bpmn2:script> </bpmn2:scriptTask> <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="initialization" targetRef="callGetService" /> - <bpmn2:exclusiveGateway id="vnfExist" name="Vnf Already Exist?" default="vnfExistYes"> - <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming> - <bpmn2:outgoing>vnfExistYes</bpmn2:outgoing> - <bpmn2:outgoing>vnfExistNo</bpmn2:outgoing> - </bpmn2:exclusiveGateway> - <bpmn2:sequenceFlow id="vnfExistYes" name="Yes" sourceRef="vnfExist" targetRef="vnfExistWorkflowException" /> - <bpmn2:sequenceFlow id="vnfExistNo" name="No" sourceRef="vnfExist" targetRef="prepareCreateGenericVnf"> - <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("GENGV_FoundIndicator" ) == false && execution.getVariable("GENGV_SuccessIndicator" ) == true}]]></bpmn2:conditionExpression> - </bpmn2:sequenceFlow> - <bpmn2:callActivity id="callGetVnf" name="Get Generic Vnf" calledElement="GenericGetVnf"> - <bpmn2:extensionElements> - <camunda:in source="DoCVNF_vnfName" target="GENGV_vnfName" /> - <camunda:in source="DoCVNF_type" target="GENGV_type" /> - <camunda:out source="GENGV_vnf" target="CRTVI_genericVnf" /> - <camunda:out source="GENGV_FoundIndicator" target="GENGV_FoundIndicator" /> - <camunda:out source="GENGV_SuccessIndicator" target="GENGV_SuccessIndicator" /> - <camunda:out source="WorkflowException" target="WorkflowException" /> - <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" /> - </bpmn2:extensionElements> - <bpmn2:incoming>VnfNameSpecified1</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing> - </bpmn2:callActivity> - <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="callGetVnf" targetRef="vnfExist" /> - <bpmn2:scriptTask id="vnfExistWorkflowException" name="Create Workflow Exception" scriptFormat="groovy"> - <bpmn2:incoming>vnfExistYes</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_10</bpmn2:outgoing> - <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.* -ExceptionUtil exceptionUtil = new ExceptionUtil() -exceptionUtil.buildWorkflowException(execution, 5000, "Generic Vnf Already Exist.")]]></bpmn2:script> - </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_10" name="" sourceRef="vnfExistWorkflowException" targetRef="EndEvent_2" /> - <bpmn2:endEvent id="EndEvent_2"> - <bpmn2:incoming>SequenceFlow_10</bpmn2:incoming> - <bpmn2:errorEventDefinition id="ErrorEventDefinition_2" errorRef="Error_2" /> - </bpmn2:endEvent> <bpmn2:scriptTask id="prepareCreateGenericVnf" name=" AAI Create (generic vnf) " scriptFormat="groovy"> - <bpmn2:incoming>vnfExistNo</bpmn2:incoming> - <bpmn2:incoming>VnfNameNotSpecified1</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_11b2sf3</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_11</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.* DoCreateVnf createVnf = new DoCreateVnf() @@ -162,15 +126,6 @@ createVnfInfra.validateSDNCResponse(execution, response, "activate")]]></bpmn2:s DoCreateVnf createVnf = new DoCreateVnf() createVnf.postProcessCreateGenericVnf(execution)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:exclusiveGateway id="ExclusiveGateway_0j73e7c" name="Vnf-name specified?" default="VnfNameSpecified1"> - <bpmn2:incoming>SequenceFlow_1mvplyi</bpmn2:incoming> - <bpmn2:outgoing>VnfNameNotSpecified1</bpmn2:outgoing> - <bpmn2:outgoing>VnfNameSpecified1</bpmn2:outgoing> - </bpmn2:exclusiveGateway> - <bpmn2:sequenceFlow id="VnfNameNotSpecified1" name="No" sourceRef="ExclusiveGateway_0j73e7c" targetRef="prepareCreateGenericVnf"> - <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DoCVNF_vnfName" ) == null}]]></bpmn2:conditionExpression> - </bpmn2:sequenceFlow> - <bpmn2:sequenceFlow id="VnfNameSpecified1" name="Yes" sourceRef="ExclusiveGateway_0j73e7c" targetRef="callGetVnf" /> <bpmn2:sequenceFlow id="SequenceFlow_1h9jdgr" sourceRef="PreProcessSDNCGetRequest" targetRef="CallSDNCAdapterVNFTopologyGet" /> <bpmn2:sequenceFlow id="SequenceFlow_14xac2y" sourceRef="CallSDNCAdapterVNFTopologyGet" targetRef="PostProcessSDNCGetRequest" /> <bpmn2:sequenceFlow id="SequenceFlow_1q1poly" sourceRef="PostProcessSDNCGetRequest" targetRef="preProcessSDNCActivateRequest" /> @@ -236,12 +191,12 @@ doCreateVnf.prepUpdateAAIGenericVnf(execution)]]></bpmn2:script> </bpmn2:scriptTask> <bpmn2:scriptTask id="callGetService" name="AAI Query (svc instance)" scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_1mvplyi</bpmn2:outgoing> + <bpmn2:outgoing>SequenceFlow_11b2sf3</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.* DoCreateVnf createVnf = new DoCreateVnf() createVnf.getServiceInstance(execution)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_1mvplyi" sourceRef="callGetService" targetRef="ExclusiveGateway_0j73e7c" /> + <bpmn2:sequenceFlow id="SequenceFlow_11b2sf3" sourceRef="callGetService" targetRef="prepareCreateGenericVnf" /> </bpmn2:process> <bpmn2:error id="Error_1" name="Java Lang Exception" errorCode="java.lang.Exception" /> <bpmn2:error id="Error_2" name="MSO Workflow Exception" errorCode="MSOWorkflowException" /> @@ -265,62 +220,14 @@ createVnf.getServiceInstance(execution)]]></bpmn2:script> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_285"> <di:waypoint xsi:type="dc:Point" x="338" y="240" /> - <di:waypoint xsi:type="dc:Point" x="425" y="240" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="336.5" y="225" width="90" height="0" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="_BPMNShape_CallActivity_60" bpmnElement="callGetVnf"> - <dc:Bounds x="720" y="288" width="100" height="80" /> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_232" bpmnElement="vnfExist" isMarkerVisible="true"> - <dc:Bounds x="854" y="302" width="50" height="50" /> + <di:waypoint xsi:type="dc:Point" x="493" y="240" /> <bpmndi:BPMNLabel> - <dc:Bounds x="890" y="332" width="114" height="22" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_CallActivity_60" targetElement="_BPMNShape_ExclusiveGateway_232"> - <di:waypoint xsi:type="dc:Point" x="820" y="328" /> - <di:waypoint xsi:type="dc:Point" x="854" y="327" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="804" y="330" width="6" height="6" /> + <dc:Bounds x="370.5" y="225" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_299" bpmnElement="vnfExistWorkflowException"> - <dc:Bounds x="926" y="367" width="100" height="80" /> - </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_300" bpmnElement="prepareCreateGenericVnf"> - <dc:Bounds x="959" y="200" width="100" height="80" /> + <dc:Bounds x="781" y="200" width="100" height="80" /> </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="vnfExistYes" sourceElement="_BPMNShape_ExclusiveGateway_232" targetElement="_BPMNShape_ScriptTask_299"> - <di:waypoint xsi:type="dc:Point" x="879" y="352" /> - <di:waypoint xsi:type="dc:Point" x="879" y="407" /> - <di:waypoint xsi:type="dc:Point" x="926" y="407" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="880" y="367" width="29" height="22" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="vnfExistNo" sourceElement="_BPMNShape_ExclusiveGateway_232" targetElement="_BPMNShape_ScriptTask_300"> - <di:waypoint xsi:type="dc:Point" x="879" y="302" /> - <di:waypoint xsi:type="dc:Point" x="879" y="240" /> - <di:waypoint xsi:type="dc:Point" x="959" y="240" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="884" y="254" width="14" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNShape id="_BPMNShape_EndEvent_227" bpmnElement="EndEvent_2"> - <dc:Bounds x="1092" y="389" width="36" height="36" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="1110" y="430" width="0" height="0" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_ScriptTask_299" targetElement="_BPMNShape_EndEvent_227"> - <di:waypoint xsi:type="dc:Point" x="1026" y="407" /> - <di:waypoint xsi:type="dc:Point" x="1092" y="407" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="1034" y="407" width="6" height="6" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_EndEvent_228" bpmnElement="EndEvent_3"> <dc:Bounds x="1765" y="537" width="36" height="36" /> <bpmndi:BPMNLabel> @@ -328,10 +235,10 @@ createVnf.getServiceInstance(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="SequenceFlow_11" sourceElement="_BPMNShape_ScriptTask_300" targetElement="ScriptTask_0y55cyz_di"> - <di:waypoint xsi:type="dc:Point" x="1059" y="240" /> + <di:waypoint xsi:type="dc:Point" x="881" y="240" /> <di:waypoint xsi:type="dc:Point" x="1146" y="240" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1057.5" y="225" width="90" height="0" /> + <dc:Bounds x="968.5" y="225" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_SubProcess_32" bpmnElement="javaErrorHandlingSubProcess" isExpanded="true"> @@ -454,27 +361,6 @@ createVnf.getServiceInstance(execution)]]></bpmn2:script> <bpmndi:BPMNShape id="ScriptTask_0y55cyz_di" bpmnElement="postProcessCreateGenericVnf"> <dc:Bounds x="1146" y="200" width="100" height="80" /> </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="ExclusiveGateway_0j73e7c_di" bpmnElement="ExclusiveGateway_0j73e7c" isMarkerVisible="true"> - <dc:Bounds x="646" y="215" width="50" height="50" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="653" y="184" width="51" height="24" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="SequenceFlow_0k2oavy_di" bpmnElement="VnfNameNotSpecified1"> - <di:waypoint xsi:type="dc:Point" x="696" y="240" /> - <di:waypoint xsi:type="dc:Point" x="959" y="240" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="821.0502092050209" y="215" width="14" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="SequenceFlow_1pwgmrg_di" bpmnElement="VnfNameSpecified1"> - <di:waypoint xsi:type="dc:Point" x="671" y="265" /> - <di:waypoint xsi:type="dc:Point" x="671" y="328" /> - <di:waypoint xsi:type="dc:Point" x="720" y="328" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="677" y="286.5" width="18" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1h9jdgr_di" bpmnElement="SequenceFlow_1h9jdgr"> <di:waypoint xsi:type="dc:Point" x="777" y="693" /> <di:waypoint xsi:type="dc:Point" x="799" y="693" /> @@ -555,13 +441,13 @@ createVnf.getServiceInstance(execution)]]></bpmn2:script> <dc:Bounds x="1445" y="515" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_019g8vu_di" bpmnElement="callGetService"> - <dc:Bounds x="425" y="200" width="100" height="80" /> + <dc:Bounds x="493" y="200" width="100" height="80" /> </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="SequenceFlow_1mvplyi_di" bpmnElement="SequenceFlow_1mvplyi"> - <di:waypoint xsi:type="dc:Point" x="525" y="240" /> - <di:waypoint xsi:type="dc:Point" x="646" y="240" /> + <bpmndi:BPMNEdge id="SequenceFlow_11b2sf3_di" bpmnElement="SequenceFlow_11b2sf3"> + <di:waypoint xsi:type="dc:Point" x="593" y="240" /> + <di:waypoint xsi:type="dc:Point" x="781" y="240" /> <bpmndi:BPMNLabel> - <dc:Bounds x="585.5" y="219" width="0" height="12" /> + <dc:Bounds x="687" y="219" width="0" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> </bpmndi:BPMNPlane> diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn index 0d48719c6b..b5988538e3 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn @@ -36,6 +36,7 @@ doCreateVnfAndModules.preProcessRequest(execution)]]></bpmn:script> <camunda:in source="vnfModelInfo" target="vnfModelInfo" /> <camunda:in source="globalSubscriberId" target="globalSubscriberId" /> <camunda:in source="sdncVersion" target="sdncVersion" /> + <camunda:in source="cloudOwner" target="cloudOwner" /> <camunda:in source="lcpCloudRegionId" target="lcpCloudRegionId" /> <camunda:in source="tenantId" target="tenantId" /> <camunda:in source="false" target="usePreload" /> @@ -71,6 +72,7 @@ doCreateVnfAndModules.preProcessRequest(execution)]]></bpmn:script> <camunda:in source="vnfModelInfo" target="vnfModelInfo" /> <camunda:in source="globalSubscriberId" target="globalSubscriberId" /> <camunda:in source="sdncVersion" target="sdncVersion" /> + <camunda:in source="cloudOwner" target="cloudOwner" /> <camunda:in source="lcpCloudRegionId" target="lcpCloudRegionId" /> <camunda:in source="tenantId" target="tenantId" /> <camunda:in source="false" target="usePreload" /> @@ -123,6 +125,7 @@ doCreateVnfAndModules.validateAddOnModule(execution)]]></bpmn:script> <camunda:in source="globalSubscriberId" target="globalSubscriberId" /> <camunda:in source="sdncVersion" target="sdncVersion" /> <camunda:out source="vnfName" target="vnfName" /> + <camunda:in source="cloudOwner" target="cloudOwner" /> <camunda:in source="lcpCloudRegionId" target="lcpCloudRegionId" /> <camunda:in source="tenantId" target="tenantId" /> <camunda:in source="rollbackData" target="rollbackData" /> diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVnf.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVnf.bpmn index d9596f0d14..da7fc652ed 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVnf.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVnf.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="_9MhrcHqVEea26OhQB97uCQ" 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:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_9MhrcHqVEea26OhQB97uCQ" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.10.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd"> <bpmn2:process id="DoDeleteVnf" name="DoDeleteVnf" isExecutable="true"> <bpmn2:startEvent id="StartEvent_1"> <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing> @@ -12,44 +12,29 @@ DoDeleteVnf deleteVnf = new DoDeleteVnf() deleteVnf.preProcessRequest(execution)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="intialization" targetRef="callGetVnf" /> - <bpmn2:callActivity id="callGetVnf" name="Get Generic Vnf" calledElement="GenericGetVnf"> - <bpmn2:extensionElements> - <camunda:out source="GENGV_vnf" target="DoDVNF_genericVnf" /> - <camunda:out source="WorkflowException" target="WorkflowException" /> - <camunda:out source="GENGV_SuccessIndicator" target="GENGV_SuccessIndicator" /> - <camunda:out source="GENGV_FoundIndicator" target="GENGV_FoundIndicator" /> - <camunda:in source="DoDVNF_type" target="GENGV_type" /> - <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" /> - <camunda:in source="DoDVNF_vnfId" target="GENGV_vnfId" /> - </bpmn2:extensionElements> - <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing> - </bpmn2:callActivity> - <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="callGetVnf" targetRef="vnfFoundCheck" /> + <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="intialization" targetRef="processResponse" /> <bpmn2:exclusiveGateway id="vnfFoundCheck" name="Vnf Found?" default="notFound"> - <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_0hbmag5</bpmn2:incoming> <bpmn2:outgoing>vnfFound</bpmn2:outgoing> <bpmn2:outgoing>notFound</bpmn2:outgoing> </bpmn2:exclusiveGateway> - <bpmn2:sequenceFlow id="vnfFound" name="Yes" sourceRef="vnfFoundCheck" targetRef="processResponse"> - <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("GENGV_FoundIndicator") == true && execution.getVariable("GENGV_SuccessIndicator") == true}]]></bpmn2:conditionExpression> + <bpmn2:sequenceFlow id="vnfFound" name="Yes" sourceRef="vnfFoundCheck" targetRef="vnfInUseCheck"> + <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("GENGV_FoundIndicator") == true}]]></bpmn2:conditionExpression> </bpmn2:sequenceFlow> <bpmn2:sequenceFlow id="notFound" name="No" sourceRef="vnfFoundCheck" targetRef="IntermediateThrowEvent_1" /> - <bpmn2:scriptTask id="processResponse" name="Process Response" scriptFormat="groovy"> - <bpmn2:incoming>vnfFound</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing> + <bpmn2:scriptTask id="processResponse" name=" AAI Query (generic vnf) " scriptFormat="groovy"> + <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming> + <bpmn2:outgoing>SequenceFlow_0hbmag5</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.* DoDeleteVnf deleteVnf = new DoDeleteVnf() -deleteVnf.processGetVnfResponse(execution)]]></bpmn2:script> +deleteVnf.getVnf(execution)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="processResponse" targetRef="vnfInUseCheck" /> <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_1" name="Skip Delete"> <bpmn2:incoming>notFound</bpmn2:incoming> <bpmn2:linkEventDefinition id="LinkEventDefinition_1" name="Skip Delete" /> </bpmn2:intermediateThrowEvent> <bpmn2:exclusiveGateway id="vnfInUseCheck" name="Vnf In Use?" default="notInUse"> - <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming> + <bpmn2:incoming>vnfFound</bpmn2:incoming> <bpmn2:outgoing>inUse</bpmn2:outgoing> <bpmn2:outgoing>notInUse</bpmn2:outgoing> </bpmn2:exclusiveGateway> @@ -110,6 +95,7 @@ exceptionUtil.processJavaException(execution)]]></bpmn2:script> DoDeleteVnf delete = new DoDeleteVnf() delete.deleteVnf(execution)]]></bpmn2:script> </bpmn2:scriptTask> + <bpmn2:sequenceFlow id="SequenceFlow_0hbmag5" sourceRef="processResponse" targetRef="vnfFoundCheck" /> </bpmn2:process> <bpmn2:error id="Error_1" name="MSO Workflow Exception" errorCode="MSOWorkflowException" /> <bpmn2:error id="Error_2" name="Java Lang Exception" errorCode="java.lang.Exception" /> @@ -133,67 +119,50 @@ delete.deleteVnf(execution)]]></bpmn2:script> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_311"> <di:waypoint xsi:type="dc:Point" x="422" y="228" /> - <di:waypoint xsi:type="dc:Point" x="504" y="228" /> + <di:waypoint xsi:type="dc:Point" x="485" y="227" /> <bpmndi:BPMNLabel> - <dc:Bounds x="463" y="213" width="0" height="0" /> + <dc:Bounds x="408.5" y="212.5" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_314" bpmnElement="processResponse"> - <dc:Bounds x="704" y="291" width="100" height="80" /> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="_BPMNShape_CallActivity_63" bpmnElement="callGetVnf"> - <dc:Bounds x="504" y="188" width="100" height="80" /> + <dc:Bounds x="485" y="187" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_236" bpmnElement="vnfInUseCheck" isMarkerVisible="true"> - <dc:Bounds x="840" y="305" width="50" height="50" /> + <dc:Bounds x="789" y="306" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="890" y="335" width="73" height="22" /> + <dc:Bounds x="847" y="336" width="58" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_ScriptTask_314" targetElement="_BPMNShape_ExclusiveGateway_236"> - <di:waypoint xsi:type="dc:Point" x="804" y="331" /> - <di:waypoint xsi:type="dc:Point" x="840" y="330" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="799" y="325" width="6" height="6" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_CallActivity_63" targetElement="_BPMNShape_ExclusiveGateway_237"> - <di:waypoint xsi:type="dc:Point" x="604" y="228" /> - <di:waypoint xsi:type="dc:Point" x="634" y="227" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="630" y="227" width="6" height="6" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_315" bpmnElement="createWorkflowExceptionInUse"> - <dc:Bounds x="912" y="196" width="100" height="80" /> + <dc:Bounds x="861" y="196" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="inUse" sourceElement="_BPMNShape_ExclusiveGateway_236" targetElement="_BPMNShape_ScriptTask_315"> - <di:waypoint xsi:type="dc:Point" x="865" y="305" /> - <di:waypoint xsi:type="dc:Point" x="865" y="236" /> - <di:waypoint xsi:type="dc:Point" x="912" y="236" /> + <di:waypoint xsi:type="dc:Point" x="814" y="306" /> + <di:waypoint xsi:type="dc:Point" x="814" y="236" /> + <di:waypoint xsi:type="dc:Point" x="861" y="236" /> <bpmndi:BPMNLabel> - <dc:Bounds x="867" y="258" width="29" height="22" /> + <dc:Bounds x="821" y="258.40579710144925" width="19" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="notInUse" sourceElement="_BPMNShape_ExclusiveGateway_236" targetElement="ScriptTask_1ps8v06_di"> - <di:waypoint xsi:type="dc:Point" x="865" y="355" /> - <di:waypoint xsi:type="dc:Point" x="865" y="424" /> - <di:waypoint xsi:type="dc:Point" x="912" y="424" /> + <di:waypoint xsi:type="dc:Point" x="814" y="356" /> + <di:waypoint xsi:type="dc:Point" x="814" y="424" /> + <di:waypoint xsi:type="dc:Point" x="861" y="424" /> <bpmndi:BPMNLabel> - <dc:Bounds x="874" y="384" width="14" height="12" /> + <dc:Bounds x="823" y="384.4927536231884" width="14" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_EndEvent_236" bpmnElement="EndEvent_1"> - <dc:Bounds x="1100" y="218" width="36" height="36" /> + <dc:Bounds x="1049" y="218" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1118" y="259" width="0" height="0" /> + <dc:Bounds x="1022" y="259" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_ScriptTask_315" targetElement="_BPMNShape_EndEvent_236"> - <di:waypoint xsi:type="dc:Point" x="1012" y="236" /> - <di:waypoint xsi:type="dc:Point" x="1100" y="236" /> + <di:waypoint xsi:type="dc:Point" x="961" y="236" /> + <di:waypoint xsi:type="dc:Point" x="1049" y="236" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1062" y="236" width="6" height="6" /> + <dc:Bounds x="969" y="236" width="90" height="6" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_237" bpmnElement="vnfFoundCheck" isMarkerVisible="true"> @@ -202,12 +171,12 @@ delete.deleteVnf(execution)]]></bpmn2:script> <dc:Bounds x="672" y="240" width="72" height="22" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="vnfFound" sourceElement="_BPMNShape_ExclusiveGateway_237" targetElement="_BPMNShape_ScriptTask_314"> + <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="vnfFound" sourceElement="_BPMNShape_ExclusiveGateway_237" targetElement="_BPMNShape_ExclusiveGateway_236"> <di:waypoint xsi:type="dc:Point" x="659" y="252" /> <di:waypoint xsi:type="dc:Point" x="659" y="331" /> - <di:waypoint xsi:type="dc:Point" x="704" y="331" /> + <di:waypoint xsi:type="dc:Point" x="789" y="331" /> <bpmndi:BPMNLabel> - <dc:Bounds x="659" y="288" width="29" height="22" /> + <dc:Bounds x="664" y="288" width="19" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_IntermediateThrowEvent_2" bpmnElement="IntermediateThrowEvent_1"> @@ -225,42 +194,42 @@ delete.deleteVnf(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_EndEvent_237" bpmnElement="EndEvent_2"> - <dc:Bounds x="1174" y="405" width="36" height="36" /> + <dc:Bounds x="1151" y="405" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1192" y="446" width="0" height="0" /> + <dc:Bounds x="1124" y="446" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_238" bpmnElement="ExclusiveGateway_2" isMarkerVisible="true"> - <dc:Bounds x="1062" y="398" width="50" height="50" /> + <dc:Bounds x="1011" y="399" width="50" height="50" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1087" y="453" width="0" height="0" /> + <dc:Bounds x="991" y="454" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_9" sourceElement="ScriptTask_1ps8v06_di" targetElement="_BPMNShape_ExclusiveGateway_238"> - <di:waypoint xsi:type="dc:Point" x="1012" y="424" /> - <di:waypoint xsi:type="dc:Point" x="1062" y="423" /> + <di:waypoint xsi:type="dc:Point" x="961" y="425" /> + <di:waypoint xsi:type="dc:Point" x="1011" y="424" /> <bpmndi:BPMNLabel> - <dc:Bounds x="992" y="405.5" width="90" height="6" /> + <dc:Bounds x="941" y="406.5" width="90" height="6" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_ExclusiveGateway_238"> - <di:waypoint xsi:type="dc:Point" x="1111" y="422" /> - <di:waypoint xsi:type="dc:Point" x="1174" y="423" /> + <di:waypoint xsi:type="dc:Point" x="1060" y="423" /> + <di:waypoint xsi:type="dc:Point" x="1151" y="423" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1143" y="407.5" width="0" height="0" /> + <dc:Bounds x="1060.5" y="408" width="90" height="0" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_IntermediateCatchEvent_2" bpmnElement="IntermediateCatchEvent_1"> - <dc:Bounds x="1069" y="492" width="36" height="36" /> + <dc:Bounds x="1018" y="492" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1051" y="533" width="73" height="22" /> + <dc:Bounds x="1009" y="533" width="55" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_14" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_IntermediateCatchEvent_2" targetElement="_BPMNShape_ExclusiveGateway_238"> - <di:waypoint xsi:type="dc:Point" x="1087" y="492" /> - <di:waypoint xsi:type="dc:Point" x="1087" y="448" /> + <di:waypoint xsi:type="dc:Point" x="1036" y="492" /> + <di:waypoint xsi:type="dc:Point" x="1036" y="449" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1084" y="462" width="6" height="6" /> + <dc:Bounds x="1006" y="467.5" width="90" height="6" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="_BPMNShape_SubProcess_35" bpmnElement="javaErrorHandlingSubProcess" isExpanded="true"> @@ -296,8 +265,16 @@ delete.deleteVnf(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_1ps8v06_di" bpmnElement="deleteVnf"> - <dc:Bounds x="912" y="384" width="100" height="80" /> + <dc:Bounds x="861" y="384" width="100" height="80" /> </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_0hbmag5_di" bpmnElement="SequenceFlow_0hbmag5"> + <di:waypoint xsi:type="dc:Point" x="585" y="227" /> + <di:waypoint xsi:type="dc:Point" x="607" y="227" /> + <di:waypoint xsi:type="dc:Point" x="634" y="227" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="596" y="206" width="0" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> </bpmndi:BPMNPlane> </bpmndi:BPMNDiagram> </bpmn2:definitions> diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVnfAndModules.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVnfAndModules.bpmn index 4d6d0006e3..7563c05e1f 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVnfAndModules.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteVnfAndModules.bpmn @@ -193,6 +193,7 @@ ddvam.validateSDNCResponse(execution, response, "unassign")]]></bpmn2:script> <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" /> <camunda:in source="serviceInstanceId" target="serviceInstanceId" /> <camunda:in source="vnfId" target="vnfId" /> + <camunda:in source="cloudOwner" target="cloudOwner" /> <camunda:in source="lcpCloudRegionId" target="lcpCloudRegionId" /> <camunda:in source="tenantId" target="tenantId" /> <camunda:in source="DDVAM_sdncVersion" target="sdncVersion" /> diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateE2EServiceInstance.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateE2EServiceInstance.bpmn index ef3340e887..8383ccbd1f 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateE2EServiceInstance.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateE2EServiceInstance.bpmn @@ -87,59 +87,33 @@ ddsi.preInitResourcesOperStatus(execution)]]></bpmn2:script> <bpmn2:incoming>SequenceFlow_177wo8z</bpmn2:incoming> <bpmn2:linkEventDefinition name="StartDeleteResources" /> </bpmn2:intermediateThrowEvent> - <bpmn2:callActivity id="CallActivity_1nm9zq7" name="Call Custom E2E Put Service" calledElement="CustomE2EPutService"> - <bpmn2:extensionElements> - <camunda:in source="globalSubscriberId" target="GENPS_globalSubscriberId" /> - <camunda:in source="serviceInstanceId" target="GENPS_serviceInstanceId" /> - <camunda:in source="serviceType" target="GENPS_serviceType" /> - <camunda:in sourceExpression="service-instance" target="GENPS_type" /> - <camunda:in source="serviceInstanceData" target="GENPS_payload" /> - <camunda:out source="GENPS_SuccessIndicator" target="GENPS_SuccessIndicator" /> - <camunda:in source="msoRequestId" target="GENPS_requesId" /> - <camunda:out source="WorkflowException" target="WorkflowException" /> - <camunda:in source="GENPS_serviceResourceVersion" target="GENPS_serviceResourceVersion" /> - </bpmn2:extensionElements> + <bpmn2:scriptTask id="ScriptTask_0xtabf8" name=" AAI Create (svc instance) " scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_1kx5ke9</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_0f76thv</bpmn2:outgoing> - </bpmn2:callActivity> - <bpmn2:scriptTask id="ScriptTask_0xtabf8" name="Post Process AAI PUT" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_0f76thv</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_0x0mhlj</bpmn2:outgoing> + <bpmn2:outgoing>SequenceFlow_1cur6kz</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.* def ddsi = new DoUpdateE2EServiceInstance() -ddsi.postProcessAAIPUT(execution)]]></bpmn2:script> +ddsi.updateServiceInstance(execution)]]></bpmn2:script> </bpmn2:scriptTask> <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_0a9bdjw" name="UpdateAAI"> <bpmn2:outgoing>SequenceFlow_1demy08</bpmn2:outgoing> <bpmn2:linkEventDefinition name="UpdateAAI" /> </bpmn2:intermediateCatchEvent> <bpmn2:sequenceFlow id="SequenceFlow_1demy08" sourceRef="IntermediateCatchEvent_0a9bdjw" targetRef="ScriptTask_0sis7k0" /> - <bpmn2:sequenceFlow id="SequenceFlow_0f76thv" sourceRef="CallActivity_1nm9zq7" targetRef="ScriptTask_0xtabf8" /> <bpmn2:scriptTask id="ScriptTask_19v8l1w" name="Post Config Service Instance Update" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_0ku36oy</bpmn2:incoming> + <bpmn2:incoming>SequenceFlow_1cur6kz</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_07aa121</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.* def csi = new DoUpdateE2EServiceInstance() csi.postConfigRequest(execution)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_0z04o3s" name="FinishProcess"> - <bpmn2:outgoing>SequenceFlow_0ku36oy</bpmn2:outgoing> - <bpmn2:linkEventDefinition name="FinishProcess" /> - </bpmn2:intermediateCatchEvent> <bpmn2:endEvent id="EndEvent_0exzmfn"> <bpmn2:incoming>SequenceFlow_07aa121</bpmn2:incoming> </bpmn2:endEvent> <bpmn2:sequenceFlow id="SequenceFlow_07aa121" sourceRef="ScriptTask_19v8l1w" targetRef="EndEvent_0exzmfn" /> - <bpmn2:sequenceFlow id="SequenceFlow_0ku36oy" sourceRef="IntermediateCatchEvent_0z04o3s" targetRef="ScriptTask_19v8l1w" /> <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_06lo96a" name="GoTo UpdateAAI"> <bpmn2:incoming>SequenceFlow_1uu6uiu</bpmn2:incoming> <bpmn2:linkEventDefinition name="UpdateAAI" /> </bpmn2:intermediateThrowEvent> - <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_0hucdtk" name="GoTo FinishProcess"> - <bpmn2:incoming>SequenceFlow_0x0mhlj</bpmn2:incoming> - <bpmn2:linkEventDefinition name="FinishProcess" /> - </bpmn2:intermediateThrowEvent> - <bpmn2:sequenceFlow id="SequenceFlow_0x0mhlj" sourceRef="ScriptTask_0xtabf8" targetRef="IntermediateThrowEvent_0hucdtk" /> <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_09ur9ds" name="GoTo StartAddResources"> <bpmn2:incoming>SequenceFlow_1muxopq</bpmn2:incoming> <bpmn2:linkEventDefinition name="StartAddResources" /> @@ -180,7 +154,7 @@ dcsi.postProcessRollback(execution) def dcsi = new DoUpdateE2EServiceInstance() dcsi.preProcessAAIPUT(execution)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:sequenceFlow id="SequenceFlow_1kx5ke9" sourceRef="ScriptTask_0sis7k0" targetRef="CallActivity_1nm9zq7" /> + <bpmn2:sequenceFlow id="SequenceFlow_1kx5ke9" sourceRef="ScriptTask_0sis7k0" targetRef="ScriptTask_0xtabf8" /> <bpmn2:sequenceFlow id="SequenceFlow_04xlw7s" sourceRef="preProcessRequest_ScriptTask" targetRef="ScriptTask_0acnvkp" /> <bpmn2:exclusiveGateway id="ExclusiveGateway_06gj84t" name="HasResourcetoAdd?" default="SequenceFlow_01po987"> <bpmn2:incoming>SequenceFlow_0yztz2p</bpmn2:incoming> @@ -245,6 +219,7 @@ dcsi.preProcessAAIPUT(execution)]]></bpmn2:script> <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("hasResourcetoDelete") == true}]]></bpmn2:conditionExpression> </bpmn2:sequenceFlow> <bpmn2:sequenceFlow id="SequenceFlow_070o30v" sourceRef="ExclusiveGateway_1fcnq0g" targetRef="IntermediateThrowEvent_0y1ii4i" /> + <bpmn2:sequenceFlow id="SequenceFlow_1cur6kz" sourceRef="ScriptTask_0xtabf8" targetRef="ScriptTask_19v8l1w" /> </bpmn2:process> <bpmn2:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" /> <bpmn2:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" /> @@ -341,11 +316,8 @@ dcsi.preProcessAAIPUT(execution)]]></bpmn2:script> <dc:Bounds x="1738" y="890" width="86" height="36" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="CallActivity_1nm9zq7_di" bpmnElement="CallActivity_1nm9zq7"> - <dc:Bounds x="1229" y="1333" width="100" height="80" /> - </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_0xtabf8_di" bpmnElement="ScriptTask_0xtabf8"> - <dc:Bounds x="1473" y="1333" width="100" height="80" /> + <dc:Bounds x="844" y="1333" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="IntermediateCatchEvent_0a9bdjw_di" bpmnElement="IntermediateCatchEvent_0a9bdjw"> <dc:Bounds x="74" y="1355" width="36" height="36" /> @@ -355,45 +327,27 @@ dcsi.preProcessAAIPUT(execution)]]></bpmn2:script> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1demy08_di" bpmnElement="SequenceFlow_1demy08"> <di:waypoint xsi:type="dc:Point" x="110" y="1373" /> - <di:waypoint xsi:type="dc:Point" x="978" y="1373" /> + <di:waypoint xsi:type="dc:Point" x="293" y="1373" /> <bpmndi:BPMNLabel> - <dc:Bounds x="499" y="1352" width="90" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="SequenceFlow_0f76thv_di" bpmnElement="SequenceFlow_0f76thv"> - <di:waypoint xsi:type="dc:Point" x="1329" y="1373" /> - <di:waypoint xsi:type="dc:Point" x="1473" y="1373" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="1356" y="1352" width="90" height="12" /> + <dc:Bounds x="156.5" y="1352" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_19v8l1w_di" bpmnElement="ScriptTask_19v8l1w"> - <dc:Bounds x="858" y="1579" width="100" height="80" /> - </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="IntermediateCatchEvent_0z04o3s_di" bpmnElement="IntermediateCatchEvent_0z04o3s"> - <dc:Bounds x="74" y="1601" width="36" height="36" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="57" y="1641" width="70" height="12" /> - </bpmndi:BPMNLabel> + <dc:Bounds x="1229" y="1333" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="EndEvent_0exzmfn_di" bpmnElement="EndEvent_0exzmfn"> - <dc:Bounds x="1772" y="1601" width="36" height="36" /> + <dc:Bounds x="1750" y="1355" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1700" y="1641" width="90" height="12" /> + <dc:Bounds x="1678" y="1395" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_07aa121_di" bpmnElement="SequenceFlow_07aa121"> - <di:waypoint xsi:type="dc:Point" x="958" y="1619" /> - <di:waypoint xsi:type="dc:Point" x="1772" y="1619" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="1320" y="1598" width="90" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="SequenceFlow_0ku36oy_di" bpmnElement="SequenceFlow_0ku36oy"> - <di:waypoint xsi:type="dc:Point" x="110" y="1619" /> - <di:waypoint xsi:type="dc:Point" x="858" y="1619" /> + <di:waypoint xsi:type="dc:Point" x="1329" y="1373" /> + <di:waypoint xsi:type="dc:Point" x="1551" y="1373" /> + <di:waypoint xsi:type="dc:Point" x="1551" y="1373" /> + <di:waypoint xsi:type="dc:Point" x="1750" y="1373" /> <bpmndi:BPMNLabel> - <dc:Bounds x="439" y="1598" width="90" height="12" /> + <dc:Bounds x="1521" y="1367" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="IntermediateThrowEvent_06lo96a_di" bpmnElement="IntermediateThrowEvent_06lo96a"> @@ -402,19 +356,6 @@ dcsi.preProcessAAIPUT(execution)]]></bpmn2:script> <dc:Bounds x="1750" y="1143" width="82" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="IntermediateThrowEvent_0hucdtk_di" bpmnElement="IntermediateThrowEvent_0hucdtk"> - <dc:Bounds x="1762" y="1355" width="36" height="36" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="1756" y="1395" width="70" height="24" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="SequenceFlow_0x0mhlj_di" bpmnElement="SequenceFlow_0x0mhlj"> - <di:waypoint xsi:type="dc:Point" x="1573" y="1373" /> - <di:waypoint xsi:type="dc:Point" x="1762" y="1373" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="1622.5" y="1352" width="90" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="IntermediateThrowEvent_09ur9ds_di" bpmnElement="IntermediateThrowEvent_09ur9ds"> <dc:Bounds x="1762" y="622" width="36" height="36" /> <bpmndi:BPMNLabel> @@ -429,55 +370,55 @@ dcsi.preProcessAAIPUT(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="SubProcess_0jo0nms_di" bpmnElement="SubProcess_0jo0nms" isExpanded="true"> - <dc:Bounds x="236" y="1818" width="1428" height="210" /> + <dc:Bounds x="244" y="1688" width="1428" height="210" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="StartEvent_06768u3_di" bpmnElement="StartEvent_06768u3"> - <dc:Bounds x="266" y="1895" width="36" height="36" /> + <dc:Bounds x="274" y="1765" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="194" y="1936" width="90" height="12" /> + <dc:Bounds x="202" y="1806" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="EndEvent_014jyvb_di" bpmnElement="EndEvent_014jyvb"> - <dc:Bounds x="1581" y="1895" width="36" height="36" /> + <dc:Bounds x="1589" y="1765" width="36" height="36" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1509" y="1936" width="90" height="12" /> + <dc:Bounds x="1517" y="1806" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_1awrp72_di" bpmnElement="ScriptTask_1awrp72"> - <dc:Bounds x="557" y="1873" width="100" height="80" /> + <dc:Bounds x="565" y="1743" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_0vc9jgo_di" bpmnElement="ScriptTask_0vc9jgo"> - <dc:Bounds x="1248" y="1873" width="100" height="80" /> + <dc:Bounds x="1256" y="1743" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_05j3sat_di" bpmnElement="SequenceFlow_05j3sat"> - <di:waypoint xsi:type="dc:Point" x="302" y="1913" /> - <di:waypoint xsi:type="dc:Point" x="557" y="1913" /> + <di:waypoint xsi:type="dc:Point" x="310" y="1783" /> + <di:waypoint xsi:type="dc:Point" x="565" y="1783" /> <bpmndi:BPMNLabel> - <dc:Bounds x="385" y="1892" width="90" height="12" /> + <dc:Bounds x="393" y="1762" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_02znk15_di" bpmnElement="SequenceFlow_02znk15"> - <di:waypoint xsi:type="dc:Point" x="1348" y="1913" /> - <di:waypoint xsi:type="dc:Point" x="1581" y="1913" /> + <di:waypoint xsi:type="dc:Point" x="1356" y="1783" /> + <di:waypoint xsi:type="dc:Point" x="1589" y="1783" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1376" y="1898" width="90" height="12" /> + <dc:Bounds x="1384" y="1768" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_19ly8h7_di" bpmnElement="SequenceFlow_19ly8h7"> - <di:waypoint xsi:type="dc:Point" x="657" y="1913" /> - <di:waypoint xsi:type="dc:Point" x="1248" y="1913" /> + <di:waypoint xsi:type="dc:Point" x="665" y="1783" /> + <di:waypoint xsi:type="dc:Point" x="1256" y="1783" /> <bpmndi:BPMNLabel> - <dc:Bounds x="907.5" y="1892" width="90" height="12" /> + <dc:Bounds x="916" y="1762" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ScriptTask_0sis7k0_di" bpmnElement="ScriptTask_0sis7k0"> - <dc:Bounds x="978" y="1333" width="100" height="80" /> + <dc:Bounds x="293" y="1333" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1kx5ke9_di" bpmnElement="SequenceFlow_1kx5ke9"> - <di:waypoint xsi:type="dc:Point" x="1078" y="1373" /> - <di:waypoint xsi:type="dc:Point" x="1229" y="1373" /> + <di:waypoint xsi:type="dc:Point" x="393" y="1373" /> + <di:waypoint xsi:type="dc:Point" x="844" y="1373" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1108.5" y="1352" width="90" height="12" /> + <dc:Bounds x="573.5" y="1352" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_04xlw7s_di" bpmnElement="SequenceFlow_04xlw7s"> @@ -579,6 +520,13 @@ dcsi.preProcessAAIPUT(execution)]]></bpmn2:script> <dc:Bounds x="630" y="1176" width="0" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1cur6kz_di" bpmnElement="SequenceFlow_1cur6kz"> + <di:waypoint xsi:type="dc:Point" x="944" y="1373" /> + <di:waypoint xsi:type="dc:Point" x="1229" y="1373" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="1086.5" y="1352" width="0" height="12" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> </bpmndi:BPMNPlane> </bpmndi:BPMNDiagram> </bpmn2:definitions> diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateE2EServiceInstanceRollback.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateE2EServiceInstanceRollback.bpmn index b53e87d34a..23233abc03 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateE2EServiceInstanceRollback.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateE2EServiceInstanceRollback.bpmn @@ -190,31 +190,15 @@ csi.postProcessForAddResource(execution)]]></bpmn2:script> def dcsi = new DoUpdateE2EServiceInstanceRollback() dcsi.preProcessAAIPUT(execution)]]></bpmn2:script> </bpmn2:scriptTask> - <bpmn2:callActivity id="CallActivity_0zs5y0x" name="Call Custom E2E Put Service" calledElement="CustomE2EPutService"> - <bpmn2:extensionElements> - <camunda:in source="serviceInstanceId" target="GENGS_serviceInstanceId" /> - <camunda:in sourceExpression="service-instance" target="GENGS_type" /> - <camunda:out source="GENGS_FoundIndicator" target="GENGS_FoundIndicator" /> - <camunda:out source="GENGS_SuccessIndicator" target="GENGS_SuccessIndicator" /> - <camunda:out source="WorkflowException" target="WorkflowException" /> - <camunda:out source="GENGS_siResourceLink" target="GENGS_siResourceLink" /> - <camunda:out source="GENGS_service" target="GENGS_service" /> - <camunda:in source="globalSubscriberId" target="GENGS_globalCustomerId" /> - <camunda:in source="serviceType" target="GENGS_serviceType" /> - </bpmn2:extensionElements> + <bpmn2:scriptTask id="ScriptTask_1p96syr" name=" AAI Create (svc instance) " scriptFormat="groovy"> <bpmn2:incoming>SequenceFlow_1lppnhy</bpmn2:incoming> - <bpmn2:outgoing>SequenceFlow_0kbisn8</bpmn2:outgoing> - </bpmn2:callActivity> - <bpmn2:scriptTask id="ScriptTask_1p96syr" name="Post Process AAI PUT" scriptFormat="groovy"> - <bpmn2:incoming>SequenceFlow_0kbisn8</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_1azhgda</bpmn2:outgoing> <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.* def dcsi = new DoUpdateE2EServiceInstanceRollback() -dcsi.postProcessAAIPUT(execution)]]></bpmn2:script> +dcsi.updateServiceInstance(execution)]]></bpmn2:script> </bpmn2:scriptTask> <bpmn2:sequenceFlow id="SequenceFlow_1a65s3k" sourceRef="IntermediateCatchEvent_0546q5i" targetRef="ScriptTask_0gj4dj5" /> - <bpmn2:sequenceFlow id="SequenceFlow_1lppnhy" sourceRef="ScriptTask_0gj4dj5" targetRef="CallActivity_0zs5y0x" /> - <bpmn2:sequenceFlow id="SequenceFlow_0kbisn8" sourceRef="CallActivity_0zs5y0x" targetRef="ScriptTask_1p96syr" /> + <bpmn2:sequenceFlow id="SequenceFlow_1lppnhy" sourceRef="ScriptTask_0gj4dj5" targetRef="ScriptTask_1p96syr" /> <bpmn2:exclusiveGateway id="ExclusiveGateway_1k16vgh" name="RollBackAAI?" default="SequenceFlow_161uzhj"> <bpmn2:documentation>rollback AAI</bpmn2:documentation> <bpmn2:incoming>SequenceFlow_08p4pkv</bpmn2:incoming> @@ -562,11 +546,8 @@ rbk.postProcessRequest(execution)]]></bpmn2:script> <bpmndi:BPMNShape id="ScriptTask_0gj4dj5_di" bpmnElement="ScriptTask_0gj4dj5"> <dc:Bounds x="687" y="743" width="100" height="80" /> </bpmndi:BPMNShape> - <bpmndi:BPMNShape id="CallActivity_0zs5y0x_di" bpmnElement="CallActivity_0zs5y0x"> - <dc:Bounds x="841" y="743" width="100" height="80" /> - </bpmndi:BPMNShape> <bpmndi:BPMNShape id="ScriptTask_1p96syr_di" bpmnElement="ScriptTask_1p96syr"> - <dc:Bounds x="1014" y="743" width="100" height="80" /> + <dc:Bounds x="929" y="743" width="100" height="80" /> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="SequenceFlow_1a65s3k_di" bpmnElement="SequenceFlow_1a65s3k"> <di:waypoint xsi:type="dc:Point" x="192" y="783" /> @@ -577,18 +558,9 @@ rbk.postProcessRequest(execution)]]></bpmn2:script> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1lppnhy_di" bpmnElement="SequenceFlow_1lppnhy"> <di:waypoint xsi:type="dc:Point" x="787" y="783" /> - <di:waypoint xsi:type="dc:Point" x="841" y="783" /> - <bpmndi:BPMNLabel> - <dc:Bounds x="769" y="762" width="90" height="12" /> - </bpmndi:BPMNLabel> - </bpmndi:BPMNEdge> - <bpmndi:BPMNEdge id="SequenceFlow_0kbisn8_di" bpmnElement="SequenceFlow_0kbisn8"> - <di:waypoint xsi:type="dc:Point" x="941" y="783" /> - <di:waypoint xsi:type="dc:Point" x="978" y="783" /> - <di:waypoint xsi:type="dc:Point" x="978" y="783" /> - <di:waypoint xsi:type="dc:Point" x="1014" y="783" /> + <di:waypoint xsi:type="dc:Point" x="929" y="783" /> <bpmndi:BPMNLabel> - <dc:Bounds x="948" y="777" width="90" height="12" /> + <dc:Bounds x="813" y="762" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="ExclusiveGateway_1k16vgh_di" bpmnElement="ExclusiveGateway_1k16vgh" isMarkerVisible="true"> @@ -719,10 +691,10 @@ rbk.postProcessRequest(execution)]]></bpmn2:script> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_1azhgda_di" bpmnElement="SequenceFlow_1azhgda"> - <di:waypoint xsi:type="dc:Point" x="1114" y="783" /> + <di:waypoint xsi:type="dc:Point" x="1029" y="783" /> <di:waypoint xsi:type="dc:Point" x="1171" y="783" /> <bpmndi:BPMNLabel> - <dc:Bounds x="1097.5" y="762" width="90" height="12" /> + <dc:Bounds x="1055" y="762" width="90" height="12" /> </bpmndi:BPMNLabel> </bpmndi:BPMNEdge> <bpmndi:BPMNEdge id="SequenceFlow_055b52t_di" bpmnElement="SequenceFlow_055b52t"> diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateVnfAndModules.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateVnfAndModules.bpmn index ae77461070..c77c684fa4 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateVnfAndModules.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoUpdateVnfAndModules.bpmn @@ -63,6 +63,7 @@ exceptionUtil.processJavaException(execution)]]></bpmn2:script> <camunda:in source="serviceModelInfo" target="serviceModelInfo" /> <camunda:in source="vnfModelInfo" target="vnfModelInfo" /> <camunda:in source="globalSubscriberId" target="globalSubscriberId" /> + <camunda:in source="cloudOwner" target="cloudOwner" /> <camunda:in source="lcpCloudRegionId" target="lcpCloudRegionId" /> <camunda:in source="tenantId" target="tenantId" /> <camunda:in source="sdncVersion" target="sdncVersion" /> diff --git a/bpmn/so-bpmn-infrastructure-flows/src/test/resources/__files/VCPE/CreateVcpeResCustService/request.json b/bpmn/so-bpmn-infrastructure-flows/src/test/resources/__files/VCPE/CreateVcpeResCustService/request.json index dc4669e8d9..13dd32226f 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/test/resources/__files/VCPE/CreateVcpeResCustService/request.json +++ b/bpmn/so-bpmn-infrastructure-flows/src/test/resources/__files/VCPE/CreateVcpeResCustService/request.json @@ -24,6 +24,7 @@ "cloudConfiguration": { "lcpCloudRegionId":"mdt1", + "cloudOwner" : "my-cloud-owner", "tenantId":"8b1df54faa3b49078e3416e21370a3ba" }, "requestParameters": diff --git a/bpmn/so-bpmn-infrastructure-flows/src/test/resources/__files/VCPE/DeleteVcpeResCustService/request.json b/bpmn/so-bpmn-infrastructure-flows/src/test/resources/__files/VCPE/DeleteVcpeResCustService/request.json index dc4669e8d9..13dd32226f 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/test/resources/__files/VCPE/DeleteVcpeResCustService/request.json +++ b/bpmn/so-bpmn-infrastructure-flows/src/test/resources/__files/VCPE/DeleteVcpeResCustService/request.json @@ -24,6 +24,7 @@ "cloudConfiguration": { "lcpCloudRegionId":"mdt1", + "cloudOwner" : "my-cloud-owner", "tenantId":"8b1df54faa3b49078e3416e21370a3ba" }, "requestParameters": diff --git a/bpmn/so-bpmn-infrastructure-flows/src/test/resources/application-test.yaml b/bpmn/so-bpmn-infrastructure-flows/src/test/resources/application-test.yaml index 8a5ade6fb6..dc48c79ff9 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/test/resources/application-test.yaml +++ b/bpmn/so-bpmn-infrastructure-flows/src/test/resources/application-test.yaml @@ -101,30 +101,6 @@ mso: version: '9' generic-vnf: version: '9' - v8: - customer: - uri: /aai/v8/business/customers/customer - generic-query: - uri: /aai/v8/search/generic-query - l3-network: - uri: /aai/v8/network/l3-networks/l3-network - network-policy: - uri: /aai/v8/network/network-policies/network-policy - nodes-query: - uri: /aai/v8/search/nodes-query - route-table-reference: - uri: /aai/v8/network/route-table-references/route-table-reference - tenant: - uri: /aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant - vce: - uri: /aai/v8/network/vces/vce - vpn-binding: - uri: /aai/v8/network/vpn-bindings/vpn-binding - v9: - cloud-region: - uri: /aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic - generic-vnf: - uri: /aai/v9/network/generic-vnfs/generic-vnf global: default: aai: diff --git a/bpmn/so-bpmn-infrastructure-flows/src/test/resources/application-test.yml b/bpmn/so-bpmn-infrastructure-flows/src/test/resources/application-test.yml index 007615e569..f214c61042 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/test/resources/application-test.yml +++ b/bpmn/so-bpmn-infrastructure-flows/src/test/resources/application-test.yml @@ -178,53 +178,6 @@ mso: version: '9' generic-vnf: version: '9' - v11: - customer: - uri: /aai/v11/business/customers/customer - generic-query: - uri: /aai/v11/search/generic-query - generic-vnf: - uri: /aai/v11/network/generic-vnfs/generic-vnf - l3-network: - uri: /aai/v11/network/l3-networks/l3-network - network-policy: - uri: /aai/v11/network/network-policies/network-policy - nodes-query: - uri: /aai/v11/search/nodes-query - route-table-reference: - uri: /aai/v11/network/route-table-references/route-table-reference - tenant: - uri: /aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant - vce: - uri: /aai/v11/network/vces/vce - vpn-binding: - uri: /aai/v11/network/vpn-bindings/vpn-binding - v8: - configuration: - uri: /aai/v11/network/configurations/configuration - customer: - uri: /aai/v8/business/customers/customer - generic-query: - uri: /aai/v8/search/generic-query - l3-network: - uri: /aai/v8/network/l3-networks/l3-network - network-policy: - uri: /aai/v8/network/network-policies/network-policy - nodes-query: - uri: /aai/v8/search/nodes-query - route-table-reference: - uri: /aai/v8/network/route-table-references/route-table-reference - tenant: - uri: /aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant - vce: - uri: /aai/v8/network/vces/vce - vpn-binding: - uri: /aai/v8/network/vpn-bindings/vpn-binding - v9: - cloud-region: - uri: /aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic - generic-vnf: - uri: /aai/v9/network/generic-vnfs/generic-vnf retry: attempts: '1' deleteCinderVolumeV1: |