Containerization feature of SO

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

7 files changed, 484 insertions, 430 deletions

diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/AppCClient.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/AppCClient.bpmn
index fb25363a76..db811b10e7 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/AppCClient.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/AppCClient.bpmn
@@ -8,7 +8,7 @@
     <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.*
+      <bpmn:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def acc = new AppCClient()
 acc.preProcessRequest(execution)]]></bpmn:script>
     </bpmn:scriptTask>
@@ -21,7 +21,7 @@ acc.preProcessRequest(execution)]]></bpmn:script>
       <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.*
+import org.onap.so.bpmn.common.scripts.*
 def acc = new AppCClient()
 acc.runAppcCommand(execution)]]></bpmn:script>
     </bpmn:scriptTask>
@@ -38,7 +38,7 @@ acc.runAppcCommand(execution)]]></bpmn:script>
       <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.*
+        <bpmn:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 
 ExceptionUtil ex = new ExceptionUtil()
 ex.processSubflowsBPMNException(execution)]]></bpmn:script>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/DecomposeService.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/DecomposeService.bpmn
index 841964211e..d5223bca14 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/DecomposeService.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/DecomposeService.bpmn
@@ -1,142 +1,142 @@
-<?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" id="_MagIIMOUEeW8asg-vCEgWQ" 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="DecomposeService" name="DecomposeService" isExecutable="true">

-    <bpmn2:startEvent id="createSI_startEvent" name="Start Flow">

-      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>

-    </bpmn2:startEvent>

-    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="createSI_startEvent" targetRef="preProcessRequest_ScriptTask" />

-    <bpmn2:endEvent id="EndEvent_3">

-      <bpmn2:incoming>SequenceFlow_0tj2l1j</bpmn2:incoming>

-    </bpmn2:endEvent>

-    <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 errorRef="Error_1" />

-      </bpmn2:startEvent>

-      <bpmn2:endEvent id="EndEvent_117lkk3">

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

-      </bpmn2:endEvent>

-      <bpmn2:sequenceFlow id="SequenceFlow_0tgrn11" sourceRef="StartEvent_0yljq9y" targetRef="processJavaError" />

-      <bpmn2:scriptTask id="processJavaError" name="Process Error" scriptFormat="groovy">

-        <bpmn2:incoming>SequenceFlow_0tgrn11</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_0g4aus9</bpmn2:outgoing>

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

-ExceptionUtil exceptionUtil = new ExceptionUtil()

-exceptionUtil.processJavaException(execution)]]></bpmn2:script>

-      </bpmn2:scriptTask>

-      <bpmn2:sequenceFlow id="SequenceFlow_0g4aus9" sourceRef="processJavaError" targetRef="EndEvent_117lkk3" />

-    </bpmn2:subProcess>

-    <bpmn2:scriptTask id="decomposeService_ScriptTask" name="Decompose Service" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_12vj619</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_0tj2l1j</bpmn2:outgoing>

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

-def dds = new DecomposeService()

-dds.actuallyDecomposeService(execution)]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_0tj2l1j" sourceRef="decomposeService_ScriptTask" targetRef="EndEvent_3" />

-    <bpmn2:scriptTask id="preProcessRequest_ScriptTask" name="PreProcess Incoming Request" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_0yxffj2</bpmn2:outgoing>

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

-def dds = new DecomposeService()

-dds.preProcessRequest(execution)

-]]></bpmn2:script>

-    </bpmn2:scriptTask>

-    <bpmn2:sequenceFlow id="SequenceFlow_0yxffj2" sourceRef="preProcessRequest_ScriptTask" targetRef="queryCatalogDB_ScriptTask" />

-    <bpmn2:sequenceFlow id="SequenceFlow_12vj619" sourceRef="queryCatalogDB_ScriptTask" targetRef="decomposeService_ScriptTask" />

-    <bpmn2:scriptTask id="queryCatalogDB_ScriptTask" name="Query Catalog DB" scriptFormat="groovy">

-      <bpmn2:incoming>SequenceFlow_0yxffj2</bpmn2:incoming>

-      <bpmn2:outgoing>SequenceFlow_12vj619</bpmn2:outgoing>

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

-def dds = new DecomposeService()

-dds.queryCatalogDb(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" />

-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">

-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DecomposeService">

-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="createSI_startEvent">

-        <dc:Bounds x="152" y="79" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="147" y="120" width="48" height="14" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_47" targetElement="_BPMNShape_ScriptTask_61">

-        <di:waypoint xsi:type="dc:Point" x="188" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="301" y="97" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="245" y="82" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_177" bpmnElement="EndEvent_3">

-        <dc:Bounds x="898" y="79" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="916" 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" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="StartEvent_0yljq9y_di" bpmnElement="StartEvent_0yljq9y">

-        <dc:Bounds x="179" y="310" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="197" y="351" 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" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="483" y="351" 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" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="253" y="313" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="ScriptTask_0twd3su_di" bpmnElement="decomposeService_ScriptTask">

-        <dc:Bounds x="708" y="57" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_0tj2l1j_di" bpmnElement="SequenceFlow_0tj2l1j">

-        <di:waypoint xsi:type="dc:Point" x="808" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="898" y="97" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="853" y="82" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_61" bpmnElement="preProcessRequest_ScriptTask">

-        <dc:Bounds x="301" y="57" width="100" height="80" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="SequenceFlow_0yxffj2_di" bpmnElement="SequenceFlow_0yxffj2">

-        <di:waypoint xsi:type="dc:Point" x="401" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="513" y="97" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="457" y="82" 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" />

-      </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" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="428" y="313" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="SequenceFlow_12vj619_di" bpmnElement="SequenceFlow_12vj619">

-        <di:waypoint xsi:type="dc:Point" x="613" y="97" />

-        <di:waypoint xsi:type="dc:Point" x="708" y="97" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="661" y="82" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="ScriptTask_17xngtx_di" bpmnElement="queryCatalogDB_ScriptTask">

-        <dc:Bounds x="513" y="57" width="100" height="80" />

-      </bpmndi:BPMNShape>

-    </bpmndi:BPMNPlane>

-  </bpmndi:BPMNDiagram>

-</bpmn2:definitions>

+<?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" id="_MagIIMOUEeW8asg-vCEgWQ" 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="DecomposeService" name="DecomposeService" isExecutable="true">
+    <bpmn2:startEvent id="createSI_startEvent" name="Start Flow">
+      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
+    </bpmn2:startEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="createSI_startEvent" targetRef="preProcessRequest_ScriptTask" />
+    <bpmn2:endEvent id="EndEvent_3">
+      <bpmn2:incoming>SequenceFlow_0tj2l1j</bpmn2:incoming>
+    </bpmn2:endEvent>
+    <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 errorRef="Error_1" />
+      </bpmn2:startEvent>
+      <bpmn2:endEvent id="EndEvent_117lkk3">
+        <bpmn2:incoming>SequenceFlow_0g4aus9</bpmn2:incoming>
+      </bpmn2:endEvent>
+      <bpmn2:sequenceFlow id="SequenceFlow_0tgrn11" sourceRef="StartEvent_0yljq9y" targetRef="processJavaError" />
+      <bpmn2:scriptTask id="processJavaError" name="Process Error" scriptFormat="groovy">
+        <bpmn2:incoming>SequenceFlow_0tgrn11</bpmn2:incoming>
+        <bpmn2:outgoing>SequenceFlow_0g4aus9</bpmn2:outgoing>
+        <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+ExceptionUtil exceptionUtil = new ExceptionUtil()
+exceptionUtil.processJavaException(execution)]]></bpmn2:script>
+      </bpmn2:scriptTask>
+      <bpmn2:sequenceFlow id="SequenceFlow_0g4aus9" sourceRef="processJavaError" targetRef="EndEvent_117lkk3" />
+    </bpmn2:subProcess>
+    <bpmn2:scriptTask id="decomposeService_ScriptTask" name="Decompose Service" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_12vj619</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0tj2l1j</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+def dds = new DecomposeService()
+dds.actuallyDecomposeService(execution)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_0tj2l1j" sourceRef="decomposeService_ScriptTask" targetRef="EndEvent_3" />
+    <bpmn2:scriptTask id="preProcessRequest_ScriptTask" name="PreProcess Incoming Request" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0yxffj2</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+def dds = new DecomposeService()
+dds.preProcessRequest(execution)
+]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_0yxffj2" sourceRef="preProcessRequest_ScriptTask" targetRef="queryCatalogDB_ScriptTask" />
+    <bpmn2:sequenceFlow id="SequenceFlow_12vj619" sourceRef="queryCatalogDB_ScriptTask" targetRef="decomposeService_ScriptTask" />
+    <bpmn2:scriptTask id="queryCatalogDB_ScriptTask" name="Query Catalog DB" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_0yxffj2</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_12vj619</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+def dds = new DecomposeService()
+dds.queryCatalogDb(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" />
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DecomposeService">
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_47" bpmnElement="createSI_startEvent">
+        <dc:Bounds x="152" y="79" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="147" y="120" width="48" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_StartEvent_47" targetElement="_BPMNShape_ScriptTask_61">
+        <di:waypoint xsi:type="dc:Point" x="188" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="301" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="245" y="82" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_177" bpmnElement="EndEvent_3">
+        <dc:Bounds x="898" y="79" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="916" 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" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="StartEvent_0yljq9y_di" bpmnElement="StartEvent_0yljq9y">
+        <dc:Bounds x="179" y="310" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="197" y="351" 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" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="483" y="351" 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" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="253" y="313" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_0twd3su_di" bpmnElement="decomposeService_ScriptTask">
+        <dc:Bounds x="708" y="57" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0tj2l1j_di" bpmnElement="SequenceFlow_0tj2l1j">
+        <di:waypoint xsi:type="dc:Point" x="808" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="898" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="853" y="82" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_61" bpmnElement="preProcessRequest_ScriptTask">
+        <dc:Bounds x="301" y="57" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0yxffj2_di" bpmnElement="SequenceFlow_0yxffj2">
+        <di:waypoint xsi:type="dc:Point" x="401" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="513" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="457" y="82" 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" />
+      </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" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="428" y="313" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_12vj619_di" bpmnElement="SequenceFlow_12vj619">
+        <di:waypoint xsi:type="dc:Point" x="613" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="708" y="97" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="661" y="82" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_17xngtx_di" bpmnElement="queryCatalogDB_ScriptTask">
+        <dc:Bounds x="513" y="57" width="100" height="80" />
+      </bpmndi:BPMNShape>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</bpmn2:definitions>
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>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/HomingV2.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/HomingV2.bpmn
new file mode 100644
index 0000000000..9481ad892e
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/HomingV2.bpmn
@@ -0,0 +1,194 @@
+<?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.10.0">
+  <bpmn:process id="HomingV2" name="HomingV2" isExecutable="true">
+    <bpmn:startEvent id="start">
+      <bpmn:outgoing>SequenceFlow_0gpuwes</bpmn:outgoing>
+    </bpmn:startEvent>
+    <bpmn:subProcess id="subprocessBpmnError" name="Error Handling Subprocess" triggeredByEvent="true">
+      <bpmn:endEvent id="endBpmnError">
+        <bpmn:incoming>SequenceFlow_14dg22y</bpmn:incoming>
+        <bpmn:terminateEventDefinition />
+      </bpmn:endEvent>
+      <bpmn:startEvent id="catchBpmnError">
+        <bpmn:outgoing>SequenceFlow_0g3mn4b</bpmn:outgoing>
+        <bpmn:errorEventDefinition />
+      </bpmn:startEvent>
+      <bpmn:scriptTask id="processBpmnError" name="Process Error" scriptFormat="groovy">
+        <bpmn:incoming>SequenceFlow_0g3mn4b</bpmn:incoming>
+        <bpmn:outgoing>SequenceFlow_14dg22y</bpmn:outgoing>
+        <bpmn:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+ExceptionUtil ex = new ExceptionUtil()
+ex.processSubflowsBPMNException(execution)]]></bpmn:script>
+      </bpmn:scriptTask>
+      <bpmn:sequenceFlow id="SequenceFlow_14dg22y" sourceRef="processBpmnError" targetRef="endBpmnError" />
+      <bpmn:sequenceFlow id="SequenceFlow_0g3mn4b" sourceRef="catchBpmnError" targetRef="processBpmnError" />
+    </bpmn:subProcess>
+    <bpmn:subProcess id="subprocessJavaException" triggeredByEvent="true">
+      <bpmn:scriptTask id="processJavaException" name="Process Error" scriptFormat="groovy">
+        <bpmn:incoming>seq</bpmn:incoming>
+        <bpmn:outgoing>SequenceFlow_1epbfhx</bpmn:outgoing>
+        <bpmn:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
+ExceptionUtil ex = new ExceptionUtil()
+ex.processJavaException(execution)]]></bpmn:script>
+      </bpmn:scriptTask>
+      <bpmn:startEvent id="catchJavaException">
+        <bpmn:outgoing>seq</bpmn:outgoing>
+        <bpmn:errorEventDefinition errorRef="Error_0jmwlex" />
+      </bpmn:startEvent>
+      <bpmn:endEvent id="endJavaException">
+        <bpmn:incoming>SequenceFlow_1epbfhx</bpmn:incoming>
+        <bpmn:terminateEventDefinition />
+      </bpmn:endEvent>
+      <bpmn:sequenceFlow id="seq" name="" sourceRef="catchJavaException" targetRef="processJavaException" />
+      <bpmn:sequenceFlow id="SequenceFlow_1epbfhx" name="" sourceRef="processJavaException" targetRef="endJavaException" />
+    </bpmn:subProcess>
+    <bpmn:callActivity id="callReceiveAsync" name="Receive Async Callback" camunda:modelerTemplate="receiveWorkflowMessage" calledElement="ReceiveWorkflowMessage">
+      <bpmn:extensionElements>
+        <camunda:in source="true" target="isDebugLogEnabled" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:out source="WorkflowResponse" target="asyncResponse" />
+        <camunda:in source="asyncCorrelator" target="RCVWFMSG_correlator" />
+        <camunda:in source="asyncMessageType" target="RCVWFMSG_messageType" />
+        <camunda:in source="asyncTimeout" target="RCVWFMSG_timeout" />
+      </bpmn:extensionElements>
+      <bpmn:incoming>sequence_2</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_0m9c6gt</bpmn:outgoing>
+    </bpmn:callActivity>
+    <bpmn:endEvent id="end">
+      <bpmn:incoming>updateExecution</bpmn:incoming>
+      <bpmn:terminateEventDefinition />
+    </bpmn:endEvent>
+    <bpmn:sequenceFlow id="SequenceFlow_0gpuwes" sourceRef="start" targetRef="callSniro" />
+    <bpmn:sequenceFlow id="sequence_2" sourceRef="callSniro" targetRef="callReceiveAsync" />
+    <bpmn:sequenceFlow id="SequenceFlow_0m9c6gt" sourceRef="callReceiveAsync" targetRef="processSolution" />
+    <bpmn:sequenceFlow id="updateExecution" sourceRef="processSolution" targetRef="end" />
+    <bpmn:serviceTask id="callSniro" name="&#10;Call&#10;Sniro&#10;" camunda:expression="${SniroHoming.callSniro(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
+      <bpmn:incoming>SequenceFlow_0gpuwes</bpmn:incoming>
+      <bpmn:outgoing>sequence_2</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:serviceTask id="processSolution" name="&#10;Process Solution&#10;" camunda:expression="${SniroHoming.processSolution(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)), asyncResponse)}">
+      <bpmn:incoming>SequenceFlow_0m9c6gt</bpmn:incoming>
+      <bpmn:outgoing>updateExecution</bpmn:outgoing>
+    </bpmn:serviceTask>
+  </bpmn:process>
+  <bpmn:error id="Error_0jmwlex" name="Java Exception" errorCode="java.lang.Exception" />
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="HomingV2">
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="start">
+        <dc:Bounds x="135" y="225" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="108" y="261" width="90" height="20" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="SubProcess_1se9fyh_di" bpmnElement="subprocessBpmnError" isExpanded="true">
+        <dc:Bounds x="246" y="399" width="409" height="168" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="SubProcess_0rphl19_di" bpmnElement="subprocessJavaException" isExpanded="true">
+        <dc:Bounds x="276" y="582" width="350" height="159" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="CallActivity_1o5l6xd_di" bpmnElement="callReceiveAsync">
+        <dc:Bounds x="447" y="203" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="EndEvent_0jdabkl_di" bpmnElement="end">
+        <dc:Bounds x="852" y="225" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="824" y="265" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0gpuwes_di" bpmnElement="SequenceFlow_0gpuwes">
+        <di:waypoint xsi:type="dc:Point" x="171" y="243" />
+        <di:waypoint xsi:type="dc:Point" x="305" y="243" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="238" y="222" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1ohpzke_di" bpmnElement="sequence_2">
+        <di:waypoint xsi:type="dc:Point" x="405" y="243" />
+        <di:waypoint xsi:type="dc:Point" x="447" y="243" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="426" y="222" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0m9c6gt_di" bpmnElement="SequenceFlow_0m9c6gt">
+        <di:waypoint xsi:type="dc:Point" x="547" y="243" />
+        <di:waypoint xsi:type="dc:Point" x="589" y="243" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="568" y="222" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0f9pput_di" bpmnElement="updateExecution">
+        <di:waypoint xsi:type="dc:Point" x="689" y="243" />
+        <di:waypoint xsi:type="dc:Point" x="852" y="243" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="770.5" y="222" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="EndEvent_0q9vsib_di" bpmnElement="endBpmnError">
+        <dc:Bounds x="571" y="473" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="544" y="514" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="StartEvent_1p10ecj_di" bpmnElement="catchBpmnError">
+        <dc:Bounds x="291" y="473" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="264" y="514" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ScriptTask_112ioi2_di" bpmnElement="processBpmnError">
+        <dc:Bounds x="398" y="451" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ScriptTask_0nil5vh_di" bpmnElement="processJavaException">
+        <dc:Bounds x="402" y="630" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="StartEvent_0ekzjqo_di" bpmnElement="catchJavaException">
+        <dc:Bounds x="310" y="652" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="283" y="693" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="EndEvent_0mrji6a_di" bpmnElement="endJavaException">
+        <dc:Bounds x="559" y="652" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="532" y="693" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_14dg22y_di" bpmnElement="SequenceFlow_14dg22y">
+        <di:waypoint xsi:type="dc:Point" x="498" y="491" />
+        <di:waypoint xsi:type="dc:Point" x="571" y="491" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="490.5" y="476" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0g3mn4b_di" bpmnElement="SequenceFlow_0g3mn4b">
+        <di:waypoint xsi:type="dc:Point" x="327" y="491" />
+        <di:waypoint xsi:type="dc:Point" x="355" y="491" />
+        <di:waypoint xsi:type="dc:Point" x="355" y="491" />
+        <di:waypoint xsi:type="dc:Point" x="398" y="491" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="325" y="491" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1bsc30u_di" bpmnElement="seq">
+        <di:waypoint xsi:type="dc:Point" x="346" y="670" />
+        <di:waypoint xsi:type="dc:Point" x="402" y="670" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="329" y="655" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1epbfhx_di" bpmnElement="SequenceFlow_1epbfhx">
+        <di:waypoint xsi:type="dc:Point" x="502" y="670" />
+        <di:waypoint xsi:type="dc:Point" x="559" y="670" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="486.5" y="655" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ServiceTask_1mclgnq_di" bpmnElement="callSniro">
+        <dc:Bounds x="305" y="203" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ServiceTask_08lua6t_di" bpmnElement="processSolution">
+        <dc:Bounds x="589" y="203" width="100" height="80" />
+      </bpmndi:BPMNShape>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</bpmn:definitions>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/ManualHandling.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/ManualHandling.bpmn
index 4d31eee45a..cec3e249ea 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/ManualHandling.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/ManualHandling.bpmn
@@ -19,7 +19,7 @@
       <bpmn2:scriptTask id="processJavaError" name="Process Error" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_0tgrn11</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_0g4aus9</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+        <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 ExceptionUtil exceptionUtil = new ExceptionUtil()
 exceptionUtil.processJavaException(execution)]]></bpmn2:script>
       </bpmn2:scriptTask>
@@ -30,7 +30,7 @@ exceptionUtil.processJavaException(execution)]]></bpmn2:script>
     <bpmn2:userTask id="ManualHandlingUserTask" name="Manual Handling User Task">
       <bpmn2:extensionElements>
         <camunda:taskListener event="complete">
-          <camunda:script scriptFormat="groovy"><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+          <camunda:script scriptFormat="groovy"><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def mh = new ManualHandling()
 mh.completeTask(task)]]></camunda:script>
         </camunda:taskListener>
@@ -38,7 +38,7 @@ mh.completeTask(task)]]></camunda:script>
           <camunda:property />
         </camunda:properties>
         <camunda:taskListener event="create">
-          <camunda:script scriptFormat="groovy"><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+          <camunda:script scriptFormat="groovy"><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def mh = new ManualHandling()
 mh.setTaskVariables(task)]]></camunda:script>
         </camunda:taskListener>
@@ -54,7 +54,7 @@ mh.setTaskVariables(task)]]></camunda:script>
       <bpmn2:extensionElements>
         <camunda:connector>
           <camunda:inputOutput>
-            <camunda:inputParameter name="url">${URN_mso_adapters_openecomp_db_endpoint}</camunda:inputParameter>
+            <camunda:inputParameter name="url"><![CDATA[${UrnPropertiesReader.getVariable("mso.adapters.openecomp.db.endpoint", execution)}]]></camunda:inputParameter>
             <camunda:inputParameter name="payload"><![CDATA[${execution.getVariable("setUpdateDBstatusPayload")}]]></camunda:inputParameter>
             <camunda:inputParameter name="headers">
               <camunda:map>
@@ -75,14 +75,14 @@ mh.setTaskVariables(task)]]></camunda:script>
     <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.*
+      <bpmn2:script><![CDATA[import org.onap.so.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.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def mh = new ManualHandling()
 mh.prepareRequestsDBStatusUpdate(execution, "IN_PROGRESS")]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -90,7 +90,7 @@ mh.prepareRequestsDBStatusUpdate(execution, "IN_PROGRESS")]]></bpmn2:script>
       <bpmn2:extensionElements>
         <camunda:connector>
           <camunda:inputOutput>
-            <camunda:inputParameter name="url">${URN_mso_adapters_openecomp_db_endpoint}</camunda:inputParameter>
+            <camunda:inputParameter name="url"><![CDATA[${UrnPropertiesReader.getVariable("mso.adapters.openecomp.db.endpoint", execution)}]]></camunda:inputParameter>
             <camunda:inputParameter name="payload"><![CDATA[${execution.getVariable("setUpdateDBstatusPayload")}]]></camunda:inputParameter>
             <camunda:inputParameter name="headers">
               <camunda:map>
@@ -111,7 +111,7 @@ mh.prepareRequestsDBStatusUpdate(execution, "IN_PROGRESS")]]></bpmn2:script>
     <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.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def mh = new ManualHandling()
 mh.preProcessRequest(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
@@ -120,7 +120,7 @@ mh.preProcessRequest(execution)]]></bpmn2:script>
     <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.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def mh = new ManualHandling()
 mh.createAOTSTicket(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/Orchestration.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/Orchestration.bpmn
new file mode 100644
index 0000000000..c2214aac26
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/Orchestration.bpmn
@@ -0,0 +1,56 @@
+<?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.10.0">
+  <bpmn:process id="Orchestration" isExecutable="true">
+    <bpmn:startEvent id="StartEvent_1">
+      <bpmn:outgoing>SequenceFlow_10gblml</bpmn:outgoing>
+    </bpmn:startEvent>
+    <bpmn:endEvent id="EndEvent_0eak8i4">
+      <bpmn:incoming>SequenceFlow_0x1lx7c</bpmn:incoming>
+    </bpmn:endEvent>
+    <bpmn:serviceTask id="Task_06qhrqm" name="Decompose Request" camunda:class="org.onap.so.bpmn.servicedecomposition.tasks.DecomposeRequest">
+      <bpmn:extensionElements>
+        <camunda:inputOutput>
+          <camunda:inputParameter name="request" />
+          <camunda:inputParameter name="buildingblock" />
+        </camunda:inputOutput>
+      </bpmn:extensionElements>
+      <bpmn:incoming>SequenceFlow_10gblml</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_0x1lx7c</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:sequenceFlow id="SequenceFlow_10gblml" sourceRef="StartEvent_1" targetRef="Task_06qhrqm" />
+    <bpmn:sequenceFlow id="SequenceFlow_0x1lx7c" sourceRef="Task_06qhrqm" targetRef="EndEvent_0eak8i4" />
+  </bpmn:process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Orchestration">
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
+        <dc:Bounds x="631" y="407" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="604" y="443" width="90" height="20" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="EndEvent_0eak8i4_di" bpmnElement="EndEvent_0eak8i4">
+        <dc:Bounds x="928" y="407" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="946" y="447" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ServiceTask_0y0800u_di" bpmnElement="Task_06qhrqm">
+        <dc:Bounds x="746" y="385" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_10gblml_di" bpmnElement="SequenceFlow_10gblml">
+        <di:waypoint xsi:type="dc:Point" x="667" y="425" />
+        <di:waypoint xsi:type="dc:Point" x="746" y="425" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="706.5" y="404" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0x1lx7c_di" bpmnElement="SequenceFlow_0x1lx7c">
+        <di:waypoint xsi:type="dc:Point" x="846" y="425" />
+        <di:waypoint xsi:type="dc:Point" x="928" y="425" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="887" y="404" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</bpmn:definitions>
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/RainyDayHandler.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/RainyDayHandler.bpmn
index 8183469798..b4a3fc7721 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/RainyDayHandler.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/RainyDayHandler.bpmn
@@ -21,7 +21,7 @@
       <bpmn2:scriptTask id="processJavaError" name="Process Error" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_0tgrn11</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_0g4aus9</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+        <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 ExceptionUtil exceptionUtil = new ExceptionUtil()
 exceptionUtil.processJavaException(execution)]]></bpmn2:script>
       </bpmn2:scriptTask>
@@ -30,7 +30,7 @@ exceptionUtil.processJavaException(execution)]]></bpmn2:script>
     <bpmn2:scriptTask id="preProcessRequest_ScriptTask" name="PreProcess Incoming Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0yxffj2</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def rdh = new RainyDayHandler()
 rdh.preProcessRequest(execution)
 ]]></bpmn2:script>
@@ -40,7 +40,7 @@ rdh.preProcessRequest(execution)
     <bpmn2:scriptTask id="QueryPolicyEngine" name="Query Policy " scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_0yxffj2</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_12vj619</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.common.scripts.*
 def rdh = new RainyDayHandler()
 rdh.queryPolicy(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>