From eb6d3d34320cb233ab68ee1e7621a3030b7f63bd Mon Sep 17 00:00:00 2001 From: Priyadharshini Date: Thu, 27 Aug 2020 04:05:09 -0700 Subject: Implement so-oof-adapter to handle OOF Callback - Add NSI/NST selection callback for Networkslicing Issue-ID: SO-3205 Signed-off-by: Priyadharshini Change-Id: Ica88d503495949ecce8b897c3a990fbdaa5d4f0e --- .../main/resources/process/CreateSliceService.bpmn | 454 +++++++++++---------- .../subprocess/DoCreateSliceServiceOption.bpmn | 220 +++++----- .../resources/subprocess/DoHandleOofRequest.bpmn | 122 ++++++ 3 files changed, 494 insertions(+), 302 deletions(-) create mode 100644 bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoHandleOofRequest.bpmn (limited to 'bpmn/so-bpmn-infrastructure-flows') diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateSliceService.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateSliceService.bpmn index f27794a389..27bd01bda9 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateSliceService.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateSliceService.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_03s744c @@ -34,12 +34,12 @@ css.processUserOptions(execution) def css = new CreateSliceService() css.processDecomposition(execution) - + SequenceFlow_046irye - SequenceFlow_1o23s0i + Flow_1l8mfej import org.onap.so.bpmn.infrastructure.scripts.* def css = new CreateSliceService() -css.getNSTSelection(execution) +css.prepareSelectNSTRequest(execution) @@ -176,7 +176,7 @@ css.prepareUpdateServiceOperationStatus(execution) SequenceFlow_1t19ips - SequenceFlow_1o23s0i + Flow_1u4srgq SequenceFlow_0q7yc2c import org.onap.so.bpmn.infrastructure.scripts.* def dcsi= new CreateSliceService() @@ -446,7 +446,6 @@ css.sendSyncResponse(execution) - SequenceFlow_0n4xku8 @@ -457,12 +456,205 @@ def css = new CreateSliceService() css.updateAAIOrchStatus(execution) + + + + + + + + + + + + Flow_1l8mfej + Flow_0vq2rmw + + + + Flow_0vq2rmw + Flow_1u4srgq + import org.onap.so.bpmn.infrastructure.scripts.* +def css = new CreateSliceService() +css.processNSTSolutions(execution) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -475,9 +667,6 @@ css.updateAAIOrchStatus(execution) - - - @@ -487,12 +676,6 @@ css.updateAAIOrchStatus(execution) - - - - - - @@ -514,9 +697,53 @@ css.updateAAIOrchStatus(execution) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -526,9 +753,6 @@ css.updateAAIOrchStatus(execution) - - - @@ -544,15 +768,6 @@ css.updateAAIOrchStatus(execution) - - - - - - - - - @@ -613,197 +828,18 @@ css.updateAAIOrchStatus(execution) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateSliceServiceOption.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateSliceServiceOption.bpmn index ad0732df4d..3ed1999d9a 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateSliceServiceOption.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateSliceServiceOption.bpmn @@ -1,17 +1,17 @@ - + SequenceFlow_1qo2pln - + SequenceFlow_0khtova - SequenceFlow_1utpplq + Flow_15c2jcx import org.onap.so.bpmn.infrastructure.scripts.* def dcso = new DoCreateSliceServiceOption() -dcso.getNSIOptionfromOOF(execution) +dcso.prepareSelectNSIRequest(execution) SequenceFlow_1qo2pln @@ -73,7 +73,6 @@ dcso.prepareNSSTDecompose(execution) SequenceFlow_0a5f5y6 - SequenceFlow_0d774n5 SequenceFlow_0wy6oag @@ -84,7 +83,7 @@ dcso.prepareNSSTDecompose(execution) #{(execution.getVariable("isNSISuggested" ) == true)} - SequenceFlow_1utpplq + Flow_07ustqm SequenceFlow_0piifl1 import org.onap.so.bpmn.infrastructure.scripts.* def dcso = new DoCreateSliceServiceOption() @@ -112,124 +111,159 @@ dcso.prepareNSTDecompose(execution) def dcso = new DoCreateSliceServiceOption() dcso.processDecomposition(execution) + + + + + + + + + + + Flow_15c2jcx + Flow_1mcx2ja + + + Flow_1mcx2ja + Flow_07ustqm + import org.onap.so.bpmn.infrastructure.scripts.* +def dcso = new DoCreateSliceServiceOption() +dcso.processOOFResponse(execution) + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - + + - - - - - - + + + + + + + + + + + - - - - - - - + - + - + - + - - - - - - - - - - - - - - - - - - - - + - - - - - + - - - - - - - - - - - + - - - - - - - - - - - - - - - - - + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoHandleOofRequest.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoHandleOofRequest.bpmn new file mode 100644 index 0000000000..7ca1a62312 --- /dev/null +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoHandleOofRequest.bpmn @@ -0,0 +1,122 @@ + + + + + Flow_1jorico + + + + Flow_1fbzzqg + Flow_013jfci + import org.onap.so.bpmn.common.scripts.* +def oofHandler = new DoHandleOofRequest() +oofHandler .callOofAdapter(execution) + + + + + Flow_1jorico + Flow_1fbzzqg + import org.onap.so.bpmn.common.scripts.* +def oofHandler = new DoHandleOofRequest() +oofHandler .preProcessRequest(execution) + + + + + Flow_072knve + + + + Flow_0ykpxpc + + + Flow_072knve + Flow_0ykpxpc + import org.onap.so.bpmn.common.scripts.* +ExceptionUtil ex = new ExceptionUtil() +ex.processJavaException(execution) + + + + + + + + + + + + + + Flow_013jfci + Flow_1nmoiqi + + + + Flow_1nmoiqi + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit 1.2.3-korg