From a339f93a736c9503888d05e47d79b173229042fc Mon Sep 17 00:00:00 2001 From: "Benjamin, Max (mb388a)" Date: Tue, 5 Mar 2019 16:56:09 -0500 Subject: improvements to audit inventory feature Adjust test data to add tenant mapping Remove unused unit test already renamed Update logic, to pass hostname not pservername remove unused file that has been refactored Add project to ignore, remove class Address issues in comments on pull request Remove logging that is not needed, used UPdate BPMN to use Boolean Value, change timings Adjust BPMN to not hit deadlock scenario put error message in execution before checking rollback - removed extra code for vnf resource processing found in onap environment. Fix improper use of inclusive gateway causing deadlock Fix flakey unit tests from ONAP Remove qualifier on bean, as it breaks callbacks Adjust pom version of external camunda client Fix polling timers to be more reasonable Updated Junit test for delete vf module in onap. Changed auditInventoryNeeded variable to a boolean to prevent bpmn from erroring out in the event this variable is not found on the execution. Update logic to support writing of self link Change-Id: I2f784a0a58a09f303775282c9be6019031668570 Issue-ID: SO-1597 Signed-off-by: Benjamin, Max (mb388a) --- .../BuildingBlock/ActivateVfModuleBB.bpmn | 4 +- .../subprocess/BuildingBlock/DeleteVfModuleBB.bpmn | 259 ++++++++++++++++----- 2 files changed, 205 insertions(+), 58 deletions(-) (limited to 'bpmn/so-bpmn-building-blocks/src/main/resources') diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ActivateVfModuleBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ActivateVfModuleBB.bpmn index fd24be100b..c841da3e3a 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ActivateVfModuleBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ActivateVfModuleBB.bpmn @@ -35,7 +35,7 @@ SequenceFlow_0ghzwlo SequenceFlow_0xndboi - + SequenceFlow_0xndboi SequenceFlow_0ee42yq @@ -54,7 +54,7 @@ - + diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteVfModuleBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteVfModuleBB.bpmn index 804ae70c58..e1b36cfe65 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteVfModuleBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteVfModuleBB.bpmn @@ -1,14 +1,14 @@ - + SequenceFlow_1537yw5 - SequenceFlow_1537yw5 + SequenceFlow_1n8gab5 SequenceFlow_08tvhtf - + SequenceFlow_01vfwtp SequenceFlow_09l7pcg @@ -32,7 +32,7 @@ SequenceFlow_08tvhtf SequenceFlow_02lpx87 - + SequenceFlow_0h607z0 @@ -52,7 +52,7 @@ - SequenceFlow_02lpx87 + SequenceFlow_14bu4ys SequenceFlow_0xyu3pk @@ -70,133 +70,280 @@ SequenceFlow_0khqfnc SequenceFlow_0yuz21z + + + SequenceFlow_1537yw5 + SequenceFlow_1n8gab5 + SequenceFlow_1v3jgqe + + + + + + + + SequenceFlow_02lpx87 + SequenceFlow_1ut7n32 + SequenceFlow_14bu4ys + + + + SequenceFlow_1v3jgqe + SequenceFlow_1odt2wt + + + + + + SequenceFlow_1swistn + SequenceFlow_0qfmmgt + + + SequenceFlow_032jv5j + SequenceFlow_1swistn + + + + SequenceFlow_1odt2wt + SequenceFlow_032jv5j + SequenceFlow_1mgunf3 + + + SequenceFlow_0qfmmgt + SequenceFlow_1mgunf3 + SequenceFlow_1ut7n32 + - + - + - + - - + + - + - + - - + + - + - + - + - + - - + + + - + - + - + - + - + - + - - + + - + - + - - + + - + - - + + - + - - + + + + + + - + - + - + - - - - - - + + - + - + - - + + - + - - + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit 1.2.3-korg