From 341100553632f0ed6118216315426247d2b413ff Mon Sep 17 00:00:00 2001 From: "Benjamin, Max (mb388a)" Date: Wed, 3 Apr 2019 09:21:14 -0400 Subject: if audit fails write sub interface data to a ai added logic to write sub interface information from openstack to a&ai when audit fails to find it Change-Id: I24266812dc60eb69bfd90e3e5b34113e9fd8f4f4 Issue-ID: SO-1737 Signed-off-by: Benjamin, Max (mb388a) --- .../BuildingBlock/ActivateVfModuleBB.bpmn | 103 ++++++++++++--------- .../bpmn/subprocess/ActivateVfModuleBBTest.java | 1 + 2 files changed, 61 insertions(+), 43 deletions(-) (limited to 'bpmn/so-bpmn-building-blocks') 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 c841da3e3a..289ab6e155 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 @@ -10,7 +10,8 @@ SequenceFlow_07ybdik - SequenceFlow_0ee42yq + SequenceFlow_109oxx2 + SequenceFlow_0arwo1o SequenceFlow_1a495wm @@ -39,14 +40,6 @@ SequenceFlow_0xndboi SequenceFlow_0ee42yq - - SequenceFlow_1t99ceh - - - - - SequenceFlow_1t99ceh - SequenceFlow_1xqyur9 SequenceFlow_07ybdik @@ -56,12 +49,26 @@ - + SequenceFlow_0ieafii SequenceFlow_1xqyur9 + + SequenceFlow_0ee42yq + SequenceFlow_109oxx2 + SequenceFlow_1bo83qk + + + + + + + + SequenceFlow_1bo83qk + SequenceFlow_0arwo1o + @@ -86,7 +93,7 @@ - + @@ -102,10 +109,10 @@ - + - + @@ -117,36 +124,16 @@ - - - + - + - - - - - - - - - - - - - - - - - - - + @@ -156,9 +143,9 @@ - + - + @@ -169,12 +156,10 @@ - - - - + + - + @@ -187,6 +172,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/so-bpmn-building-blocks/src/test/java/org/onap/so/bpmn/infrastructure/bpmn/subprocess/ActivateVfModuleBBTest.java b/bpmn/so-bpmn-building-blocks/src/test/java/org/onap/so/bpmn/infrastructure/bpmn/subprocess/ActivateVfModuleBBTest.java index 2dae1173d6..deac50ca30 100644 --- a/bpmn/so-bpmn-building-blocks/src/test/java/org/onap/so/bpmn/infrastructure/bpmn/subprocess/ActivateVfModuleBBTest.java +++ b/bpmn/so-bpmn-building-blocks/src/test/java/org/onap/so/bpmn/infrastructure/bpmn/subprocess/ActivateVfModuleBBTest.java @@ -40,6 +40,7 @@ public class ActivateVfModuleBBTest extends BaseBPMNTest{ public void before() { variables.put("vfModuleActivateTimerDuration", "PT2S"); variables.put("auditInventoryNeeded", "true"); + variables.put("auditIsSuccessful", "true"); } @Test -- cgit 1.2.3-korg