From a5e1bac54eeb71f462a19cfb2b88b5886ca4bea1 Mon Sep 17 00:00:00 2001 From: deepikasatheesh Date: Thu, 10 Sep 2020 03:24:13 -0700 Subject: NSMF Functionality improvements - NSI Termination Issue-ID: SO-3231 Signed-off-by: deepikasatheesh Change-Id: I5ebeea9e7e79ba1c7c236478f4acf34af674eb77 --- .../resources/subprocess/DoDeallocateNSSI.bpmn | 265 +++++++++++---------- .../resources/subprocess/DoDeleteSliceService.bpmn | 158 ++++++------ 2 files changed, 213 insertions(+), 210 deletions(-) (limited to 'bpmn/so-bpmn-infrastructure-flows') diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeallocateNSSI.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeallocateNSSI.bpmn index db805ecb92..c107cfb53a 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeallocateNSSI.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeallocateNSSI.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_05jfhy6 @@ -35,25 +35,15 @@ dnssi.processDecomposition(execution) SequenceFlow_1e7o57n - SequenceFlow_03b0822 + SequenceFlow_1wj89r5 import org.onap.so.bpmn.infrastructure.scripts.* def dnssi= new DoDeallocateNSSI() dnssi.sendRequestToNSSMF(execution) - - - SequenceFlow_03b0822 - SequenceFlow_1anlirk - SequenceFlow_1jj0p5q - import org.onap.so.bpmn.infrastructure.scripts.* -def dnssi= new DoDeallocateNSSI() -dnssi.getJobStatus(execution) - - - - SequenceFlow_1jj0p5q + + SequenceFlow_02327ff SequenceFlow_0xq380j - SequenceFlow_0sfh52b + SequenceFlow_1wpbkt9 SequenceFlow_0xq380j @@ -76,15 +66,6 @@ dnssi.delSliceProfileFromAAI(execution) import org.onap.so.bpmn.infrastructure.scripts.* def dnssi= new DoDeallocateNSSI() dnssi.preProcessRequest(execution) - - - - SequenceFlow_1ugva41 - SequenceFlow_1u66wjs - SequenceFlow_1anlirk - import org.onap.so.bpmn.infrastructure.scripts.* -def dnssi= new DoDeallocateNSSI() -dnssi.timeDelay(execution) @@ -105,149 +86,171 @@ dnssi.timeDelay(execution) http-connector - SequenceFlow_04vg0c2 - SequenceFlow_1ugva41 + SequenceFlow_19cdxhv + SequenceFlow_02327ff - - SequenceFlow_0sfh52b - SequenceFlow_0r95j9m - SequenceFlow_1u66wjs - - - - #{(execution.getVariable("isNeedUpdateDB" ) == true)} - #{(execution.getVariable("isNeedUpdateDB" ) == true)} - - - - - SequenceFlow_0r95j9m - SequenceFlow_04vg0c2 + SequenceFlow_0o7qjoo + SequenceFlow_19cdxhv + import org.onap.so.bpmn.infrastructure.scripts.* +def dnssi= new DoDeallocateNSSI() +dnssi.prepareUpdateOperationStatus(execution) + + + + + + + + + + SequenceFlow_0w01l14 + SequenceFlow_10nogqz + + + + + SequenceFlow_10nogqz + SequenceFlow_0o7qjoo import org.onap.so.bpmn.infrastructure.scripts.* def dnssi= new DoDeallocateNSSI() dnssi.handleJobStatus(execution) + + + SequenceFlow_1wj89r5 + SequenceFlow_0w01l14 + import org.onap.so.bpmn.infrastructure.scripts.* +def dnssi= new DoDeallocateNSSI() +dnssi.prepareJobStatusRequest(execution) + + + + + + SequenceFlow_1wpbkt9 + + + + - - + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + - + - - - - - + - - - - - + - - - - - + - - - - - - - - - - - - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteSliceService.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteSliceService.bpmn index 5f4816e78f..5510dcde38 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteSliceService.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteSliceService.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_0ep5het @@ -23,12 +23,11 @@ ddss.getNSIFromAAI(execution) SequenceFlow_1rgfzzy - SequenceFlow_05si1me + SequenceFlow_1aa2ek0 import org.onap.so.bpmn.infrastructure.scripts.* def ddss= new DoDeleteSliceService() ddss.getNSSIListFromAAI(execution) - SequenceFlow_15z9iio SequenceFlow_1c4fjbv @@ -40,7 +39,6 @@ ddss.getNSSIListFromAAI(execution) #{(execution.getVariable("isAllNSSIFinished" ) == true)} - #{(execution.getVariable("isAllNSSIFinished" ) == false)} @@ -55,8 +53,8 @@ ddss.preProcessRequest(execution) SequenceFlow_0926ghe - SequenceFlow_05si1me - SequenceFlow_01o2qpv + SequenceFlow_1252rbf + SequenceFlow_17tvomo import org.onap.so.bpmn.infrastructure.scripts.* def ddss= new DoDeleteSliceService() ddss.getCurrentNSSI(execution) @@ -69,14 +67,6 @@ def ddss= new DoDeleteSliceService() ddss.parseNextNSSI(execution) - - - SequenceFlow_01o2qpv - SequenceFlow_0q83qg3 - import org.onap.so.bpmn.infrastructure.scripts.* -def ddss= new DoDeleteSliceService() -ddss.querySliceProfileFromAAI(execution) - SequenceFlow_0npmman @@ -93,30 +83,84 @@ ddss.queryE2ESliceSeriveFromAAI(execution) - SequenceFlow_0q83qg3 + SequenceFlow_17tvomo SequenceFlow_0c58sw3 + + SequenceFlow_1aa2ek0 + SequenceFlow_1252rbf + import org.onap.so.bpmn.infrastructure.scripts.* +def dss= new DeleteSliceService() +dss.terminateNSIQuery(execution) + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -126,79 +170,35 @@ ddss.queryE2ESliceSeriveFromAAI(execution) - - - - - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - + + + + -- cgit 1.2.3-korg