From bcfee1b5b7bd91f21a6b7b2fd3be9484b10b542c Mon Sep 17 00:00:00 2001 From: hetengjiao Date: Mon, 18 Jan 2021 09:16:38 +0800 Subject: update nsmf workflow of active and deactive nssi Issue-ID: SO-2963 Signed-off-by: hetengjiao Change-Id: Ic144713f9cf55ed8db679bd7c57052fcea2aadf9 --- .../resources/process/ActivateSliceService.bpmn | 552 +++++++++++---------- .../subprocess/DoActivateSliceService.bpmn | 211 ++++++++ .../resources/subprocess/DoSendCommandToNSSMF.bpmn | 344 ------------- 3 files changed, 505 insertions(+), 602 deletions(-) create mode 100644 bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoActivateSliceService.bpmn delete mode 100644 bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoSendCommandToNSSMF.bpmn (limited to 'bpmn/so-bpmn-infrastructure-flows') diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/ActivateSliceService.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/ActivateSliceService.bpmn index cd4cf473a6..af89197057 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/ActivateSliceService.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/ActivateSliceService.bpmn @@ -2,25 +2,12 @@ - - - + - - SequenceFlow_1jp9gjt - SequenceFlow_1gkpl5q - import org.onap.so.bpmn.infrastructure.scripts.* -def csi= new ActivateSliceService() -csi.updateStatusSNSSAIandNSIandNSSI(execution) - - - SequenceFlow_1gkpl5q - SequenceFlow_0pzts4p - import org.onap.so.bpmn.infrastructure.scripts.* -def csi = new ActivateSliceService() -csi.prepareCompletionRequest(execution) - - + + SequenceFlow_1tdecf1 + + @@ -28,7 +15,7 @@ csi.prepareCompletionRequest(execution) application/soap+xml - ${UrnPropertiesReader.getVariable("mso.adapters.requestDb.auth", execution)} + Basic YnBlbDpwYXNzd29yZDEk ${updateOperationStatus} @@ -39,65 +26,95 @@ csi.prepareCompletionRequest(execution) http-connector - SequenceFlow_0pzts4p - SequenceFlow_0ozefu5 + SequenceFlow_1ox6oh6 + SequenceFlow_0szxmyf - - SequenceFlow_0r611x8 - SequenceFlow_0ozefu5 - - - SequenceFlow_1qa8miv - - - - SequenceFlow_00ba5l9 - SequenceFlow_1jp9gjt - SequenceFlow_1qa8miv - - - - - - - - - - - - - - - SequenceFlow_1o4zjvp - SequenceFlow_00ba5l9 - - - SequenceFlow_1yus0c1 - SequenceFlow_1uqgdxr + + SequenceFlow_1tdecf1 + SequenceFlow_0bvnci8 + import org.onap.so.bpmn.infrastructure.scripts.* +def csi= new ActivateSliceService() +csi.preProcessRequest(execution) + + + SequenceFlow_0bvnci8 + SequenceFlow_1ox6oh6 + import org.onap.so.bpmn.infrastructure.scripts.* +def csi= new ActivateSliceService() +csi.prepareInitServiceOperationStatus(execution) + + + + + + SequenceFlow_0szxmyf + SequenceFlow_1p778c2 import org.onap.so.bpmn.infrastructure.scripts.* def csi = new ActivateSliceService() csi.sendSyncResponse(execution) - - SequenceFlow_1uqgdxr - SequenceFlow_149lhmo + + + SequenceFlow_1p778c2 + SequenceFlow_1wrrg4v + SequenceFlow_0mr8oz6 import org.onap.so.bpmn.infrastructure.scripts.* def csi= new ActivateSliceService() -csi.checkAAIOrchStatusofslice(execution) +csi.checkAAIOrchStatusOfE2ESlice(execution) - - SequenceFlow_149lhmo - SequenceFlow_15fdf5d - SequenceFlow_0r611x8 + + SequenceFlow_19gpkz7 + SequenceFlow_0cn6n0t + SequenceFlow_0cs78yf - - SequenceFlow_15fdf5d - SequenceFlow_144cqr9 + + SequenceFlow_0cn6n0t + + + + #{execution.getVariable("isContinue") == "true"} + + + SequenceFlow_003ne6w + SequenceFlow_1b7nvps import org.onap.so.bpmn.infrastructure.scripts.* def csi= new ActivateSliceService() csi.prepareActivation(execution) - + + SequenceFlow_1pgjdeq + + + + + + + + + + + + + SequenceFlow_1b7nvps + SequenceFlow_1rsr0hp + SequenceFlow_1pgjdeq + SequenceFlow_150j97l + + + SequenceFlow_194fylv + SequenceFlow_0eiek58 + import org.onap.so.bpmn.infrastructure.scripts.* +def csi= new ActivateSliceService() +csi.updateStatusSNSSAIandNSIandNSSI(execution) + + + SequenceFlow_0eiek58 + SequenceFlow_0dc8i0s + import org.onap.so.bpmn.infrastructure.scripts.* +def csi = new ActivateSliceService() +csi.prepareCompletionRequest(execution) + + @@ -105,7 +122,7 @@ csi.prepareActivation(execution) application/soap+xml - Basic YnBlbDpwYXNzd29yZDEk + ${UrnPropertiesReader.getVariable("mso.adapters.requestDb.auth", execution)} ${updateOperationStatus} @@ -116,256 +133,275 @@ csi.prepareActivation(execution) http-connector - SequenceFlow_1av6du3 - SequenceFlow_1yus0c1 + SequenceFlow_0dc8i0s + SequenceFlow_11u2ido - - SequenceFlow_0qksr1g - SequenceFlow_183ypky - import org.onap.so.bpmn.infrastructure.scripts.* -def csi= new ActivateSliceService() -csi.preProcessRequest(execution) - - - SequenceFlow_144cqr9 - SequenceFlow_1o4zjvp - SequenceFlow_1pj1j1o - - - SequenceFlow_0qksr1g - - - SequenceFlow_1pj1j1o - + + SequenceFlow_11u2ido + SequenceFlow_0cs78yf - - SequenceFlow_183ypky - SequenceFlow_1av6du3 - import org.onap.so.bpmn.infrastructure.scripts.* -def csi= new ActivateSliceService() -csi.prepareInitServiceOperationStatus(execution) - - - - SequenceFlow_0oiiwjo - SequenceFlow_0uckyao + + + + SequenceFlow_16jz1l6 + SequenceFlow_097vxbl import org.onap.so.bpmn.infrastructure.scripts.* def csi= new ActivateSliceService() csi.sendSyncError(execution) - - SequenceFlow_0uckyao + + SequenceFlow_097vxbl - - SequenceFlow_0oiiwjo - + + SequenceFlow_16jz1l6 + - - + + - - - #{execution.getVariable("isNSSIActivate") == "false"} - - + + + #{execution.getVariable("isContinue") == "false"} - - #{execution.getVariable("isNSSIActivate") == "false"} - - - #{execution.getVariable("isNSSIActivate") == "true"} + + SequenceFlow_003ne6w + + + + SequenceFlow_1wrrg4v + SequenceFlow_1ny9zkw + import org.onap.so.bpmn.infrastructure.scripts.* +def csi= new ActivateSliceService() +csi.checkAAIOrchStatusOfAllocates(execution) + + + #{execution.getVariable("isContinue") == true} - - - - - - - - #{execution.getVariable("isContinue") == "true"} + + SequenceFlow_0mr8oz6 + + + + + + SequenceFlow_1ny9zkw + SequenceFlow_19gpkz7 + import org.onap.so.bpmn.infrastructure.scripts.* +def csi= new ActivateSliceService() +csi.checkAAIOrchStatusOfNSI(execution) + + + + + #{execution.getVariable("WorkflowException") == null} - - - #{execution.getVariable("isNSSIActivate") == "true"} + + #{execution.getVariable("isOperationFinished") == "true"} - - - + + + SequenceFlow_150j97l + SequenceFlow_194fylv + SequenceFlow_1rsr0hp + import org.onap.so.bpmn.infrastructure.scripts.* +def csi= new ActivateSliceService() +csi.isOperationFinished(execution) + + - - - - - - - + + + + + + - - + + - - + + - - + + - - - + + + - - - + + + - - - - - - - - + + + + + + - - + + + + + + - - + + - + - - - - - - - - + + + + + - - + + + - + + + + - - + + - - + + + + + + - - + + - - - - - + + - - + + - - - - - - - - - - - - - - + + - + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + + + - + - - - + + - + - - - - - - + + + + + + + - + - - - + + - + - - - - - - - - - + + + - - + + + + + + + + + + - - - + + + + + + + - - - + + + - - - + + + + + + + + + + + + + + + + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoActivateSliceService.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoActivateSliceService.bpmn new file mode 100644 index 0000000000..ca231b3daf --- /dev/null +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoActivateSliceService.bpmn @@ -0,0 +1,211 @@ + + + + + + SequenceFlow_13fdjwf + + + SequenceFlow_13fdjwf + SequenceFlow_1lh6vpe + import org.onap.so.bpmn.infrastructure.scripts.* +def dcso = new DoActivateSliceService() +dcso.preProcessRequest(execution) + + + + + + + + + + + SequenceFlow_1yqrli6 + SequenceFlow_0ru5d0h + + + SequenceFlow_0ru5d0h + SequenceFlow_0so165e + import org.onap.so.bpmn.infrastructure.scripts.* +def dcso = new DoActivateSliceService() +dcso.processDecomposition(execution) + + + SequenceFlow_0so165e + SequenceFlow_05wxhwm + import org.onap.so.bpmn.infrastructure.scripts.* +def dcso = new DoActivateSliceService() +dcso.sendCreateRequestNSSMF(execution) + + + + + + + SequenceFlow_1lh6vpe + SequenceFlow_1yqrli6 + import org.onap.so.bpmn.infrastructure.scripts.* +def dcso = new DoActivateSliceService() +dcso.prepareCompose(execution) + + + SequenceFlow_0oa5clt + SequenceFlow_05wxhwm + SequenceFlow_1herzai + import org.onap.so.bpmn.infrastructure.scripts.* +def dcso = new DoActivateSliceService() +dcso.queryNSSIStatus(execution) + + + SequenceFlow_1herzai + SequenceFlow_0btrzm8 + SequenceFlow_1lvozh0 + + + SequenceFlow_1lvozh0 + + + SequenceFlow_0btrzm8 + SequenceFlow_0oa5clt + import org.onap.so.bpmn.infrastructure.scripts.* +def dcso = new DoActivateSliceService() +dcso.timeDelay(execution) + + + + + + #{(execution.getVariable("jobFinished" ) == true)} + + + + + SequenceFlow_0ca8iyv + + + + SequenceFlow_0aqapur + + + SequenceFlow_0ca8iyv + SequenceFlow_0aqapur + import org.onap.so.bpmn.infrastructure.scripts.* +def dcso = new DoActivateSliceService() +dcso.sendSyncError(execution) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoSendCommandToNSSMF.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoSendCommandToNSSMF.bpmn deleted file mode 100644 index 4f12ca7f41..0000000000 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoSendCommandToNSSMF.bpmn +++ /dev/null @@ -1,344 +0,0 @@ - - - - - - - - SequenceFlow_0umnozs - SequenceFlow_1vuuuhr - SequenceFlow_1ea3pk8 - import org.onap.so.bpmn.infrastructure.scripts.* -def csi= new DoSendCommandToNSSMF() -csi.getNSSIformlist(execution) - - - SequenceFlow_1yjsv5s - SequenceFlow_1qxmooy - SequenceFlow_1lh0it1 - SequenceFlow_0swcqw8 - - - SequenceFlow_1ea3pk8 - SequenceFlow_080lgb0 - SequenceFlow_1oi86yc - - - - - - - #{execution.getVariable("isActivateSuccessfull") == "waitting"} - - - #{execution.getVariable("isActivateSuccessfull") == "false"} - - - #{execution.getVariable("isActivateSuccessfull") == "true"} - - - #{execution.getVariable("isGetSuccessfull") == "true"} - - - - #{execution.getVariable("isNSSIActivated") == "true"} - - - #{execution.getVariable("isNSSIActivated") == "false"} - - - - - #{execution.getVariable("isGetSuccessfull") == "false"} - - - SequenceFlow_1oi86yc - - - SequenceFlow_1pfo460 - - - SequenceFlow_1pfo460 - SequenceFlow_0umnozs - import org.onap.so.bpmn.infrastructure.scripts.* -def dcso = new DoSendCommandToNSSMF() -dcso.preProcessRequest(execution) - - - - SequenceFlow_0oiiwjo - - - - SequenceFlow_0uckyao - - - - - SequenceFlow_0oiiwjo - SequenceFlow_0uckyao - import org.onap.so.bpmn.infrastructure.scripts.* -def csi= new DoSendCommandToNSSMF() -csi.sendSyncError(execution) - - - - - - SequenceFlow_020xvv4 - SequenceFlow_1lh0it1 - - - - SequenceFlow_1s2oozd - SequenceFlow_0swcqw8 - SequenceFlow_10162l8 - import org.onap.so.bpmn.infrastructure.scripts.* -def csi= new DoSendCommandToNSSMF() -csi.WaitForReturn(execution) - - - SequenceFlow_10162l8 - SequenceFlow_1yjsv5s - import org.onap.so.bpmn.infrastructure.scripts.* -def csi= new DoSendCommandToNSSMF() -csi.GetTheStatusOfActivation(execution) - - - SequenceFlow_08xfw41 - SequenceFlow_1s2oozd - SequenceFlow_020xvv4 - - - SequenceFlow_1a6iu8c - SequenceFlow_08xfw41 - import org.onap.so.bpmn.infrastructure.scripts.* -def csi= new DoSendCommandToNSSMF() -csi.SendCommandToNssmf(execution) - - - - - - - - - - SequenceFlow_080lgb0 - SequenceFlow_1ucjcm1 - - - SequenceFlow_1ucjcm1 - SequenceFlow_1a6iu8c - import org.onap.so.bpmn.infrastructure.scripts.* -def csi= new DoSendCommandToNSSMF() -csi.processDecomposition(execution) - - - - - - - ${CVFMI_dbAdapterEndpoint} - - - application/soap+xml - Basic YnBlbDpwYXNzd29yZDEk - - - ${CVFMI_updateServiceOperStatusRequest} - POST - ${statusCode} - ${response} - - http-connector - - - SequenceFlow_1oeexsj - SequenceFlow_1vuuuhr - - - SequenceFlow_1qxmooy - SequenceFlow_1oeexsj - import org.onap.so.bpmn.infrastructure.scripts.* -def csi= new DoSendCommandToNSSMF() -csi.UpdateIndex(execution) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit 1.2.3-korg