move network adapter to an external client task

Began impelenting new network external task.
Made the vnfAdapterTask subflow an openstack subflow, refactored infra
flows and BB to call it for network functions.
Fixed bugs discovered through a robot dry run, added unit test, added
support for rollback network request
Updated junit test files for comparison due to not polling for response
Removed the no longer used network adapter rest task from bpmn tasks
Removed the unused network adapter async and its beans
Removed network async client package from open pojo scan

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

7 files changed, 229 insertions, 159 deletions

diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateNetworkBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateNetworkBB.bpmn
index 1ea311549c..12b038e738 100644
--- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateNetworkBB.bpmn
+++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateNetworkBB.bpmn
@@ -1,5 +1,5 @@
 <?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:camunda="http://camunda.org/schema/1.0/bpmn" 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.10.0" 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:camunda="http://camunda.org/schema/1.0/bpmn" 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="3.7.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="CreateNetworkBB" name="CreateNetworkBB" isExecutable="true">
     <bpmn2:startEvent id="createNetwork_startEvent">
       <bpmn2:outgoing>SequenceFlow_1maepy7</bpmn2:outgoing>
@@ -11,7 +11,7 @@
       <bpmn2:incoming>SequenceFlow_1oc7wcr</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0n42zi5</bpmn2:outgoing>
     </bpmn2:serviceTask>
-    <bpmn2:serviceTask id="Create_Network_ServiceTask" name="&#10;AIC&#10;Create&#10;(network)&#10;" camunda:expression="${NetworkAdapterCreateTasks.createNetwork(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
+    <bpmn2:serviceTask id="Create_Network_ServiceTask" name="Prepare Request" camunda:expression="${NetworkAdapterCreateTasks.createNetwork(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
       <bpmn2:incoming>SequenceFlow_1eqfh23</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1fm99t6</bpmn2:outgoing>
     </bpmn2:serviceTask>
@@ -31,19 +31,19 @@
     <bpmn2:sequenceFlow id="SequenceFlow_1yy4aik" sourceRef="QueryNetworkPolicy_ServiceTask" targetRef="QueryNetworkTableRef_ServiceTask" />
     <bpmn2:sequenceFlow id="SequenceFlow_0sissul" sourceRef="Update_Network_AAI_ServiceTask" targetRef="createNetwork_EndEvent" />
     <bpmn2:sequenceFlow id="SequenceFlow_1maepy7" sourceRef="createNetwork_startEvent" targetRef="ServiceTask_get_cloud_region" />
-    <bpmn2:intermediateThrowEvent id="ThrowEvent_ToCollectAAIData" name="ThrowEvent_ToCollectAAIData">
+    <bpmn2:intermediateThrowEvent id="ThrowEvent_ToCollectAAIData" name="Query&#10;AAI">
       <bpmn2:incoming>SequenceFlow_03ebe6c</bpmn2:incoming>
       <bpmn2:linkEventDefinition name="CatchEvent_Collect_AAI_Data" />
     </bpmn2:intermediateThrowEvent>
-    <bpmn2:intermediateCatchEvent id="CatchEvent_Collect_AAI_Data" name="CatchEvent_Collect_AAI_Data">
+    <bpmn2:intermediateCatchEvent id="CatchEvent_Collect_AAI_Data" name="Query&#10;AAI">
       <bpmn2:outgoing>SequenceFlow_1oc7wcr</bpmn2:outgoing>
       <bpmn2:linkEventDefinition name="CatchEvent_Collect_AAI_Data" />
     </bpmn2:intermediateCatchEvent>
-    <bpmn2:intermediateCatchEvent id="CatchEvent_Create_Network" name="CatchEvent_Create_Network">
+    <bpmn2:intermediateCatchEvent id="CatchEvent_Create_Network" name="Create&#10;Network">
       <bpmn2:outgoing>SequenceFlow_1eqfh23</bpmn2:outgoing>
       <bpmn2:linkEventDefinition name="CatchEvent_Create_Network" />
     </bpmn2:intermediateCatchEvent>
-    <bpmn2:intermediateThrowEvent id="ThrowEvent_ToCreateNetwork" name="ThrowEvent_ToCreateNetwork">
+    <bpmn2:intermediateThrowEvent id="ThrowEvent_ToCreateNetwork" name="Create&#10;Network">
       <bpmn2:incoming>SequenceFlow_0y0w60u</bpmn2:incoming>
       <bpmn2:linkEventDefinition name="CatchEvent_Create_Network" />
     </bpmn2:intermediateThrowEvent>
@@ -55,12 +55,12 @@
       <bpmn2:outgoing>SequenceFlow_03ebe6c</bpmn2:outgoing>
     </bpmn2:serviceTask>
     <bpmn2:sequenceFlow id="SequenceFlow_03ebe6c" sourceRef="ServiceTask_get_cloud_region" targetRef="ThrowEvent_ToCollectAAIData" />
-    <bpmn2:callActivity id="CallActivity_0aj19il" name="Call NetworkAdapterRestV1" calledElement="NetworkAdapterRestV1">
+    <bpmn2:callActivity id="CallActivity_0aj19il" name="Network Adapter" calledElement="NetworkAdapter">
       <bpmn2:extensionElements>
         <camunda:in source="networkAdapterRequest" target="networkAdapterRequest" />
         <camunda:out source="WorkflowException" target="WorkflowException" />
         <camunda:out source="createNetworkResponse" target="createNetworkResponse" />
-        <camunda:in source="mso-request-id" target="mso-request-id" />
+        <camunda:in source="gBuildingBlockExecution" target="gBuildingBlockExecution" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_1fm99t6</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0qpu80i</bpmn2:outgoing>
@@ -83,148 +83,148 @@
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="CreateNetworkBB">
       <bpmndi:BPMNShape id="StartEvent_0lbwmd1_di" bpmnElement="createNetwork_startEvent">
-        <dc:Bounds x="236" y="-55" width="36" height="36" />
+        <dc:Bounds x="176" y="105" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="229" y="-14" width="50" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_10l9a3s_di" bpmnElement="createNetwork_EndEvent">
-        <dc:Bounds x="997" y="326" width="36" height="36" />
+        <dc:Bounds x="937" y="486" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="971" y="362" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_1k7d8ih_di" bpmnElement="QueryVpnBinding_ServiceTask">
-        <dc:Bounds x="340" y="91" width="100" height="80" />
+        <dc:Bounds x="280" y="251" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_1911vum_di" bpmnElement="Create_Network_ServiceTask">
-        <dc:Bounds x="346" y="304" width="100" height="80" />
+        <dc:Bounds x="286" y="464" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_1glneas_di" bpmnElement="QueryNetworkPolicy_ServiceTask">
-        <dc:Bounds x="503" y="91" width="100" height="80" />
+        <dc:Bounds x="443" y="251" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_00rw5co_di" bpmnElement="QueryNetworkTableRef_ServiceTask">
-        <dc:Bounds x="663" y="91" width="100" height="80" />
+        <dc:Bounds x="603" y="251" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_0q51h0f_di" bpmnElement="Update_Network_AAI_ServiceTask">
-        <dc:Bounds x="836" y="304" width="100" height="80" />
+        <dc:Bounds x="776" y="464" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0n42zi5_di" bpmnElement="SequenceFlow_0n42zi5">
-        <di:waypoint xsi:type="dc:Point" x="440" y="131" />
-        <di:waypoint xsi:type="dc:Point" x="503" y="131" />
+        <di:waypoint x="380" y="291" />
+        <di:waypoint x="443" y="291" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="472" y="106" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1yy4aik_di" bpmnElement="SequenceFlow_1yy4aik">
-        <di:waypoint xsi:type="dc:Point" x="603" y="131" />
-        <di:waypoint xsi:type="dc:Point" x="663" y="131" />
+        <di:waypoint x="543" y="291" />
+        <di:waypoint x="603" y="291" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="633" y="106" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0sissul_di" bpmnElement="SequenceFlow_0sissul">
-        <di:waypoint xsi:type="dc:Point" x="936" y="344" />
-        <di:waypoint xsi:type="dc:Point" x="997" y="344" />
+        <di:waypoint x="876" y="504" />
+        <di:waypoint x="937" y="504" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="921.5" y="329" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1maepy7_di" bpmnElement="SequenceFlow_1maepy7">
-        <di:waypoint xsi:type="dc:Point" x="272" y="-37" />
-        <di:waypoint xsi:type="dc:Point" x="426" y="-37" />
+        <di:waypoint x="212" y="123" />
+        <di:waypoint x="366" y="123" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="304" y="-52" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="IntermediateThrowEvent_0fexg2g_di" bpmnElement="ThrowEvent_ToCollectAAIData">
-        <dc:Bounds x="666" y="-55" width="36" height="36" />
+        <dc:Bounds x="606" y="105" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="709" y="-43" width="85" height="24" />
+          <dc:Bounds x="608" y="146" width="31" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="IntermediateCatchEvent_1plrukk_di" bpmnElement="CatchEvent_Collect_AAI_Data">
-        <dc:Bounds x="236" y="113" width="36" height="36" />
+        <dc:Bounds x="176" y="273" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="216" y="154" width="81" height="24" />
+          <dc:Bounds x="181" y="314" width="31" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="IntermediateCatchEvent_1n0vun1_di" bpmnElement="CatchEvent_Create_Network">
-        <dc:Bounds x="236" y="326" width="36" height="36" />
+        <dc:Bounds x="176" y="486" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="213" y="367" width="87" height="24" />
+          <dc:Bounds x="173" y="527" width="41" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="IntermediateThrowEvent_04qwhex_di" bpmnElement="ThrowEvent_ToCreateNetwork">
-        <dc:Bounds x="962" y="113" width="36" height="36" />
+        <dc:Bounds x="902" y="273" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1005" y="125" width="86" height="24" />
+          <dc:Bounds x="899" y="314" width="41" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1h9kkhb_di" bpmnElement="SequenceFlow_1h9kkhb">
-        <di:waypoint xsi:type="dc:Point" x="763" y="131" />
-        <di:waypoint xsi:type="dc:Point" x="817" y="131" />
+        <di:waypoint x="703" y="291" />
+        <di:waypoint x="757" y="291" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="745" y="116" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1oc7wcr_di" bpmnElement="SequenceFlow_1oc7wcr">
-        <di:waypoint xsi:type="dc:Point" x="272" y="131" />
-        <di:waypoint xsi:type="dc:Point" x="340" y="131" />
+        <di:waypoint x="212" y="291" />
+        <di:waypoint x="280" y="291" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="306" y="106" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1eqfh23_di" bpmnElement="SequenceFlow_1eqfh23">
-        <di:waypoint xsi:type="dc:Point" x="272" y="344" />
-        <di:waypoint xsi:type="dc:Point" x="346" y="344" />
+        <di:waypoint x="212" y="504" />
+        <di:waypoint x="286" y="504" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="309" y="319" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ServiceTask_02qnccl_di" bpmnElement="ServiceTask_get_cloud_region">
-        <dc:Bounds x="426" y="-77" width="100" height="80" />
+        <dc:Bounds x="366" y="83" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_03ebe6c_di" bpmnElement="SequenceFlow_03ebe6c">
-        <di:waypoint xsi:type="dc:Point" x="526" y="-37" />
-        <di:waypoint xsi:type="dc:Point" x="666" y="-37" />
+        <di:waypoint x="466" y="123" />
+        <di:waypoint x="606" y="123" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="551" y="-52" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="CallActivity_0aj19il_di" bpmnElement="CallActivity_0aj19il">
-        <dc:Bounds x="503" y="304" width="100" height="80" />
+        <dc:Bounds x="443" y="464" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_1k8gsz5_di" bpmnElement="ServiceTask_1k8gsz5">
-        <dc:Bounds x="663" y="304" width="100" height="80" />
+        <dc:Bounds x="603" y="464" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0qpu80i_di" bpmnElement="SequenceFlow_0qpu80i">
-        <di:waypoint xsi:type="dc:Point" x="603" y="344" />
-        <di:waypoint xsi:type="dc:Point" x="663" y="344" />
+        <di:waypoint x="543" y="504" />
+        <di:waypoint x="603" y="504" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="633" y="323" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_16152be_di" bpmnElement="SequenceFlow_16152be">
-        <di:waypoint xsi:type="dc:Point" x="763" y="344" />
-        <di:waypoint xsi:type="dc:Point" x="836" y="344" />
+        <di:waypoint x="703" y="504" />
+        <di:waypoint x="776" y="504" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="799.5" y="323" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1fm99t6_di" bpmnElement="SequenceFlow_1fm99t6">
-        <di:waypoint xsi:type="dc:Point" x="446" y="344" />
-        <di:waypoint xsi:type="dc:Point" x="503" y="344" />
+        <di:waypoint x="386" y="504" />
+        <di:waypoint x="443" y="504" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="474.5" y="323" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ServiceTask_0u4ie2q_di" bpmnElement="QueryNetworkSubnet_ServiceTask">
-        <dc:Bounds x="817" y="91" width="100" height="80" />
+        <dc:Bounds x="757" y="251" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0y0w60u_di" bpmnElement="SequenceFlow_0y0w60u">
-        <di:waypoint xsi:type="dc:Point" x="917" y="131" />
-        <di:waypoint xsi:type="dc:Point" x="962" y="131" />
+        <di:waypoint x="857" y="291" />
+        <di:waypoint x="902" y="291" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="939.5" y="110" width="0" height="12" />
         </bpmndi:BPMNLabel>
diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateVfModuleBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateVfModuleBB.bpmn
index 97fad57e7d..d77e141364 100644
--- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateVfModuleBB.bpmn
+++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateVfModuleBB.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0">
+<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="3.7.0">
   <bpmn:process id="CreateVfModuleBB" name="CreateVfModuleBB" isExecutable="true">
     <bpmn:startEvent id="CreateVfModuleBB_Start">
       <bpmn:outgoing>SequenceFlow_1xr6chl</bpmn:outgoing>
@@ -12,7 +12,7 @@
     <bpmn:endEvent id="CreateVfModuleBB_End">
       <bpmn:incoming>SequenceFlow_1vbwdaw</bpmn:incoming>
     </bpmn:endEvent>
-    <bpmn:serviceTask id="CreateVfModule" name="Create VF Module (VNF)" camunda:expression="${VnfAdapterCreateTasks.createVfModule(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
+    <bpmn:serviceTask id="CreateVfModule" name="Prepare Request" camunda:expression="${VnfAdapterCreateTasks.createVfModule(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
       <bpmn:incoming>SequenceFlow_15hn8si</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_16g4dz0</bpmn:outgoing>
     </bpmn:serviceTask>
@@ -83,148 +83,148 @@
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="CreateVfModuleBB">
       <bpmndi:BPMNShape id="StartEvent_0kxwniy_di" bpmnElement="CreateVfModuleBB_Start">
-        <dc:Bounds x="59" y="88" width="36" height="36" />
+        <dc:Bounds x="159" y="88" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="77" y="124" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_13t22km_di" bpmnElement="QueryVfModule">
-        <dc:Bounds x="416" y="66" width="100" height="80" />
+        <dc:Bounds x="516" y="66" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1xr6chl_di" bpmnElement="SequenceFlow_1xr6chl">
-        <di:waypoint xsi:type="dc:Point" x="95" y="106" />
-        <di:waypoint xsi:type="dc:Point" x="216" y="106" />
+        <di:waypoint x="195" y="106" />
+        <di:waypoint x="316" y="106" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="156" y="91" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="EndEvent_0qdq7wj_di" bpmnElement="CreateVfModuleBB_End">
-        <dc:Bounds x="1118" y="293" width="36" height="36" />
+        <dc:Bounds x="1218" y="293" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1136" y="333" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_1dgenhy_di" bpmnElement="CreateVfModule">
-        <dc:Bounds x="612" y="66" width="100" height="80" />
+        <dc:Bounds x="712" y="66" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_15hn8si_di" bpmnElement="SequenceFlow_15hn8si">
-        <di:waypoint xsi:type="dc:Point" x="516" y="106" />
-        <di:waypoint xsi:type="dc:Point" x="612" y="106" />
+        <di:waypoint x="616" y="106" />
+        <di:waypoint x="712" y="106" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="519" y="91" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1s4rpyp_di" bpmnElement="SequenceFlow_1s4rpyp">
-        <di:waypoint xsi:type="dc:Point" x="316" y="106" />
-        <di:waypoint xsi:type="dc:Point" x="416" y="106" />
+        <di:waypoint x="416" y="106" />
+        <di:waypoint x="516" y="106" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="321" y="91" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ServiceTask_1frb5h2_di" bpmnElement="QueryVnf">
-        <dc:Bounds x="216" y="66" width="100" height="80" />
+        <dc:Bounds x="316" y="66" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_16g4dz0_di" bpmnElement="SequenceFlow_16g4dz0">
-        <di:waypoint xsi:type="dc:Point" x="712" y="106" />
-        <di:waypoint xsi:type="dc:Point" x="790" y="106" />
+        <di:waypoint x="812" y="106" />
+        <di:waypoint x="890" y="106" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="751" y="91" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0ecr393_di" bpmnElement="SequenceFlow_0ecr393">
-        <di:waypoint xsi:type="dc:Point" x="890" y="107" />
-        <di:waypoint xsi:type="dc:Point" x="994" y="107" />
-        <di:waypoint xsi:type="dc:Point" x="994" y="209" />
-        <di:waypoint xsi:type="dc:Point" x="73" y="209" />
-        <di:waypoint xsi:type="dc:Point" x="73" y="306" />
-        <di:waypoint xsi:type="dc:Point" x="142" y="306" />
+        <di:waypoint x="990" y="107" />
+        <di:waypoint x="1094" y="107" />
+        <di:waypoint x="1094" y="209" />
+        <di:waypoint x="173" y="209" />
+        <di:waypoint x="173" y="306" />
+        <di:waypoint x="242" y="306" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="534" y="194" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="CallActivity_1i1pfzb_di" bpmnElement="VnfAdapter">
-        <dc:Bounds x="790" y="66" width="100" height="80" />
+        <dc:Bounds x="890" y="66" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_0fpfn71_di" bpmnElement="UpdateVfModuleStatus">
-        <dc:Bounds x="942" y="271" width="100" height="80" />
+        <dc:Bounds x="1042" y="271" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_04k1b85_di" bpmnElement="UpdateVfModuleHeatStackId">
-        <dc:Bounds x="777" y="271" width="100" height="80" />
+        <dc:Bounds x="877" y="271" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="SubProcess_1getwnf_di" bpmnElement="SubProcess_1getwnf" isExpanded="true">
-        <dc:Bounds x="136" y="439" width="231" height="135" />
+        <dc:Bounds x="236" y="439" width="231" height="135" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="StartEvent_1c8o652_di" bpmnElement="StartEvent_1c8o652">
-        <dc:Bounds x="175" y="497" width="36" height="36" />
+        <dc:Bounds x="275" y="497" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="148" y="533" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_1emam1w_di" bpmnElement="EndEvent_1emam1w">
-        <dc:Bounds x="312" y="497" width="36" height="36" />
+        <dc:Bounds x="412" y="497" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="285" y="533" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0gcots6_di" bpmnElement="SequenceFlow_0gcots6">
-        <di:waypoint xsi:type="dc:Point" x="211" y="515" />
-        <di:waypoint xsi:type="dc:Point" x="312" y="515" />
+        <di:waypoint x="311" y="515" />
+        <di:waypoint x="412" y="515" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="262" y="494" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0rds4rj_di" bpmnElement="SequenceFlow_0rds4rj">
-        <di:waypoint xsi:type="dc:Point" x="877" y="311" />
-        <di:waypoint xsi:type="dc:Point" x="942" y="311" />
+        <di:waypoint x="977" y="311" />
+        <di:waypoint x="1042" y="311" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="910" y="296" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1vbwdaw_di" bpmnElement="SequenceFlow_1vbwdaw">
-        <di:waypoint xsi:type="dc:Point" x="1042" y="311" />
-        <di:waypoint xsi:type="dc:Point" x="1083" y="311" />
-        <di:waypoint xsi:type="dc:Point" x="1083" y="311" />
-        <di:waypoint xsi:type="dc:Point" x="1118" y="311" />
+        <di:waypoint x="1142" y="311" />
+        <di:waypoint x="1183" y="311" />
+        <di:waypoint x="1183" y="311" />
+        <di:waypoint x="1218" y="311" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1098" y="311" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ServiceTask_1v8zx4s_di" bpmnElement="CreateNetworkPolicies">
-        <dc:Bounds x="142" y="271" width="100" height="80" />
+        <dc:Bounds x="242" y="271" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0xqhep5_di" bpmnElement="SequenceFlow_0xqhep5">
-        <di:waypoint xsi:type="dc:Point" x="242" y="311" />
-        <di:waypoint xsi:type="dc:Point" x="295" y="311" />
+        <di:waypoint x="342" y="311" />
+        <di:waypoint x="395" y="311" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="269" y="296" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ServiceTask_015ayw5_di" bpmnElement="UpdateVnfIpv4OamAddress">
-        <dc:Bounds x="295" y="271" width="100" height="80" />
+        <dc:Bounds x="395" y="271" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1yo6mvv_di" bpmnElement="SequenceFlow_1yo6mvv">
-        <di:waypoint xsi:type="dc:Point" x="395" y="311" />
-        <di:waypoint xsi:type="dc:Point" x="464" y="311" />
+        <di:waypoint x="495" y="311" />
+        <di:waypoint x="564" y="311" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="430" y="296" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ServiceTask_0mlfsc9_di" bpmnElement="UpdateVnfManagementV6Address">
-        <dc:Bounds x="464" y="271" width="100" height="80" />
+        <dc:Bounds x="564" y="271" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1i03uy2_di" bpmnElement="SequenceFlow_1i03uy2">
-        <di:waypoint xsi:type="dc:Point" x="564" y="311" />
-        <di:waypoint xsi:type="dc:Point" x="612" y="311" />
+        <di:waypoint x="664" y="311" />
+        <di:waypoint x="712" y="311" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="588" y="296" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ServiceTask_0wctnhw_di" bpmnElement="UpdateVfModuleContrailServiceInstanceFqdn">
-        <dc:Bounds x="612" y="271" width="100" height="80" />
+        <dc:Bounds x="712" y="271" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_15do1tu_di" bpmnElement="SequenceFlow_15do1tu">
-        <di:waypoint xsi:type="dc:Point" x="712" y="311" />
-        <di:waypoint xsi:type="dc:Point" x="777" y="311" />
+        <di:waypoint x="812" y="311" />
+        <di:waypoint x="877" y="311" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="745" y="286" width="0" height="0" />
         </bpmndi:BPMNLabel>
diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteNetworkBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteNetworkBB.bpmn
index 7a05163b0f..37459cdc7e 100644
--- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteNetworkBB.bpmn
+++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteNetworkBB.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.10.0">
+<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="3.7.0">
   <bpmn:process id="DeleteNetworkBB" name="DeleteNetworkBB" isExecutable="true">
     <bpmn:startEvent id="deleteNetwork_startEvent">
       <bpmn:outgoing>SequenceFlow_1mc3d3f</bpmn:outgoing>
@@ -17,12 +17,12 @@
       <bpmn:incoming>SequenceFlow_0nhd7b7</bpmn:incoming>
     </bpmn:endEvent>
     <bpmn:sequenceFlow id="SequenceFlow_0nhd7b7" sourceRef="updateNetworkAAI" targetRef="deleteNetwork_endEvent" />
-    <bpmn:callActivity id="CallActivity_1a77pxk" name="AIC &#10;Delete&#10;(network)&#10;" calledElement="NetworkAdapterRestV1">
+    <bpmn:callActivity id="CallActivity_1a77pxk" name="Network Adapter" calledElement="NetworkAdapter">
       <bpmn:extensionElements>
         <camunda:in source="networkAdapterRequest" target="networkAdapterRequest" />
         <camunda:out source="WorkflowException" target="WorkflowException" />
         <camunda:out source="deleteNetworkResponse" target="deleteNetworkResponse" />
-        <camunda:in source="mso-request-id" target="mso-request-id" />
+        <camunda:in source="gBuildingBlockExecution" target="gBuildingBlockExecution" />
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_16ti327</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0gnafn2</bpmn:outgoing>
@@ -52,8 +52,8 @@
         <dc:Bounds x="626" y="103" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1mc3d3f_di" bpmnElement="SequenceFlow_1mc3d3f">
-        <di:waypoint xsi:type="dc:Point" x="192" y="143" />
-        <di:waypoint xsi:type="dc:Point" x="312" y="143" />
+        <di:waypoint x="192" y="143" />
+        <di:waypoint x="312" y="143" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="207" y="122" width="90" height="12" />
         </bpmndi:BPMNLabel>
@@ -68,8 +68,8 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0nhd7b7_di" bpmnElement="SequenceFlow_0nhd7b7">
-        <di:waypoint xsi:type="dc:Point" x="726" y="143" />
-        <di:waypoint xsi:type="dc:Point" x="862" y="143" />
+        <di:waypoint x="726" y="143" />
+        <di:waypoint x="862" y="143" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="749" y="122" width="90" height="12" />
         </bpmndi:BPMNLabel>
@@ -78,15 +78,15 @@
         <dc:Bounds x="470" y="103" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_16ti327_di" bpmnElement="SequenceFlow_16ti327">
-        <di:waypoint xsi:type="dc:Point" x="412" y="143" />
-        <di:waypoint xsi:type="dc:Point" x="470" y="143" />
+        <di:waypoint x="412" y="143" />
+        <di:waypoint x="470" y="143" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="396" y="122" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0gnafn2_di" bpmnElement="SequenceFlow_0gnafn2">
-        <di:waypoint xsi:type="dc:Point" x="570" y="143" />
-        <di:waypoint xsi:type="dc:Point" x="626" y="143" />
+        <di:waypoint x="570" y="143" />
+        <di:waypoint x="626" y="143" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="553" y="122" width="90" height="12" />
         </bpmndi:BPMNLabel>
diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/NetworkAdapter.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/NetworkAdapter.bpmn
new file mode 100644
index 0000000000..fe071a25ba
--- /dev/null
+++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/NetworkAdapter.bpmn
@@ -0,0 +1,69 @@
+<?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:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_0gecuy2" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.7.0">
+  <bpmn:process id="NetworkAdapter" name="NetworkAdapter" isExecutable="true">
+    <bpmn:startEvent id="StartEvent_1">
+      <bpmn:outgoing>Flow_1te2q0o</bpmn:outgoing>
+    </bpmn:startEvent>
+    <bpmn:sequenceFlow id="Flow_1te2q0o" sourceRef="StartEvent_1" targetRef="Activity_045o7mr" />
+    <bpmn:sequenceFlow id="Flow_16y1hyp" sourceRef="Activity_045o7mr" targetRef="Activity_1ml9k96" />
+    <bpmn:sequenceFlow id="Flow_03mucze" sourceRef="Activity_1ml9k96" targetRef="Activity_124f192" />
+    <bpmn:endEvent id="Event_0mfsd2x">
+      <bpmn:incoming>Flow_0dcm3bq</bpmn:incoming>
+    </bpmn:endEvent>
+    <bpmn:sequenceFlow id="Flow_0dcm3bq" sourceRef="Activity_124f192" targetRef="Event_0mfsd2x" />
+    <bpmn:serviceTask id="Activity_045o7mr" name="Pre Process Request" camunda:expression="${NetworkAdapterImpl.preProcessNetworkAdapter(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
+      <bpmn:incoming>Flow_1te2q0o</bpmn:incoming>
+      <bpmn:outgoing>Flow_16y1hyp</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:serviceTask id="Activity_124f192" name="Post Process Response" camunda:expression="${NetworkAdapterImpl.postProcessNetworkAdapter(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
+      <bpmn:incoming>Flow_03mucze</bpmn:incoming>
+      <bpmn:outgoing>Flow_0dcm3bq</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:callActivity id="Activity_1ml9k96" name="Openstack&#10;Adapter" calledElement="openstackAdapterTask">
+      <bpmn:extensionElements>
+        <camunda:in source="networkAdapterRequest" target="openstackAdapterTaskRequest" />
+        <camunda:in source="mso-request-id" target="mso-request-id" />
+        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:out source="WorkflowResponse" target="WorkflowResponse" />
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_16y1hyp</bpmn:incoming>
+      <bpmn:outgoing>Flow_03mucze</bpmn:outgoing>
+    </bpmn:callActivity>
+  </bpmn:process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="NetworkAdapter">
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
+        <dc:Bounds x="179" y="82" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="Flow_1te2q0o_di" bpmnElement="Flow_1te2q0o">
+        <di:waypoint x="215" y="100" />
+        <di:waypoint x="300" y="100" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_16y1hyp_di" bpmnElement="Flow_16y1hyp">
+        <di:waypoint x="400" y="100" />
+        <di:waypoint x="490" y="100" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_03mucze_di" bpmnElement="Flow_03mucze">
+        <di:waypoint x="590" y="100" />
+        <di:waypoint x="680" y="100" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="Event_0mfsd2x_di" bpmnElement="Event_0mfsd2x">
+        <dc:Bounds x="872" y="82" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="Flow_0dcm3bq_di" bpmnElement="Flow_0dcm3bq">
+        <di:waypoint x="780" y="100" />
+        <di:waypoint x="872" y="100" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="Activity_1gfh44k_di" bpmnElement="Activity_045o7mr">
+        <dc:Bounds x="300" y="60" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1m5d1dj_di" bpmnElement="Activity_124f192">
+        <dc:Bounds x="680" y="60" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_037d53l_di" bpmnElement="Activity_1ml9k96">
+        <dc:Bounds x="490" y="60" width="100" height="80" />
+      </bpmndi:BPMNShape>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</bpmn:definitions>
diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/UpdateNetworkBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/UpdateNetworkBB.bpmn
index 1235469b42..f4ffa18267 100644
--- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/UpdateNetworkBB.bpmn
+++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/UpdateNetworkBB.bpmn
@@ -1,5 +1,5 @@
 <?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:camunda="http://camunda.org/schema/1.0/bpmn" 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.7.2" 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:camunda="http://camunda.org/schema/1.0/bpmn" 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="3.7.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="UpdateNetworkBB" name="UpdateNetworkBB" isExecutable="true">
     <bpmn2:startEvent id="UpdateNetworkBB_Start" name="Start">
       <bpmn2:outgoing>SequenceFlow_074w2et</bpmn2:outgoing>
@@ -48,11 +48,12 @@
     <bpmn2:endEvent id="UpdateNetworkBB_End" name="End">
       <bpmn2:incoming>SequenceFlow_06ei0em</bpmn2:incoming>
     </bpmn2:endEvent>
-    <bpmn2:callActivity id="CallActivity_NetworkAdapterRestV1" name="Call NetworkAdapterRestV1" calledElement="NetworkAdapterRestV1">
+    <bpmn2:callActivity id="CallActivity_NetworkAdapterRestV1" name="Network Adapter" calledElement="NetworkAdapter">
       <bpmn2:extensionElements>
         <camunda:in source="networkAdapterRequest" target="networkAdapterRequest" />
         <camunda:out source="WorkflowException" target="WorkflowException" />
         <camunda:out source="updateNetworkResponse" target="updateNetworkResponse" />
+        <camunda:in source="gBuildingBlockExecution" target="gBuildingBlockExecution" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_07hq1eg</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_183ph5i</bpmn2:outgoing>
@@ -61,7 +62,7 @@
       <bpmn2:incoming>SequenceFlow_183ph5i</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_001ursg</bpmn2:outgoing>
     </bpmn2:serviceTask>
-    <bpmn2:serviceTask id="Create_Network_ServiceTask" name="&#10;AIC&#10;Update&#10;(network)&#10;" camunda:expression="${NetworkAdapterUpdateTasks.updateNetwork(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
+    <bpmn2:serviceTask id="Create_Network_ServiceTask" name="Prepare Request" camunda:expression="${NetworkAdapterUpdateTasks.updateNetwork(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
       <bpmn2:incoming>SequenceFlow_0qrtpcy</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_07hq1eg</bpmn2:outgoing>
     </bpmn2:serviceTask>
@@ -98,8 +99,8 @@
         <dc:Bounds x="278" y="55" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_074w2et_di" bpmnElement="SequenceFlow_074w2et">
-        <di:waypoint xsi:type="dc:Point" x="180" y="95" />
-        <di:waypoint xsi:type="dc:Point" x="278" y="95" />
+        <di:waypoint x="180" y="95" />
+        <di:waypoint x="278" y="95" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="229" y="74" width="0" height="12" />
         </bpmndi:BPMNLabel>
@@ -117,8 +118,8 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1trqq6d_di" bpmnElement="SequenceFlow_1trqq6d">
-        <di:waypoint xsi:type="dc:Point" x="180" y="233" />
-        <di:waypoint xsi:type="dc:Point" x="280" y="233" />
+        <di:waypoint x="180" y="233" />
+        <di:waypoint x="280" y="233" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="185" y="212" width="90" height="12" />
         </bpmndi:BPMNLabel>
@@ -130,15 +131,15 @@
         <dc:Bounds x="455" y="193" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1io4cl7_di" bpmnElement="SequenceFlow_1io4cl7">
-        <di:waypoint xsi:type="dc:Point" x="380" y="233" />
-        <di:waypoint xsi:type="dc:Point" x="455" y="233" />
+        <di:waypoint x="380" y="233" />
+        <di:waypoint x="455" y="233" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="417.5" y="212" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_16fm47t_di" bpmnElement="SequenceFlow_16fm47t">
-        <di:waypoint xsi:type="dc:Point" x="555" y="233" />
-        <di:waypoint xsi:type="dc:Point" x="625" y="233" />
+        <di:waypoint x="555" y="233" />
+        <di:waypoint x="625" y="233" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="590" y="212" width="0" height="12" />
         </bpmndi:BPMNLabel>
@@ -153,8 +154,8 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_00xbxe7_di" bpmnElement="SequenceFlow_00xbxe7">
-        <di:waypoint xsi:type="dc:Point" x="725" y="233" />
-        <di:waypoint xsi:type="dc:Point" x="785" y="233" />
+        <di:waypoint x="725" y="233" />
+        <di:waypoint x="785" y="233" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="755" y="212" width="0" height="12" />
         </bpmndi:BPMNLabel>
@@ -184,38 +185,38 @@
         <dc:Bounds x="278" y="362" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0qrtpcy_di" bpmnElement="SequenceFlow_0qrtpcy">
-        <di:waypoint xsi:type="dc:Point" x="180" y="402" />
-        <di:waypoint xsi:type="dc:Point" x="229" y="402" />
-        <di:waypoint xsi:type="dc:Point" x="229" y="402" />
-        <di:waypoint xsi:type="dc:Point" x="278" y="402" />
+        <di:waypoint x="180" y="402" />
+        <di:waypoint x="229" y="402" />
+        <di:waypoint x="229" y="402" />
+        <di:waypoint x="278" y="402" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="199" y="396" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_001ursg_di" bpmnElement="SequenceFlow_001ursg">
-        <di:waypoint xsi:type="dc:Point" x="725" y="402" />
-        <di:waypoint xsi:type="dc:Point" x="806" y="402" />
+        <di:waypoint x="725" y="402" />
+        <di:waypoint x="806" y="402" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="720.5" y="381" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_06ei0em_di" bpmnElement="SequenceFlow_06ei0em">
-        <di:waypoint xsi:type="dc:Point" x="906" y="402" />
-        <di:waypoint xsi:type="dc:Point" x="983" y="402" />
+        <di:waypoint x="906" y="402" />
+        <di:waypoint x="983" y="402" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="899.5" y="381" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_07hq1eg_di" bpmnElement="SequenceFlow_07hq1eg">
-        <di:waypoint xsi:type="dc:Point" x="378" y="402" />
-        <di:waypoint xsi:type="dc:Point" x="445" y="402" />
+        <di:waypoint x="378" y="402" />
+        <di:waypoint x="445" y="402" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="411.5" y="381" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_183ph5i_di" bpmnElement="SequenceFlow_183ph5i">
-        <di:waypoint xsi:type="dc:Point" x="545" y="402" />
-        <di:waypoint xsi:type="dc:Point" x="625" y="402" />
+        <di:waypoint x="545" y="402" />
+        <di:waypoint x="625" y="402" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="585" y="381" width="0" height="12" />
         </bpmndi:BPMNLabel>
@@ -224,15 +225,15 @@
         <dc:Bounds x="455" y="55" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0rvstwt_di" bpmnElement="SequenceFlow_0rvstwt">
-        <di:waypoint xsi:type="dc:Point" x="378" y="95" />
-        <di:waypoint xsi:type="dc:Point" x="455" y="95" />
+        <di:waypoint x="378" y="95" />
+        <di:waypoint x="455" y="95" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="416.5" y="74" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1eacnem_di" bpmnElement="SequenceFlow_1eacnem">
-        <di:waypoint xsi:type="dc:Point" x="555" y="95" />
-        <di:waypoint xsi:type="dc:Point" x="665" y="95" />
+        <di:waypoint x="555" y="95" />
+        <di:waypoint x="665" y="95" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="610" y="74" width="0" height="12" />
         </bpmndi:BPMNLabel>
diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/VnfAdapter.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/VnfAdapter.bpmn
index e139e94660..3448e8d577 100644
--- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/VnfAdapter.bpmn
+++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/VnfAdapter.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.10.0">
+<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="3.7.0">
   <bpmn:process id="VnfAdapter" name="Vnf Adapter" isExecutable="true">
     <bpmn:startEvent id="VnfAdapter_Start">
       <bpmn:outgoing>SequenceFlow_1xr6chl</bpmn:outgoing>
@@ -27,10 +27,10 @@
       <bpmn:outgoing>SequenceFlow_1ivhukd</bpmn:outgoing>
     </bpmn:serviceTask>
     <bpmn:sequenceFlow id="SequenceFlow_1ivhukd" sourceRef="PostProcessResponse" targetRef="VnfAdapter_End" />
-    <bpmn:callActivity id="Call_vnfAdapterTask" name="&#10;Cloud&#10;Create&#10;(vnf)&#10;" calledElement="vnfAdapterTask">
+    <bpmn:callActivity id="Call_openstackAdapterTask" name="Openstack&#10;Adapter" calledElement="openstackAdapterTask">
       <bpmn:extensionElements>
         <camunda:out source="WorkflowException" target="WorkflowException" />
-        <camunda:in source="VNFREST_Request" target="vnfAdapterTaskRequest" />
+        <camunda:in source="VNFREST_Request" target="openstackAdapterTaskRequest" />
         <camunda:out source="WorkflowResponse" target="WorkflowResponse" />
         <camunda:in source="mso-request-id" target="mso-request-id" />
         <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
@@ -38,8 +38,8 @@
       <bpmn:incoming>SequenceFlow_0qaaf5k</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0j1zvis</bpmn:outgoing>
     </bpmn:callActivity>
-    <bpmn:sequenceFlow id="SequenceFlow_0qaaf5k" sourceRef="PreProcessRequest" targetRef="Call_vnfAdapterTask" />
-    <bpmn:sequenceFlow id="SequenceFlow_0j1zvis" sourceRef="Call_vnfAdapterTask" targetRef="PostProcessResponse" />
+    <bpmn:sequenceFlow id="SequenceFlow_0qaaf5k" sourceRef="PreProcessRequest" targetRef="Call_openstackAdapterTask" />
+    <bpmn:sequenceFlow id="SequenceFlow_0j1zvis" sourceRef="Call_openstackAdapterTask" targetRef="PostProcessResponse" />
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="VnfAdapter">
@@ -53,8 +53,8 @@
         <dc:Bounds x="396" y="275" width="233" height="135" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1xr6chl_di" bpmnElement="SequenceFlow_1xr6chl">
-        <di:waypoint xsi:type="dc:Point" x="192" y="121" />
-        <di:waypoint xsi:type="dc:Point" x="272" y="121" />
+        <di:waypoint x="192" y="121" />
+        <di:waypoint x="272" y="121" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="244" y="360" width="90" height="0" />
         </bpmndi:BPMNLabel>
@@ -72,10 +72,10 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1abat8l_di" bpmnElement="SequenceFlow_1abat8l">
-        <di:waypoint xsi:type="dc:Point" x="470" y="337" />
-        <di:waypoint xsi:type="dc:Point" x="509" y="337" />
-        <di:waypoint xsi:type="dc:Point" x="509" y="337" />
-        <di:waypoint xsi:type="dc:Point" x="549" y="337" />
+        <di:waypoint x="470" y="337" />
+        <di:waypoint x="509" y="337" />
+        <di:waypoint x="509" y="337" />
+        <di:waypoint x="549" y="337" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="536" y="591" width="90" height="0" />
         </bpmndi:BPMNLabel>
@@ -93,25 +93,25 @@
         <dc:Bounds x="657" y="81" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1ivhukd_di" bpmnElement="SequenceFlow_1ivhukd">
-        <di:waypoint xsi:type="dc:Point" x="757" y="121" />
-        <di:waypoint xsi:type="dc:Point" x="837" y="121" />
+        <di:waypoint x="757" y="121" />
+        <di:waypoint x="837" y="121" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="809" y="354" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="CallActivity_0n6wnin_di" bpmnElement="Call_vnfAdapterTask">
+      <bpmndi:BPMNShape id="CallActivity_0n6wnin_di" bpmnElement="Call_openstackAdapterTask">
         <dc:Bounds x="463" y="81" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0qaaf5k_di" bpmnElement="SequenceFlow_0qaaf5k">
-        <di:waypoint xsi:type="dc:Point" x="372" y="121" />
-        <di:waypoint xsi:type="dc:Point" x="463" y="121" />
+        <di:waypoint x="372" y="121" />
+        <di:waypoint x="463" y="121" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="429.5" y="354" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0j1zvis_di" bpmnElement="SequenceFlow_0j1zvis">
-        <di:waypoint xsi:type="dc:Point" x="563" y="121" />
-        <di:waypoint xsi:type="dc:Point" x="657" y="121" />
+        <di:waypoint x="563" y="121" />
+        <di:waypoint x="657" y="121" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="622" y="354" width="90" height="12" />
         </bpmndi:BPMNLabel>
diff --git a/bpmn/so-bpmn-building-blocks/src/test/java/org/onap/so/bpmn/infrastructure/bpmn/subprocess/VnfAdapterTest.java b/bpmn/so-bpmn-building-blocks/src/test/java/org/onap/so/bpmn/infrastructure/bpmn/subprocess/VnfAdapterTest.java
index 4dbf4d46ff..51384c6a87 100644
--- a/bpmn/so-bpmn-building-blocks/src/test/java/org/onap/so/bpmn/infrastructure/bpmn/subprocess/VnfAdapterTest.java
+++ b/bpmn/so-bpmn-building-blocks/src/test/java/org/onap/so/bpmn/infrastructure/bpmn/subprocess/VnfAdapterTest.java
@@ -32,12 +32,12 @@ import org.onap.so.bpmn.common.BuildingBlockExecution;
 public class VnfAdapterTest extends BaseBPMNTest {
     @Test
     public void vnfAdapterCreatedTest() {
-        mockSubprocess("vnfAdapterTask", "Mocked vnfAdapterTask", "GenericStub");
+        mockSubprocess("openstackAdapterTask", "Mocked openstackAdapterTask", "GenericStub");
 
         ProcessInstance pi = runtimeService.startProcessInstanceByKey("VnfAdapter", variables);
         assertThat(pi).isNotNull();
-        assertThat(pi).isStarted().hasPassedInOrder("VnfAdapter_Start", "PreProcessRequest", "Call_vnfAdapterTask",
-                "PostProcessResponse", "VnfAdapter_End");
+        assertThat(pi).isStarted().hasPassedInOrder("VnfAdapter_Start", "PreProcessRequest",
+                "Call_openstackAdapterTask", "PostProcessResponse", "VnfAdapter_End");
         assertThat(pi).isEnded();
     }