From f4bf9e7ad4746fbec415c0ad34fa57f168840e30 Mon Sep 17 00:00:00 2001 From: sarada prasad sahoo Date: Fri, 7 Jun 2019 14:46:36 +0530 Subject: Enhanced List Level flow with backward support Modified the e2e service instance flow to support both new list types groups along with backward compatibility to support old types alloted resources, network etc. Change-Id: Ie8fc8a4550a90b44736b6b9de058e2a2e187570c Issue-ID: SO-1393 Signed-off-by: sarada prasad sahoo --- .../process/DeleteSDNCNetworkResource.bpmn | 105 +++++------ .../subprocess/DoCreateE2EServiceInstance.bpmn | 206 ++++++++++++--------- .../resources/subprocess/DoCreateResources.bpmn | 174 ++++++++--------- .../subprocess/DoDeleteE2EServiceInstance.bpmn | 5 +- 4 files changed, 254 insertions(+), 236 deletions(-) (limited to 'bpmn/so-bpmn-infrastructure-flows/src/main') diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/DeleteSDNCNetworkResource.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/DeleteSDNCNetworkResource.bpmn index c2d4de3973..4cd4ab527f 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/DeleteSDNCNetworkResource.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/DeleteSDNCNetworkResource.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_1qo2pln_delete @@ -123,6 +123,7 @@ csi.sendSyncResponse(execution) + SequenceFlow_0h3klf0_delete SequenceFlow_00vqgvt_delete @@ -154,145 +155,145 @@ dcsi.prepareUpdateAfterDeleteSDNCResource(execution) - + - + - - + + - - + + - + - + - + - - + + - + - - + + - - + + - + - + - - + + - - - - - + + + + + - + - + - + - + - - + + - - + + - + - + - - + + - + - - - + + + - + - - + + - + - + - - + + - + - - + + 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 76dd6facd6..125f08c49e 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 @@ - + SequenceFlow_1qiiycn @@ -9,8 +9,7 @@ SequenceFlow_0w9t6tc import org.onap.so.bpmn.infrastructure.scripts.* def dcsi = new DoCreateE2EServiceInstance() -dcsi.preProcessRequest(execution) - +dcsi.preProcessRequest(execution) @@ -38,8 +37,7 @@ dcsi.preProcessRequest(execution) SequenceFlow_1lqktwf import org.onap.so.bpmn.infrastructure.scripts.* def dcsi = new DoCreateE2EServiceInstance() -dcsi.preProcessRollback(execution) - +dcsi.preProcessRollback(execution) @@ -47,8 +45,7 @@ dcsi.preProcessRollback(execution) SequenceFlow_1xzgv5k import org.onap.so.bpmn.infrastructure.scripts.* def dcsi = new DoCreateE2EServiceInstance() -dcsi.postProcessRollback(execution) - +dcsi.postProcessRollback(execution) @@ -98,10 +95,10 @@ dcsi.prepareDecomposeService(execution) - SequenceFlow_1tkgqu3 + SequenceFlow_19zefa9 - + SequenceFlow_0yuzaen @@ -156,7 +153,7 @@ ddsi.preInitResourcesOperStatus(execution) - SequenceFlow_0b1dsaj + SequenceFlow_11zobkq SequenceFlow_0sphcy5 @@ -168,6 +165,7 @@ csi.preProcessForAddResource(execution) SequenceFlow_0sphcy5 + SequenceFlow_1mvvc6c SequenceFlow_18gnns6 import org.onap.so.bpmn.infrastructure.scripts.* def csi = new DoCreateE2EServiceInstance() @@ -193,253 +191,289 @@ dcsi.doTPResourcesAllocation(execution) - + + + + SequenceFlow_1tkgqu3 + SequenceFlow_19zefa9 + import org.onap.so.bpmn.infrastructure.scripts.* +def ddsi = new DoCreateE2EServiceInstance() +ddsi.createCustomRelationship(execution) + + + SequenceFlow_0b1dsaj + SequenceFlow_11zobkq + SequenceFlow_1mvvc6c + + + #{(execution.getVariable("isCreateResourceListValid" ) == true)} + + - + - + - + - + - + - + - + - - + + - - + + - + - + - - + + - + - - - - + + + + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - + - + - - - - + + - - - - + + + + - + - + - - - - + + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateResources.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateResources.bpmn index 75767929aa..2a2093522f 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateResources.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateResources.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_1qiiycn @@ -9,8 +9,7 @@ SequenceFlow_0w9t6tc import org.onap.so.bpmn.infrastructure.scripts.* def dcsi = new DoCreateResources() -dcsi.preProcessRequest(execution) - +dcsi.preProcessRequest(execution) SequenceFlow_16nxl6h @@ -48,7 +47,7 @@ ddsi.parseNextResource(execution) SequenceFlow_0q6uy30 - SequenceFlow_1obf0cq + SequenceFlow_1qozd66 SequenceFlow_0uiygod import org.onap.so.bpmn.infrastructure.scripts.* def ddsi = new DoCreateResources() @@ -103,7 +102,7 @@ ddsi.executeResourceRecipe(execution) - + SequenceFlow_0epxs3b @@ -134,252 +133,237 @@ def ddsi = new DoCreateResources() ddsi.prepareServiceTopologyRequest(execution) - - - SequenceFlow_1qozd66 - SequenceFlow_1obf0cq - import org.onap.so.bpmn.infrastructure.scripts.* -def ddsi = new DoCreateResources() -ddsi.prepareInstanceResourceList(execution) - - + - + - + - + - + - - - - + + + + - + - - + + - + - + - - - - + + + + - + - + - - + + - + - + - + - - + + - + - + - + - + - + - - + + - - - - + + + + - + - + - - - + + + - + - + - + - - + + - + - + - - + + - + - - + + - - + + - - + + - - + + - + - - + + - + - + - + - + - - + + - - + + - + - - + + - - - - - - - diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteE2EServiceInstance.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteE2EServiceInstance.bpmn index 4d0324e478..1149cc9ea9 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteE2EServiceInstance.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteE2EServiceInstance.bpmn @@ -9,8 +9,7 @@ SequenceFlow_11e6bfy import org.onap.so.bpmn.infrastructure.scripts.* def ddsi = new DoDeleteE2EServiceInstance() -ddsi.preProcessRequest(execution) - +ddsi.preProcessRequest(execution) SequenceFlow_0e7inkl @@ -27,7 +26,7 @@ ddsi.postProcessAAIGET(execution) SequenceFlow_12rr1yy SequenceFlow_0e7inkl import org.onap.so.bpmn.infrastructure.scripts.* -def ddsi = new DoCustomDeleteE2EServiceInstance() +def ddsi = new DoDeleteE2EServiceInstance() ddsi.deleteServiceInstance(execution) -- cgit 1.2.3-korg