From 36cdaeb207619022fdb6098370a06f904d57b9a4 Mon Sep 17 00:00:00 2001 From: aleemraja Date: Fri, 18 Dec 2020 17:59:03 +0530 Subject: 5G core nssmf - Allocate api Code changes to fix issues observed during testing for share/non-shared nssmf Allocate api Issue-ID: SO-3418 Signed-off-by: aleemraja Change-Id: I37ce7d21eaba8ea51a91a7034502323b2cf3a615 --- .../resources/subprocess/DoAllocateCoreNSSI.bpmn | 1 + .../subprocess/DoAllocateCoreSharedSlice.bpmn | 107 +++++++++++---------- 2 files changed, 58 insertions(+), 50 deletions(-) (limited to 'bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess') diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoAllocateCoreNSSI.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoAllocateCoreNSSI.bpmn index 92407e9b2a..45ebfb9664 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoAllocateCoreNSSI.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoAllocateCoreNSSI.bpmn @@ -78,6 +78,7 @@ allocateNssi.prepareOOFRequest(execution) + SequenceFlow_1ygklb8 SequenceFlow_0tytimn diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoAllocateCoreSharedSlice.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoAllocateCoreSharedSlice.bpmn index 0a482beca0..88902d1c91 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoAllocateCoreSharedSlice.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoAllocateCoreSharedSlice.bpmn @@ -39,37 +39,15 @@ allocateNssi.prepareSOMacroRequestPayload(execution) def allocateNssi = new DoAllocateCoreSharedSlice() allocateNssi.sendPutRequestToSOMacro(execution) - + Flow_0x7shtq + Flow_163kxug Flow_1c9nkx4 import org.onap.so.bpmn.infrastructure.scripts.* def allocateNssi = new DoAllocateCoreSharedSlice() -allocateNssi.prepareCallCheckProcessStatus(execution) +allocateNssi.getSOPUTProgress(execution) - - - - - - - - - - - - - - - - - - - - Flow_1c9nkx4 - Flow_0c94gye - - - + Flow_1973d9m Flow_0da7dao @@ -78,13 +56,13 @@ def allocateNssi = new DoAllocateCoreSharedSlice() allocateNssi.getServiceVNFAndVFsFromCatalogDB(execution) - Flow_0c94gye + Flow_15lksyg SequenceFlow_1re5jor import org.onap.so.bpmn.infrastructure.scripts.* def allocateNssi = new DoAllocateCoreSharedSlice() allocateNssi.prepareUpdateResourceOperationStatus(execution) - + @@ -95,7 +73,7 @@ allocateNssi.prepareUpdateResourceOperationStatus(execution) Basic YnBlbDpwYXNzd29yZDEk - ${updateOperationStatus} + ${updateResourceOperationStatus} POST ${statusCode} ${response} @@ -111,11 +89,11 @@ allocateNssi.prepareUpdateResourceOperationStatus(execution) - + SequenceFlow_1j1qqcs - + SequenceFlow_013bc74 @@ -178,16 +156,33 @@ allocateNssi.prepareFailedOperationStatusUpdate(execution) + + Flow_1c9nkx4 + Flow_15lksyg + Flow_1lzv4jo + + + + #{(execution.getVariable("requestState" ) == "IN_PROGRESS")} + + + Flow_1lzv4jo + Flow_163kxug + import org.onap.so.bpmn.infrastructure.scripts.* +def allocateNssi = new DoAllocateCoreSharedSlice() +allocateNssi.timeDelay(execution) + + - - - - + + + + - + @@ -232,16 +227,9 @@ allocateNssi.prepareFailedOperationStatusUpdate(execution) - - - - - - - - + @@ -271,6 +259,22 @@ allocateNssi.prepareFailedOperationStatusUpdate(execution) + + + + + + + + + + + + + + + + @@ -298,9 +302,6 @@ allocateNssi.prepareFailedOperationStatusUpdate(execution) - - - @@ -313,21 +314,27 @@ allocateNssi.prepareFailedOperationStatusUpdate(execution) - + - + - + + + + + + + -- cgit 1.2.3-korg