From 0d5e1abcfdc89dcde7a468560f36c36a5d76ecae Mon Sep 17 00:00:00 2001 From: Yulian Han Date: Tue, 21 Aug 2018 16:33:03 +0800 Subject: conflict process Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa60000016 Issue-ID: SO-683 Signed-off-by: Yulian Han --- .../subprocess/DoCreateE2EServiceInstance.bpmn | 151 +++++++++++++-------- 1 file changed, 91 insertions(+), 60 deletions(-) (limited to 'bpmn/so-bpmn-infrastructure-flows') diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn index 0b890d8573..0dc570771d 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn @@ -76,7 +76,7 @@ ddsi.postProcessAAIPUT(execution)]]> - SequenceFlow_1m2tm19 + SequenceFlow_1hbesp9 SequenceFlow_1qctzm0 SequenceFlow_1qctzm0 - SequenceFlow_13xfsff + SequenceFlow_0bfwj4y SequenceFlow_0w9t6tc @@ -147,10 +147,10 @@ dcsi.prepareDecomposeService(execution)]]> - SequenceFlow_1tkgqu3 + SequenceFlow_15d8lqu - + SequenceFlow_1i7t9hq @@ -158,16 +158,10 @@ dcsi.prepareDecomposeService(execution)]]> - SequenceFlow_1m2tm19 + SequenceFlow_1hbesp9 - - SequenceFlow_13xfsff - SequenceFlow_0y3i2k7 - - + @@ -190,7 +184,7 @@ dcsi.doProcessSiteLocation(execution)]]> SequenceFlow_0d0c20n - SequenceFlow_0y3i2k7 + SequenceFlow_0p6ba92 SequenceFlow_0bf6bzp def csi = new DoCreateE2EServiceInstance() csi.postProcessForAddResource(execution)]]> - @@ -211,8 +204,31 @@ csi.postProcessForAddResource(execution)]]> - - + + SequenceFlow_0bfwj4y + SequenceFlow_1e5vxox + + + + SequenceFlow_1e5vxox + SequenceFlow_0p6ba92 + + + + + + + SequenceFlow_1tkgqu3 + SequenceFlow_15d8lqu + + + @@ -228,15 +244,13 @@ csi.postProcessForAddResource(execution)]]> - + - - - - + + - + @@ -272,7 +286,7 @@ csi.postProcessForAddResource(execution)]]> - + @@ -298,16 +312,16 @@ csi.postProcessForAddResource(execution)]]> - + - + - + @@ -371,12 +385,10 @@ csi.postProcessForAddResource(execution)]]> - - - - + + - + @@ -389,19 +401,18 @@ csi.postProcessForAddResource(execution)]]> - + - + - - - - - + + + + - + @@ -410,30 +421,27 @@ csi.postProcessForAddResource(execution)]]> - - - + + + + + + + - + - - - - - - - - + - + @@ -463,18 +471,41 @@ csi.postProcessForAddResource(execution)]]> - - - + + + + + + + + + + + + + + + + - + - - - + + + + + + + + + + + + + - + -- cgit 1.2.3-korg