From 62cd6aaaf74aa91ee0037c0e155c8e7284f07567 Mon Sep 17 00:00:00 2001 From: Arthur Martella Date: Fri, 8 Sep 2017 13:27:46 -0400 Subject: 1710 Rebase - Second Attempt This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit: 54483fc6606ddb1591a2e9da61bff8712325f924 Wed Sep 6 18:12:56 2017 -0400 Rebasing was done on a branch on top of this commit in so/master in ONAP: 93fbdfbe46104f8859d4754040f979cb7997c157 Thu Sep 7 16:42:59 2017 +0000 Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59 Issue-id: SO-107 Signed-off-by: Arthur Martella --- .../subprocess/BuildingBlock/DecomposeService.bpmn | 142 ++++++ .../subprocess/BuildingBlock/ManualHandling.bpmn | 135 +++++ .../subprocess/BuildingBlock/RainyDayHandler.bpmn | 186 +++++++ .../resources/subprocess/CompleteMsoProcess.bpmn | 560 ++++++++------------- .../main/resources/subprocess/FalloutHandler.bpmn | 6 +- .../main/resources/subprocess/SDNCAdapterV1.bpmn | 131 +++-- 6 files changed, 762 insertions(+), 398 deletions(-) create mode 100644 bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/DecomposeService.bpmn create mode 100644 bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/ManualHandling.bpmn create mode 100644 bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/RainyDayHandler.bpmn (limited to 'bpmn/MSOCommonBPMN/src/main/resources/subprocess') diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/DecomposeService.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/DecomposeService.bpmn new file mode 100644 index 0000000000..8a89b43cde --- /dev/null +++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/DecomposeService.bpmn @@ -0,0 +1,142 @@ + + + + + SequenceFlow_1 + + + + SequenceFlow_0tj2l1j + + + + SequenceFlow_0tgrn11 + + + + SequenceFlow_0g4aus9 + + + + SequenceFlow_0tgrn11 + SequenceFlow_0g4aus9 + + + + + + SequenceFlow_12vj619 + SequenceFlow_0tj2l1j + + + + + SequenceFlow_1 + SequenceFlow_0yxffj2 + + + + + + SequenceFlow_0yxffj2 + SequenceFlow_12vj619 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/ManualHandling.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/ManualHandling.bpmn new file mode 100644 index 0000000000..2f30864c39 --- /dev/null +++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/ManualHandling.bpmn @@ -0,0 +1,135 @@ + + + + + SequenceFlow_0jav6cu + + + SequenceFlow_192yimz + + + + SequenceFlow_0tgrn11 + + + + SequenceFlow_0g4aus9 + + + + SequenceFlow_0tgrn11 + SequenceFlow_0g4aus9 + + + + + + + + SequenceFlow_0jav6cu + SequenceFlow_0zgg47r + + + + + + + + + + + + + + + + SequenceFlow_0zgg47r + SequenceFlow_192yimz + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/RainyDayHandler.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/RainyDayHandler.bpmn new file mode 100644 index 0000000000..2638d85a8a --- /dev/null +++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/RainyDayHandler.bpmn @@ -0,0 +1,186 @@ + + + + + SequenceFlow_1 + + + + SequenceFlow_0uwsjoh + SequenceFlow_1f0bjoy + + + + SequenceFlow_0tgrn11 + + + + SequenceFlow_0g4aus9 + + + + SequenceFlow_0tgrn11 + SequenceFlow_0g4aus9 + + + + + + SequenceFlow_1 + SequenceFlow_0yxffj2 + + + + + + SequenceFlow_0yxffj2 + SequenceFlow_12vj619 + + + + SequenceFlow_12vj619 + SequenceFlow_0uwsjoh + SequenceFlow_0navei4 + + + + + + + + + + + + + + + + + + + + + SequenceFlow_0navei4 + SequenceFlow_1f0bjoy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CompleteMsoProcess.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CompleteMsoProcess.bpmn index cd977e3ae6..2629ea7437 100644 --- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CompleteMsoProcess.bpmn +++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CompleteMsoProcess.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_18 @@ -10,25 +10,12 @@ preProcessRequestData.preProcessRequest(execution) ]]> - + SequenceFlow_18 - - SequenceFlow_2 - SequenceFlow_45 - SequenceFlow_46 - - - - - SequenceFlow_45 - SequenceFlow_40 - if_notifcationURLExists - - @@ -47,60 +34,23 @@ preProcessRequestData.preProcessRequest(execution) - - SequenceFlow_7 - SequenceFlow_24 - SequenceFlow_39 - - SequenceFlow_9 - - SequenceFlow_72 + + SequenceFlow_127i45q SequenceFlow_10 - - SequenceFlow_13 - - - - SequenceFlow_46 - SequenceFlow_72 - SequenceFlow_81 - - - - - - - SequenceFlow_25 - SequenceFlow_1q7eer1 - SequenceFlow_13 - Build Error Message @@@@" -import org.openecomp.mso.bpmn.common.scripts.* -def buildDataErrorMessage = new CompleteMsoProcess() -buildDataErrorMessage.buildDataError(execution, "Complete --Update DB status to SUCCESS-- Failed")]]> - - - - SequenceFlow_81 - SequenceFlow_49 - - - - + - ${URN_mso_adapters_db_endpoint} + ${URN_mso_openecomp_adapters_db_endpoint} @@ -119,10 +69,6 @@ completeMsoProcess.updateDBStatusToSuccessPayload(execution)]]> SequenceFlow_6 - - SequenceFlow_1q7eer1 - - SequenceFlow_1 SequenceFlow_0mipf25 @@ -134,78 +80,20 @@ def buildDataErrorMessage = new CompleteMsoProcess() buildDataErrorMessage.buildDataError(execution, "Complete MSO -- Update DB status to SUCCESS -- Failed")]]> - - SequenceFlow_23 - SequenceFlow_24 - SequenceFlow_25 - - - - - SequenceFlow_6 - SequenceFlow_7 SequenceFlow_1 + SequenceFlow_03z8rch - - - - - - - - ${URN_mso_adapters_db_endpoint} - - - - application/soap+xml - #{BasicAuthHeaderValueDB} - - - POST - - ${statusCode} - - soap-http-connector - - - SequenceFlow_49 - SequenceFlow_23 - - SequenceFlow_0mipf25 - - SequenceFlow_40 - SequenceFlow_13qdn1s - SequenceFlow_32 - - - - SequenceFlow_32 - SequenceFlow_39 - SequenceFlow_33 - - - - SequenceFlow_33 - SequenceFlow_17 - Complete MSO Process Done SUCCESSFULLY" -import org.openecomp.mso.bpmn.common.scripts.* -def postProcessResponseData = new CompleteMsoProcess() -postProcessResponseData.postProcessResponse(execution) -println "CompleteMsoProcess Response -->" + "\n" + execution.getVariable("CompletionHandlerResponse")]]> - - - SequenceFlow_17 + SequenceFlow_1pzb94j - @@ -214,13 +102,66 @@ println "CompleteMsoProcess Response -->" + "\n" + execution.getVariable("Comple - if_notifcationURLExists + SequenceFlow_81 SequenceFlow_13qdn1s - - - + + + SequenceFlow_067veaf + SequenceFlow_81 + SequenceFlow_1dptl35 + + + SequenceFlow_1dptl35 + SequenceFlow_13qdn1s + SequenceFlow_1hpvwyt + + + + + + SequenceFlow_2 + SequenceFlow_067veaf + SequenceFlow_0xe5zck + + + SequenceFlow_12he9a1 + SequenceFlow_1hpvwyt + SequenceFlow_1g8ig3h + + + + + SequenceFlow_0xe5zck + SequenceFlow_127i45q + SequenceFlow_1ffkc0n + + + + + + + SequenceFlow_03z8rch + SequenceFlow_1ffkc0n + SequenceFlow_12he9a1 + + + + + + + + + SequenceFlow_1g8ig3h + SequenceFlow_1pzb94j + Complete MSO Process Done SUCCESSFULLY" +import org.openecomp.mso.bpmn.common.scripts.* +def postProcessResponseData = new CompleteMsoProcess() +postProcessResponseData.postProcessResponse(execution) +println "CompleteMsoProcess Response -->" + "\n" + execution.getVariable("CompletionHandlerResponse")]]> + + @@ -228,325 +169,254 @@ println "CompleteMsoProcess Response -->" + "\n" + execution.getVariable("Comple - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - + - - - + + + - + - - + + - + - - - - - + + - - - - - + + - - - - + + - + - - - - - - + + + - + - - - - - - - - - - + + - + - - - - - - - + + + - + - - - + + - + - - - - - + + + + + + + - + - - - - + + + - + - - - - - + + - + - - + + - + - - - - - + + - - - + + + - + - - - - + + + + - + - - - - - - - - + + - - - + + + - + - - - + + + - + - - + + + + + - - + + - + - - - + + + - + - - - - + + + + + - + - - - - - - + + - + - - - + + + - + - - - + + + - + - - - + + + + - + - - + + - + - - - + + + + - + - - + + + + + - + - - - + + + - + - - - - - - + + + + - + - - - - + + + + - + - - - - + + + + + - + - - - - - - - + + + + - + - - - - - - - - - - - + + + + + + - + diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/FalloutHandler.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/FalloutHandler.bpmn index 75e05cb58e..4ac34f9210 100644 --- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/FalloutHandler.bpmn +++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/FalloutHandler.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_12 @@ -133,7 +133,7 @@ falloutHandler.buildDBWorkflowException(execution, "FH_updateRequestInfraRespons - ${URN_mso_adapters_db_endpoint} + ${URN_mso_openecomp_adapters_db_endpoint} POST @@ -207,7 +207,7 @@ execution.setVariable("FH_WorkflowException", wfe)]]> - + diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/SDNCAdapterV1.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/SDNCAdapterV1.bpmn index e0fc14e933..6a4223d2ad 100644 --- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/SDNCAdapterV1.bpmn +++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/SDNCAdapterV1.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_15 @@ -129,12 +129,12 @@ sdnc.resetCallbackRequest(execution)]]> Done SequenceFlow_30 - + - Done + SequenceFlow_1w1za5m SequenceFlow_17 SequenceFlow_21 SequenceFlow_26 - + @@ -177,20 +177,12 @@ sdnc.assignError(execution)]]> SequenceFlow_27 - - SequenceFlow_21 - SequenceFlow_31 - - - - SequenceFlow_31 + SequenceFlow_21 SequenceFlow_4 SequenceFlow_23 - + @@ -210,15 +202,32 @@ sdnc.toggleSuccessIndicator(execution)]]> - + - SequenceFlow_4 + SequenceFlow_193cb6p + SequenceFlow_1em7gys + + SequenceFlow_4 + SequenceFlow_193cb6p + + + + + SequenceFlow_1em7gys + + + + Done + SequenceFlow_1w1za5m + + + @@ -243,9 +252,9 @@ sdnc.toggleSuccessIndicator(execution)]]> - + - + @@ -376,9 +385,9 @@ sdnc.toggleSuccessIndicator(execution)]]> - + - + @@ -401,16 +410,16 @@ sdnc.toggleSuccessIndicator(execution)]]> - + - + - - + + - + @@ -420,23 +429,24 @@ sdnc.toggleSuccessIndicator(execution)]]> - - + + - + - + - + - - + + + - + @@ -448,13 +458,13 @@ sdnc.toggleSuccessIndicator(execution)]]> - + - - + + - + @@ -489,18 +499,6 @@ sdnc.toggleSuccessIndicator(execution)]]> - - - - - - - - - - - - @@ -543,8 +541,41 @@ sdnc.toggleSuccessIndicator(execution)]]> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit 1.2.3-korg