From b1e5734ef566af5d49ba17d05ca0ab7b56d6666d Mon Sep 17 00:00:00 2001 From: "Determe, Sebastien (sd378r)" Date: Tue, 9 May 2017 03:55:30 -0700 Subject: [MSO-8] Additional fixes for the second rebase DB fixes + BPMN flows and groovy fixes + Fix issue with CloudConfig file not reloaded properly when it's wrong (JSON error or model hierarchy mistake) at MSO startup Change-Id: I2853030b78499e2a761706b643ea210955e72de3 Signed-off-by: Determe, Sebastien (sd378r) [MSO-8] Restore files removed in patch set 2 Those groovy files must be there Change-Id: I9a47ac3d9c8fc06774a1b8f518491b1b0b00af04 Signed-off-by: Determe, Sebastien (sd378r) --- .../CreateGenericALaCarteServiceInstance.bpmn | 336 +++ .../CreateGenericMacroServiceNetworkVnf.bpmn | 2416 ++++++++++---------- .../resources/process/CreateServiceInstance.bpmn | 336 --- .../resources/process/CreateVfModuleInfra.bpmn | 354 +-- .../src/main/resources/process/CreateVnfInfra.bpmn | 5 +- .../main/resources/process/DelServiceInstance.bpmn | 331 --- .../DeleteGenericALaCarteServiceInstance.bpmn | 331 +++ .../DeleteGenericMacroServiceNetworkVnf.bpmn | 1524 ++++++------ .../src/main/resources/process/DeleteVnfInfra.bpmn | 2 +- .../process/UpdateNetworkInstanceInfra.bpmn | 1014 -------- .../subprocess/DoCreateNetworkInstance.bpmn | 208 +- .../subprocess/DoCreateServiceInstance.bpmn | 805 +++---- .../DoCreateServiceInstanceRollback.bpmn | 707 +++--- .../src/main/resources/subprocess/DoCreateVnf.bpmn | 312 ++- .../subprocess/DoCreateVnfAndModules.bpmn | 74 +- .../subprocess/DoDeleteServiceInstance.bpmn | 693 +++--- .../resources/subprocess/DoDeleteVfModule.bpmn | 27 +- .../subprocess/DoDeleteVnfAndModules.bpmn | 355 ++- 18 files changed, 4723 insertions(+), 5107 deletions(-) create mode 100644 bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateGenericALaCarteServiceInstance.bpmn delete mode 100644 bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateServiceInstance.bpmn delete mode 100644 bpmn/MSOInfrastructureBPMN/src/main/resources/process/DelServiceInstance.bpmn create mode 100644 bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteGenericALaCarteServiceInstance.bpmn delete mode 100644 bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateNetworkInstanceInfra.bpmn (limited to 'bpmn/MSOInfrastructureBPMN/src/main/resources') diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateGenericALaCarteServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateGenericALaCarteServiceInstance.bpmn new file mode 100644 index 0000000000..dbd40c072e --- /dev/null +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateGenericALaCarteServiceInstance.bpmn @@ -0,0 +1,336 @@ + + + + + SequenceFlow_0lp2z7l + + + + SequenceFlow_10 + SequenceFlow_14 + + + + + SequenceFlow_10 + + + + + SequenceFlow_14 + + + + + + + + + + + + + + + + + + + + + SequenceFlow_0eto8sn + SequenceFlow_1lj31zp + + + SequenceFlow_095crcd + + + + SequenceFlow_0lp2z7l + SequenceFlow_0ktadna + + + + + SequenceFlow_1o4wwba + SequenceFlow_0xxvjxq + + + + + + + + + + + + SequenceFlow_0xxvjxq + SequenceFlow_095crcd + + + + + SequenceFlow_0n4umjf + + + + SequenceFlow_1ghqolv + + + SequenceFlow_14eadeb + SequenceFlow_1reso2f + + + + + + + + + + + + SequenceFlow_1reso2f + SequenceFlow_1ghqolv + + + + + + SequenceFlow_0n4umjf + SequenceFlow_14eadeb + + + + + + + + SequenceFlow_0ktadna + SequenceFlow_0eto8sn + + + + + SequenceFlow_1lj31zp + SequenceFlow_1o4wwba + SequenceFlow_1mdnv3l + + + SequenceFlow_1mdnv3l + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateGenericMacroServiceNetworkVnf.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateGenericMacroServiceNetworkVnf.bpmn index 7b9b8212e5..a3a36529da 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateGenericMacroServiceNetworkVnf.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateGenericMacroServiceNetworkVnf.bpmn @@ -1,1203 +1,1243 @@ - - - - - SequenceFlow_7 - SequenceFlow_3 + + + + + SequenceFlow_7 + SequenceFlow_3 - - - - SequenceFlow_1 - - - - SequenceFlow_1 - SequenceFlow_7 +def CreateGenericMacroServiceNetworkVnf = new CreateGenericMacroServiceNetworkVnf() +CreateGenericMacroServiceNetworkVnf.sendSyncResponse(execution)]]> + + + + SequenceFlow_1 + + + + SequenceFlow_1 + SequenceFlow_7 - - - +def CreateGenericMacroServiceNetworkVnf = new CreateGenericMacroServiceNetworkVnf() +CreateGenericMacroServiceNetworkVnf.preProcessRequest(execution) +]]> + + + SequenceFlow_10o22u2 - - - - SequenceFlow_0afe2pg - SequenceFlow_29 + + + + SequenceFlow_0afe2pg + SequenceFlow_29 - - - - - - - - - - - - - - SequenceFlow_29 - SequenceFlow_8 - - - - SequenceFlow_8 - SequenceFlow_6 - - - - - SequenceFlow_6 - - - - - SequenceFlow_2 - - - - SequenceFlow_5 - - - - SequenceFlow_2 - SequenceFlow_5 +def CreateGenericMacroServiceNetworkVnf = new CreateGenericMacroServiceNetworkVnf() +CreateGenericMacroServiceNetworkVnf.postProcessResponse(execution)]]> + + + + + + + + + + + + + + SequenceFlow_29 + SequenceFlow_8 + + + + SequenceFlow_8 + SequenceFlow_6 + + + + + SequenceFlow_6 + + + + + SequenceFlow_2 + + + + SequenceFlow_5 + + + + SequenceFlow_2 + SequenceFlow_5 - - - - - SequenceFlow_12ilko1 - - - - - - - - - - - - - - - - - - - - - - - - - - SequenceFlow_1bwbn7r - SequenceFlow_12ag2bk - - - SequenceFlow_0cmebdc - SequenceFlow_0dfkfh1 - SequenceFlow_1bwbn7r +def CreateServiceInstanceInfra = new CreateServiceInstanceInfra() +CreateServiceInstanceInfra.processJavaException(execution)]]> + + + + + SequenceFlow_12ilko1 + + + + + + + + + + + + + + + + + + + + + + + + + + SequenceFlow_1bwbn7r + SequenceFlow_12ag2bk + + + SequenceFlow_0cmebdc + SequenceFlow_0dfkfh1 + SequenceFlow_1bwbn7r - - - - - - - - - - - - - - - - - - - - - - SequenceFlow_0j6sjye - SequenceFlow_1ky2sv9 - - - - - - - - - - - - - - - - - - - - SequenceFlow_1h77psn - SequenceFlow_0qi5uxg - - - SequenceFlow_0bvecvm - SequenceFlow_1h77psn +def CreateGenericMacroServiceNetworkVnf= new CreateGenericMacroServiceNetworkVnf() +CreateGenericMacroServiceNetworkVnf.prepareNetworkCreate(execution)]]> + + + + + + + + + + + + + + + + + + + + + + SequenceFlow_0j6sjye + SequenceFlow_1ky2sv9 + + + + + + + + + + + + + + + + + + + + + + + SequenceFlow_1h77psn + SequenceFlow_0qi5uxg + + + SequenceFlow_0bvecvm + SequenceFlow_1h77psn - - - SequenceFlow_0xowenu - - - - SequenceFlow_3 - - - - - SequenceFlow_0zq7i3q - SequenceFlow_0zpbskl - SequenceFlow_0dhf2js - - - SequenceFlow_0zq7i3q - - - - SequenceFlow_0zpbskl - SequenceFlow_1sx5llu - SequenceFlow_02o4yqx - - - SequenceFlow_0sdb3on - SequenceFlow_05lo85t - SequenceFlow_0xtr1g5 - - - SequenceFlow_05lo85t - SequenceFlow_09xerwk - SequenceFlow_19mxskt - SequenceFlow_0tmepzk - - - - - - - - - - - SequenceFlow_0807ukc - SequenceFlow_19yywk8 - - - SequenceFlow_19yywk8 - - - SequenceFlow_19mxskt - SequenceFlow_1brxd2r - SequenceFlow_08s0ew2 - - - SequenceFlow_0jg47xm - SequenceFlow_0807ukc +def CreateGenericMacroServiceNetworkVnf= new CreateGenericMacroServiceNetworkVnf() +CreateGenericMacroServiceNetworkVnf.prepareVnfAndModulesCreate(execution)]]> + + + SequenceFlow_0xowenu + + + + SequenceFlow_3 + + + + + SequenceFlow_0zq7i3q + SequenceFlow_0zpbskl + SequenceFlow_0dhf2js + + + SequenceFlow_0zq7i3q + + + + SequenceFlow_0zpbskl + SequenceFlow_1sx5llu + SequenceFlow_02o4yqx + + + SequenceFlow_0sdb3on + SequenceFlow_05lo85t + SequenceFlow_0xtr1g5 + + + SequenceFlow_05lo85t + SequenceFlow_09xerwk + SequenceFlow_19mxskt + SequenceFlow_0tmepzk + + + + + + + + + + + SequenceFlow_0807ukc + SequenceFlow_19yywk8 + + + SequenceFlow_19yywk8 + + + SequenceFlow_19mxskt + SequenceFlow_1brxd2r + SequenceFlow_08s0ew2 + + + SequenceFlow_0jg47xm + SequenceFlow_0807ukc - - - - - - - - - - - - - - - - - - - - - - - SequenceFlow_0xtr1g5 - SequenceFlow_09xerwk - - - - - - - - - - - SequenceFlow_0136s37 - SequenceFlow_1fqmrda - SequenceFlow_1dmsx0d - - - SequenceFlow_1ieiew4 - SequenceFlow_1os9x7w - SequenceFlow_0g7scsg - - - - - - - - - - SequenceFlow_1os9x7w - SequenceFlow_1f1hd3l - - - SequenceFlow_1sx5llu - SequenceFlow_0dhf2js - SequenceFlow_1rabks0 - SequenceFlow_0jg47xm - - - - - - - - - - - SequenceFlow_1dmsx0d - SequenceFlow_1otyild +def CreateGenericMacroServiceNetworkVnf = new CreateGenericMacroServiceNetworkVnf() +CreateGenericMacroServiceNetworkVnf.prepareFalloutRequest(execution)]]> + + + + + + + + + + + + + + + + + + + + + + + SequenceFlow_0xtr1g5 + SequenceFlow_09xerwk + + + + + + + + + + + SequenceFlow_0136s37 + SequenceFlow_1fqmrda + SequenceFlow_1dmsx0d + + + SequenceFlow_1ieiew4 + SequenceFlow_1os9x7w + SequenceFlow_0g7scsg + + + + + + + + + + SequenceFlow_1os9x7w + SequenceFlow_1f1hd3l + + + SequenceFlow_1sx5llu + SequenceFlow_0dhf2js + SequenceFlow_1rabks0 + SequenceFlow_0jg47xm + + + + + + + + + + + SequenceFlow_1dmsx0d + SequenceFlow_1otyild - - - SequenceFlow_1otyild - SequenceFlow_0136s37 - SequenceFlow_12u8ufr - - - - - 0 }]]> - - - - SequenceFlow_0tmepzk - SequenceFlow_1fqmrda - SequenceFlow_1brxd2r - - - - - - - - - - SequenceFlow_12u8ufr - SequenceFlow_08s0ew2 - SequenceFlow_1ieiew4 - SequenceFlow_0sezboq - - - - - - - - - SequenceFlow_1f1hd3l - SequenceFlow_0g7scsg - SequenceFlow_0sezboq - SequenceFlow_0f4u373 - - - SequenceFlow_02o4yqx - SequenceFlow_0sdb3on +def CreateGenericMacroServiceNetworkVnf= new CreateGenericMacroServiceNetworkVnf() +CreateGenericMacroServiceNetworkVnf.validateNetworkRollback(execution)]]> + + + SequenceFlow_1otyild + SequenceFlow_0136s37 + SequenceFlow_12u8ufr + + + + + 0 }]]> + + + + SequenceFlow_0tmepzk + SequenceFlow_1fqmrda + SequenceFlow_1brxd2r + + + + + + + + + + SequenceFlow_12u8ufr + SequenceFlow_08s0ew2 + SequenceFlow_1ieiew4 + SequenceFlow_0sezboq + + + + + + + + + SequenceFlow_1f1hd3l + SequenceFlow_0g7scsg + SequenceFlow_0sezboq + SequenceFlow_0f4u373 + + + SequenceFlow_02o4yqx + SequenceFlow_0sdb3on - - - SequenceFlow_0f4u373 - SequenceFlow_1rabks0 +def CreateGenericMacroServiceNetworkVnf= new CreateGenericMacroServiceNetworkVnf() +CreateGenericMacroServiceNetworkVnf.preProcessRollback(execution)]]> + + + SequenceFlow_0f4u373 + SequenceFlow_1rabks0 - - - - - - - SequenceFlow_1vwssu7 - SequenceFlow_19etqmx +def CreateGenericMacroServiceNetworkVnf= new CreateGenericMacroServiceNetworkVnf() +CreateGenericMacroServiceNetworkVnf.postProcessRollback(execution)]]> + + + + + + + SequenceFlow_1vwssu7 + SequenceFlow_19etqmx - - - SequenceFlow_10o22u2 - SequenceFlow_0j6sjye +def CreateGenericMacroServiceNetworkVnf= new CreateGenericMacroServiceNetworkVnf() +CreateGenericMacroServiceNetworkVnf.getDataFromDecomposition(execution)]]> + + + SequenceFlow_0hvcwa1 + SequenceFlow_0j6sjye - - - - SequenceFlow_12ilko1 - SequenceFlow_0afe2pg - - - - - - - - - SequenceFlow_1vwssu7 - - - - SequenceFlow_13uceka - - - - SequenceFlow_19etqmx - SequenceFlow_0cmebdc - SequenceFlow_1f26zbk - - - SequenceFlow_04vlq8r - SequenceFlow_1n7r495 - SequenceFlow_0dfkfh1 - - - - - - 0}]]> - - - SequenceFlow_1n7r495 - SequenceFlow_1f26zbk - SequenceFlow_1j7n6qx - - - - SequenceFlow_1j7n6qx - - - - - - - SequenceFlow_10tbv62 - - - - SequenceFlow_10tbv62 - SequenceFlow_0bvecvm - SequenceFlow_0w7328u - - - SequenceFlow_0qi5uxg - SequenceFlow_0w7328u - SequenceFlow_0xowenu - - - - 0}]]> - - - in 1702 scope only one VNF will be created - - - - - SequenceFlow_12ag2bk - SequenceFlow_04vlq8r +def CreateGenericMacroServiceNetworkVnf = new CreateGenericMacroServiceNetworkVnf() +CreateGenericMacroServiceNetworkVnf.prepareCreateServiceInstance(execution)]]> + + + SequenceFlow_12ilko1 + SequenceFlow_0afe2pg + + + + + + + + + SequenceFlow_1vwssu7 + + + + SequenceFlow_13uceka + + + + SequenceFlow_19etqmx + SequenceFlow_0cmebdc + SequenceFlow_1f26zbk + + + SequenceFlow_04vlq8r + SequenceFlow_1n7r495 + SequenceFlow_0dfkfh1 + + + + + + 0}]]> + + + SequenceFlow_1n7r495 + SequenceFlow_1f26zbk + SequenceFlow_1j7n6qx + + + + SequenceFlow_1j7n6qx + + + + + + + SequenceFlow_10tbv62 + + + + SequenceFlow_10tbv62 + SequenceFlow_0bvecvm + SequenceFlow_0w7328u + + + SequenceFlow_0qi5uxg + SequenceFlow_0w7328u + SequenceFlow_0xowenu + + + + 0}]]> + + + in 1702 scope only one VNF will be created + + + + + SequenceFlow_12ag2bk + SequenceFlow_04vlq8r - - - - - - - - - ${URN_mso_adapters_db_endpoint} - - - - application/soap+xml - - - POST - - soap-http-connector - - - SequenceFlow_0vj46ej - SequenceFlow_13uceka - - - - SequenceFlow_1ky2sv9 - SequenceFlow_0vj46ej +def CreateGenericMacroServiceNetworkVnf= new CreateGenericMacroServiceNetworkVnf() +CreateGenericMacroServiceNetworkVnf.validateNetworkCreate(execution)]]> + + + + + + + + + ${URN_mso_adapters_db_endpoint} + + + + application/soap+xml + + + POST + + soap-http-connector + + + SequenceFlow_0vj46ej + SequenceFlow_13uceka + + + + SequenceFlow_1ky2sv9 + SequenceFlow_0vj46ej - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +def CreateGenericMacroServiceNetworkVnf = new CreateGenericMacroServiceNetworkVnf() +CreateGenericMacroServiceNetworkVnf.postProcessServiceInstanceCreate(execution)]]> + + + + + + + + + + + + + + SequenceFlow_00h6hmd + SequenceFlow_0hvcwa1 + + + SequenceFlow_1eu60rt + SequenceFlow_00h6hmd + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateServiceInstance.bpmn deleted file mode 100644 index fa114c5e76..0000000000 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateServiceInstance.bpmn +++ /dev/null @@ -1,336 +0,0 @@ - - - - - SequenceFlow_0lp2z7l - - - - SequenceFlow_10 - SequenceFlow_14 - - - - - SequenceFlow_10 - - - - - SequenceFlow_14 - - - - - - - - - - - - - - - - - - - - - SequenceFlow_0eto8sn - SequenceFlow_1lj31zp - - - SequenceFlow_095crcd - - - - SequenceFlow_0lp2z7l - SequenceFlow_0ktadna - - - - - SequenceFlow_1o4wwba - SequenceFlow_0xxvjxq - - - - - - - - - - - - SequenceFlow_0xxvjxq - SequenceFlow_095crcd - - - - - SequenceFlow_0n4umjf - - - - SequenceFlow_1ghqolv - - - SequenceFlow_14eadeb - SequenceFlow_1reso2f - - - - - - - - - - - - SequenceFlow_1reso2f - SequenceFlow_1ghqolv - - - - - - SequenceFlow_0n4umjf - SequenceFlow_14eadeb - - - - - - - - SequenceFlow_0ktadna - SequenceFlow_0eto8sn - - - - - SequenceFlow_1lj31zp - SequenceFlow_1o4wwba - SequenceFlow_1mdnv3l - - - SequenceFlow_1mdnv3l - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVfModuleInfra.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVfModuleInfra.bpmn index 7a8133ec7f..c58fec9dd9 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVfModuleInfra.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVfModuleInfra.bpmn @@ -1,22 +1,42 @@ - + SequenceFlow_1 - + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SequenceFlow_7 SequenceFlow_4 @@ -28,17 +48,17 @@ def createVfModule = new CreateVfModuleInfra() createVfModule.sendResponse(execution)]]> - + SequenceFlow_4 - + - + SequenceFlow_5 - + - + SequenceFlow_5 SequenceFlow_6 @@ -49,7 +69,6 @@ createVfModule.prepareUpdateInfraRequest(execution)]]> - http-connector ${URN_mso_adapters_db_endpoint} @@ -62,13 +81,14 @@ createVfModule.prepareUpdateInfraRequest(execution)]]> ${statusCode} ${response} + http-connector SequenceFlow_6 SequenceFlow_8 - - + + updateInfraRequestResponseGood SequenceFlow_12 @@ -76,15 +96,15 @@ createVfModule.prepareUpdateInfraRequest(execution)]]> def createVfModule = new CreateVfModuleInfra() createVfModule.postProcessResponse(execution)]]> - + - - - - - - + + + + + + SequenceFlow_12 SequenceFlow_14 @@ -94,13 +114,13 @@ createVfModule.postProcessResponse(execution)]]> updateInfraRequestResponseBad updateInfraRequestResponseGood - + updateInfraRequestResponseBad - + @@ -110,37 +130,37 @@ createVfModule.postProcessResponse(execution)]]> def createVfModule = new CreateVfModuleInfra() createVfModule.validateRollbackResponse(execution)]]> - + - - - - + + + + SequenceFlow_19 SequenceFlow_17 - + SequenceFlow_13 - + - + - - - - + + + + SequenceFlow_10 SequenceFlow_11 - + SequenceFlow_11 - + SequenceFlow_22 @@ -149,19 +169,19 @@ createVfModule.validateRollbackResponse(execution)]]> def cvfm = new CreateVfModuleInfra() cvfm.falloutHandlerPrep(execution, 'CVFMI_FalloutHandlerRequest')]]> - + SequenceFlow_21 isRollbackOnNoSequenceFlow SequenceFlow_22 - + SequenceFlow_13 isRollbackOnNoSequenceFlow IsRollbackOnYesSequenceFlow - + IsRollbackOnYesSequenceFlow SequenceFlow_19 @@ -172,7 +192,7 @@ cvfm.logAndSaveOriginalException(execution)]]> - + SequenceFlow_14 @@ -181,18 +201,18 @@ cvfm.logAndSaveOriginalException(execution)]]> SequenceFlow_16 - + - - + + SequenceFlow_15 - + - + SequenceFlow_15 - + SequenceFlow_1 @@ -201,272 +221,272 @@ cvfm.logAndSaveOriginalException(execution)]]> def createVfModule = new CreateVfModuleInfra() createVfModule.preProcessRequest(execution)]]> - + - - + + - + - - + + - + - + - + - - + + - + - + - - + + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - - + + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - - + + - + - - + + - + - + - - + + - - + + - + - + - + - + - + - - - - + + + + - + - - - - + + + + - + - - - + + + - + - - - - + + + + - + - + - - + + - + - + - - + + - + - - + + - \ No newline at end of file + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVnfInfra.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVnfInfra.bpmn index e8d27b6014..b10e98b56f 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVnfInfra.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVnfInfra.bpmn @@ -23,7 +23,7 @@ createVnf.sendSyncResponse(execution)]]> - + @@ -31,12 +31,13 @@ createVnf.sendSyncResponse(execution)]]> - + + SequenceFlow_3 SequenceFlow_0lso26t diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DelServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DelServiceInstance.bpmn deleted file mode 100644 index 4488e8de1c..0000000000 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DelServiceInstance.bpmn +++ /dev/null @@ -1,331 +0,0 @@ - - - - - SequenceFlow_0lp2z7l - - - - SequenceFlow_10 - SequenceFlow_14 - - - - - SequenceFlow_10 - - - - - SequenceFlow_14 - - - - - - - - - - - - - - - - - - SequenceFlow_0eto8sn - SequenceFlow_1lj31zp - - - SequenceFlow_095crcd - - - - SequenceFlow_0lp2z7l - SequenceFlow_0ktadna - - - - - SequenceFlow_1qjygj5 - SequenceFlow_0xxvjxq - - - - - - - - - - - - SequenceFlow_0xxvjxq - SequenceFlow_095crcd - - - - - SequenceFlow_0n4umjf - - - - SequenceFlow_1ghqolv - - - SequenceFlow_14eadeb - SequenceFlow_1reso2f - - - - - - - - - - - - SequenceFlow_1reso2f - SequenceFlow_1ghqolv - - - - - - SequenceFlow_0n4umjf - SequenceFlow_14eadeb - - - - - - - - SequenceFlow_0ktadna - SequenceFlow_0eto8sn - - - - - SequenceFlow_1lj31zp - SequenceFlow_1qjygj5 - SequenceFlow_0hgiouk - - - - - - SequenceFlow_0hgiouk - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteGenericALaCarteServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteGenericALaCarteServiceInstance.bpmn new file mode 100644 index 0000000000..ceb0c72218 --- /dev/null +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteGenericALaCarteServiceInstance.bpmn @@ -0,0 +1,331 @@ + + + + + SequenceFlow_0lp2z7l + + + + SequenceFlow_10 + SequenceFlow_14 + + + + + SequenceFlow_10 + + + + + SequenceFlow_14 + + + + + + + + + + + + + + + + + + SequenceFlow_0eto8sn + SequenceFlow_1lj31zp + + + SequenceFlow_095crcd + + + + SequenceFlow_0lp2z7l + SequenceFlow_0ktadna + + + + + SequenceFlow_1qjygj5 + SequenceFlow_0xxvjxq + + + + + + + + + + + + SequenceFlow_0xxvjxq + SequenceFlow_095crcd + + + + + SequenceFlow_0n4umjf + + + + SequenceFlow_1ghqolv + + + SequenceFlow_14eadeb + SequenceFlow_1reso2f + + + + + + + + + + + + SequenceFlow_1reso2f + SequenceFlow_1ghqolv + + + + + + SequenceFlow_0n4umjf + SequenceFlow_14eadeb + + + + + + + + SequenceFlow_0ktadna + SequenceFlow_0eto8sn + + + + + SequenceFlow_1lj31zp + SequenceFlow_1qjygj5 + SequenceFlow_0hgiouk + + + + + + SequenceFlow_0hgiouk + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteGenericMacroServiceNetworkVnf.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteGenericMacroServiceNetworkVnf.bpmn index eeb32599d3..bb2c487e8a 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteGenericMacroServiceNetworkVnf.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteGenericMacroServiceNetworkVnf.bpmn @@ -1,771 +1,773 @@ - - - - - SequenceFlow_7 - SequenceFlow_3 + + + + + SequenceFlow_7 + SequenceFlow_3 - - - - SequenceFlow_1 - - - - SequenceFlow_1 - SequenceFlow_7 +def DeleteGenericMacroServiceNetworkVnf = new DeleteGenericMacroServiceNetworkVnf() +DeleteGenericMacroServiceNetworkVnf.sendSyncResponse(execution)]]> + + + + SequenceFlow_1 + + + + SequenceFlow_1 + SequenceFlow_7 - - - - SequenceFlow_10o22u2 - - - - SequenceFlow_12ilko1 - SequenceFlow_29 +def DeleteGenericMacroServiceNetworkVnf = new DeleteGenericMacroServiceNetworkVnf() +DeleteGenericMacroServiceNetworkVnf.preProcessRequest(execution) +]]> + + + + SequenceFlow_10o22u2 + + + + SequenceFlow_12ilko1 + SequenceFlow_29 - - - - - - - - - - - - - - SequenceFlow_29 - SequenceFlow_8 - - - - SequenceFlow_8 - SequenceFlow_6 - - - - - SequenceFlow_6 - - - - - SequenceFlow_2 - - - - SequenceFlow_5 - - - - SequenceFlow_2 - SequenceFlow_5 +def DeleteGenericMacroServiceNetworkVnf = new DeleteGenericMacroServiceNetworkVnf() +DeleteGenericMacroServiceNetworkVnf.postProcessResponse(execution)]]> + + + + + + + + + + + + + + SequenceFlow_29 + SequenceFlow_8 + + + + SequenceFlow_8 + SequenceFlow_6 + + + + + SequenceFlow_6 + + + + + SequenceFlow_2 + + + + SequenceFlow_5 + + + + SequenceFlow_2 + SequenceFlow_5 - - - - - SequenceFlow_12ilko1 - - - - - - - - - - - - - - - - - - - SequenceFlow_1bwbn7r - SequenceFlow_12ag2bk - - - SequenceFlow_0cmebdc - SequenceFlow_0dfkfh1 - SequenceFlow_1bwbn7r +def DeleteServiceInstanceInfra = new DeleteServiceInstanceInfra() +DeleteServiceInstanceInfra.processJavaException(execution)]]> + + + + + SequenceFlow_12ilko1 + + + + + + + + + + + + + + + + + + + SequenceFlow_1bwbn7r + SequenceFlow_12ag2bk + + + SequenceFlow_0cmebdc + SequenceFlow_0dfkfh1 + SequenceFlow_1bwbn7r - - - - - - - - - - - - - - SequenceFlow_10o22u2 - SequenceFlow_04ao07f - - - - - - - - - - - - - - SequenceFlow_1h77psn - SequenceFlow_1dmn40p - - - SequenceFlow_0bvecvm - SequenceFlow_0mr8jgt - SequenceFlow_1h77psn +def DeleteGenericMacroServiceNetworkVnf= new DeleteGenericMacroServiceNetworkVnf() +DeleteGenericMacroServiceNetworkVnf.prepareNetworkDelete(execution)]]> + + + + + + + + + + + + + + SequenceFlow_10o22u2 + SequenceFlow_04ao07f + + + + + + + + + + + + + + + + SequenceFlow_1h77psn + SequenceFlow_1dmn40p + + + SequenceFlow_0bvecvm + SequenceFlow_0mr8jgt + SequenceFlow_1h77psn - - - SequenceFlow_0xowenu - - - - SequenceFlow_3 - - - - - SequenceFlow_06llof4 - - - - - - - - - - - - SequenceFlow_0807ukc - SequenceFlow_19yywk8 - - - SequenceFlow_19yywk8 - - - SequenceFlow_06llof4 - SequenceFlow_0807ukc +def DeleteGenericMacroServiceNetworkVnf= new DeleteGenericMacroServiceNetworkVnf() +DeleteGenericMacroServiceNetworkVnf.prepareVnfAndModulesDelete(execution)]]> + + + SequenceFlow_0xowenu + + + + SequenceFlow_3 + + + + + SequenceFlow_06llof4 + + + + + + + + + + + + SequenceFlow_0807ukc + SequenceFlow_19yywk8 + + + SequenceFlow_19yywk8 + + + SequenceFlow_06llof4 + SequenceFlow_0807ukc - - - - - - - - - - - - SequenceFlow_1vwssu7 - - - - SequenceFlow_04ao07f - - - - SequenceFlow_1vwssu7 - SequenceFlow_0cmebdc - SequenceFlow_1f26zbk - - - SequenceFlow_04vlq8r - SequenceFlow_1n7r495 - SequenceFlow_0dfkfh1 - - - - - - 0}]]> - - - SequenceFlow_1n7r495 - SequenceFlow_1f26zbk - SequenceFlow_1j7n6qx - - - - SequenceFlow_1j7n6qx - - - - - - SequenceFlow_10tbv62 - - - - SequenceFlow_10tbv62 - SequenceFlow_0bvecvm - SequenceFlow_0w7328u - - - SequenceFlow_0w7328u - SequenceFlow_1wc8h5g - SequenceFlow_0xowenu - - - - 0}]]> - - - - - SequenceFlow_12ag2bk - SequenceFlow_04vlq8r +def DeleteGenericMacroServiceNetworkVnf = new DeleteGenericMacroServiceNetworkVnf() +DeleteGenericMacroServiceNetworkVnf.prepareFalloutRequest(execution)]]> + + + + + + + + + + + + SequenceFlow_1vwssu7 + + + + SequenceFlow_04ao07f + + + + SequenceFlow_1vwssu7 + SequenceFlow_0cmebdc + SequenceFlow_1f26zbk + + + SequenceFlow_04vlq8r + SequenceFlow_1n7r495 + SequenceFlow_0dfkfh1 + + + + + + 0}]]> + + + SequenceFlow_1n7r495 + SequenceFlow_1f26zbk + SequenceFlow_1j7n6qx + + + + SequenceFlow_1j7n6qx + + + + + + SequenceFlow_10tbv62 + + + + SequenceFlow_10tbv62 + SequenceFlow_0bvecvm + SequenceFlow_0w7328u + + + SequenceFlow_0w7328u + SequenceFlow_1wc8h5g + SequenceFlow_0xowenu + + + + 0}]]> + + + + + SequenceFlow_12ag2bk + SequenceFlow_04vlq8r - - - - - - - - - - - - - - - SequenceFlow_0jek18q - SequenceFlow_1ttswdr - - - SequenceFlow_1ttswdr - SequenceFlow_18103ca +def DeleteGenericMacroServiceNetworkVnf= new DeleteGenericMacroServiceNetworkVnf() +DeleteGenericMacroServiceNetworkVnf.validateNetworkDelete(execution)]]> + + + + + + + + + + + + + + + SequenceFlow_0jek18q + SequenceFlow_1ttswdr + + + SequenceFlow_1ttswdr + SequenceFlow_18103ca - - - SequenceFlow_0jek18q - - - - SequenceFlow_18103ca - - - - - - - - SequenceFlow_1dmn40p - SequenceFlow_0g2cw86 +def DeleteGenericMacroServiceNetworkVnf = new DeleteGenericMacroServiceNetworkVnf() +DeleteGenericMacroServiceNetworkVnf.prepareServiceInstanceDelete(execution)]]> + + + SequenceFlow_0jek18q + + + + SequenceFlow_18103ca + + + + + + + + SequenceFlow_1dmn40p + SequenceFlow_0g2cw86 - - - SequenceFlow_0g2cw86 - SequenceFlow_0mr8jgt - SequenceFlow_1wc8h5g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +def DeleteGenericMacroServiceNetworkVnf= new DeleteGenericMacroServiceNetworkVnf() +DeleteGenericMacroServiceNetworkVnf.validateVnfDelete(execution)]]> + + + SequenceFlow_0g2cw86 + SequenceFlow_0mr8jgt + SequenceFlow_1wc8h5g + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVnfInfra.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVnfInfra.bpmn index b5b10a0fda..95c0a727ce 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVnfInfra.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVnfInfra.bpmn @@ -129,7 +129,7 @@ deleteVnf.prepareCompletionHandlerRequest(execution)]]> - + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateNetworkInstanceInfra.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateNetworkInstanceInfra.bpmn deleted file mode 100644 index f49149b709..0000000000 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateNetworkInstanceInfra.bpmn +++ /dev/null @@ -1,1014 +0,0 @@ - - - - - SequenceFlow_1 - - - - SequenceFlow_32 - SequenceFlow_11 - - - - - SequenceFlow_12 - SequenceFlow_5 - - - - SequenceFlow_5 - sdncTopoNo_SequenceFlow - sdncTopoYes_SequenceFlow - - - - - - - - SequenceFlow_34 - - - - - sdncTopoNo_SequenceFlow - SequenceFlow_34 - - - - - - - - - - - - - - - - - - - - - - - - - - SequenceFlow_11 - SequenceFlow_12 - - - - SequenceFlow_27 - SequenceFlow_29 - - - - - - SequenceFlow_23 - isRollbackOn_YesNetwork_SequenceFlow - isRollbackOn_NoNetwork_SequenceFlow - - - - - - - SequenceFlow_23 - - - - - isRollbackOn_YesNetwork_SequenceFlow - isPONR_Yes_SequenceFlow - isPONR_No_SequenceFlow - - - - - - - isPONR_No_SequenceFlow - isNetworkOk_No_SequenceFlow - isNetworkOk_Yes_SequenceFlow - - - - - - - isNetworkOk_No_SequenceFlow - isNetworkOk_Yes_SequenceFlow - sdncOk_Yeso_ExclusiveGateway - sdncOk_No_ExclusiveGateway - - - - - - - sdncOk_Yeso_ExclusiveGateway - SequenceFlow_53 - - - - - SequenceFlow_53 - SequenceFlow_55 - - - - - SequenceFlow_47 - SequenceFlow_22 - - - - - - - http-connector - - ${URN_mso_adapters_db_endpoint} - ${UPDNETI_updateDBRequest} - - - application/soap+xml - - - POST - ${response} - ${statusCode} - - - - SequenceFlow_22 - SequenceFlow_19 - - - - - - - - - - - - - - SequenceFlow_25 - SequenceFlow_18 - - - - SequenceFlow_18 - - - SequenceFlow_55 - sdncOk_No_ExclusiveGateway - SequenceFlow_4 - - - - - isRollbackOn_NoNetwork_SequenceFlow - isPONR_Yes_SequenceFlow - SequenceFlow_4 - SequenceFlow_47 - - - - SequenceFlow_19 - SequenceFlow_25 - - - - - - SequenceFlow_13 - SequenceFlow_35 - - - - - SequenceFlow_35 - SequenceFlow_46 - - - - - SequenceFlow_46 - SequenceFlow_37 - - - - - - - http-connector - - ${URN_mso_adapters_db_endpoint} - ${UPDNETI_updateDBRequest} - - - application/soap+xml - - - POST - ${response} - ${statusCode} - - - - SequenceFlow_37 - SequenceFlow_27 - - - - - - - - - - - - - - SequenceFlow_29 - SequenceFlow_17 - - - - SequenceFlow_17 - - - - SequenceFlow_10 - SequenceFlow_14 - - - - - SequenceFlow_10 - - - - - SequenceFlow_14 - - - - SequenceFlow_1 - SequenceFlow_7 - - - - - SequenceFlow_24 - SequenceFlow_32 - - - - - siFoundYes - SequenceFlow_24 - - - - - SequenceFlow_30 - - - - siFoundNo - SequenceFlow_30 - - - - - SequenceFlow_3 - siFoundYes - siFoundNo - - - - - - - - - - - - - - - - SequenceFlow_28 - SequenceFlow_3 - - - - SequenceFlow_7 - SequenceFlow_28 - - - - - SequenceFlow_59 - SequenceFlow_13 - - - - - - - http-connector - - ${UPDNETI_updateNetworkRequest} - ${URN_mso_adapters_network_rest_endpoint}/${UPDNETI_networkId} - - - #{BasicAuthHeaderValuePO} - application/xml - - - PUT - ${statusCode} - ${response} - - - - SequenceFlow_61 - SequenceFlow_59 - - - - SequenceFlow_2 - SequenceFlow_61 - - - - - SequenceFlow_38 - SequenceFlow_2 - - - - - sdncTopoYes_SequenceFlow - SequenceFlow_6 - - - - - SequenceFlow_6 - SequenceFlow_15 - - - - - SequenceFlow_15 - SequenceFlow_38 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateNetworkInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateNetworkInstance.bpmn index ecd23f0ca9..5488350afc 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateNetworkInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateNetworkInstance.bpmn @@ -623,12 +623,12 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]> - + - + - + @@ -675,10 +675,10 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]> - - + + - + @@ -795,46 +795,46 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]> - + - + - - - + + + - + - - + + - + - + - + - - - + + + - + - - - + + + - + @@ -861,7 +861,7 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]> - + @@ -1074,24 +1074,24 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]> - + - + - - + + - + - - - + + + - + @@ -1133,24 +1133,24 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]> - + - + - - + + - + - - - + + + - + @@ -1178,7 +1178,7 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]> - + @@ -1187,9 +1187,9 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]> - + - + @@ -1211,17 +1211,17 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]> - + - - + + - + - + @@ -1233,98 +1233,98 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]> - + - - + + - + - - + + - + - - - + + + - + - - + + - + - + - - + + - + - - + + - + - + - + - - + + - + - - + + - + - + - + - - + + - + - + - + - - + + - + @@ -1338,17 +1338,17 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]> - + - + - - - + + + - + @@ -1359,20 +1359,20 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]> - + - - + + - + - - + + - + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstance.bpmn index a770c8c11a..19fd490b9f 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstance.bpmn @@ -1,390 +1,431 @@ - - - - - SequenceFlow_1 - - - - SequenceFlow_2 - SequenceFlow_3 + + + + + SequenceFlow_1 + + + + SequenceFlow_2 + SequenceFlow_3 - - - - SequenceFlow_1 - SequenceFlow_2 +def dcsi = new DoCreateServiceInstance() +dcsi.getAAICustomerById(execution)]]> + + + + SequenceFlow_1 + SequenceFlow_2 - - - - SequenceFlow_156ih25 - SequenceFlow_14 +def dcsi = new DoCreateServiceInstance() +dcsi.preProcessRequest(execution) +]]> + + + + SequenceFlow_156ih25 + SequenceFlow_14 - - - SequenceFlow_9 - SequenceFlow_10 +def dcsi = new DoCreateServiceInstance() +dcsi.preProcessSDNCAssignRequest(execution)]]> + + + SequenceFlow_9 + SequenceFlow_10 - - - - - - - - - - - SequenceFlow_14 - SequenceFlow_9 - - - SequenceFlow_10 - - - - - - - - - - - - - - - SequenceFlow_11fnnkb - SequenceFlow_4 - - - - - - - - - - - - - SequenceFlow_1uw2p9a - SequenceFlow_1w01tqs - SequenceFlow_129ih1g - - - - SequenceFlow_3 - SequenceFlow_11fnnkb - SequenceFlow_1uw2p9a - - - - - - - - SequenceFlow_0tgrn11 - - - - SequenceFlow_1xzgv5k - - - - - - - - - - SequenceFlow_1lqktwf - SequenceFlow_0eumzpf - - - - - SequenceFlow_0tgrn11 - SequenceFlow_1lqktwf +def dcsi = new DoCreateServiceInstance() +dcsi.postProcessSDNCAssign(execution)]]> + + + + + + + + + + + SequenceFlow_14 + SequenceFlow_9 + + + SequenceFlow_01q6pl4 + + + + + + + + + + + + + + + SequenceFlow_11fnnkb + SequenceFlow_4 + + + + + + + + + + + + + SequenceFlow_1uw2p9a + SequenceFlow_1w01tqs + SequenceFlow_129ih1g + + + + SequenceFlow_3 + SequenceFlow_11fnnkb + SequenceFlow_1uw2p9a + + + + + + + + SequenceFlow_0tgrn11 + + + + SequenceFlow_1xzgv5k + + + + + + + + + + SequenceFlow_1lqktwf + SequenceFlow_0eumzpf + + + + + SequenceFlow_0tgrn11 + SequenceFlow_1lqktwf - - - - SequenceFlow_0eumzpf - SequenceFlow_1xzgv5k +def dcsi = new DoCreateServiceInstance() +dcsi.preProcessRollback(execution) +]]> + + + + SequenceFlow_0eumzpf + SequenceFlow_1xzgv5k - - - - - SequenceFlow_1dd86x8 - SequenceFlow_156ih25 - SequenceFlow_00v4npo - - - - SequenceFlow_00v4npo - - - - - - SequenceFlow_4 - SequenceFlow_1w01tqs +def dcsi = new DoCreateServiceInstance() +dcsi.postProcessRollback(execution) +]]> + + + + + SequenceFlow_1dd86x8 + SequenceFlow_156ih25 + SequenceFlow_00v4npo + + + + SequenceFlow_00v4npo + + + + + + SequenceFlow_4 + SequenceFlow_1w01tqs - - - - SequenceFlow_129ih1g - SequenceFlow_1dd86x8 +def dcsi = new DoCreateServiceInstance() +dcsi.postProcessAAIGET(execution)]]> + + + + SequenceFlow_129ih1g + SequenceFlow_1dd86x8 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +def ddsi = new DoCreateServiceInstance() +ddsi.postProcessAAIPUT(execution)]]> + + + + + + + + + + + + + + SequenceFlow_10 + SequenceFlow_0tx5frq + + + + + SequenceFlow_0tx5frq + SequenceFlow_01q6pl4 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstanceRollback.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstanceRollback.bpmn index 80ace28ae7..6c24696cbd 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstanceRollback.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstanceRollback.bpmn @@ -1,338 +1,379 @@ - - - - - SequenceFlow_1 - - - - SequenceFlow_1 - SequenceFlow_2 + + + + + SequenceFlow_1 + + + + SequenceFlow_1 + SequenceFlow_2 - - - SequenceFlow_01l4ssl - - - - SequenceFlow_8 - - - - SequenceFlow_7 - - - - SequenceFlow_8 - SequenceFlow_7 +def rbk = new DoCreateServiceInstanceRollback() +rbk.preProcessRequest(execution) +]]> + + + SequenceFlow_01l4ssl + + + + SequenceFlow_8 + + + + SequenceFlow_7 + + + + SequenceFlow_8 + SequenceFlow_7 - - - - - - - - - - - - - - - - SequenceFlow_1x9eh33 - SequenceFlow_05wu9i7 - - - SequenceFlow_06aasqh - SequenceFlow_11fnnkb - SequenceFlow_1uw2p9a - - - - - - - rollback AAI - SequenceFlow_1uw2p9a - SequenceFlow_0khjo7l - SequenceFlow_1n7wade - SequenceFlow_1x9eh33 - - - - - - - - - - - - - - - - - SequenceFlow_11fnnkb - SequenceFlow_0k28xib - - - SequenceFlow_0k28xib - SequenceFlow_0khjo7l +def rbk= new DoCreateServiceInstanceRollback() +rbk.processRollbackException(execution)]]> + + + + + + + + + + + + + + + + SequenceFlow_1x9eh33 + SequenceFlow_05wu9i7 + + + SequenceFlow_06aasqh + SequenceFlow_11fnnkb + SequenceFlow_1uw2p9a + + + + + + + rollback AAI + SequenceFlow_1uw2p9a + SequenceFlow_1njogr1 + SequenceFlow_1n7wade + SequenceFlow_1x9eh33 + + + + + + + + + + + + + + + + + SequenceFlow_11fnnkb + SequenceFlow_0k28xib + + + SequenceFlow_0k28xib + SequenceFlow_0khjo7l - - - - SequenceFlow_2 - SequenceFlow_06aasqh - SequenceFlow_1rzlaoy - - - SequenceFlow_05wu9i7 - SequenceFlow_1n7wade - SequenceFlow_1rzlaoy - SequenceFlow_01l4ssl +String response = execution.getVariable("sdncDeactivateResponse") +def rbk= new DoCreateServiceInstanceRollback() +rbk.validateSDNCResponse(execution, response, "deactivate")]]> + + + + SequenceFlow_2 + SequenceFlow_06aasqh + SequenceFlow_1rzlaoy + + + SequenceFlow_05wu9i7 + SequenceFlow_1n7wade + SequenceFlow_1rzlaoy + SequenceFlow_01l4ssl - - - - - - - - - SequenceFlow_1ch4xrf - - - - SequenceFlow_1ch4xrf - SequenceFlow_1pjk2ff +def rbk = new DoCreateServiceInstanceRollback() +rbk.postProcessRequest(execution)]]> + + + + + + + + + SequenceFlow_1ch4xrf + + + + SequenceFlow_1ch4xrf + SequenceFlow_1pjk2ff - - - SequenceFlow_1pjk2ff - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +def rbk= new DoCreateServiceInstanceRollback() +rbk.processRollbackJavaException(execution)]]> + + + SequenceFlow_1pjk2ff + + + + + + + SequenceFlow_006g9e8 + SequenceFlow_1njogr1 + + + + + + + + + + + + SequenceFlow_0khjo7l + SequenceFlow_006g9e8 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnf.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnf.bpmn index 5e88527676..8411c56bef 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnf.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnf.bpmn @@ -9,7 +9,7 @@ SequenceFlow_1 SequenceFlow_2 @@ -42,7 +42,7 @@ exceptionUtil.buildWorkflowException(execution, 404, "Service Instance Not Found found - + @@ -64,7 +64,7 @@ exceptionUtil.buildWorkflowException(execution, 404, "Service Instance Not Found - found + VnfNameSpecified1 SequenceFlow_7 @@ -86,9 +86,10 @@ exceptionUtil.buildWorkflowException(execution, 5000, "Generic Vnf Already Exist vnfExistNo + VnfNameNotSpecified1 SequenceFlow_11 @@ -123,21 +124,20 @@ exceptionUtil.processJavaException(execution)]]> - SequenceFlow_15z3gpq - SequenceFlow_0ay5l4b + SdncInteractionNotEnabled + SequenceFlow_0bj7c4s - - + - SequenceFlow_0ttqcwx + SdncInteractionEnabled SequenceFlow_1q6udwm @@ -155,19 +155,20 @@ createVnf.preProcessSDNCAssignRequest(execution)]]> SequenceFlow_15knw0q - SequenceFlow_0c5h00o SequenceFlow_0lnh79j + +String response = execution.getVariable("DoCVNF_assignSDNCAdapterResponse") + +def createVnfInfra = new DoCreateVnf() createVnfInfra.validateSDNCResponse(execution, response, "assign")]]> - SequenceFlow_0c5h00o + SequenceFlow_1q1poly + VnfNameSpecified2 SequenceFlow_1lalmvp @@ -187,30 +188,102 @@ createVnf.preProcessSDNCActivateRequest(execution)]]> SequenceFlow_0eb41vb SequenceFlow_15z3gpq - + SequenceFlow_1gc18ih - SequenceFlow_0ttqcwx - SequenceFlow_0ay5l4b + SdncInteractionEnabled + SdncInteractionNotEnabled - - + + - + SequenceFlow_0seif8n SequenceFlow_1gc18ih + + found + VnfNameNotSpecified1 + VnfNameSpecified1 + + + + + + + + + + SequenceFlow_0lnh79j + VnfNameNotSpecified2 + VnfNameSpecified2 + + + + + + + + VnfNameNotSpecified2 + SequenceFlow_1h9jdgr + + + + + + + + + + + + + SequenceFlow_1h9jdgr + SequenceFlow_14xac2y + + + SequenceFlow_14xac2y + SequenceFlow_1q1poly + + + + + + + + + + + + SequenceFlow_0nhsdmj + SequenceFlow_0bj7c4s + + + + SequenceFlow_15z3gpq + SequenceFlow_0nhsdmj + + @@ -243,27 +316,27 @@ createVnf.postProcessCreateGenericVnf(execution)]]> - + - + - + - + - - + + - + @@ -280,11 +353,10 @@ createVnf.postProcessCreateGenericVnf(execution)]]> - - - + + - + @@ -339,9 +411,9 @@ createVnf.postProcessCreateGenericVnf(execution)]]> - + - + @@ -400,32 +472,25 @@ createVnf.postProcessCreateGenericVnf(execution)]]> - - - - - - - - - + + - + - - + + - + - - + + - + @@ -438,36 +503,37 @@ createVnf.postProcessCreateGenericVnf(execution)]]> - + - + - + - + - + - - - + + + - + - - - - + + + + + - + @@ -479,14 +545,114 @@ createVnf.postProcessCreateGenericVnf(execution)]]> - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn index 433957572d..be54119bda 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn @@ -13,7 +13,7 @@ doCreateVnfAndModules.preProcessRequest(execution)]]> - + @@ -36,6 +36,9 @@ doCreateVnfAndModules.preProcessRequest(execution)]]> + + + SequenceFlow_1hf7k7q SequenceFlow_1ixcnb6 @@ -44,7 +47,7 @@ doCreateVnfAndModules.preProcessRequest(execution)]]> - + @@ -67,6 +70,9 @@ doCreateVnfAndModules.preProcessRequest(execution)]]> + + + SequenceFlow_1lh21yl SequenceFlow_1llbx0k @@ -97,7 +103,7 @@ doCreateVnfAndModules.validateAddOnModule(execution)]]> - + @@ -105,7 +111,6 @@ doCreateVnfAndModules.validateAddOnModule(execution)]]> - @@ -115,6 +120,9 @@ doCreateVnfAndModules.validateAddOnModule(execution)]]> + + + SequenceFlow_1xd3ri5 SequenceFlow_08i3uo6 @@ -141,10 +149,10 @@ doCreateVnfAndModules.queryCatalogDB(execution)]]> SequenceFlow_1vrogpr - + - + @@ -159,6 +167,7 @@ doCreateVnfAndModules.queryCatalogDB(execution)]]> + SequenceFlow_1ifw9tw SequenceFlow_1hf7k7q @@ -171,6 +180,7 @@ doCreateVnfAndModules.queryCatalogDB(execution)]]> + SequenceFlow_0kld3qt SequenceFlow_1lh21yl @@ -193,7 +203,27 @@ doCreateVnfAndModules.finisthProcessingInitialCountDeployment(execution)]]> + + + SequenceFlow_11bmhi4 + SequenceFlow_1kjlzrn + + + + SequenceFlow_1kjlzrn + + + SequenceFlow_11bmhi4 + + + + + + + @@ -374,6 +404,38 @@ doCreateVnfAndModules.validateBaseModule(execution)]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteServiceInstance.bpmn index 9d21cc8301..49274bd8a6 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteServiceInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteServiceInstance.bpmn @@ -1,332 +1,373 @@ - - - - - SequenceFlow_0jfgn05 - - - SequenceFlow_0jfgn05 - SequenceFlow_1jqc16k + + + + + SequenceFlow_0jfgn05 + + + SequenceFlow_0jfgn05 + SequenceFlow_1jqc16k - - - SequenceFlow_1wyvxwi - - - - - - - - - - - - - SequenceFlow_1w8ao21 - SequenceFlow_0riudmc - SequenceFlow_05wu9i7 - - - - - - - - - - - - - SequenceFlow_0rtflal - SequenceFlow_0k28xib - - - SequenceFlow_0k28xib - SequenceFlow_1w8ao21 +def ddsi = new DoDeleteServiceInstance() +ddsi.preProcessRequest(execution) +]]> + + + SequenceFlow_1wyvxwi + + + + + + + + + + + + + SequenceFlow_0riudmc + SequenceFlow_0znbzxu + SequenceFlow_05wu9i7 + + + + + + + + + + + + + SequenceFlow_0rtflal + SequenceFlow_0k28xib + + + SequenceFlow_0k28xib + SequenceFlow_1w8ao21 - - - - SequenceFlow_1dwch0k - SequenceFlow_0rtflal + +String response = execution.getVariable("sdncDeactivateResponse") +def ddsi = new DoDeleteServiceInstance() +ddsi.postProcessSDNCDelete(execution, response, "deactivate")]]> + + + + SequenceFlow_1dwch0k + SequenceFlow_0rtflal - - - - SequenceFlow_1up0j5r - SequenceFlow_1hcfvcj - SequenceFlow_05jfuko - - - - - - SequenceFlow_05jfuko - - - - - SequenceFlow_1hcfvcj - SequenceFlow_0riudmc - SequenceFlow_1dwch0k - - - - - - - - - - - - - - - - SequenceFlow_1jqc16k - SequenceFlow_1grea1r - - - - SequenceFlow_1grea1r - SequenceFlow_1up0j5r +def ddsi = new DoDeleteServiceInstance() +ddsi.preProcessSDNCDelete(execution)]]> + + + + SequenceFlow_1up0j5r + SequenceFlow_1hcfvcj + SequenceFlow_05jfuko + + + + + + SequenceFlow_05jfuko + + + + + SequenceFlow_1hcfvcj + SequenceFlow_0riudmc + SequenceFlow_1dwch0k + + + + + + + + + + + + + + + + SequenceFlow_1jqc16k + SequenceFlow_1grea1r + + + + SequenceFlow_1grea1r + SequenceFlow_1up0j5r - - - - - SequenceFlow_05wu9i7 - SequenceFlow_1wyvxwi +def ddsi = new DoDeleteServiceInstance() +ddsi.postProcessAAIGET(execution)]]> + + + + + SequenceFlow_05wu9i7 + SequenceFlow_1wyvxwi - - - - - SequenceFlow_0u33vy6 - - - - SequenceFlow_0hevfee - - - SequenceFlow_0u33vy6 - SequenceFlow_0hevfee +def ddsi = new DoDeleteServiceInstance() +ddsi.postProcessAAIDEL(execution)]]> + + + + + SequenceFlow_0u33vy6 + + + + SequenceFlow_0hevfee + + + SequenceFlow_0u33vy6 + SequenceFlow_0hevfee - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +ExceptionUtil ex = new ExceptionUtil() +ex.processJavaException(execution)]]> + + + + + + + + + + + + + + SequenceFlow_1w8ao21 + SequenceFlow_14x55db + + + SequenceFlow_14x55db + SequenceFlow_0znbzxu + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVfModule.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVfModule.bpmn index ab0812343b..b8c6aa32a4 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVfModule.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVfModule.bpmn @@ -1,8 +1,7 @@ - + SequenceFlow_0fp1wqz SequenceFlow_28 - + @@ -21,8 +19,7 @@ dvm.prepUpdateAAIVfModule(execution)]]> SequenceFlow_31 - + @@ -34,8 +31,7 @@ dvm.prepUpdateAAIVfModule(execution)]]> SequenceFlow_1j9dvfx - + @@ -49,16 +45,14 @@ dvm.prepUpdateAAIVfModule(execution)]]> SequenceFlow_33 - + SequenceFlow_1j9dvfx SequenceFlow_4 - + SequenceFlow_31 SequenceFlow_32 - + @@ -82,8 +75,7 @@ dvm.prepSDNCAdapterRequest(execution, "delete")]]> SequenceFlow_35 - + @@ -94,8 +86,7 @@ dvm.prepSDNCAdapterRequest(execution, "delete")]]> SequenceFlow_35 - + SequenceFlow_2 SequenceFlow_34 SequenceFlow_0t4yszi - SequenceFlow_0lu7b1v + SequenceFlow_1tt31qu + SequenceFlow_1fccvli SequenceFlow_1qrkdn3 SequenceFlow_1936oc0 - + SequenceFlow_05ujwz8 + SequenceFlow_1x25m7t SequenceFlow_1uqlr6b - + @@ -63,20 +65,22 @@ exceptionUtil.processJavaException(execution)]]> - + + - SequenceFlow_1qoor0l + SequenceFlow_1xujrk5 SequenceFlow_1p4ycii - + SequenceFlow_1936oc0 SequenceFlow_05ujwz8 + SDNCInteractionEnabled2 - + SequenceFlow_08nd69s @@ -92,15 +96,115 @@ ddvam.queryAAIVfModule(execution)]]> def ddvam = new DoDeleteVnfAndModules() ddvam.prepareNextModuleToDelete(execution)]]> - - - + + + SequenceFlow_1p4ycii + SequenceFlow_0xl033m SequenceFlow_0t4yszi +int nextModule = execution.getVariable("DDVAM_nextModule") + execution.setVariable("DDVAM_nextModule", nextModule + 1)]]> + + + SequenceFlow_0lu7b1v + SequenceFlow_1tt31qu + SDNCInteractionEnabled1 + + + + + + + + + + SDNCInteractionEnabled1 + SequenceFlow_0fhhsyo + + + SequenceFlow_0qdn8k4 + SequenceFlow_1fccvli + + + + + + + + + + + + + SequenceFlow_0fhhsyo + SequenceFlow_0qdn8k4 + + + + + + + + + SDNCInteractionEnabled2 + SequenceFlow_001uxa1 + + + + + + + + + + + + + SequenceFlow_001uxa1 + SequenceFlow_1x29mht + + + SequenceFlow_1x29mht + SequenceFlow_1x25m7t + + + + SequenceFlow_1qoor0l + SequenceFlow_1xujrk5 + SequenceFlow_1laeenc + + + + + + + + + + + + + + SequenceFlow_1laeenc + SequenceFlow_0xl033m + + + + + + @@ -123,51 +227,51 @@ int nextModule = execution.getVariable("nextModule") - + - + - + - + - + - + - + - + - - + + - + - - + + - + - + - + - + @@ -177,87 +281,208 @@ int nextModule = execution.getVariable("nextModule") - - - + + + - + - + - + - + - - - - + + + - + - - - + + + - + - - - - + + - + - - + + - + - - + + - + - + - + - + - - - - + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit 1.2.3-korg