From f891e734e3bc0d4b367f893e57b7efb5079d133c Mon Sep 17 00:00:00 2001 From: Rob Daugherty Date: Thu, 15 Nov 2018 15:09:30 -0500 Subject: Accept vCPE vfModuleNames in NB API This affects the vCPE custom flow. You can specify zero or more VF Module names (correlated with the model invariant UUID) in the user parameters, like this: "userParams": [ . . . { "name": "VfModuleNames", "value": [ { "VfModuleModelInvariantUuId": "5366deab-be06-44c7-b4f7-77e657b78b25", "VfModuleName": "VGW:e2:25:25:25:%" } ] } ] Change-Id: I673c04775bf5796079dc0ed19890e73e76820ac0 Issue-ID: SO-1213 Signed-off-by: Rob Daugherty --- .../subprocess/DoCreateVnfAndModules.bpmn | 137 ++++++++++++++------- 1 file changed, 95 insertions(+), 42 deletions(-) (limited to 'bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn') diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn index b5988538e3..dec841c021 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_0o4vuzt @@ -42,7 +42,8 @@ doCreateVnfAndModules.preProcessRequest(execution)]]> - SequenceFlow_1hf7k7q + SequenceFlow_0tbhtk8 + SequenceFlow_10nwzbe SequenceFlow_1ixcnb6 @@ -79,6 +80,7 @@ doCreateVnfAndModules.preProcessRequest(execution)]]> SequenceFlow_1lh21yl + SequenceFlow_12ffqm1 SequenceFlow_1llbx0k @@ -132,7 +134,6 @@ doCreateVnfAndModules.validateAddOnModule(execution)]]> SequenceFlow_19ohb1a - SequenceFlow_07u8e3l SequenceFlow_0jz6bqn @@ -157,12 +158,11 @@ doCreateVnfAndModules.queryCatalogDB(execution)]]> - + - @@ -173,8 +173,8 @@ doCreateVnfAndModules.queryCatalogDB(execution)]]> - SequenceFlow_07u8e3l - SequenceFlow_1hf7k7q + SequenceFlow_19ecf9p + SequenceFlow_0tbhtk8 @@ -186,7 +186,7 @@ doCreateVnfAndModules.queryCatalogDB(execution)]]> - SequenceFlow_0kld3qt + SequenceFlow_0ulldxo SequenceFlow_1lh21yl @@ -240,7 +240,6 @@ dcvam.postProcessRollback(execution)]]> - SequenceFlow_1vrogpr @@ -250,7 +249,7 @@ def doCreateVnfAndModules = new DoCreateVnfAndModules() doCreateVnfAndModules.postProcessAddOnModule(execution)]]> - + SequenceFlow_07u8e3l SequenceFlow_1t407j7 @@ -265,6 +264,25 @@ doCreateVnfAndModules.createPlatform(execution)]]> def doCreateVnfAndModules = new DoCreateVnfAndModules() doCreateVnfAndModules.createLineOfBusiness(execution)]]> + + SequenceFlow_0baw1tl + SequenceFlow_19ecf9p + SequenceFlow_10nwzbe + + + + + + + + SequenceFlow_0kld3qt + SequenceFlow_0ulldxo + SequenceFlow_12ffqm1 + + + + + @@ -303,16 +321,16 @@ doCreateVnfAndModules.createLineOfBusiness(execution)]]> - + - + - + @@ -323,11 +341,9 @@ doCreateVnfAndModules.createLineOfBusiness(execution)]]> - - - + - + @@ -356,10 +372,10 @@ doCreateVnfAndModules.createLineOfBusiness(execution)]]> - - + + - + @@ -377,27 +393,21 @@ doCreateVnfAndModules.createLineOfBusiness(execution)]]> - - - - - - - - + - + - + - - + + + - + @@ -485,13 +495,6 @@ doCreateVnfAndModules.createLineOfBusiness(execution)]]> - - - - - - - @@ -512,9 +515,9 @@ doCreateVnfAndModules.createLineOfBusiness(execution)]]> - + - + @@ -523,6 +526,56 @@ doCreateVnfAndModules.createLineOfBusiness(execution)]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit 1.2.3-korg From a8c9cca7c94c327015b95b4c59efc5b56ba49109 Mon Sep 17 00:00:00 2001 From: Rob Daugherty Date: Tue, 20 Nov 2018 11:41:57 -0500 Subject: Fix for vCPE flows A sequence flow was accidentally deleted in the DoCreateVnfAndModules process. This fixes it. Also adding VfModuleModuleNames support for the original (Not V2) version of CreateVcpeResCustService. Change-Id: I20bba7448802a548bb913bc2e016c9c0f2abdd42 Issue-ID: SO-1213 Signed-off-by: Rob Daugherty --- .../src/main/resources/process/CreateVcpeResCustService.bpmn | 3 ++- .../src/main/resources/subprocess/DoCreateVnfAndModules.bpmn | 11 ++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn') diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVcpeResCustService.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVcpeResCustService.bpmn index 7413e6df83..54f0947d29 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVcpeResCustService.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVcpeResCustService.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_7 @@ -518,6 +518,7 @@ CreateVcpeResCustService.prepareCreateAllottedResourceBRG(execution)]]> + SequenceFlow_0ws7fjn SequenceFlow_1mkdhw9 diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn index dec841c021..016aaa20d2 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateVnfAndModules.bpmn @@ -134,6 +134,7 @@ doCreateVnfAndModules.validateAddOnModule(execution)]]> SequenceFlow_19ohb1a + SequenceFlow_0oxfrrr SequenceFlow_0jz6bqn @@ -251,7 +252,7 @@ doCreateVnfAndModules.postProcessAddOnModule(execution)]]> - SequenceFlow_07u8e3l + SequenceFlow_0oxfrrr SequenceFlow_1t407j7 + @@ -576,6 +578,13 @@ doCreateVnfAndModules.createLineOfBusiness(execution)]]> + + + + + + + -- cgit 1.2.3-korg