From 12e339cdb724209b7be6f58aafc9820cd07d2f91 Mon Sep 17 00:00:00 2001 From: biniek Date: Mon, 16 Apr 2018 16:14:32 +0200 Subject: Added CreateVcpePesCustServiceV2 workflow for pnf Change-Id: I5b42baa859eb039e806af609b1c3e618a86efba6 Issue-ID: SO-506 Signed-off-by: biniek --- .../delegate/CheckAaiForCorrelationIdDelegate.java | 2 +- .../process/CreateAndActivatePnfResource.bpmn | 189 +-- .../process/CreateVcpeResCustServiceV2.bpmn | 1441 ++++++++++++++++++++ .../src/main/webapp/WEB-INF/applicationContext.xml | 3 +- 4 files changed, 1550 insertions(+), 85 deletions(-) create mode 100644 bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVcpeResCustServiceV2.bpmn diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/pnf/delegate/CheckAaiForCorrelationIdDelegate.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/pnf/delegate/CheckAaiForCorrelationIdDelegate.java index 417bb4668e..e2dfedb6e4 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/pnf/delegate/CheckAaiForCorrelationIdDelegate.java +++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/pnf/delegate/CheckAaiForCorrelationIdDelegate.java @@ -42,7 +42,7 @@ import org.springframework.beans.factory.annotation.Autowired; * * Outputs: * - AAI_CONTAINS_INFO_ABOUT_PNF - local Boolean - * - aaiContainsInfoAboutIp - local Boolean (only present if AAI_CONTAINS_INFO_ABOUT_PNF is true) + * - aaiContainsInfoAboutIp - local Boolean */ public class CheckAaiForCorrelationIdDelegate implements JavaDelegate { diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateAndActivatePnfResource.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateAndActivatePnfResource.bpmn index 7d8863892d..177bd98b44 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateAndActivatePnfResource.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateAndActivatePnfResource.bpmn @@ -9,36 +9,42 @@ + + + + #{!aaiContainsInfoAboutIp} - - #{aaiContainsInfoAboutPnf} - #{!aaiContainsInfoAboutPnf} + + #{aaiContainsInfoAboutPnf} + + + #{aaiContainsInfoAboutIp} - + + SequenceFlow_0j5ksz1 + + + SequenceFlow_0p09qgm + SequenceFlow_1h6yz62 - - SequenceFlow_0p09qgm + + + SequenceFlow_1miyzfe + - - SequenceFlow_0j5ksz1 - - - - - SequenceFlow_0j5ksz1 SequenceFlow_1j4r3zt @@ -62,6 +68,10 @@ SequenceFlow_1ls8pua SequenceFlow_17s9025 + + SequenceFlow_17s9025 + SequenceFlow_1o8od8e + SequenceFlow_1o8od8e SequenceFlow_0p09qgm @@ -72,14 +82,10 @@ #{timeoutForPnfEntryNotification} - + SequenceFlow_1kc34bc - - - - SequenceFlow_17s9025 - SequenceFlow_1o8od8e - + SequenceFlow_1miyzfe + - + - + - + - + @@ -120,92 +126,94 @@ - + - + - - + + - + - - - + + + - + - - + + - + - + - + - - + + + + - + - - + + - + - + - + - - + + - + - - + + - + - - + + - + - + - + - + @@ -215,9 +223,9 @@ - + - + @@ -228,60 +236,77 @@ - - + + - + - - + + - + - + - + - - - + + + - + - + - + - + - - + + - + - - + + - + - + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVcpeResCustServiceV2.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVcpeResCustServiceV2.bpmn new file mode 100644 index 0000000000..b23d1c6b8f --- /dev/null +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVcpeResCustServiceV2.bpmn @@ -0,0 +1,1441 @@ + + + + + SequenceFlow_7 + SequenceFlow_3 + + + + + SequenceFlow_1 + + + + SequenceFlow_1 + SequenceFlow_7 + + + + + SequenceFlow_1eu60rt + + + + 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_0j6sjye + SequenceFlow_1ky2sv9 + + + SequenceFlow_3 + + + + + SequenceFlow_0zq7i3q + SequenceFlow_0zpbskl + SequenceFlow_0dhf2js + + + SequenceFlow_0zq7i3q + + + + SequenceFlow_0zpbskl + SequenceFlow_1sx5llu + SequenceFlow_02o4yqx + + + SequenceFlow_0t3mtod + SequenceFlow_19mxskt + SequenceFlow_1sl79hn + + + + + + + + + + + SequenceFlow_0807ukc + SequenceFlow_19yywk8 + + + SequenceFlow_19yywk8 + + + SequenceFlow_0jg47xm + SequenceFlow_0807ukc + + + + + + + + + + + + + + + + + + + + SequenceFlow_1a7e8l1 + SequenceFlow_1f1hd3l + + + SequenceFlow_1sx5llu + SequenceFlow_0dhf2js + SequenceFlow_1rabks0 + SequenceFlow_0jg47xm + + + + + + + SequenceFlow_19mxskt + SequenceFlow_17cz98f + SequenceFlow_0sezboq + SequenceFlow_1a7e8l1 + + + + + SequenceFlow_1f1hd3l + SequenceFlow_0sezboq + SequenceFlow_1mbymcu + SequenceFlow_00by7l7 + SequenceFlow_1lv5ld6 + + + SequenceFlow_02o4yqx + SequenceFlow_0ftzjjm + + + + SequenceFlow_0dvsqpp + SequenceFlow_1rabks0 + + + + + SequenceFlow_12dakwh + SequenceFlow_0orpdrl + SequenceFlow_0ya1cr3 + + + + + + + + + + SequenceFlow_0orpdrl + SequenceFlow_1t3cnnx + + + SequenceFlow_0ya1cr3 + SequenceFlow_1sim44y + SequenceFlow_027lz43 + + + + + + + + SequenceFlow_027lz43 + SequenceFlow_1kpdu1j + SequenceFlow_007p8k3 + + + SequenceFlow_1kpdu1j + SequenceFlow_1quvahv + SequenceFlow_0t3mtod + + + + SequenceFlow_1t3cnnx + SequenceFlow_1sim44y + SequenceFlow_0dr2fem + + + + + + + SequenceFlow_1mpsdaj + SequenceFlow_1quvahv + SequenceFlow_1mbymcu + + + + + + + SequenceFlow_0ftzjjm + SequenceFlow_12dakwh + SequenceFlow_09nn9a9 + + + + + SequenceFlow_1lv5ld6 + SequenceFlow_09nn9a9 + SequenceFlow_0dr2fem + SequenceFlow_0dvsqpp + + + + + + + + + + + + + + + + + SequenceFlow_1sl79hn + SequenceFlow_0ne9n0g + + + + + + SequenceFlow_0ne9n0g + SequenceFlow_00by7l7 + SequenceFlow_17cz98f + + + + + + + + + + + + + + + + + + SequenceFlow_007p8k3 + SequenceFlow_1mpsdaj + + + + + + + + SequenceFlow_15odbkz + SequenceFlow_0j6sjye + + + + SequenceFlow_12ilko1 + SequenceFlow_0afe2pg + + + + + + SequenceFlow_1jbuf1t + + + + + + + + ${URN_mso_adapters_db_endpoint} + + + + application/soap+xml + #{BasicAuthHeaderValueDB} + + + POST + + soap-http-connector + + + SequenceFlow_0vj46ej + SequenceFlow_0sjpja4 + + + SequenceFlow_1ky2sv9 + SequenceFlow_0vj46ej + + + + + + + + + + + + + + SequenceFlow_00h6hmd + SequenceFlow_17g05fd + + + SequenceFlow_1eu60rt + SequenceFlow_00h6hmd + + + + + + SequenceFlow_0x9pjgm + SequenceFlow_1kgaq0j + + + + SequenceFlow_0x9pjgm + + + + + SequenceFlow_1kgaq0j + SequenceFlow_0ofjahh + SequenceFlow_16qob4p + + + SequenceFlow_0ofjahh + SequenceFlow_1cgpklo + SequenceFlow_0o6tf9p + + + + + + + + SequenceFlow_15odbkz + + + + SequenceFlow_1db0ri1 + + + + + + + + + + + + + + + + + SequenceFlow_11efpvh + SequenceFlow_1jbuf1t + + + + + SequenceFlow_0gj4vud + + + + SequenceFlow_0clhseq + + + + SequenceFlow_0o6tf9p + + + + + + + + + + + + + + + + + + + + + + + + + SequenceFlow_0ws7fjn + SequenceFlow_1mkdhw9 + + + SequenceFlow_0p75l97 + SequenceFlow_0ws7fjn + + + + SequenceFlow_1ufio7c + + + + SequenceFlow_0aza7xq + + + + SequenceFlow_0aza7xq + SequenceFlow_0p75l97 + SequenceFlow_13iuk3s + + + SequenceFlow_13iuk3s + SequenceFlow_0k5vcuu + SequenceFlow_1ufio7c + + + + in 1702 scope only one VNF will be created + + + 0}]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SequenceFlow_16qob4p + SequenceFlow_1cgpklo + + + + SequenceFlow_17g05fd + SequenceFlow_11efpvh + + + + + SequenceFlow_1mkdhw9 + SequenceFlow_0k5vcuu + + + + + SequenceFlow_0sjpja4 + SequenceFlow_1db0ri1 + + ${aaiDistDelay} + + + + + + + + + + + + SequenceFlow_0gj4vud + SequenceFlow_0clhseq + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/applicationContext.xml b/bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/applicationContext.xml index 6fe70ff614..cbb8266bf7 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/applicationContext.xml +++ b/bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/applicationContext.xml @@ -15,8 +15,7 @@ - - +