From 7328b3f1e9eb1804911dfe9dcede792fd711d51f Mon Sep 17 00:00:00 2001
From: "Benjamin, Max (mb388a)" <mb388a@us.att.com>
Date: Sun, 21 Apr 2019 11:11:21 -0400
Subject: Status message for create vf module event audit

Added appc to application-test due to new dependency in openstack
Updated exception class to inject mock into class for junits.
Added error handling support for when create audit fails.
Added error handling for when create audit fails and added test
Updated test schema file to create table and added field.
Updated pom file to relfect typo in change made.
Updated locaton of pojos for audit code
Updated test schema file to create table and added field.
Updated pom file to relfect typo in change made.
Comitting files that i forgot to stage from previous commit
Updated locaton of pojos for audit code
Additional fixes including vnfcname and null check
Fixed bug in delete audit failure check and reverted gateway change.

Change-Id: I993ce377dd6407960a65b4940d83d8162b24633c
Issue-ID: SO-1792
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
---
 .../BuildingBlock/ActivateVfModuleBB.bpmn          | 251 ++++++++++++++-------
 .../subprocess/BuildingBlock/DeleteVfModuleBB.bpmn | 202 +++++++++++------
 2 files changed, 308 insertions(+), 145 deletions(-)

(limited to 'bpmn/so-bpmn-building-blocks/src')

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 289ab6e155..435d85d032 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.7.1">
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.10.0">
   <bpmn:process id="ActivateVfModuleBB" name="ActivateVfModuleBB" isExecutable="true">
     <bpmn:startEvent id="ActivateVfModuleBB_Start">
       <bpmn:outgoing>SequenceFlow_0ieafii</bpmn:outgoing>
@@ -9,9 +9,7 @@
       <bpmn:incoming>SequenceFlow_0xsp0pv</bpmn:incoming>
     </bpmn:endEvent>
     <bpmn:serviceTask id="ActivateVfModule" name="&#10;SDNC&#10;Activate&#10;(vf module)&#10;" camunda:expression="${SDNCActivateTasks.activateVfModule(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
-      <bpmn:incoming>SequenceFlow_07ybdik</bpmn:incoming>
-      <bpmn:incoming>SequenceFlow_109oxx2</bpmn:incoming>
-      <bpmn:incoming>SequenceFlow_0arwo1o</bpmn:incoming>
+      <bpmn:incoming>SequenceFlow_1b63lv4</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_1a495wm</bpmn:outgoing>
     </bpmn:serviceTask>
     <bpmn:serviceTask id="UpdateVfModuleActiveStatus" name="&#10;AAI&#10;Update&#10;(vf module)&#10;" camunda:expression="${AAIUpdateTasks.updateOrchestrationStatusActivateVfModule(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
@@ -40,13 +38,8 @@
       <bpmn:incoming>SequenceFlow_0xndboi</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0ee42yq</bpmn:outgoing>
     </bpmn:serviceTask>
-    <bpmn:exclusiveGateway id="ExclusiveGateway_1v8bmbu" default="SequenceFlow_07ybdik">
-      <bpmn:incoming>SequenceFlow_1xqyur9</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_07ybdik</bpmn:outgoing>
-      <bpmn:outgoing>SequenceFlow_0ghzwlo</bpmn:outgoing>
-    </bpmn:exclusiveGateway>
-    <bpmn:sequenceFlow id="SequenceFlow_07ybdik" sourceRef="ExclusiveGateway_1v8bmbu" targetRef="ActivateVfModule" />
-    <bpmn:sequenceFlow id="SequenceFlow_0ghzwlo" sourceRef="ExclusiveGateway_1v8bmbu" targetRef="Setup_AAI_Inventory_Audit">
+    <bpmn:sequenceFlow id="SequenceFlow_07ybdik" name="No" sourceRef="ExclusiveGateway_1v8bmbu" targetRef="ExclusiveGateway_0sqvzll" />
+    <bpmn:sequenceFlow id="SequenceFlow_0ghzwlo" name="Yes" sourceRef="ExclusiveGateway_1v8bmbu" targetRef="Setup_AAI_Inventory_Audit">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[${execution.getVariable("auditInventoryNeeded") == true}]]></bpmn:conditionExpression>
     </bpmn:sequenceFlow>
     <bpmn:sequenceFlow id="SequenceFlow_0ee42yq" sourceRef="Audit_AAI_Inventory" targetRef="ExclusiveGateway_1h8avxn" />
@@ -55,154 +48,252 @@
       <bpmn:outgoing>SequenceFlow_1xqyur9</bpmn:outgoing>
     </bpmn:serviceTask>
     <bpmn:sequenceFlow id="SequenceFlow_1xqyur9" sourceRef="CheckAuditVariable" targetRef="ExclusiveGateway_1v8bmbu" />
-    <bpmn:exclusiveGateway id="ExclusiveGateway_1h8avxn" default="SequenceFlow_1bo83qk">
-      <bpmn:incoming>SequenceFlow_0ee42yq</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_109oxx2</bpmn:outgoing>
-      <bpmn:outgoing>SequenceFlow_1bo83qk</bpmn:outgoing>
-    </bpmn:exclusiveGateway>
-    <bpmn:sequenceFlow id="SequenceFlow_109oxx2" sourceRef="ExclusiveGateway_1h8avxn" targetRef="ActivateVfModule">
+    <bpmn:sequenceFlow id="SequenceFlow_109oxx2" name="No" sourceRef="ExclusiveGateway_1h8avxn" targetRef="ExclusiveGateway_0y0ek7t">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[${execution.getVariable("auditIsSuccessful")== true }]]></bpmn:conditionExpression>
     </bpmn:sequenceFlow>
-    <bpmn:sequenceFlow id="SequenceFlow_1bo83qk" name="If Audit Fails" sourceRef="ExclusiveGateway_1h8avxn" targetRef="Create_AAI_Inventory" />
-    <bpmn:sequenceFlow id="SequenceFlow_0arwo1o" sourceRef="Create_AAI_Inventory" targetRef="ActivateVfModule" />
+    <bpmn:sequenceFlow id="SequenceFlow_1bo83qk" name="Yes" sourceRef="ExclusiveGateway_1h8avxn" targetRef="Create_AAI_Inventory" />
+    <bpmn:sequenceFlow id="SequenceFlow_0arwo1o" sourceRef="Create_AAI_Inventory" targetRef="ExclusiveGateway_0y0ek7t" />
     <bpmn:serviceTask id="Create_AAI_Inventory" name="Create A&#38;AI Inventory" camunda:type="external" camunda:topic="InventoryCreate">
       <bpmn:incoming>SequenceFlow_1bo83qk</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0arwo1o</bpmn:outgoing>
     </bpmn:serviceTask>
+    <bpmn:sequenceFlow id="SequenceFlow_1b63lv4" sourceRef="ExclusiveGateway_0sqvzll" targetRef="ActivateVfModule" />
+    <bpmn:sequenceFlow id="SequenceFlow_18faffa" sourceRef="ExclusiveGateway_0y0ek7t" targetRef="ExclusiveGateway_0sqvzll" />
+    <bpmn:subProcess id="SubProcess_0bpsptg" name="Audit Exception Sub Process" triggeredByEvent="true">
+      <bpmn:startEvent id="catchInventoryException">
+        <bpmn:outgoing>SequenceFlow_19gbhlj</bpmn:outgoing>
+        <bpmn:errorEventDefinition errorRef="Error_1s3kxze" />
+      </bpmn:startEvent>
+      <bpmn:endEvent id="EndEvent_067jv1n">
+        <bpmn:incoming>SequenceFlow_0l4jzc5</bpmn:incoming>
+      </bpmn:endEvent>
+      <bpmn:sequenceFlow id="SequenceFlow_19gbhlj" sourceRef="catchInventoryException" targetRef="processAuditException" />
+      <bpmn:sequenceFlow id="SequenceFlow_0l4jzc5" sourceRef="processAuditException" targetRef="EndEvent_067jv1n" />
+      <bpmn:serviceTask id="processAuditException" name="Proccess Error" camunda:expression="${ExceptionBuilder.processAuditException(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
+        <bpmn:incoming>SequenceFlow_19gbhlj</bpmn:incoming>
+        <bpmn:outgoing>SequenceFlow_0l4jzc5</bpmn:outgoing>
+      </bpmn:serviceTask>
+    </bpmn:subProcess>
+    <bpmn:inclusiveGateway id="ExclusiveGateway_1v8bmbu" name="Audit Enabled?" default="SequenceFlow_07ybdik">
+      <bpmn:incoming>SequenceFlow_1xqyur9</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_07ybdik</bpmn:outgoing>
+      <bpmn:outgoing>SequenceFlow_0ghzwlo</bpmn:outgoing>
+    </bpmn:inclusiveGateway>
+    <bpmn:inclusiveGateway id="ExclusiveGateway_0sqvzll">
+      <bpmn:incoming>SequenceFlow_07ybdik</bpmn:incoming>
+      <bpmn:incoming>SequenceFlow_18faffa</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_1b63lv4</bpmn:outgoing>
+    </bpmn:inclusiveGateway>
+    <bpmn:inclusiveGateway id="ExclusiveGateway_1h8avxn" name="Audit Failed?" default="SequenceFlow_1bo83qk">
+      <bpmn:incoming>SequenceFlow_0ee42yq</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_109oxx2</bpmn:outgoing>
+      <bpmn:outgoing>SequenceFlow_1bo83qk</bpmn:outgoing>
+    </bpmn:inclusiveGateway>
+    <bpmn:inclusiveGateway id="ExclusiveGateway_0y0ek7t">
+      <bpmn:incoming>SequenceFlow_109oxx2</bpmn:incoming>
+      <bpmn:incoming>SequenceFlow_0arwo1o</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_18faffa</bpmn:outgoing>
+    </bpmn:inclusiveGateway>
   </bpmn:process>
   <bpmn:error id="Error_0q258vt" errorCode="7000" />
+  <bpmn:error id="Error_0zgccif" name="org.onap.so.adapters.inventory.create.InventoryException" errorCode="org.onap.so.adapters.inventory.create.InventoryException" />
+  <bpmn:error id="Error_1s3kxze" name="Error_3q664s5" errorCode="AAIInventoryFailure" />
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="ActivateVfModuleBB">
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="ActivateVfModuleBB_Start">
-        <dc:Bounds x="73" y="102" width="36" height="36" />
+        <dc:Bounds x="85" y="234" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="46" y="138" width="90" height="12" />
+          <dc:Bounds x="58" y="270" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0ieafii_di" bpmnElement="SequenceFlow_0ieafii">
-        <di:waypoint xsi:type="dc:Point" x="109" y="120" />
-        <di:waypoint xsi:type="dc:Point" x="161" y="120" />
+        <di:waypoint xsi:type="dc:Point" x="121" y="252" />
+        <di:waypoint xsi:type="dc:Point" x="201" y="252" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="90" y="99" width="90" height="12" />
+          <dc:Bounds x="116" y="231" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="EndEvent_1v967li_di" bpmnElement="ActivateVfModuleBB_End">
-        <dc:Bounds x="1104" y="102" width="36" height="36" />
+        <dc:Bounds x="1404" y="235" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="935" y="142" width="90" height="12" />
+          <dc:Bounds x="1235" y="275" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_0hawa84_di" bpmnElement="ActivateVfModule">
-        <dc:Bounds x="647" y="80" width="100" height="80" />
+        <dc:Bounds x="958" y="212" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_175e9ul_di" bpmnElement="UpdateVfModuleActiveStatus">
-        <dc:Bounds x="952" y="80" width="100" height="80" />
+        <dc:Bounds x="1214" y="212" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0xsp0pv_di" bpmnElement="SequenceFlow_0xsp0pv">
-        <di:waypoint xsi:type="dc:Point" x="1052" y="120" />
-        <di:waypoint xsi:type="dc:Point" x="1104" y="120" />
+        <di:waypoint xsi:type="dc:Point" x="1314" y="252" />
+        <di:waypoint xsi:type="dc:Point" x="1404" y="253" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1033" y="99" width="90" height="12" />
+          <dc:Bounds x="1314" y="231.5" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="CallActivity_03jkesd_di" bpmnElement="CallActivity_sdncHandler">
-        <dc:Bounds x="794" y="80" width="100" height="80" />
+        <dc:Bounds x="1086" y="212" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1a495wm_di" bpmnElement="SequenceFlow_1a495wm">
-        <di:waypoint xsi:type="dc:Point" x="747" y="120" />
-        <di:waypoint xsi:type="dc:Point" x="794" y="120" />
+        <di:waypoint xsi:type="dc:Point" x="1058" y="252" />
+        <di:waypoint xsi:type="dc:Point" x="1086" y="252" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="725.5" y="99" width="90" height="12" />
+          <dc:Bounds x="1027" y="231" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1j4x1ej_di" bpmnElement="SequenceFlow_1j4x1ej">
-        <di:waypoint xsi:type="dc:Point" x="894" y="120" />
-        <di:waypoint xsi:type="dc:Point" x="952" y="120" />
+        <di:waypoint xsi:type="dc:Point" x="1186" y="252" />
+        <di:waypoint xsi:type="dc:Point" x="1214" y="252" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="878" y="99" width="90" height="12" />
+          <dc:Bounds x="1155" y="231" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0xndboi_di" bpmnElement="SequenceFlow_0xndboi">
-        <di:waypoint xsi:type="dc:Point" x="365" y="256" />
-        <di:waypoint xsi:type="dc:Point" x="408" y="256" />
+        <di:waypoint xsi:type="dc:Point" x="491" y="175" />
+        <di:waypoint xsi:type="dc:Point" x="513" y="175" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="341.5" y="234.5" width="90" height="13" />
+          <dc:Bounds x="457" y="153.5" width="90" height="13" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ServiceTask_0krf1ur_di" bpmnElement="Setup_AAI_Inventory_Audit">
-        <dc:Bounds x="265" y="216" width="100" height="80" />
+        <dc:Bounds x="391" y="135" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_08rxjeb_di" bpmnElement="Audit_AAI_Inventory">
-        <dc:Bounds x="408" y="216" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ExclusiveGateway_1v8bmbu_di" bpmnElement="ExclusiveGateway_1v8bmbu" isMarkerVisible="true">
-        <dc:Bounds x="290" y="95" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="315" y="148" width="0" height="13" />
-        </bpmndi:BPMNLabel>
+        <dc:Bounds x="513" y="135" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_07ybdik_di" bpmnElement="SequenceFlow_07ybdik">
-        <di:waypoint xsi:type="dc:Point" x="340" y="120" />
-        <di:waypoint xsi:type="dc:Point" x="647" y="120" />
+        <di:waypoint xsi:type="dc:Point" x="355" y="277" />
+        <di:waypoint xsi:type="dc:Point" x="355" y="315" />
+        <di:waypoint xsi:type="dc:Point" x="881" y="315" />
+        <di:waypoint xsi:type="dc:Point" x="881" y="277" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="448.5" y="98.5" width="90" height="13" />
+          <dc:Bounds x="364" y="294" width="14" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0ghzwlo_di" bpmnElement="SequenceFlow_0ghzwlo">
-        <di:waypoint xsi:type="dc:Point" x="315" y="145" />
-        <di:waypoint xsi:type="dc:Point" x="315" y="216" />
+        <di:waypoint xsi:type="dc:Point" x="355" y="227" />
+        <di:waypoint xsi:type="dc:Point" x="355" y="175" />
+        <di:waypoint xsi:type="dc:Point" x="391" y="175" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="330" y="174" width="0" height="13" />
+          <dc:Bounds x="362" y="185" width="19" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0ee42yq_di" bpmnElement="SequenceFlow_0ee42yq">
-        <di:waypoint xsi:type="dc:Point" x="508" y="256" />
-        <di:waypoint xsi:type="dc:Point" x="566" y="256" />
+        <di:waypoint xsi:type="dc:Point" x="613" y="175" />
+        <di:waypoint xsi:type="dc:Point" x="638" y="175" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="492" y="234.5" width="90" height="13" />
+          <dc:Bounds x="580.5" y="153.5" width="90" height="13" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ServiceTask_1eg5ryx_di" bpmnElement="CheckAuditVariable">
-        <dc:Bounds x="161" y="80" width="100" height="80" />
+        <dc:Bounds x="201" y="212" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1xqyur9_di" bpmnElement="SequenceFlow_1xqyur9">
-        <di:waypoint xsi:type="dc:Point" x="261" y="120" />
-        <di:waypoint xsi:type="dc:Point" x="290" y="120" />
+        <di:waypoint xsi:type="dc:Point" x="301" y="252" />
+        <di:waypoint xsi:type="dc:Point" x="330" y="252" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="275.5" y="98.5" width="0" height="13" />
+          <dc:Bounds x="270.5" y="230.5" width="90" height="13" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ExclusiveGateway_1h8avxn_di" bpmnElement="ExclusiveGateway_1h8avxn" isMarkerVisible="true">
-        <dc:Bounds x="566" y="231" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="591" y="284" width="0" height="13" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_109oxx2_di" bpmnElement="SequenceFlow_109oxx2">
-        <di:waypoint xsi:type="dc:Point" x="616" y="256" />
-        <di:waypoint xsi:type="dc:Point" x="670" y="256" />
-        <di:waypoint xsi:type="dc:Point" x="670" y="160" />
+        <di:waypoint xsi:type="dc:Point" x="663" y="200" />
+        <di:waypoint xsi:type="dc:Point" x="663" y="230" />
+        <di:waypoint xsi:type="dc:Point" x="834" y="230" />
+        <di:waypoint xsi:type="dc:Point" x="834" y="200" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="643" y="234.5" width="0" height="13" />
+          <dc:Bounds x="670" y="207" width="14" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1bo83qk_di" bpmnElement="SequenceFlow_1bo83qk">
-        <di:waypoint xsi:type="dc:Point" x="591" y="281" />
-        <di:waypoint xsi:type="dc:Point" x="591" y="345" />
-        <di:waypoint xsi:type="dc:Point" x="656" y="345" />
+        <di:waypoint xsi:type="dc:Point" x="663" y="150" />
+        <di:waypoint xsi:type="dc:Point" x="663" y="101" />
+        <di:waypoint xsi:type="dc:Point" x="691" y="101" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="560" y="358" width="61" height="12" />
+          <dc:Bounds x="667" y="111" width="19" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0arwo1o_di" bpmnElement="SequenceFlow_0arwo1o">
-        <di:waypoint xsi:type="dc:Point" x="706" y="305" />
-        <di:waypoint xsi:type="dc:Point" x="706" y="160" />
+        <di:waypoint xsi:type="dc:Point" x="791" y="101" />
+        <di:waypoint xsi:type="dc:Point" x="834" y="101" />
+        <di:waypoint xsi:type="dc:Point" x="834" y="150" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="721" y="226" width="0" height="13" />
+          <dc:Bounds x="767.5" y="79.5" width="90" height="13" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ServiceTask_1eb09gr_di" bpmnElement="Create_AAI_Inventory">
-        <dc:Bounds x="656" y="305" width="100" height="80" />
+        <dc:Bounds x="691" y="61" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1b63lv4_di" bpmnElement="SequenceFlow_1b63lv4">
+        <di:waypoint xsi:type="dc:Point" x="906" y="252" />
+        <di:waypoint xsi:type="dc:Point" x="958" y="252" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="887" y="231" width="90" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_18faffa_di" bpmnElement="SequenceFlow_18faffa">
+        <di:waypoint xsi:type="dc:Point" x="859" y="175" />
+        <di:waypoint xsi:type="dc:Point" x="881" y="175" />
+        <di:waypoint xsi:type="dc:Point" x="881" y="227" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="825" y="154" width="90" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="SubProcess_0mbkb7v_di" bpmnElement="SubProcess_0bpsptg" isExpanded="true">
+        <dc:Bounds x="293" y="449" width="350" height="200" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="StartEvent_12r96di_di" bpmnElement="catchInventoryException">
+        <dc:Bounds x="324" y="532" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="341.15269461077844" y="571.6127744510978" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="EndEvent_067jv1n_di" bpmnElement="EndEvent_067jv1n">
+        <dc:Bounds x="572.1526946107784" y="532" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="590.1526946107784" y="572" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_19gbhlj_di" bpmnElement="SequenceFlow_19gbhlj">
+        <di:waypoint xsi:type="dc:Point" x="360" y="550" />
+        <di:waypoint xsi:type="dc:Point" x="415" y="550" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="387.5" y="529" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0l4jzc5_di" bpmnElement="SequenceFlow_0l4jzc5">
+        <di:waypoint xsi:type="dc:Point" x="515" y="550" />
+        <di:waypoint xsi:type="dc:Point" x="572" y="550" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="543.5" y="529" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ServiceTask_08xffml_di" bpmnElement="processAuditException">
+        <dc:Bounds x="415" y="510" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="InclusiveGateway_03pi9y4_di" bpmnElement="ExclusiveGateway_1v8bmbu">
+        <dc:Bounds x="330" y="227" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="383" y="246" width="73" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="InclusiveGateway_16ap4e3_di" bpmnElement="ExclusiveGateway_0sqvzll">
+        <dc:Bounds x="856" y="227" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="836" y="281" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="InclusiveGateway_00n600s_di" bpmnElement="ExclusiveGateway_1h8avxn">
+        <dc:Bounds x="638" y="150" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="693" y="169" width="63" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="InclusiveGateway_0xx6c29_di" bpmnElement="ExclusiveGateway_0y0ek7t">
+        <dc:Bounds x="809" y="150" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="789" y="204" width="0" height="12" />
+        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
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 e1b36cfe65..8be07a165c 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,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.7.1">
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.10.0">
   <bpmn:process id="DeleteVfModuleBB" name="DeleteVfModuleBB" isExecutable="true">
     <bpmn:startEvent id="DeleteVfModuleBB_Start">
       <bpmn:outgoing>SequenceFlow_1537yw5</bpmn:outgoing>
@@ -51,22 +51,22 @@
     <bpmn:sequenceFlow id="SequenceFlow_01vfwtp" sourceRef="UpdateVfModuleHeatStackId" targetRef="UpdateVfModuleDeleteStatus" />
     <bpmn:sequenceFlow id="SequenceFlow_09l7pcg" sourceRef="UpdateVfModuleDeleteStatus" targetRef="DeleteVfModuleBB_End" />
     <bpmn:sequenceFlow id="SequenceFlow_0xyu3pk" sourceRef="DeleteNetworkPolicies" targetRef="UpdateVnfIpv4OamAddress" />
-    <bpmn:serviceTask id="DeleteNetworkPolicies" name="AAI Delete (network policies)" camunda:expression="${AAIDeleteTasks.deleteNetworkPolicies(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
-      <bpmn:incoming>SequenceFlow_14bu4ys</bpmn:incoming>
+    <bpmn:serviceTask id="DeleteNetworkPolicies" name="&#10;AAI&#10;Delete&#10;(net policies)&#10;" camunda:expression="${AAIDeleteTasks.deleteNetworkPolicies(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
+      <bpmn:incoming>SequenceFlow_179btn2</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0xyu3pk</bpmn:outgoing>
     </bpmn:serviceTask>
-    <bpmn:serviceTask id="UpdateVnfManagementV6Address" name="AAI Update (VNF)" camunda:expression="${AAIUpdateTasks.updateManagementV6AddressVnf(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
+    <bpmn:serviceTask id="UpdateVnfManagementV6Address" name="&#10;AAI &#10;Update&#10;(vnf)&#10;" camunda:expression="${AAIUpdateTasks.updateManagementV6AddressVnf(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
       <bpmn:incoming>SequenceFlow_0jtem3b</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0khqfnc</bpmn:outgoing>
     </bpmn:serviceTask>
     <bpmn:sequenceFlow id="SequenceFlow_0jtem3b" sourceRef="UpdateVnfIpv4OamAddress" targetRef="UpdateVnfManagementV6Address" />
-    <bpmn:serviceTask id="UpdateVnfIpv4OamAddress" name="AAI Update (VNF)" camunda:expression="${AAIUpdateTasks.updateIpv4OamAddressVnf(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
+    <bpmn:serviceTask id="UpdateVnfIpv4OamAddress" name="&#10;AAI &#10;Update &#10;(vnf)&#10;" camunda:expression="${AAIUpdateTasks.updateIpv4OamAddressVnf(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
       <bpmn:incoming>SequenceFlow_0xyu3pk</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0jtem3b</bpmn:outgoing>
     </bpmn:serviceTask>
     <bpmn:sequenceFlow id="SequenceFlow_0khqfnc" sourceRef="UpdateVnfManagementV6Address" targetRef="UpdateVfModuleContrailServiceInstanceFqdn" />
     <bpmn:sequenceFlow id="SequenceFlow_0yuz21z" sourceRef="UpdateVfModuleContrailServiceInstanceFqdn" targetRef="UpdateVfModuleHeatStackId" />
-    <bpmn:serviceTask id="UpdateVfModuleContrailServiceInstanceFqdn" name="AAI&#10;Update&#10;(vf module)&#10;" camunda:expression="${AAIUpdateTasks.updateContrailServiceInstanceFqdnVfModule(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
+    <bpmn:serviceTask id="UpdateVfModuleContrailServiceInstanceFqdn" name="&#10;AAI&#10;Update&#10;(vf module)&#10;" camunda:expression="${AAIUpdateTasks.updateContrailServiceInstanceFqdnVfModule(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
       <bpmn:incoming>SequenceFlow_0khqfnc</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0yuz21z</bpmn:outgoing>
     </bpmn:serviceTask>
@@ -80,7 +80,7 @@
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[${execution.getVariable("auditInventoryNeeded") == true}]]></bpmn:conditionExpression>
     </bpmn:sequenceFlow>
     <bpmn:sequenceFlow id="SequenceFlow_0qfmmgt" sourceRef="Audit_Inventory" targetRef="ExclusiveGateway_1pydilb" />
-    <bpmn:sequenceFlow id="SequenceFlow_14bu4ys" sourceRef="ExclusiveGateway_1yvh16a" targetRef="DeleteNetworkPolicies" />
+    <bpmn:sequenceFlow id="SequenceFlow_14bu4ys" sourceRef="ExclusiveGateway_1yvh16a" targetRef="aaiThrow" />
     <bpmn:parallelGateway id="ExclusiveGateway_1yvh16a">
       <bpmn:incoming>SequenceFlow_02lpx87</bpmn:incoming>
       <bpmn:incoming>SequenceFlow_1ut7n32</bpmn:incoming>
@@ -113,7 +113,32 @@
       <bpmn:incoming>SequenceFlow_1mgunf3</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_1ut7n32</bpmn:outgoing>
     </bpmn:exclusiveGateway>
+    <bpmn:subProcess id="SubProcess_0grvkj2" name="Audit Exception Sub Process" triggeredByEvent="true">
+      <bpmn:startEvent id="StartEvent_1euiddy">
+        <bpmn:outgoing>SequenceFlow_0xuodpy</bpmn:outgoing>
+        <bpmn:errorEventDefinition errorRef="Error_0jjnve8" />
+      </bpmn:startEvent>
+      <bpmn:endEvent id="EndEvent_1gzq57j">
+        <bpmn:incoming>SequenceFlow_1fhst92</bpmn:incoming>
+      </bpmn:endEvent>
+      <bpmn:serviceTask id="ServiceTask_1isbxvo" name="Proccess Error" camunda:expression="${ExceptionBuilder.processAuditException(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
+        <bpmn:incoming>SequenceFlow_0xuodpy</bpmn:incoming>
+        <bpmn:outgoing>SequenceFlow_1fhst92</bpmn:outgoing>
+      </bpmn:serviceTask>
+      <bpmn:sequenceFlow id="SequenceFlow_0xuodpy" sourceRef="StartEvent_1euiddy" targetRef="ServiceTask_1isbxvo" />
+      <bpmn:sequenceFlow id="SequenceFlow_1fhst92" sourceRef="ServiceTask_1isbxvo" targetRef="EndEvent_1gzq57j" />
+    </bpmn:subProcess>
+    <bpmn:sequenceFlow id="SequenceFlow_179btn2" sourceRef="aaiCatch" targetRef="DeleteNetworkPolicies" />
+    <bpmn:intermediateThrowEvent id="aaiThrow" name="Update AAI">
+      <bpmn:incoming>SequenceFlow_14bu4ys</bpmn:incoming>
+      <bpmn:linkEventDefinition name="AAI" />
+    </bpmn:intermediateThrowEvent>
+    <bpmn:intermediateCatchEvent id="aaiCatch" name="Update AAI">
+      <bpmn:outgoing>SequenceFlow_179btn2</bpmn:outgoing>
+      <bpmn:linkEventDefinition name="AAI" />
+    </bpmn:intermediateCatchEvent>
   </bpmn:process>
+  <bpmn:error id="Error_0jjnve8" name="Error_3k24na6" errorCode="AAIInventoryFailure" />
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DeleteVfModuleBB">
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="DeleteVfModuleBB_Start">
@@ -133,7 +158,7 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ServiceTask_0pbhsub_di" bpmnElement="UpdateVfModuleDeleteStatus">
-        <dc:Bounds x="840" y="443" width="100" height="80" />
+        <dc:Bounds x="907" y="443" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_08tvhtf_di" bpmnElement="SequenceFlow_08tvhtf">
         <di:waypoint xsi:type="dc:Point" x="482" y="318" />
@@ -143,9 +168,9 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="EndEvent_1rn6yvh_di" bpmnElement="DeleteVfModuleBB_End">
-        <dc:Bounds x="1087" y="465" width="36" height="36" />
+        <dc:Bounds x="1136" y="465" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1060" y="505" width="90" height="0" />
+          <dc:Bounds x="1109" y="505" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_0whogn3_di" bpmnElement="VnfAdapter">
@@ -153,94 +178,90 @@
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_02lpx87_di" bpmnElement="SequenceFlow_02lpx87">
         <di:waypoint xsi:type="dc:Point" x="611" y="318" />
-        <di:waypoint xsi:type="dc:Point" x="836" y="318" />
-        <di:waypoint xsi:type="dc:Point" x="836" y="284" />
+        <di:waypoint xsi:type="dc:Point" x="847" y="318" />
+        <di:waypoint xsi:type="dc:Point" x="847" y="284" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="678.5" y="303" width="90" height="0" />
+          <dc:Bounds x="684" y="303" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="SubProcess_11p7mrh_di" bpmnElement="SubProcess_11p7mrh" isExpanded="true">
-        <dc:Bounds x="294" y="618" width="231" height="135" />
+        <dc:Bounds x="290" y="857" width="231" height="135" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="StartEvent_1xp6ewt_di" bpmnElement="StartEvent_1xp6ewt">
-        <dc:Bounds x="337" y="680" width="36" height="36" />
+        <dc:Bounds x="333" y="919" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="265" y="716" width="90" height="0" />
+          <dc:Bounds x="261" y="955" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_0guhjau_di" bpmnElement="EndEvent_0guhjau">
-        <dc:Bounds x="466" y="680" width="36" height="36" />
+        <dc:Bounds x="462" y="919" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="394" y="716" width="90" height="0" />
+          <dc:Bounds x="390" y="955" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0h607z0_di" bpmnElement="SequenceFlow_0h607z0">
-        <di:waypoint xsi:type="dc:Point" x="373" y="698" />
-        <di:waypoint xsi:type="dc:Point" x="466" y="698" />
+        <di:waypoint xsi:type="dc:Point" x="369" y="937" />
+        <di:waypoint xsi:type="dc:Point" x="462" y="937" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="375" y="677" width="90" height="0" />
+          <dc:Bounds x="371" y="916" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ServiceTask_0vlgqod_di" bpmnElement="UpdateVfModuleHeatStackId">
-        <dc:Bounds x="706" y="443" width="100" height="80" />
+        <dc:Bounds x="779" y="443" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_01vfwtp_di" bpmnElement="SequenceFlow_01vfwtp">
-        <di:waypoint xsi:type="dc:Point" x="806" y="483" />
-        <di:waypoint xsi:type="dc:Point" x="840" y="483" />
+        <di:waypoint xsi:type="dc:Point" x="879" y="483" />
+        <di:waypoint xsi:type="dc:Point" x="907" y="483" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="778" y="468" width="90" height="0" />
+          <dc:Bounds x="848" y="468" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_09l7pcg_di" bpmnElement="SequenceFlow_09l7pcg">
-        <di:waypoint xsi:type="dc:Point" x="940" y="483" />
-        <di:waypoint xsi:type="dc:Point" x="1087" y="483" />
+        <di:waypoint xsi:type="dc:Point" x="1007" y="483" />
+        <di:waypoint xsi:type="dc:Point" x="1136" y="483" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="968.5" y="468" width="90" height="0" />
+          <dc:Bounds x="1026.5" y="468" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0xyu3pk_di" bpmnElement="SequenceFlow_0xyu3pk">
-        <di:waypoint xsi:type="dc:Point" x="998" y="259" />
-        <di:waypoint xsi:type="dc:Point" x="1072" y="259" />
-        <di:waypoint xsi:type="dc:Point" x="1072" y="399" />
-        <di:waypoint xsi:type="dc:Point" x="233" y="399" />
-        <di:waypoint xsi:type="dc:Point" x="233" y="483" />
-        <di:waypoint xsi:type="dc:Point" x="280" y="483" />
+        <di:waypoint xsi:type="dc:Point" x="376" y="483" />
+        <di:waypoint xsi:type="dc:Point" x="404" y="483" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="607.5" y="384" width="90" height="0" />
+          <dc:Bounds x="345" y="468" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ServiceTask_0tty0ac_di" bpmnElement="DeleteNetworkPolicies">
-        <dc:Bounds x="898" y="219" width="100" height="80" />
+        <dc:Bounds x="276" y="443" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_0lrrd16_di" bpmnElement="UpdateVnfManagementV6Address">
-        <dc:Bounds x="421" y="443" width="100" height="80" />
+        <dc:Bounds x="531" y="443" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0jtem3b_di" bpmnElement="SequenceFlow_0jtem3b">
-        <di:waypoint xsi:type="dc:Point" x="380" y="483" />
-        <di:waypoint xsi:type="dc:Point" x="421" y="483" />
+        <di:waypoint xsi:type="dc:Point" x="504" y="483" />
+        <di:waypoint xsi:type="dc:Point" x="531" y="483" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="355.5" y="468" width="90" height="0" />
+          <dc:Bounds x="472.5" y="468" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ServiceTask_0w9805b_di" bpmnElement="UpdateVnfIpv4OamAddress">
-        <dc:Bounds x="280" y="443" width="100" height="80" />
+        <dc:Bounds x="404" y="443" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0khqfnc_di" bpmnElement="SequenceFlow_0khqfnc">
-        <di:waypoint xsi:type="dc:Point" x="521" y="483" />
-        <di:waypoint xsi:type="dc:Point" x="561" y="483" />
+        <di:waypoint xsi:type="dc:Point" x="631" y="483" />
+        <di:waypoint xsi:type="dc:Point" x="654" y="483" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="496" y="468" width="90" height="0" />
+          <dc:Bounds x="597.5" y="468" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0yuz21z_di" bpmnElement="SequenceFlow_0yuz21z">
-        <di:waypoint xsi:type="dc:Point" x="661" y="483" />
-        <di:waypoint xsi:type="dc:Point" x="706" y="483" />
+        <di:waypoint xsi:type="dc:Point" x="754" y="483" />
+        <di:waypoint xsi:type="dc:Point" x="779" y="483" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="638.5" y="468" width="90" height="0" />
+          <dc:Bounds x="721.5" y="468" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ServiceTask_0v8naz9_di" bpmnElement="UpdateVfModuleContrailServiceInstanceFqdn">
-        <dc:Bounds x="561" y="443" width="100" height="80" />
+        <dc:Bounds x="654" y="443" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1n8gab5_di" bpmnElement="SequenceFlow_1n8gab5">
         <di:waypoint xsi:type="dc:Point" x="307" y="284" />
@@ -266,32 +287,32 @@
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0qfmmgt_di" bpmnElement="SequenceFlow_0qfmmgt">
         <di:waypoint xsi:type="dc:Point" x="754" y="108" />
-        <di:waypoint xsi:type="dc:Point" x="784" y="108" />
-        <di:waypoint xsi:type="dc:Point" x="784" y="149" />
+        <di:waypoint xsi:type="dc:Point" x="790" y="108" />
+        <di:waypoint xsi:type="dc:Point" x="790" y="149" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="724" y="86.5" width="90" height="13" />
+          <dc:Bounds x="727" y="86.5" width="90" height="13" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_14bu4ys_di" bpmnElement="SequenceFlow_14bu4ys">
-        <di:waypoint xsi:type="dc:Point" x="861" y="259" />
-        <di:waypoint xsi:type="dc:Point" x="898" y="259" />
+        <di:waypoint xsi:type="dc:Point" x="872" y="259" />
+        <di:waypoint xsi:type="dc:Point" x="1022" y="258" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="834.5" y="237.5" width="90" height="13" />
+          <dc:Bounds x="902" y="237" width="90" height="13" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ParallelGateway_02fjfb8_di" bpmnElement="ExclusiveGateway_1yvh16a">
-        <dc:Bounds x="811" y="234" width="50" height="50" />
+        <dc:Bounds x="822" y="234" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="790" y="287" width="90" height="13" />
+          <dc:Bounds x="801" y="287" width="90" height="13" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1mgunf3_di" bpmnElement="SequenceFlow_1mgunf3">
         <di:waypoint xsi:type="dc:Point" x="492" y="199" />
         <di:waypoint xsi:type="dc:Point" x="492" y="232" />
-        <di:waypoint xsi:type="dc:Point" x="784" y="232" />
-        <di:waypoint xsi:type="dc:Point" x="784" y="199" />
+        <di:waypoint xsi:type="dc:Point" x="790" y="232" />
+        <di:waypoint xsi:type="dc:Point" x="790" y="199" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="499" y="212" width="15" height="13" />
+          <dc:Bounds x="500.3082191780822" y="212" width="14" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ServiceTask_1vmz3zo_di" bpmnElement="Check_Audit">
@@ -326,11 +347,11 @@
         <dc:Bounds x="531" y="68" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1ut7n32_di" bpmnElement="SequenceFlow_1ut7n32">
-        <di:waypoint xsi:type="dc:Point" x="809" y="174" />
-        <di:waypoint xsi:type="dc:Point" x="836" y="174" />
-        <di:waypoint xsi:type="dc:Point" x="836" y="234" />
+        <di:waypoint xsi:type="dc:Point" x="815" y="174" />
+        <di:waypoint xsi:type="dc:Point" x="847" y="174" />
+        <di:waypoint xsi:type="dc:Point" x="847" y="234" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="777.5" y="152.5" width="90" height="13" />
+          <dc:Bounds x="786" y="152.5" width="90" height="13" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_1olwkdn_di" bpmnElement="ExclusiveGateway_1h2ystu" isMarkerVisible="true">
@@ -340,9 +361,60 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_1d1pmqz_di" bpmnElement="ExclusiveGateway_1pydilb" isMarkerVisible="true">
-        <dc:Bounds x="759" y="149" width="50" height="50" />
+        <dc:Bounds x="765" y="149" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="655" y="202" width="90" height="13" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="SubProcess_0grvkj2_di" bpmnElement="SubProcess_0grvkj2" isExpanded="true">
+        <dc:Bounds x="231" y="617" width="350" height="200" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="StartEvent_1euiddy_di" bpmnElement="StartEvent_1euiddy">
+        <dc:Bounds x="262" y="700" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="234" y="740" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="EndEvent_1gzq57j_di" bpmnElement="EndEvent_1gzq57j">
+        <dc:Bounds x="510" y="700" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="483" y="740" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ServiceTask_1isbxvo_di" bpmnElement="ServiceTask_1isbxvo">
+        <dc:Bounds x="353" y="678" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0xuodpy_di" bpmnElement="SequenceFlow_0xuodpy">
+        <di:waypoint xsi:type="dc:Point" x="298" y="718" />
+        <di:waypoint xsi:type="dc:Point" x="353" y="718" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="281.5" y="697" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1fhst92_di" bpmnElement="SequenceFlow_1fhst92">
+        <di:waypoint xsi:type="dc:Point" x="453" y="718" />
+        <di:waypoint xsi:type="dc:Point" x="510" y="718" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="437.5" y="697" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_179btn2_di" bpmnElement="SequenceFlow_179btn2">
+        <di:waypoint xsi:type="dc:Point" x="195" y="483" />
+        <di:waypoint xsi:type="dc:Point" x="276" y="483" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="235.5" y="462" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="IntermediateThrowEvent_1sftyjz_di" bpmnElement="aaiThrow">
+        <dc:Bounds x="1022" y="241" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1014" y="280" width="55" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="IntermediateCatchEvent_13y483m_di" bpmnElement="aaiCatch">
+        <dc:Bounds x="159" y="465" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="694" y="202" width="0" height="13" />
+          <dc:Bounds x="150" y="505" width="55" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
-- 
cgit 1.2.3-korg