From 5bffd3ec2455a9c67206102873e3a6a321bfec5d Mon Sep 17 00:00:00 2001 From: Marcus G K Williams Date: Wed, 10 Apr 2019 16:41:06 -0700 Subject: Fix GR_API Homing This change uses the correct variable name to enable homing in AssignVnfBB. The correct variable to use is not 'callHoming' but 'homing'. Also updated sunnyDayAssignVnfBBTest to use the correct variable and BaseBPMNTest. This change also corrects HomingBB and calls HomingV2 rather than SniroV2 or OofV2. HomingV2 already passes calls to the correct implimentation, no need do this in the BPMN. Issue-ID: SO-1470 Change-Id: I14a77ef75b8b86feed7af3aab4d52c0df5f12886 Signed-off-by: Marcus G K Williams --- .../subprocess/BuildingBlock/AssignVnfBB.bpmn | 4 +- .../subprocess/BuildingBlock/HomingBB.bpmn | 272 ++++++--------------- 2 files changed, 71 insertions(+), 205 deletions(-) (limited to 'bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock') diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AssignVnfBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AssignVnfBB.bpmn index ea762c8719..7bb97939dd 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AssignVnfBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AssignVnfBB.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_0zaz9o2 @@ -24,7 +24,7 @@ - + diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/HomingBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/HomingBB.bpmn index cd62636b77..b66ecfa329 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/HomingBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/HomingBB.bpmn @@ -1,10 +1,9 @@ - + - SequenceFlow_1x9usa6 + SequenceFlow_0jtjlbu - SequenceFlow_1rf4vs8 @@ -43,7 +42,7 @@ ex.processJavaException(execution)]]> - + @@ -52,278 +51,145 @@ ex.processJavaException(execution)]]> - SequenceFlow_1qbnm82 - SequenceFlow_1fipbmk + SequenceFlow_0qrwjzu + SequenceFlow_03cy5y5 - - - SequenceFlow_1urt5i6 + SequenceFlow_138xgla - - - - - - - - - - - - - - - SequenceFlow_1dtador - SequenceFlow_0lc15i7 + + SequenceFlow_0jtjlbu + SequenceFlow_0qrwjzu - - SequenceFlow_08k112s - SequenceFlow_01apjvo + + SequenceFlow_03cy5y5 + SequenceFlow_138xgla - - SequenceFlow_0m6nhqg - SequenceFlow_0kvax6n - - - SequenceFlow_0oixz4g - SequenceFlow_0ph4paa - - - SequenceFlow_1x9usa6 - SequenceFlow_1dtador - SequenceFlow_0m6nhqg - - - SequenceFlow_0lc15i7 - SequenceFlow_0kvax6n - SequenceFlow_1qbnm82 - - - SequenceFlow_1fipbmk - SequenceFlow_08k112s - SequenceFlow_0oixz4g - - - SequenceFlow_01apjvo - SequenceFlow_0ph4paa - SequenceFlow_1urt5i6 - + + + + - + - + - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - - - - + + + + - + - - + + - + - - + + - + - + - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - + - - - - + + + - + - - - - + + + - + - - - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit 1.2.3-korg