From a9d903b6eb024b76bacf09dec811b4124d79d616 Mon Sep 17 00:00:00 2001 From: aleemraja Date: Sun, 28 Feb 2021 10:40:17 +0530 Subject: Core-nssmf - activate/deactivate flow To fix the issues noticed during testing - in activate and deactivate flow - in allocate non-shared: update requestdb correctly when flow is successful. Issue-ID: SO-3527 Signed-off-by: aleemraja Change-Id: I37ce7d61eaba8ea60a95a9517509696b2cf3a357 --- .../resources/subprocess/DoActivateCoreNSSI.bpmn | 279 +++++++++------------ 1 file changed, 124 insertions(+), 155 deletions(-) (limited to 'bpmn/so-bpmn-infrastructure-flows') diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoActivateCoreNSSI.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoActivateCoreNSSI.bpmn index b422545e84..9ce25ed174 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoActivateCoreNSSI.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoActivateCoreNSSI.bpmn @@ -4,7 +4,7 @@ SequenceFlow_0wwo1lh - + SequenceFlow_0wwo1lh SequenceFlow_139ejmn import org.onap.so.bpmn.infrastructure.scripts.* @@ -25,8 +25,8 @@ activateNssi.getServiceVNFAndVFsFromCatalogDB(execution) def activateNssi = new DoActivateCoreNSSI() activateNssi.prepareSOMacroRequestPayLoad(execution) - - SequenceFlow_1e20i9g + + Flow_09eevay SequenceFlow_0j0egoi import org.onap.so.bpmn.infrastructure.scripts.* def activateNssi = new DoActivateCoreNSSI() @@ -46,38 +46,9 @@ activateNssi.getNetworkInstanceWithSPInstanceAssociatedWithNssiId(execution) - - Flow_039sx2v - SequenceFlow_18x9gdi - import org.onap.so.bpmn.infrastructure.scripts.* -def activateNssi = new DoActivateCoreNSSI() -activateNssi.prepareCallCheckProcessStatus(execution) - - - - - - - - - - - - - - - - - - - - - SequenceFlow_18x9gdi - SequenceFlow_1l9ry0a - - - SequenceFlow_1l9ry0a - SequenceFlow_0wx21io + + Flow_1a7o8s7 + Flow_09eevay import org.onap.so.bpmn.infrastructure.scripts.* def activateNssi = new DoActivateCoreNSSI() activateNssi.prepareUpdateResourceOperationStatus(execution) @@ -86,7 +57,6 @@ activateNssi.prepareUpdateResourceOperationStatus(execution) - SequenceFlow_0fbr356 @@ -98,25 +68,15 @@ activateNssi.prepareUpdateResourceOperationStatus(execution) - - SequenceFlow_0wx21io - SequenceFlow_1e20i9g - SequenceFlow_07u1gfw - - - - #{(execution.getVariable("isTimeOut") == "NO")} - SequenceFlow_0v0dntm - SequenceFlow_0rjd7tg Flow_039sx2v Flow_1jchhgj - + #{(execution.getVariable("isSOResponseSucceed" ) == "yes")} @@ -130,7 +90,7 @@ activateNssi.prepareUpdateResourceOperationStatus(execution) Basic YnBlbDpwYXNzd29yZDEk - ${updateOperationStatus} + ${updateResourceOperationStatus} POST ${statusCode} ${response} @@ -140,13 +100,11 @@ activateNssi.prepareUpdateResourceOperationStatus(execution) Flow_1jchhgj SequenceFlow_0j0egoi - SequenceFlow_07u1gfw SequenceFlow_0v0dntm - Flow_149oqyp @@ -196,225 +154,236 @@ activateNssi.prepareFailedOperationStatusUpdate(execution) + + Flow_0q5mlhf + Flow_039sx2v + Flow_1mtsx52 + import org.onap.so.bpmn.infrastructure.scripts.* +def activateNssi = new DoActivateCoreNSSI() +activateNssi.getSOPUTProgress(execution) + + + Flow_1mtsx52 + Flow_1ocji6k + Flow_1a7o8s7 + + + Flow_1ocji6k + Flow_0q5mlhf + import org.onap.so.bpmn.infrastructure.scripts.* +def activateNssi = new DoActivateCoreNSSI() +activateNssi.timeDelay() + + + + #{(execution.getVariable("requestState" ) == "IN_PROGRESS")} + + + + - - - + + + + + + + + + + + + + + + - + + + + + + - - - + + - - - - + + + + - + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - + - - + + - - + + - - + + - - - - - - - - - + + - - + + - - + + - - + + - + - + - + - + - + - + - + - - - - - - - + - + - + - + - - - - - - - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - + - + - + - + - + + + + + + + + + + - + \ No newline at end of file -- cgit 1.2.3-korg