From 38f720752af4d4aad8c4e467a288d9048659f688 Mon Sep 17 00:00:00 2001 From: Rob Daugherty Date: Wed, 14 Mar 2018 02:07:32 -0400 Subject: AT&T 1712 and 1802 release code This is code from AT&T's 1712 and 1802 releases. Change-Id: Ie1e85851e94bc66c4d9514a0226c221939531a04 Issue-ID: SO-425 Signed-off-by: Rob Daugherty --- .../subprocess/CreateServiceInstanceV3.bpmn | 146 ++++ .../CreateServiceInstanceV3Rollback.bpmn | 97 +++ .../subprocess/DoCreateServiceInstance.bpmn | 252 ++++-- .../DoCreateServiceInstanceRollback.bpmn | 68 +- .../DoCreateServiceInstanceRollbackV2.bpmn | 103 +++ .../subprocess/DoCreateServiceInstanceV2.bpmn | 197 +++++ .../resources/subprocess/DoCreateVfModule.bpmn | 856 ++++++++++++++++----- .../subprocess/DoCreateVfModuleRollback.bpmn | 255 +++--- .../subprocess/DoCreateVfModuleVolumeV2.bpmn | 4 +- .../src/main/resources/subprocess/DoCreateVnf.bpmn | 1 + .../subprocess/DoCreateVnfAndModules.bpmn | 4 +- .../subprocess/DoCreateVnfAndModulesRollback.bpmn | 3 +- .../DoCustomDeleteE2EServiceInstance.bpmn | 2 +- .../subprocess/DoDeleteServiceInstance.bpmn | 14 +- .../resources/subprocess/DoDeleteVfModule.bpmn | 228 +++--- .../subprocess/DoDeleteVnfAndModules.bpmn | 2 + .../subprocess/DoUpdateVnfAndModules.bpmn | 1 + .../src/main/resources/subprocess/RollbackVnf.bpmn | 343 +++++++++ .../subprocess/SetRefactorServiceDecomp.bpmn | 68 ++ 19 files changed, 2103 insertions(+), 541 deletions(-) create mode 100644 bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/CreateServiceInstanceV3.bpmn create mode 100644 bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/CreateServiceInstanceV3Rollback.bpmn create mode 100644 bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstanceRollbackV2.bpmn create mode 100644 bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstanceV2.bpmn create mode 100644 bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/RollbackVnf.bpmn create mode 100644 bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/SetRefactorServiceDecomp.bpmn (limited to 'bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess') diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/CreateServiceInstanceV3.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/CreateServiceInstanceV3.bpmn new file mode 100644 index 0000000000..dcb5323fa5 --- /dev/null +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/CreateServiceInstanceV3.bpmn @@ -0,0 +1,146 @@ + + + + + SequenceFlow_055igqy + + + + SequenceFlow_055igqy + SequenceFlow_0n3aqvm + + + SequenceFlow_011vkoq + + + + SequenceFlow_0n3aqvm + SequenceFlow_1knhaka + + + + + + SequenceFlow_1knhaka + SequenceFlow_1wvh54c + + + SequenceFlow_1wvh54c + SequenceFlow_011vkoq + + + + + SequenceFlow_1lli2e6 + + + + SequenceFlow_1hm0qrs + + + + + + + + SequenceFlow_1hm0qrs + SequenceFlow_1lli2e6 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/CreateServiceInstanceV3Rollback.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/CreateServiceInstanceV3Rollback.bpmn new file mode 100644 index 0000000000..392ebd7ac8 --- /dev/null +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/CreateServiceInstanceV3Rollback.bpmn @@ -0,0 +1,97 @@ + + + + + SequenceFlow_15a3kpo + + + + SequenceFlow_0dqe5xo + + + + SequenceFlow_15a3kpo + SequenceFlow_0dqe5xo + + + + SequenceFlow_10szwpv + + + + + SequenceFlow_05g9m3e + + + + SequenceFlow_10szwpv + SequenceFlow_05g9m3e + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstance.bpmn index 19fd490b9f..7b2ededb6f 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstance.bpmn @@ -9,7 +9,7 @@ SequenceFlow_2 SequenceFlow_3 @@ -17,8 +17,8 @@ dcsi.getAAICustomerById(execution)]]> SequenceFlow_1 SequenceFlow_2 @@ -26,14 +26,14 @@ dcsi.preProcessRequest(execution) SequenceFlow_156ih25 SequenceFlow_14 SequenceFlow_9 SequenceFlow_10 @@ -80,22 +80,21 @@ dcsi.postProcessSDNCAssign(execution)]]> SequenceFlow_1uw2p9a SequenceFlow_1w01tqs - SequenceFlow_129ih1g + SequenceFlow_1jhzmzn - - + SequenceFlow_3 SequenceFlow_11fnnkb SequenceFlow_1uw2p9a - + SequenceFlow_0tgrn11 - + SequenceFlow_1xzgv5k @@ -117,8 +116,8 @@ dcsi.postProcessSDNCAssign(execution)]]> SequenceFlow_0tgrn11 SequenceFlow_1lqktwf @@ -126,14 +125,14 @@ dcsi.preProcessRollback(execution) SequenceFlow_0eumzpf SequenceFlow_1xzgv5k - - SequenceFlow_1dd86x8 + + SequenceFlow_0w5i6vf SequenceFlow_156ih25 SequenceFlow_00v4npo @@ -142,24 +141,16 @@ dcsi.postProcessRollback(execution) SequenceFlow_00v4npo - + SequenceFlow_4 SequenceFlow_1w01tqs - - SequenceFlow_129ih1g - SequenceFlow_1dd86x8 - - - @@ -179,10 +170,53 @@ ddsi.postProcessAAIPUT(execution)]]> SequenceFlow_0tx5frq SequenceFlow_01q6pl4 - + + SequenceFlow_1jhzmzn + SequenceFlow_16sdyz9 + + + + + SequenceFlow_16sdyz9 + SequenceFlow_0k0wn03 + + + + SequenceFlow_0k0wn03 + SequenceFlow_0w5i6vf + + + + + + + + SequenceFlow_0x48any + SequenceFlow_052o4xc + + + + SequenceFlow_0x48any + + + + SequenceFlow_052o4xc + + + + @@ -215,9 +249,9 @@ dcsi.postProcessAAIGET2(execution)]]> - + - + @@ -228,13 +262,13 @@ dcsi.postProcessAAIGET2(execution)]]> - + - + - + @@ -244,28 +278,24 @@ dcsi.postProcessAAIGET2(execution)]]> - - - - + + - + - - - - + + - + - - + + - + @@ -274,17 +304,10 @@ dcsi.postProcessAAIGET2(execution)]]> - - - - - - - - + @@ -335,31 +358,31 @@ dcsi.postProcessAAIGET2(execution)]]> - + - + - - - - + + - + - + - + - - + + + + - + @@ -374,16 +397,6 @@ dcsi.postProcessAAIGET2(execution)]]> - - - - - - - - - - @@ -407,25 +420,96 @@ dcsi.postProcessAAIGET2(execution)]]> - + - - + + - + - - + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstanceRollback.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstanceRollback.bpmn index 6c24696cbd..ef5ce351d2 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstanceRollback.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstanceRollback.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_1 @@ -35,20 +35,6 @@ rbk.processRollbackException(execution)]]> - - - - - - - - - - - - SequenceFlow_1x9eh33 - SequenceFlow_05wu9i7 - SequenceFlow_06aasqh SequenceFlow_11fnnkb @@ -66,10 +52,6 @@ rbk.processRollbackException(execution)]]> SequenceFlow_1x9eh33 - - - - @@ -98,9 +80,9 @@ rbk.validateSDNCResponse(execution, response, "deactivate")]]> SequenceFlow_1rzlaoy - SequenceFlow_05wu9i7 SequenceFlow_1n7wade SequenceFlow_1rzlaoy + SequenceFlow_0h3wkj4 SequenceFlow_01l4ssl + + SequenceFlow_1x9eh33 + SequenceFlow_0h3wkj4 + + + + + @@ -208,9 +198,6 @@ rbk.validateSDNCResponse(execution, response, "delete")]]> - - - @@ -247,20 +234,6 @@ rbk.validateSDNCResponse(execution, response, "delete")]]> - - - - - - - - - - - - - - @@ -374,6 +347,27 @@ rbk.validateSDNCResponse(execution, response, "delete")]]> + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstanceRollbackV2.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstanceRollbackV2.bpmn new file mode 100644 index 0000000000..7853aa9586 --- /dev/null +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstanceRollbackV2.bpmn @@ -0,0 +1,103 @@ + + + + + SequenceFlow_0r35zfs + + + + SequenceFlow_1f949uf + + + + SequenceFlow_0r35zfs + SequenceFlow_1f949uf + + + + + SequenceFlow_1tnfu1n + + + + + SequenceFlow_0hi9120 + + + + SequenceFlow_1tnfu1n + SequenceFlow_0hi9120 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstanceV2.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstanceV2.bpmn new file mode 100644 index 0000000000..251af54305 --- /dev/null +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstanceV2.bpmn @@ -0,0 +1,197 @@ + + + + + SequenceFlow_0g8qp84 + + + + + SequenceFlow_0ekno6w + SequenceFlow_1t50vt9 + SequenceFlow_0xhy3o1 + + + + + + + SequenceFlow_0xhy3o1 + + + + SequenceFlow_0eryvle + + + + SequenceFlow_0g8qp84 + SequenceFlow_0651nnp + + + + SequenceFlow_0651nnp + SequenceFlow_0u0ptz7 + + + + SequenceFlow_0u0ptz7 + SequenceFlow_0ekno6w + + + + SequenceFlow_1t50vt9 + SequenceFlow_0eryvle + + + + + SequenceFlow_0mk8fd7 + + + + SequenceFlow_14mdxgk + + + + + + + + + + SequenceFlow_0mk8fd7 + SequenceFlow_14mdxgk + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModule.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModule.bpmn index 5383dc871e..e6d25a4b9f 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModule.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModule.bpmn @@ -75,7 +75,7 @@ SequenceFlow_20 - SequenceFlow_22 + SequenceFlow_1nh92s8 - SequenceFlow_22 + SequenceFlow_0p61zug + SequenceFlow_0aegg0r SequenceFlow_23 SequenceFlow_23 SequenceFlow_24 - @@ -174,12 +174,9 @@ doCreateVfModule.validateSDNCResponse(execution, response, "activate")]]> SequenceFlow_14 - SequenceFlow_28 SequenceFlow_30 + SequenceFlow_28 - - - @@ -320,7 +317,7 @@ return doCreateVfModule.queryCloudRegion(execution)]]> def doCreateVfModule = new DoCreateVfModule() doCreateVfModule.preProcessRequest(execution)]]> - + SequenceFlow_1f53tby SequenceFlow_0270n5c @@ -453,7 +450,8 @@ doCreateVfModule.validateSDNCResponse(execution, response, "get")]]> - SequenceFlow_4 + SequenceFlow_1y1ttqe + SequenceFlow_0lilmm3 SequenceFlow_0270n5c SequenceFlow_05og7iw @@ -492,6 +490,7 @@ doCreateVfModule.validateSDNCResponse(execution, response, "get")]]> + SequenceFlow_1i1q78e SequenceFlow_0112l2c @@ -532,6 +531,174 @@ doCreateVfModule.processBPMNException(execution)]]> + + SequenceFlow_0cc17yk + SequenceFlow_17cp3tn + SequenceFlow_006rnym + + + + + + SequenceFlow_4 + SequenceFlow_1y1ttqe + SequenceFlow_1y8q87e + + + + SequenceFlow_1sf1091 + SequenceFlow_0lilmm3 + SequenceFlow_15i583d + + + + + + + + + + + SequenceFlow_00bh7m7 + + + + + + + SequenceFlow_1nh92s8 + SequenceFlow_16mgvsd + SequenceFlow_1iyt5i4 + + + + + + + + + + + + + + + + + + + SequenceFlow_0ynd0iy + SequenceFlow_1mnipp8 + + + SequenceFlow_17cp3tn + SequenceFlow_0ynd0iy + + + + SequenceFlow_16mgvsd + SequenceFlow_0cc17yk + + + + SequenceFlow_1y8q87e + SequenceFlow_1sf1091 + + + + SequenceFlow_1mnipp8 + SequenceFlow_00bh7m7 + + + + SequenceFlow_15i583d + SequenceFlow_0tfrcnc + SequenceFlow_0oadvvx + + + + + + + SequenceFlow_0tfrcnc + SequenceFlow_0c6p4aa + SequenceFlow_1qzw172 + + + + + + SequenceFlow_1qzw172 + SequenceFlow_0xed5sn + SequenceFlow_0p3cspl + + + + + + + SequenceFlow_0xed5sn + SequenceFlow_1k7xbcu + SequenceFlow_0p61zug + + + + + SequenceFlow_0oadvvx + SequenceFlow_03batve + + + + + + + + + + + + + + SequenceFlow_03batve + SequenceFlow_0c6p4aa + + + SequenceFlow_0p3cspl + SequenceFlow_1k7xbcu + + + + SequenceFlow_006rnym + SequenceFlow_1iyt5i4 + SequenceFlow_0thm33s + + + + + + + + + + SequenceFlow_0thm33s + SequenceFlow_0aegg0r + + + @@ -560,16 +727,16 @@ doCreateVfModule.processBPMNException(execution)]]> - + - + - + @@ -594,53 +761,44 @@ doCreateVfModule.processBPMNException(execution)]]> - + - + - + - + - + - + - - - - - - - - - + - + - - - - + + + + - + - - - - + + + - + @@ -693,9 +851,9 @@ doCreateVfModule.processBPMNException(execution)]]> - + - + @@ -747,134 +905,140 @@ doCreateVfModule.processBPMNException(execution)]]> - + - + - - - - - - - - - - + + + + + + + - - - - + + + + - + - + - + - + - - + + - + - - + + - + - - - - + + + + - + - - + + - + - - - - + + + + - + - + - + - - + + - + - + - + - + - + - + - - + + - + - + - + - - - - + + + + + + + - - + + + + + - - + + + + + @@ -928,13 +1092,13 @@ doCreateVfModule.processBPMNException(execution)]]> - + - - + + - + @@ -970,110 +1134,109 @@ doCreateVfModule.processBPMNException(execution)]]> - + - + - - + + - + - - - + + + - + - - + + - + - - - - + + + - + - + - + - + - + - + - - - + + + - + - - - - + + + + - + - - - + + + - + - - + + - + - - - - + + + + - + - - + + - + - + - + @@ -1133,123 +1296,406 @@ doCreateVfModule.processBPMNException(execution)]]> - - - + + + - + - + - + - - + + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - - + + - + - - - - + + + + - + - - + + - + - - + + - + - + - + - - + + - + - - - + + + - + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - \ No newline at end of file + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModuleRollback.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModuleRollback.bpmn index cb6538c73a..d9f1dc71fb 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModuleRollback.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModuleRollback.bpmn @@ -10,13 +10,6 @@ SequenceFlow_6 SequenceFlow_9 - - SequenceFlow_6 - SequenceFlow_7 - - @@ -24,13 +17,12 @@ dcvfmr.preProcessRequest(execution)]]> - SequenceFlow_7 + SequenceFlow_6 SequenceFlow_8 - - + + - @@ -57,12 +49,11 @@ dcvfmr.prepVNFAdapterRequest(execution)]]> SequenceFlow_16 - SequenceFlow_11 + SequenceFlow_08aruzz - SequenceFlow_13 @@ -83,8 +74,7 @@ dcvfmr.prepUpdateAAIVfModule(execution)]]> - SequenceFlow_11 - SequenceFlow_03i4czf + SequenceFlow_1gcfdej SequenceFlow_13 SequenceFlow_17 @@ -256,7 +246,7 @@ dcvfmr.preProcessUpdateAAIGenericVnf(execution)]]> - + SequenceFlow_5 SequenceFlow_11er1t8 @@ -351,11 +341,41 @@ dcvfmr.sdncValidateResponse(execution, response)]]> SequenceFlow_21 SequenceFlow_35 + SequenceFlow_17it51d SequenceFlow_1h8ve60 + + SequenceFlow_03i4czf + SequenceFlow_08aruzz + SequenceFlow_1gcfdej + SequenceFlow_17ne2iz + + + + + + + + + + + + + + SequenceFlow_0fvuowt + SequenceFlow_17it51d + + + SequenceFlow_17ne2iz + SequenceFlow_0fvuowt + + + @@ -380,9 +400,6 @@ dcvfmr.setSuccessfulRollbackStatus(execution)]]> - - - @@ -397,10 +414,10 @@ dcvfmr.setSuccessfulRollbackStatus(execution)]]> - + - + @@ -443,9 +460,9 @@ dcvfmr.setSuccessfulRollbackStatus(execution)]]> - + - + @@ -461,19 +478,14 @@ dcvfmr.setSuccessfulRollbackStatus(execution)]]> - - - - - + + + + - + - - - - @@ -484,10 +496,10 @@ dcvfmr.setSuccessfulRollbackStatus(execution)]]> - + - + @@ -501,40 +513,31 @@ dcvfmr.setSuccessfulRollbackStatus(execution)]]> - + - + - - - - - - - - - - - - - + + + + - + - - + + - + - + - + @@ -549,28 +552,28 @@ dcvfmr.setSuccessfulRollbackStatus(execution)]]> - - + + - + - - - + + + - + - - + + - + - + @@ -580,7 +583,7 @@ dcvfmr.setSuccessfulRollbackStatus(execution)]]> - + @@ -588,7 +591,7 @@ dcvfmr.setSuccessfulRollbackStatus(execution)]]> - + @@ -627,40 +630,42 @@ dcvfmr.setSuccessfulRollbackStatus(execution)]]> - + - + - + - + - + - + - + - + - + - + - - + + + + - + @@ -743,9 +748,9 @@ dcvfmr.setSuccessfulRollbackStatus(execution)]]> - + - + @@ -756,32 +761,32 @@ dcvfmr.setSuccessfulRollbackStatus(execution)]]> - + - + - + - + - - + + - + - - + + - + @@ -907,15 +912,67 @@ dcvfmr.setSuccessfulRollbackStatus(execution)]]> - - + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModuleVolumeV2.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModuleVolumeV2.bpmn index 693fd36575..18e972c0a9 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModuleVolumeV2.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModuleVolumeV2.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_1 @@ -21,7 +21,7 @@ doCreateVfModuleVolumeV2.executeMethod('callRESTQueryAAICloudRegion', execution, SequenceFlow_7 +doCreateVfModuleVolumeV2.executeMethod('buildWorkflowException', execution, 2500, "Volume group name already exists in the system.", isDebugLogEnabled)]]> diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnf.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnf.bpmn index 5aa4d22b0c..9bf3972523 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnf.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnf.bpmn @@ -31,6 +31,7 @@ exceptionUtil.buildWorkflowException(execution, 404, "Service Instance Not Found + SequenceFlow_2 SequenceFlow_4 diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn index a90c816bc3..675b8fadb5 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn @@ -39,6 +39,7 @@ doCreateVnfAndModules.preProcessRequest(execution)]]> + SequenceFlow_1hf7k7q SequenceFlow_1ixcnb6 @@ -73,6 +74,7 @@ doCreateVnfAndModules.preProcessRequest(execution)]]> + SequenceFlow_1lh21yl SequenceFlow_1llbx0k @@ -484,4 +486,4 @@ doCreateVnfAndModules.postProcessAddOnModule(execution)]]> - \ No newline at end of file + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModulesRollback.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModulesRollback.bpmn index aa362021e0..57baf6ebe5 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModulesRollback.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModulesRollback.bpmn @@ -84,6 +84,7 @@ dcvamr.preProcessCreateVfModuleRollback(execution)]]> + SequenceFlow_1ycq005 SequenceFlow_181hb2a @@ -537,4 +538,4 @@ dcvamr.setSuccessfulRollbackStatus(execution)]]> - \ No newline at end of file + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn index 095948a87c..561a84b7c4 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn @@ -118,7 +118,7 @@ ddsi.preInitResourcesOperStatus(execution)]]> - ${URN_mso_openecomp_adapters_db_endpoint} + ${URN_mso_adapters_openecomp_db_endpoint} application/soap+xml diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteServiceInstance.bpmn index 10f688b30f..e5b18a1303 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteServiceInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteServiceInstance.bpmn @@ -74,15 +74,15 @@ ddsi.preProcessSDNCDelete(execution)]]> - + SequenceFlow_1hcfvcj SequenceFlow_0riudmc SequenceFlow_1dwch0k - - + + - + @@ -255,7 +255,7 @@ ddsi.postProcessSDNCDelete(execution, response, "delete")]]> - + @@ -264,7 +264,7 @@ ddsi.postProcessSDNCDelete(execution, response, "delete")]]> - + @@ -272,7 +272,7 @@ ddsi.postProcessSDNCDelete(execution, response, "delete")]]> - + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVfModule.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVfModule.bpmn index b8c6aa32a4..f147639a59 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVfModule.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVfModule.bpmn @@ -27,8 +27,8 @@ dvm.prepUpdateAAIVfModule(execution)]]> - SequenceFlow_42 - SequenceFlow_1j9dvfx + SequenceFlow_029ioyr + SequenceFlow_14xn858 @@ -46,7 +46,7 @@ dvm.prepUpdateAAIVfModule(execution)]]> - SequenceFlow_1j9dvfx + SequenceFlow_14xn858 SequenceFlow_4 SequenceFlow_4 - SequenceFlow_01cvxjf + SequenceFlow_1xruki1 SequenceFlow_35 @@ -117,7 +117,7 @@ dvm.preProcessRequest(execution)]]> def dvm = new DoDeleteVfModule() dvm.preProcessRequest(execution)]]> - + SequenceFlow_1 @@ -130,10 +130,8 @@ dvm.preProcessRequest(execution)]]> def dvm = new DoDeleteVfModule() dvm.deleteNetworkPoliciesFromAAI(execution)]]> - - - SequenceFlow_01cvxjf + SequenceFlow_1xruki1 SequenceFlow_0coa90m SequenceFlow_1a7lzhz SequenceFlow_14l7olw + + + SequenceFlow_42 + SequenceFlow_029ioyr + + + + @@ -198,7 +206,7 @@ doDeleteVfModule.prepUpdateAAIGenericVnf(execution)]]> - + @@ -211,203 +219,215 @@ doDeleteVfModule.prepUpdateAAIGenericVnf(execution)]]> - + - + - + - + - - + + - + - + - + - + - + - - - - - + + + + + - + - - - - + + + + - + - - + + - + - - + + - + - + - + - - + + - + - + - + - - - - + + - + - + - - + + - + - + - - - - - - - - - - - - - - - - - - - + - - + + + + + + - + - + - + - - + + - + - - - + + + - + - - - - + + + + - + - + - + - - + + - + - - - + + + - + - - + + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVnfAndModules.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVnfAndModules.bpmn index 9850552a9e..d066d1e2e9 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVnfAndModules.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVnfAndModules.bpmn @@ -68,6 +68,8 @@ exceptionUtil.processJavaException(execution)]]> + + SequenceFlow_1xujrk5 SequenceFlow_1p4ycii diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateVnfAndModules.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateVnfAndModules.bpmn index c110580f5c..609d630429 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateVnfAndModules.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateVnfAndModules.bpmn @@ -68,6 +68,7 @@ exceptionUtil.processJavaException(execution)]]> + SequenceFlow_04o61yk SequenceFlow_1p4ycii diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/RollbackVnf.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/RollbackVnf.bpmn new file mode 100644 index 0000000000..2fa1fa932c --- /dev/null +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/RollbackVnf.bpmn @@ -0,0 +1,343 @@ + + + + + SequenceFlow_0bie3cu + + + SequenceFlow_0mpoa26 + SequenceFlow_1pirwg0 + SequenceFlow_1lne8je + SequenceFlow_0tj5bkd + + + SequenceFlow_0tj5bkd + SequenceFlow_1ney8l6 + SequenceFlow_0gsro0z + SequenceFlow_0b2y2dw + + + SequenceFlow_0b2y2dw + SequenceFlow_11556y3 + SequenceFlow_0skjb2u + SequenceFlow_0c5ovtd + + + SequenceFlow_0g18wrd + SequenceFlow_0c5ovtd + SequenceFlow_12bz15k + SequenceFlow_03qkk4e + + + + + + + + + + + + + + + + + + + + + + SequenceFlow_0bie3cu + SequenceFlow_1ix4dpf + + + + + + + + + + + + SequenceFlow_1lne8je + SequenceFlow_1ney8l6 + + + + + + + + + + SequenceFlow_0gsro0z + SequenceFlow_11556y3 + + + SequenceFlow_0skjb2u + SequenceFlow_0g18wrd + + + + SequenceFlow_12bz15k + SequenceFlow_0tkvd6f + + + + SequenceFlow_1p3pyal + + + + + SequenceFlow_03qkk4e + SequenceFlow_0tkvd6f + SequenceFlow_1p3pyal + + + + + SequenceFlow_1ix4dpf + SequenceFlow_0mpoa26 + SequenceFlow_05ihl7f + + + + + + + + + + + + + + + + + SequenceFlow_05ihl7f + SequenceFlow_1pirwg0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/SetRefactorServiceDecomp.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/SetRefactorServiceDecomp.bpmn new file mode 100644 index 0000000000..c4f107b0b5 --- /dev/null +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/SetRefactorServiceDecomp.bpmn @@ -0,0 +1,68 @@ + + + + + SequenceFlow_1aizx5q + + + + SequenceFlow_1fypndb + + + + SequenceFlow_1aizx5q + SequenceFlow_1ipdcwj + + + + + + SequenceFlow_1ipdcwj + SequenceFlow_1fypndb + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit 1.2.3-korg