Containerization feature of SO

Change-Id: I95381232eeefcd247a66a5cec370a8ce1c288e18
Issue-ID: SO-670
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

1 files changed, 77 insertions, 273 deletions

diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/Homing.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/Homing.bpmn
index 91a6546621..fdb54116b8 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/Homing.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/Homing.bpmn
@@ -1,17 +1,22 @@
 <?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.11.3" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<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.10.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>sniroCall</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_0gajic6</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
-SniroHoming homing = new SniroHoming()
-homing.callSniro(execution)]]></bpmn2:script>
+    <bpmn2:scriptTask id="callSniro" name="&#10;Call&#10;Sniro/Oof&#10;" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_1x9usa6</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0lc15i7</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+if(execution.getVariable("homingService") == "oof"){
+  OofHoming oofHoming = new OofHoming()
+  oofHoming.callOof(execution)
+}else{
+  SniroHomingV1 sniroHoming = new SniroHomingV1()
+  sniroHoming.callSniro(execution)
+}]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_1x9usa6" sourceRef="StartEvent_1" targetRef="homingSolutionCheck" />
+    <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>
@@ -24,7 +29,7 @@ homing.callSniro(execution)]]></bpmn2:script>
       <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.*
+        <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 ExceptionUtil ex = new ExceptionUtil()
 ex.processSubflowsBPMNException(execution)]]></bpmn2:script>
       </bpmn2:scriptTask>
@@ -35,7 +40,7 @@ ex.processSubflowsBPMNException(execution)]]></bpmn2:script>
       <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.*
+        <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 ExceptionUtil ex = new ExceptionUtil()
 ex.processJavaException(execution)]]></bpmn2:script>
       </bpmn2:scriptTask>
@@ -50,37 +55,18 @@ ex.processJavaException(execution)]]></bpmn2:script>
       <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="processSniroHomingSolution" name="Process &#10;Sniro Homing Solution&#10;" scriptFormat="groovy">
-      <bpmn2:incoming>sniroProcess</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_1h9opg9</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
-SniroHoming homing = new SniroHoming()
-homing.processHomingSolution(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:exclusiveGateway id="responseCheck" name="Response Ok?" default="badResponse">
-      <bpmn2:incoming>SequenceFlow_12t0lqb</bpmn2:incoming>
-      <bpmn2:incoming>SequenceFlow_0gajic6</bpmn2:incoming>
-      <bpmn2:outgoing>badResponse</bpmn2:outgoing>
-      <bpmn2:outgoing>goodResponse</bpmn2:outgoing>
-    </bpmn2:exclusiveGateway>
-    <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/OOF.")]]></bpmn2:script>
+    <bpmn2:scriptTask id="processSniroHomingSolution" name="&#10;Process Solution&#10;" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_1fipbmk</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_01apjvo</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+if(execution.getVariable("homingService") == "oof"){
+  OofHoming oofHoming = new OofHoming()
+  oofHoming.processHomingSolution(execution)
+}else{
+  SniroHomingV1  sniroHoming = new SniroHomingV1 ()
+  sniroHoming.processHomingSolution(execution)
+}]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="badResponse" name="No" sourceRef="responseCheck" targetRef="assignError" />
-    <bpmn2:sequenceFlow id="SequenceFlow_0clfkld" sourceRef="assignError" targetRef="throwMSOWorkflowException2" />
-    <bpmn2:endEvent id="throwMSOWorkflowException2">
-      <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:callActivity id="receiveAsyncCallback" name="Receive Async Callback" camunda:modelerTemplate="receiveWorkflowMessage" calledElement="ReceiveWorkflowMessage">
       <bpmn2:extensionElements>
         <camunda:in source="true" target="isDebugLogEnabled" />
@@ -90,71 +76,16 @@ ex.buildAndThrowWorkflowException(execution, responseCode, "Received a Bad Sync
         <camunda:in source="timeout" target="RCVWFMSG_timeout" />
         <camunda:out source="WorkflowResponse" target="asyncCallbackResponse" />
       </bpmn2:extensionElements>
-      <bpmn2:incoming>goodResponse</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_0lc15i7</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1fipbmk</bpmn2:outgoing>
     </bpmn2:callActivity>
-    <bpmn2:sequenceFlow id="SequenceFlow_1h9opg9" sourceRef="processSniroHomingSolution" targetRef="EndEvent_0n56tas" />
-    <bpmn2:endEvent id="EndEvent_0n56tas">
-      <bpmn2:incoming>SequenceFlow_1h9opg9</bpmn2:incoming>
-      <bpmn2:incoming>SequenceFlow_07u9d7f</bpmn2:incoming>
+    <bpmn2:sequenceFlow id="SequenceFlow_1fipbmk" sourceRef="receiveAsyncCallback" targetRef="processSniroHomingSolution" />
+    <bpmn2:sequenceFlow id="SequenceFlow_01apjvo" sourceRef="processSniroHomingSolution" targetRef="EndEvent_0rrbz2a" />
+    <bpmn2:endEvent id="EndEvent_0rrbz2a">
+      <bpmn2:incoming>SequenceFlow_01apjvo</bpmn2:incoming>
       <bpmn2:terminateEventDefinition />
     </bpmn2:endEvent>
-    <bpmn2:exclusiveGateway id="homingSolutionCheck" name="Which homing Solution?" default="SequenceFlow_02eywxz">
-      <bpmn2:incoming>SequenceFlow_1x9usa6</bpmn2:incoming>
-      <bpmn2:outgoing>sniroCall</bpmn2:outgoing>
-      <bpmn2:outgoing>oofCall</bpmn2:outgoing>
-      <bpmn2:outgoing>SequenceFlow_02eywxz</bpmn2:outgoing>
-    </bpmn2:exclusiveGateway>
-    <bpmn2:scriptTask id="ScriptTask_1pkjo1d" name="Call OOF" scriptFormat="groovy">
-      <bpmn2:incoming>oofCall</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_12t0lqb</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
-OofHoming homing = new OofHoming()
-homing.callOof(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="sniroCall" name="Sniro" sourceRef="homingSolutionCheck" targetRef="callSniro">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("homingService") == "sniro"}]]></bpmn2:conditionExpression>
-    </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="oofCall" name="OOF" sourceRef="homingSolutionCheck" targetRef="ScriptTask_1pkjo1d">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("homingService") == "oof"}]]></bpmn2:conditionExpression>
-    </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="SequenceFlow_12t0lqb" sourceRef="ScriptTask_1pkjo1d" targetRef="responseCheck" />
-    <bpmn2:sequenceFlow id="SequenceFlow_0gajic6" sourceRef="callSniro" targetRef="responseCheck" />
-    <bpmn2:exclusiveGateway id="processHomingCheck" name="Which homing Solution?">
-      <bpmn2:incoming>SequenceFlow_1fipbmk</bpmn2:incoming>
-      <bpmn2:outgoing>sniroProcess</bpmn2:outgoing>
-      <bpmn2:outgoing>oofProcess</bpmn2:outgoing>
-    </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="SequenceFlow_1fipbmk" sourceRef="receiveAsyncCallback" targetRef="processHomingCheck" />
-    <bpmn2:sequenceFlow id="sniroProcess" name="Sniro" sourceRef="processHomingCheck" targetRef="processSniroHomingSolution">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("homingService") == "sniro"}]]></bpmn2:conditionExpression>
-    </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="oofProcess" name="OOF" sourceRef="processHomingCheck" targetRef="processOofHomingSolution">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("homingService") == "oof"}]]></bpmn2:conditionExpression>
-    </bpmn2:sequenceFlow>
-    <bpmn2:scriptTask id="processOofHomingSolution" name="Process &#10;OOF Homing Solution&#10;" scriptFormat="groovy">
-      <bpmn2:incoming>oofProcess</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_07u9d7f</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
-OofHoming homing = new OofHoming()
-homing.processHomingSolution(execution)]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_07u9d7f" sourceRef="processOofHomingSolution" targetRef="EndEvent_0n56tas" />
-    <bpmn2:endEvent id="throwMSOWorkflowException1">
-      <bpmn2:incoming>SequenceFlow_1bub8mj</bpmn2:incoming>
-      <bpmn2:errorEventDefinition errorRef="Error_10hit0u" />
-    </bpmn2:endEvent>
-    <bpmn2:scriptTask id="ScriptTask_0t0fs4n" name="Assign Error" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_02eywxz</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_1bub8mj</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[int responseCode = execution.getVariable("sniroHomingSolution")
-
-import org.openecomp.mso.bpmn.common.scripts.*
-ExceptionUtil ex = new ExceptionUtil()
-ex.buildAndThrowWorkflowException(execution, responseCode, "No sniroHomingSolution found for Sniro/OOF.")]]></bpmn2:script>
-    </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_1bub8mj" sourceRef="ScriptTask_0t0fs4n" targetRef="throwMSOWorkflowException1" />
-    <bpmn2:sequenceFlow id="SequenceFlow_02eywxz" sourceRef="homingSolutionCheck" targetRef="ScriptTask_0t0fs4n" />
+    <bpmn2:sequenceFlow id="SequenceFlow_0lc15i7" sourceRef="callSniro" targetRef="receiveAsyncCallback" />
   </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" />
@@ -164,239 +95,112 @@ ex.buildAndThrowWorkflowException(execution, responseCode, "No sniroHomingSoluti
         <dc:Bounds x="147" y="275" width="36" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0qmfpdr_di" bpmnElement="callSniro">
-        <dc:Bounds x="391" y="137" width="100" height="80" />
+        <dc:Bounds x="313" 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="274" y="293" />
+        <di:waypoint xsi:type="dc:Point" x="313" y="293" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="183.5" y="278" width="90" height="0" />
+          <dc:Bounds x="203" y="278" width="90" 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" />
+        <dc:Bounds x="254" y="449" 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" />
+        <dc:Bounds x="284" y="632" 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" />
+        <dc:Bounds x="579" y="523" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="597" y="611" width="0" height="0" />
+          <dc:Bounds x="552" y="564" width="90" 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" />
+        <dc:Bounds x="299" y="523" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="317" y="611" width="0" height="0" />
+          <dc:Bounds x="272" y="564" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_03hs6s9_di" bpmnElement="processMsoWorkflowException">
-        <dc:Bounds x="406" y="548" width="100" height="80" />
+        <dc:Bounds x="406" y="501" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_19gqykh_di" bpmnElement="processJavaException">
-        <dc:Bounds x="410" y="727" width="100" height="80" />
+        <dc:Bounds x="410" y="680" 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" />
+        <dc:Bounds x="318" y="702" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="336" y="790" width="0" height="0" />
+          <dc:Bounds x="291" y="743" width="90" 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" />
+        <dc:Bounds x="567" y="702" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="585" y="790" width="0" height="0" />
+          <dc:Bounds x="540" y="743" width="90" 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" />
+        <di:waypoint xsi:type="dc:Point" x="506" y="541" />
+        <di:waypoint xsi:type="dc:Point" x="579" y="541" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="543" y="573" width="0" height="0" />
+          <dc:Bounds x="498" y="526" width="90" 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" />
+        <di:waypoint xsi:type="dc:Point" x="335" y="541" />
+        <di:waypoint xsi:type="dc:Point" x="363" y="541" />
+        <di:waypoint xsi:type="dc:Point" x="363" y="541" />
+        <di:waypoint xsi:type="dc:Point" x="406" y="541" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="378" y="588" width="0" height="0" />
+          <dc:Bounds x="333" y="541" width="90" 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" />
+        <di:waypoint xsi:type="dc:Point" x="354" y="720" />
+        <di:waypoint xsi:type="dc:Point" x="410" y="720" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="382" y="752" width="0" height="0" />
+          <dc:Bounds x="337" y="705" width="90" 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" />
+        <di:waypoint xsi:type="dc:Point" x="510" y="720" />
+        <di:waypoint xsi:type="dc:Point" x="567" y="720" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="539" y="752" width="0" height="0" />
+          <dc:Bounds x="494" y="705" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_1aapkvq_di" bpmnElement="processSniroHomingSolution">
-        <dc:Bounds x="1293" y="253" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ExclusiveGateway_03gt5b8_di" bpmnElement="responseCheck" isMarkerVisible="true">
-        <dc:Bounds x="566" y="268" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="554" y="328" width="74" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ScriptTask_0ikcqeo_di" bpmnElement="assignError">
-        <dc:Bounds x="777" y="184" width="100" height="80" />
+        <dc:Bounds x="597" y="253" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1m1c9nu_di" bpmnElement="badResponse">
-        <di:waypoint xsi:type="dc:Point" x="610" y="287" />
-        <di:waypoint xsi:type="dc:Point" x="777" y="239" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="665.309770337371" y="246.39875517690592" width="14" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0clfkld_di" bpmnElement="SequenceFlow_0clfkld">
-        <di:waypoint xsi:type="dc:Point" x="877" y="224" />
-        <di:waypoint xsi:type="dc:Point" x="949" y="224" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="868" y="209" width="90" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="EndEvent_13ejfwp_di" bpmnElement="throwMSOWorkflowException2">
-        <dc:Bounds x="949" y="206" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="922" y="242" width="90" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1o3br3u_di" bpmnElement="goodResponse">
-        <di:waypoint xsi:type="dc:Point" x="610" y="299" />
-        <di:waypoint xsi:type="dc:Point" x="777" y="356" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="667.027112499105" y="300.1275453507" width="19" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="CallActivity_031b5m3_di" bpmnElement="receiveAsyncCallback">
-        <dc:Bounds x="777" y="333" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1h9opg9_di" bpmnElement="SequenceFlow_1h9opg9">
-        <di:waypoint xsi:type="dc:Point" x="1393" y="293" />
-        <di:waypoint xsi:type="dc:Point" x="1509" y="293" />
-        <di:waypoint xsi:type="dc:Point" x="1509" y="355" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1406" y="278" width="90" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="EndEvent_0ougemc_di" bpmnElement="EndEvent_0n56tas">
-        <dc:Bounds x="1491" y="355" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1464" y="391" width="90" height="0" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ExclusiveGateway_03vhlpt_di" bpmnElement="homingSolutionCheck" isMarkerVisible="true">
-        <dc:Bounds x="274" y="268" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="266" y="322" width="69" height="24" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ScriptTask_1pkjo1d_di" bpmnElement="ScriptTask_1pkjo1d">
-        <dc:Bounds x="391" y="370" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1x12ld7_di" bpmnElement="sniroCall">
-        <di:waypoint xsi:type="dc:Point" x="299" y="268" />
-        <di:waypoint xsi:type="dc:Point" x="299" y="177" />
-        <di:waypoint xsi:type="dc:Point" x="391" y="177" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="329" y="192" width="25" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0iu4ms3_di" bpmnElement="oofCall">
-        <di:waypoint xsi:type="dc:Point" x="299" y="318" />
-        <di:waypoint xsi:type="dc:Point" x="299" y="410" />
-        <di:waypoint xsi:type="dc:Point" x="391" y="410" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="333" y="378" width="25" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_12t0lqb_di" bpmnElement="SequenceFlow_12t0lqb">
-        <di:waypoint xsi:type="dc:Point" x="491" y="410" />
-        <di:waypoint xsi:type="dc:Point" x="591" y="410" />
-        <di:waypoint xsi:type="dc:Point" x="591" y="318" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="496" y="389" width="90" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0gajic6_di" bpmnElement="SequenceFlow_0gajic6">
-        <di:waypoint xsi:type="dc:Point" x="491" y="177" />
-        <di:waypoint xsi:type="dc:Point" x="591" y="177" />
-        <di:waypoint xsi:type="dc:Point" x="591" y="268" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="496" y="156" width="90" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ExclusiveGateway_0dwcgfe_di" bpmnElement="processHomingCheck" isMarkerVisible="true">
-        <dc:Bounds x="942" y="348" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="934" y="402" width="69" height="24" />
-        </bpmndi:BPMNLabel>
+        <dc:Bounds x="455" y="253" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1fipbmk_di" bpmnElement="SequenceFlow_1fipbmk">
-        <di:waypoint xsi:type="dc:Point" x="877" y="373" />
-        <di:waypoint xsi:type="dc:Point" x="942" y="373" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="909.5" y="352" width="0" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_14jzswu_di" bpmnElement="sniroProcess">
-        <di:waypoint xsi:type="dc:Point" x="967" y="348" />
-        <di:waypoint xsi:type="dc:Point" x="967" y="293" />
-        <di:waypoint xsi:type="dc:Point" x="1293" y="293" />
+        <di:waypoint xsi:type="dc:Point" x="555" y="293" />
+        <di:waypoint xsi:type="dc:Point" x="597" y="293" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1034" y="312" width="25" height="12" />
+          <dc:Bounds x="531" y="272" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_158imry_di" bpmnElement="oofProcess">
-        <di:waypoint xsi:type="dc:Point" x="967" y="398" />
-        <di:waypoint xsi:type="dc:Point" x="967" y="469" />
-        <di:waypoint xsi:type="dc:Point" x="1293" y="469" />
+      <bpmndi:BPMNEdge id="SequenceFlow_01apjvo_di" bpmnElement="SequenceFlow_01apjvo">
+        <di:waypoint xsi:type="dc:Point" x="697" y="293" />
+        <di:waypoint xsi:type="dc:Point" x="860" y="293" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1039" y="432" width="25" height="12" />
+          <dc:Bounds x="778.5" y="272" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ScriptTask_0ihb64o_di" bpmnElement="processOofHomingSolution">
-        <dc:Bounds x="1293" y="429" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_07u9d7f_di" bpmnElement="SequenceFlow_07u9d7f">
-        <di:waypoint xsi:type="dc:Point" x="1393" y="469" />
-        <di:waypoint xsi:type="dc:Point" x="1509" y="469" />
-        <di:waypoint xsi:type="dc:Point" x="1509" y="391" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1451" y="448" width="0" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="EndEvent_1rxyas7_di" bpmnElement="throwMSOWorkflowException1">
-        <dc:Bounds x="507" y="275" width="36" height="36" />
+      <bpmndi:BPMNShape id="EndEvent_07i1a5x_di" bpmnElement="EndEvent_0rrbz2a">
+        <dc:Bounds x="860" y="275" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="480" y="311" width="0" height="12" />
+          <dc:Bounds x="877.17" y="315" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ScriptTask_0t0fs4n_di" bpmnElement="ScriptTask_0t0fs4n">
-        <dc:Bounds x="364" y="253" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1bub8mj_di" bpmnElement="SequenceFlow_1bub8mj">
-        <di:waypoint xsi:type="dc:Point" x="464" y="293" />
-        <di:waypoint xsi:type="dc:Point" x="507" y="293" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="485.5" y="272" width="0" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_02eywxz_di" bpmnElement="SequenceFlow_02eywxz">
-        <di:waypoint xsi:type="dc:Point" x="324" y="293" />
-        <di:waypoint xsi:type="dc:Point" x="364" y="293" />
+      <bpmndi:BPMNEdge id="SequenceFlow_0lc15i7_di" bpmnElement="SequenceFlow_0lc15i7">
+        <di:waypoint xsi:type="dc:Point" x="413" y="293" />
+        <di:waypoint xsi:type="dc:Point" x="455" y="293" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="344" y="272" width="0" height="12" />
+          <dc:Bounds x="434" y="272" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>