From 94ee92559b051f2f82ed681f841f4f13016842ed Mon Sep 17 00:00:00 2001 From: "Determe, Sebastien (sd378r)" Date: Tue, 2 May 2017 03:53:18 -0700 Subject: [MSO-8] Second step of the rebase for MSO Second rebase containing additional features for MSO + total reworking of the BPMN structure + Notification flow can now be added at the end of some BPMN flows Change-Id: I7e937c7a0ba1593ca85e164a093f79c7e38b6ce0 Signed-off-by: Determe, Sebastien (sd378r) --- .../src/main/resources/META-INF/persistence.xml | 74 +- .../src/main/resources/META-INF/processes.xml | 162 +- .../src/main/resources/logback.xml | 318 +-- .../CreateGenericMacroServiceNetworkVnf.bpmn | 2406 ++++++++++---------- .../resources/process/CreateNetworkInstance.bpmn | 3 +- .../resources/process/CreateServiceInstance.bpmn | 2 +- .../resources/process/CreateVfModuleInfra.bpmn | 335 ++- .../process/CreateVfModuleVolumeInfraV1.bpmn | 341 ++- .../src/main/resources/process/CreateVnfInfra.bpmn | 6 +- .../main/resources/process/DelServiceInstance.bpmn | 2 +- .../DeleteGenericMacroServiceNetworkVnf.bpmn | 1542 ++++++------- .../resources/process/DeleteNetworkInstance.bpmn | 741 +++--- .../resources/process/DeleteVfModuleInfra.bpmn | 3 +- .../process/DeleteVfModuleVolumeInfraV1.bpmn | 1 - .../src/main/resources/process/DeleteVnfInfra.bpmn | 4 +- .../resources/process/UpdateNetworkInstance.bpmn | 372 +++ .../process/UpdateNetworkInstanceInfra.bpmn | 688 +++--- .../process/UpdateVfModuleVolumeInfraV1.bpmn | 1 - .../subprocess/DoCreateNetworkInstance.bpmn | 139 +- .../subprocess/DoCreateServiceInstance.bpmn | 780 +++---- .../DoCreateServiceInstanceRollback.bpmn | 676 +++--- .../resources/subprocess/DoCreateVfModule.bpmn | 2171 ++++++++++-------- .../subprocess/DoCreateVfModuleRollback.bpmn | 29 +- .../src/main/resources/subprocess/DoCreateVnf.bpmn | 95 +- .../subprocess/DoCreateVnfAndModules.bpmn | 145 +- .../subprocess/DoCreateVnfAndModulesRollback.bpmn | 282 +++ .../subprocess/DoDeleteNetworkInstance.bpmn | 30 +- .../DoDeleteNetworkInstanceRollback.bpmn | 2 +- .../subprocess/DoDeleteServiceInstance.bpmn | 664 +++--- .../subprocess/DoDeleteVnfAndModules.bpmn | 263 +++ .../subprocess/DoUpdateNetworkInstance.bpmn | 847 +++++++ .../DoUpdateNetworkInstanceRollback.bpmn | 373 +++ .../src/main/resources/urn.properties | 58 +- 33 files changed, 7939 insertions(+), 5616 deletions(-) create mode 100644 bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateNetworkInstance.bpmn create mode 100644 bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModulesRollback.bpmn create mode 100644 bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVnfAndModules.bpmn create mode 100644 bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateNetworkInstance.bpmn create mode 100644 bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateNetworkInstanceRollback.bpmn (limited to 'bpmn/MSOInfrastructureBPMN/src/main/resources') diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/META-INF/persistence.xml b/bpmn/MSOInfrastructureBPMN/src/main/resources/META-INF/persistence.xml index 62fcfadca7..8e87f47ddc 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/META-INF/persistence.xml +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/META-INF/persistence.xml @@ -1,37 +1,37 @@ - - - - - - - java:jboss/datasources/ProcessEngine - - - - - - - - + + + + + + + java:jboss/datasources/ProcessEngine + + + + + + + + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/META-INF/processes.xml b/bpmn/MSOInfrastructureBPMN/src/main/resources/META-INF/processes.xml index 511ba0ae3d..4053de8e28 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/META-INF/processes.xml +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/META-INF/processes.xml @@ -1,81 +1,81 @@ - - - - - - - org.camunda.bpm.engine.impl.cfg.StandaloneProcessEngineConfiguration - java:jboss/datasources/ProcessEngine - - full - true - true - true - true - - - - - - org.camunda.bpm.application.impl.event.ProcessApplicationEventListenerPlugin - - - - - org.camunda.spin.plugin.impl.SpinProcessEnginePlugin - - - - - org.camunda.connect.plugin.impl.ConnectProcessEnginePlugin - - - - org.openecomp.mso.bpmn.core.plugins.LoggingAndURNMappingPlugin - - - - - org.openecomp.mso.bpmn.core.plugins.WorkflowExceptionPlugin - - - - - - - - - - infrastructure - - false - true - - - - + + + + + + + org.camunda.bpm.engine.impl.cfg.StandaloneProcessEngineConfiguration + java:jboss/datasources/ProcessEngine + + full + true + true + true + true + + + + + + org.camunda.bpm.application.impl.event.ProcessApplicationEventListenerPlugin + + + + + org.camunda.spin.plugin.impl.SpinProcessEnginePlugin + + + + + org.camunda.connect.plugin.impl.ConnectProcessEnginePlugin + + + + org.openecomp.mso.bpmn.core.plugins.LoggingAndURNMappingPlugin + + + + + org.openecomp.mso.bpmn.core.plugins.WorkflowExceptionPlugin + + + + + + + + + + infrastructure + + false + true + + + + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/logback.xml b/bpmn/MSOInfrastructureBPMN/src/main/resources/logback.xml index 133fa54003..7c9e0282d4 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/logback.xml +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/logback.xml @@ -1,159 +1,159 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${logDirectory}/${auditLogName}${jboss.server.name}.log - - ${logDirectory}/${auditLogName}${jboss.server.name}.log.%d - - - - ${auditPattern} - - - - 256 - - - - - ${logDirectory}/${metricsLogName}${jboss.server.name}.log - - ${logDirectory}/${metricsLogName}${jboss.server.name}.log.%d - - - - - ${metricPattern} - - - - - - 256 - - - - - ${logDirectory}/${errorLogName}${jboss.server.name}.log - - ${logDirectory}/${errorLogName}${jboss.server.name}.log.%d - - - - INFO - - - ${errorPattern} - - - - - 256 - - - - - ${debugLogDirectory}/${debugLogName}${jboss.server.name}.log - - ${debugLogDirectory}/${debugLogName}${jboss.server.name}.log.%d - - - - ${debugPattern} - - - - - 256 - - true - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${logDirectory}/${auditLogName}${jboss.server.name}.log + + ${logDirectory}/${auditLogName}${jboss.server.name}.log.%d + + + + ${auditPattern} + + + + 256 + + + + + ${logDirectory}/${metricsLogName}${jboss.server.name}.log + + ${logDirectory}/${metricsLogName}${jboss.server.name}.log.%d + + + + + ${metricPattern} + + + + + + 256 + + + + + ${logDirectory}/${errorLogName}${jboss.server.name}.log + + ${logDirectory}/${errorLogName}${jboss.server.name}.log.%d + + + + INFO + + + ${errorPattern} + + + + + 256 + + + + + ${debugLogDirectory}/${debugLogName}${jboss.server.name}.log + + ${debugLogDirectory}/${debugLogName}${jboss.server.name}.log.%d + + + + ${debugPattern} + + + + + 256 + + true + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateGenericMacroServiceNetworkVnf.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateGenericMacroServiceNetworkVnf.bpmn index 1f5318224b..7b9b8212e5 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateGenericMacroServiceNetworkVnf.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateGenericMacroServiceNetworkVnf.bpmn @@ -1,1203 +1,1203 @@ - - - - - SequenceFlow_7 - SequenceFlow_3 - - - - - SequenceFlow_1 - - - - SequenceFlow_1 - SequenceFlow_7 - - - - - SequenceFlow_10o22u2 - - - - SequenceFlow_0afe2pg - SequenceFlow_29 - - - - - - - - - - - - - - - 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 - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - SequenceFlow_0f4u373 - SequenceFlow_1rabks0 - - - - - - - - SequenceFlow_1vwssu7 - SequenceFlow_19etqmx - - - - SequenceFlow_10o22u2 - 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 - - - - - - - - - - ${URN_mso_adapters_db_endpoint} - - - - application/soap+xml - - - POST - - soap-http-connector - - - SequenceFlow_0vj46ej - SequenceFlow_13uceka - - - - SequenceFlow_1ky2sv9 - SequenceFlow_0vj46ej - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + SequenceFlow_7 + SequenceFlow_3 + + + + + SequenceFlow_1 + + + + SequenceFlow_1 + SequenceFlow_7 + + + + + SequenceFlow_10o22u2 + + + + SequenceFlow_0afe2pg + SequenceFlow_29 + + + + + + + + + + + + + + + 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 + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + SequenceFlow_0f4u373 + SequenceFlow_1rabks0 + + + + + + + + SequenceFlow_1vwssu7 + SequenceFlow_19etqmx + + + + SequenceFlow_10o22u2 + 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 + + + + + + + + + + ${URN_mso_adapters_db_endpoint} + + + + application/soap+xml + + + POST + + soap-http-connector + + + SequenceFlow_0vj46ej + SequenceFlow_13uceka + + + + SequenceFlow_1ky2sv9 + SequenceFlow_0vj46ej + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateNetworkInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateNetworkInstance.bpmn index e86d287e27..52627a5e33 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateNetworkInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateNetworkInstance.bpmn @@ -121,6 +121,7 @@ CreateNetworkInstance.prepareDBRequestError(execution)]]> application/soap+xml + #{BasicAuthHeaderValueDB} POST @@ -369,4 +370,4 @@ CreateNetworkInstance.sendSyncResponse(execution)]]> - + \ No newline at end of file diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateServiceInstance.bpmn index d8e8dfda30..fa114c5e76 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateServiceInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateServiceInstance.bpmn @@ -8,7 +8,7 @@ SequenceFlow_10 SequenceFlow_14 - diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVfModuleInfra.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVfModuleInfra.bpmn index 7e5a1cd497..7a8133ec7f 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVfModuleInfra.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVfModuleInfra.bpmn @@ -1,22 +1,22 @@ - + SequenceFlow_1 - + - - - - - - - - - - + + + + + + + + + + SequenceFlow_7 SequenceFlow_4 @@ -28,17 +28,17 @@ def createVfModule = new CreateVfModuleInfra() createVfModule.sendResponse(execution)]]> - + SequenceFlow_4 - + - + SequenceFlow_5 - + - + SequenceFlow_5 SequenceFlow_6 @@ -49,12 +49,12 @@ createVfModule.prepareUpdateInfraRequest(execution)]]> + http-connector ${URN_mso_adapters_db_endpoint} application/soap+xml - #{BasicAuthHeaderValueDB} ${CVFMI_updateInfraRequest} @@ -62,14 +62,13 @@ createVfModule.prepareUpdateInfraRequest(execution)]]> ${statusCode} ${response} - http-connector SequenceFlow_6 SequenceFlow_8 - - + + updateInfraRequestResponseGood SequenceFlow_12 @@ -77,15 +76,15 @@ createVfModule.prepareUpdateInfraRequest(execution)]]> def createVfModule = new CreateVfModuleInfra() createVfModule.postProcessResponse(execution)]]> - + - - - - - - + + + + + + SequenceFlow_12 SequenceFlow_14 @@ -95,13 +94,13 @@ createVfModule.postProcessResponse(execution)]]> updateInfraRequestResponseBad updateInfraRequestResponseGood - + updateInfraRequestResponseBad - + @@ -111,37 +110,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 @@ -150,19 +149,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 @@ -173,7 +172,7 @@ cvfm.logAndSaveOriginalException(execution)]]> - + SequenceFlow_14 @@ -182,18 +181,18 @@ cvfm.logAndSaveOriginalException(execution)]]> SequenceFlow_16 - + - - + + SequenceFlow_15 - + - + SequenceFlow_15 - + SequenceFlow_1 @@ -202,272 +201,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/CreateVfModuleVolumeInfraV1.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVfModuleVolumeInfraV1.bpmn index 5c8074e01e..0fc889bfd6 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVfModuleVolumeInfraV1.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVfModuleVolumeInfraV1.bpmn @@ -1,16 +1,16 @@ - + SequenceFlow_1 - + SequenceFlow_14 - + - + SequenceFlow_14 SequenceFlow_syncResponseSent @@ -26,8 +26,8 @@ def createVfModuleVolumeInfraV1 = new CreateVfModuleVolumeInfraV1() createVfModuleVolumeInfraV1.executeMethod('sendSyncError', execution, isDebugLogEnabled)]]> - - + + SequenceFlow_22 SequenceFlow_syncResponseSent @@ -37,24 +37,24 @@ def createVfModuleVolumeInfraV1 = new CreateVfModuleVolumeInfraV1() createVfModuleVolumeInfraV1.executeMethod('prepareFalloutHandlerRequest', execution, isDebugLogEnabled) ]]> - + - - - - - - - + + + + + + + SequenceFlow_18 SequenceFlow_19 - + SequenceFlow_19 - + @@ -64,7 +64,7 @@ createVfModuleVolumeInfraV1.executeMethod('prepareFalloutHandlerRequest', execut def createVfModuleVolumeInfraV1 = new CreateVfModuleVolumeInfraV1() createVfModuleVolumeInfraV1.executeMethod('preProcessRequest', execution, isDebugLogEnabled)]]> - + SequenceFlow_4 SequenceFlow_3 @@ -72,7 +72,7 @@ createVfModuleVolumeInfraV1.executeMethod('preProcessRequest', execution, isDebu def createVfModuleVolumeInfraV1 = new CreateVfModuleVolumeInfraV1() createVfModuleVolumeInfraV1.executeMethod('sendSyncResponse', execution, isDebugLogEnabled)]]> - + SequenceFlow_3 SequenceFlow_volGrpNamePresent @@ -81,7 +81,7 @@ createVfModuleVolumeInfraV1.executeMethod('sendSyncResponse', execution, isDebug - + SequenceFlow_volGrpNameMissing SequenceFlow_7 @@ -89,40 +89,40 @@ createVfModuleVolumeInfraV1.executeMethod('sendSyncResponse', execution, isDebug def createVfModuleVolumeInfraV1 = new CreateVfModuleVolumeInfraV1() createVfModuleVolumeInfraV1.executeMethod('buildWorkflowException', execution, 2500, "Volume group name not present in request.", isDebugLogEnabled)]]> - + SequenceFlow_7 - + - - - - - + + + + + SequenceFlow_volGrpNamePresent SequenceFlow_5 - - - - - - - - - - - + + + + + + + + + + + SequenceFlow_serviceInstanceFound SequenceFlow_2 - + SequenceFlow_12 SequenceFlow_13 @@ -130,20 +130,20 @@ createVfModuleVolumeInfraV1.executeMethod('buildWorkflowException', execution, 2 def createVfModuleVolumeInfraV1 = new CreateVfModuleVolumeInfraV1() createVfModuleVolumeInfraV1.executeMethod('setSuccessIndicator', execution, true)]]> - + - - - - - - + + + + + + SequenceFlow_11 SequenceFlow_12 - + SequenceFlow_8 SequenceFlow_11 @@ -151,33 +151,32 @@ createVfModuleVolumeInfraV1.executeMethod('setSuccessIndicator', execution, true def createVfModuleVolumeInfraV1 = new CreateVfModuleVolumeInfraV1() createVfModuleVolumeInfraV1.executeMethod('postProcessResponse', execution, isDebugLogEnabled)]]> - + + http-connector ${URN_mso_adapters_db_endpoint} ${CVMVINFRAV1_createDBRequest} application/soap+xml - #{BasicAuthHeaderValueDB} POST ${response} ${statusCode} - http-connector SequenceFlow_6 SequenceFlow_8 - + SequenceFlow_13 - + SequenceFlow_2 @@ -186,20 +185,20 @@ createVfModuleVolumeInfraV1.executeMethod('postProcessResponse', execution, isDe def createVfModuleVolumeInfraV1 = new CreateVfModuleVolumeInfraV1() createVfModuleVolumeInfraV1.executeMethod('prepareDbInfraSuccessRequest', execution, isDebugLogEnabled)]]> - + SequenceFlow_5 SequenceFlow_serviceInstanceFound SequenceFlow_serviceInstanceNotFound - + - + SequenceFlow_16 - + SequenceFlow_serviceInstanceNotFound @@ -208,274 +207,274 @@ createVfModuleVolumeInfraV1.executeMethod('prepareDbInfraSuccessRequest', execut def createVfModuleVolumeInfraV1 = new CreateVfModuleVolumeInfraV1() createVfModuleVolumeInfraV1.executeMethod('buildWorkflowException', execution, 2500, "Service instance id not found in AAI: $CVMVINFRAV1_serviceInstanceId.", isDebugLogEnabled)]]> - + - + - + - + - - + + - + - + - + - + - + - + - + - - - - + + + + - + - - + + - + - - + + - + - - + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - - + + - + - - + + - + - - + + - + - + - - + + - + - - - - + + + + - + - - - - + + + + - + - + - + - - + + - + - - + + - + - + - + - - - - + + + + - + - + - - - - + + + + - + - - - - + + + + - + - + - + - + - - - - + + + + - - - - + + + + - + - + - - + + - + - + - - + + - + - + \ 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 f98f8eda03..e8d27b6014 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVnfInfra.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVnfInfra.bpmn @@ -45,7 +45,7 @@ createVnf.sendSyncResponse(execution)]]> SequenceFlow_8 SequenceFlow_9 - @@ -60,7 +60,7 @@ exceptionUtil.processJavaException(execution)]]> - + @@ -109,7 +109,7 @@ createVnf.prepareCompletionHandlerRequest(execution)]]> SequenceFlow_17 - + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DelServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DelServiceInstance.bpmn index 6d47b1a9ba..4488e8de1c 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DelServiceInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DelServiceInstance.bpmn @@ -8,7 +8,7 @@ SequenceFlow_10 SequenceFlow_14 - diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteGenericMacroServiceNetworkVnf.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteGenericMacroServiceNetworkVnf.bpmn index 3bd8b91abd..eeb32599d3 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteGenericMacroServiceNetworkVnf.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteGenericMacroServiceNetworkVnf.bpmn @@ -1,771 +1,771 @@ - - - - - SequenceFlow_7 - SequenceFlow_3 - - - - - SequenceFlow_1 - - - - SequenceFlow_1 - SequenceFlow_7 - - - - - SequenceFlow_10o22u2 - - - - SequenceFlow_12ilko1 - SequenceFlow_29 - - - - - - - - - - - - - - - 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 - - - - - - - - - - - - - - - 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 - - - - - - - - - - - - - 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 - - - - SequenceFlow_0jek18q - - - - SequenceFlow_18103ca - - - - - - - - SequenceFlow_1dmn40p - SequenceFlow_0g2cw86 - - - - SequenceFlow_0g2cw86 - SequenceFlow_0mr8jgt - SequenceFlow_1wc8h5g - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + SequenceFlow_7 + SequenceFlow_3 + + + + + SequenceFlow_1 + + + + SequenceFlow_1 + SequenceFlow_7 + + + + + SequenceFlow_10o22u2 + + + + SequenceFlow_12ilko1 + SequenceFlow_29 + + + + + + + + + + + + + + + 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 + + + + + + + + + + + + + + + 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 + + + + + + + + + + + + + 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 + + + + SequenceFlow_0jek18q + + + + SequenceFlow_18103ca + + + + + + + + SequenceFlow_1dmn40p + SequenceFlow_0g2cw86 + + + + SequenceFlow_0g2cw86 + SequenceFlow_0mr8jgt + SequenceFlow_1wc8h5g + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteNetworkInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteNetworkInstance.bpmn index 8c37d212c3..951ae3c0b5 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteNetworkInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteNetworkInstance.bpmn @@ -1,370 +1,371 @@ - - - - - SequenceFlow_0lp2z7l - - - - SequenceFlow_10 - SequenceFlow_14 - - - - - SequenceFlow_10 - - - - - SequenceFlow_14 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SequenceFlow_0eto8sn - SequenceFlow_1lj31zp - - - SequenceFlow_0x3znm5 - - - SequenceFlow_095crcd - SequenceFlow_0x3znm5 - - - - - - SequenceFlow_0lp2z7l - SequenceFlow_1ablr60 - - - - - - SequenceFlow_1lj31zp - SequenceFlow_0xxvjxq - - - - - - - - - - - - SequenceFlow_0xxvjxq - SequenceFlow_095crcd - - - - - SequenceFlow_0n4umjf - - - - SequenceFlow_1ghqolv - - - SequenceFlow_0n4umjf - SequenceFlow_1s5niqb - - - - - - - ${URN_mso_adapters_db_endpoint} - ${DELNI_deleteDBRequest} - - - application/soap+xml - - - POST - ${response} - ${statusCode} - - http-connector - - - SequenceFlow_1s5niqb - SequenceFlow_06s5eu4 - - - SequenceFlow_06s5eu4 - SequenceFlow_1reso2f - - - - - - - - - - - - SequenceFlow_1reso2f - SequenceFlow_1ghqolv - - - - - - - - - - - - SequenceFlow_1ablr60 - SequenceFlow_0rt8wax - - - - SequenceFlow_0rt8wax - SequenceFlow_0eto8sn - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + SequenceFlow_0lp2z7l + + + + SequenceFlow_10 + SequenceFlow_14 + + + + + SequenceFlow_10 + + + + + SequenceFlow_14 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SequenceFlow_0eto8sn + SequenceFlow_1lj31zp + + + SequenceFlow_0x3znm5 + + + SequenceFlow_095crcd + SequenceFlow_0x3znm5 + + + + + + SequenceFlow_0lp2z7l + SequenceFlow_1ablr60 + + + + + + SequenceFlow_1lj31zp + SequenceFlow_0xxvjxq + + + + + + + + + + + + SequenceFlow_0xxvjxq + SequenceFlow_095crcd + + + + + SequenceFlow_0n4umjf + + + + SequenceFlow_1ghqolv + + + SequenceFlow_0n4umjf + SequenceFlow_1s5niqb + + + + + + + ${URN_mso_adapters_db_endpoint} + ${DELNI_deleteDBRequest} + + + application/soap+xml + #{BasicAuthHeaderValueDB} + + + POST + ${response} + ${statusCode} + + http-connector + + + SequenceFlow_1s5niqb + SequenceFlow_06s5eu4 + + + SequenceFlow_06s5eu4 + SequenceFlow_1reso2f + + + + + + + + + + + + SequenceFlow_1reso2f + SequenceFlow_1ghqolv + + + + + + + + + + + + SequenceFlow_1ablr60 + SequenceFlow_0rt8wax + + + + SequenceFlow_0rt8wax + SequenceFlow_0eto8sn + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVfModuleInfra.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVfModuleInfra.bpmn index b974bd01aa..04369acba0 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVfModuleInfra.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVfModuleInfra.bpmn @@ -83,7 +83,6 @@ dvfm.completionHandlerPrep(execution, 'DELVfModI_CompletionHandlerRequest') POST - #{BasicAuthHeaderValueDB} application/soap+xml @@ -327,4 +326,4 @@ dvfm.falloutHandlerPrep(execution, 'DELVfModI_FalloutHandlerRequest') - \ No newline at end of file + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVfModuleVolumeInfraV1.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVfModuleVolumeInfraV1.bpmn index 163e50be23..d0051de976 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVfModuleVolumeInfraV1.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVfModuleVolumeInfraV1.bpmn @@ -203,7 +203,6 @@ execution.setVariable("DELVfModVol_TransactionSuccessIndicator", true)]]>${DELVfModVol_updateInfraRequest} - #{BasicAuthHeaderValueDB} application/soap+xml diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVnfInfra.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVnfInfra.bpmn index 765bb1ffa6..b5b10a0fda 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVnfInfra.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVnfInfra.bpmn @@ -33,7 +33,7 @@ String falloutHandlerRequest = ex.processMainflowsBPMNException(execution, reque execution.setVariable("DELVI_falloutHandlerRequest", falloutHandlerRequest )]]> - + @@ -87,7 +87,7 @@ DeleteVnfInfra deleteVnf = new DeleteVnfInfra() deleteVnf.prepareCompletionHandlerRequest(execution)]]> - + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateNetworkInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateNetworkInstance.bpmn new file mode 100644 index 0000000000..a19e0c632b --- /dev/null +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateNetworkInstance.bpmn @@ -0,0 +1,372 @@ + + + + + SequenceFlow_0lp2z7l + + + + SequenceFlow_10 + SequenceFlow_14 + + + + + SequenceFlow_10 + + + + + SequenceFlow_14 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SequenceFlow_0eto8sn + SequenceFlow_1lj31zp + + + SequenceFlow_0x3znm5 + + + SequenceFlow_095crcd + SequenceFlow_0x3znm5 + + + + + + SequenceFlow_0lp2z7l + SequenceFlow_1ablr60 + + + + + + SequenceFlow_1lj31zp + SequenceFlow_0xxvjxq + + + + + + + + + + + + SequenceFlow_0xxvjxq + SequenceFlow_095crcd + + + + + SequenceFlow_0n4umjf + + + + SequenceFlow_1ghqolv + + + SequenceFlow_0n4umjf + SequenceFlow_1s5niqb + + + + + + + ${URN_mso_adapters_db_endpoint} + ${UPDNI_createDBRequest} + + + application/soap+xml + + + POST + ${response} + ${statusCode} + + http-connector + + + SequenceFlow_1s5niqb + SequenceFlow_06s5eu4 + + + SequenceFlow_06s5eu4 + SequenceFlow_1reso2f + + + + + + + + + + + + SequenceFlow_1reso2f + SequenceFlow_1ghqolv + + + + + + + + + + + + SequenceFlow_1ablr60 + SequenceFlow_0rt8wax + + + + SequenceFlow_0rt8wax + SequenceFlow_0eto8sn + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateNetworkInstanceInfra.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateNetworkInstanceInfra.bpmn index bba8b6f7a7..f49149b709 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateNetworkInstanceInfra.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateNetworkInstanceInfra.bpmn @@ -1,10 +1,10 @@ - + SequenceFlow_1 - + SequenceFlow_32 SequenceFlow_11 @@ -13,7 +13,7 @@ def UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra() UpdateNetworkInstanceInfra.prepareSDNCRequest(execution) ]]> - + SequenceFlow_12 SequenceFlow_5 @@ -26,56 +26,56 @@ UpdateNetworkInstanceInfra.validateSDNCResponse(execution)]]> sdncTopoNo_SequenceFlow sdncTopoYes_SequenceFlow - + - + SequenceFlow_34 - + - + sdncTopoNo_SequenceFlow SequenceFlow_34 - + - - - - - + + + + + - + - - - - - - - - + + + + + + + + SequenceFlow_11 SequenceFlow_12 - - + + SequenceFlow_27 SequenceFlow_29 - + SequenceFlow_23 @@ -85,12 +85,12 @@ UpdateNetworkInstanceInfra.postProcessResponse(execution)]]> - + SequenceFlow_23 - + - + isRollbackOn_YesNetwork_SequenceFlow isPONR_Yes_SequenceFlow @@ -99,13 +99,13 @@ UpdateNetworkInstanceInfra.postProcessResponse(execution)]]> - + isPONR_No_SequenceFlow isNetworkOk_No_SequenceFlow isNetworkOk_Yes_SequenceFlow - + @@ -118,7 +118,7 @@ UpdateNetworkInstanceInfra.postProcessResponse(execution)]]> - + sdncOk_Yeso_ExclusiveGateway SequenceFlow_53 @@ -126,13 +126,13 @@ UpdateNetworkInstanceInfra.postProcessResponse(execution)]]> def UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra() UpdateNetworkInstanceInfra.prepareSDNCRollbackRequest(execution)]]> - + SequenceFlow_53 SequenceFlow_55 - + - + SequenceFlow_47 SequenceFlow_22 @@ -140,16 +140,16 @@ UpdateNetworkInstanceInfra.prepareSDNCRollbackRequest(execution)]]> - + + http-connector ${URN_mso_adapters_db_endpoint} ${UPDNETI_updateDBRequest} - #{BasicAuthHeaderValueDB} application/soap+xml @@ -157,28 +157,27 @@ UpdateNetworkInstanceInfra.prepareDBRequestError(execution)]]> ${response} ${statusCode} - http-connector SequenceFlow_22 SequenceFlow_19 - + - - - - - - - - + + + + + + + + SequenceFlow_25 SequenceFlow_18 - + SequenceFlow_18 @@ -190,14 +189,14 @@ UpdateNetworkInstanceInfra.prepareDBRequestError(execution)]]> def UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra() UpdateNetworkInstanceInfra.validateRollbackResponses(execution)]]> - + isRollbackOn_NoNetwork_SequenceFlow isPONR_Yes_SequenceFlow SequenceFlow_4 SequenceFlow_47 - + SequenceFlow_19 SequenceFlow_25 @@ -206,7 +205,7 @@ def buildErrorResponse = new UpdateNetworkInstanceInfra() buildErrorResponse.buildErrorResponse(execution) ]]> - + SequenceFlow_13 @@ -215,7 +214,7 @@ buildErrorResponse.buildErrorResponse(execution) def UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra() UpdateNetworkInstanceInfra.callRESTReQueryAAINetworkId(execution)]]> - + SequenceFlow_35 SequenceFlow_46 @@ -223,7 +222,7 @@ UpdateNetworkInstanceInfra.callRESTReQueryAAINetworkId(execution)]]> - + SequenceFlow_46 SequenceFlow_37 @@ -233,16 +232,16 @@ UpdateNetworkInstanceInfra.prepareDBRequest(execution) ]]> - + + http-connector ${URN_mso_adapters_db_endpoint} ${UPDNETI_updateDBRequest} - #{BasicAuthHeaderValueDB} application/soap+xml @@ -250,28 +249,27 @@ UpdateNetworkInstanceInfra.prepareDBRequest(execution) ${response} ${statusCode} - http-connector SequenceFlow_37 SequenceFlow_27 - + - - - - - - - - + + + + + + + + SequenceFlow_29 SequenceFlow_17 - + SequenceFlow_17 @@ -283,12 +281,12 @@ UpdateNetworkInstanceInfra.prepareDBRequest(execution) def UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra() UpdateNetworkInstanceInfra.processJavaException(execution)]]> - + SequenceFlow_10 - + - + SequenceFlow_14 @@ -301,7 +299,7 @@ def UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra() UpdateNetworkInstanceInfra.preProcessRequest(execution) ]]> - + SequenceFlow_24 SequenceFlow_32 @@ -309,7 +307,7 @@ UpdateNetworkInstanceInfra.preProcessRequest(execution) def UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra() UpdateNetworkInstanceInfra.callRESTQueryAAICloudRegion(execution)]]> - + siFoundYes SequenceFlow_24 @@ -317,19 +315,19 @@ UpdateNetworkInstanceInfra.callRESTQueryAAICloudRegion(execution)]]> - + SequenceFlow_30 - + siFoundNo SequenceFlow_30 - - + SequenceFlow_3 siFoundYes @@ -338,21 +336,21 @@ exceptionUtil.buildWorkflowException(execution, 404, "Service Instance Not Found - - + + - - - - - - - + + + + + + + SequenceFlow_28 SequenceFlow_3 - + SequenceFlow_7 SequenceFlow_28 @@ -360,7 +358,7 @@ exceptionUtil.buildWorkflowException(execution, 404, "Service Instance Not Found def UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra() UpdateNetworkInstanceInfra.sendSyncResponse(execution)]]> - + SequenceFlow_59 SequenceFlow_13 @@ -368,10 +366,11 @@ UpdateNetworkInstanceInfra.sendSyncResponse(execution)]]> def UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra() UpdateNetworkInstanceInfra.validateUpdateNetworkResponse(execution)]]> - + + http-connector ${UPDNETI_updateNetworkRequest} ${URN_mso_adapters_network_rest_endpoint}/${UPDNETI_networkId} @@ -385,13 +384,12 @@ UpdateNetworkInstanceInfra.validateUpdateNetworkResponse(execution)]]>${statusCode} ${response} - http-connector SequenceFlow_61 SequenceFlow_59 - + SequenceFlow_2 SequenceFlow_61 @@ -400,7 +398,7 @@ def UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra() UpdateNetworkInstanceInfra.prepareUpdateNetworkRequest(execution) ]]> - + SequenceFlow_38 SequenceFlow_2 @@ -408,7 +406,7 @@ UpdateNetworkInstanceInfra.prepareUpdateNetworkRequest(execution) def UpdateNetworkInstanceInfra = new UpdateNetworkInstanceInfra() UpdateNetworkInstanceInfra.callRESTQueryAAINetworkTableRef(execution)]]> - + sdncTopoYes_SequenceFlow SequenceFlow_6 @@ -416,7 +414,7 @@ UpdateNetworkInstanceInfra.callRESTQueryAAINetworkTableRef(execution)]]> - + SequenceFlow_6 SequenceFlow_15 @@ -424,7 +422,7 @@ UpdateNetworkInstanceInfra.callRESTReQueryAAINetworkId(execution)]]> - + SequenceFlow_15 SequenceFlow_38 @@ -432,585 +430,585 @@ UpdateNetworkInstanceInfra.callRESTQueryAAINetworkVpnBinding(execution)]]> - - + + - - + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - - - + + + - + - + - + - + - + - + - + - + - + - - - - + + + + - + - - + + - + - - + + - - + + - + - + - - - - + + + + - + - + - + - - + + - + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - + - + - + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - + - - + + - + - - + + - + - + - - + + - + - + - + - - + + - + - - - + + + - + - + - - + + - + - + - + - + - + - - + + - + - - + + - + - + - + - - - - + + + + - + - - - - + + + + - + - + - + - - + + - + - - + + - + - + - + - - + + - + - + - + - - + + - + - - + + - + - + - + - - + + - + - + - - - - + + + + - + - + - - - + + + - + - + - + - - - - + + + + - + - - + + - + - - - - + + + + - + - - + + - + - - - - + + + + - + - + - + - + - + - + - + - - + + - + - - + + - + - + - + - + - - - - + + + + - + - - - - + + + + - + - + - + - + - - - + + + - + - - + + - + - - + + - + - - + + - + - + - - + + - + - + - - - - + + + + - + - + \ No newline at end of file diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateVfModuleVolumeInfraV1.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateVfModuleVolumeInfraV1.bpmn index 75b88b2e8d..96c0681c48 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateVfModuleVolumeInfraV1.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateVfModuleVolumeInfraV1.bpmn @@ -26,7 +26,6 @@ ${UPDVfModVol_updateInfraRequest} - #{BasicAuthHeaderValueDB} aapplication/soap+xml diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateNetworkInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateNetworkInstance.bpmn index 59f82013b1..ecd23f0ca9 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateNetworkInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateNetworkInstance.bpmn @@ -297,10 +297,9 @@ WorkflowException SequenceFlow_59 - + - isSdncRpc2No_SequenceFlow2 - SequenceFlow_1jia57e + SequenceFlow_13 SequenceFlow_35 siFoundNo SequenceFlow_30 - @@ -454,7 +453,7 @@ DoCreateNetworkInstance.prepareRpcSDNCActivateRequest(execution)]]> - + @@ -500,14 +499,14 @@ DoCreateNetworkInstance.validateRpcSDNCActivateResponse(execution)]]> - SequenceFlow_13 + SequenceFlow_1ipz2ze isSdncRpc2Yes_SequenceFlow2 isSdncRpc2No_SequenceFlow2 - + isSdncRpc1Yes_SequenceFlow1 SequenceFlow_0j8bxnb @@ -524,13 +523,14 @@ DoCreateNetworkInstance.prepareRpcSDNCRequest(execution) - SequenceFlow_1ipz2ze + SequenceFlow_1jia57e + isSdncRpc2No_SequenceFlow2 SequenceFlow_1s8b1m1 - + isNetworkActiveYes_SequenceFlow SequenceFlow_18ylufb @@ -730,16 +730,16 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]> - + - + - - + + - + @@ -865,11 +865,9 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]> - - - + - + @@ -1006,77 +1004,73 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]> - + - + - + - + - - + + - + - - - - + + - + - - - - + + - + - - + + - + - - + + - + - + - + - + - - - + + + - + - + - + @@ -1160,25 +1154,24 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]> - + - + - - - - + + - + - - + + + - + @@ -1188,9 +1181,9 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]> - + - + @@ -1206,16 +1199,16 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]> - - - - + + + + - + - + @@ -1231,10 +1224,12 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]> - - + + + + - + @@ -1382,4 +1377,4 @@ DoCreateNetworkInstance.postProcessResponse(execution)]]> - \ No newline at end of file + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstance.bpmn index 302620fdaf..a770c8c11a 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstance.bpmn @@ -1,390 +1,390 @@ - - - - - SequenceFlow_1 - - - - SequenceFlow_2 - SequenceFlow_3 - - - - - SequenceFlow_1 - SequenceFlow_2 - - - - - SequenceFlow_156ih25 - SequenceFlow_14 - - - - 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 - - - - - SequenceFlow_0eumzpf - SequenceFlow_1xzgv5k - - - - - - SequenceFlow_1dd86x8 - SequenceFlow_156ih25 - SequenceFlow_00v4npo - - - - SequenceFlow_00v4npo - - - - - - SequenceFlow_4 - SequenceFlow_1w01tqs - - - - - SequenceFlow_129ih1g - SequenceFlow_1dd86x8 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + SequenceFlow_1 + + + + SequenceFlow_2 + SequenceFlow_3 + + + + + SequenceFlow_1 + SequenceFlow_2 + + + + + SequenceFlow_156ih25 + SequenceFlow_14 + + + + 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 + + + + + SequenceFlow_0eumzpf + SequenceFlow_1xzgv5k + + + + + + SequenceFlow_1dd86x8 + SequenceFlow_156ih25 + SequenceFlow_00v4npo + + + + SequenceFlow_00v4npo + + + + + + SequenceFlow_4 + SequenceFlow_1w01tqs + + + + + SequenceFlow_129ih1g + SequenceFlow_1dd86x8 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstanceRollback.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstanceRollback.bpmn index e73c79d953..80ace28ae7 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstanceRollback.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateServiceInstanceRollback.bpmn @@ -1,338 +1,338 @@ - - - - - SequenceFlow_1 - - - - SequenceFlow_1 - SequenceFlow_2 - - - - 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 - - - - - SequenceFlow_2 - SequenceFlow_06aasqh - SequenceFlow_1rzlaoy - - - SequenceFlow_05wu9i7 - SequenceFlow_1n7wade - SequenceFlow_1rzlaoy - SequenceFlow_01l4ssl - - - - - - - - - - SequenceFlow_1ch4xrf - - - - SequenceFlow_1ch4xrf - SequenceFlow_1pjk2ff - - - - SequenceFlow_1pjk2ff - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + SequenceFlow_1 + + + + SequenceFlow_1 + SequenceFlow_2 + + + + 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 + + + + + SequenceFlow_2 + SequenceFlow_06aasqh + SequenceFlow_1rzlaoy + + + SequenceFlow_05wu9i7 + SequenceFlow_1n7wade + SequenceFlow_1rzlaoy + SequenceFlow_01l4ssl + + + + + + + + + + SequenceFlow_1ch4xrf + + + + SequenceFlow_1ch4xrf + SequenceFlow_1pjk2ff + + + + SequenceFlow_1pjk2ff + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModule.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModule.bpmn index 62eb91810f..fecb720666 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModule.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModule.bpmn @@ -1,1006 +1,1167 @@ - - - - - SequenceFlow_1 - - - - SequenceFlow_15 - - - - - SequenceFlow_15 - SequenceFlow_11 - SequenceFlow_40 - - - - - - - - - - - - - - SequenceFlow_43 - SequenceFlow_17 - - - - SequenceFlow_17 - SequenceFlow_19 - SequenceFlow_21 - - - - - - - - - - - - - - - SequenceFlow_19 - SequenceFlow_35 - - - - SequenceFlow_11 - SequenceFlow_21 - SequenceFlow_35 - SequenceFlow_6 - - - - - - - - - - - - - SequenceFlow_18 - SequenceFlow_20 - - - SequenceFlow_20 - SequenceFlow_22 - - - - SequenceFlow_8 - SequenceFlow_18 - - - - - - SequenceFlow_22 - SequenceFlow_23 - - - - - - - - - - - - - SequenceFlow_23 - SequenceFlow_24 - - - - - - SequenceFlow_24 - SequenceFlow_31 - - - - - - - - - - SequenceFlow_5 - SequenceFlow_10 - - - SequenceFlow_1avfxsz - SequenceFlow_5 - - - - SequenceFlow_10 - SequenceFlow_12 - - - - - - - - - - - - - SequenceFlow_12 - SequenceFlow_13 - - - SequenceFlow_13 - SequenceFlow_14 - - - - SequenceFlow_14 - SequenceFlow_28 - SequenceFlow_30 - - - - - - - - - - - - SequenceFlow_0363dz7 - - - - SequenceFlow_8 - - - - - SequenceFlow_28 - SequenceFlow_3 - - - - - - - - - - SequenceFlow_3 - SequenceFlow_29 - - - - - SequenceFlow_30 - SequenceFlow_29 - SequenceFlow_16 - - - - SequenceFlow_31 - SequenceFlow_32 - - - - - - - - - - - - SequenceFlow_32 - SequenceFlow_33 - - - SequenceFlow_33 - SequenceFlow_1ushk1d - - - - SequenceFlow_0xfanpi - SequenceFlow_0abffyj - - - - - - - SequenceFlow_41 - - - - SequenceFlow_39 - SequenceFlow_37 - SequenceFlow_41 - - - SequenceFlow_25 - SequenceFlow_27 - - - - - SequenceFlow_27 - SequenceFlow_36 - SequenceFlow_39 - - - - - - - SequenceFlow_36 - SequenceFlow_37 - - - - - - SequenceFlow_16 - SequenceFlow_7 - - - - - SequenceFlow_7 - - - - SequenceFlow_40 - SequenceFlow_43 - - - - - - - - - SequenceFlow_9 - SequenceFlow_38 - - - - - SequenceFlow_9 - - - - - SequenceFlow_38 - - - - SequenceFlow_1 - SequenceFlow_4 - - - - - SequenceFlow_4 - - - - - - - - - - - - - - - - - - - - - SequenceFlow_6 - SequenceFlow_25 - - - - SequenceFlow_1ushk1d - SequenceFlow_0ery1pk - SequenceFlow_0xfanpi - - - - - - - - - SequenceFlow_0ery1pk - SequenceFlow_0abffyj - - - - SequenceFlow_0363dz7 - SequenceFlow_0bi38s7 - SequenceFlow_1k5uku2 - - - SequenceFlow_112los9 - SequenceFlow_1k5uku2 - SequenceFlow_1avfxsz - - - - - - - - - - - SequenceFlow_0bi38s7 - SequenceFlow_1qm81ym - - - - - - - - - - - SequenceFlow_1qm81ym - SequenceFlow_112los9 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + SequenceFlow_1 + + + + SequenceFlow_15 + + + + + SequenceFlow_15 + SequenceFlow_11 + SequenceFlow_40 + + + + + + + + + + + + + + SequenceFlow_43 + SequenceFlow_17 + + + + SequenceFlow_17 + SequenceFlow_19 + SequenceFlow_21 + + + + + + + + + + + + + + + SequenceFlow_19 + SequenceFlow_35 + + + + SequenceFlow_11 + SequenceFlow_21 + SequenceFlow_35 + SequenceFlow_6 + + + + + + + + + + + + + SequenceFlow_18 + SequenceFlow_20 + + + SequenceFlow_20 + SequenceFlow_22 + + + + SequenceFlow_8 + SequenceFlow_18 + + + + + + SequenceFlow_22 + SequenceFlow_23 + + + + + + + + + + + + + SequenceFlow_23 + SequenceFlow_24 + + + + + + SequenceFlow_24 + SequenceFlow_31 + + + + + + + + + + SequenceFlow_5 + SequenceFlow_10 + + + SequenceFlow_1avfxsz + SequenceFlow_5 + + + + SequenceFlow_10 + SequenceFlow_12 + + + + + + + + + + + + + SequenceFlow_12 + SequenceFlow_13 + + + SequenceFlow_13 + SequenceFlow_14 + + + + SequenceFlow_14 + SequenceFlow_28 + SequenceFlow_30 + + + + + + + + + + + + SequenceFlow_0363dz7 + + + + SequenceFlow_8 + + + + + SequenceFlow_28 + SequenceFlow_3 + + + + + + + + + + SequenceFlow_3 + SequenceFlow_29 + + + + + SequenceFlow_30 + SequenceFlow_29 + SequenceFlow_16 + + + + SequenceFlow_31 + SequenceFlow_32 + + + + + + + + + + + + SequenceFlow_32 + SequenceFlow_33 + + + SequenceFlow_33 + SequenceFlow_1ushk1d + + + + SequenceFlow_0xfanpi + SequenceFlow_0abffyj + + + + + + + SequenceFlow_0zcfn2x + SequenceFlow_170kw7h + + + + SequenceFlow_39 + SequenceFlow_37 + SequenceFlow_0zcfn2x + SequenceFlow_0m382su + + + SequenceFlow_25 + SequenceFlow_27 + + + + + SequenceFlow_27 + SequenceFlow_36 + SequenceFlow_39 + + + + + + + SequenceFlow_36 + SequenceFlow_37 + + + + + SequenceFlow_16 + SequenceFlow_7 + + + + + SequenceFlow_7 + + + + SequenceFlow_40 + SequenceFlow_43 + + + + + + + + + SequenceFlow_9 + SequenceFlow_38 + + + + + SequenceFlow_9 + + + + + SequenceFlow_38 + + + + SequenceFlow_1 + SequenceFlow_4 + + + + + SequenceFlow_1f53tby + SequenceFlow_0270n5c + + + + + + + + + + + + + + + + + + + + + SequenceFlow_6 + SequenceFlow_25 + + + + SequenceFlow_1ushk1d + SequenceFlow_0ery1pk + SequenceFlow_0xfanpi + + + + + + + + + SequenceFlow_0ery1pk + SequenceFlow_0abffyj + + + + SequenceFlow_0363dz7 + SequenceFlow_0bi38s7 + SequenceFlow_1k5uku2 + + + SequenceFlow_112los9 + SequenceFlow_1k5uku2 + SequenceFlow_1avfxsz + + + + + + + + + + + SequenceFlow_0bi38s7 + SequenceFlow_1qm81ym + + + + + + + + + + + SequenceFlow_1qm81ym + SequenceFlow_112los9 + + + + + + + + + SequenceFlow_0d00zqi + SequenceFlow_0g270u0 + + + + + + + + + + + + + SequenceFlow_0g270u0 + SequenceFlow_1yrlvgb + + + SequenceFlow_1yrlvgb + SequenceFlow_170kw7h + + + + + + + + + + + + + SequenceFlow_0m382su + SequenceFlow_0d00zqi + + + + SequenceFlow_4 + SequenceFlow_0270n5c + SequenceFlow_05og7iw + + + + + + + + + + + + + + + + SequenceFlow_05og7iw + SequenceFlow_1f53tby + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 0444b69633..7a7f369e42 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModuleRollback.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModuleRollback.bpmn @@ -17,8 +17,7 @@ def dcvfmr = new DoCreateVfModuleRollback() dcvfmr.preProcessRequest(execution)]]> - + @@ -40,8 +39,7 @@ dcvfmr.preProcessRequest(execution)]]> SequenceFlow_10 SequenceFlow_15 - + SequenceFlow_1p0v6yk SequenceFlow_16 - + @@ -67,8 +64,7 @@ dcvfmr.prepVNFAdapterRequest(execution)]]> - + SequenceFlow_13 SequenceFlow_14 - + @@ -107,8 +102,7 @@ dcvfmr.prepUpdateAAIVfModule(execution)]]> - + SequenceFlow_19 SequenceFlow_32 - + @@ -140,8 +133,7 @@ dcvfmr.prepSDNCAdapterRequest(execution)]]> - + @@ -156,8 +148,7 @@ dcvfmr.prepSDNCAdapterRequest(execution)]]> SequenceFlow_35 SequenceFlow_21 - + SequenceFlow_24 SequenceFlow_34 - \ No newline at end of file + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnf.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnf.bpmn index 91fca3d213..5e88527676 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnf.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnf.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_1 @@ -8,8 +8,8 @@ SequenceFlow_1 SequenceFlow_2 - @@ -87,8 +87,8 @@ exceptionUtil.buildWorkflowException(execution, 5000, "Generic Vnf Already Exist vnfExistNo SequenceFlow_11 - @@ -102,7 +102,7 @@ createVnf.prepareCreateGenericVnf(execution)]]> SequenceFlow_11 - SequenceFlow_1acnwwu + SequenceFlow_0seif8n @@ -133,12 +133,11 @@ exceptionUtil.processJavaException(execution)]]> - SequenceFlow_0ttqcwx SequenceFlow_1q6udwm - @@ -157,18 +156,18 @@ createVnf.preProcessSDNCAssignRequest(execution)]]> SequenceFlow_15knw0q SequenceFlow_0c5h00o - SequenceFlow_0c5h00o SequenceFlow_1lalmvp - @@ -187,22 +186,31 @@ createVnf.preProcessSDNCActivateRequest(execution)]]> SequenceFlow_0eb41vb SequenceFlow_15z3gpq - - SequenceFlow_1acnwwu + SequenceFlow_1gc18ih SequenceFlow_0ttqcwx SequenceFlow_0ay5l4b - + + + + + SequenceFlow_0seif8n + SequenceFlow_1gc18ih + + @@ -420,13 +428,6 @@ createVnfInfra.validateSDNCResponse(execution, response, "activate")]]> - - - - - - - @@ -446,30 +447,46 @@ createVnfInfra.validateSDNCResponse(execution, response, "activate")]]> - + - + - - + + - + - - - + + - + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn index 58a88c2b56..433957572d 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn @@ -29,12 +29,16 @@ doCreateVnfAndModules.preProcessRequest(execution)]]> - + + + + + SequenceFlow_1hf7k7q - SequenceFlow_02oe9wx + SequenceFlow_1ixcnb6 @@ -56,9 +60,13 @@ doCreateVnfAndModules.preProcessRequest(execution)]]> - + + + + + SequenceFlow_1lh21yl SequenceFlow_1llbx0k @@ -81,8 +89,8 @@ doCreateVnfAndModules.validateAddOnModule(execution)]]> - SequenceFlow_02oe9wx SequenceFlow_07gl6gw + SequenceFlow_1a6wyuu SequenceFlow_132bohl SequenceFlow_0jz6bqn @@ -104,6 +112,9 @@ doCreateVnfAndModules.validateAddOnModule(execution)]]> + + + SequenceFlow_1xd3ri5 SequenceFlow_08i3uo6 @@ -165,7 +176,6 @@ doCreateVnfAndModules.queryCatalogDB(execution)]]> SequenceFlow_1lh21yl - SequenceFlow_1vrogpr @@ -174,6 +184,15 @@ doCreateVnfAndModules.queryCatalogDB(execution)]]> def doCreateVnfAndModules = new DoCreateVnfAndModules() doCreateVnfAndModules.finisthProcessingInitialCountDeployment(execution)]]> + + + + SequenceFlow_1ixcnb6 + SequenceFlow_1a6wyuu + + @@ -204,44 +223,44 @@ doCreateVnfAndModules.finisthProcessingInitialCountDeployment(execution)]]> - + - + - + - + - - + + - + - + - + - - - - + + + + - + - + @@ -254,51 +273,51 @@ doCreateVnfAndModules.finisthProcessingInitialCountDeployment(execution)]]> - + - + - - - - + + + + - + - - - + + + - + - - - + + + - + - - - - + + + + - + - - - + + + - + @@ -319,33 +338,41 @@ doCreateVnfAndModules.finisthProcessingInitialCountDeployment(execution)]]> - + - - + + - + - + + + + + + + + + + + - - - + - + - - - + + + - + - - + + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModulesRollback.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModulesRollback.bpmn new file mode 100644 index 0000000000..2fba166dc4 --- /dev/null +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVnfAndModulesRollback.bpmn @@ -0,0 +1,282 @@ + + + + + + SequenceFlow_12 + + + + SequenceFlow_22 + + + + SequenceFlow_12 + SequenceFlow_22 + + + + + + SequenceFlow_23 + + + + SequenceFlow_23 + + + + SequenceFlow_1537b7m + + + SequenceFlow_0bmsi5h + SequenceFlow_1srw52v + SequenceFlow_1r6wyy6 + SequenceFlow_0v85t87 + + + SequenceFlow_1r6wyy6 + SequenceFlow_1kr0r4a + SequenceFlow_1yas9ol + + + SequenceFlow_04yd2yr + SequenceFlow_1yas9ol + + + + SequenceFlow_1537b7m + SequenceFlow_0bmsi5h + + + + + + SequenceFlow_0v85t87 + SequenceFlow_1ycq005 + + + + + + + + + + + SequenceFlow_1ycq005 + SequenceFlow_181hb2a + + + + 0}]]> + + + + + + + + + + + + + SequenceFlow_1kr0r4a + SequenceFlow_04yd2yr + + + + SequenceFlow_181hb2a + SequenceFlow_1srw52v + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteNetworkInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteNetworkInstance.bpmn index 84b6d68149..3c581865cc 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteNetworkInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteNetworkInstance.bpmn @@ -65,7 +65,6 @@ validateSDNCResponse.validateSDNCResponse(execution) SequenceFlow_1yvnovn - SequenceFlow_1loz6nk SequenceFlow_1nl99y6 SequenceFlow_1yvnovn - SequenceFlow_0jb7rws SequenceFlow_1wif0e5 SequenceFlow_147vc14 - SequenceFlow_1loz6nk - SequenceFlow_0tiz0kk SequenceFlow_0jb7rws SequenceFlow_1raa09h - + SequenceFlow_1suj1nc SequenceFlow_1raa09h + SequenceFlow_0jb7rws SequenceFlow_1nl99y6 @@ -142,6 +139,9 @@ DoDeleteNetworkInstance.prepareRollbackData(execution)]]> def DoDeleteNetworkInstance = new DoDeleteNetworkInstance() DoDeleteNetworkInstance.setExceptionFlag(execution)]]> + Rollback Not Needed for Delete. + + isRelationshipExistNo_SequenceFlow @@ -858,13 +858,6 @@ DoDeleteNetworkInstance.validateRpcSDNCDeactivateResponse(execution)]]> - - - - - - - @@ -874,10 +867,10 @@ DoDeleteNetworkInstance.validateRpcSDNCDeactivateResponse(execution)]]> - - + + - + @@ -928,6 +921,13 @@ DoDeleteNetworkInstance.validateRpcSDNCDeactivateResponse(execution)]]> + + + + + + + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteNetworkInstanceRollback.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteNetworkInstanceRollback.bpmn index 17f5ce4a40..2c5fa5ae4b 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteNetworkInstanceRollback.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteNetworkInstanceRollback.bpmn @@ -84,7 +84,7 @@ DoDeleteNetworkInstanceRollback.processJavaException(execution)]]> ${DELNWKIR_rollbackNetworkRequest} - CRENWKIR_urlRollbackPoNetwork + ${URN_mso_adapters_network_rest_endpoint} #{BasicAuthHeaderValuePO} diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteServiceInstance.bpmn index c40f73d059..9d21cc8301 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteServiceInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteServiceInstance.bpmn @@ -1,332 +1,332 @@ - - - - - SequenceFlow_0jfgn05 - - - SequenceFlow_0jfgn05 - SequenceFlow_1jqc16k - - - - SequenceFlow_1wyvxwi - - - - - - - - - - - - - SequenceFlow_1w8ao21 - SequenceFlow_0riudmc - SequenceFlow_05wu9i7 - - - - - - - - - - - - - SequenceFlow_0rtflal - SequenceFlow_0k28xib - - - SequenceFlow_0k28xib - SequenceFlow_1w8ao21 - - - - - 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 - - - - - - SequenceFlow_05wu9i7 - SequenceFlow_1wyvxwi - - - - - - SequenceFlow_0u33vy6 - - - - SequenceFlow_0hevfee - - - SequenceFlow_0u33vy6 - SequenceFlow_0hevfee - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + SequenceFlow_0jfgn05 + + + SequenceFlow_0jfgn05 + SequenceFlow_1jqc16k + + + + SequenceFlow_1wyvxwi + + + + + + + + + + + + + SequenceFlow_1w8ao21 + SequenceFlow_0riudmc + SequenceFlow_05wu9i7 + + + + + + + + + + + + + SequenceFlow_0rtflal + SequenceFlow_0k28xib + + + SequenceFlow_0k28xib + SequenceFlow_1w8ao21 + + + + + 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 + + + + + + SequenceFlow_05wu9i7 + SequenceFlow_1wyvxwi + + + + + + SequenceFlow_0u33vy6 + + + + SequenceFlow_0hevfee + + + SequenceFlow_0u33vy6 + SequenceFlow_0hevfee + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVnfAndModules.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVnfAndModules.bpmn new file mode 100644 index 0000000000..127030d789 --- /dev/null +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteVnfAndModules.bpmn @@ -0,0 +1,263 @@ + + + + + SequenceFlow_1 + + + + SequenceFlow_1 + SequenceFlow_08nd69s + + + + + SequenceFlow_19 + + + SequenceFlow_18 + + + + + SequenceFlow_18 + SequenceFlow_19 + + + + + + SequenceFlow_1uqlr6b + + + + SequenceFlow_0t4yszi + SequenceFlow_0lu7b1v + SequenceFlow_1qrkdn3 + SequenceFlow_1936oc0 + + + + + + + + SequenceFlow_05ujwz8 + SequenceFlow_1uqlr6b + + + + + + + + + + + + + + + + + + + SequenceFlow_1qoor0l + SequenceFlow_1p4ycii + + + SequenceFlow_1936oc0 + SequenceFlow_05ujwz8 + + + + + + + + SequenceFlow_08nd69s + SequenceFlow_0lu7b1v + + + + SequenceFlow_1qrkdn3 + SequenceFlow_1qoor0l + + + + + + SequenceFlow_1p4ycii + SequenceFlow_0t4yszi + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateNetworkInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateNetworkInstance.bpmn new file mode 100644 index 0000000000..45e1a49f8a --- /dev/null +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateNetworkInstance.bpmn @@ -0,0 +1,847 @@ + + + + + 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_46 + SequenceFlow_29 + + + + + + SequenceFlow_053re4q + isRollbackOn_YesNetwork_SequenceFlow + isRollbackOn_NoNetwork_SequenceFlow + + + + + + + SequenceFlow_23 + + + + + isRollbackOn_YesNetwork_SequenceFlow + isPONR_Yes_SequenceFlow + isPONR_No_SequenceFlow + + + + + + + SequenceFlow_0nrc66n + sdncOk_Yeso_ExclusiveGateway + sdncOk_No_ExclusiveGateway + + + + + + + sdncOk_Yeso_ExclusiveGateway + SequenceFlow_53 + + + + + SequenceFlow_04rdjfi + + + SequenceFlow_53 + sdncOk_No_ExclusiveGateway + SequenceFlow_0srdlf3 + SequenceFlow_47 + + + + SequenceFlow_47 + SequenceFlow_0qr4es6 + + + + + + + + + + + + + + + + + + + SequenceFlow_0qr4es6 + + + SequenceFlow_0ze5k6c + SequenceFlow_04rdjfi + + + + + + SequenceFlow_0nrc66n + SequenceFlow_0srdlf3 + + + + + + + SequenceFlow_23 + SequenceFlow_053re4q + + + + + isPONR_Yes_SequenceFlow + isRollbackOn_NoNetwork_SequenceFlow + isPONR_No_SequenceFlow + SequenceFlow_0ze5k6c + + + Note: Rollback is not needed for UpdateNetwork, + + + + + SequenceFlow_13 + SequenceFlow_35 + + + + + SequenceFlow_35 + SequenceFlow_46 + + + + + SequenceFlow_29 + + + + 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_7 + SequenceFlow_3 + + + + SequenceFlow_59 + SequenceFlow_13 + + + + + + + + ${UPDNETI_updateNetworkRequest} + ${URN_mso_adapters_network_rest_endpoint}/${UPDNETI_networkId} + + + #{BasicAuthHeaderValuePO} + application/xml + + + PUT + ${statusCode} + ${response} + + http-connector + + + SequenceFlow_61 + SequenceFlow_59 + + + + SequenceFlow_2 + SequenceFlow_61 + + + + + SequenceFlow_38 + SequenceFlow_2 + + + + + sdncTopoYes_SequenceFlow + SequenceFlow_6 + + + + + SequenceFlow_6 + SequenceFlow_15 + + + + + SequenceFlow_15 + SequenceFlow_38 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateNetworkInstanceRollback.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateNetworkInstanceRollback.bpmn new file mode 100644 index 0000000000..6fd0565f3a --- /dev/null +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateNetworkInstanceRollback.bpmn @@ -0,0 +1,373 @@ + + + + + SequenceFlow_1krl2dg + + + SequenceFlow_1krl2dg + SequenceFlow_0u41iz2 + + + + + + + + + ${UPDNETIR_rollbackNetworkRequest} + ${URN_mso_adapters_network_rest_endpoint} + + + #{BasicAuthHeaderValuePO} + application/xml + + + PUT + ${statusCode} + ${response} + + http-connector + + + SequenceFlow_0e1uixp + SequenceFlow_17o4w67 + + + SequenceFlow_0u41iz2 + SequenceFlow_0e1uixp + SequenceFlow_1lteduj + + + + + + + + + + + + SequenceFlow_101y57s + SequenceFlow_0790olb + + + SequenceFlow_0virkpu + SequenceFlow_101y57s + SequenceFlow_0mw0dgd + + + SequenceFlow_0qc4v9t + SequenceFlow_0el8yzs + SequenceFlow_0yto4gz + + + + SequenceFlow_1lteduj + SequenceFlow_17o4w67 + SequenceFlow_0virkpu + SequenceFlow_0qc4v9t + + + + + + + + + + + + + + + SequenceFlow_0yto4gz + + + + + + SequenceFlow_0xktw7v + SequenceFlow_0soe5t3 + + + + SequenceFlow_0xktw7v + + + + SequenceFlow_0soe5t3 + + + + + + SequenceFlow_0790olb + SequenceFlow_0mw0dgd + SequenceFlow_0el8yzs + + + + + + SequenceFlow_07kf49j + SequenceFlow_01syg1x + + + + SequenceFlow_07kf49j + + + + SequenceFlow_01syg1x + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/urn.properties b/bpmn/MSOInfrastructureBPMN/src/main/resources/urn.properties index b3fee32765..ccbeaa6e38 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/urn.properties +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/urn.properties @@ -1,29 +1,29 @@ -### -# ============LICENSE_START======================================================= -# ECOMP MSO -# ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END========================================================= -### - -# URN mappings for this project. - -# TODO: Remove all the non-URN stuff that's in here. -# TODO: Implement a real URN mapping capability. - -#AAIEndPoint= http://localhost:8080/SoapUIMocks -AAIEndPoint= http://localhost:28090/ -SDNCEndPoint=http://localhost:28090/SDNCAdapter/ -msoRollback = true +### +# ============LICENSE_START======================================================= +# ECOMP MSO +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END========================================================= +### + +# URN mappings for this project. + +# TODO: Remove all the non-URN stuff that's in here. +# TODO: Implement a real URN mapping capability. + +#AAIEndPoint= http://localhost:8080/SoapUIMocks +AAIEndPoint= http://localhost:28090/ +SDNCEndPoint=http://localhost:28090/SDNCAdapter/ +msoRollback = true -- cgit 1.2.3-korg