From b3641c2450c642aab3e4df638a3b79d54fc09022 Mon Sep 17 00:00:00 2001 From: Yulian Han Date: Fri, 20 Apr 2018 16:30:45 +0800 Subject: move comparemodel before syncresponse updateE2E deleteE2EServiceInstance excution param type def Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f064306 Issue-ID: SO-578 Signed-off-by: Yulian Han --- .../process/UpdateCustomE2EServiceInstance.bpmn | 540 +++++++++++++---- .../subprocess/DoUpdateE2EServiceInstance.bpmn | 667 ++++++++------------- 2 files changed, 667 insertions(+), 540 deletions(-) (limited to 'bpmn/MSOInfrastructureBPMN/src/main/resources') diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateCustomE2EServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateCustomE2EServiceInstance.bpmn index 3071d1c20d..6451dc6ca0 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateCustomE2EServiceInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateCustomE2EServiceInstance.bpmn @@ -8,8 +8,8 @@ SequenceFlow_1dsbjjb SequenceFlow_1yay321 - @@ -33,7 +33,6 @@ ex.processJavaException(execution)]]> - @@ -41,8 +40,12 @@ ex.processJavaException(execution)]]> + + + + - SequenceFlow_19eilro + SequenceFlow_04qwbbf SequenceFlow_0klbpxx @@ -50,16 +53,16 @@ ex.processJavaException(execution)]]> SequenceFlow_0s2spoq - SequenceFlow_0z4faf9 - SequenceFlow_0az1n4y + SequenceFlow_14zu6wr SequenceFlow_0je30si - @@ -85,8 +88,8 @@ csi.prepareCompletionRequest(execution)]]> SequenceFlow_0n9pexp SequenceFlow_01umodj - @@ -102,22 +105,57 @@ csi.prepareFalloutRequest(execution)]]> SequenceFlow_1ysapam - SequenceFlow_0e1r62n + SequenceFlow_06o383f SequenceFlow_0n9pexp - - + + + SequenceFlow_0e1r62n + SequenceFlow_0t4nds2 + + + + + + + + ${URN_mso_openecomp_adapters_db_endpoint} + + + application/soap+xml + Basic QlBFTENsaWVudDpwYXNzd29yZDEk + + + ${CVFMI_updateServiceOperStatusRequest} + POST + ${statusCode} + ${response} + + http-connector + + + SequenceFlow_0t4nds2 + SequenceFlow_06o383f + + - SequenceFlow_1853xxi - SequenceFlow_19eilro - SequenceFlow_12dou7o + SequenceFlow_0secadm + @@ -130,10 +168,8 @@ csi.sendSyncResponse(execution)]]> - - @@ -141,14 +177,85 @@ csi.sendSyncResponse(execution)]]> - - SequenceFlow_0z4faf9 - SequenceFlow_0utlsnd + + + + + + + + + + + + + SequenceFlow_0az1n4y + SequenceFlow_1bd4711 + + + SequenceFlow_1bd4711 + SequenceFlow_03i6zhx + + + + + SequenceFlow_0xhbobd + SequenceFlow_0t7zinj + + + + SequenceFlow_03i6zhx + SequenceFlow_1pdv4qj + + + + + + + + + + + + + + + + SequenceFlow_1pdv4qj + SequenceFlow_0xhbobd + + + + + + SequenceFlow_0secadm + SequenceFlow_1n8h3zt + SequenceFlow_0zmd4rt + + + + SequenceFlow_04qwbbf + + + + + + SequenceFlow_0kvl23y + + + SequenceFlow_1bddzne + SequenceFlow_1e3vtyq - + @@ -167,11 +274,64 @@ csi.prepareInitServiceOperationStatus(execution)]]> http-connector - SequenceFlow_0utlsnd - SequenceFlow_1853xxi + SequenceFlow_1e3vtyq + SequenceFlow_12dou7o - - + + + + + + + ${CVFMI_dbAdapterEndpoint} + + + application/soap+xml + Basic QlBFTENsaWVudDpwYXNzd29yZDEk + + + ${CVFMI_updateServiceOperStatusRequest} + POST + ${statusCode} + ${response} + + http-connector + + + SequenceFlow_1wzk6tu + SequenceFlow_0kvl23y + + + + + + SequenceFlow_0t7zinj + + + + + SequenceFlow_1bddzne + + + + + SequenceFlow_1n8h3zt + SequenceFlow_1wzk6tu + + + + + SequenceFlow_0zmd4rt + + + + @@ -183,42 +343,42 @@ csi.prepareInitServiceOperationStatus(execution)]]> - + - + - + - + - + - + - + - + - + - + - + - + @@ -228,157 +388,305 @@ csi.prepareInitServiceOperationStatus(execution)]]> - - - - - - - - - + + - + - - - - - - - - - + + - + - - + + - + - - + + - + - - - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - - + + - + - - - - + + - + - - + + - + - - - - + + - + - - + + - + - + - - + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + - + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateE2EServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateE2EServiceInstance.bpmn index 7735b192dc..ca43c00952 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateE2EServiceInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateE2EServiceInstance.bpmn @@ -7,19 +7,11 @@ SequenceFlow_1 - SequenceFlow_2 + SequenceFlow_04xlw7s - - - - SequenceFlow_0qg0uyn - SequenceFlow_167wc99 - SequenceFlow_115mdln @@ -28,42 +20,19 @@ dcsi.postProcessAAIGET(execution)]]> def csi = new DoUpdateE2EServiceInstance() csi.preProcessForAddResource(execution)]]> - - - - - - - - - - - - - - - - SequenceFlow_0yztz2p - SequenceFlow_0lblyhi - - SequenceFlow_0lblyhi - SequenceFlow_1nqfgvs + SequenceFlow_1wwjugw + SequenceFlow_177wo8z SequenceFlow_115mdln - + - - SequenceFlow_167wc99 - - - - + SequenceFlow_1qn0865 SequenceFlow_14rubz2 @@ -71,24 +40,8 @@ csi.postProcessForAddResource(execution)]]> def csi = new DoUpdateE2EServiceInstance() csi.preProcessForDeleteResource(execution)]]> - - - - - - - - - - - - - - SequenceFlow_14rubz2 - SequenceFlow_0tm9bw9 - - SequenceFlow_0tm9bw9 + SequenceFlow_0w4t4ao SequenceFlow_1uu6uiu - - - - SequenceFlow_02d5ibj - SequenceFlow_0l4gosl - - - - SequenceFlow_1vtlt1v - - - - SequenceFlow_1vtlt1v - SequenceFlow_0h40pn8 - - - - - - - - - - - - - - - - - - - SequenceFlow_0h40pn8 - SequenceFlow_02d5ibj - - - - - - - - - - - - - - SequenceFlow_2 - SequenceFlow_0qg0uyn - - + - SequenceFlow_0l4gosl + SequenceFlow_04xlw7s SequenceFlow_0r6c0ci SequenceFlow_0r6c0ci SequenceFlow_1muxopq - - SequenceFlow_1muxopq - SequenceFlow_1sgsysh - - - + - SequenceFlow_1nqfgvs + SequenceFlow_177wo8z @@ -224,7 +116,7 @@ ddsi.postProcessAAIPUT(execution)]]> - SequenceFlow_0h3kdi2 + SequenceFlow_0ku36oy SequenceFlow_07aa121 SequenceFlow_07aa121 - - SequenceFlow_0ku36oy - SequenceFlow_0mwh16g - - - - - - - ${URN_mso_openecomp_adapters_db_endpoint} - - - application/soap+xml - Basic QlBFTENsaWVudDpwYXNzd29yZDEk - - - ${CVFMI_updateServiceOperStatusRequest} - POST - ${statusCode} - ${response} - - http-connector - - - SequenceFlow_0mwh16g - SequenceFlow_0h3kdi2 - - - - + SequenceFlow_1uu6uiu @@ -281,14 +140,10 @@ ddsi.preUpdateServiceOperationStatus(execution)]]> - - SequenceFlow_1sgsysh - + SequenceFlow_1muxopq + - - - @@ -298,7 +153,7 @@ ddsi.preUpdateServiceOperationStatus(execution)]]> SequenceFlow_02znk15 - + SequenceFlow_05j3sat SequenceFlow_19ly8h7 - - SequenceFlow_0utvwkh + + SequenceFlow_19ly8h7 SequenceFlow_02znk15 - - - - - - ${URN_mso_openecomp_adapters_db_endpoint} - - - application/soap+xml - Basic QlBFTENsaWVudDpwYXNzd29yZDEk - - - ${CVFMI_updateServiceOperStatusRequest} - POST - ${statusCode} - ${response} - - http-connector - - - SequenceFlow_1lqzi94 - SequenceFlow_0utvwkh - - - - SequenceFlow_19ly8h7 - SequenceFlow_1lqzi94 - - - + - + SequenceFlow_1demy08 SequenceFlow_1cy5gq2 +dcsi.preProcessAAIGET(execution)]]> @@ -373,12 +196,12 @@ dcsi.preProcessAAIGET2(execution)]]> SequenceFlow_1cy5gq2 SequenceFlow_1vy856f - + SequenceFlow_1vy856f SequenceFlow_14ggluy +dcsi.postProcessAAIGET(execution)]]> @@ -390,45 +213,99 @@ def dcsi = new DoUpdateE2EServiceInstance() dcsi.preProcessAAIPUT(execution)]]> + + + SequenceFlow_0yztz2p + SequenceFlow_0ttlte0 + SequenceFlow_01po987 + + + + SequenceFlow_01po987 + + + + + + + SequenceFlow_14rubz2 + SequenceFlow_0vjx5a2 + SequenceFlow_1do7kq0 + + + SequenceFlow_1do7kq0 + + + + + + + + + + + + + + + + + + + + + SequenceFlow_0vjx5a2 + SequenceFlow_0w4t4ao + + + + + + + + + + + + + + + + + + + + + SequenceFlow_0ttlte0 + SequenceFlow_1wwjugw + + - + - + - + - - - - - - - - - + + - + - - - - - - - + @@ -436,12 +313,6 @@ dcsi.preProcessAAIPUT(execution)]]> - - - - - - @@ -451,26 +322,16 @@ dcsi.preProcessAAIPUT(execution)]]> - + - - - - - - - - + - - - - + @@ -489,100 +350,44 @@ dcsi.preProcessAAIPUT(execution)]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - + - - + + + + - + - - + + - + - + - + - + - + @@ -600,123 +405,71 @@ dcsi.preProcessAAIPUT(execution)]]> - - - - + + - + - + - + - + - + - + - - - - - - - - - - - - - - - + + - + - - + + - - - - - - - - + - + - + - + - + - - - - + + - - - - - - - - + - + - + - - - - - - - - - - - - - - - - - - - - - - - + + - + @@ -725,13 +478,13 @@ dcsi.preProcessAAIPUT(execution)]]> - + - + @@ -744,21 +497,21 @@ dcsi.preProcessAAIPUT(execution)]]> - + - + - + - + @@ -766,63 +519,129 @@ dcsi.preProcessAAIPUT(execution)]]> - + - + - + - + - - - - + + - + - - - - + + - + - + - - + + + + + + + + + - + - - + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - - - + + + + + + + + + + + + + + + - + -- cgit 1.2.3-korg