From 3e4d7035ff7fc105465840bfaec14da47f64b3aa Mon Sep 17 00:00:00 2001 From: hetengjiao Date: Fri, 25 Sep 2020 16:17:33 +0800 Subject: Update NSMF workflow of allocate Issue-ID: SO-2963 Signed-off-by: hetengjiao Change-Id: I4ab9272501a76c93e1c56d4bf0ed646699363ecb --- .../main/resources/process/CreateSliceService.bpmn | 3 + .../resources/subprocess/DoAllocateNSIandNSSI.bpmn | 32 +-- .../main/resources/subprocess/DoAllocateNSSI.bpmn | 4 +- .../subprocess/DoCreateSliceServiceInstance.bpmn | 2 +- .../subprocess/DoCreateSliceServiceOption.bpmn | 261 ++++++++++----------- 5 files changed, 143 insertions(+), 159 deletions(-) (limited to 'bpmn/so-bpmn-infrastructure-flows/src/main') 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 60d7355a9c..9656c86ae5 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 @@ -42,6 +42,8 @@ css.processUserOptions(execution) + + SequenceFlow_1dfon41 SequenceFlow_0jhqtls @@ -278,6 +280,7 @@ css.prepareUpdateOrchestrationTask(execution) + SequenceFlow_1bevt3a SequenceFlow_0mlrlbv diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoAllocateNSIandNSSI.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoAllocateNSIandNSSI.bpmn index e42f001012..9090bf2fab 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoAllocateNSIandNSSI.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoAllocateNSIandNSSI.bpmn @@ -58,19 +58,11 @@ dcnsio.createNSIinAAI(execution) - - - - - - - - @@ -80,6 +72,8 @@ dcnsio.createNSIinAAI(execution) + + SequenceFlow_0npsyye SequenceFlow_1xb5nx1 @@ -88,19 +82,11 @@ dcnsio.createNSIinAAI(execution) - - - - - - - - @@ -111,6 +97,8 @@ dcnsio.createNSIinAAI(execution) + + SequenceFlow_0cwbtmr SequenceFlow_1l74seh @@ -185,19 +173,11 @@ dcnsio.createTnBHSliceProfile(execution) - - - - - - - - @@ -207,6 +187,8 @@ dcnsio.createTnBHSliceProfile(execution) + + SequenceFlow_01isn2q SequenceFlow_1omynpt @@ -279,7 +261,7 @@ dcnsio.prepareAllocateTnBHNssi(execution) - + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoAllocateNSSI.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoAllocateNSSI.bpmn index 6e94538775..58795056d4 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoAllocateNSSI.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoAllocateNSSI.bpmn @@ -76,7 +76,7 @@ dcnssi.timeDelay(execution) - + @@ -155,4 +155,4 @@ dcnssi.timeDelay(execution) - + \ No newline at end of file diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateSliceServiceInstance.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateSliceServiceInstance.bpmn index 0345ea7a9f..9d47888b14 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateSliceServiceInstance.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateSliceServiceInstance.bpmn @@ -135,4 +135,4 @@ dcsi.prepareDecomposeService(execution) - + \ No newline at end of file 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 045d88daa9..b16ceee0d3 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 @@ -29,43 +29,19 @@ dcso.processDecompositionNST(execution) - - SequenceFlow_1h3kdce - SequenceFlow_05250mp - SequenceFlow_0euwvgf - SequenceFlow_0il5j01 - - - SequenceFlow_14rhmx9 - SequenceFlow_103oxyw - SequenceFlow_0aasemn - SequenceFlow_1tr3i9d - - + - - - - + + + + - - + + SequenceFlow_0abqxa1 SequenceFlow_1tqg26p - - - - - - - - - - - SequenceFlow_1nrfy6i - SequenceFlow_1fuwy35 @@ -107,29 +83,10 @@ dcso.preNSSIRequest(execution) SequenceFlow_1tqg26p - SequenceFlow_1i3j8c3 + SequenceFlow_1ezi1oi import org.onap.so.bpmn.infrastructure.scripts.* def dcso = new DoCreateSliceServiceOption() dcso.processNSSIResp(execution) - - - SequenceFlow_1tey3hz - SequenceFlow_126j77n - SequenceFlow_1nrfy6i - - - #{(execution.getVariable("nssmfOperation" ) == "update")} - - - - - - SequenceFlow_1tr3i9d - SequenceFlow_1i3j8c3 - SequenceFlow_1tey3hz - import org.onap.so.bpmn.infrastructure.scripts.* -def dcso = new DoCreateSliceServiceOption() -dcso.handleNssiSelect(execution) SequenceFlow_0zglfyw @@ -215,10 +172,53 @@ dcso.preNSIRequest(execution) + + SequenceFlow_1tr3i9d + SequenceFlow_1tey3hz + import org.onap.so.bpmn.infrastructure.scripts.* +def dcso = new DoCreateSliceServiceOption() +dcso.handleNssiSelect(execution) + + + SequenceFlow_0aasemn + SequenceFlow_103oxyw + SequenceFlow_14rhmx9 + SequenceFlow_1tr3i9d + + + + + + + SequenceFlow_1h3kdce + SequenceFlow_0il5j01 + SequenceFlow_0euwvgf + SequenceFlow_05250mp + + + + + + + + + SequenceFlow_1tey3hz + SequenceFlow_1ezi1oi + SequenceFlow_126j77n + SequenceFlow_1nrfy6i + + + #{(execution.getVariable("needSelectNssi" ) == true)} + + + SequenceFlow_1nrfy6i + + + - + @@ -236,58 +236,9 @@ dcso.preNSIRequest(execution) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -314,36 +265,7 @@ dcso.preNSIRequest(execution) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -420,10 +342,87 @@ dcso.preNSIRequest(execution) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit 1.2.3-korg