From e6a0b6e507098f65fd54f796ff4c3e94d09ebabf Mon Sep 17 00:00:00 2001 From: c00149107 Date: Mon, 5 Mar 2018 11:17:12 +0800 Subject: Update generic create service workflow Update generic create service workflow Change-Id: Ia13b7acd107ca9df96f05f239e8ca156c554eb40 Issue-ID: SO-370 Signed-off-by: c00149107 --- .../scripts/DoCreateE2EServiceInstance.groovy | 40 ++ .../subprocess/DoCreateE2EServiceInstance.bpmn | 621 ++++++++++++--------- 2 files changed, 410 insertions(+), 251 deletions(-) (limited to 'bpmn') diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy index ef2388fe44..cfdc0e9bfa 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy @@ -176,7 +176,47 @@ public class DoCreateE2EServiceInstance extends AbstractServiceTaskProcessor { } utils.log("INFO"," ***** Exit preProcessRequest *****", isDebugEnabled) } + + public void prepareDecomposeService(Execution execution) { + def isDebugEnabled=execution.getVariable("isDebugLogEnabled") + + try { + utils.log("DEBUG", " ***** Inside prepareDecomposeService of create generic e2e service ***** ", isDebugEnabled) + String modelInvariantUuid = execution.getVariable("modelInvariantUuid") + String modelUuid = execution.getVariable("modelUuid") + //here modelVersion is not set, we use modelUuid to decompose the service. + String serviceModelInfo = """{ + "modelInvariantUuid":"${modelInvariantUuid}", + "modelUuid":"${modelUuid}", + "modelVersion":"" + }""" + execution.setVariable("serviceModelInfo", serviceModelInfo) + utils.log("DEBUG", " ***** Completed prepareDecomposeService of create generic e2e service ***** ", isDebugEnabled) + } catch (Exception ex) { + // try error in method block + String exceptionMessage = "Bpmn error encountered in create generic e2e service flow. Unexpected Error from method prepareDecomposeService() - " + ex.getMessage() + exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage) + } + } + + public void processDecomposition (Execution execution) { + def isDebugEnabled=execution.getVariable("isDebugLogEnabled") + + utils.log("DEBUG", " ***** Inside processDecomposition() of create generic e2e service flow ***** ", isDebugEnabled) + try { + ServiceDecomposition serviceDecomposition = execution.getVariable("serviceDecomposition") + } catch (Exception ex) { + String exceptionMessage = "Bpmn error encountered in create generic e2e service flow. processDecomposition() - " + ex.getMessage() + utils.log("DEBUG", exceptionMessage, isDebugEnabled) + exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage) + } + } + + public void doServiceHoming(Execution execution) { + //Now Homing is not clear. So to be implemented. + } + public void postProcessAAIGET(Execution execution) { def isDebugEnabled=execution.getVariable("isDebugLogEnabled") utils.log("INFO"," ***** postProcessAAIGET ***** ", isDebugEnabled) diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn index 0849c46b20..ddc87c7d55 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn @@ -2,19 +2,17 @@ - SequenceFlow_1 + SequenceFlow_1qiiycn - - SequenceFlow_1 - SequenceFlow_2 + SequenceFlow_1qiiycn + SequenceFlow_0w9t6tc - @@ -25,7 +23,7 @@ dcsi.preProcessRequest(execution) - SequenceFlow_2 + SequenceFlow_1i7t9hq SequenceFlow_4 @@ -93,49 +91,24 @@ dcsi.postProcessAAIGET(execution)]]> SequenceFlow_129ih1g - SequenceFlow_03fabby + SequenceFlow_1tkgqu3 - - SequenceFlow_1q1d7d9 - SequenceFlow_15zgrcq - - - - - - - - - - - - - - - - SequenceFlow_15zgrcq - SequenceFlow_1aya35q - - SequenceFlow_0lt42ul - SequenceFlow_092ghvu + SequenceFlow_16nxl6h + SequenceFlow_0vbznai - - - SequenceFlow_092ghvu + SequenceFlow_0vbznai - SequenceFlow_03fabby + SequenceFlow_1hbesp9 SequenceFlow_1qctzm0 SequenceFlow_10reo7r - SequenceFlow_1limzcd + SequenceFlow_1vprtt9 SequenceFlow_11f2zuu - - SequenceFlow_10q9kus - SequenceFlow_17i1ors - - - - SequenceFlow_17i1ors - SequenceFlow_02svciv - - - - - SequenceFlow_04d3qcu - SequenceFlow_10q9kus - SequenceFlow_1q1d7d9 - - + SequenceFlow_10reo7r SequenceFlow_13d9g1n @@ -197,362 +152,526 @@ ddsi.sequenceResoure(execution)]]> SequenceFlow_1jenxlp - SequenceFlow_0lt42ul SequenceFlow_0q6uy30 + SequenceFlow_16nxl6h - - - - SequenceFlow_1aya35q - SequenceFlow_02svciv + SequenceFlow_13c7bhn SequenceFlow_1jenxlp - - - SequenceFlow_11f2zuu SequenceFlow_0q6uy30 - SequenceFlow_18wj44x - SequenceFlow_04d3qcu + SequenceFlow_1qozd66 + SequenceFlow_0uiygod - - - - - - - SequenceFlow_13d9g1n - SequenceFlow_1limzcd SequenceFlow_18wj44x + SequenceFlow_1vprtt9 - + + + + + SequenceFlow_0uiygod + SequenceFlow_1u9k0dm + + + + SequenceFlow_1u9k0dm + SequenceFlow_13c7bhn + + + + SequenceFlow_0w9t6tc + + + + SequenceFlow_1gusrvp + + + + SequenceFlow_0xjwb45 + SequenceFlow_027owbf + + + + + + + + + + + + SequenceFlow_0qxzgvq + SequenceFlow_0xjwb45 + + + SequenceFlow_166w91p + SequenceFlow_0qxzgvq + + + + SequenceFlow_166w91p + + + + + + + + + SequenceFlow_1tkgqu3 + + + + + + SequenceFlow_1i7t9hq + + + + + SequenceFlow_18wj44x + SequenceFlow_11f2zuu + + + - - + + SequenceFlow_1hbesp9 + + + + + SequenceFlow_1qozd66 + + + + + + + + + + + + SequenceFlow_027owbf + SequenceFlow_1gusrvp + + - + - + - + - - - - - - - - - - - - - - - - + + + + - + - + - + - - + + + + - + - + - + - + - + - + - + - - + + - + - - + + - + - + - - + + + + - + - + - + - - + + - + - + - - - - + + + + - + - - - - - - - + - - - - - - - - - - - - - - - + - + - - + + - + - + - + - - - - + - - + + + + + + + + + + + + + + + + + + - - - + + + - + - - - + + + + + + + + + + + - + - - - + + + + + + - + - - + + + + + - + - - - - - + + + - + - - + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + + + - + - - - - - + + + + + - + - - + + + + + - - - - - + + + - + - - - - - + + + + + + + + + + - + - - - + + + + + + + + + - + - - + + + + + - - - - + + + - + - - - - + + + - + - - - + + + - + - - + + + - + - - - - + + + + - + - - - - + + + - + + + + + + + + + + + -- cgit 1.2.3-korg