From 62cd6aaaf74aa91ee0037c0e155c8e7284f07567 Mon Sep 17 00:00:00 2001 From: Arthur Martella Date: Fri, 8 Sep 2017 13:27:46 -0400 Subject: 1710 Rebase - Second Attempt This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit: 54483fc6606ddb1591a2e9da61bff8712325f924 Wed Sep 6 18:12:56 2017 -0400 Rebasing was done on a branch on top of this commit in so/master in ONAP: 93fbdfbe46104f8859d4754040f979cb7997c157 Thu Sep 7 16:42:59 2017 +0000 Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59 Issue-id: SO-107 Signed-off-by: Arthur Martella --- .../subprocess/DoCreateVnfAndModulesRollback.bpmn | 432 ++++++++++++++++----- 1 file changed, 345 insertions(+), 87 deletions(-) (limited to 'bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModulesRollback.bpmn') diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModulesRollback.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModulesRollback.bpmn index 2fba166dc4..aa362021e0 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModulesRollback.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModulesRollback.bpmn @@ -9,9 +9,9 @@ SequenceFlow_22 - + - SequenceFlow_12 + SequenceFlow_1wch84s SequenceFlow_22 + + + SequenceFlow_12 + SequenceFlow_1wch84s + + SequenceFlow_23 @@ -32,19 +40,21 @@ dcvfmr.saveWorkflowException(execution, 'DCVFMR_CaughtWorkflowException1')]]>SequenceFlow_1537b7m - SequenceFlow_0bmsi5h SequenceFlow_1srw52v + SequenceFlow_0zjzorm + SequenceFlow_19xaddm SequenceFlow_1r6wyy6 SequenceFlow_0v85t87 - SequenceFlow_1r6wyy6 + SequenceFlow_1g6psjt + SequenceFlow_152tazp SequenceFlow_1kr0r4a SequenceFlow_1yas9ol - SequenceFlow_04yd2yr - SequenceFlow_1yas9ol + SequenceFlow_0mk9lrj + SequenceFlow_03cc9y6 @@ -54,8 +64,8 @@ dcvfmr.saveWorkflowException(execution, 'DCVFMR_CaughtWorkflowException1')]]> - - + + SequenceFlow_0v85t87 SequenceFlow_1ycq005 @@ -63,26 +73,30 @@ dcvamr.preProcessRequest(execution)]]> def dcvamr = new DoCreateVnfAndModulesRollback() dcvamr.preProcessCreateVfModuleRollback(execution)]]> - + - + + + + + SequenceFlow_1ycq005 SequenceFlow_181hb2a - + 0}]]> - + - - + + @@ -92,7 +106,7 @@ dcvamr.preProcessCreateVfModuleRollback(execution)]]> SequenceFlow_1kr0r4a SequenceFlow_04yd2yr - + SequenceFlow_181hb2a SequenceFlow_1srw52v @@ -101,13 +115,111 @@ def dcvamr = new DoCreateVnfAndModulesRollback() dcvamr.postProcessCreateVfModuleRollback(execution)]]> + + SDNCDeactivateYes + SequenceFlow_0nysmc9 + + + + SequenceFlow_1hc04x2 + SequenceFlow_19xaddm + + + + + + + + + + + + + SequenceFlow_0nysmc9 + SequenceFlow_1hc04x2 + + + + + SequenceFlow_1rezswi + SequenceFlow_0zjzorm + SDNCDeactivateYes + + + + + + + + SequenceFlow_1r6wyy6 + SequenceFlow_1g6psjt + SequenceFlow_01am36p + + + + SequenceFlow_01am36p + SequenceFlow_0a5ecvu + + + + + + + + + + + + + SequenceFlow_0a5ecvu + SequenceFlow_1ilok6u + + + SequenceFlow_1ilok6u + SequenceFlow_152tazp + + + + + + + + + + SequenceFlow_0bmsi5h + SequenceFlow_1rezswi + SequenceFlow_0mk9lrj + + + + + + + + SequenceFlow_1yas9ol + SequenceFlow_04yd2yr + SequenceFlow_03cc9y6 + + - + @@ -116,167 +228,313 @@ dcvamr.postProcessCreateVfModuleRollback(execution)]]> - + - + - + - + - + - + - + - + - + - - - - + + - + - - + + - + - + - + - + - + - + - + - + - + - - + + - + - + - - - - + + + + - + - - + + - + - + - - + + - - - - - + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - + + - + - + - - + + - + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + \ No newline at end of file -- cgit 1.2.3-korg