AT&T 1712 and 1802 release code

This is code from AT&T's 1712 and 1802 releases.

Change-Id: Ie1e85851e94bc66c4d9514a0226c221939531a04
Issue-ID: SO-425
Signed-off-by: Rob Daugherty <rd472p@att.com>

5 files changed, 538 insertions, 289 deletions

diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/AppCClient.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/AppCClient.bpmn
new file mode 100644
index 0000000000..fb25363a76
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/AppCClient.bpmn
@@ -0,0 +1,127 @@
+<?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:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.9.0">
+  <bpmn:process id="AppCClient" name="AppCClient" isExecutable="true">
+    <bpmn:startEvent id="StartEvent_1" name="Start">
+      <bpmn:outgoing>SequenceFlow_1wz1rfg</bpmn:outgoing>
+    </bpmn:startEvent>
+    <bpmn:sequenceFlow id="SequenceFlow_1wz1rfg" sourceRef="StartEvent_1" targetRef="PreProcessRequest" />
+    <bpmn:scriptTask id="PreProcessRequest" name="PreProcessRequest" scriptFormat="groovy">
+      <bpmn:incoming>SequenceFlow_1wz1rfg</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_14vlkf4</bpmn:outgoing>
+      <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+def acc = new AppCClient()
+acc.preProcessRequest(execution)]]></bpmn:script>
+    </bpmn:scriptTask>
+    <bpmn:endEvent id="EndEvent_1k6463v">
+      <bpmn:incoming>SequenceFlow_1j937vi</bpmn:incoming>
+    </bpmn:endEvent>
+    <bpmn:sequenceFlow id="SequenceFlow_14vlkf4" sourceRef="PreProcessRequest" targetRef="Task_12dmd3n" />
+    <bpmn:sequenceFlow id="SequenceFlow_1j937vi" sourceRef="Task_12dmd3n" targetRef="EndEvent_1k6463v" />
+    <bpmn:scriptTask id="Task_12dmd3n" name="Call APP-C VNF Start" scriptFormat="groovy">
+      <bpmn:incoming>SequenceFlow_14vlkf4</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_1j937vi</bpmn:outgoing>
+      <bpmn:script><![CDATA[import org.onap.appc.client.lcm.model.Action
+import org.openecomp.mso.bpmn.common.scripts.*
+def acc = new AppCClient()
+acc.runAppcCommand(execution)]]></bpmn:script>
+    </bpmn:scriptTask>
+    <bpmn:subProcess id="SubProcess_1qgfsqz" triggeredByEvent="true">
+      <bpmn:startEvent id="StartEvent_0d3qxzd">
+        <bpmn:outgoing>SequenceFlow_1wi3avf</bpmn:outgoing>
+        <bpmn:errorEventDefinition />
+      </bpmn:startEvent>
+      <bpmn:endEvent id="EndEvent_187ulsw">
+        <bpmn:incoming>SequenceFlow_1gq753e</bpmn:incoming>
+      </bpmn:endEvent>
+      <bpmn:sequenceFlow id="SequenceFlow_1gq753e" sourceRef="Task_0a36o0m" targetRef="EndEvent_187ulsw" />
+      <bpmn:sequenceFlow id="SequenceFlow_1wi3avf" sourceRef="StartEvent_0d3qxzd" targetRef="Task_0a36o0m" />
+      <bpmn:scriptTask id="Task_0a36o0m" name="Process Error" scriptFormat="groovy">
+        <bpmn:incoming>SequenceFlow_1wi3avf</bpmn:incoming>
+        <bpmn:outgoing>SequenceFlow_1gq753e</bpmn:outgoing>
+        <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+
+ExceptionUtil ex = new ExceptionUtil()
+ex.processSubflowsBPMNException(execution)]]></bpmn:script>
+      </bpmn:scriptTask>
+    </bpmn:subProcess>
+  </bpmn:process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="AppCClient">
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
+        <dc:Bounds x="173" y="102" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="179" y="138" width="24" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1wz1rfg_di" bpmnElement="SequenceFlow_1wz1rfg">
+        <di:waypoint xsi:type="dc:Point" x="209" y="120" />
+        <di:waypoint xsi:type="dc:Point" x="306" y="119" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="257.5" y="98.5" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_0369vot_di" bpmnElement="PreProcessRequest">
+        <dc:Bounds x="306" y="79" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="EndEvent_1k6463v_di" bpmnElement="EndEvent_1k6463v">
+        <dc:Bounds x="844" y="102" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="817" y="142" width="90" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_14vlkf4_di" bpmnElement="SequenceFlow_14vlkf4">
+        <di:waypoint xsi:type="dc:Point" x="406" y="119" />
+        <di:waypoint xsi:type="dc:Point" x="471" y="119" />
+        <di:waypoint xsi:type="dc:Point" x="471" y="120" />
+        <di:waypoint xsi:type="dc:Point" x="520" y="120" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="441" y="113.5" width="90" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1j937vi_di" bpmnElement="SequenceFlow_1j937vi">
+        <di:waypoint xsi:type="dc:Point" x="620" y="120" />
+        <di:waypoint xsi:type="dc:Point" x="740" y="120" />
+        <di:waypoint xsi:type="dc:Point" x="740" y="120" />
+        <di:waypoint xsi:type="dc:Point" x="844" y="120" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="710" y="114" width="90" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_08gicz7_di" bpmnElement="Task_12dmd3n">
+        <dc:Bounds x="520" y="80" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="SubProcess_0l79snr_di" bpmnElement="SubProcess_1qgfsqz" isExpanded="true">
+        <dc:Bounds x="124" y="271" width="340" height="159" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="StartEvent_0d8xcpk_di" bpmnElement="StartEvent_0d3qxzd">
+        <dc:Bounds x="150" y="332" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="168" y="372" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="EndEvent_187ulsw_di" bpmnElement="EndEvent_187ulsw">
+        <dc:Bounds x="394" y="332" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="412" y="372" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1gq753e_di" bpmnElement="SequenceFlow_1gq753e">
+        <di:waypoint xsi:type="dc:Point" x="334" y="350" />
+        <di:waypoint xsi:type="dc:Point" x="394" y="350" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="364" y="329" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1wi3avf_di" bpmnElement="SequenceFlow_1wi3avf">
+        <di:waypoint xsi:type="dc:Point" x="186" y="350" />
+        <di:waypoint xsi:type="dc:Point" x="234" y="350" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="210" y="329" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_1wumcac_di" bpmnElement="Task_0a36o0m">
+        <dc:Bounds x="234" y="310" width="100" height="80" />
+      </bpmndi:BPMNShape>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</bpmn:definitions>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/DecomposeService.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/DecomposeService.bpmn
index 8a89b43cde..841964211e 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/DecomposeService.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/DecomposeService.bpmn
@@ -11,7 +11,7 @@
     <bpmn2:subProcess id="SubProcess_06d8lk8" name="Java Exception Handling Sub Process" triggeredByEvent="true">

       <bpmn2:startEvent id="StartEvent_0yljq9y">

         <bpmn2:outgoing>SequenceFlow_0tgrn11</bpmn2:outgoing>

-        <bpmn2:errorEventDefinition />

+        <bpmn2:errorEventDefinition errorRef="Error_1" />

       </bpmn2:startEvent>

       <bpmn2:endEvent id="EndEvent_117lkk3">

         <bpmn2:incoming>SequenceFlow_0g4aus9</bpmn2:incoming>

diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/Homing.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/Homing.bpmn
index a432417c21..481d1dfa6f 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/Homing.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/Homing.bpmn
@@ -1,259 +1,259 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="_vwRmIBsREeeIQtzUKIjH4g" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
-  <bpmn2:process id="Homing" name="Homing" isExecutable="true">
-    <bpmn2:startEvent id="StartEvent_1">
-      <bpmn2:outgoing>SequenceFlow_1x9usa6</bpmn2:outgoing>
-    </bpmn2:startEvent>
-    <bpmn2:scriptTask id="callSniro" name="Call Sniro" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_1x9usa6</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_10x3ocp</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
-Homing sniro = new Homing()
-sniro.callSniro(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_1x9usa6" sourceRef="StartEvent_1" targetRef="callSniro" />
-    <bpmn2:subProcess id="bpmnErrorSubprocess" name="Error Handling Subprocess" triggeredByEvent="true">
-      <bpmn2:endEvent id="EndEvent_07tjq3v">
-        <bpmn2:incoming>SequenceFlow_1rf4vs8</bpmn2:incoming>
-        <bpmn2:terminateEventDefinition />
-      </bpmn2:endEvent>
-      <bpmn2:startEvent id="StartEvent_1qiitb2">
-        <bpmn2:outgoing>SequenceFlow_00nlh7l</bpmn2:outgoing>
-        <bpmn2:errorEventDefinition />
-      </bpmn2:startEvent>
-      <bpmn2:scriptTask id="processMsoWorkflowException" name="Process Error" scriptFormat="groovy">
-        <bpmn2:incoming>SequenceFlow_00nlh7l</bpmn2:incoming>
-        <bpmn2:outgoing>SequenceFlow_1rf4vs8</bpmn2:outgoing>
+<?xml version="1.0" encoding="UTF-8"?>

+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="_vwRmIBsREeeIQtzUKIjH4g" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">

+  <bpmn2:process id="Homing" name="Homing" isExecutable="true">

+    <bpmn2:startEvent id="StartEvent_1">

+      <bpmn2:outgoing>SequenceFlow_1x9usa6</bpmn2:outgoing>

+    </bpmn2:startEvent>

+    <bpmn2:scriptTask id="callSniro" name="Call Sniro" scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_1x9usa6</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_10x3ocp</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

+Homing sniro = new Homing()

+sniro.callSniro(execution)]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:sequenceFlow id="SequenceFlow_1x9usa6" sourceRef="StartEvent_1" targetRef="callSniro" />

+    <bpmn2:subProcess id="bpmnErrorSubprocess" name="Error Handling Subprocess" triggeredByEvent="true">

+      <bpmn2:endEvent id="EndEvent_07tjq3v">

+        <bpmn2:incoming>SequenceFlow_1rf4vs8</bpmn2:incoming>

+        <bpmn2:terminateEventDefinition />

+      </bpmn2:endEvent>

+      <bpmn2:startEvent id="StartEvent_1qiitb2">

+        <bpmn2:outgoing>SequenceFlow_00nlh7l</bpmn2:outgoing>

+        <bpmn2:errorEventDefinition />

+      </bpmn2:startEvent>

+      <bpmn2:scriptTask id="processMsoWorkflowException" name="Process Error" scriptFormat="groovy">

+        <bpmn2:incoming>SequenceFlow_00nlh7l</bpmn2:incoming>

+        <bpmn2:outgoing>SequenceFlow_1rf4vs8</bpmn2:outgoing>

         <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

 ExceptionUtil ex = new ExceptionUtil()

-ex.processSubflowsBPMNException(execution)]]></bpmn2:script>
-      </bpmn2:scriptTask>
-      <bpmn2:sequenceFlow id="SequenceFlow_1rf4vs8" sourceRef="processMsoWorkflowException" targetRef="EndEvent_07tjq3v" />
-      <bpmn2:sequenceFlow id="SequenceFlow_00nlh7l" sourceRef="StartEvent_1qiitb2" targetRef="processMsoWorkflowException" />
-    </bpmn2:subProcess>
-    <bpmn2:subProcess id="javaExceptionSubProcess" name="Java Exception Sub Process" triggeredByEvent="true">
-      <bpmn2:scriptTask id="processJavaException" name="Process Error" scriptFormat="groovy">
-        <bpmn2:incoming>SequenceFlow_0kamg53</bpmn2:incoming>
-        <bpmn2:outgoing>SequenceFlow_1o7154s</bpmn2:outgoing>
+ex.processSubflowsBPMNException(execution)]]></bpmn2:script>

+      </bpmn2:scriptTask>

+      <bpmn2:sequenceFlow id="SequenceFlow_1rf4vs8" sourceRef="processMsoWorkflowException" targetRef="EndEvent_07tjq3v" />

+      <bpmn2:sequenceFlow id="SequenceFlow_00nlh7l" sourceRef="StartEvent_1qiitb2" targetRef="processMsoWorkflowException" />

+    </bpmn2:subProcess>

+    <bpmn2:subProcess id="javaExceptionSubProcess" name="Java Exception Sub Process" triggeredByEvent="true">

+      <bpmn2:scriptTask id="processJavaException" name="Process Error" scriptFormat="groovy">

+        <bpmn2:incoming>SequenceFlow_0kamg53</bpmn2:incoming>

+        <bpmn2:outgoing>SequenceFlow_1o7154s</bpmn2:outgoing>

         <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

 ExceptionUtil ex = new ExceptionUtil()

-ex.processJavaException(execution)]]></bpmn2:script>
-      </bpmn2:scriptTask>
-      <bpmn2:startEvent id="StartEvent_1fbpeuw">
-        <bpmn2:outgoing>SequenceFlow_0kamg53</bpmn2:outgoing>
-        <bpmn2:errorEventDefinition errorRef="Error_1lwpypa" />
-      </bpmn2:startEvent>
-      <bpmn2:endEvent id="EndEvent_0jbvnr0">
-        <bpmn2:incoming>SequenceFlow_1o7154s</bpmn2:incoming>
-        <bpmn2:terminateEventDefinition />
-      </bpmn2:endEvent>
-      <bpmn2:sequenceFlow id="SequenceFlow_0kamg53" name="" sourceRef="StartEvent_1fbpeuw" targetRef="processJavaException" />
-      <bpmn2:sequenceFlow id="SequenceFlow_1o7154s" name="" sourceRef="processJavaException" targetRef="EndEvent_0jbvnr0" />
-    </bpmn2:subProcess>
-    <bpmn2:scriptTask id="processHomingSolution" name="Process &#10;Homing Solutio&#10;" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_043r3j8</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_1h9opg9</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
-Homing homing = new Homing()
-homing.processHomingSolution(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:exclusiveGateway id="responseCheck" name="Response Ok?" default="badResponse">
-      <bpmn2:incoming>SequenceFlow_10x3ocp</bpmn2:incoming>
-      <bpmn2:outgoing>badResponse</bpmn2:outgoing>
-      <bpmn2:outgoing>goodResponse</bpmn2:outgoing>
-    </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="SequenceFlow_10x3ocp" sourceRef="callSniro" targetRef="responseCheck" />
-    <bpmn2:scriptTask id="assignError" name="Assign Error" scriptFormat="groovy">
-      <bpmn2:incoming>badResponse</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_0clfkld</bpmn2:outgoing>
+ex.processJavaException(execution)]]></bpmn2:script>

+      </bpmn2:scriptTask>

+      <bpmn2:startEvent id="StartEvent_1fbpeuw">

+        <bpmn2:outgoing>SequenceFlow_0kamg53</bpmn2:outgoing>

+        <bpmn2:errorEventDefinition errorRef="Error_1lwpypa" />

+      </bpmn2:startEvent>

+      <bpmn2:endEvent id="EndEvent_0jbvnr0">

+        <bpmn2:incoming>SequenceFlow_1o7154s</bpmn2:incoming>

+        <bpmn2:terminateEventDefinition />

+      </bpmn2:endEvent>

+      <bpmn2:sequenceFlow id="SequenceFlow_0kamg53" name="" sourceRef="StartEvent_1fbpeuw" targetRef="processJavaException" />

+      <bpmn2:sequenceFlow id="SequenceFlow_1o7154s" name="" sourceRef="processJavaException" targetRef="EndEvent_0jbvnr0" />

+    </bpmn2:subProcess>

+    <bpmn2:scriptTask id="processHomingSolution" name="Process &#10;Solution&#10;" scriptFormat="groovy">

+      <bpmn2:incoming>SequenceFlow_043r3j8</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_1h9opg9</bpmn2:outgoing>

+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*

+Homing homing = new Homing()

+homing.processHomingSolution(execution)]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:exclusiveGateway id="responseCheck" name="Response Ok?" default="badResponse">

+      <bpmn2:incoming>SequenceFlow_10x3ocp</bpmn2:incoming>

+      <bpmn2:outgoing>badResponse</bpmn2:outgoing>

+      <bpmn2:outgoing>goodResponse</bpmn2:outgoing>

+    </bpmn2:exclusiveGateway>

+    <bpmn2:sequenceFlow id="SequenceFlow_10x3ocp" sourceRef="callSniro" targetRef="responseCheck" />

+    <bpmn2:scriptTask id="assignError" name="Assign Error" scriptFormat="groovy">

+      <bpmn2:incoming>badResponse</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_0clfkld</bpmn2:outgoing>

       <bpmn2:script><![CDATA[int responseCode = execution.getVariable("syncResponseCode") 

 

 import org.openecomp.mso.bpmn.common.scripts.*

 ExceptionUtil ex = new ExceptionUtil()

-ex.buildAndThrowWorkflowException(execution, responseCode, "Received a Bad Sync Response from Sniro.")]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="badResponse" name="No" sourceRef="responseCheck" targetRef="assignError" />
-    <bpmn2:sequenceFlow id="SequenceFlow_0clfkld" sourceRef="assignError" targetRef="throwMSOWorkflowException" />
-    <bpmn2:endEvent id="throwMSOWorkflowException">
-      <bpmn2:incoming>SequenceFlow_0clfkld</bpmn2:incoming>
-      <bpmn2:errorEventDefinition errorRef="Error_10hit0u" />
-    </bpmn2:endEvent>
-    <bpmn2:sequenceFlow id="goodResponse" name="Yes" sourceRef="responseCheck" targetRef="receiveAsyncCallback">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("syncResponseCode") == 202}]]></bpmn2:conditionExpression>
-    </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="SequenceFlow_043r3j8" sourceRef="receiveAsyncCallback" targetRef="processHomingSolution" />
-    <bpmn2:callActivity id="receiveAsyncCallback" name="Receive Async Callback" calledElement="ReceiveWorkflowMessage" camunda:modelerTemplate="receiveWorkflowMessage">
-      <bpmn2:extensionElements>
-        <camunda:in source="true" target="isDebugLogEnabled" />
-        <camunda:out source="WorkflowException" target="WorkflowException" />
-        <camunda:in source="messageType" target="RCVWFMSG_messageType" />
-        <camunda:in source="correlator" target="RCVWFMSG_correlator" />
-        <camunda:in source="timeout" target="RCVWFMSG_timeout" />
-        <camunda:out source="WorkflowResponse" target="asyncCallbackResponse" />
-      </bpmn2:extensionElements>
-      <bpmn2:incoming>goodResponse</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_043r3j8</bpmn2:outgoing>
-    </bpmn2:callActivity>
-    <bpmn2:sequenceFlow id="SequenceFlow_1h9opg9" sourceRef="processHomingSolution" targetRef="EndEvent_0n56tas" />
-    <bpmn2:endEvent id="EndEvent_0n56tas">
-      <bpmn2:incoming>SequenceFlow_1h9opg9</bpmn2:incoming>
-      <bpmn2:terminateEventDefinition />
-    </bpmn2:endEvent>
-  </bpmn2:process>
-  <bpmn2:error id="Error_10hit0u" name="MSO Workflow Exception" errorCode="MSOWorkflowException" />
-  <bpmn2:error id="Error_1lwpypa" name="Java Lang Exception" errorCode="java.lang.Exception" />
-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Homing">
-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
-        <dc:Bounds x="147" y="275" width="36" height="36" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ScriptTask_0qmfpdr_di" bpmnElement="callSniro">
-        <dc:Bounds x="286" y="253" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1x9usa6_di" bpmnElement="SequenceFlow_1x9usa6">
-        <di:waypoint xsi:type="dc:Point" x="183" y="293" />
-        <di:waypoint xsi:type="dc:Point" x="286" y="293" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="235" y="278" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="SubProcess_16p12qo_di" bpmnElement="bpmnErrorSubprocess" isExpanded="true">
-        <dc:Bounds x="254" y="496" width="409" height="168" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="SubProcess_12gjiy8_di" bpmnElement="javaExceptionSubProcess" isExpanded="true">
-        <dc:Bounds x="284" y="679" width="350" height="159" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="EndEvent_07tjq3v_di" bpmnElement="EndEvent_07tjq3v">
-        <dc:Bounds x="579" y="570" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="597" y="611" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="StartEvent_1qiitb2_di" bpmnElement="StartEvent_1qiitb2">
-        <dc:Bounds x="299" y="570" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="317" y="611" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ScriptTask_03hs6s9_di" bpmnElement="processMsoWorkflowException">
-        <dc:Bounds x="406" y="548" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ScriptTask_19gqykh_di" bpmnElement="processJavaException">
-        <dc:Bounds x="410" y="727" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="StartEvent_1fbpeuw_di" bpmnElement="StartEvent_1fbpeuw">
-        <dc:Bounds x="318" y="749" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="336" y="790" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="EndEvent_0jbvnr0_di" bpmnElement="EndEvent_0jbvnr0">
-        <dc:Bounds x="567" y="749" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="585" y="790" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1rf4vs8_di" bpmnElement="SequenceFlow_1rf4vs8">
-        <di:waypoint xsi:type="dc:Point" x="506" y="588" />
-        <di:waypoint xsi:type="dc:Point" x="579" y="588" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="543" y="573" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_00nlh7l_di" bpmnElement="SequenceFlow_00nlh7l">
-        <di:waypoint xsi:type="dc:Point" x="335" y="588" />
-        <di:waypoint xsi:type="dc:Point" x="363" y="588" />
-        <di:waypoint xsi:type="dc:Point" x="363" y="588" />
-        <di:waypoint xsi:type="dc:Point" x="406" y="588" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="378" y="588" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0kamg53_di" bpmnElement="SequenceFlow_0kamg53">
-        <di:waypoint xsi:type="dc:Point" x="354" y="767" />
-        <di:waypoint xsi:type="dc:Point" x="410" y="767" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="382" y="752" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_1o7154s_di" bpmnElement="SequenceFlow_1o7154s">
-        <di:waypoint xsi:type="dc:Point" x="510" y="767" />
-        <di:waypoint xsi:type="dc:Point" x="567" y="767" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="539" y="752" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ScriptTask_1aapkvq_di" bpmnElement="processHomingSolution">
-        <dc:Bounds x="630" y="325" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ExclusiveGateway_03gt5b8_di" bpmnElement="responseCheck" isMarkerVisible="true">
-        <dc:Bounds x="419" y="268" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="474" y="287" width="74" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_10x3ocp_di" bpmnElement="SequenceFlow_10x3ocp">
-        <di:waypoint xsi:type="dc:Point" x="386" y="293" />
-        <di:waypoint xsi:type="dc:Point" x="419" y="293" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="403" y="278" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ScriptTask_0ikcqeo_di" bpmnElement="assignError">
-        <dc:Bounds x="490" y="176" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1m1c9nu_di" bpmnElement="badResponse">
-        <di:waypoint xsi:type="dc:Point" x="444" y="268" />
-        <di:waypoint xsi:type="dc:Point" x="444" y="216" />
-        <di:waypoint xsi:type="dc:Point" x="490" y="216" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="451" y="226" width="14" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0clfkld_di" bpmnElement="SequenceFlow_0clfkld">
-        <di:waypoint xsi:type="dc:Point" x="590" y="216" />
-        <di:waypoint xsi:type="dc:Point" x="662" y="216" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="626" y="201" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="EndEvent_13ejfwp_di" bpmnElement="throwMSOWorkflowException">
-        <dc:Bounds x="662" y="198" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="680" y="234" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1o3br3u_di" bpmnElement="goodResponse">
-        <di:waypoint xsi:type="dc:Point" x="444" y="318" />
-        <di:waypoint xsi:type="dc:Point" x="444" y="365" />
-        <di:waypoint xsi:type="dc:Point" x="490" y="365" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="447" y="339.5" width="18" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_043r3j8_di" bpmnElement="SequenceFlow_043r3j8">
-        <di:waypoint xsi:type="dc:Point" x="590" y="365" />
-        <di:waypoint xsi:type="dc:Point" x="630" y="365" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="610" y="350" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="CallActivity_031b5m3_di" bpmnElement="receiveAsyncCallback">
-        <dc:Bounds x="490" y="325" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1h9opg9_di" bpmnElement="SequenceFlow_1h9opg9">
-        <di:waypoint xsi:type="dc:Point" x="730" y="365" />
-        <di:waypoint xsi:type="dc:Point" x="825" y="365" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="778" y="350" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="EndEvent_0ougemc_di" bpmnElement="EndEvent_0n56tas">
-        <dc:Bounds x="825" y="347" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="843" y="383" width="0" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-    </bpmndi:BPMNPlane>
-  </bpmndi:BPMNDiagram>
-</bpmn2:definitions>
+ex.buildAndThrowWorkflowException(execution, responseCode, "Received a Bad Sync Response from Sniro.")]]></bpmn2:script>

+    </bpmn2:scriptTask>

+    <bpmn2:sequenceFlow id="badResponse" name="No" sourceRef="responseCheck" targetRef="assignError" />

+    <bpmn2:sequenceFlow id="SequenceFlow_0clfkld" sourceRef="assignError" targetRef="throwMSOWorkflowException" />

+    <bpmn2:endEvent id="throwMSOWorkflowException">

+      <bpmn2:incoming>SequenceFlow_0clfkld</bpmn2:incoming>

+      <bpmn2:errorEventDefinition errorRef="Error_10hit0u" />

+    </bpmn2:endEvent>

+    <bpmn2:sequenceFlow id="goodResponse" name="Yes" sourceRef="responseCheck" targetRef="receiveAsyncCallback">

+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("syncResponseCode") == 202}]]></bpmn2:conditionExpression>

+    </bpmn2:sequenceFlow>

+    <bpmn2:sequenceFlow id="SequenceFlow_043r3j8" sourceRef="receiveAsyncCallback" targetRef="processHomingSolution" />

+    <bpmn2:callActivity id="receiveAsyncCallback" name="Receive Async Callback" calledElement="ReceiveWorkflowMessage" camunda:modelerTemplate="receiveWorkflowMessage">

+      <bpmn2:extensionElements>

+        <camunda:in source="true" target="isDebugLogEnabled" />

+        <camunda:out source="WorkflowException" target="WorkflowException" />

+        <camunda:in source="messageType" target="RCVWFMSG_messageType" />

+        <camunda:in source="correlator" target="RCVWFMSG_correlator" />

+        <camunda:in source="timeout" target="RCVWFMSG_timeout" />

+        <camunda:out source="WorkflowResponse" target="asyncCallbackResponse" />

+      </bpmn2:extensionElements>

+      <bpmn2:incoming>goodResponse</bpmn2:incoming>

+      <bpmn2:outgoing>SequenceFlow_043r3j8</bpmn2:outgoing>

+    </bpmn2:callActivity>

+    <bpmn2:sequenceFlow id="SequenceFlow_1h9opg9" sourceRef="processHomingSolution" targetRef="EndEvent_0n56tas" />

+    <bpmn2:endEvent id="EndEvent_0n56tas">

+      <bpmn2:incoming>SequenceFlow_1h9opg9</bpmn2:incoming>

+      <bpmn2:terminateEventDefinition />

+    </bpmn2:endEvent>

+  </bpmn2:process>

+  <bpmn2:error id="Error_10hit0u" name="MSO Workflow Exception" errorCode="MSOWorkflowException" />

+  <bpmn2:error id="Error_1lwpypa" name="Java Lang Exception" errorCode="java.lang.Exception" />

+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">

+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Homing">

+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">

+        <dc:Bounds x="147" y="275" width="36" height="36" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="ScriptTask_0qmfpdr_di" bpmnElement="callSniro">

+        <dc:Bounds x="286" y="253" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_1x9usa6_di" bpmnElement="SequenceFlow_1x9usa6">

+        <di:waypoint xsi:type="dc:Point" x="183" y="293" />

+        <di:waypoint xsi:type="dc:Point" x="286" y="293" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="235" y="278" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="SubProcess_16p12qo_di" bpmnElement="bpmnErrorSubprocess" isExpanded="true">

+        <dc:Bounds x="254" y="496" width="409" height="168" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="SubProcess_12gjiy8_di" bpmnElement="javaExceptionSubProcess" isExpanded="true">

+        <dc:Bounds x="284" y="679" width="350" height="159" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="EndEvent_07tjq3v_di" bpmnElement="EndEvent_07tjq3v">

+        <dc:Bounds x="579" y="570" width="36" height="36" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="597" y="611" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="StartEvent_1qiitb2_di" bpmnElement="StartEvent_1qiitb2">

+        <dc:Bounds x="299" y="570" width="36" height="36" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="317" y="611" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="ScriptTask_03hs6s9_di" bpmnElement="processMsoWorkflowException">

+        <dc:Bounds x="406" y="548" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="ScriptTask_19gqykh_di" bpmnElement="processJavaException">

+        <dc:Bounds x="410" y="727" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="StartEvent_1fbpeuw_di" bpmnElement="StartEvent_1fbpeuw">

+        <dc:Bounds x="318" y="749" width="36" height="36" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="336" y="790" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="EndEvent_0jbvnr0_di" bpmnElement="EndEvent_0jbvnr0">

+        <dc:Bounds x="567" y="749" width="36" height="36" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="585" y="790" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_1rf4vs8_di" bpmnElement="SequenceFlow_1rf4vs8">

+        <di:waypoint xsi:type="dc:Point" x="506" y="588" />

+        <di:waypoint xsi:type="dc:Point" x="579" y="588" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="543" y="573" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_00nlh7l_di" bpmnElement="SequenceFlow_00nlh7l">

+        <di:waypoint xsi:type="dc:Point" x="335" y="588" />

+        <di:waypoint xsi:type="dc:Point" x="363" y="588" />

+        <di:waypoint xsi:type="dc:Point" x="363" y="588" />

+        <di:waypoint xsi:type="dc:Point" x="406" y="588" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="378" y="588" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_0kamg53_di" bpmnElement="SequenceFlow_0kamg53">

+        <di:waypoint xsi:type="dc:Point" x="354" y="767" />

+        <di:waypoint xsi:type="dc:Point" x="410" y="767" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="382" y="752" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_1o7154s_di" bpmnElement="SequenceFlow_1o7154s">

+        <di:waypoint xsi:type="dc:Point" x="510" y="767" />

+        <di:waypoint xsi:type="dc:Point" x="567" y="767" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="539" y="752" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="ScriptTask_1aapkvq_di" bpmnElement="processHomingSolution">

+        <dc:Bounds x="630" y="325" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="ExclusiveGateway_03gt5b8_di" bpmnElement="responseCheck" isMarkerVisible="true">

+        <dc:Bounds x="419" y="268" width="50" height="50" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="474" y="287" width="74" height="12" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_10x3ocp_di" bpmnElement="SequenceFlow_10x3ocp">

+        <di:waypoint xsi:type="dc:Point" x="386" y="293" />

+        <di:waypoint xsi:type="dc:Point" x="419" y="293" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="403" y="278" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="ScriptTask_0ikcqeo_di" bpmnElement="assignError">

+        <dc:Bounds x="490" y="176" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_1m1c9nu_di" bpmnElement="badResponse">

+        <di:waypoint xsi:type="dc:Point" x="444" y="268" />

+        <di:waypoint xsi:type="dc:Point" x="444" y="216" />

+        <di:waypoint xsi:type="dc:Point" x="490" y="216" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="451" y="226" width="14" height="12" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_0clfkld_di" bpmnElement="SequenceFlow_0clfkld">

+        <di:waypoint xsi:type="dc:Point" x="590" y="216" />

+        <di:waypoint xsi:type="dc:Point" x="662" y="216" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="626" y="201" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="EndEvent_13ejfwp_di" bpmnElement="throwMSOWorkflowException">

+        <dc:Bounds x="662" y="198" width="36" height="36" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="680" y="234" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_1o3br3u_di" bpmnElement="goodResponse">

+        <di:waypoint xsi:type="dc:Point" x="444" y="318" />

+        <di:waypoint xsi:type="dc:Point" x="444" y="365" />

+        <di:waypoint xsi:type="dc:Point" x="490" y="365" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="447" y="339.5" width="18" height="12" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_043r3j8_di" bpmnElement="SequenceFlow_043r3j8">

+        <di:waypoint xsi:type="dc:Point" x="590" y="365" />

+        <di:waypoint xsi:type="dc:Point" x="630" y="365" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="610" y="350" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="CallActivity_031b5m3_di" bpmnElement="receiveAsyncCallback">

+        <dc:Bounds x="490" y="325" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_1h9opg9_di" bpmnElement="SequenceFlow_1h9opg9">

+        <di:waypoint xsi:type="dc:Point" x="730" y="365" />

+        <di:waypoint xsi:type="dc:Point" x="825" y="365" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="778" y="350" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="EndEvent_0ougemc_di" bpmnElement="EndEvent_0n56tas">

+        <dc:Bounds x="825" y="347" width="36" height="36" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="843" y="383" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+    </bpmndi:BPMNPlane>

+  </bpmndi:BPMNDiagram>

+</bpmn2:definitions>

diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/ManualHandling.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/ManualHandling.bpmn
index 2f30864c39..4d31eee45a 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/ManualHandling.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/ManualHandling.bpmn
@@ -5,7 +5,7 @@
       <bpmn2:outgoing>SequenceFlow_0jav6cu</bpmn2:outgoing>
     </bpmn2:startEvent>
     <bpmn2:endEvent id="EndEvent_3">
-      <bpmn2:incoming>SequenceFlow_192yimz</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_14cyk9v</bpmn2:incoming>
     </bpmn2:endEvent>
     <bpmn2:subProcess id="SubProcess_06d8lk8" name="Java Exception Handling Sub Process" triggeredByEvent="true">
       <bpmn2:startEvent id="StartEvent_0yljq9y">
@@ -26,15 +26,7 @@ exceptionUtil.processJavaException(execution)]]></bpmn2:script>
       <bpmn2:sequenceFlow id="SequenceFlow_0g4aus9" sourceRef="processJavaError" targetRef="EndEvent_117lkk3" />
     </bpmn2:subProcess>
     <bpmn2:sequenceFlow id="SequenceFlow_0jav6cu" sourceRef="createSI_startEvent" targetRef="Task_1qrt7xw" />
-    <bpmn2:sequenceFlow id="SequenceFlow_0zgg47r" sourceRef="Task_1qrt7xw" targetRef="ManualHandlingUserTask" />
-    <bpmn2:scriptTask id="Task_1qrt7xw" name="PreProcess Request" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_0jav6cu</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_0zgg47r</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
-def mh = new ManualHandling()
-mh.preProcessRequest(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_192yimz" sourceRef="ManualHandlingUserTask" targetRef="EndEvent_3" />
+    <bpmn2:sequenceFlow id="SequenceFlow_192yimz" sourceRef="ManualHandlingUserTask" targetRef="Task_0r60vxk" />
     <bpmn2:userTask id="ManualHandlingUserTask" name="Manual Handling User Task">
       <bpmn2:extensionElements>
         <camunda:taskListener event="complete">
@@ -51,9 +43,87 @@ def mh = new ManualHandling()
 mh.setTaskVariables(task)]]></camunda:script>
         </camunda:taskListener>
       </bpmn2:extensionElements>
-      <bpmn2:incoming>SequenceFlow_0zgg47r</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_0igra4l</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_192yimz</bpmn2:outgoing>
     </bpmn2:userTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_0mbjrvr" sourceRef="Task_137bzdi" targetRef="Task_1kuxfdu" />
+    <bpmn2:sequenceFlow id="SequenceFlow_0b84ki5" sourceRef="Task_1kuxfdu" targetRef="CreateAOTSRubyTicket" />
+    <bpmn2:sequenceFlow id="SequenceFlow_0zer29a" sourceRef="Task_0r60vxk" targetRef="Task_02xybqx" />
+    <bpmn2:sequenceFlow id="SequenceFlow_14cyk9v" sourceRef="Task_02xybqx" targetRef="EndEvent_3" />
+    <bpmn2:serviceTask id="Task_1kuxfdu" name="Update Infra DB Status to PENDING_MANUAL_TASK">
+      <bpmn2:extensionElements>
+        <camunda:connector>
+          <camunda:inputOutput>
+            <camunda:inputParameter name="url">${URN_mso_adapters_openecomp_db_endpoint}</camunda:inputParameter>
+            <camunda:inputParameter name="payload"><![CDATA[${execution.getVariable("setUpdateDBstatusPayload")}]]></camunda:inputParameter>
+            <camunda:inputParameter name="headers">
+              <camunda:map>
+                <camunda:entry key="content-type">application/soap+xml</camunda:entry>
+                <camunda:entry key="Authorization">#{BasicAuthHeaderValueDB}</camunda:entry>
+              </camunda:map>
+            </camunda:inputParameter>
+            <camunda:inputParameter name="method">POST</camunda:inputParameter>
+            <camunda:outputParameter name="updateRequestResponse"><![CDATA[${statusCode == null || statusCode == 204 ? "" : response}]]></camunda:outputParameter>
+            <camunda:outputParameter name="updateRequestResponseCode">${statusCode}</camunda:outputParameter>
+          </camunda:inputOutput>
+          <camunda:connectorId>soap-http-connector</camunda:connectorId>
+        </camunda:connector>
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_0mbjrvr</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0b84ki5</bpmn2:outgoing>
+    </bpmn2:serviceTask>
+    <bpmn2:scriptTask id="Task_137bzdi" name="Prepare Requests DB Status Update to PENDING_MANUAL_TASK" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_0zgg47r</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0mbjrvr</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+def mh = new ManualHandling()
+mh.prepareRequestsDBStatusUpdate(execution, "PENDING_MANUAL_TASK")]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:scriptTask id="Task_0r60vxk" name="Prepare Requests DB Status Update to IN_PROGRESS" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_192yimz</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0zer29a</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+def mh = new ManualHandling()
+mh.prepareRequestsDBStatusUpdate(execution, "IN_PROGRESS")]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:serviceTask id="Task_02xybqx" name="Update Infra DB Status to IN_PROGRESS">
+      <bpmn2:extensionElements>
+        <camunda:connector>
+          <camunda:inputOutput>
+            <camunda:inputParameter name="url">${URN_mso_adapters_openecomp_db_endpoint}</camunda:inputParameter>
+            <camunda:inputParameter name="payload"><![CDATA[${execution.getVariable("setUpdateDBstatusPayload")}]]></camunda:inputParameter>
+            <camunda:inputParameter name="headers">
+              <camunda:map>
+                <camunda:entry key="content-type">application/soap+xml</camunda:entry>
+                <camunda:entry key="Authorization">#{BasicAuthHeaderValueDB}</camunda:entry>
+              </camunda:map>
+            </camunda:inputParameter>
+            <camunda:inputParameter name="method">POST</camunda:inputParameter>
+            <camunda:outputParameter name="updateRequestResponse"><![CDATA[${statusCode == null || statusCode == 204 ? "" : response}]]></camunda:outputParameter>
+            <camunda:outputParameter name="updateRequestResponseCode">${statusCode}</camunda:outputParameter>
+          </camunda:inputOutput>
+          <camunda:connectorId>soap-http-connector</camunda:connectorId>
+        </camunda:connector>
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_0zer29a</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_14cyk9v</bpmn2:outgoing>
+    </bpmn2:serviceTask>
+    <bpmn2:scriptTask id="Task_1qrt7xw" name="PreProcess Request" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_0jav6cu</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0zgg47r</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+def mh = new ManualHandling()
+mh.preProcessRequest(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_0zgg47r" sourceRef="Task_1qrt7xw" targetRef="Task_137bzdi" />
+    <bpmn2:sequenceFlow id="SequenceFlow_0igra4l" sourceRef="CreateAOTSRubyTicket" targetRef="ManualHandlingUserTask" />
+    <bpmn2:scriptTask id="CreateAOTSRubyTicket" name="Create AOTS Ruby Ticket" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_0b84ki5</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0igra4l</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+def mh = new ManualHandling()
+mh.createAOTSTicket(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
   </bpmn2:process>
   <bpmn2:error id="Error_2" name="MSOWorkflowException" errorCode="MSOWorkflowException" />
   <bpmn2:error id="Error_1" name="java.lang.Exception" errorCode="java.lang.Exception" />
@@ -66,69 +136,119 @@ mh.setTaskVariables(task)]]></camunda:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_177" bpmnElement="EndEvent_3">
-        <dc:Bounds x="598" y="79" width="36" height="36" />
+        <dc:Bounds x="1286" y="79" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="616" y="120" width="0" height="0" />
+          <dc:Bounds x="1304" y="120" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="SubProcess_06d8lk8_di" bpmnElement="SubProcess_06d8lk8" isExpanded="true">
-        <dc:Bounds x="142" y="243" width="417" height="161" />
+        <dc:Bounds x="137" y="408" width="417" height="161" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="StartEvent_0yljq9y_di" bpmnElement="StartEvent_0yljq9y">
-        <dc:Bounds x="179" y="310" width="36" height="36" />
+        <dc:Bounds x="174" y="475" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="197" y="351" width="0" height="0" />
+          <dc:Bounds x="192" y="516" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_117lkk3_di" bpmnElement="EndEvent_117lkk3">
-        <dc:Bounds x="465" y="310" width="36" height="36" />
+        <dc:Bounds x="460" y="475" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="483" y="351" width="0" height="0" />
+          <dc:Bounds x="478" y="516" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0tgrn11_di" bpmnElement="SequenceFlow_0tgrn11">
-        <di:waypoint xsi:type="dc:Point" x="215" y="328" />
-        <di:waypoint xsi:type="dc:Point" x="290" y="328" />
+        <di:waypoint xsi:type="dc:Point" x="210" y="493" />
+        <di:waypoint xsi:type="dc:Point" x="285" y="493" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="253" y="313" width="0" height="0" />
+          <dc:Bounds x="248" y="478" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_0b5155c_di" bpmnElement="processJavaError">
-        <dc:Bounds x="290" y="288" width="100" height="80" />
+        <dc:Bounds x="285" y="453" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0g4aus9_di" bpmnElement="SequenceFlow_0g4aus9">
-        <di:waypoint xsi:type="dc:Point" x="390" y="328" />
-        <di:waypoint xsi:type="dc:Point" x="465" y="328" />
+        <di:waypoint xsi:type="dc:Point" x="385" y="493" />
+        <di:waypoint xsi:type="dc:Point" x="460" y="493" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="428" y="313" width="0" height="0" />
+          <dc:Bounds x="423" y="478" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0jav6cu_di" bpmnElement="SequenceFlow_0jav6cu">
         <di:waypoint xsi:type="dc:Point" x="188" y="97" />
         <di:waypoint xsi:type="dc:Point" x="238" y="97" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="213" y="82" width="0" height="0" />
+          <dc:Bounds x="214" y="82" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0zgg47r_di" bpmnElement="SequenceFlow_0zgg47r">
-        <di:waypoint xsi:type="dc:Point" x="338" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="413" y="97" />
+      <bpmndi:BPMNEdge id="SequenceFlow_192yimz_di" bpmnElement="SequenceFlow_192yimz">
+        <di:waypoint xsi:type="dc:Point" x="944" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="982" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="963" y="82" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="UserTask_1krqrz1_di" bpmnElement="ManualHandlingUserTask">
+        <dc:Bounds x="844" y="57" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0mbjrvr_di" bpmnElement="SequenceFlow_0mbjrvr">
+        <di:waypoint xsi:type="dc:Point" x="483" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="527" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="505" y="82" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0b84ki5_di" bpmnElement="SequenceFlow_0b84ki5">
+        <di:waypoint xsi:type="dc:Point" x="627" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="689" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="658" y="82" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0zer29a_di" bpmnElement="SequenceFlow_0zer29a">
+        <di:waypoint xsi:type="dc:Point" x="1082" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="1128" y="97" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="376" y="82" width="0" height="0" />
+          <dc:Bounds x="1105" y="82" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_14cyk9v_di" bpmnElement="SequenceFlow_14cyk9v">
+        <di:waypoint xsi:type="dc:Point" x="1228" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="1286" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1257" y="82" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ServiceTask_0c0yopb_di" bpmnElement="Task_1kuxfdu">
+        <dc:Bounds x="527" y="57" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ScriptTask_1o2jyrv_di" bpmnElement="Task_137bzdi">
+        <dc:Bounds x="383" y="57" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ScriptTask_1mjq23a_di" bpmnElement="Task_0r60vxk">
+        <dc:Bounds x="982" y="57" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ServiceTask_1hc2ewj_di" bpmnElement="Task_02xybqx">
+        <dc:Bounds x="1128" y="57" width="100" height="80" />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_055s81f_di" bpmnElement="Task_1qrt7xw">
         <dc:Bounds x="238" y="57" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_192yimz_di" bpmnElement="SequenceFlow_192yimz">
-        <di:waypoint xsi:type="dc:Point" x="513" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="598" y="97" />
+      <bpmndi:BPMNEdge id="SequenceFlow_0zgg47r_di" bpmnElement="SequenceFlow_0zgg47r">
+        <di:waypoint xsi:type="dc:Point" x="338" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="383" y="97" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="556" y="82" width="0" height="0" />
+          <dc:Bounds x="361" y="82" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="UserTask_1krqrz1_di" bpmnElement="ManualHandlingUserTask">
-        <dc:Bounds x="413" y="57" width="100" height="80" />
+      <bpmndi:BPMNEdge id="SequenceFlow_0igra4l_di" bpmnElement="SequenceFlow_0igra4l">
+        <di:waypoint xsi:type="dc:Point" x="789" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="844" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="817" y="82" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_0yhlgfw_di" bpmnElement="CreateAOTSRubyTicket">
+        <dc:Bounds x="689" y="57" width="100" height="80" />
       </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/RainyDayHandler.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/RainyDayHandler.bpmn
index 2638d85a8a..8183469798 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/RainyDayHandler.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/RainyDayHandler.bpmn
@@ -64,9 +64,11 @@ rdh.queryPolicy(execution)]]></bpmn2:script>
         <camunda:in source="workStep" target="workStep" />
         <camunda:in source="errorCode" target="errorCode" />
         <camunda:in source="errorText" target="errorText" />
-        <camunda:in source="RFH_validResponses" target="validResponses" />
+        <camunda:in source="validResponses" target="validResponses" />
         <camunda:out source="WorkflowException" target="WorkflowException" />
         <camunda:out source="responseValue" target="handlingCode" />
+        <camunda:in source="vnfName" target="vnfName" />
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_0navei4</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1f0bjoy</bpmn2:outgoing>